From 67a5f081923243a9e3938dfbb24f111b3f23bf19 Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <jessica.lawshe@overleaf.com>
Date: Wed, 6 Nov 2019 07:41:08 -0600
Subject: [PATCH] Merge pull request #2300 from
 overleaf/jel-institution-register

Institution SSO register notification

GitOrigin-RevId: 6838b4f950f9841911da97234d1292802d3ea451
---
 .../src/Features/Project/ProjectController.js |  5 ++++-
 .../src/Project/ProjectControllerTests.js     | 22 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 2d1b974be2..0d11596215 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -506,7 +506,10 @@ const ProjectController = {
             }
 
             // Notification: Tried to register, but account already existed
-            if (samlSession.registerIntercept) {
+            // registerIntercept is set before the institution callback.
+            // institutionEmail is set after institution callback.
+            // Check for both in case SSO flow was abandoned
+            if (samlSession.registerIntercept && samlSession.institutionEmail) {
               notificationsInstitution.push({
                 email: samlSession.institutionEmail,
                 templateKey: 'notification_institution_sso_already_registered'
diff --git a/services/web/test/unit/src/Project/ProjectControllerTests.js b/services/web/test/unit/src/Project/ProjectControllerTests.js
index 93412563fb..83387c1dcd 100644
--- a/services/web/test/unit/src/Project/ProjectControllerTests.js
+++ b/services/web/test/unit/src/Project/ProjectControllerTests.js
@@ -747,7 +747,27 @@ describe('ProjectController', function() {
             hasEntitlement: false,
             universityName: 'Overleaf'
           },
-          registerIntercept: true
+          registerIntercept: {
+            id: 1,
+            name: 'Example University'
+          }
+        }
+        this.ProjectController.projectListPage(this.req, this.res)
+      })
+      it('should not show a register notification if the flow was abandoned', function() {
+        // could initially start to register with an SSO email and then
+        // abandon flow and login with an existing non-institution SSO email
+        this.res.render = (pageName, opts) => {
+          expect(opts.notificationsInstitution).to.deep.not.include({
+            email: 'test@overleaf.com',
+            templateKey: 'notification_institution_sso_already_registered'
+          })
+        }
+        this.req.session.saml = {
+          registerIntercept: {
+            id: 1,
+            name: 'Example University'
+          }
         }
         this.ProjectController.projectListPage(this.req, this.res)
       })