From 0091ab3d92a9a6dfb2a4dfc403d27dbfb175a0ef Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Tue, 1 Apr 2025 12:20:20 +0100
Subject: [PATCH] Merge pull request #24609 from overleaf/rh-bs5-b2c-teardown

Teardown Bootstrap 5 B2C feature flag

GitOrigin-RevId: 4021820bc3b207dae9fffd23dfac778746fa8f20
---
 .../src/Features/TokenAccess/TokenAccessController.mjs    | 8 --------
 .../web/app/src/Features/User/UserEmailsController.js     | 6 ------
 services/web/app/views/project/token/access-react.pug     | 1 -
 services/web/app/views/user/addSecondaryEmail.pug         | 1 -
 services/web/app/views/user/confirmSecondaryEmail.pug     | 1 -
 5 files changed, 17 deletions(-)

diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs b/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs
index 63c29466f8..ff4b93e88c 100644
--- a/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs
+++ b/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs
@@ -20,7 +20,6 @@ import { getSafeAdminDomainRedirect } from '../Helpers/UrlHelper.js'
 import UserGetter from '../User/UserGetter.js'
 import Settings from '@overleaf/settings'
 import LimitationsManager from '../Subscription/LimitationsManager.js'
-import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 
 const orderedPrivilegeLevels = [
   PrivilegeLevels.NONE,
@@ -112,13 +111,6 @@ async function tokenAccessPage(req, res, next) {
       }
     }
 
-    // Populates splitTestVariants with a value for the split test name and allows
-    // Pug to read it
-    await SplitTestHandler.promises.getAssignment(
-      req,
-      res,
-      'bs5-misc-pages-b2c'
-    )
     res.render('project/token/access-react', {
       postUrl: makePostUrl(token),
     })
diff --git a/services/web/app/src/Features/User/UserEmailsController.js b/services/web/app/src/Features/User/UserEmailsController.js
index f639d0861a..54ace10cb0 100644
--- a/services/web/app/src/Features/User/UserEmailsController.js
+++ b/services/web/app/src/Features/User/UserEmailsController.js
@@ -480,10 +480,6 @@ async function confirmSecondaryEmailPage(req, res) {
     return res.redirect(redirectURL)
   }
 
-  // Populates splitTestVariants with a value for the split test name and allows
-  // Pug to read it
-  await SplitTestHandler.promises.getAssignment(req, res, 'bs5-misc-pages-b2c')
-
   AnalyticsManager.recordEventForUserInBackground(
     userId,
     'confirm-secondary-email-page-displayed'
@@ -511,8 +507,6 @@ async function addSecondaryEmailPage(req, res) {
     'add-secondary-email-page-displayed'
   )
 
-  await SplitTestHandler.promises.getAssignment(req, res, 'bs5-misc-pages-b2c')
-
   res.render('user/addSecondaryEmail')
 }
 
diff --git a/services/web/app/views/project/token/access-react.pug b/services/web/app/views/project/token/access-react.pug
index da7da72489..734ffa053f 100644
--- a/services/web/app/views/project/token/access-react.pug
+++ b/services/web/app/views/project/token/access-react.pug
@@ -8,7 +8,6 @@ block vars
 	- var suppressCookieBanner = true
 	- var suppressSkipToContent = true
 	- bootstrap5PageStatus = 'enabled'
-	- bootstrap5PageSplitTest = 'bs5-misc-pages-b2c'
 		
 block append meta
 	meta(name="ol-postUrl" data-type="string" content=postUrl)
diff --git a/services/web/app/views/user/addSecondaryEmail.pug b/services/web/app/views/user/addSecondaryEmail.pug
index 43332eaf64..68c506c977 100644
--- a/services/web/app/views/user/addSecondaryEmail.pug
+++ b/services/web/app/views/user/addSecondaryEmail.pug
@@ -4,7 +4,6 @@ block vars
 	- var suppressNavbar = true
 	- var suppressSkipToContent = true
 	- bootstrap5PageStatus = 'enabled'
-	- bootstrap5PageSplitTest = 'bs5-misc-pages-b2c'
 
 block entrypointVar
 	- entrypoint = 'pages/user/add-secondary-email'
diff --git a/services/web/app/views/user/confirmSecondaryEmail.pug b/services/web/app/views/user/confirmSecondaryEmail.pug
index 447a9df20a..95927f2f05 100644
--- a/services/web/app/views/user/confirmSecondaryEmail.pug
+++ b/services/web/app/views/user/confirmSecondaryEmail.pug
@@ -4,7 +4,6 @@ block vars
 	- var suppressNavbar = true
 	- var suppressSkipToContent = true
 	- bootstrap5PageStatus = 'enabled'
-	- bootstrap5PageSplitTest = 'bs5-misc-pages-b2c'
 
 block entrypointVar
 	- entrypoint = 'pages/user/confirm-secondary-email'