From 1916a0bbf636a3514d977dc98658667afbb6c992 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Mon, 27 Jan 2025 08:47:32 -0700
Subject: [PATCH] Merge pull request #22613 from
 overleaf/mf-migrate-primary-email-check-bs5

[web] Migrate "Primary email check" page to bootstrap 5 and website-redesign styling

GitOrigin-RevId: e233edafb8c5033c8fbd97088fa1ac840e2e572e
---
 .../src/Features/User/UserEmailsController.js | 14 ++++++-
 .../app/views/user/primaryEmailCheck-bs5.pug  | 38 +++++++++++++++++++
 .../src/User/UserEmailsControllerTests.js     |  5 +++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 services/web/app/views/user/primaryEmailCheck-bs5.pug

diff --git a/services/web/app/src/Features/User/UserEmailsController.js b/services/web/app/src/Features/User/UserEmailsController.js
index d841cf8d54..2a25859baa 100644
--- a/services/web/app/src/Features/User/UserEmailsController.js
+++ b/services/web/app/src/Features/User/UserEmailsController.js
@@ -20,6 +20,7 @@ const { RateLimiter } = require('../../infrastructure/RateLimiter')
 const Features = require('../../infrastructure/Features')
 const tsscmp = require('tsscmp')
 const Modules = require('../../infrastructure/Modules')
+const SplitTestHandler = require('../SplitTests/SplitTestHandler')
 
 const AUDIT_LOG_TOKEN_PREFIX_LENGTH = 10
 
@@ -460,7 +461,18 @@ async function primaryEmailCheckPage(req, res) {
     userId,
     'primary-email-check-page-displayed'
   )
-  res.render('user/primaryEmailCheck')
+  const { variant } = await SplitTestHandler.promises.getAssignment(
+    req,
+    res,
+    'auth-pages-bs5'
+  )
+
+  const template =
+    variant === 'enabled'
+      ? 'user/primaryEmailCheck-bs5'
+      : 'user/primaryEmailCheck'
+
+  res.render(template)
 }
 
 async function primaryEmailCheck(req, res) {
diff --git a/services/web/app/views/user/primaryEmailCheck-bs5.pug b/services/web/app/views/user/primaryEmailCheck-bs5.pug
new file mode 100644
index 0000000000..b04511a48f
--- /dev/null
+++ b/services/web/app/views/user/primaryEmailCheck-bs5.pug
@@ -0,0 +1,38 @@
+extends ../layout-website-redesign-bootstrap-5
+
+block content
+	main#main-content
+		.auth-aux-container
+			img.w-50.d-block(src=buildImgPath("ol-brand/overleaf.svg") alt=settings.appName)
+			h1.h3.mb-3 #{translate("keep_your_account_safe")}
+			div(data-ol-multi-submit)
+				p.small.mb-4
+					| !{translate("primary_email_check_question", { email: getUserEmail() }, ["strong"])}
+				form(
+					data-ol-async-form
+					action="/user/emails/primary-email-check"
+					method="POST"
+				)
+					input(name='_csrf', type='hidden', value=csrfToken)
+					+formMessages()
+
+					button.btn.btn-primary.w-100.mb-3(
+						type='submit'
+						data-ol-disabled-inflight
+					)
+						span(data-ol-inflight="idle") #{translate("yes_that_is_correct")}
+						span(hidden data-ol-inflight="pending") #{translate("confirming")}…
+
+				a.btn.btn-secondary.w-100.mb-4(
+					href="/user/settings#add-email"
+					data-ol-slow-link
+					event-tracking="primary-email-check-change-email"
+					event-tracking-mb="true"
+					event-tracking-trigger="click"
+				)
+					span(data-ol-inflight="idle") #{translate("no_update_email")}
+					span(hidden data-ol-inflight="pending") #{translate("redirecting")}…  
+				p.small.mb-2
+					|  #{translate("keep_your_email_updated")}
+				p.small
+					|  !{translate("learn_more_about_emails", {}, [{name: 'a', attrs: {href: '/learn/how-to/Keeping_your_account_secure', 'event-tracking': 'primary-email-check-learn-more', 'event-tracking-mb': 'true', 'event-tracking-trigger': 'click' }}])}
diff --git a/services/web/test/unit/src/User/UserEmailsControllerTests.js b/services/web/test/unit/src/User/UserEmailsControllerTests.js
index cfa6bbe049..0513528737 100644
--- a/services/web/test/unit/src/User/UserEmailsControllerTests.js
+++ b/services/web/test/unit/src/User/UserEmailsControllerTests.js
@@ -101,6 +101,11 @@ describe('UserEmailsController', function () {
         '../Analytics/AnalyticsManager': this.AnalyticsManager,
         './UserAuditLogHandler': this.UserAuditLogHandler,
         '../../infrastructure/RateLimiter': this.RateLimiter,
+        '../SplitTests/SplitTestHandler': {
+          promises: {
+            getAssignment: sinon.stub().resolves('default'),
+          },
+        },
       },
     })
   })