From fa6ea47952280ef1c7133a4e0ee3341b11940dbe Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Tue, 3 Dec 2024 01:18:19 +0100
Subject: [PATCH 001/274] Enable LDAP and SAML authentication support

---
 patches/@node-saml+node-saml+4.0.5.patch      |  23 +++
 patches/ldapauth-fork+4.3.3.patch             |  64 +++++++
 .../AuthenticationController.js               |   5 +-
 .../PasswordReset/PasswordResetController.mjs |   4 +
 .../PasswordReset/PasswordResetHandler.mjs    |   4 +
 .../app/src/Features/User/UserController.js   |   3 +-
 services/web/app/views/user/login.pug         |  14 +-
 services/web/app/views/user/settings.pug      |   4 +-
 services/web/config/settings.defaults.js      |   2 +
 services/web/locales/en.json                  |   2 +
 .../launchpad/app/src/LaunchpadController.mjs |   3 +-
 .../modules/launchpad/app/views/launchpad.pug |  81 ++++++++-
 .../app/src/AuthenticationControllerLdap.mjs  |  64 +++++++
 .../app/src/AuthenticationManagerLdap.mjs     |  80 +++++++++
 .../app/src/InitLdapSettings.mjs              |  17 ++
 .../app/src/LdapContacts.mjs                  | 136 +++++++++++++++
 .../app/src/LdapStrategy.mjs                  |  78 +++++++++
 .../web/modules/ldap-authentication/index.mjs |  30 ++++
 .../app/src/AuthenticationControllerSaml.mjs  | 160 ++++++++++++++++++
 .../app/src/AuthenticationManagerSaml.mjs     |  60 +++++++
 .../app/src/InitSamlSettings.mjs              |  16 ++
 .../app/src/SamlNonCsrfRouter.mjs             |  12 ++
 .../app/src/SamlRouter.mjs                    |  14 ++
 .../app/src/SamlStrategy.mjs                  |  62 +++++++
 .../web/modules/saml-authentication/index.mjs |  26 +++
 25 files changed, 953 insertions(+), 11 deletions(-)
 create mode 100644 patches/@node-saml+node-saml+4.0.5.patch
 create mode 100644 patches/ldapauth-fork+4.3.3.patch
 create mode 100644 services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
 create mode 100644 services/web/modules/ldap-authentication/index.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/SamlRouter.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
 create mode 100644 services/web/modules/saml-authentication/index.mjs

diff --git a/patches/@node-saml+node-saml+4.0.5.patch b/patches/@node-saml+node-saml+4.0.5.patch
new file mode 100644
index 0000000000..81fd700b31
--- /dev/null
+++ b/patches/@node-saml+node-saml+4.0.5.patch
@@ -0,0 +1,23 @@
+diff --git a/node_modules/@node-saml/node-saml/lib/saml.js b/node_modules/@node-saml/node-saml/lib/saml.js
+index fba15b9..a5778cb 100644
+--- a/node_modules/@node-saml/node-saml/lib/saml.js
++++ b/node_modules/@node-saml/node-saml/lib/saml.js
+@@ -336,7 +336,8 @@ class SAML {
+         const requestOrResponse = request || response;
+         (0, utility_1.assertRequired)(requestOrResponse, "either request or response is required");
+         let buffer;
+-        if (this.options.skipRequestCompression) {
++       // logout requestOrResponse must be compressed anyway
++        if (this.options.skipRequestCompression && operation !== "logout") {
+             buffer = Buffer.from(requestOrResponse, "utf8");
+         }
+         else {
+@@ -495,7 +496,7 @@ class SAML {
+         try {
+             xml = Buffer.from(container.SAMLResponse, "base64").toString("utf8");
+             doc = await (0, xml_1.parseDomFromString)(xml);
+-            const inResponseToNodes = xml_1.xpath.selectAttributes(doc, "/*[local-name()='Response']/@InResponseTo");
++            const inResponseToNodes = xml_1.xpath.selectAttributes(doc, "/*[local-name()='Response' or local-name()='LogoutResponse']/@InResponseTo");
+             if (inResponseToNodes) {
+                 inResponseTo = inResponseToNodes.length ? inResponseToNodes[0].nodeValue : null;
+                 await this.validateInResponseTo(inResponseTo);
diff --git a/patches/ldapauth-fork+4.3.3.patch b/patches/ldapauth-fork+4.3.3.patch
new file mode 100644
index 0000000000..4d31210c9d
--- /dev/null
+++ b/patches/ldapauth-fork+4.3.3.patch
@@ -0,0 +1,64 @@
+diff --git a/node_modules/ldapauth-fork/lib/ldapauth.js b/node_modules/ldapauth-fork/lib/ldapauth.js
+index 85ecf36a8b..a7d07e0f78 100644
+--- a/node_modules/ldapauth-fork/lib/ldapauth.js
++++ b/node_modules/ldapauth-fork/lib/ldapauth.js
+@@ -69,6 +69,7 @@ function LdapAuth(opts) {
+   this.opts.bindProperty || (this.opts.bindProperty = 'dn');
+   this.opts.groupSearchScope || (this.opts.groupSearchScope = 'sub');
+   this.opts.groupDnProperty || (this.opts.groupDnProperty = 'dn');
++  this.opts.tlsStarted = false;
+
+   EventEmitter.call(this);
+
+@@ -108,21 +109,7 @@ function LdapAuth(opts) {
+   this._userClient.on('error', this._handleError.bind(this));
+
+   var self = this;
+-  if (this.opts.starttls) {
+-    // When starttls is enabled, this callback supplants the 'connect' callback
+-    this._adminClient.starttls(this.opts.tlsOptions, this._adminClient.controls, function(err) {
+-      if (err) {
+-        self._handleError(err);
+-      } else {
+-        self._onConnectAdmin();
+-      }
+-    });
+-    this._userClient.starttls(this.opts.tlsOptions, this._userClient.controls, function(err) {
+-      if (err) {
+-        self._handleError(err);
+-      }
+-    });
+-  } else if (opts.reconnect) {
++  if (opts.reconnect && !this.opts.starttls) {
+     this.once('_installReconnectListener', function() {
+       self.log && self.log.trace('install reconnect listener');
+       self._adminClient.on('connect', function() {
+@@ -384,6 +371,28 @@ LdapAuth.prototype._findGroups = function(user, callback) {
+  */
+ LdapAuth.prototype.authenticate = function(username, password, callback) {
+   var self = this;
++  if (this.opts.starttls && !this.opts.tlsStarted) {
++    // When starttls is enabled, this callback supplants the 'connect' callback
++    this._adminClient.starttls(this.opts.tlsOptions, this._adminClient.controls, function (err) {
++      if (err) {
++        self._handleError(err);
++      } else {
++        self._onConnectAdmin(function(){self._handleAuthenticate(username, password, callback);});
++      }
++    });
++    this._userClient.starttls(this.opts.tlsOptions, this._userClient.controls, function (err) {
++      if (err) {
++        self._handleError(err);
++      }
++    });
++  } else {
++    self._handleAuthenticate(username, password, callback);
++  }
++};
++
++LdapAuth.prototype._handleAuthenticate = function (username, password, callback) {
++  this.opts.tlsStarted = true;
++  var self = this;
+
+   if (typeof password === 'undefined' || password === null || password === '') {
+     return callback(new Error('no password given'));
diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js
index 7a97d2ac9c..983526006e 100644
--- a/services/web/app/src/Features/Authentication/AuthenticationController.js
+++ b/services/web/app/src/Features/Authentication/AuthenticationController.js
@@ -102,9 +102,9 @@ const AuthenticationController = {
     // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
     // and send a `{redir: ""}` response on success
     passport.authenticate(
-      'local',
+      Settings.ldap?.enable ? ['custom-fail-ldapauth','local'] : ['local'],
       { keepSessionInfo: true },
-      async function (err, user, info) {
+      async function (err, user, infoArray) {
         if (err) {
           return next(err)
         }
@@ -126,6 +126,7 @@ const AuthenticationController = {
             return next(err)
           }
         } else {
+	  let info = infoArray[0]
           if (info.redir != null) {
             return res.json({ redir: info.redir })
           } else {
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
index 771782c302..85ed99fcb8 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
@@ -141,6 +141,10 @@ async function requestReset(req, res, next) {
     return res.status(404).json({
       message: req.i18n.translate('secondary_email_password_reset'),
     })
+  } else if (status === 'external') {
+    return res.status(403).json({
+      message: req.i18n.translate('password_managed_externally'),
+    })
   } else {
     return res.status(404).json({
       message: req.i18n.translate('cant_find_email'),
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
index 094f18b95f..0ac203222c 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
@@ -18,6 +18,10 @@ async function generateAndEmailResetToken(email) {
     return null
   }
 
+  if (!user.hashedPassword) {
+    return 'external'
+  }
+
   if (user.email !== email) {
     return 'secondary'
   }
diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index b767dcd4a1..772e77e3e4 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -404,7 +404,7 @@ async function updateUserSettings(req, res, next) {
   if (
     newEmail == null ||
     newEmail === user.email ||
-    req.externalAuthenticationSystemUsed()
+    (req.externalAuthenticationSystemUsed() && !user.hashedPassword)
   ) {
     // end here, don't update email
     SessionManager.setInSessionUser(req.session, {
@@ -481,6 +481,7 @@ async function doLogout(req) {
 }
 
 async function logout(req, res, next) {
+  if (req?.session.saml_extce) return res.redirect(308, '/saml/logout')
   const requestedRedirect = req.body.redirect
     ? UrlHelper.getSafeRedirectPath(req.body.redirect)
     : undefined
diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index 1ad77cb8b4..fc4973efb4 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -23,10 +23,10 @@ block content
 									| !{translate('password_compromised_try_again_or_use_known_device_or_reset', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}, {name: 'a', attrs: {href: '/user/password/reset', target: '_blank'}}])}.
 								.form-group
 									input.form-control(
-										type='email',
+										type=(settings.ldap && settings.ldap.enable) ? 'text' : 'email',
 										name='email',
 										required,
-										placeholder='email@example.com',
+										placeholder=(settings.ldap && settings.ldap.enable) ? settings.ldap.placeholder : 'email@example.com',
 										autofocus="true"
 									)
 								.form-group
@@ -47,4 +47,12 @@ block content
 								if login_support_text
 									hr
 									p.text-center !{login_support_text}	
-		
+							if settings.saml && settings.saml.enable
+								form(data-ol-async-form, name="samlLoginForm")
+									.actions(style='margin-top: 30px;')
+										a.btn.btn-secondary.btn-block(
+											href='/saml/login',
+											data-ol-disabled-inflight
+										)
+											span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
+											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index 4ac35bef71..0a4573d812 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -8,7 +8,7 @@ block vars
 
 block append meta
 	meta(name="ol-hasPassword" data-type="boolean" content=hasPassword)
-	meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails)
+	meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails || hasPassword)
 	meta(name="ol-oauthProviders", data-type="json", content=oauthProviders)
 	meta(name="ol-institutionLinked", data-type="json", content=institutionLinked)
 	meta(name="ol-samlError", data-type="json", content=samlError)
@@ -20,7 +20,7 @@ block append meta
 	meta(name="ol-ssoErrorMessage", content=ssoErrorMessage)
 	meta(name="ol-thirdPartyIds", data-type="json", content=thirdPartyIds || {})
 	meta(name="ol-passwordStrengthOptions", data-type="json", content=settings.passwordStrengthOptions || {})
-	meta(name="ol-isExternalAuthenticationSystemUsed" data-type="boolean" content=externalAuthenticationSystemUsed())
+	meta(name="ol-isExternalAuthenticationSystemUsed" data-type="boolean" content=externalAuthenticationSystemUsed() && !hasPassword)
 	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-labsExperiments" data-type="json" content=labsExperiments)
 	meta(name="ol-dropbox" data-type="json" content=dropbox)
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index 07558a0420..f25f8760b1 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -1010,6 +1010,8 @@ module.exports = {
     'launchpad',
     'server-ce-scripts',
     'user-activate',
+    'ldap-authentication',
+    'saml-authentication',
   ],
   viewIncludes: {},
 
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 5c6ab42fee..e8aafc842d 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -164,6 +164,7 @@
   "already_have_sl_account": "Already have an __appName__ account?",
   "also": "Also",
   "alternatively_create_new_institution_account": "Alternatively, you can create a <b>new account</b> with your institution email (<b>__email__</b>) by clicking <b>__clickText__</b>.",
+  "alternatively_create_local_admin_account": "Alternatively, you can create __appName__ local admin account.",
   "an_email_has_already_been_sent_to": "An email has already been sent to <0>__email__</0>. Please wait and try again later.",
   "an_error_occured_while_restoring_project": "An error occured while restoring the project",
   "an_error_occurred_when_verifying_the_coupon_code": "An error occurred when verifying the coupon code",
@@ -1255,6 +1256,7 @@
   "loading_prices": "loading prices",
   "loading_recent_github_commits": "Loading recent commits",
   "loading_writefull": "Loading Writefull",
+  "local_account": "Local account",
   "log_entry_description": "Log entry with level: __level__",
   "log_entry_maximum_entries": "Maximum log entries limit hit",
   "log_entry_maximum_entries_enable_stop_on_first_error": "Try to fix the first error and recompile. Often one error causes many later error messages. You can <0>Enable “Stop on first error”</0> to focus on fixing errors. We recommend fixing errors as soon as possible; letting them accumulate may lead to hard-to-debug and fatal errors. <1>Learn more</1>",
diff --git a/services/web/modules/launchpad/app/src/LaunchpadController.mjs b/services/web/modules/launchpad/app/src/LaunchpadController.mjs
index b626e0176e..49dd9ea9cb 100644
--- a/services/web/modules/launchpad/app/src/LaunchpadController.mjs
+++ b/services/web/modules/launchpad/app/src/LaunchpadController.mjs
@@ -154,7 +154,8 @@ function registerExternalAuthAdmin(authMethod) {
       await User.updateOne(
         { _id: user._id },
         {
-          $set: { isAdmin: true, emails: [{ email, reversedHostname }] },
+          $set: { isAdmin: true, emails: [{ email, reversedHostname, 'confirmedAt' : Date.now() }] },
+          $unset: { 'hashedPassword': "" }, // external-auth user must not have a hashedPassword
         }
       ).exec()
     } catch (err) {
diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug
index fdf0576c4a..80215cadf2 100644
--- a/services/web/modules/launchpad/app/views/launchpad.pug
+++ b/services/web/modules/launchpad/app/views/launchpad.pug
@@ -29,7 +29,7 @@ block vars
 
 block append meta
 	meta(name="ol-adminUserExists" data-type="boolean" content=adminUserExists)
-	meta(name="ol-ideJsPath" content=buildJsPath('ide.js'))
+	meta(name="ol-ideJsPath" content=buildJsPath('ide-detached.js'))
 
 block content
 	script(type="text/javascript", nonce=scriptNonce, src=(wsUrl || '/socket.io') + '/socket.io.js')
@@ -126,6 +126,45 @@ block content
 															span(data-ol-inflight="idle") #{translate("register")}
 															span(hidden data-ol-inflight="pending") #{translate("registering")}…
 
+												h3 #{translate('local_account')}
+												p
+													| #{translate('alternatively_create_local_admin_account')}
+
+												form(
+													data-ol-async-form
+													data-ol-register-admin
+													action="/launchpad/register_admin"
+													method="POST"
+												)
+													input(name='_csrf', type='hidden', value=csrfToken)
+													+formMessages()
+													.form-group
+														label(for='email') #{translate("email")}
+														input.form-control(
+															type='email',
+															name='email',
+															placeholder="email@example.com"
+															autocomplete="username"
+															required,
+															autofocus="true"
+														)
+													.form-group
+														label(for='password') #{translate("password")}
+														input.form-control#passwordField(
+															type='password',
+															name='password',
+															placeholder="********",
+															autocomplete="new-password"
+															required,
+														)
+													.actions
+														button.btn-primary.btn(
+															type='submit'
+															data-ol-disabled-inflight
+														)
+															span(data-ol-inflight="idle") #{translate("register")}
+															span(hidden data-ol-inflight="pending") #{translate("registering")}…
+
 											// Saml Form
 											if authMethod === 'saml'
 												h3 #{translate('saml')}
@@ -137,6 +176,35 @@ block content
 													data-ol-register-admin
 													action="/launchpad/register_saml_admin"
 													method="POST"
+												)
+													input(name='_csrf', type='hidden', value=csrfToken)
+													+formMessages()
+													.form-group
+														label(for='email') #{translate("email")}
+														input.form-control(
+															name='email',
+															placeholder="email@example.com"
+															autocomplete="username"
+															required,
+															autofocus="true"
+														)
+													.actions
+														button.btn-primary.btn(
+															type='submit'
+															data-ol-disabled-inflight
+														)
+															span(data-ol-inflight="idle") #{translate("register")}
+															span(hidden data-ol-inflight="pending") #{translate("registering")}…
+
+												h3 #{translate('local_account')}
+												p
+													| #{translate('alternatively_create_local_admin_account')}
+
+												form(
+													data-ol-async-form
+													data-ol-register-admin
+													action="/launchpad/register_admin"
+													method="POST"
 												)
 													input(name='_csrf', type='hidden', value=csrfToken)
 													+formMessages()
@@ -150,6 +218,15 @@ block content
 															required,
 															autofocus="true"
 														)
+													.form-group
+														label(for='password') #{translate("password")}
+														input.form-control#passwordField(
+															type='password',
+															name='password',
+															placeholder="********",
+															autocomplete="new-password"
+															required,
+														)
 													.actions
 														button.btn-primary.btn(
 															type='submit'
@@ -220,7 +297,7 @@ block content
 												p
 													a(href="/admin").btn.btn-info
 														| Go To Admin Panel
-													| &nbsp;
+												p
 													a(href="/project").btn.btn-primary
 														| Start Using #{settings.appName}
 												br
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs b/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
new file mode 100644
index 0000000000..64fa4f5a96
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
@@ -0,0 +1,64 @@
+import logger from '@overleaf/logger'
+import LoginRateLimiter from '../../../../app/src/Features/Security/LoginRateLimiter.js'
+import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
+import AuthenticationManagerLdap from './AuthenticationManagerLdap.mjs'
+
+const AuthenticationControllerLdap = {
+  async doPassportLdapLogin(req, ldapUser, done) {
+    let user, info
+    try {
+      ;({ user, info } = await AuthenticationControllerLdap._doPassportLdapLogin(
+        req,
+        ldapUser
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportLdapLogin(req, ldapUser) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'LDAP password login', fromKnownDevice },
+    }
+
+    let user, isPasswordReused
+    try {
+      user = await AuthenticationManagerLdap.promises.findOrCreateLdapUser(ldapUser, auditLog)
+    } catch (error) {
+      return {
+        user: false,
+        info: handleAuthenticateErrors(error, req),
+      }
+    }
+    if (user && AuthenticationController.captchaRequiredForLogin(req, user)) {
+      return {
+        user: false,
+        info: {
+          text: req.i18n.translate('cannot_verify_user_not_robot'),
+          type: 'error',
+          errorReason: 'cannot_verify_user_not_robot',
+          status: 400,
+        },
+      }
+    } else if (user) {
+      // async actions
+      return { user, info: undefined }
+    } else { //something wrong
+      logger.debug({ email : ldapUser.mail }, 'failed LDAP log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          status: 500,
+        },
+      }
+    }
+  },
+}
+
+export const {
+  doPassportLdapLogin,
+} = AuthenticationControllerLdap
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs b/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
new file mode 100644
index 0000000000..1371f76d52
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
@@ -0,0 +1,80 @@
+import Settings from '@overleaf/settings'
+import { callbackify } from '@overleaf/promise-utils'
+import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
+import { User } from '../../../../app/src/models/User.js'
+
+const AuthenticationManagerLdap = {
+  splitFullName(fullName) {
+    fullName = fullName.trim();
+    let lastSpaceIndex = fullName.lastIndexOf(' ');
+    let firstNames = fullName.substring(0, lastSpaceIndex).trim();
+    let lastName = fullName.substring(lastSpaceIndex + 1).trim();
+    return [firstNames, lastName];
+  },
+  async findOrCreateLdapUser(profile, auditLog) {
+    //user is already authenticated in Ldap
+    const {
+      attEmail,
+      attFirstName,
+      attLastName,
+      attName,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+    } = Settings.ldap
+
+    const email = Array.isArray(profile[attEmail])
+                    ? profile[attEmail][0].toLowerCase()
+                    : profile[attEmail].toLowerCase()
+    let nameParts = ["",""]
+    if ((!attFirstName || !attLastName) && attName) {
+      nameParts = this.splitFullName(profile[attName] || "")
+    }
+    const firstName = attFirstName ? (profile[attFirstName] || "") : nameParts[0]
+    let   lastName  = attLastName  ? (profile[attLastName]  || "") : nameParts[1]
+    if (!firstName && !lastName) lastName = email
+    let isAdmin = false
+    if( attAdmin && valAdmin ) {
+      isAdmin = (profile._groups?.length > 0) ||
+                (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
+                                                    profile[attAdmin] === valAdmin)
+    }
+    let user = await User.findOne({ 'email': email }).exec()
+    if( !user ) {
+      user = await UserCreator.promises.createNewUser(
+        {
+          email: email,
+          first_name: firstName,
+          last_name: lastName,
+          isAdmin: isAdmin,
+          holdingAccount: false,
+        }
+      )
+      await User.updateOne(
+        { _id: user._id },
+        { $set : { 'emails.0.confirmedAt' : Date.now() } }
+      ).exec() //email of ldap user is confirmed
+    }
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if( attAdmin && valAdmin ) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
+      {}
+    ).exec()
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+}
+
+export default {
+  findOrCreateLdapUser: callbackify(AuthenticationManagerLdap.findOrCreateLdapUser),
+  promises: AuthenticationManagerLdap,
+}
+export const {
+  splitFullName,
+} = AuthenticationManagerLdap
diff --git a/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs b/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
new file mode 100644
index 0000000000..e7f312fc11
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
@@ -0,0 +1,17 @@
+import Settings from '@overleaf/settings'
+
+function initLdapSettings() {
+  Settings.ldap = {
+    enable: true,
+    placeholder:  process.env.OVERLEAF_LDAP_PLACEHOLDER || 'Username',
+    attEmail:     process.env.OVERLEAF_LDAP_EMAIL_ATT || 'mail',
+    attFirstName: process.env.OVERLEAF_LDAP_FIRST_NAME_ATT,
+    attLastName:  process.env.OVERLEAF_LDAP_LAST_NAME_ATT,
+    attName:      process.env.OVERLEAF_LDAP_NAME_ATT,
+    attAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT,
+    valAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT_VALUE,
+    updateUserDetailsOnLogin: String(process.env.OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN ).toLowerCase() === 'true',
+  }
+}
+
+export default initLdapSettings
diff --git a/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs b/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
new file mode 100644
index 0000000000..c4093b8684
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
@@ -0,0 +1,136 @@
+import Settings from '@overleaf/settings'
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import ldapjs from 'ldapauth-fork/node_modules/ldapjs/lib/index.js'
+import UserGetter from '../../../../app/src/Features/User/UserGetter.js'
+import { splitFullName } from './AuthenticationManagerLdap.mjs'
+
+async function fetchLdapContacts(userId, contacts) {
+  if (!Settings.ldap?.enable || !process.env.OVERLEAF_LDAP_CONTACTS_FILTER) {
+    return []
+  }
+
+  const ldapOpts = passport._strategy('custom-fail-ldapauth').options.server
+  const { attEmail, attFirstName = "", attLastName = "", attName = "" } = Settings.ldap
+  const {
+    url,
+    timeout,
+    connectTimeout,
+    tlsOptions,
+    starttls,
+    bindDN,
+    bindCredentials,
+  } = ldapOpts
+  const searchBase = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_BASE || ldapOpts.searchBase
+  const searchScope = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_SCOPE || 'sub'
+  const ldapConfig = { url, timeout, connectTimeout, tlsOptions }
+
+  let ldapUsers
+  const client = ldapjs.createClient(ldapConfig)
+  try {
+    if (starttls) {
+      await _upgradeToTLS(client, tlsOptions)
+    }
+    await _bindLdap(client, bindDN, bindCredentials)
+
+    const filter = await _formContactsSearchFilter(client, ldapOpts, userId, process.env.OVERLEAF_LDAP_CONTACTS_FILTER)
+    const searchOptions = { scope: searchScope, attributes: [attEmail, attFirstName, attLastName, attName], filter }
+
+    ldapUsers = await _searchLdap(client, searchBase, searchOptions)
+  } catch (err) {
+    logger.warn({ err }, 'error in fetchLdapContacts')
+    return []
+  } finally {
+    client.unbind()
+  }
+
+  const newLdapContacts = ldapUsers.reduce((acc, ldapUser) => {
+    const email = Array.isArray(ldapUser[attEmail])
+                    ? ldapUser[attEmail][0]?.toLowerCase()
+                    : ldapUser[attEmail]?.toLowerCase()
+    if (!email) return acc
+    if (!contacts.some(contact => contact.email === email)) {
+      let nameParts = ["",""]
+      if ((!attFirstName || !attLastName) && attName) {
+        nameParts = splitFullName(ldapUser[attName] || "")
+      }
+      const firstName = attFirstName ? (ldapUser[attFirstName] || "") : nameParts[0]
+      const lastName  = attLastName  ? (ldapUser[attLastName]  || "") : nameParts[1]
+      acc.push({
+        first_name: firstName,
+        last_name: lastName,
+        email: email,
+        type: 'user',
+      })
+    }
+    return acc
+  }, [])
+
+  return newLdapContacts.sort((a, b) =>
+    a.last_name.localeCompare(b.last_name) ||
+    a.first_name.localeCompare(a.first_name) ||
+    a.email.localeCompare(b.email)
+  )
+}
+
+function _upgradeToTLS(client, tlsOptions) {
+  return new Promise((resolve, reject) => {
+    client.on('error', error => reject(new Error(`LDAP client error: ${error}`)))
+    client.on('connect', () => {
+      client.starttls(tlsOptions, null, error => {
+        if (error) {
+          reject(new Error(`StartTLS error: ${error}`))
+        } else {
+          resolve()
+        }
+      })
+    })
+  })
+}
+
+function _bindLdap(client, bindDN, bindCredentials) {
+  return new Promise((resolve, reject) => {
+    client.bind(bindDN, bindCredentials, error => {
+      if (error) {
+        reject(error)
+      } else {
+        resolve()
+      }
+    })
+  })
+}
+
+function _searchLdap(client, baseDN, options) {
+  return new Promise((resolve, reject) => {
+    const searchEntries = []
+    client.search(baseDN, options, (error, res) => {
+      if (error) {
+        reject(error)
+      } else {
+        res.on('searchEntry', entry => searchEntries.push(entry.object))
+        res.on('error', reject)
+        res.on('end', () => resolve(searchEntries))
+      }
+    })
+  })
+}
+
+async function _formContactsSearchFilter(client, ldapOpts, userId, contactsFilter) {
+  const searchProperty = process.env.OVERLEAF_LDAP_CONTACTS_PROPERTY
+  if (!searchProperty) {
+    return contactsFilter
+  }
+  const email = await UserGetter.promises.getUserEmail(userId)
+  const searchOptions = {
+    scope: ldapOpts.searchScope,
+    attributes: [searchProperty],
+    filter: `(${Settings.ldap.attEmail}=${email})`,
+  }
+  const searchBase = ldapOpts.searchBase
+  const ldapUser = (await _searchLdap(client, searchBase, searchOptions))[0]
+  const searchPropertyValue = ldapUser ? ldapUser[searchProperty]
+                                       : process.env.OVERLEAF_LDAP_CONTACTS_NON_LDAP_VALUE || 'IMATCHNOTHING'
+  return contactsFilter.replace(/{{userProperty}}/g, searchPropertyValue)
+}
+
+export default fetchLdapContacts
diff --git a/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs b/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
new file mode 100644
index 0000000000..b07dc3f3bd
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
@@ -0,0 +1,78 @@
+import fs from 'fs'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { doPassportLdapLogin } from './AuthenticationControllerLdap.mjs'
+import { Strategy as LdapStrategy } from 'passport-ldapauth'
+
+function _readFilesContentFromEnv(envVar) {
+// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
+  if (!envVar) return undefined
+  try {
+    const parsedFileNames = JSON.parse(envVar)
+    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
+  } catch (error) {
+    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
+      return fs.readFileSync(envVar, 'utf8')
+    } else {
+      throw error
+    }
+  }
+}
+
+//  custom responses on authentication failure
+class CustomFailLdapStrategy extends LdapStrategy {
+  constructor(options, validate) {
+    super(options, validate);
+    this.name = 'custom-fail-ldapauth'
+  }
+  authenticate(req, options) {
+    const defaultFail = this.fail.bind(this)
+    this.fail = function(info, status) {
+      info.type = 'error'
+      info.key = 'invalid-password-retry-or-reset'
+      info.status = 401
+      return defaultFail(info, status)
+    }.bind(this)
+    super.authenticate(req, options)
+  }
+}
+
+const ldapServerOpts = {
+  url: process.env.OVERLEAF_LDAP_URL,
+  bindDN: process.env.OVERLEAF_LDAP_BIND_DN || "",
+  bindCredentials: process.env.OVERLEAF_LDAP_BIND_CREDENTIALS || "",
+  bindProperty: process.env.OVERLEAF_LDAP_BIND_PROPERTY,
+  searchBase: process.env.OVERLEAF_LDAP_SEARCH_BASE,
+  searchFilter: process.env.OVERLEAF_LDAP_SEARCH_FILTER,
+  searchScope: process.env.OVERLEAF_LDAP_SEARCH_SCOPE || 'sub',
+  searchAttributes: JSON.parse(process.env.OVERLEAF_LDAP_SEARCH_ATTRIBUTES || '[]'),
+  groupSearchBase: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_BASE,
+  groupSearchFilter: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_FILTER,
+  groupSearchScope: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_SCOPE || 'sub',
+  groupSearchAttributes: ["dn"],
+  groupDnProperty: process.env.OVERLEAF_LDAP_ADMIN_DN_PROPERTY,
+  cache: String(process.env.OVERLEAF_LDAP_CACHE).toLowerCase() === 'true',
+  timeout: process.env.OVERLEAF_LDAP_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_TIMEOUT) : undefined,
+  connectTimeout: process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT) : undefined,
+  starttls: String(process.env.OVERLEAF_LDAP_STARTTLS).toLowerCase() === 'true',
+  tlsOptions: {
+    ca: _readFilesContentFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_CA_PATH),
+    rejectUnauthorized: String(process.env.OVERLEAF_LDAP_TLS_OPTS_REJECT_UNAUTH).toLowerCase() === 'true',
+  }
+}
+
+function addLdapStrategy(passport) {
+  passport.use(
+    new CustomFailLdapStrategy(
+      {
+        server: ldapServerOpts,
+        passReqToCallback: true,
+        usernameField: 'email',
+        passwordField: 'password',
+      },
+      doPassportLdapLogin
+    )
+  )
+}
+
+export default addLdapStrategy
diff --git a/services/web/modules/ldap-authentication/index.mjs b/services/web/modules/ldap-authentication/index.mjs
new file mode 100644
index 0000000000..f56d7ffee0
--- /dev/null
+++ b/services/web/modules/ldap-authentication/index.mjs
@@ -0,0 +1,30 @@
+import initLdapSettings from './app/src/InitLdapSettings.mjs'
+import addLdapStrategy from './app/src/LdapStrategy.mjs'
+import fetchLdapContacts from './app/src/LdapContacts.mjs'
+
+let ldapModule = {};
+if (process.env.EXTERNAL_AUTH === 'ldap') {
+  initLdapSettings()
+  ldapModule = {
+    name: 'ldap-authentication',
+    hooks: {
+      passportSetup: function (passport, callback) {
+        try {
+          addLdapStrategy(passport)
+          callback(null)
+        } catch (error) {
+          callback(error)
+        }
+      },
+      getContacts: async function (userId, contacts, callback) {
+        try {
+          const newLdapContacts = await fetchLdapContacts(userId, contacts)
+          callback(null, newLdapContacts)
+        } catch (error) {
+          callback(error)
+        }
+      },
+    }
+  }
+}
+export default ldapModule
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs b/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
new file mode 100644
index 0000000000..f5db3f738d
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
@@ -0,0 +1,160 @@
+import Settings from '@overleaf/settings'
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
+import AuthenticationManagerSaml from './AuthenticationManagerSaml.mjs'
+import UserController from '../../../../app/src/Features/User/UserController.js'
+import UserSessionsManager from '../../../../app/src/Features/User/UserSessionsManager.js'
+import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { xmlResponse } from '../../../../app/src/infrastructure/Response.js'
+
+const AuthenticationControllerSaml = {
+  passportSamlAuthWithIdP(req, res, next) {
+    if ( passport._strategy('saml')._saml.options.authnRequestBinding === 'HTTP-POST') {
+      const csp = res.getHeader('Content-Security-Policy')
+      if (csp) {
+        res.setHeader(
+          'Content-Security-Policy',
+          csp.replace(/(?:^|\s)(default-src|form-action)[^;]*;?/g, '')
+        )
+      }
+    }
+    passport.authenticate('saml')(req, res, next)
+  },
+  passportSamlLogin(req, res, next) {
+    // This function is middleware which wraps the passport.authenticate middleware,
+    // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
+    // and send a `{redir: ""}` response on success
+    passport.authenticate(
+      'saml',
+      { keepSessionInfo: true },
+      async function (err, user, info) {
+        if (err) {
+          return next(err)
+        }
+        if (user) {
+          // `user` is either a user object or false
+          AuthenticationController.setAuditInfo(req, {
+            method: 'SAML login',
+          })
+          try {
+            await AuthenticationController.promises.finishLogin(user, req, res)
+          } catch (err) {
+            return next(err)
+          }
+        } else {
+          if (info.redir != null) {
+            return res.json({ redir: info.redir })
+          } else {
+            res.status(info.status || 200)
+            delete info.status
+            const body = { message: info }
+            const { errorReason } = info
+            if (errorReason) {
+              body.errorReason = errorReason
+              delete info.errorReason
+            }
+            return res.json(body)
+          }
+        }
+      }
+    )(req, res, next)
+  },
+  async doPassportSamlLogin(req, profile, done) {
+    let user, info
+    try {
+      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogin(
+        req,
+        profile
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportSamlLogin(req, profile) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'SAML login', fromKnownDevice },
+    }
+
+    let user
+    try {
+      user = await AuthenticationManagerSaml.promises.findOrCreateSamlUser(profile, auditLog)
+    } catch (error) {
+      return {
+        user: false,
+        info: handleAuthenticateErrors(error, req),
+      }
+    }
+    if (user) {
+      req.session.saml_extce = {nameID : profile.nameID, sessionIndex : profile.sessionIndex}
+      return { user, info: undefined }
+    } else { //something wrong
+      logger.debug({ email : profile.mail }, 'failed SAML log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Unknown error',
+          status: 500,
+        },
+      }
+    }
+  },
+  async passportSamlSPLogout(req, res, next) {
+    passport._strategy('saml').logout(req, async (err, url) => {
+      if (err) logger.error({ err }, 'can not generate logout url')
+      await UserController.promises.doLogout(req)
+      res.redirect(url)
+    })
+  },
+  passportSamlIdPLogout(req, res, next) {
+    passport.authenticate('saml')(req, res, (err) => {
+      if (err) return next(err)
+      res.redirect('/login');
+    })
+  },
+  async doPassportSamlLogout(req, profile, done) {
+    let user, info
+    try {
+      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogout(
+        req,
+        profile
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportSamlLogout(req, profile) {
+    if (req?.session?.saml_extce?.nameID === profile.nameID &&
+        req?.session?.saml_extce?.sessionIndex === profile.sessionIndex) {
+      profile = req.user
+    }
+    await UserSessionsManager.promises.untrackSession(req.user, req.sessionID).catch(err => {
+      logger.warn({ err, userId: req.user._id }, 'failed to untrack session')
+    })
+    return { user: profile, info: undefined }
+  },
+  passportSamlMetadata(req, res) {
+    const samlStratery = passport._strategy('saml')
+    res.setHeader('Content-Disposition', `attachment; filename="${samlStratery._saml.options.issuer}-meta.xml"`)
+    xmlResponse(res,
+      samlStratery.generateServiceProviderMetadata(
+        samlStratery._saml.options.decryptionCert,
+        samlStratery._saml.options.signingCert
+      )
+    )
+  },
+}
+export const {
+  passportSamlAuthWithIdP,
+  passportSamlLogin,
+  passportSamlSPLogout,
+  passportSamlIdPLogout,
+  doPassportSamlLogin,
+  doPassportSamlLogout,
+  passportSamlMetadata,
+} = AuthenticationControllerSaml
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs b/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
new file mode 100644
index 0000000000..47d97f3019
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
@@ -0,0 +1,60 @@
+import Settings from '@overleaf/settings'
+import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
+import { User } from '../../../../app/src/models/User.js'
+
+const AuthenticationManagerSaml = {
+  async findOrCreateSamlUser(profile, auditLog) {
+    const {
+      attEmail,
+      attFirstName,
+      attLastName,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+    } = Settings.saml
+    const email = Array.isArray(profile[attEmail])
+                    ? profile[attEmail][0].toLowerCase()
+                    : profile[attEmail].toLowerCase()
+    const firstName = attFirstName ? profile[attFirstName] : ""
+    const lastName  = attLastName  ? profile[attLastName] : email
+    let isAdmin = false
+    if( attAdmin && valAdmin ) {
+      isAdmin = (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
+                                                    profile[attAdmin] === valAdmin)
+    }
+    let user = await User.findOne({ 'email': email }).exec()
+    if( !user ) {
+      user = await UserCreator.promises.createNewUser(
+        {
+          email: email,
+          first_name: firstName,
+          last_name: lastName,
+          isAdmin: isAdmin,
+          holdingAccount: false,
+        }
+      )
+      await User.updateOne(
+        { _id: user._id },
+        { $set : { 'emails.0.confirmedAt' : Date.now() } }
+      ).exec() //email of saml user is confirmed
+    }
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if( attAdmin && valAdmin ) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
+      {}
+    ).exec()
+
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+}
+
+export default {
+  promises: AuthenticationManagerSaml,
+}
diff --git a/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs b/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
new file mode 100644
index 0000000000..441f9033af
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
@@ -0,0 +1,16 @@
+import Settings from '@overleaf/settings'
+
+function initSamlSettings() {
+  Settings.saml = {
+    enable: true,
+    identityServiceName: process.env.OVERLEAF_SAML_IDENTITY_SERVICE_NAME || 'Login with SAML IdP',
+    attEmail:     process.env.OVERLEAF_SAML_EMAIL_FIELD || 'nameID',
+    attFirstName: process.env.OVERLEAF_SAML_FIRST_NAME_FIELD || 'givenName',
+    attLastName:  process.env.OVERLEAF_SAML_LAST_NAME_FIELD || 'lastName',
+    attAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD,
+    valAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD_VALUE,
+    updateUserDetailsOnLogin: String(process.env.OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN).toLowerCase() === 'true',
+  }
+}
+
+export default initSamlSettings
diff --git a/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
new file mode 100644
index 0000000000..65b42c92ae
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
@@ -0,0 +1,12 @@
+import logger from '@overleaf/logger'
+import { passportSamlLogin, passportSamlIdPLogout } from './AuthenticationControllerSaml.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML NonCsrfRouter')
+    webRouter.get('/saml/login/callback', passportSamlLogin)
+    webRouter.post('/saml/login/callback', passportSamlLogin)
+    webRouter.get('/saml/logout/callback', passportSamlIdPLogout)
+    webRouter.post('/saml/logout/callback', passportSamlIdPLogout)
+  },
+}
diff --git a/services/web/modules/saml-authentication/app/src/SamlRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
new file mode 100644
index 0000000000..9ee3677901
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
@@ -0,0 +1,14 @@
+import logger from '@overleaf/logger'
+import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
+import { passportSamlAuthWithIdP, passportSamlSPLogout, passportSamlMetadata} from './AuthenticationControllerSaml.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML router')
+    webRouter.get('/saml/login', passportSamlAuthWithIdP)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/login')
+    webRouter.post('/saml/logout', AuthenticationController.requireLogin(), passportSamlSPLogout)
+    webRouter.get('/saml/meta', passportSamlMetadata)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/meta')
+  },
+}
diff --git a/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs b/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
new file mode 100644
index 0000000000..3a16459f98
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
@@ -0,0 +1,62 @@
+import fs from 'fs'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { doPassportSamlLogin, doPassportSamlLogout } from './AuthenticationControllerSaml.mjs'
+import { Strategy as SamlStrategy } from '@node-saml/passport-saml'
+
+function _readFilesContentFromEnv(envVar) {
+// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
+  if (!envVar) return undefined
+  try {
+    const parsedFileNames = JSON.parse(envVar)
+    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
+  } catch (error) {
+    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
+      return fs.readFileSync(envVar, 'utf8')
+    } else {
+      throw error
+    }
+  }
+}
+
+const samlOptions = {
+  entryPoint: process.env.OVERLEAF_SAML_ENTRYPOINT,
+  callbackUrl: process.env.OVERLEAF_SAML_CALLBACK_URL,
+  issuer: process.env.OVERLEAF_SAML_ISSUER,
+  audience: process.env.OVERLEAF_SAML_AUDIENCE,
+  cert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_IDP_CERT),
+  signingCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PUBLIC_CERT),
+  privateKey:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PRIVATE_KEY),
+  decryptionCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_CERT),
+  decryptionPvk:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_PVK),
+  signatureAlgorithm: process.env.OVERLEAF_SAML_SIGNATURE_ALGORITHM,
+  additionalParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_PARAMS || '{}'),
+  additionalAuthorizeParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_AUTHORIZE_PARAMS || '{}'),
+  identifierFormat: process.env.OVERLEAF_SAML_IDENTIFIER_FORMAT,
+  acceptedClockSkewMs: process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS ? Number(process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS) : undefined,
+  attributeConsumingServiceIndex: process.env.OVERLEAF_SAML_ATTRIBUTE_CONSUMING_SERVICE_INDEX,
+  authnContext: process.env.OVERLEAF_SAML_AUTHN_CONTEXT ? JSON.parse(process.env.OVERLEAF_SAML_AUTHN_CONTEXT) : undefined,
+  forceAuthn: String(process.env.OVERLEAF_SAML_FORCE_AUTHN).toLowerCase() === 'true',
+  disableRequestedAuthnContext: String(process.env.OVERLEAF_SAML_DISABLE_REQUESTED_AUTHN_CONTEXT).toLowerCase() === 'true',
+  skipRequestCompression: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING === 'HTTP-POST',  // compression should be skipped iff authnRequestBinding is POST
+  authnRequestBinding: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING,
+  validateInResponseTo: process.env.OVERLEAF_SAML_VALIDATE_IN_RESPONSE_TO,
+  requestIdExpirationPeriodMs: process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS ? Number(process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS) : undefined,
+//  cacheProvider: process.env.OVERLEAF_SAML_CACHE_PROVIDER,
+  logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
+  logoutCallbackUrl: process.env.OVERLEAF_SAML_LOGOUT_CALLBACK_URL,
+  additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
+  passReqToCallback: true,
+}
+
+function addSamlStrategy(passport) {
+  passport.use(
+    new SamlStrategy(
+      samlOptions,
+      doPassportSamlLogin,
+      doPassportSamlLogout
+    )
+  )
+}
+
+export default addSamlStrategy
diff --git a/services/web/modules/saml-authentication/index.mjs b/services/web/modules/saml-authentication/index.mjs
new file mode 100644
index 0000000000..35ea70283f
--- /dev/null
+++ b/services/web/modules/saml-authentication/index.mjs
@@ -0,0 +1,26 @@
+import initSamlSettings from './app/src/InitSamlSettings.mjs'
+import addSamlStrategy from './app/src/SamlStrategy.mjs'
+import SamlRouter from './app/src/SamlRouter.mjs'
+import SamlNonCsrfRouter from './app/src/SamlNonCsrfRouter.mjs'
+
+let samlModule = {};
+
+if (process.env.EXTERNAL_AUTH === 'saml') {
+  initSamlSettings()
+  samlModule = {
+    name: 'saml-authentication',
+    hooks: {
+      passportSetup: function (passport, callback) {
+        try {
+          addSamlStrategy(passport)
+          callback(null)
+        } catch (error) {
+          callback(error)
+        }
+      },
+    },
+    router: SamlRouter,
+    nonCsrfRouter: SamlNonCsrfRouter,
+  }
+}
+export default samlModule

From 4003e6e7d33df89af5ef5b2c70770b978a4af7cc Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Tue, 17 Dec 2024 18:36:18 +0100
Subject: [PATCH 002/274] Refactor authentication code; add OIDC support

---
 .../AuthenticationController.js               |   6 +-
 .../PasswordReset/PasswordResetController.mjs |   4 -
 .../PasswordReset/PasswordResetHandler.mjs    |   5 +-
 .../app/src/Features/User/UserController.js   |   3 +-
 .../src/Features/User/UserPagesController.mjs |   6 +-
 .../app/src/infrastructure/ExpressLocals.js   |   4 +-
 services/web/app/src/router.mjs               |   4 +-
 services/web/app/views/user/login.pug         |   9 +
 services/web/app/views/user/passwordReset.pug |   2 +-
 services/web/app/views/user/settings.pug      |   4 +-
 services/web/config/settings.defaults.js      |  19 +-
 .../web/frontend/extracted-translations.json  |   1 +
 .../settings/components/linking-section.tsx   |   3 +-
 .../components/linking/sso-widget.tsx         |   4 +-
 .../settings/components/password-section.tsx  |   6 +-
 .../frontend/js/shared/svgs/openid-logo.jsx   |  27 +++
 services/web/locales/en.json                  |   2 +
 .../app/src/LDAPAuthenticationController.mjs  | 112 ++++++++++++
 .../app/src/LDAPAuthenticationManager.mjs}    |  36 ++--
 .../ldap/app/src/LDAPContacts.mjs             | 120 ++++++++++++
 .../ldap/app/src/LDAPModuleManager.mjs        | 112 ++++++++++++
 .../ldap/app/src/LDAPRouter.mjs               |  19 ++
 .../web/modules/authentication/ldap/index.mjs |  17 ++
 .../web/modules/authentication/logout.mjs     |  18 ++
 .../app/src/OIDCAuthenticationController.mjs  | 171 ++++++++++++++++++
 .../app/src/OIDCAuthenticationManager.mjs     |  94 ++++++++++
 .../oidc/app/src/OIDCModuleManager.mjs        |  82 +++++++++
 .../oidc/app/src/OIDCRouter.mjs               |  15 ++
 .../web/modules/authentication/oidc/index.mjs |  16 ++
 .../app/src/SAMLAuthenticationController.mjs} |  66 +++----
 .../app/src/SAMLAuthenticationManager.mjs     |  85 +++++++++
 .../saml/app/src/SAMLModuleManager.mjs        | 100 ++++++++++
 .../saml/app/src/SAMLNonCsrfRouter.mjs        |  11 ++
 .../saml/app/src/SAMLRouter.mjs               |  16 ++
 .../web/modules/authentication/saml/index.mjs |  18 ++
 services/web/modules/authentication/utils.mjs |  42 +++++
 .../modules/launchpad/app/views/launchpad.pug |   2 +-
 .../app/src/AuthenticationControllerLdap.mjs  |  64 -------
 .../app/src/InitLdapSettings.mjs              |  17 --
 .../app/src/LdapContacts.mjs                  | 136 --------------
 .../app/src/LdapStrategy.mjs                  |  78 --------
 .../web/modules/ldap-authentication/index.mjs |  30 ---
 .../app/src/AuthenticationManagerSaml.mjs     |  60 ------
 .../app/src/InitSamlSettings.mjs              |  16 --
 .../app/src/SamlNonCsrfRouter.mjs             |  12 --
 .../app/src/SamlRouter.mjs                    |  14 --
 .../app/src/SamlStrategy.mjs                  |  62 -------
 .../web/modules/saml-authentication/index.mjs |  26 ---
 services/web/package.json                     |   1 +
 49 files changed, 1170 insertions(+), 607 deletions(-)
 create mode 100644 services/web/frontend/js/shared/svgs/openid-logo.jsx
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs
 rename services/web/modules/{ldap-authentication/app/src/AuthenticationManagerLdap.mjs => authentication/ldap/app/src/LDAPAuthenticationManager.mjs} (67%)
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
 create mode 100644 services/web/modules/authentication/ldap/index.mjs
 create mode 100644 services/web/modules/authentication/logout.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
 create mode 100644 services/web/modules/authentication/oidc/index.mjs
 rename services/web/modules/{saml-authentication/app/src/AuthenticationControllerSaml.mjs => authentication/saml/app/src/SAMLAuthenticationController.mjs} (65%)
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLRouter.mjs
 create mode 100644 services/web/modules/authentication/saml/index.mjs
 create mode 100644 services/web/modules/authentication/utils.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
 delete mode 100644 services/web/modules/ldap-authentication/index.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/SamlRouter.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
 delete mode 100644 services/web/modules/saml-authentication/index.mjs

diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js
index 983526006e..baba8aacee 100644
--- a/services/web/app/src/Features/Authentication/AuthenticationController.js
+++ b/services/web/app/src/Features/Authentication/AuthenticationController.js
@@ -82,6 +82,7 @@ const AuthenticationController = {
       analyticsId: user.analyticsId || user._id,
       alphaProgram: user.alphaProgram || undefined, // only store if set
       betaProgram: user.betaProgram || undefined, // only store if set
+      externalAuth: user.externalAuth || false,
     }
     if (user.isAdmin) {
       lightUser.isAdmin = true
@@ -102,9 +103,9 @@ const AuthenticationController = {
     // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
     // and send a `{redir: ""}` response on success
     passport.authenticate(
-      Settings.ldap?.enable ? ['custom-fail-ldapauth','local'] : ['local'],
+      'local',
       { keepSessionInfo: true },
-      async function (err, user, infoArray) {
+      async function (err, user, info) {
         if (err) {
           return next(err)
         }
@@ -126,7 +127,6 @@ const AuthenticationController = {
             return next(err)
           }
         } else {
-	  let info = infoArray[0]
           if (info.redir != null) {
             return res.json({ redir: info.redir })
           } else {
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
index 85ed99fcb8..771782c302 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
@@ -141,10 +141,6 @@ async function requestReset(req, res, next) {
     return res.status(404).json({
       message: req.i18n.translate('secondary_email_password_reset'),
     })
-  } else if (status === 'external') {
-    return res.status(403).json({
-      message: req.i18n.translate('password_managed_externally'),
-    })
   } else {
     return res.status(404).json({
       message: req.i18n.translate('cant_find_email'),
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
index 0ac203222c..2c1aefe6a6 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
@@ -18,10 +18,6 @@ async function generateAndEmailResetToken(email) {
     return null
   }
 
-  if (!user.hashedPassword) {
-    return 'external'
-  }
-
   if (user.email !== email) {
     return 'secondary'
   }
@@ -76,6 +72,7 @@ async function getUserForPasswordResetToken(token) {
     'overleaf.id': 1,
     email: 1,
     must_reconfirm: 1,
+    hashedPassword: 1,
   })
 
   await assertUserPermissions(user, ['change-password'])
diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index 772e77e3e4..b767dcd4a1 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -404,7 +404,7 @@ async function updateUserSettings(req, res, next) {
   if (
     newEmail == null ||
     newEmail === user.email ||
-    (req.externalAuthenticationSystemUsed() && !user.hashedPassword)
+    req.externalAuthenticationSystemUsed()
   ) {
     // end here, don't update email
     SessionManager.setInSessionUser(req.session, {
@@ -481,7 +481,6 @@ async function doLogout(req) {
 }
 
 async function logout(req, res, next) {
-  if (req?.session.saml_extce) return res.redirect(308, '/saml/logout')
   const requestedRedirect = req.body.redirect
     ? UrlHelper.getSafeRedirectPath(req.body.redirect)
     : undefined
diff --git a/services/web/app/src/Features/User/UserPagesController.mjs b/services/web/app/src/Features/User/UserPagesController.mjs
index d353ca88e3..2f5d46d0d3 100644
--- a/services/web/app/src/Features/User/UserPagesController.mjs
+++ b/services/web/app/src/Features/User/UserPagesController.mjs
@@ -53,10 +53,8 @@ async function settingsPage(req, res) {
   const reconfirmedViaSAML = _.get(req.session, ['saml', 'reconfirmed'])
   delete req.session.saml
   let shouldAllowEditingDetails = true
-  if (Settings.ldap && Settings.ldap.updateUserDetailsOnLogin) {
-    shouldAllowEditingDetails = false
-  }
-  if (Settings.saml && Settings.saml.updateUserDetailsOnLogin) {
+  const externalAuth = req.user.externalAuth
+  if (externalAuth && Settings[externalAuth].updateUserDetailsOnLogin) {
     shouldAllowEditingDetails = false
   }
   const oauthProviders = Settings.oauthProviders || {}
diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index 34eda0ba2d..836670233c 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -107,9 +107,9 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
 
   webRouter.use(function (req, res, next) {
     req.externalAuthenticationSystemUsed =
-      Features.externalAuthenticationSystemUsed
+      () => !!req?.user?.externalAuth
     res.locals.externalAuthenticationSystemUsed =
-      Features.externalAuthenticationSystemUsed
+      () => !!req?.user?.externalAuth
     req.hasFeature = res.locals.hasFeature = Features.hasFeature
     next()
   })
diff --git a/services/web/app/src/router.mjs b/services/web/app/src/router.mjs
index 7851a4a66f..484c4e7960 100644
--- a/services/web/app/src/router.mjs
+++ b/services/web/app/src/router.mjs
@@ -217,6 +217,8 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
     CaptchaMiddleware.canSkipCaptcha
   )
 
+  await Modules.applyRouter(webRouter, privateApiRouter, publicApiRouter)
+
   webRouter.get('/login', UserPagesController.loginPage)
   AuthenticationController.addEndpointToLoginWhitelist('/login')
 
@@ -285,8 +287,6 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
   TokenAccessRouter.apply(webRouter)
   HistoryRouter.apply(webRouter, privateApiRouter)
 
-  await Modules.applyRouter(webRouter, privateApiRouter, publicApiRouter)
-
   if (Settings.enableSubscriptions) {
     webRouter.get(
       '/user/bonus',
diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index fc4973efb4..1ed2fc4950 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -56,3 +56,12 @@ block content
 										)
 											span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
 											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
+							if settings.oidc && settings.oidc.enable
+								form(data-ol-async-form, name="oidcLoginForm")
+									.actions(style='margin-top: 30px;')
+										a.btn.btn-secondary.btn-block(
+											href='/oidc/login',
+											data-ol-disabled-inflight
+										)
+											span(data-ol-inflight="idle") #{settings.oidc.identityServiceName}
+											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug
index ed806c32cd..4eb1adbca5 100644
--- a/services/web/app/views/user/passwordReset.pug
+++ b/services/web/app/views/user/passwordReset.pug
@@ -53,7 +53,7 @@ block content
 								.notification-content-and-cta
 									.notification-content
 										p
-											| !{translate("you_cant_reset_password_due_to_sso", {}, [{name: 'a', attrs: {href: '/sso-login'}}])}
+											| !{translate("you_cant_reset_password_due_to_ldap_or_sso")}
 
 						input(type="hidden", name="_csrf", value=csrfToken)
 						.form-group.mb-3
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index 0a4573d812..4ac35bef71 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -8,7 +8,7 @@ block vars
 
 block append meta
 	meta(name="ol-hasPassword" data-type="boolean" content=hasPassword)
-	meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails || hasPassword)
+	meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails)
 	meta(name="ol-oauthProviders", data-type="json", content=oauthProviders)
 	meta(name="ol-institutionLinked", data-type="json", content=institutionLinked)
 	meta(name="ol-samlError", data-type="json", content=samlError)
@@ -20,7 +20,7 @@ block append meta
 	meta(name="ol-ssoErrorMessage", content=ssoErrorMessage)
 	meta(name="ol-thirdPartyIds", data-type="json", content=thirdPartyIds || {})
 	meta(name="ol-passwordStrengthOptions", data-type="json", content=settings.passwordStrengthOptions || {})
-	meta(name="ol-isExternalAuthenticationSystemUsed" data-type="boolean" content=externalAuthenticationSystemUsed() && !hasPassword)
+	meta(name="ol-isExternalAuthenticationSystemUsed" data-type="boolean" content=externalAuthenticationSystemUsed())
 	meta(name="ol-user" data-type="json" content=user)
 	meta(name="ol-labsExperiments" data-type="json" content=labsExperiments)
 	meta(name="ol-dropbox" data-type="json" content=dropbox)
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index f25f8760b1..3b2e17593a 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -1010,8 +1010,9 @@ module.exports = {
     'launchpad',
     'server-ce-scripts',
     'user-activate',
-    'ldap-authentication',
-    'saml-authentication',
+    'authentication/ldap',
+    'authentication/saml',
+    'authentication/oidc',
   ],
   viewIncludes: {},
 
@@ -1038,6 +1039,20 @@ module.exports = {
   managedUsers: {
     enabled: false,
   },
+
+  oauthProviders: {
+    ...(process.env.EXTERNAL_AUTH && process.env.EXTERNAL_AUTH.includes('oidc') && {
+      [process.env.OVERLEAF_OIDC_PROVIDER_ID || 'oidc']: {
+        name: process.env.OVERLEAF_OIDC_PROVIDER_NAME || 'OIDC Provider',
+        descriptionKey: process.env.OVERLEAF_OIDC_PROVIDER_DESCRIPTION,
+        descriptionOptions: { link: process.env.OVERLEAF_OIDC_PROVIDER_INFO_LINK },
+        hideWhenNotLinked: process.env.OVERLEAF_OIDC_PROVIDER_HIDE_NOT_LINKED ?
+          process.env.OVERLEAF_OIDC_PROVIDER_HIDE_NOT_LINKED.toLowerCase() === 'true' : undefined,
+        linkPath: '/oidc/login',
+      },
+    }),
+  },
+
 }
 
 module.exports.mergeWith = function (overrides) {
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 156ec9df3f..e01bb9aa94 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -2137,6 +2137,7 @@
   "you_can_select_or_invite_collaborator": "",
   "you_can_select_or_invite_collaborator_plural": "",
   "you_can_still_use_your_premium_features": "",
+  "you_cant_add_or_change_password_due_to_ldap_or_sso": "",
   "you_cant_add_or_change_password_due_to_sso": "",
   "you_cant_join_this_group_subscription": "",
   "you_dont_have_any_add_ons_on_your_account": "",
diff --git a/services/web/frontend/js/features/settings/components/linking-section.tsx b/services/web/frontend/js/features/settings/components/linking-section.tsx
index a198cb1328..411d38e650 100644
--- a/services/web/frontend/js/features/settings/components/linking-section.tsx
+++ b/services/web/frontend/js/features/settings/components/linking-section.tsx
@@ -204,7 +204,8 @@ function SSOLinkingWidgetContainer({
   const { t } = useTranslation()
   const { unlink } = useSSOContext()
 
-  let description = ''
+  let description = subscription.provider.descriptionKey ||
+    `${t('login_with_service', { service: subscription.provider.name, })}.`
   switch (subscription.providerId) {
     case 'collabratec':
       description = t('linked_collabratec_description')
diff --git a/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx b/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx
index 800a7540ae..bb767d984c 100644
--- a/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx
+++ b/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx
@@ -4,6 +4,7 @@ import { FetchError } from '../../../../infrastructure/fetch-json'
 import IEEELogo from '../../../../shared/svgs/ieee-logo'
 import GoogleLogo from '../../../../shared/svgs/google-logo'
 import OrcidLogo from '../../../../shared/svgs/orcid-logo'
+import OpenIDLogo from '../../../../shared/svgs/openid-logo'
 import LinkingStatus from './status'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLModal, {
@@ -17,6 +18,7 @@ const providerLogos: { readonly [p: string]: JSX.Element } = {
   collabratec: <IEEELogo />,
   google: <GoogleLogo />,
   orcid: <OrcidLogo />,
+  oidc: <OpenIDLogo />,
 }
 
 type SSOLinkingWidgetProps = {
@@ -66,7 +68,7 @@ export function SSOLinkingWidget({
 
   return (
     <div className="settings-widget-container">
-      <div>{providerLogos[providerId]}</div>
+      <div>{providerLogos[providerId] || providerLogos['oidc']}</div>
       <div className="description-container">
         <div className="title-row">
           <h4 id={providerId}>{title}</h4>
diff --git a/services/web/frontend/js/features/settings/components/password-section.tsx b/services/web/frontend/js/features/settings/components/password-section.tsx
index 739636e998..c09ad50562 100644
--- a/services/web/frontend/js/features/settings/components/password-section.tsx
+++ b/services/web/frontend/js/features/settings/components/password-section.tsx
@@ -39,11 +39,7 @@ function CanOnlyLogInThroughSSO() {
   return (
     <p>
       <Trans
-        i18nKey="you_cant_add_or_change_password_due_to_sso"
-        components={[
-          // eslint-disable-next-line react/jsx-key, jsx-a11y/anchor-has-content
-          <a href="/learn/how-to/Logging_in_with_Group_single_sign-on" />,
-        ]}
+        i18nKey="you_cant_add_or_change_password_due_to_ldap_or_sso"
       />
     </p>
   )
diff --git a/services/web/frontend/js/shared/svgs/openid-logo.jsx b/services/web/frontend/js/shared/svgs/openid-logo.jsx
new file mode 100644
index 0000000000..3de933820b
--- /dev/null
+++ b/services/web/frontend/js/shared/svgs/openid-logo.jsx
@@ -0,0 +1,27 @@
+function OpenIDLogo() {
+  return (
+    <svg
+      width="40"
+      height="40"
+      viewBox="0 0 40 40"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect width="40" height="40" fill="white" />
+      <path
+        d="M18.185415 36.042565 23.298193 32.35627 23.060446 3.090316 18.185415 6.8918455Z"
+        fill="#ff8e00"
+      />
+      <path
+        d="M18.246064 36.042565C-0.37463741 32.997945 -1.0248032 15.054095 18.13083 11.143396l0.05944 3.322396 c -13.3672163 2.225847 -11.6629563 14.187201 0 15.92785l0.05944 3.127104Z"
+        fill="#626262"
+      />
+      <path
+        d="M23.219348 14.720521c2.279219 0.01577 4.262468 1.057732 6.237225 2.117891l-2.917255 2.176115h9.317022l0.05701 -6.371868 -2.917255 2.176115C30.03396 13.32315 27.308358 11.530342 23.169615 11.496378Z"
+        fill="#626262"
+      />
+    </svg>
+  )
+}
+
+export default OpenIDLogo
+
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index e8aafc842d..f1ff9799ff 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -2700,8 +2700,10 @@
   "you_can_select_or_invite_collaborator": "You can select or invite __count__ collaborator on your current plan. Upgrade to add more editors or reviewers.",
   "you_can_select_or_invite_collaborator_plural": "You can select or invite __count__ collaborators on your current plan. Upgrade to add more editors or reviewers.",
   "you_can_still_use_your_premium_features": "You can still use your premium features until the pause becomes active.",
+  "you_cant_add_or_change_password_due_to_ldap_or_sso": "You can’t add or change your password because your group or organization uses LDAP or SSO.",
   "you_cant_add_or_change_password_due_to_sso": "You can’t add or change your password because your group or organization uses <0>single sign-on (SSO)</0>.",
   "you_cant_join_this_group_subscription": "You can’t join this group subscription",
+  "you_cant_reset_password_due_to_ldap_or_sso": "You can’t reset your password because your group or organization uses LDAP or SSO. Contact your system administrator.",
   "you_cant_reset_password_due_to_sso": "You can’t reset your password because your group or organization uses SSO. <0>Log in with SSO</0>.",
   "you_dont_have_any_add_ons_on_your_account": "You don’t have any add-ons on your account.",
   "you_dont_have_any_repositories": "You don’t have any repositories",
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs
new file mode 100644
index 0000000000..1a3ed01d3c
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs
@@ -0,0 +1,112 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import EmailHelper from '../../../../../app/src/Features/Helpers/EmailHelper.js'
+import { handleAuthenticateErrors } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import LDAPAuthenticationManager from './LDAPAuthenticationManager.mjs'
+
+const LDAPAuthenticationController = {
+  passportLogin(req, res, next) {
+    // This function is middleware which wraps the passport.authenticate middleware,
+    // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
+    // and send a `{redir: ""}` response on success
+    passport.authenticate(
+      'ldapauth',
+      { keepSessionInfo: true },
+      async function (err, user, info, status) {
+        if (err) { //we cannot be here as long as errors are treated as fails
+          return next(err)
+        }
+        if (user) {
+          // `user` is either a user object or false
+          AuthenticationController.setAuditInfo(req, {
+            method: 'LDAP password login',
+          })
+
+          try {
+            await AuthenticationController.promises.finishLogin(user, req, res)
+	    res.status(200)
+	    return
+          } catch (err) {
+            return next(err)
+          }
+        } else {
+          if (status != 401) {
+            logger.warn(status, 'LDAP: ' + info.message)
+          }
+          if (EmailHelper.parseEmail(req.body.email)) return next() //Try local authentication
+          if (info.redir != null) {
+            return res.json({ redir: info.redir })
+          } else {
+            res.status(status || info.status || 401)
+            delete info.status
+            info.type = 'error'
+            info.key = 'invalid-password-retry-or-reset'
+            const body = { message: info }
+            const { errorReason } = info
+            if (errorReason) {
+              body.errorReason = errorReason
+              delete info.errorReason
+            }
+            return res.json(body)
+          }
+        }
+      }
+    )(req, res, next)
+  },
+  async doPassportLogin(req, profile, done) {
+    let user, info
+    try {
+      ;({ user, info } = await LDAPAuthenticationController._doPassportLogin(
+        req,
+        profile
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportLogin(req, profile) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'LDAP password login', fromKnownDevice },
+    }
+
+    let user, isPasswordReused
+    try {
+      user = await LDAPAuthenticationManager.promises.findOrCreateUser(profile, auditLog)
+    } catch (error) {
+      return {
+        user: false,
+        info: handleAuthenticateErrors(error, req),
+      }
+    }
+    if (user && AuthenticationController.captchaRequiredForLogin(req, user)) {
+      return {
+        user: false,
+        info: {
+          text: req.i18n.translate('cannot_verify_user_not_robot'),
+          type: 'error',
+          errorReason: 'cannot_verify_user_not_robot',
+          status: 400,
+        },
+      }
+    } else if (user) {
+      user.externalAuth = 'ldap'
+      return { user, info: undefined }
+    } else { //we cannot be here, something is terribly wrong
+      logger.debug({ email : profile.mail }, 'failed LDAP log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Unknown error',
+          status: 500,
+        },
+      }
+    }
+  },
+}
+
+export default LDAPAuthenticationController
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
similarity index 67%
rename from services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
rename to services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
index 1371f76d52..66943e82a3 100644
--- a/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
@@ -1,18 +1,13 @@
 import Settings from '@overleaf/settings'
 import { callbackify } from '@overleaf/promise-utils'
-import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
-import { User } from '../../../../app/src/models/User.js'
+import UserCreator from '../../../../../app/src/Features/User/UserCreator.js'
+import { ParallelLoginError } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { User } from '../../../../../app/src/models/User.js'
+import { splitFullName } from '../../../utils.mjs'
 
-const AuthenticationManagerLdap = {
-  splitFullName(fullName) {
-    fullName = fullName.trim();
-    let lastSpaceIndex = fullName.lastIndexOf(' ');
-    let firstNames = fullName.substring(0, lastSpaceIndex).trim();
-    let lastName = fullName.substring(lastSpaceIndex + 1).trim();
-    return [firstNames, lastName];
-  },
-  async findOrCreateLdapUser(profile, auditLog) {
-    //user is already authenticated in Ldap
+const LDAPAuthenticationManager = {
+  async findOrCreateUser(profile, auditLog) {
+    //user is already authenticated in LDAP
     const {
       attEmail,
       attFirstName,
@@ -28,7 +23,7 @@ const AuthenticationManagerLdap = {
                     : profile[attEmail].toLowerCase()
     let nameParts = ["",""]
     if ((!attFirstName || !attLastName) && attName) {
-      nameParts = this.splitFullName(profile[attName] || "")
+      nameParts = splitFullName(profile[attName] || "")
     }
     const firstName = attFirstName ? (profile[attFirstName] || "") : nameParts[0]
     let   lastName  = attLastName  ? (profile[attLastName]  || "") : nameParts[1]
@@ -40,6 +35,7 @@ const AuthenticationManagerLdap = {
                                                     profile[attAdmin] === valAdmin)
     }
     let user = await User.findOne({ 'email': email }).exec()
+
     if( !user ) {
       user = await UserCreator.promises.createNewUser(
         {
@@ -61,8 +57,12 @@ const AuthenticationManagerLdap = {
       userDetails.isAdmin = isAdmin
     }
     const result = await User.updateOne(
-      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
-      {}
+      { _id: user._id, loginEpoch: user.loginEpoch },
+      {
+        $inc: { loginEpoch: 1 },
+        $set: userDetails,
+        $unset: { hashedPassword: "" },
+      }
     ).exec()
     if (result.modifiedCount !== 1) {
       throw new ParallelLoginError()
@@ -72,9 +72,5 @@ const AuthenticationManagerLdap = {
 }
 
 export default {
-  findOrCreateLdapUser: callbackify(AuthenticationManagerLdap.findOrCreateLdapUser),
-  promises: AuthenticationManagerLdap,
+  promises: LDAPAuthenticationManager,
 }
-export const {
-  splitFullName,
-} = AuthenticationManagerLdap
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs b/services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs
new file mode 100644
index 0000000000..4557b4a4e4
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs
@@ -0,0 +1,120 @@
+import Settings from '@overleaf/settings'
+import logger from '@overleaf/logger'
+import { promisify } from 'util'
+import passport from 'passport'
+import ldapjs from 'ldapauth-fork/node_modules/ldapjs/lib/index.js'
+import UserGetter from '../../../../../app/src/Features/User/UserGetter.js'
+import { splitFullName } from '../../../utils.mjs'
+
+function _searchLDAP(client, baseDN, options) {
+  return new Promise((resolve, reject) => {
+    const searchEntries = []
+    client.search(baseDN, options, (error, res) => {
+      if (error) {
+        reject(error)
+      } else {
+        res.on('searchEntry', entry => searchEntries.push(entry.object))
+        res.on('error', reject)
+        res.on('end', () => resolve(searchEntries))
+      }
+    })
+  })
+}
+
+async function fetchLDAPContacts(userId, contacts) {
+  if (!Settings.ldap?.enable || !process.env.OVERLEAF_LDAP_CONTACTS_FILTER) {
+    return []
+  }
+
+  const ldapOptions = passport._strategy('ldapauth').options.server
+  const { attEmail, attFirstName = "", attLastName = "", attName = "" } = Settings.ldap
+  const {
+    url,
+    timeout,
+    connectTimeout,
+    tlsOptions,
+    starttls,
+    bindDN,
+    bindCredentials
+  } = ldapOptions
+  const searchBase = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_BASE || ldapOptions.searchBase
+  const searchScope = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_SCOPE || 'sub'
+  const ldapConfig = { url, timeout, connectTimeout, tlsOptions }
+
+  let ldapUsers
+  let client
+
+  try {
+    await new Promise((resolve, reject) => {
+      client = ldapjs.createClient(ldapConfig)
+      client.on('error', (error) => { reject(error) })
+      client.on('connectTimeout', (error) => { reject(error) })
+      client.on('connect', () => { resolve() })
+    })
+
+    if (starttls) {
+      const starttlsAsync = promisify(client.starttls).bind(client)
+      await starttlsAsync(tlsOptions, null)
+    }
+    const bindAsync = promisify(client.bind).bind(client)
+    await bindAsync(bindDN, bindCredentials)
+
+    async function createContactsSearchFilter(client, ldapOptions, userId, contactsFilter) {
+      const searchProperty = process.env.OVERLEAF_LDAP_CONTACTS_PROPERTY
+      if (!searchProperty) {
+        return contactsFilter
+      }
+      const email = await UserGetter.promises.getUserEmail(userId)
+      const searchOptions = {
+        scope: ldapOptions.searchScope,
+        attributes: [searchProperty],
+        filter: `(${Settings.ldap.attEmail}=${email})`
+      }
+      const searchBase = ldapOptions.searchBase
+      const ldapUser = (await _searchLDAP(client, searchBase, searchOptions))[0]
+      const searchPropertyValue = ldapUser ? ldapUser[searchProperty]
+                                           : process.env.OVERLEAF_LDAP_CONTACTS_NON_LDAP_VALUE || 'IMATCHNOTHING'
+      return contactsFilter.replace(/{{userProperty}}/g, searchPropertyValue)
+    }
+
+    const filter = await createContactsSearchFilter(client, ldapOptions, userId, process.env.OVERLEAF_LDAP_CONTACTS_FILTER)
+    const searchOptions = { scope: searchScope, attributes: [attEmail, attFirstName, attLastName, attName], filter }
+
+    ldapUsers = await _searchLDAP(client, searchBase, searchOptions)
+  } catch (error) {
+    logger.warn({ error }, 'Error in fetchLDAPContacts')
+    return []
+  } finally {
+    client?.unbind()
+  }
+
+  const newLDAPContacts = ldapUsers.reduce((acc, ldapUser) => {
+    const email = Array.isArray(ldapUser[attEmail])
+                    ? ldapUser[attEmail][0]?.toLowerCase()
+                    : ldapUser[attEmail]?.toLowerCase()
+    if (!email) return acc
+    if (!contacts.some(contact => contact.email === email)) {
+      let nameParts = ["", ""]
+      if ((!attFirstName || !attLastName) && attName) {
+        nameParts = splitFullName(ldapUser[attName] || "")
+      }
+      const firstName = attFirstName ? (ldapUser[attFirstName] || "") : nameParts[0]
+      const lastName  = attLastName  ? (ldapUser[attLastName]  || "") : nameParts[1]
+      acc.push({
+        first_name: firstName,
+        last_name: lastName,
+        email: email,
+        type: 'user'
+      })
+    }
+    return acc
+  }, [])
+
+  return newLDAPContacts.sort((a, b) =>
+    a.last_name.localeCompare(b.last_name) ||
+    a.first_name.localeCompare(b.first_name) ||
+    a.email.localeCompare(b.email)
+  )
+}
+
+export default fetchLDAPContacts
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
new file mode 100644
index 0000000000..846ca9b158
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
@@ -0,0 +1,112 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import { Strategy as LDAPStrategy } from 'passport-ldapauth'
+import Settings from '@overleaf/settings'
+import PermissionsManager from '../../../../../app/src/Features/Authorization/PermissionsManager.js'
+import { readFilesContentFromEnv, numFromEnv, boolFromEnv } from '../../../utils.mjs'
+import LDAPAuthenticationController from './LDAPAuthenticationController.mjs'
+import fetchLDAPContacts from './LDAPContacts.mjs'
+
+const LDAPModuleManager = {
+  initSettings() {
+    Settings.ldap = {
+      enable: true,
+      placeholder:  process.env.OVERLEAF_LDAP_PLACEHOLDER || 'Username',
+      attEmail:     process.env.OVERLEAF_LDAP_EMAIL_ATT || 'mail',
+      attFirstName: process.env.OVERLEAF_LDAP_FIRST_NAME_ATT,
+      attLastName:  process.env.OVERLEAF_LDAP_LAST_NAME_ATT,
+      attName:      process.env.OVERLEAF_LDAP_NAME_ATT,
+      attAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT,
+      valAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT_VALUE,
+      updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN),
+    }
+  },
+  passportSetup(passport, callback) {
+    const ldapOptions = {
+      url: process.env.OVERLEAF_LDAP_URL,
+      bindDN: process.env.OVERLEAF_LDAP_BIND_DN || "",
+      bindCredentials: process.env.OVERLEAF_LDAP_BIND_CREDENTIALS || "",
+      bindProperty: process.env.OVERLEAF_LDAP_BIND_PROPERTY,
+      searchBase: process.env.OVERLEAF_LDAP_SEARCH_BASE,
+      searchFilter: process.env.OVERLEAF_LDAP_SEARCH_FILTER,
+      searchScope: process.env.OVERLEAF_LDAP_SEARCH_SCOPE || 'sub',
+      searchAttributes: JSON.parse(process.env.OVERLEAF_LDAP_SEARCH_ATTRIBUTES || '[]'),
+      groupSearchBase: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_BASE,
+      groupSearchFilter: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_FILTER,
+      groupSearchScope: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_SCOPE || 'sub',
+      groupSearchAttributes: ["dn"],
+      groupDnProperty: process.env.OVERLEAF_LDAP_ADMIN_DN_PROPERTY,
+      cache: boolFromEnv(process.env.OVERLEAF_LDAP_CACHE),
+      timeout: numFromEnv(process.env.OVERLEAF_LDAP_TIMEOUT),
+      connectTimeout: numFromEnv(process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT),
+      starttls: boolFromEnv(process.env.OVERLEAF_LDAP_STARTTLS),
+      tlsOptions: {
+        ca: readFilesContentFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_CA_PATH),
+        rejectUnauthorized: boolFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_REJECT_UNAUTH),
+      }
+    }
+    try {
+      passport.use(
+        new LDAPStrategy(
+          {
+            server: ldapOptions,
+            passReqToCallback: true,
+            usernameField: 'email',
+            passwordField: 'password',
+            handleErrorsAsFailures: true,
+          },
+          LDAPAuthenticationController.doPassportLogin
+        )
+      )
+      callback(null)
+    } catch (error) {
+      callback(error)
+    }
+  },
+
+  async getContacts(userId, contacts, callback) {
+    try {
+      const newContacts = await fetchLDAPContacts(userId, contacts)
+      callback(null, newContacts)
+    } catch (error) {
+      callback(error)
+    }
+  },
+
+  initPolicy() {
+    try {
+      PermissionsManager.registerCapability('change-password', { default : true })
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+    const ldapPolicyValidator = async ({ user, subscription }) => {
+// If user is not logged in, user.externalAuth is undefined,
+// in this case allow to change password if the user has a hashedPassword
+      return user.externalAuth === 'ldap' || (user.externalAuth === undefined && !user.hashedPassword)
+    }
+    try {
+    PermissionsManager.registerPolicy(
+      'ldapPolicy',
+      { 'change-password' : false },
+      { validator: ldapPolicyValidator }
+    )
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+  },
+  async getGroupPolicyForUser(user, callback) {
+    try {
+      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
+        user,
+        groupPolicy : { 'ldapPolicy' : true },
+        subscription : null
+      })
+      let groupPolicy = Object.fromEntries(userValidationMap)
+      callback(null,  {'groupPolicy' : groupPolicy })
+    } catch (error) {
+      callback(error)
+    }
+  },
+}
+
+export default LDAPModuleManager
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
new file mode 100644
index 0000000000..44d9d373d2
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
@@ -0,0 +1,19 @@
+import logger from '@overleaf/logger'
+import RateLimiterMiddleware from '../../../../../app/src/Features/Security/RateLimiterMiddleware.js'
+import CaptchaMiddleware from '../../../../../app/src/Features/Captcha/CaptchaMiddleware.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import { overleafLoginRateLimiter } from '../../../../../app/src/infrastructure/RateLimiter.js'
+import LDAPAuthenticationController from './LDAPAuthenticationController.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init LDAP router')
+    webRouter.post('/login',
+      RateLimiterMiddleware.rateLimit(overleafLoginRateLimiter), // rate limit IP (20 / 60s)
+      RateLimiterMiddleware.loginRateLimitEmail, // rate limit email (10 / 120s)
+      CaptchaMiddleware.validateCaptcha('login'),
+      LDAPAuthenticationController.passportLogin,
+      AuthenticationController.passportLogin,
+    )
+  },
+}
diff --git a/services/web/modules/authentication/ldap/index.mjs b/services/web/modules/authentication/ldap/index.mjs
new file mode 100644
index 0000000000..244a8db8e7
--- /dev/null
+++ b/services/web/modules/authentication/ldap/index.mjs
@@ -0,0 +1,17 @@
+let ldapModule = {}
+if (process.env.EXTERNAL_AUTH.includes('ldap')) {
+  const { default: LDAPModuleManager } = await import('./app/src/LDAPModuleManager.mjs')
+  const { default: router } = await import('./app/src/LDAPRouter.mjs')
+  LDAPModuleManager.initSettings()
+  LDAPModuleManager.initPolicy()
+  ldapModule = {
+    name: 'ldap-authentication',
+    hooks: {
+      passportSetup: LDAPModuleManager.passportSetup,
+      getContacts: LDAPModuleManager.getContacts,
+      getGroupPolicyForUser: LDAPModuleManager.getGroupPolicyForUser,
+    },
+    router: router,
+  }
+}
+export default ldapModule
diff --git a/services/web/modules/authentication/logout.mjs b/services/web/modules/authentication/logout.mjs
new file mode 100644
index 0000000000..4163cf536d
--- /dev/null
+++ b/services/web/modules/authentication/logout.mjs
@@ -0,0 +1,18 @@
+let SAMLAuthenticationController 
+if (process.env.EXTERNAL_AUTH.includes('saml')) {
+  SAMLAuthenticationController = await import('./saml/app/src/SAMLAuthenticationController.mjs')
+}
+let OIDCAuthenticationController 
+if (process.env.EXTERNAL_AUTH.includes('oidc')) {
+  OIDCAuthenticationController = await import('./oidc/app/src/OIDCAuthenticationController.mjs')
+}
+export default async function logout(req, res, next) {
+  switch(req.user.externalAuth) {
+    case 'saml':
+      return SAMLAuthenticationController.default.passportLogout(req, res, next)
+    case 'oidc':
+      return OIDCAuthenticationController.default.passportLogout(req, res, next)
+    default: 
+      next()
+  }
+}
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
new file mode 100644
index 0000000000..42c01e712f
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
@@ -0,0 +1,171 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import ThirdPartyIdentityManager from '../../../../../app/src/Features/User/ThirdPartyIdentityManager.js'
+import OIDCAuthenticationManager from './OIDCAuthenticationManager.mjs'
+import { acceptsJson } from '../../../../../app/src/infrastructure/RequestContentTypeDetection.js'
+
+const OIDCAuthenticationController = {
+  passportLogin(req, res, next) {
+    req.session.intent = req.query.intent
+    passport.authenticate('openidconnect')(req, res, next)
+  },
+  passportLoginCallback(req, res, next) {
+    passport.authenticate(
+      'openidconnect',
+      { keepSessionInfo: true },
+      async function (err, user, info) {
+        if (err) {
+          return next(err)
+        }
+        if(req.session.intent === 'link') {
+          delete req.session.intent
+// After linking, log out from the OIDC provider and redirect back to '/user/settings'.
+// Keycloak supports this; Authentik does not (yet).
+          const logoutUrl = process.env.OVERLEAF_OIDC_LOGOUT_URL
+          const redirectUri = `${Settings.siteUrl.replace(/\/+$/, '')}/user/settings`
+          return res.redirect(`${logoutUrl}?id_token_hint=${info.idToken}&post_logout_redirect_uri=${encodeURIComponent(redirectUri)}`)
+	}
+        if (user) {
+          req.session.idToken = info.idToken
+          user.externalAuth = 'oidc'
+          // `user` is either a user object or false
+          AuthenticationController.setAuditInfo(req, {
+            method: 'OIDC login',
+          })
+          try {
+            await AuthenticationController.promises.finishLogin(user, req, res)
+          } catch (err) {
+            return next(err)
+          }
+        } else {
+          if (info.redir != null) {
+            return res.json({ redir: info.redir })
+          } else {
+            res.status(info.status || 401)
+            delete info.status
+            const body = { message: info }
+            return res.json(body)
+          }
+        }
+      }
+    )(req, res, next)
+  },
+  async doPassportLogin(req, issuer, profile, context, idToken, accessToken, refreshToken, done) {
+    let user, info
+    try {
+      if(req.session.intent === 'link') {
+        ;({ user, info } = await OIDCAuthenticationController._doLink(
+          req,
+          profile
+        ))
+      } else {
+        ;({ user, info } = await OIDCAuthenticationController._doLogin(
+          req,
+          profile
+        ))
+      }
+    } catch (error) {
+      return done(error)
+    }
+    if (user) {
+      info = {
+        ...(info || {}),
+        idToken: idToken
+      }
+    }
+    return done(null, user, info)
+  },
+  async _doLogin(req, profile) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'OIDC login', fromKnownDevice },
+    }
+
+    let user
+    try {
+      user = await OIDCAuthenticationManager.promises.findOrCreateUser(profile, auditLog)
+    } catch (error) {
+      logger.debug({ email : profile.emails[0].value }, `OIDC login failed: ${error}`)
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: error.message,
+          status: 401,
+        },
+      }
+    }
+    if (user) {
+      return { user, info: undefined }
+    } else { // we cannot be here, something is terribly wrong
+      logger.debug({ email : profile.emails[0].value }, 'failed OIDC log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Unknown error',
+          status: 500,
+        },
+      }
+    }
+  },
+  async _doLink(req, profile) {
+    const { user: { _id: userId }, ip } = req
+    try {
+      const auditLog = {
+        ipAddress: ip,
+        initiatorId: userId,
+      }
+      await OIDCAuthenticationManager.promises.linkAccount(userId, profile, auditLog)
+    } catch (error) {
+      logger.error(error.info, error.message)
+      return {
+        user: true,
+        info: {
+          type: 'error',
+          text: error.message,
+          status: 200,
+        },
+      }
+    }
+    return { user: true, info: undefined }
+  },
+  async unlinkAccount(req, res, next) {
+    try {
+      const { user: { _id: userId }, body: { providerId }, ip } = req
+      const auditLog = {
+        ipAddress: ip,
+        initiatorId: userId,
+      }
+      await ThirdPartyIdentityManager.promises.unlink(userId, providerId, auditLog)
+      return res.status(200).end()
+    } catch (error) {
+      logger.error(error.info, error.message)
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Can not unlink account',
+          status: 200,
+	}
+      }
+    }
+  },
+  async passportLogout(req, res, next) {
+// TODO: instead of storing idToken in session, use refreshToken to obtain a new idToken?
+    const idTokenHint = req.session.idToken
+    await UserController.promises.doLogout(req)
+    const logoutUrl = process.env.OVERLEAF_OIDC_LOGOUT_URL
+    const redirectUri = Settings.siteUrl
+    res.redirect(`${logoutUrl}?id_token_hint=${idTokenHint}&post_logout_redirect_uri=${encodeURIComponent(redirectUri)}`)
+  },
+  passportLogoutCallback(req, res, next) {
+    const redirectUri = Settings.siteUrl
+    res.redirect(redirectUri)
+  },
+}
+export default OIDCAuthenticationController
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
new file mode 100644
index 0000000000..56ec2e5455
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -0,0 +1,94 @@
+import Settings from '@overleaf/settings'
+import UserCreator from '../../../../../app/src/Features/User/UserCreator.js'
+import ThirdPartyIdentityManager from '../../../../../app/src/Features/User/ThirdPartyIdentityManager.js'
+import { ParallelLoginError } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { User } from '../../../../../app/src/models/User.js'
+
+const OIDCAuthenticationManager = {
+  async findOrCreateUser(profile, auditLog) {
+    const {
+      attUserId,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+      providerId,
+    } = Settings.oidc
+    const oidcUserId = profile[attUserId]
+    const email = profile.emails[0].value
+    const firstName = profile.name?.givenName || ""
+    const lastName  = profile.name?.familyName || ""
+    let isAdmin = false
+    if (attAdmin && valAdmin) {
+      if (attAdmin === 'email') {
+        isAdmin = (email === valAdmin)
+      } else {
+        isAdmin = (profile[attAdmin] === valAdmin)
+      }
+    }
+    const oidcUserData = null // Possibly it can be used later
+    let user
+    try {
+      user = await ThirdPartyIdentityManager.promises.login(providerId, oidcUserId, oidcUserData)
+    } catch {
+// A user with the specified OIDC ID and provider ID is not found. Search for a user with the given email.
+// If no user exists with this email, create a new user and link the OIDC account to it.
+// If a user exists but no account from the specified OIDC provider is linked to this user, link the OIDC account to this user.
+// If an account from the specified provider is already linked to this user, unlink it, and link the OIDC account to this user.
+// (Is it safe? Concider: If an account from the specified provider is already linked to this user, throw an error)
+      user = await User.findOne({ 'email': email }).exec()
+      if (!user) {
+        user = await UserCreator.promises.createNewUser(
+          {
+            email: email,
+            first_name: firstName,
+            last_name: lastName,
+            isAdmin: isAdmin,
+            holdingAccount: false,
+          }
+        )
+      }
+//    const alreadyLinked = user.thirdPartyIdentifiers.some(item => item.providerId === providerId)
+//    if (!alreadyLinked) {
+        auditLog.initiatorId = user._id
+        await ThirdPartyIdentityManager.promises.link(user._id, providerId, oidcUserId, oidcUserData, auditLog)
+        await User.updateOne(
+          { _id: user._id },
+          { $set : {
+             'emails.0.confirmedAt': Date.now(), //email of external user is confirmed
+            },
+          }
+        ).exec()
+//    } else {
+//      throw new Error(`Overleaf user ${user.email} is already linked to another ${providerId} user`)
+//    }
+    }
+
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if (attAdmin && valAdmin) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
+      {}
+    ).exec()
+
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+  async linkAccount(userId, profile, auditLog) {
+    const {
+      attUserId,
+      providerId,
+    } = Settings.oidc
+    const oidcUserId = profile[attUserId]
+    const oidcUserData = null // Possibly it can be used later
+    await ThirdPartyIdentityManager.promises.link(userId, providerId, oidcUserId, oidcUserData, auditLog)
+  },
+}
+
+export default {
+  promises: OIDCAuthenticationManager,
+}
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
new file mode 100644
index 0000000000..3a2e6e2780
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -0,0 +1,82 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { readFilesContentFromEnv, numFromEnv, boolFromEnv } from '../../../utils.mjs'
+import PermissionsManager from '../../../../../app/src/Features/Authorization/PermissionsManager.js'
+import OIDCAuthenticationController from './OIDCAuthenticationController.mjs'
+import { Strategy as OIDCStrategy } from 'passport-openidconnect'
+
+const OIDCModuleManager = {
+  initSettings() {
+    let providerId = process.env.OVERLEAF_OIDC_PROVIDER_ID || 'oidc'
+    Settings.oidc = {
+      enable: true,
+      providerId:   providerId,
+      identityServiceName: process.env.OVERLEAF_OIDC_IDENTITY_SERVICE_NAME || `Log in with ${Settings.oauthProviders[providerId].name}`,
+      attUserId:    process.env.OVERLEAF_OIDC_USER_ID_FIELD || 'id',
+      attAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD,
+      valAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD_VALUE,
+      updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_OIDC_UPDATE_USER_DETAILS_ON_LOGIN),
+    }
+  },
+  passportSetup(passport, callback) {
+    const oidcOptions = {
+      issuer: process.env.OVERLEAF_OIDC_ISSUER,
+      authorizationURL: process.env.OVERLEAF_OIDC_AUTHORIZATION_URL,
+      tokenURL: process.env.OVERLEAF_OIDC_TOKEN_URL,
+      userInfoURL: process.env.OVERLEAF_OIDC_USER_INFO_URL,
+      clientID: process.env.OVERLEAF_OIDC_CLIENT_ID,
+      clientSecret: process.env.OVERLEAF_OIDC_CLIENT_SECRET,
+      callbackURL: `${Settings.siteUrl.replace(/\/+$/, '')}/oidc/login/callback`,
+      scope: process.env.OVERLEAF_OIDC_SCOPE || 'openid profile email',
+      passReqToCallback: true,
+    }
+    try {
+      passport.use(
+        new OIDCStrategy(
+          oidcOptions,
+          OIDCAuthenticationController.doPassportLogin
+        )
+      )
+      callback(null)
+    } catch (error) {
+      callback(error)
+    }
+  },
+  initPolicy() {
+    try {
+      PermissionsManager.registerCapability('change-password', { default : true })
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+    const oidcPolicyValidator = async ({ user, subscription }) => {
+// If user is not logged in, user.externalAuth is undefined,
+// in this case allow to change password if the user has a hashedPassword
+      return user.externalAuth === 'oidc' || (user.externalAuth === undefined && !user.hashedPassword)
+    }
+    try {
+    PermissionsManager.registerPolicy(
+      'oidcPolicy',
+      { 'change-password' : false },
+      { validator: oidcPolicyValidator }
+    )
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+  },
+  async getGroupPolicyForUser(user, callback) {
+    try {
+      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
+        user,
+        groupPolicy : { 'oidcPolicy' : true },
+        subscription : null
+      })
+      let groupPolicy = Object.fromEntries(userValidationMap)
+      callback(null,  {'groupPolicy' : groupPolicy })
+    } catch (error) {
+      callback(error)
+    }
+  },
+}
+
+export default OIDCModuleManager
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
new file mode 100644
index 0000000000..519fa5043a
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
@@ -0,0 +1,15 @@
+import logger from '@overleaf/logger'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import OIDCAuthenticationController from './OIDCAuthenticationController.mjs'
+import logout from '../../../logout.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init OIDC router')
+    webRouter.get('/oidc/login', OIDCAuthenticationController.passportLogin)
+    webRouter.get('/oidc/login/callback', OIDCAuthenticationController.passportLoginCallback)
+    webRouter.get('/oidc/logout/callback', OIDCAuthenticationController.passportLogoutCallback)
+    webRouter.post('/user/oauth-unlink', OIDCAuthenticationController.unlinkAccount)
+    webRouter.post('/logout', logout, UserController.logout)
+  },
+}
diff --git a/services/web/modules/authentication/oidc/index.mjs b/services/web/modules/authentication/oidc/index.mjs
new file mode 100644
index 0000000000..51d9e0d483
--- /dev/null
+++ b/services/web/modules/authentication/oidc/index.mjs
@@ -0,0 +1,16 @@
+let oidcModule = {}
+if (process.env.EXTERNAL_AUTH.includes('oidc')) {
+  const { default: OIDCModuleManager } = await import('./app/src/OIDCModuleManager.mjs')
+  const { default: router } = await import('./app/src/OIDCRouter.mjs')
+  OIDCModuleManager.initSettings()
+  OIDCModuleManager.initPolicy()
+  oidcModule = {
+    name: 'oidc-authentication',
+    hooks: {
+      passportSetup: OIDCModuleManager.passportSetup,
+      getGroupPolicyForUser: OIDCModuleManager.getGroupPolicyForUser,
+    },
+    router: router,
+  }
+}
+export default oidcModule
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
similarity index 65%
rename from services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
rename to services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
index f5db3f738d..ac0e5398b2 100644
--- a/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
@@ -1,15 +1,16 @@
 import Settings from '@overleaf/settings'
 import logger from '@overleaf/logger'
 import passport from 'passport'
-import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
-import AuthenticationManagerSaml from './AuthenticationManagerSaml.mjs'
-import UserController from '../../../../app/src/Features/User/UserController.js'
-import UserSessionsManager from '../../../../app/src/Features/User/UserSessionsManager.js'
-import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
-import { xmlResponse } from '../../../../app/src/infrastructure/Response.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import SAMLAuthenticationManager from './SAMLAuthenticationManager.mjs'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import UserSessionsManager from '../../../../../app/src/Features/User/UserSessionsManager.js'
+import { handleAuthenticateErrors } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { xmlResponse } from '../../../../../app/src/infrastructure/Response.js'
+import { readFilesContentFromEnv } from '../../../utils.mjs'
 
-const AuthenticationControllerSaml = {
-  passportSamlAuthWithIdP(req, res, next) {
+const SAMLAuthenticationController = {
+  passportLogin(req, res, next) {
     if ( passport._strategy('saml')._saml.options.authnRequestBinding === 'HTTP-POST') {
       const csp = res.getHeader('Content-Security-Policy')
       if (csp) {
@@ -21,7 +22,7 @@ const AuthenticationControllerSaml = {
     }
     passport.authenticate('saml')(req, res, next)
   },
-  passportSamlLogin(req, res, next) {
+  passportLoginCallback(req, res, next) {
     // This function is middleware which wraps the passport.authenticate middleware,
     // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
     // and send a `{redir: ""}` response on success
@@ -46,24 +47,19 @@ const AuthenticationControllerSaml = {
           if (info.redir != null) {
             return res.json({ redir: info.redir })
           } else {
-            res.status(info.status || 200)
+            res.status(info.status || 401)
             delete info.status
             const body = { message: info }
-            const { errorReason } = info
-            if (errorReason) {
-              body.errorReason = errorReason
-              delete info.errorReason
-            }
             return res.json(body)
           }
         }
       }
     )(req, res, next)
   },
-  async doPassportSamlLogin(req, profile, done) {
+  async doPassportLogin(req, profile, done) {
     let user, info
     try {
-      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogin(
+      ;({ user, info } = await SAMLAuthenticationController._doPassportLogin(
         req,
         profile
       ))
@@ -72,7 +68,7 @@ const AuthenticationControllerSaml = {
     }
     return done(undefined, user, info)
   },
-  async _doPassportSamlLogin(req, profile) {
+  async _doPassportLogin(req, profile) {
     const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
     const auditLog = {
       ipAddress: req.ip,
@@ -81,7 +77,7 @@ const AuthenticationControllerSaml = {
 
     let user
     try {
-      user = await AuthenticationManagerSaml.promises.findOrCreateSamlUser(profile, auditLog)
+      user = await SAMLAuthenticationManager.promises.findOrCreateUser(profile, auditLog)
     } catch (error) {
       return {
         user: false,
@@ -89,9 +85,10 @@ const AuthenticationControllerSaml = {
       }
     }
     if (user) {
+      user.externalAuth = 'saml'
       req.session.saml_extce = {nameID : profile.nameID, sessionIndex : profile.sessionIndex}
       return { user, info: undefined }
-    } else { //something wrong
+    } else { // we cannot be here, something is terribly wrong
       logger.debug({ email : profile.mail }, 'failed SAML log in')
       return {
         user: false,
@@ -103,23 +100,24 @@ const AuthenticationControllerSaml = {
       }
     }
   },
-  async passportSamlSPLogout(req, res, next) {
+  async passportLogout(req, res, next) {
     passport._strategy('saml').logout(req, async (err, url) => {
-      if (err) logger.error({ err }, 'can not generate logout url')
       await UserController.promises.doLogout(req)
+      if (err) return next(err)
       res.redirect(url)
     })
   },
-  passportSamlIdPLogout(req, res, next) {
+  passportLogoutCallback(req, res, next) {
+//TODO: is it possible to close the editor?
     passport.authenticate('saml')(req, res, (err) => {
       if (err) return next(err)
       res.redirect('/login');
     })
   },
-  async doPassportSamlLogout(req, profile, done) {
+  async doPassportLogout(req, profile, done) {
     let user, info
     try {
-      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogout(
+      ;({ user, info } = await SAMLAuthenticationController._doPassportLogout(
         req,
         profile
       ))
@@ -128,7 +126,7 @@ const AuthenticationControllerSaml = {
     }
     return done(undefined, user, info)
   },
-  async _doPassportSamlLogout(req, profile) {
+  async _doPassportLogout(req, profile) {
     if (req?.session?.saml_extce?.nameID === profile.nameID &&
         req?.session?.saml_extce?.sessionIndex === profile.sessionIndex) {
       profile = req.user
@@ -138,23 +136,15 @@ const AuthenticationControllerSaml = {
     })
     return { user: profile, info: undefined }
   },
-  passportSamlMetadata(req, res) {
+  getSPMetadata(req, res) {
     const samlStratery = passport._strategy('saml')
     res.setHeader('Content-Disposition', `attachment; filename="${samlStratery._saml.options.issuer}-meta.xml"`)
     xmlResponse(res,
       samlStratery.generateServiceProviderMetadata(
-        samlStratery._saml.options.decryptionCert,
-        samlStratery._saml.options.signingCert
+        readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_CERT),
+        readFilesContentFromEnv(process.env.OVERLEAF_SAML_PUBLIC_CERT)
       )
     )
   },
 }
-export const {
-  passportSamlAuthWithIdP,
-  passportSamlLogin,
-  passportSamlSPLogout,
-  passportSamlIdPLogout,
-  doPassportSamlLogin,
-  doPassportSamlLogout,
-  passportSamlMetadata,
-} = AuthenticationControllerSaml
+export default SAMLAuthenticationController
diff --git a/services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs
new file mode 100644
index 0000000000..80c4e30ea7
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs
@@ -0,0 +1,85 @@
+import Settings from '@overleaf/settings'
+import UserCreator from '../../../../../app/src/Features/User/UserCreator.js'
+import { ParallelLoginError } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import SAMLIdentityManager from '../../../../../app/src/Features/User/SAMLIdentityManager.js'
+import { User } from '../../../../../app/src/models/User.js'
+
+const SAMLAuthenticationManager = {
+  async findOrCreateUser(profile, auditLog) {
+    const {
+      attUserId,
+      attEmail,
+      attFirstName,
+      attLastName,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+    } = Settings.saml
+    const externalUserId = profile[attUserId]
+    const email = Array.isArray(profile[attEmail])
+                    ? profile[attEmail][0].toLowerCase()
+                    : profile[attEmail].toLowerCase()
+    const firstName = attFirstName ? profile[attFirstName] : ""
+    const lastName  = attLastName  ? profile[attLastName] : email
+    let isAdmin = false
+    if (attAdmin && valAdmin) {
+      isAdmin = (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
+                                                    profile[attAdmin] === valAdmin)
+    }
+    const providerId = '1' // for now, only one fixed IdP is supported
+// We search for a SAML user, and if none is found, we search for a user with the given email. If a user is found,
+// we update the user to be a SAML user, otherwise, we create a new SAML user with the given email. In the case of
+// multiple SAML IdPs, one would have to do something similar, or possibly report an error like
+// 'the email is associated with the wrong IdP'
+    let user = await SAMLIdentityManager.getUser(providerId, externalUserId, attUserId)
+    if (!user) {
+      user = await User.findOne({ 'email': email }).exec()
+      if (!user) {
+        user = await UserCreator.promises.createNewUser(
+          {
+            email: email,
+            first_name: firstName,
+            last_name: lastName,
+            isAdmin: isAdmin,
+            holdingAccount: false,
+            samlIdentifiers: [{ providerId: providerId }],
+          }
+        )
+      }
+      // cannot use SAMLIdentityManager.linkAccounts because affilations service is not there
+      await User.updateOne(
+        { _id: user._id },
+        {
+          $set : {
+           'emails.0.confirmedAt': Date.now(), //email of saml user is confirmed
+           'emails.0.samlProviderId': providerId,
+           'samlIdentifiers.0.providerId': providerId,
+           'samlIdentifiers.0.externalUserId': externalUserId,
+           'samlIdentifiers.0.userIdAttribute': attUserId,
+          },
+        }
+      ).exec()
+    }
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if (attAdmin && valAdmin) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch },
+      {
+        $inc: { loginEpoch: 1 },
+        $set: userDetails,
+        $unset: { hashedPassword: "" },
+      },
+    ).exec()
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+}
+
+export default {
+  promises: SAMLAuthenticationManager,
+}
diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
new file mode 100644
index 0000000000..c7efdef214
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
@@ -0,0 +1,100 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { readFilesContentFromEnv, numFromEnv, boolFromEnv } from '../../../utils.mjs'
+import PermissionsManager from '../../../../../app/src/Features/Authorization/PermissionsManager.js'
+import SAMLAuthenticationController from './SAMLAuthenticationController.mjs'
+import { Strategy as SAMLStrategy } from '@node-saml/passport-saml'
+
+const SAMLModuleManager = {
+  initSettings() {
+  Settings.saml = {
+    enable: true,
+    identityServiceName: process.env.OVERLEAF_SAML_IDENTITY_SERVICE_NAME || 'Log in with SAML IdP',
+    attUserId:    process.env.OVERLEAF_SAML_USER_ID_FIELD || 'nameID',
+    attEmail:     process.env.OVERLEAF_SAML_EMAIL_FIELD || 'nameID',
+    attFirstName: process.env.OVERLEAF_SAML_FIRST_NAME_FIELD || 'givenName',
+    attLastName:  process.env.OVERLEAF_SAML_LAST_NAME_FIELD || 'lastName',
+    attAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD,
+    valAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD_VALUE,
+    updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN),
+  }
+},
+  passportSetup(passport, callback) {
+    const samlOptions = {
+      entryPoint: process.env.OVERLEAF_SAML_ENTRYPOINT,
+      callbackUrl: `${Settings.siteUrl.replace(/\/+$/, '')}/saml/login/callback`,
+      issuer: process.env.OVERLEAF_SAML_ISSUER,
+      audience: process.env.OVERLEAF_SAML_AUDIENCE,
+      cert: readFilesContentFromEnv(process.env.OVERLEAF_SAML_IDP_CERT),
+      privateKey:  readFilesContentFromEnv(process.env.OVERLEAF_SAML_PRIVATE_KEY),
+      decryptionPvk:  readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_PVK),
+      signatureAlgorithm: process.env.OVERLEAF_SAML_SIGNATURE_ALGORITHM,
+      additionalParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_PARAMS || '{}'),
+      additionalAuthorizeParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_AUTHORIZE_PARAMS || '{}'),
+      identifierFormat: process.env.OVERLEAF_SAML_IDENTIFIER_FORMAT,
+      acceptedClockSkewMs: numFromEnv(process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS),
+      attributeConsumingServiceIndex: process.env.OVERLEAF_SAML_ATTRIBUTE_CONSUMING_SERVICE_INDEX,
+      authnContext: process.env.OVERLEAF_SAML_AUTHN_CONTEXT ? JSON.parse(process.env.OVERLEAF_SAML_AUTHN_CONTEXT) : undefined,
+      forceAuthn: boolFromEnv(process.env.OVERLEAF_SAML_FORCE_AUTHN),
+      disableRequestedAuthnContext: boolFromEnv(process.env.OVERLEAF_SAML_DISABLE_REQUESTED_AUTHN_CONTEXT),
+      skipRequestCompression: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING === 'HTTP-POST',  // compression should be skipped iff authnRequestBinding is POST
+      authnRequestBinding: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING,
+      validateInResponseTo: process.env.OVERLEAF_SAML_VALIDATE_IN_RESPONSE_TO,
+      requestIdExpirationPeriodMs: numFromEnv(process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS),
+      // cacheProvider: process.env.OVERLEAF_SAML_CACHE_PROVIDER,
+      logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
+      logoutCallbackUrl: `${Settings.siteUrl.replace(/\/+$/, '')}/saml/logout/callback`,
+      additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
+      passReqToCallback: true,
+    }
+    try {
+      passport.use(
+        new SAMLStrategy(
+          samlOptions,
+          SAMLAuthenticationController.doPassportLogin,
+          SAMLAuthenticationController.doPassportLogout
+        )
+      )
+      callback(null)
+    } catch (error) {
+      callback(error)
+    }
+  },
+  initPolicy() {
+    try {
+      PermissionsManager.registerCapability('change-password', { default : true })
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+    const samlPolicyValidator = async ({ user, subscription }) => {
+// If user is not logged in, user.externalAuth is undefined,
+// in this case allow to change password if the user has a hashedPassword
+      return user.externalAuth === 'saml' || (user.externalAuth === undefined && !user.hashedPassword)
+    }
+    try {
+    PermissionsManager.registerPolicy(
+      'samlPolicy',
+      { 'change-password' : false },
+      { validator: samlPolicyValidator }
+    )
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+  },
+  async getGroupPolicyForUser(user, callback) {
+    try {
+      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
+        user,
+        groupPolicy : { 'samlPolicy' : true },
+        subscription : null
+      })
+      let groupPolicy = Object.fromEntries(userValidationMap)
+      callback(null,  {'groupPolicy' : groupPolicy })
+    } catch (error) {
+      callback(error)
+    }
+  },
+}
+
+export default SAMLModuleManager
diff --git a/services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs b/services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs
new file mode 100644
index 0000000000..c0d617b299
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs
@@ -0,0 +1,11 @@
+import logger from '@overleaf/logger'
+import SAMLAuthenticationController from './SAMLAuthenticationController.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML NonCsrfRouter')
+    webRouter.post('/saml/login/callback', SAMLAuthenticationController.passportLoginCallback)
+    webRouter.get ('/saml/logout/callback', SAMLAuthenticationController.passportLogoutCallback)
+    webRouter.post('/saml/logout/callback', SAMLAuthenticationController.passportLogoutCallback)
+  },
+}
diff --git a/services/web/modules/authentication/saml/app/src/SAMLRouter.mjs b/services/web/modules/authentication/saml/app/src/SAMLRouter.mjs
new file mode 100644
index 0000000000..3cd6e56e2d
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLRouter.mjs
@@ -0,0 +1,16 @@
+import logger from '@overleaf/logger'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import SAMLAuthenticationController from './SAMLAuthenticationController.mjs'
+import logout from '../../../logout.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML router')
+    webRouter.get('/saml/login', SAMLAuthenticationController.passportLogin)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/login')
+    webRouter.get('/saml/meta', SAMLAuthenticationController.getSPMetadata)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/meta')
+    webRouter.post('/logout', logout, UserController.logout)
+  },
+}
diff --git a/services/web/modules/authentication/saml/index.mjs b/services/web/modules/authentication/saml/index.mjs
new file mode 100644
index 0000000000..2d6ee5706c
--- /dev/null
+++ b/services/web/modules/authentication/saml/index.mjs
@@ -0,0 +1,18 @@
+let samlModule = {}
+if (process.env.EXTERNAL_AUTH.includes('saml')) {
+  const { default: SAMLModuleManager } = await import('./app/src/SAMLModuleManager.mjs')
+  const { default: router } = await import('./app/src/SAMLRouter.mjs')
+  const { default: nonCsrfRouter } = await import('./app/src/SAMLNonCsrfRouter.mjs')
+  SAMLModuleManager.initSettings()
+  SAMLModuleManager.initPolicy()
+  samlModule = {
+    name: 'saml-authentication',
+    hooks: {
+      passportSetup: SAMLModuleManager.passportSetup,
+      getGroupPolicyForUser: SAMLModuleManager.getGroupPolicyForUser,
+    },
+    router: router,
+    nonCsrfRouter: nonCsrfRouter,
+  }
+}
+export default samlModule
diff --git a/services/web/modules/authentication/utils.mjs b/services/web/modules/authentication/utils.mjs
new file mode 100644
index 0000000000..468dae32b1
--- /dev/null
+++ b/services/web/modules/authentication/utils.mjs
@@ -0,0 +1,42 @@
+import fs from 'fs'
+function readFilesContentFromEnv(envVar) {
+// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
+  if (!envVar) return undefined
+  try {
+    const parsedFileNames = JSON.parse(envVar)
+    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
+  } catch (error) {
+    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
+      return fs.readFileSync(envVar, 'utf8')
+    } else {
+      throw error
+    }
+  }
+}
+function numFromEnv(env) {
+  return env ? Number(env) : undefined
+}
+function boolFromEnv(env) {
+  if (env === undefined || env === null) return undefined
+  if (typeof env === "string") {
+    const envLower = env.toLowerCase()
+    if (envLower === 'true') return true
+    if (envLower === 'false') return false
+  }
+  throw new Error("Invalid value for boolean envirionment variable")
+}
+
+function splitFullName(fullName) {
+  fullName = fullName.trim();
+  let lastSpaceIndex = fullName.lastIndexOf(' ');
+  let firstNames = fullName.substring(0, lastSpaceIndex).trim();
+  let lastName = fullName.substring(lastSpaceIndex + 1).trim();
+  return [firstNames, lastName];
+}
+
+export {
+  readFilesContentFromEnv,
+  numFromEnv,
+  boolFromEnv,
+  splitFullName,
+}
diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug
index 80215cadf2..32dcd7abb7 100644
--- a/services/web/modules/launchpad/app/views/launchpad.pug
+++ b/services/web/modules/launchpad/app/views/launchpad.pug
@@ -29,7 +29,7 @@ block vars
 
 block append meta
 	meta(name="ol-adminUserExists" data-type="boolean" content=adminUserExists)
-	meta(name="ol-ideJsPath" content=buildJsPath('ide-detached.js'))
+	meta(name="ol-ideJsPath" content=buildJsPath('ide.js'))
 
 block content
 	script(type="text/javascript", nonce=scriptNonce, src=(wsUrl || '/socket.io') + '/socket.io.js')
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs b/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
deleted file mode 100644
index 64fa4f5a96..0000000000
--- a/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
+++ /dev/null
@@ -1,64 +0,0 @@
-import logger from '@overleaf/logger'
-import LoginRateLimiter from '../../../../app/src/Features/Security/LoginRateLimiter.js'
-import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
-import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
-import AuthenticationManagerLdap from './AuthenticationManagerLdap.mjs'
-
-const AuthenticationControllerLdap = {
-  async doPassportLdapLogin(req, ldapUser, done) {
-    let user, info
-    try {
-      ;({ user, info } = await AuthenticationControllerLdap._doPassportLdapLogin(
-        req,
-        ldapUser
-      ))
-    } catch (error) {
-      return done(error)
-    }
-    return done(undefined, user, info)
-  },
-  async _doPassportLdapLogin(req, ldapUser) {
-    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
-    const auditLog = {
-      ipAddress: req.ip,
-      info: { method: 'LDAP password login', fromKnownDevice },
-    }
-
-    let user, isPasswordReused
-    try {
-      user = await AuthenticationManagerLdap.promises.findOrCreateLdapUser(ldapUser, auditLog)
-    } catch (error) {
-      return {
-        user: false,
-        info: handleAuthenticateErrors(error, req),
-      }
-    }
-    if (user && AuthenticationController.captchaRequiredForLogin(req, user)) {
-      return {
-        user: false,
-        info: {
-          text: req.i18n.translate('cannot_verify_user_not_robot'),
-          type: 'error',
-          errorReason: 'cannot_verify_user_not_robot',
-          status: 400,
-        },
-      }
-    } else if (user) {
-      // async actions
-      return { user, info: undefined }
-    } else { //something wrong
-      logger.debug({ email : ldapUser.mail }, 'failed LDAP log in')
-      return {
-        user: false,
-        info: {
-          type: 'error',
-          status: 500,
-        },
-      }
-    }
-  },
-}
-
-export const {
-  doPassportLdapLogin,
-} = AuthenticationControllerLdap
diff --git a/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs b/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
deleted file mode 100644
index e7f312fc11..0000000000
--- a/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
+++ /dev/null
@@ -1,17 +0,0 @@
-import Settings from '@overleaf/settings'
-
-function initLdapSettings() {
-  Settings.ldap = {
-    enable: true,
-    placeholder:  process.env.OVERLEAF_LDAP_PLACEHOLDER || 'Username',
-    attEmail:     process.env.OVERLEAF_LDAP_EMAIL_ATT || 'mail',
-    attFirstName: process.env.OVERLEAF_LDAP_FIRST_NAME_ATT,
-    attLastName:  process.env.OVERLEAF_LDAP_LAST_NAME_ATT,
-    attName:      process.env.OVERLEAF_LDAP_NAME_ATT,
-    attAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT,
-    valAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT_VALUE,
-    updateUserDetailsOnLogin: String(process.env.OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN ).toLowerCase() === 'true',
-  }
-}
-
-export default initLdapSettings
diff --git a/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs b/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
deleted file mode 100644
index c4093b8684..0000000000
--- a/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
+++ /dev/null
@@ -1,136 +0,0 @@
-import Settings from '@overleaf/settings'
-import logger from '@overleaf/logger'
-import passport from 'passport'
-import ldapjs from 'ldapauth-fork/node_modules/ldapjs/lib/index.js'
-import UserGetter from '../../../../app/src/Features/User/UserGetter.js'
-import { splitFullName } from './AuthenticationManagerLdap.mjs'
-
-async function fetchLdapContacts(userId, contacts) {
-  if (!Settings.ldap?.enable || !process.env.OVERLEAF_LDAP_CONTACTS_FILTER) {
-    return []
-  }
-
-  const ldapOpts = passport._strategy('custom-fail-ldapauth').options.server
-  const { attEmail, attFirstName = "", attLastName = "", attName = "" } = Settings.ldap
-  const {
-    url,
-    timeout,
-    connectTimeout,
-    tlsOptions,
-    starttls,
-    bindDN,
-    bindCredentials,
-  } = ldapOpts
-  const searchBase = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_BASE || ldapOpts.searchBase
-  const searchScope = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_SCOPE || 'sub'
-  const ldapConfig = { url, timeout, connectTimeout, tlsOptions }
-
-  let ldapUsers
-  const client = ldapjs.createClient(ldapConfig)
-  try {
-    if (starttls) {
-      await _upgradeToTLS(client, tlsOptions)
-    }
-    await _bindLdap(client, bindDN, bindCredentials)
-
-    const filter = await _formContactsSearchFilter(client, ldapOpts, userId, process.env.OVERLEAF_LDAP_CONTACTS_FILTER)
-    const searchOptions = { scope: searchScope, attributes: [attEmail, attFirstName, attLastName, attName], filter }
-
-    ldapUsers = await _searchLdap(client, searchBase, searchOptions)
-  } catch (err) {
-    logger.warn({ err }, 'error in fetchLdapContacts')
-    return []
-  } finally {
-    client.unbind()
-  }
-
-  const newLdapContacts = ldapUsers.reduce((acc, ldapUser) => {
-    const email = Array.isArray(ldapUser[attEmail])
-                    ? ldapUser[attEmail][0]?.toLowerCase()
-                    : ldapUser[attEmail]?.toLowerCase()
-    if (!email) return acc
-    if (!contacts.some(contact => contact.email === email)) {
-      let nameParts = ["",""]
-      if ((!attFirstName || !attLastName) && attName) {
-        nameParts = splitFullName(ldapUser[attName] || "")
-      }
-      const firstName = attFirstName ? (ldapUser[attFirstName] || "") : nameParts[0]
-      const lastName  = attLastName  ? (ldapUser[attLastName]  || "") : nameParts[1]
-      acc.push({
-        first_name: firstName,
-        last_name: lastName,
-        email: email,
-        type: 'user',
-      })
-    }
-    return acc
-  }, [])
-
-  return newLdapContacts.sort((a, b) =>
-    a.last_name.localeCompare(b.last_name) ||
-    a.first_name.localeCompare(a.first_name) ||
-    a.email.localeCompare(b.email)
-  )
-}
-
-function _upgradeToTLS(client, tlsOptions) {
-  return new Promise((resolve, reject) => {
-    client.on('error', error => reject(new Error(`LDAP client error: ${error}`)))
-    client.on('connect', () => {
-      client.starttls(tlsOptions, null, error => {
-        if (error) {
-          reject(new Error(`StartTLS error: ${error}`))
-        } else {
-          resolve()
-        }
-      })
-    })
-  })
-}
-
-function _bindLdap(client, bindDN, bindCredentials) {
-  return new Promise((resolve, reject) => {
-    client.bind(bindDN, bindCredentials, error => {
-      if (error) {
-        reject(error)
-      } else {
-        resolve()
-      }
-    })
-  })
-}
-
-function _searchLdap(client, baseDN, options) {
-  return new Promise((resolve, reject) => {
-    const searchEntries = []
-    client.search(baseDN, options, (error, res) => {
-      if (error) {
-        reject(error)
-      } else {
-        res.on('searchEntry', entry => searchEntries.push(entry.object))
-        res.on('error', reject)
-        res.on('end', () => resolve(searchEntries))
-      }
-    })
-  })
-}
-
-async function _formContactsSearchFilter(client, ldapOpts, userId, contactsFilter) {
-  const searchProperty = process.env.OVERLEAF_LDAP_CONTACTS_PROPERTY
-  if (!searchProperty) {
-    return contactsFilter
-  }
-  const email = await UserGetter.promises.getUserEmail(userId)
-  const searchOptions = {
-    scope: ldapOpts.searchScope,
-    attributes: [searchProperty],
-    filter: `(${Settings.ldap.attEmail}=${email})`,
-  }
-  const searchBase = ldapOpts.searchBase
-  const ldapUser = (await _searchLdap(client, searchBase, searchOptions))[0]
-  const searchPropertyValue = ldapUser ? ldapUser[searchProperty]
-                                       : process.env.OVERLEAF_LDAP_CONTACTS_NON_LDAP_VALUE || 'IMATCHNOTHING'
-  return contactsFilter.replace(/{{userProperty}}/g, searchPropertyValue)
-}
-
-export default fetchLdapContacts
diff --git a/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs b/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
deleted file mode 100644
index b07dc3f3bd..0000000000
--- a/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
+++ /dev/null
@@ -1,78 +0,0 @@
-import fs from 'fs'
-import passport from 'passport'
-import Settings from '@overleaf/settings'
-import { doPassportLdapLogin } from './AuthenticationControllerLdap.mjs'
-import { Strategy as LdapStrategy } from 'passport-ldapauth'
-
-function _readFilesContentFromEnv(envVar) {
-// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
-  if (!envVar) return undefined
-  try {
-    const parsedFileNames = JSON.parse(envVar)
-    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
-  } catch (error) {
-    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
-      return fs.readFileSync(envVar, 'utf8')
-    } else {
-      throw error
-    }
-  }
-}
-
-//  custom responses on authentication failure
-class CustomFailLdapStrategy extends LdapStrategy {
-  constructor(options, validate) {
-    super(options, validate);
-    this.name = 'custom-fail-ldapauth'
-  }
-  authenticate(req, options) {
-    const defaultFail = this.fail.bind(this)
-    this.fail = function(info, status) {
-      info.type = 'error'
-      info.key = 'invalid-password-retry-or-reset'
-      info.status = 401
-      return defaultFail(info, status)
-    }.bind(this)
-    super.authenticate(req, options)
-  }
-}
-
-const ldapServerOpts = {
-  url: process.env.OVERLEAF_LDAP_URL,
-  bindDN: process.env.OVERLEAF_LDAP_BIND_DN || "",
-  bindCredentials: process.env.OVERLEAF_LDAP_BIND_CREDENTIALS || "",
-  bindProperty: process.env.OVERLEAF_LDAP_BIND_PROPERTY,
-  searchBase: process.env.OVERLEAF_LDAP_SEARCH_BASE,
-  searchFilter: process.env.OVERLEAF_LDAP_SEARCH_FILTER,
-  searchScope: process.env.OVERLEAF_LDAP_SEARCH_SCOPE || 'sub',
-  searchAttributes: JSON.parse(process.env.OVERLEAF_LDAP_SEARCH_ATTRIBUTES || '[]'),
-  groupSearchBase: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_BASE,
-  groupSearchFilter: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_FILTER,
-  groupSearchScope: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_SCOPE || 'sub',
-  groupSearchAttributes: ["dn"],
-  groupDnProperty: process.env.OVERLEAF_LDAP_ADMIN_DN_PROPERTY,
-  cache: String(process.env.OVERLEAF_LDAP_CACHE).toLowerCase() === 'true',
-  timeout: process.env.OVERLEAF_LDAP_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_TIMEOUT) : undefined,
-  connectTimeout: process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT) : undefined,
-  starttls: String(process.env.OVERLEAF_LDAP_STARTTLS).toLowerCase() === 'true',
-  tlsOptions: {
-    ca: _readFilesContentFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_CA_PATH),
-    rejectUnauthorized: String(process.env.OVERLEAF_LDAP_TLS_OPTS_REJECT_UNAUTH).toLowerCase() === 'true',
-  }
-}
-
-function addLdapStrategy(passport) {
-  passport.use(
-    new CustomFailLdapStrategy(
-      {
-        server: ldapServerOpts,
-        passReqToCallback: true,
-        usernameField: 'email',
-        passwordField: 'password',
-      },
-      doPassportLdapLogin
-    )
-  )
-}
-
-export default addLdapStrategy
diff --git a/services/web/modules/ldap-authentication/index.mjs b/services/web/modules/ldap-authentication/index.mjs
deleted file mode 100644
index f56d7ffee0..0000000000
--- a/services/web/modules/ldap-authentication/index.mjs
+++ /dev/null
@@ -1,30 +0,0 @@
-import initLdapSettings from './app/src/InitLdapSettings.mjs'
-import addLdapStrategy from './app/src/LdapStrategy.mjs'
-import fetchLdapContacts from './app/src/LdapContacts.mjs'
-
-let ldapModule = {};
-if (process.env.EXTERNAL_AUTH === 'ldap') {
-  initLdapSettings()
-  ldapModule = {
-    name: 'ldap-authentication',
-    hooks: {
-      passportSetup: function (passport, callback) {
-        try {
-          addLdapStrategy(passport)
-          callback(null)
-        } catch (error) {
-          callback(error)
-        }
-      },
-      getContacts: async function (userId, contacts, callback) {
-        try {
-          const newLdapContacts = await fetchLdapContacts(userId, contacts)
-          callback(null, newLdapContacts)
-        } catch (error) {
-          callback(error)
-        }
-      },
-    }
-  }
-}
-export default ldapModule
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs b/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
deleted file mode 100644
index 47d97f3019..0000000000
--- a/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
+++ /dev/null
@@ -1,60 +0,0 @@
-import Settings from '@overleaf/settings'
-import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
-import { User } from '../../../../app/src/models/User.js'
-
-const AuthenticationManagerSaml = {
-  async findOrCreateSamlUser(profile, auditLog) {
-    const {
-      attEmail,
-      attFirstName,
-      attLastName,
-      attAdmin,
-      valAdmin,
-      updateUserDetailsOnLogin,
-    } = Settings.saml
-    const email = Array.isArray(profile[attEmail])
-                    ? profile[attEmail][0].toLowerCase()
-                    : profile[attEmail].toLowerCase()
-    const firstName = attFirstName ? profile[attFirstName] : ""
-    const lastName  = attLastName  ? profile[attLastName] : email
-    let isAdmin = false
-    if( attAdmin && valAdmin ) {
-      isAdmin = (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
-                                                    profile[attAdmin] === valAdmin)
-    }
-    let user = await User.findOne({ 'email': email }).exec()
-    if( !user ) {
-      user = await UserCreator.promises.createNewUser(
-        {
-          email: email,
-          first_name: firstName,
-          last_name: lastName,
-          isAdmin: isAdmin,
-          holdingAccount: false,
-        }
-      )
-      await User.updateOne(
-        { _id: user._id },
-        { $set : { 'emails.0.confirmedAt' : Date.now() } }
-      ).exec() //email of saml user is confirmed
-    }
-    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
-    if( attAdmin && valAdmin ) {
-      user.isAdmin = isAdmin
-      userDetails.isAdmin = isAdmin
-    }
-    const result = await User.updateOne(
-      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
-      {}
-    ).exec()
-
-    if (result.modifiedCount !== 1) {
-      throw new ParallelLoginError()
-    }
-    return user
-  },
-}
-
-export default {
-  promises: AuthenticationManagerSaml,
-}
diff --git a/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs b/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
deleted file mode 100644
index 441f9033af..0000000000
--- a/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
+++ /dev/null
@@ -1,16 +0,0 @@
-import Settings from '@overleaf/settings'
-
-function initSamlSettings() {
-  Settings.saml = {
-    enable: true,
-    identityServiceName: process.env.OVERLEAF_SAML_IDENTITY_SERVICE_NAME || 'Login with SAML IdP',
-    attEmail:     process.env.OVERLEAF_SAML_EMAIL_FIELD || 'nameID',
-    attFirstName: process.env.OVERLEAF_SAML_FIRST_NAME_FIELD || 'givenName',
-    attLastName:  process.env.OVERLEAF_SAML_LAST_NAME_FIELD || 'lastName',
-    attAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD,
-    valAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD_VALUE,
-    updateUserDetailsOnLogin: String(process.env.OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN).toLowerCase() === 'true',
-  }
-}
-
-export default initSamlSettings
diff --git a/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
deleted file mode 100644
index 65b42c92ae..0000000000
--- a/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import logger from '@overleaf/logger'
-import { passportSamlLogin, passportSamlIdPLogout } from './AuthenticationControllerSaml.mjs'
-
-export default {
-  apply(webRouter) {
-    logger.debug({}, 'Init SAML NonCsrfRouter')
-    webRouter.get('/saml/login/callback', passportSamlLogin)
-    webRouter.post('/saml/login/callback', passportSamlLogin)
-    webRouter.get('/saml/logout/callback', passportSamlIdPLogout)
-    webRouter.post('/saml/logout/callback', passportSamlIdPLogout)
-  },
-}
diff --git a/services/web/modules/saml-authentication/app/src/SamlRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
deleted file mode 100644
index 9ee3677901..0000000000
--- a/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
+++ /dev/null
@@ -1,14 +0,0 @@
-import logger from '@overleaf/logger'
-import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
-import { passportSamlAuthWithIdP, passportSamlSPLogout, passportSamlMetadata} from './AuthenticationControllerSaml.mjs'
-
-export default {
-  apply(webRouter) {
-    logger.debug({}, 'Init SAML router')
-    webRouter.get('/saml/login', passportSamlAuthWithIdP)
-    AuthenticationController.addEndpointToLoginWhitelist('/saml/login')
-    webRouter.post('/saml/logout', AuthenticationController.requireLogin(), passportSamlSPLogout)
-    webRouter.get('/saml/meta', passportSamlMetadata)
-    AuthenticationController.addEndpointToLoginWhitelist('/saml/meta')
-  },
-}
diff --git a/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs b/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
deleted file mode 100644
index 3a16459f98..0000000000
--- a/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
+++ /dev/null
@@ -1,62 +0,0 @@
-import fs from 'fs'
-import passport from 'passport'
-import Settings from '@overleaf/settings'
-import { doPassportSamlLogin, doPassportSamlLogout } from './AuthenticationControllerSaml.mjs'
-import { Strategy as SamlStrategy } from '@node-saml/passport-saml'
-
-function _readFilesContentFromEnv(envVar) {
-// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
-  if (!envVar) return undefined
-  try {
-    const parsedFileNames = JSON.parse(envVar)
-    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
-  } catch (error) {
-    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
-      return fs.readFileSync(envVar, 'utf8')
-    } else {
-      throw error
-    }
-  }
-}
-
-const samlOptions = {
-  entryPoint: process.env.OVERLEAF_SAML_ENTRYPOINT,
-  callbackUrl: process.env.OVERLEAF_SAML_CALLBACK_URL,
-  issuer: process.env.OVERLEAF_SAML_ISSUER,
-  audience: process.env.OVERLEAF_SAML_AUDIENCE,
-  cert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_IDP_CERT),
-  signingCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PUBLIC_CERT),
-  privateKey:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PRIVATE_KEY),
-  decryptionCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_CERT),
-  decryptionPvk:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_PVK),
-  signatureAlgorithm: process.env.OVERLEAF_SAML_SIGNATURE_ALGORITHM,
-  additionalParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_PARAMS || '{}'),
-  additionalAuthorizeParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_AUTHORIZE_PARAMS || '{}'),
-  identifierFormat: process.env.OVERLEAF_SAML_IDENTIFIER_FORMAT,
-  acceptedClockSkewMs: process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS ? Number(process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS) : undefined,
-  attributeConsumingServiceIndex: process.env.OVERLEAF_SAML_ATTRIBUTE_CONSUMING_SERVICE_INDEX,
-  authnContext: process.env.OVERLEAF_SAML_AUTHN_CONTEXT ? JSON.parse(process.env.OVERLEAF_SAML_AUTHN_CONTEXT) : undefined,
-  forceAuthn: String(process.env.OVERLEAF_SAML_FORCE_AUTHN).toLowerCase() === 'true',
-  disableRequestedAuthnContext: String(process.env.OVERLEAF_SAML_DISABLE_REQUESTED_AUTHN_CONTEXT).toLowerCase() === 'true',
-  skipRequestCompression: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING === 'HTTP-POST',  // compression should be skipped iff authnRequestBinding is POST
-  authnRequestBinding: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING,
-  validateInResponseTo: process.env.OVERLEAF_SAML_VALIDATE_IN_RESPONSE_TO,
-  requestIdExpirationPeriodMs: process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS ? Number(process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS) : undefined,
-//  cacheProvider: process.env.OVERLEAF_SAML_CACHE_PROVIDER,
-  logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
-  logoutCallbackUrl: process.env.OVERLEAF_SAML_LOGOUT_CALLBACK_URL,
-  additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
-  passReqToCallback: true,
-}
-
-function addSamlStrategy(passport) {
-  passport.use(
-    new SamlStrategy(
-      samlOptions,
-      doPassportSamlLogin,
-      doPassportSamlLogout
-    )
-  )
-}
-
-export default addSamlStrategy
diff --git a/services/web/modules/saml-authentication/index.mjs b/services/web/modules/saml-authentication/index.mjs
deleted file mode 100644
index 35ea70283f..0000000000
--- a/services/web/modules/saml-authentication/index.mjs
+++ /dev/null
@@ -1,26 +0,0 @@
-import initSamlSettings from './app/src/InitSamlSettings.mjs'
-import addSamlStrategy from './app/src/SamlStrategy.mjs'
-import SamlRouter from './app/src/SamlRouter.mjs'
-import SamlNonCsrfRouter from './app/src/SamlNonCsrfRouter.mjs'
-
-let samlModule = {};
-
-if (process.env.EXTERNAL_AUTH === 'saml') {
-  initSamlSettings()
-  samlModule = {
-    name: 'saml-authentication',
-    hooks: {
-      passportSetup: function (passport, callback) {
-        try {
-          addSamlStrategy(passport)
-          callback(null)
-        } catch (error) {
-          callback(error)
-        }
-      },
-    },
-    router: SamlRouter,
-    nonCsrfRouter: SamlNonCsrfRouter,
-  }
-}
-export default samlModule
diff --git a/services/web/package.json b/services/web/package.json
index 59825e0e68..ff837e87ac 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -159,6 +159,7 @@
     "passport-ldapauth": "^2.1.4",
     "passport-local": "^1.0.0",
     "passport-oauth2": "^1.5.0",
+    "passport-openidconnect": "^0.1.2",
     "passport-orcid": "0.0.4",
     "pug": "^3.0.3",
     "pug-runtime": "^3.0.1",

From 855baba4240fdf0e2dc1ce5d38c7974d75bf0fe6 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 27 Jan 2025 04:58:23 +0100
Subject: [PATCH 003/274] Re-export `doLogout` (was removed from exports in
 commit b9fb636).

---
 services/web/app/src/Features/User/UserController.js            | 1 +
 .../oidc/app/src/OIDCAuthenticationController.mjs               | 2 +-
 .../saml/app/src/SAMLAuthenticationController.mjs               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index b767dcd4a1..cabab8c891 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -518,4 +518,5 @@ module.exports = {
   expireDeletedUsersAfterDuration: expressify(expireDeletedUsersAfterDuration),
   ensureAffiliationMiddleware: expressify(ensureAffiliationMiddleware),
   ensureAffiliation,
+  doLogout,
 }
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
index 42c01e712f..0b8dc501e0 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
@@ -158,7 +158,7 @@ const OIDCAuthenticationController = {
   async passportLogout(req, res, next) {
 // TODO: instead of storing idToken in session, use refreshToken to obtain a new idToken?
     const idTokenHint = req.session.idToken
-    await UserController.promises.doLogout(req)
+    await UserController.doLogout(req)
     const logoutUrl = process.env.OVERLEAF_OIDC_LOGOUT_URL
     const redirectUri = Settings.siteUrl
     res.redirect(`${logoutUrl}?id_token_hint=${idTokenHint}&post_logout_redirect_uri=${encodeURIComponent(redirectUri)}`)
diff --git a/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
index ac0e5398b2..3ed834608f 100644
--- a/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
@@ -102,7 +102,7 @@ const SAMLAuthenticationController = {
   },
   async passportLogout(req, res, next) {
     passport._strategy('saml').logout(req, async (err, url) => {
-      await UserController.promises.doLogout(req)
+      await UserController.doLogout(req)
       if (err) return next(err)
       res.redirect(url)
     })

From 9b23e0d8d772d271b89299dcf648c4256b263cb2 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Thu, 6 Feb 2025 12:12:03 +0100
Subject: [PATCH 004/274] Add ENV variables to control SAML signature
 validation

---
 .../modules/authentication/saml/app/src/SAMLModuleManager.mjs   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
index c7efdef214..29e9ae52cd 100644
--- a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
@@ -46,6 +46,8 @@ const SAMLModuleManager = {
       logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
       logoutCallbackUrl: `${Settings.siteUrl.replace(/\/+$/, '')}/saml/logout/callback`,
       additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
+      wantAssertionsSigned: boolFromEnv(process.env.OVERLEAF_SAML_WANT_ASSERTIONS_SIGNED),
+      wantAuthnResponseSigned: boolFromEnv(process.env.OVERLEAF_SAML_WANT_AUTHN_RESPONSE_SIGNED),
       passReqToCallback: true,
     }
     try {

From 8c3b7567746b4e88939ae88ed83483df51a30003 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Sat, 22 Feb 2025 03:26:25 +0100
Subject: [PATCH 005/274] Whitelist /oidc/login endpoint, fixes #21

---
 .../web/modules/authentication/oidc/app/src/OIDCRouter.mjs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
index 519fa5043a..0857e41889 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
@@ -1,5 +1,6 @@
 import logger from '@overleaf/logger'
 import UserController from '../../../../../app/src/Features/User/UserController.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
 import OIDCAuthenticationController from './OIDCAuthenticationController.mjs'
 import logout from '../../../logout.mjs'
 
@@ -7,7 +8,9 @@ export default {
   apply(webRouter) {
     logger.debug({}, 'Init OIDC router')
     webRouter.get('/oidc/login', OIDCAuthenticationController.passportLogin)
+    AuthenticationController.addEndpointToLoginWhitelist('/oidc/login')
     webRouter.get('/oidc/login/callback', OIDCAuthenticationController.passportLoginCallback)
+    AuthenticationController.addEndpointToLoginWhitelist('/oidc/login/callback')
     webRouter.get('/oidc/logout/callback', OIDCAuthenticationController.passportLogoutCallback)
     webRouter.post('/user/oauth-unlink', OIDCAuthenticationController.unlinkAccount)
     webRouter.post('/logout', logout, UserController.logout)

From acb0a75e6ed380bbb4cc11d4c10f13899e082b29 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 10 Mar 2025 05:55:01 +0100
Subject: [PATCH 006/274] See upstream commit 42ee56e

---
 services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
index 44d9d373d2..d2bbb35236 100644
--- a/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
@@ -10,7 +10,7 @@ export default {
     logger.debug({}, 'Init LDAP router')
     webRouter.post('/login',
       RateLimiterMiddleware.rateLimit(overleafLoginRateLimiter), // rate limit IP (20 / 60s)
-      RateLimiterMiddleware.loginRateLimitEmail, // rate limit email (10 / 120s)
+      RateLimiterMiddleware.loginRateLimitEmail(), // rate limit email (10 / 120s)
       CaptchaMiddleware.validateCaptcha('login'),
       LDAPAuthenticationController.passportLogin,
       AuthenticationController.passportLogin,

From 7770eddc17a1e2076518a9d39579b8911691fd20 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 10 Mar 2025 06:37:50 +0100
Subject: [PATCH 007/274] Make OVERLEAF_OIDC_USER_ID_FIELD support 'email' as a
 value

---
 .../authentication/oidc/app/src/OIDCAuthenticationManager.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
index 56ec2e5455..5295ce63d0 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -13,8 +13,8 @@ const OIDCAuthenticationManager = {
       updateUserDetailsOnLogin,
       providerId,
     } = Settings.oidc
-    const oidcUserId = profile[attUserId]
     const email = profile.emails[0].value
+    const oidcUserId = (attUserId === 'email') ? email : profile[attUserId]
     const firstName = profile.name?.givenName || ""
     const lastName  = profile.name?.familyName || ""
     let isAdmin = false
@@ -83,7 +83,7 @@ const OIDCAuthenticationManager = {
       attUserId,
       providerId,
     } = Settings.oidc
-    const oidcUserId = profile[attUserId]
+    const oidcUserId = (attUserId === 'email') ? profile.emails[0].value : profile[attUserId]
     const oidcUserData = null // Possibly it can be used later
     await ThirdPartyIdentityManager.promises.link(userId, providerId, oidcUserId, oidcUserData, auditLog)
   },

From ca16cc8fa620701d116d0dd2253236ef9011452d Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Fri, 4 Apr 2025 15:14:14 +0200
Subject: [PATCH 008/274] Allow EXTERNAL_AUTH to be undefined, fixes #26

---
 services/web/modules/authentication/ldap/index.mjs | 2 +-
 services/web/modules/authentication/oidc/index.mjs | 2 +-
 services/web/modules/authentication/saml/index.mjs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/web/modules/authentication/ldap/index.mjs b/services/web/modules/authentication/ldap/index.mjs
index 244a8db8e7..94743a6611 100644
--- a/services/web/modules/authentication/ldap/index.mjs
+++ b/services/web/modules/authentication/ldap/index.mjs
@@ -1,5 +1,5 @@
 let ldapModule = {}
-if (process.env.EXTERNAL_AUTH.includes('ldap')) {
+if (process.env.EXTERNAL_AUTH?.includes('ldap')) {
   const { default: LDAPModuleManager } = await import('./app/src/LDAPModuleManager.mjs')
   const { default: router } = await import('./app/src/LDAPRouter.mjs')
   LDAPModuleManager.initSettings()
diff --git a/services/web/modules/authentication/oidc/index.mjs b/services/web/modules/authentication/oidc/index.mjs
index 51d9e0d483..f10ff64c82 100644
--- a/services/web/modules/authentication/oidc/index.mjs
+++ b/services/web/modules/authentication/oidc/index.mjs
@@ -1,5 +1,5 @@
 let oidcModule = {}
-if (process.env.EXTERNAL_AUTH.includes('oidc')) {
+if (process.env.EXTERNAL_AUTH?.includes('oidc')) {
   const { default: OIDCModuleManager } = await import('./app/src/OIDCModuleManager.mjs')
   const { default: router } = await import('./app/src/OIDCRouter.mjs')
   OIDCModuleManager.initSettings()
diff --git a/services/web/modules/authentication/saml/index.mjs b/services/web/modules/authentication/saml/index.mjs
index 2d6ee5706c..36f0281637 100644
--- a/services/web/modules/authentication/saml/index.mjs
+++ b/services/web/modules/authentication/saml/index.mjs
@@ -1,5 +1,5 @@
 let samlModule = {}
-if (process.env.EXTERNAL_AUTH.includes('saml')) {
+if (process.env.EXTERNAL_AUTH?.includes('saml')) {
   const { default: SAMLModuleManager } = await import('./app/src/SAMLModuleManager.mjs')
   const { default: router } = await import('./app/src/SAMLRouter.mjs')
   const { default: nonCsrfRouter } = await import('./app/src/SAMLNonCsrfRouter.mjs')

From 17c07707db3f8764ad3f2f9357374499a5ffd30b Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Fri, 23 May 2025 16:00:40 +0200
Subject: [PATCH 009/274] Fix login page

---
 services/web/app/views/user/login.pug | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index 1ed2fc4950..ffeb3eca89 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -48,20 +48,20 @@ block content
 									hr
 									p.text-center !{login_support_text}	
 							if settings.saml && settings.saml.enable
-								form(data-ol-async-form, name="samlLoginForm")
-									.actions(style='margin-top: 30px;')
-										a.btn.btn-secondary.btn-block(
-											href='/saml/login',
-											data-ol-disabled-inflight
-										)
-											span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
-											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
+								.actions(style='margin-top: 30px;')
+									a.button.btn-secondary.btn(
+									href='/saml/login',
+										style="width: 100%;"
+										data-ol-disabled-inflight
+									)
+										span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
+										span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
 							if settings.oidc && settings.oidc.enable
-								form(data-ol-async-form, name="oidcLoginForm")
-									.actions(style='margin-top: 30px;')
-										a.btn.btn-secondary.btn-block(
-											href='/oidc/login',
-											data-ol-disabled-inflight
-										)
-											span(data-ol-inflight="idle") #{settings.oidc.identityServiceName}
-											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
+								.actions(style='margin-top: 30px;')
+									a.button.btn-secondary.btn(
+										href='/oidc/login',
+										style="width: 100%;"
+										data-ol-disabled-inflight
+									)
+										span(data-ol-inflight="idle") #{settings.oidc.identityServiceName}
+										span(hidden data-ol-inflight="pending") #{translate("logging_in")}…

From 339968e8d8cd0dc9340771c26f989f8301fa4f43 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 16 Jun 2025 13:39:16 +0200
Subject: [PATCH 010/274] Avoid DEP0174 by removing async from callback-based
 getGroupPolicyForUser

---
 .../ldap/app/src/LDAPModuleManager.mjs        | 20 +++++++++----------
 .../oidc/app/src/OIDCModuleManager.mjs        | 20 +++++++++----------
 .../saml/app/src/SAMLModuleManager.mjs        | 19 +++++++++---------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
index 846ca9b158..64afd02b0c 100644
--- a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
@@ -94,18 +94,18 @@ const LDAPModuleManager = {
       logger.info({}, error.message)
     }
   },
-  async getGroupPolicyForUser(user, callback) {
-    try {
-      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
-        user,
-        groupPolicy : { 'ldapPolicy' : true },
-        subscription : null
-      })
+
+  getGroupPolicyForUser(user, callback) {
+    PermissionsManager.promises.getUserValidationStatus({
+      user,
+      groupPolicy : { 'ldapPolicy' : true },
+      subscription : null
+    }).then(userValidationMap => {
       let groupPolicy = Object.fromEntries(userValidationMap)
-      callback(null,  {'groupPolicy' : groupPolicy })
-    } catch (error) {
+      callback(null, { groupPolicy })
+    }).catch(error => {
       callback(error)
-    }
+    })
   },
 }
 
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
index 3a2e6e2780..ec734ced19 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -64,18 +64,18 @@ const OIDCModuleManager = {
       logger.info({}, error.message)
     }
   },
-  async getGroupPolicyForUser(user, callback) {
-    try {
-      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
-        user,
-        groupPolicy : { 'oidcPolicy' : true },
-        subscription : null
-      })
+
+  getGroupPolicyForUser(user, callback) {
+    PermissionsManager.promises.getUserValidationStatus({
+      user,
+      groupPolicy : { 'oidcPolicy' : true },
+      subscription : null
+    }).then(userValidationMap => {
       let groupPolicy = Object.fromEntries(userValidationMap)
-      callback(null,  {'groupPolicy' : groupPolicy })
-    } catch (error) {
+      callback(null, { groupPolicy })
+    }).catch(error => {
       callback(error)
-    }
+    })
   },
 }
 
diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
index 29e9ae52cd..67545f7fc9 100644
--- a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
@@ -84,18 +84,17 @@ const SAMLModuleManager = {
       logger.info({}, error.message)
     }
   },
-  async getGroupPolicyForUser(user, callback) {
-    try {
-      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
-        user,
-        groupPolicy : { 'samlPolicy' : true },
-        subscription : null
-      })
+  getGroupPolicyForUser(user, callback) {
+    PermissionsManager.promises.getUserValidationStatus({
+      user,
+      groupPolicy : { 'samlPolicy' : true },
+      subscription : null
+    }).then(userValidationMap => {
       let groupPolicy = Object.fromEntries(userValidationMap)
-      callback(null,  {'groupPolicy' : groupPolicy })
-    } catch (error) {
+      callback(null, { groupPolicy })
+    }).catch(error => {
       callback(error)
-    }
+    })
   },
 }
 

From 04e04e63189733ccff89f80908d6001d96c7a5de Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Tue, 24 Jun 2025 00:51:45 +0200
Subject: [PATCH 011/274] Introduce an environment variable to control user
 creation in OIDC authentication, closes #47

---
 services/web/app/src/infrastructure/Features.js    |  2 +-
 .../oidc/app/src/OIDCAuthenticationController.mjs  | 14 +++++++-------
 .../oidc/app/src/OIDCAuthenticationManager.mjs     |  3 +++
 .../oidc/app/src/OIDCModuleManager.mjs             |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/services/web/app/src/infrastructure/Features.js b/services/web/app/src/infrastructure/Features.js
index aaf51103b9..3264c323cd 100644
--- a/services/web/app/src/infrastructure/Features.js
+++ b/services/web/app/src/infrastructure/Features.js
@@ -56,7 +56,7 @@ const Features = {
       case 'registration-page':
         return (
           !Features.externalAuthenticationSystemUsed() ||
-          Boolean(Settings.overleaf)
+          Boolean(Settings.overleaf) || Settings.oidc?.disableJITAccountCreation
         )
       case 'registration':
         return Boolean(Settings.overleaf)
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
index 0b8dc501e0..f8bbd32c29 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
@@ -42,7 +42,8 @@ const OIDCAuthenticationController = {
           }
         } else {
           if (info.redir != null) {
-            return res.json({ redir: info.redir })
+            await UserController.doLogout(req)
+            return res.redirect(info.redir)
           } else {
             res.status(info.status || 401)
             delete info.status
@@ -95,20 +96,19 @@ const OIDCAuthenticationController = {
         info: {
           type: 'error',
           text: error.message,
-          status: 401,
+          status: 500,
         },
       }
     }
     if (user) {
       return { user, info: undefined }
-    } else { // we cannot be here, something is terribly wrong
-      logger.debug({ email : profile.emails[0].value }, 'failed OIDC log in')
+    } else { // user account is not created
+      logger.debug({ email : profile.emails[0].value }, 'OIDC users JIT account creation is off')
       return {
         user: false,
         info: {
-          type: 'error',
-          text: 'Unknown error',
-          status: 500,
+          redir: '/register',
+          status: 401,
         },
       }
     }
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
index 5295ce63d0..3082558e39 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -37,6 +37,9 @@ const OIDCAuthenticationManager = {
 // (Is it safe? Concider: If an account from the specified provider is already linked to this user, throw an error)
       user = await User.findOne({ 'email': email }).exec()
       if (!user) {
+        if (Settings.oidc.disableJITAccountCreation) {
+          return null
+        }
         user = await UserCreator.promises.createNewUser(
           {
             email: email,
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
index ec734ced19..debb5c8c5d 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -17,6 +17,7 @@ const OIDCModuleManager = {
       attAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD,
       valAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD_VALUE,
       updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_OIDC_UPDATE_USER_DETAILS_ON_LOGIN),
+      disableJITAccountCreation: boolFromEnv(process.env.OVERLEAF_OIDC_DISABLE_JIT_ACCOUNT_CREATION),
     }
   },
   passportSetup(passport, callback) {

From c40ab3234dd413b045157c9739d97ff91c25c6cb Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Mon, 23 Jun 2025 10:08:08 +0200
Subject: [PATCH 012/274] Prettier for PUG templates (#26170)

* Setup prettier

* Ignore these pug templates by prettier

* Fix typo

* Fix prettier error

* Add prettier-ignore for quoting of event-segmentation attribute

* Manual tab indentation

* Interpolate

* Remove unbuffered if conditional

* Inline event-segmentation objects and remove prettier-ignore rule

* Fix spacing before interpolation

* Source format

* Source format

GitOrigin-RevId: c30e037f5caf8f91efc1bd9e75f81ae533b5a506
---
 package-lock.json                             |  28 ++
 services/web/.prettierignore                  |  25 +
 services/web/.prettierrc                      |  16 +-
 services/web/Makefile                         |   7 +
 services/web/app/views/_cookie_banner.pug     |  18 +-
 services/web/app/views/_metadata.pug          | 157 ++++---
 .../web/app/views/_mixins/back_to_btns.pug    |   4 +-
 .../web/app/views/_mixins/begin_now_card.pug  |  10 +-
 .../app/views/_mixins/bookmarkable_tabset.pug |   8 +-
 .../web/app/views/_mixins/bootstrap_js.pug    |   4 +-
 services/web/app/views/_mixins/eyebrow.pug    |   8 +-
 .../views/_mixins/faq_search-marketing.pug    |  29 +-
 .../web/app/views/_mixins/foot_scripts.pug    |  15 +-
 .../web/app/views/_mixins/formMessages.pug    | 110 ++---
 services/web/app/views/_mixins/links.pug      |  75 ++-
 .../web/app/views/_mixins/material_symbol.pug |   5 +-
 services/web/app/views/_mixins/navbar.pug     |  14 +-
 .../web/app/views/_mixins/notification.pug    |  16 +-
 services/web/app/views/_mixins/pagination.pug |  45 +-
 .../app/views/_mixins/previous_page_link.pug  |   2 +-
 services/web/app/views/_mixins/quote.pug      |  28 +-
 services/web/app/views/_mixins/recaptcha.pug  |   2 +-
 .../reconfirm_affiliation-marketing.pug       |  36 +-
 .../app/views/_mixins/terms_of_service.pug    |   2 +-
 services/web/app/views/admin/index.pug        |  85 ++--
 .../web/app/views/beta_program/opt_in.pug     |  49 +-
 services/web/app/views/general/400.pug        |  14 +-
 services/web/app/views/general/404.pug        |   4 +-
 services/web/app/views/general/500.pug        |  10 +-
 services/web/app/views/general/closed.pug     |   2 +-
 .../web/app/views/general/post-gateway.pug    |  14 +-
 .../app/views/general/unsupported-browser.pug |  10 +-
 services/web/app/views/layout-base.pug        | 133 ++++--
 services/web/app/views/layout-marketing.pug   |  10 +-
 services/web/app/views/layout-react.pug       |  70 +--
 .../web/app/views/layout-website-redesign.pug |  12 +-
 .../web/app/views/layout/fat-footer-base.pug  |  67 ++-
 .../layout/fat-footer-website-redesign.pug    |  79 ++--
 services/web/app/views/layout/fat-footer.pug  |  79 ++--
 .../layout/language-picker-bootstrap-5.pug    |  30 +-
 .../web/app/views/layout/language-picker.pug  |  27 +-
 .../web/app/views/layout/layout-no-js.pug     |  14 +-
 .../layout/navbar-marketing-bootstrap-5.pug   | 204 ++++----
 .../web/app/views/layout/navbar-marketing.pug | 191 ++++----
 .../views/layout/navbar-website-redesign.pug  | 182 ++++----
 .../views/layout/thin-footer-bootstrap-5.pug  |   4 +-
 services/web/app/views/layout/thin-footer.pug |   4 +-
 .../project/editor/new_from_template.pug      |  58 +--
 .../app/views/project/ide-react-detached.pug  |   2 +-
 services/web/app/views/project/ide-react.pug  |   9 +-
 .../app/views/project/invite/not-valid.pug    |   6 +-
 .../web/app/views/project/invite/show.pug     |  16 +-
 services/web/app/views/project/list-react.pug | 106 +++--
 .../app/views/project/token/access-react.pug  |  10 +-
 .../views/project/token/sharing-updates.pug   |   8 +-
 .../web/app/views/subscriptions/add-seats.pug |  18 +-
 .../canceled-subscription-react.pug           |   4 +-
 .../views/subscriptions/dashboard-react.pug   | 109 +++--
 .../manually-collected-subscription.pug       |   6 +-
 .../missing-billing-information.pug           |   6 +-
 .../views/subscriptions/plans/_faq_new.pug    |  70 ++-
 .../subscriptions/plans/_plans_faq_tabs.pug   | 438 +++++++++---------
 .../views/subscriptions/preview-change.pug    |  12 +-
 .../subscriptions/subtotal-limit-exceeded.pug |   6 +-
 .../successful-subscription-react.pug         |   8 +-
 .../subscriptions/team/group-invites.pug      |   6 +-
 .../subscriptions/team/invite-managed.pug     |  26 +-
 .../app/views/subscriptions/team/invite.pug   |  26 +-
 .../subscriptions/team/invite_logged_out.pug  |  14 +-
 .../upgrade-group-subscription-react.pug      |  14 +-
 .../web/app/views/user/accountSuspended.pug   |   2 +-
 .../app/views/user/compromised_password.pug   |   2 +-
 .../app/views/user/confirmSecondaryEmail.pug  |   2 +-
 services/web/app/views/user/confirm_email.pug |  54 +--
 .../web/app/views/user/email-preferences.pug  |  34 +-
 services/web/app/views/user/login.pug         |  40 +-
 .../web/app/views/user/one_time_login.pug     |   4 +-
 .../web/app/views/user/passwordReset-bs5.pug  |  56 +--
 services/web/app/views/user/passwordReset.pug |  70 +--
 .../app/views/user/primaryEmailCheck-bs5.pug  |  38 +-
 services/web/app/views/user/reconfirm-bs5.pug |  55 +--
 services/web/app/views/user/reconfirm.pug     |  57 +--
 services/web/app/views/user/register.pug      |   6 +-
 services/web/app/views/user/sessions.pug      |  32 +-
 .../web/app/views/user/setPassword-bs5.pug    |  50 +-
 services/web/app/views/user/setPassword.pug   |  66 +--
 services/web/app/views/user/settings.pug      |  81 ++--
 .../user_membership/group-managers-react.pug  |  10 +-
 .../user_membership/group-members-react.pug   |  40 +-
 .../institution-managers-react.pug            |  10 +-
 .../web/app/views/user_membership/new.pug     |  19 +-
 .../publisher-managers-react.pug              |  10 +-
 .../modules/launchpad/app/views/launchpad.pug | 159 +++----
 .../user-activate/app/views/user/activate.pug |  58 ++-
 .../user-activate/app/views/user/register.pug |   4 +-
 services/web/package.json                     |   3 +
 96 files changed, 2140 insertions(+), 1758 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a3bb7696d..53388a5732 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8911,6 +8911,33 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
+    "node_modules/@prettier/plugin-pug": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-3.4.0.tgz",
+      "integrity": "sha512-Jzd5rE/ellJz3vqfxyVewPsCHXw1dmIzJ3AXhAnqVBKQOj2u73ZS2oUacji8CbQSsYyCy7GXFjXWDlDTMG1x2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/Shinigami92"
+        },
+        {
+          "type": "paypal",
+          "url": "https://www.paypal.com/donate/?hosted_button_id=L7GY729FBKTZY"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "pug-lexer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=9.0.0"
+      },
+      "peerDependencies": {
+        "prettier": "^3.0.0"
+      }
+    },
     "node_modules/@protobufjs/aspromise": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
@@ -45272,6 +45299,7 @@
         "@pollyjs/adapter-node-http": "^6.0.6",
         "@pollyjs/core": "^6.0.6",
         "@pollyjs/persister-fs": "^6.0.6",
+        "@prettier/plugin-pug": "^3.4.0",
         "@replit/codemirror-emacs": "overleaf/codemirror-emacs#4394c03858f27053f8768258e9493866e06e938e",
         "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#78264032eb286bc47871569ae87bff5ca1c6c161",
         "@replit/codemirror-vim": "overleaf/codemirror-vim#1bef138382d948018f3f9b8a4d7a70ab61774e4b",
diff --git a/services/web/.prettierignore b/services/web/.prettierignore
index 94ab5579c2..2e8db8b35b 100644
--- a/services/web/.prettierignore
+++ b/services/web/.prettierignore
@@ -13,3 +13,28 @@ frontend/js/features/source-editor/lezer-latex/latex.terms.mjs
 frontend/js/features/source-editor/lezer-bibtex/bibtex.mjs
 frontend/js/features/source-editor/lezer-bibtex/bibtex.terms.mjs
 frontend/js/features/source-editor/hunspell/wasm/hunspell.mjs
+
+# complex pages
+app/views/project/editor.pug
+app/views/project/editor/**
+modules/open-in-overleaf/app/views/documentation.pug
+modules/references-search/app/views/project/editor/**
+modules/rich-text/app/views/toolbar.pug
+
+# loops
+app/views/referal/bonus.pug
+modules/templates/app/views/tag.pug
+
+# expressions that could not be formatted correctly
+app/views/_mixins/faq_search.pug
+app/views/external/home/v2.pug
+app/views/project/token/access.pug
+app/views/user/primaryEmailCheck.pug
+app/views/user/restricted.pug
+modules/admin-panel/app/views/project/show.pug
+modules/templates/app/views/project/editor/_left-menu.pug
+modules/two-factor-authentication/app/views/_mixins.pug
+
+# minified files
+app/views/_google_analytics.pug
+app/views/_customer_io.pug
diff --git a/services/web/.prettierrc b/services/web/.prettierrc
index 13e31862ff..b99212a874 100644
--- a/services/web/.prettierrc
+++ b/services/web/.prettierrc
@@ -1,9 +1,23 @@
 {
   "arrowParens": "avoid",
   "jsxSingleQuote": false,
+  "pugAttributeSeparator": "as-needed",
+  "pugBracketSpacing": false,
+  "pugClassNotation": "as-is",
+  "pugIdNotation": "as-is",
+  "pugSortAttributesBeginning": ["name", "data-type"],
+  "plugins": ["@prettier/plugin-pug"],
   "semi": false,
   "singleQuote": true,
   "trailingComma": "es5",
   "tabWidth": 2,
-  "useTabs": false
+  "useTabs": false,
+  "overrides": [
+    {
+      "files": "*.pug",
+      "options": {
+        "useTabs": true
+      }
+    }
+  ]
 }
diff --git a/services/web/Makefile b/services/web/Makefile
index 6ebbc357c6..f5a7542691 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -455,12 +455,19 @@ format: format_styles
 format_styles:
 	npm run --silent format:styles
 
+format: format_pug
+format_pug:
+	npm run --silent format:pug
+
 format_fix:
 	npm run --silent format:fix
 
 format_styles_fix:
 	npm run --silent format:styles:fix
 
+format_pug_fix:
+	npm run --silent format:pug:fix
+
 format_in_docker:
 	$(RUN_LINT_FORMAT) make format -j2 --output-sync
 
diff --git a/services/web/app/views/_cookie_banner.pug b/services/web/app/views/_cookie_banner.pug
index 2d5631f9c8..56974326cd 100644
--- a/services/web/app/views/_cookie_banner.pug
+++ b/services/web/app/views/_cookie_banner.pug
@@ -1,5 +1,13 @@
-section.cookie-banner.hidden-print.hidden(aria-label="Cookie banner")
-    .cookie-banner-content We only use cookies for essential purposes and to improve your experience on our site. You can find out more in our <a href="/legal#Cookies">cookie policy</a>.
-    .cookie-banner-actions
-        button(type="button" class="btn btn-link btn-sm" data-ol-cookie-banner-set-consent="essential") Essential cookies only
-        button(type="button" class="btn btn-primary btn-sm" data-ol-cookie-banner-set-consent="all") Accept all cookies
+section.cookie-banner.hidden-print.hidden(aria-label='Cookie banner')
+	.cookie-banner-content We only use cookies for essential purposes and to improve your experience on our site. You can find out more in our <a href="/legal#Cookies">cookie policy</a>.
+	.cookie-banner-actions
+		button(
+			type='button'
+			class='btn btn-link btn-sm'
+			data-ol-cookie-banner-set-consent='essential'
+		) Essential cookies only
+		button(
+			type='button'
+			class='btn btn-primary btn-sm'
+			data-ol-cookie-banner-set-consent='all'
+		) Accept all cookies
diff --git a/services/web/app/views/_metadata.pug b/services/web/app/views/_metadata.pug
index a784860095..6d7c599546 100644
--- a/services/web/app/views/_metadata.pug
+++ b/services/web/app/views/_metadata.pug
@@ -1,123 +1,140 @@
-
 //- Title
-if (metadata && metadata.title)
-	title= metadata.title + ' - ' + settings.appName + ', ' + translate("online_latex_editor")
-	meta(name="twitter:title", content=metadata.title)
-	meta(name="og:title", content=metadata.title)
-else if (typeof(title) == "undefined")
-	title= settings.appName + ', '+ translate("online_latex_editor")
-	meta(name="twitter:title", content=settings.appName + ', '+ translate("online_latex_editor"))
-	meta(name="og:title", content=settings.appName + ', '+ translate("online_latex_editor"))
+if metadata && metadata.title
+	title= metadata.title + ' - ' + settings.appName + ', ' + translate('online_latex_editor')
+	meta(name='twitter:title' content=metadata.title)
+	meta(name='og:title' content=metadata.title)
+else if typeof title == 'undefined'
+	title= settings.appName + ', ' + translate('online_latex_editor')
+	meta(
+		name='twitter:title'
+		content=settings.appName + ', ' + translate('online_latex_editor')
+	)
+	meta(
+		name='og:title'
+		content=settings.appName + ', ' + translate('online_latex_editor')
+	)
 else
-	title= translate(title) + ' - ' + settings.appName + ', ' + translate("online_latex_editor")
+	title= translate(title) + ' - ' + settings.appName + ', ' + translate('online_latex_editor')
 	//- to do - not translate?
-	meta(name="twitter:title", content=translate(title))
-	meta(name="og:title", content=translate(title))
+	meta(name='twitter:title' content=translate(title))
+	meta(name='og:title' content=translate(title))
 
 //- Description
-if (metadata && metadata.description)
-	meta(name="description" , content=metadata.description)
-	meta(itemprop="description" , content=metadata.description)
+if metadata && metadata.description
+	meta(name='description' content=metadata.description)
+	meta(itemprop='description' content=metadata.description)
 	//-twitter and og descriptions handeled in their sections below
 else
-	meta(name="description", content=translate("site_description"))
-	meta(itemprop="description", content=translate("site_description"))
+	meta(name='description' content=translate('site_description'))
+	meta(itemprop='description' content=translate('site_description'))
 
 //- Image
-if (metadata && metadata.image && metadata.image.fields)
+if metadata && metadata.image && metadata.image.fields
 	//- from the CMS
-	meta(itemprop="image", content=metadata.image.fields.file.url)
-	meta(name="image", content=metadata.image.fields.file.url)
-else if (metadata && metadata.image_src)
+	meta(itemprop='image' content=metadata.image.fields.file.url)
+	meta(name='image' content=metadata.image.fields.file.url)
+else if metadata && metadata.image_src
 	//- pages with custom metadata images, metadata.image_src is the full image URL
-	meta(itemprop="image", content=metadata.image_src)
-	meta(name="image", content=metadata.image_src)
-else if (settings.overleaf)
+	meta(itemprop='image' content=metadata.image_src)
+	meta(name='image' content=metadata.image_src)
+else if settings.overleaf
 	//- the default image for Overleaf
-	meta(itemprop="image", content=buildImgPath('ol-brand/overleaf_og_logo.png'))
-	meta(name="image", content=buildImgPath('ol-brand/overleaf_og_logo.png'))
+	meta(itemprop='image' content=buildImgPath('ol-brand/overleaf_og_logo.png'))
+	meta(name='image' content=buildImgPath('ol-brand/overleaf_og_logo.png'))
 else
 	//- the default image for Overleaf Community Edition/Server Pro
-	meta(itemprop="image", content='/apple-touch-icon.png')
-	meta(name="image", content='/apple-touch-icon.png')
+	meta(itemprop='image' content='/apple-touch-icon.png')
+	meta(name='image' content='/apple-touch-icon.png')
 
 //- Keywords
-if (metadata && metadata.keywords)
-	meta(name="keywords" content=metadata.keywords)
+if metadata && metadata.keywords
+	meta(name='keywords' content=metadata.keywords)
 
 //- Misc
-meta(itemprop="name", content=settings.appName + ", the Online LaTeX Editor")
+meta(itemprop='name' content=settings.appName + ', the Online LaTeX Editor')
 
-if (metadata && metadata.robotsNoindexNofollow)
-	meta(name="robots" content="noindex, nofollow")
+if metadata && metadata.robotsNoindexNofollow
+	meta(name='robots' content='noindex, nofollow')
 
 //- Twitter
-meta(name="twitter:card", content=metadata && metadata.twitterCardType ? metadata.twitterCardType : 'summary')
-if (settings.social && settings.social.twitter && settings.social.twitter.handle)
-	meta(name="twitter:site", content="@" + settings.social.twitter.handle)
-if (metadata && metadata.twitterDescription)
-	meta(name="twitter:description", content=metadata.twitterDescription)
+meta(
+	name='twitter:card'
+	content=metadata && metadata.twitterCardType ? metadata.twitterCardType : 'summary'
+)
+if settings.social && settings.social.twitter && settings.social.twitter.handle
+	meta(name='twitter:site' content='@' + settings.social.twitter.handle)
+if metadata && metadata.twitterDescription
+	meta(name='twitter:description' content=metadata.twitterDescription)
 else
-	meta(name="twitter:description", content=translate("site_description"))
-if (metadata && metadata.twitterImage && metadata.twitterImage.fields)
+	meta(name='twitter:description' content=translate('site_description'))
+if metadata && metadata.twitterImage && metadata.twitterImage.fields
 	//- from the CMS
-	meta(name="twitter:image", content=metadata.twitterImage.fields.file.url)
-	meta(name="twitter:image:alt", content=metadata.twitterImage.fields.title)
-else if (settings.overleaf)
+	meta(name='twitter:image' content=metadata.twitterImage.fields.file.url)
+	meta(name='twitter:image:alt' content=metadata.twitterImage.fields.title)
+else if settings.overleaf
 	//- the default image for Overleaf
-	meta(name="twitter:image", content=buildImgPath('ol-brand/overleaf_og_logo.png'))
+	meta(
+		name='twitter:image'
+		content=buildImgPath('ol-brand/overleaf_og_logo.png')
+	)
 else
 	//- the default image for Overleaf Community Edition/Server Pro
-	meta(name="twitter:image", content='/apple-touch-icon.png')
+	meta(name='twitter:image' content='/apple-touch-icon.png')
 
 //- Open Graph
 //- to do - add og:url
-if (settings.social && settings.social.facebook && settings.social.facebook.appId)
-	meta(property="fb:app_id", content=settings.social.facebook.appId)
+if settings.social && settings.social.facebook && settings.social.facebook.appId
+	meta(property='fb:app_id' content=settings.social.facebook.appId)
 
-if (metadata && metadata.openGraphDescription)
-	meta(property="og:description", content=metadata.openGraphDescription)
+if metadata && metadata.openGraphDescription
+	meta(property='og:description' content=metadata.openGraphDescription)
 else
-	meta(property="og:description", content=translate("site_description"))
+	meta(property='og:description' content=translate('site_description'))
 
-if (metadata && metadata.openGraphImage && metadata.openGraphImage.fields)
+if metadata && metadata.openGraphImage && metadata.openGraphImage.fields
 	//- from the CMS
-	meta(property="og:image", content=metadata.openGraphImage.fields.file.url)
-else if (settings.overleaf)
+	meta(property='og:image' content=metadata.openGraphImage.fields.file.url)
+else if settings.overleaf
 	//- the default image for Overleaf
-	meta(property="og:image", content=buildImgPath('ol-brand/overleaf_og_logo.png'))
+	meta(
+		property='og:image'
+		content=buildImgPath('ol-brand/overleaf_og_logo.png')
+	)
 else
 	//- the default image for Overleaf Community Edition/Server Pro
-	meta(property="og:image", content='/apple-touch-icon.png')
+	meta(property='og:image' content='/apple-touch-icon.png')
 
-if (metadata && metadata.openGraphType)
-	meta(property="og:type", metadata.openGraphType)
+if metadata && metadata.openGraphType
+	meta(property='og:type' metadata.openGraphType)
 else
-	meta(property="og:type", content="website")
+	meta(property='og:type' content='website')
 
-if (metadata && metadata.openGraphVideo)
+if metadata && metadata.openGraphVideo
 	//- from the CMS
-	meta(property="og:video", content=metadata.openGraphVideo)
+	meta(property='og:video' content=metadata.openGraphVideo)
 
 //- Viewport
 if !metadata || metadata.viewport !== false
-	meta(name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes")
+	meta(
+		name='viewport'
+		content='width=device-width, initial-scale=1.0, user-scalable=yes'
+	)
 
 //- Noindex
 if settings.robotsNoindex
-	meta(name="robots" content="noindex")
+	meta(name='robots' content='noindex')
 
 //- Icons
-link(rel="icon", sizes="32x32", href="/favicon-32x32.png")
-link(rel="icon", sizes="16x16", href="/favicon-16x16.png")
-link(rel="icon", href="/favicon.svg" type="image/svg+xml")
-link(rel="apple-touch-icon", href="/apple-touch-icon.png")
-link(rel="mask-icon", href="/mask-favicon.svg", color="#046530")
+link(rel='icon' sizes='32x32' href='/favicon-32x32.png')
+link(rel='icon' sizes='16x16' href='/favicon-16x16.png')
+link(rel='icon' href='/favicon.svg' type='image/svg+xml')
+link(rel='apple-touch-icon' href='/apple-touch-icon.png')
+link(rel='mask-icon' href='/mask-favicon.svg' color='#046530')
 
 //- Canonical Tag for SEO
-if (metadata && metadata.canonicalURL)
-	link(rel="canonical" href=metadata.canonicalURL)
+if metadata && metadata.canonicalURL
+	link(rel='canonical' href=metadata.canonicalURL)
 
 //- Manifest
 //- Does not currently contain a start_url to prevent browser installation prompts
-link(rel="manifest" href="/web.sitemanifest")
+link(rel='manifest' href='/web.sitemanifest')
diff --git a/services/web/app/views/_mixins/back_to_btns.pug b/services/web/app/views/_mixins/back_to_btns.pug
index dacd9ea7a2..c3a1f4f76e 100644
--- a/services/web/app/views/_mixins/back_to_btns.pug
+++ b/services/web/app/views/_mixins/back_to_btns.pug
@@ -1,4 +1,6 @@
 mixin back-to-btns(settingsAnchor)
 	.d-flex.flex-column.flex-sm-row.gap-3
-		a.btn.btn-secondary(href=`/user/settings${settingsAnchor ? '#' + settingsAnchor : '' }`) #{translate('back_to_account_settings')}
+		a.btn.btn-secondary(
+			href=`/user/settings${settingsAnchor ? '#' + settingsAnchor : '' }`
+		) #{translate('back_to_account_settings')}
 		a.btn.btn-secondary(href='/project') #{translate('back_to_your_projects')}
diff --git a/services/web/app/views/_mixins/begin_now_card.pug b/services/web/app/views/_mixins/begin_now_card.pug
index 8f9919553d..641703d606 100644
--- a/services/web/app/views/_mixins/begin_now_card.pug
+++ b/services/web/app/views/_mixins/begin_now_card.pug
@@ -1,10 +1,10 @@
-mixin begin_now_card()
+mixin begin_now_card
 	- var registerURL = '/register'
 	- var plansURL = '/user/subscription/plans'
 	- var isUserLoggedIn = !!getSessionUser()
 
 	.begin-now-card
-		div.card.card-pattern
+		.card.card-pattern
 			.card-body
 				p.dm-mono
 					span.font-size-display-xs
@@ -16,10 +16,8 @@ mixin begin_now_card()
 				p #{translate("discover_why_over_people_worldwide_trust_overleaf", {count: settings.userCountInMillions})}
 				p.card-links
 					if !isUserLoggedIn
-						a.btn.btn-primary.card-link(
-							href=registerURL
-						) #{translate("sign_up_for_free")}
+						a.btn.btn-primary.card-link(href=registerURL) #{translate("sign_up_for_free")}
 					a.btn.card-link(
-						class = isUserLoggedIn ? 'btn-primary' : 'btn-secondary'
+						class=isUserLoggedIn ? 'btn-primary' : 'btn-secondary'
 						href=plansURL
 					) #{translate("explore_all_plans")}
diff --git a/services/web/app/views/_mixins/bookmarkable_tabset.pug b/services/web/app/views/_mixins/bookmarkable_tabset.pug
index 27ac74ef66..72579c7725 100644
--- a/services/web/app/views/_mixins/bookmarkable_tabset.pug
+++ b/services/web/app/views/_mixins/bookmarkable_tabset.pug
@@ -1,10 +1,10 @@
 mixin bookmarkable-tabset-header(id, title, active)
-	li(role="presentation")
+	li(role='presentation')
 		a.nav-link(
 			href='#' + id
-			class=(active ? 'active' : '')
+			class=active ? 'active' : ''
 			aria-controls=id
-			role="tab"
-			data-toggle="tab"
+			role='tab'
+			data-toggle='tab'
 			data-ol-bookmarkable-tab
 		) #{title}
diff --git a/services/web/app/views/_mixins/bootstrap_js.pug b/services/web/app/views/_mixins/bootstrap_js.pug
index 866b0b4218..746e811bf7 100644
--- a/services/web/app/views/_mixins/bootstrap_js.pug
+++ b/services/web/app/views/_mixins/bootstrap_js.pug
@@ -1,3 +1,3 @@
 mixin bootstrap-js(bootstrapVersion)
-	each file in (entrypointScripts(bootstrapVersion === 5 ? 'bootstrap-5' : 'bootstrap-3'))
-		script(type="text/javascript", nonce=scriptNonce, src=file)
+	each file in entrypointScripts(bootstrapVersion === 5 ? 'bootstrap-5' : 'bootstrap-3')
+		script(type='text/javascript' nonce=scriptNonce src=file)
diff --git a/services/web/app/views/_mixins/eyebrow.pug b/services/web/app/views/_mixins/eyebrow.pug
index c5f01a10db..3eae0b8308 100644
--- a/services/web/app/views/_mixins/eyebrow.pug
+++ b/services/web/app/views/_mixins/eyebrow.pug
@@ -1,5 +1,5 @@
 mixin eyebrow(text)
-    span.eyebrow-text
-        span(aria-hidden="true") {
-        span #{text}
-        span(aria-hidden="true") }
\ No newline at end of file
+	span.eyebrow-text
+		span(aria-hidden='true') {
+		span #{text}
+		span(aria-hidden='true') }
diff --git a/services/web/app/views/_mixins/faq_search-marketing.pug b/services/web/app/views/_mixins/faq_search-marketing.pug
index aa41d00f9b..1b161dbdf6 100644
--- a/services/web/app/views/_mixins/faq_search-marketing.pug
+++ b/services/web/app/views/_mixins/faq_search-marketing.pug
@@ -1,30 +1,37 @@
 mixin faq_search-marketing(headerText, headerClass)
-	if (typeof(settings.algolia) != "undefined" && typeof(settings.algolia.indexes) != "undefined" && typeof(settings.algolia.indexes.wiki) != "undefined")
+	if typeof settings.algolia != 'undefined' && typeof settings.algolia.indexes != 'undefined' && typeof settings.algolia.indexes.wiki != 'undefined'
 		if headerText
 			div(class=headerClass) #{headerText}
 		.wiki
-			form.project-search.form-horizontal(role="search" data-ol-faq-search)
+			form.project-search.form-horizontal(role='search' data-ol-faq-search)
 				.form-group.has-feedback.has-feedback-left
 					.col-sm-12
-						input.form-control(type='search', placeholder="Search help library…" aria-label="Search help library…")
-						i.fa.fa-search.form-control-feedback-left(aria-hidden="true")
+						input.form-control(
+							type='search'
+							placeholder='Search help library…'
+							aria-label='Search help library…'
+						)
+						i.fa.fa-search.form-control-feedback-left(aria-hidden='true')
 						i.fa.fa-times.form-control-feedback(
-							style="cursor: pointer;",
+							style='cursor: pointer'
 							hidden
 							data-ol-clear-search
-							aria-hidden="true"
+							aria-hidden='true'
 						)
 						button.sr-only(
-							type="button"
+							type='button'
 							hidden
 							data-ol-clear-search
 							aria-label=translate('clear_search')
 						)
 
-				.row(role="region" aria-label="search results")
-					.col-md-12()
+				.row(role='region' aria-label='search results')
+					.col-md-12
 						div(data-ol-search-results-wrapper)
-							span.sr-only(aria-live="polite" data-ol-search-sr-help-message)
+							span.sr-only(aria-live='polite' data-ol-search-sr-help-message)
 							div(data-ol-search-results)
-						.row-spaced-small.search-result.card.card-thin(hidden data-ol-search-no-results)
+						.row-spaced-small.search-result.card.card-thin(
+							hidden
+							data-ol-search-no-results
+						)
 							p #{translate("no_search_results")}
diff --git a/services/web/app/views/_mixins/foot_scripts.pug b/services/web/app/views/_mixins/foot_scripts.pug
index c6b65e81c7..717c46cdd9 100644
--- a/services/web/app/views/_mixins/foot_scripts.pug
+++ b/services/web/app/views/_mixins/foot_scripts.pug
@@ -1,6 +1,11 @@
-mixin foot-scripts()
+mixin foot-scripts
 	each file in entrypointScripts(entrypoint)
-		script(type="text/javascript", nonce=scriptNonce, src=file, defer=deferScripts)
-	if (settings.devToolbar.enabled)
-		each file in entrypointScripts("devToolbar")
-			script(type="text/javascript", nonce=scriptNonce, src=file, defer=deferScripts)
+		script(type='text/javascript' nonce=scriptNonce src=file defer=deferScripts)
+	if settings.devToolbar.enabled
+		each file in entrypointScripts('devToolbar')
+			script(
+				type='text/javascript'
+				nonce=scriptNonce
+				src=file
+				defer=deferScripts
+			)
diff --git a/services/web/app/views/_mixins/formMessages.pug b/services/web/app/views/_mixins/formMessages.pug
index 2fab7e40d8..a14bb2196a 100644
--- a/services/web/app/views/_mixins/formMessages.pug
+++ b/services/web/app/views/_mixins/formMessages.pug
@@ -1,41 +1,35 @@
 include ./material_symbol
 
-mixin formMessages()
-	div(
-		data-ol-form-messages='',
-		role="alert"
-	)
+mixin formMessages
+	div(data-ol-form-messages='' role='alert')
 
 mixin formMessagesNewStyle(extraClass = 'form-messages-bottom-margin')
-	- const attrs = extraClass ? { 'class': extraClass }  : {}
-	div(
-		data-ol-form-messages-new-style='',
-		role="alert"
-	)&attributes(attrs)
+	- const attrs = extraClass ? {class: extraClass} : {}
+	div(data-ol-form-messages-new-style='' role='alert')&attributes(attrs)
 
 mixin customFormMessage(key, kind)
 	if kind === 'success'
-		div.alert.alert-success(
-			hidden,
-			data-ol-custom-form-message=key,
-			role="alert"
-			aria-live="polite"
+		.alert.alert-success(
+			hidden
+			data-ol-custom-form-message=key
+			role='alert'
+			aria-live='polite'
 		)
 			block
 	else if kind === 'danger'
-		div.alert.alert-danger(
-			hidden,
-			data-ol-custom-form-message=key,
-			role="alert"
-			aria-live="assertive"
+		.alert.alert-danger(
+			hidden
+			data-ol-custom-form-message=key
+			role='alert'
+			aria-live='assertive'
 		)
 			block
 	else
-		div.alert.alert-warning(
-			hidden,
-			data-ol-custom-form-message=key,
-			role="alert"
-			aria-live="polite"
+		.alert.alert-warning(
+			hidden
+			data-ol-custom-form-message=key
+			role='alert'
+			aria-live='polite'
 		)
 			block
 
@@ -43,56 +37,50 @@ mixin customFormMessageNewStyle(key, kind, extraClass = 'mb-3')
 	- extraClass = extraClass ? ' ' + extraClass : ''
 	if kind === 'success'
 		div(
-			class="notification notification-type-success" + extraClass,
-			hidden,
-			data-ol-custom-form-message=key,
-			role="alert"
-			aria-live="polite"
+			class='notification notification-type-success' + extraClass
+			hidden
+			data-ol-custom-form-message=key
+			role='alert'
+			aria-live='polite'
 		)
-			div.notification-icon
-				+material-symbol("check_circle")
-			div.notification-content.text-left
+			.notification-icon
+				+material-symbol('check_circle')
+			.notification-content.text-left
 				block
 	else if kind === 'danger'
 		div(
-			class="notification notification-type-error" + extraClass,
-			hidden,
-			data-ol-custom-form-message=key,
-			role="alert"
-			aria-live="polite"
+			class='notification notification-type-error' + extraClass
+			hidden
+			data-ol-custom-form-message=key
+			role='alert'
+			aria-live='polite'
 		)
-			div.notification-icon
-				+material-symbol("error")
-			div.notification-content.text-left
+			.notification-icon
+				+material-symbol('error')
+			.notification-content.text-left
 				block
 	else
 		div(
-			class="notification notification-type-warning" + extraClass,
-			hidden,
-			data-ol-custom-form-message=key,
-			role="alert"
-			aria-live="polite"
+			class='notification notification-type-warning' + extraClass
+			hidden
+			data-ol-custom-form-message=key
+			role='alert'
+			aria-live='polite'
 		)
-			div.notification-icon
-				+material-symbol("warning")
-			div.notification-content.text-left
+			.notification-icon
+				+material-symbol('warning')
+			.notification-content.text-left
 				block
 
 mixin customValidationMessage(key)
-	div.invalid-feedback.mt-2(
-		hidden,
-		data-ol-custom-form-message=key
-	)
-		i.fa.fa-fw.fa-warning.me-1(aria-hidden="true")
+	.invalid-feedback.mt-2(hidden data-ol-custom-form-message=key)
+		i.fa.fa-fw.fa-warning.me-1(aria-hidden='true')
 		div
 			block
 
 mixin customValidationMessageNewStyle(key)
-	div.notification.notification-type-error(
-			hidden,
-			data-ol-custom-form-message=key
-		)
-		div.notification-icon
-			+material-symbol("error")
-		div.notification-content.text-left.small
+	.notification.notification-type-error(hidden data-ol-custom-form-message=key)
+		.notification-icon
+			+material-symbol('error')
+		.notification-content.text-left.small
 			block
diff --git a/services/web/app/views/_mixins/links.pug b/services/web/app/views/_mixins/links.pug
index 566c90ee50..a919cdd74e 100644
--- a/services/web/app/views/_mixins/links.pug
+++ b/services/web/app/views/_mixins/links.pug
@@ -8,7 +8,8 @@ mixin linkAdvisors(linkText, linkClass, track)
 	- var mb = track && track.mb ? 'true' : null
 	- var mbSegmentation = track && track.segmentation ? track.segmentation : null
 	- var trigger = track && track.trigger ? track.trigger : null
-	a(href="/advisors" 
+	a(
+		href='/advisors'
 		class=linkClass ? linkClass : ''
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
@@ -20,24 +21,36 @@ mixin linkAdvisors(linkText, linkClass, track)
 		span #{linkText ? linkText : 'advisor programme'}
 
 mixin linkBenefits(linkText, linkClass)
-	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/authors" class=linkClass ? linkClass : '')
+	a(
+		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/authors'
+		class=linkClass ? linkClass : ''
+	)
 		| #{linkText ? linkText : 'benefits'}
-		
+
 mixin linkBlog(linkText, linkClass, slug)
 	if slug
-		a(href=(settings.siteUrl ? settings.siteUrl : '') + "/blog/" + slug class=linkClass ? linkClass : '')
+		a(
+			href=(settings.siteUrl ? settings.siteUrl : '') + '/blog/' + slug
+			class=linkClass ? linkClass : ''
+		)
 			| #{linkText ? linkText : 'blog'}
 
 mixin linkContact(linkText, linkClass)
-	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/contact" class=linkClass ? linkClass : '')
+	a(
+		href=(settings.siteUrl ? settings.siteUrl : '') + '/contact'
+		class=linkClass ? linkClass : ''
+	)
 		| #{linkText ? linkText : 'contact'}
 
 mixin linkDash(linkText, linkClass)
-	a(href="/project" class=linkClass ? linkClass : '')
+	a(href='/project' class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'project dashboard'}
 
 mixin linkEducation(linkText, linkClass)
-	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/edu" class=linkClass ? linkClass : '')
+	a(
+		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/edu'
+		class=linkClass ? linkClass : ''
+	)
 		| #{linkText ? linkText : 'teaching toolkit'}
 
 mixin linkInvite(linkText, linkClass, track)
@@ -48,7 +61,8 @@ mixin linkInvite(linkText, linkClass, track)
 	- var mbSegmentation = track && track.segmentation ? track.segmentation : null
 	- var trigger = track && track.trigger ? track.trigger : null
 
-	a(href="/user/bonus"
+	a(
+		href='/user/bonus'
 		class=linkClass ? linkClass : ''
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
@@ -60,7 +74,7 @@ mixin linkInvite(linkText, linkClass, track)
 		span #{linkText ? linkText : 'invite your friends'}
 
 mixin linkPlansAndPricing(linkText, linkClass)
-	a(href="/user/subscription/plans" class=linkClass ? linkClass : '')
+	a(href='/user/subscription/plans' class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'plans and pricing'}
 
 mixin linkPrintNewTab(linkText, linkClass, icon, track)
@@ -71,7 +85,8 @@ mixin linkPrintNewTab(linkText, linkClass, icon, track)
 	- var mbSegmentation = track && track.segmentation ? track.segmentation : null
 	- var trigger = track && track.trigger ? track.trigger : null
 
-	a(href='?media=print'
+	a(
+		href='?media=print'
 		class=linkClass ? linkClass : ''
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
@@ -79,20 +94,26 @@ mixin linkPrintNewTab(linkText, linkClass, icon, track)
 		event-tracking-trigger=trigger
 		event-tracking-mb=mb
 		event-segmentation=mbSegmentation
-		target="_BLANK",
-		rel="noopener noreferrer"
+		target='_BLANK'
+		rel='noopener noreferrer'
 	)
 		if icon
-			i(class="fa fa-print")
+			i(class='fa fa-print')
 			| &nbsp;
 		span #{linkText ? linkText : 'print'}
 
 mixin linkSignIn(linkText, linkClass, redirect)
-	a(href=`/login${redirect ? '?redir=' + redirect : ''}` class=linkClass ? linkClass : '')
+	a(
+		href=`/login${redirect ? '?redir=' + redirect : ''}`
+		class=linkClass ? linkClass : ''
+	)
 		| #{linkText ? linkText : 'sign in'}
 
 mixin linkSignUp(linkText, linkClass, redirect)
-	a(href=`/register${redirect ? '?redir=' + redirect : ''}` class=linkClass ? linkClass : '')
+	a(
+		href=`/register${redirect ? '?redir=' + redirect : ''}`
+		class=linkClass ? linkClass : ''
+	)
 		| #{linkText ? linkText : 'sign up'}
 
 mixin linkTweet(linkText, linkClass, tweetText, track)
@@ -103,23 +124,33 @@ mixin linkTweet(linkText, linkClass, tweetText, track)
 	- var mb = track && track.mb ? 'true' : null
 	- var mbSegmentation = track && track.segmentation ? track.segmentation : null
 	- var trigger = track && track.trigger ? track.trigger : null
-	a(class="twitter-share-button " + linkClass
+	a(
+		class='twitter-share-button ' + linkClass
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
 		event-tracking-label=gaLabel
 		event-tracking-trigger=trigger
 		event-tracking-mb=mb
 		event-segmentation=mbSegmentation
-		href="https://twitter.com/intent/tweet?text=" + tweetText
-		target="_BLANK",
-		rel="noopener noreferrer"
+		href='https://twitter.com/intent/tweet?text=' + tweetText
+		target='_BLANK'
+		rel='noopener noreferrer'
 	) #{linkText ? linkText : 'tweet'}
 
 mixin linkUniversities(linkText, linkClass)
-	a(href=(settings.siteUrl ? settings.siteUrl : '') + "/for/universities" class=linkClass ? linkClass : '')
+	a(
+		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/universities'
+		class=linkClass ? linkClass : ''
+	)
 		| #{linkText ? linkText : 'universities'}
 
 mixin linkWithArrow({text, href, eventTracking, eventSegmentation, eventTrackingTrigger})
-	a.link-with-arrow(href=href event-tracking=eventTracking event-segmentation=eventSegmentation, event-tracking-trigger=eventTrackingTrigger event-tracking-mb)
+	a.link-with-arrow(
+		href=href
+		event-tracking=eventTracking
+		event-segmentation=eventSegmentation
+		event-tracking-trigger=eventTrackingTrigger
+		event-tracking-mb
+	)
 		| #{text}
-		+material-symbol("arrow_right_alt")
+		+material-symbol('arrow_right_alt')
diff --git a/services/web/app/views/_mixins/material_symbol.pug b/services/web/app/views/_mixins/material_symbol.pug
index 1e97425faf..e4e8925f93 100644
--- a/services/web/app/views/_mixins/material_symbol.pug
+++ b/services/web/app/views/_mixins/material_symbol.pug
@@ -1,7 +1,8 @@
 mixin material-symbol(icon, extraClass = null)
 	- extraClass = extraClass ? ' ' + extraClass : ''
-	span(aria-hidden="true", translate="no", class="material-symbols" + extraClass)&attributes(attributes) #{icon}
-	
+	span(aria-hidden='true' translate='no' class='material-symbols' + extraClass)&attributes(attributes)
+		| #{icon}
+
 mixin material-symbol-outlined(icon, extraClass = null)
 	- extraClass = extraClass ? ' ' + extraClass : ''
 	+material-symbol(icon, 'material-symbols-outlined' + extraClass)&attributes(attributes)
diff --git a/services/web/app/views/_mixins/navbar.pug b/services/web/app/views/_mixins/navbar.pug
index f3482d3b54..0ea2e4e3a0 100644
--- a/services/web/app/views/_mixins/navbar.pug
+++ b/services/web/app/views/_mixins/navbar.pug
@@ -1,23 +1,23 @@
 mixin nav-item
-	li(role="none")&attributes(attributes)
+	li(role='none')&attributes(attributes)
 		block
 
 mixin nav-link
-	a(role="menuitem").nav-link&attributes(attributes)
+	a.nav-link(role='menuitem')&attributes(attributes)
 		block
 
 mixin dropdown-menu
-	ul(role="menu").dropdown-menu&attributes(attributes)
+	ul.dropdown-menu(role='menu')&attributes(attributes)
 		block
 
 mixin dropdown-menu-item
-	li(role="none")
+	li(role='none')
 		block
 
 mixin dropdown-menu-link-item
 	+dropdown-menu-item
-		a(role="menuitem").dropdown-item&attributes(attributes)
+		a.dropdown-item(role='menuitem')&attributes(attributes)
 			block
-		
+
 mixin dropdown-menu-divider
-	li(role="separator").dropdown-divider.d-none.d-lg-block
+	li.dropdown-divider.d-none.d-lg-block(role='separator')
diff --git a/services/web/app/views/_mixins/notification.pug b/services/web/app/views/_mixins/notification.pug
index fb0db79630..482dd540c5 100644
--- a/services/web/app/views/_mixins/notification.pug
+++ b/services/web/app/views/_mixins/notification.pug
@@ -3,25 +3,19 @@ include ./material_symbol
 
 mixin notificationIcon(type)
 	if type === 'info'
-		+material-symbol("info")
+		+material-symbol('info')
 	else if type === 'success'
-		+material-symbol("check_circle")
+		+material-symbol('check_circle')
 	else if type === 'error'
-		+material-symbol("error")
+		+material-symbol('error')
 	else if type === 'warning'
-		+material-symbol("warning")
-
+		+material-symbol('warning')
 
 mixin notification(options)
 	- var {ariaLive, id, type, title, content, disclaimer, className} = options
 	- var classNames = `notification notification-type-${type} ${className ? className : ''} ${isActionBelowContent ? 'notification-cta-below-content' : ''}`
 
-	div(
-		aria-live=ariaLive,
-		role="alert",
-		id=id,
-		class=classNames
-	)
+	div(aria-live=ariaLive role='alert' id=id class=classNames)
 		.notification-icon
 			+notificationIcon(type)
 		.notification-content-and-cta
diff --git a/services/web/app/views/_mixins/pagination.pug b/services/web/app/views/_mixins/pagination.pug
index ef5f62bd0e..a2422e8c5d 100644
--- a/services/web/app/views/_mixins/pagination.pug
+++ b/services/web/app/views/_mixins/pagination.pug
@@ -10,77 +10,74 @@ mixin pagination(pages, page_path, max_btns)
 		- var max_btns = max_btns || 4
 		- var prev_page = Math.max(parseInt(pages.current_page, 10) - max_btns, 1)
 		- var next_page = parseInt(pages.current_page, 10) + 1
-		- var next_index = 0;
-		- var full_page_path = page_path + "/page/"
+		- var next_index = 0
+		- var full_page_path = page_path + '/page/'
 
-		nav(role="navigation" aria-label=(translate("pagination_navigation")))
+		nav(role='navigation' aria-label=translate('pagination_navigation'))
 			ul.pagination
 				if pages.current_page > 1
 					li
-						a(
-							aria-label=translate("go_to_first_page")
-							href=page_path
-						)
-							span(aria-hidden="true") &lt;&lt;
+						a(aria-label=translate('go_to_first_page') href=page_path)
+							span(aria-hidden='true') &lt;&lt;
 							|
 							| First
 					li
 						a(
-							aria-label=translate("go_to_previous_page")
+							aria-label=translate('go_to_previous_page')
 							href=full_page_path + (parseInt(pages.current_page, 10) - 1)
-							rel="prev"
+							rel='prev'
 						)
-							span(aria-hidden="true") &lt;
+							span(aria-hidden='true') &lt;
 							|
 							| Prev
 
 				if pages.current_page - max_btns > 1
-					li(aria-hidden="true")
+					li(aria-hidden='true')
 						span …
 
 				while prev_page < pages.current_page
 					li
 						a(
-							aria-label=translate("go_to_page_x", {page: prev_page})
+							aria-label=translate('go_to_page_x', {page: prev_page})
 							href=full_page_path + prev_page
 						) #{prev_page}
 						- prev_page++
 
-				li(class="active")
+				li(class='active')
 					span(
-						aria-label=translate("current_page_page", {page: pages.current_page})
-						aria-current="true"
+						aria-label=translate('current_page_page', {page: pages.current_page})
+						aria-current='true'
 					) #{pages.current_page}
 
 				if pages.current_page < pages.total_pages
 					while next_page <= pages.total_pages && next_index < max_btns
 						li
 							a(
-								aria-label=translate("go_to_page_x", {page: next_page})
+								aria-label=translate('go_to_page_x', {page: next_page})
 								href=full_page_path + next_page
 							) #{next_page}
 						- next_page++
 						- next_index++
 
-					if next_page <= pages.total_pages 
-						li.ellipses(aria-hidden="true")
+					if next_page <= pages.total_pages
+						li.ellipses(aria-hidden='true')
 							span …
 
 					li
 						a(
-							aria-label=translate("go_to_next_page")
+							aria-label=translate('go_to_next_page')
 							href=full_page_path + (parseInt(pages.current_page, 10) + 1)
-							rel="next"
+							rel='next'
 						)
 							| Next
 							|
-							span(aria-hidden="true") &gt;
+							span(aria-hidden='true') &gt;
 
 					li
 						a(
-							aria-label=translate("go_to_last_page")
+							aria-label=translate('go_to_last_page')
 							href=full_page_path + pages.total_pages
 						)
 							| Last
 							|
-							span(aria-hidden="true") &gt;&gt;
+							span(aria-hidden='true') &gt;&gt;
diff --git a/services/web/app/views/_mixins/previous_page_link.pug b/services/web/app/views/_mixins/previous_page_link.pug
index 1b646a04d2..9809409d4e 100644
--- a/services/web/app/views/_mixins/previous_page_link.pug
+++ b/services/web/app/views/_mixins/previous_page_link.pug
@@ -2,5 +2,5 @@ include ./material_symbol
 
 mixin previous-page-link(href, text)
 	a.previous-page-link(href=href)
-		+material-symbol-rounded("arrow_left_alt")
+		+material-symbol-rounded('arrow_left_alt')
 		| #{text}
diff --git a/services/web/app/views/_mixins/quote.pug b/services/web/app/views/_mixins/quote.pug
index 573e0b6b0c..a414c4dcec 100644
--- a/services/web/app/views/_mixins/quote.pug
+++ b/services/web/app/views/_mixins/quote.pug
@@ -3,10 +3,10 @@ mixin quoteLargeTextCentered(quote, person, position, affiliation, link, picture
 		.quote !{quote}
 		if pictureUrl
 			.quote-img
-				-var pictureAlt=`Photo of ${person}`
+				- var pictureAlt = `Photo of ${person}`
 				img(src=pictureUrl alt=pictureAlt)
 		footer
-			div.quote-person
+			.quote-person
 				strong #{person}
 			if person && position
 				div #{position}
@@ -29,27 +29,27 @@ mixin quoteLeftGreenBorder({quote, person, position, affiliation, link})
 
 mixin collinsQuote1
 	.card.card-dark-green-bg
-		-var quote = 'Overleaf is indispensable for us. We use it in our research, thesis writing, project proposals, and manuscripts for publication. When it comes to writing, it’s our main tool.'
-		-var quotePerson = 'Christopher Collins'
-		-var quotePersonPosition = 'Associate Professor and Lab Director, Ontario Tech University'
-		-var quotePersonImg = buildImgPath("advocates/collins.jpg")
+		- var quote = 'Overleaf is indispensable for us. We use it in our research, thesis writing, project proposals, and manuscripts for publication. When it comes to writing, it’s our main tool.'
+		- var quotePerson = 'Christopher Collins'
+		- var quotePersonPosition = 'Associate Professor and Lab Director, Ontario Tech University'
+		- var quotePersonImg = buildImgPath('advocates/collins.jpg')
 		.card-body
 			+quoteLargeTextCentered(quote, quotePerson, quotePersonPosition, null, null, quotePersonImg)
 
 mixin collinsQuote2
 	.card.card-dark-green-bg
-		-var quote = 'We are writing collaboratively right up until the last minute. We are faced with deadlines all the time, and Overleaf gives us the ability to polish right up until the last possible second.'
-		-var quotePerson = 'Christopher Collins'
-		-var quotePersonPosition = 'Associate Professor and Lab Director, Ontario Tech University'
-		-var quotePersonImg = buildImgPath("advocates/collins.jpg")
+		- var quote = 'We are writing collaboratively right up until the last minute. We are faced with deadlines all the time, and Overleaf gives us the ability to polish right up until the last possible second.'
+		- var quotePerson = 'Christopher Collins'
+		- var quotePersonPosition = 'Associate Professor and Lab Director, Ontario Tech University'
+		- var quotePersonImg = buildImgPath('advocates/collins.jpg')
 		.card-body
 			+quoteLargeTextCentered(quote, quotePerson, quotePersonPosition, null, null, quotePersonImg)
 
 mixin bennettQuote1
 	.card.card-dark-green-bg
-		-var quote = 'With Overleaf, we now have a process for developing technical documentation which has virtually eliminated the time required to properly format and layout documents.'
-		-var quotePerson = 'Andrew Bennett'
-		-var quotePersonPosition = 'Software Architect, Symplectic'
-		-var quotePersonImg = buildImgPath("advocates/bennett.jpg")
+		- var quote = 'With Overleaf, we now have a process for developing technical documentation which has virtually eliminated the time required to properly format and layout documents.'
+		- var quotePerson = 'Andrew Bennett'
+		- var quotePersonPosition = 'Software Architect, Symplectic'
+		- var quotePersonImg = buildImgPath('advocates/bennett.jpg')
 		.card-body
 			+quoteLargeTextCentered(quote, quotePerson, quotePersonPosition, null, null, quotePersonImg)
diff --git a/services/web/app/views/_mixins/recaptcha.pug b/services/web/app/views/_mixins/recaptcha.pug
index 24e0c501ea..ec5604c825 100644
--- a/services/web/app/views/_mixins/recaptcha.pug
+++ b/services/web/app/views/_mixins/recaptcha.pug
@@ -1,2 +1,2 @@
-mixin recaptchaConditions()
+mixin recaptchaConditions
 	.recaptcha-branding !{translate("recaptcha_conditions", {}, [{}, {name: 'a', attrs: {href: 'https://policies.google.com/privacy', rel: 'noopener noreferrer', target: '_blank'}}, {name: 'a', attrs: {href: 'https://policies.google.com/terms', rel: 'noopener noreferrer', target: '_blank'}}])}
diff --git a/services/web/app/views/_mixins/reconfirm_affiliation-marketing.pug b/services/web/app/views/_mixins/reconfirm_affiliation-marketing.pug
index c42a3b439a..f54dd5d4ba 100644
--- a/services/web/app/views/_mixins/reconfirm_affiliation-marketing.pug
+++ b/services/web/app/views/_mixins/reconfirm_affiliation-marketing.pug
@@ -1,14 +1,11 @@
 mixin reconfirmAffiliationNotification-marketing(userEmail, location)
-	form(
-		data-ol-async-form
-		action='/user/emails/send-reconfirmation'
-	)
-		input(name="_csrf" type="hidden" value=csrfToken)
-		input(name="email" type="hidden" value=userEmail.email)
-		+formMessages()
+	form(data-ol-async-form action='/user/emails/send-reconfirmation')
+		input(name='_csrf' type='hidden' value=csrfToken)
+		input(name='email' type='hidden' value=userEmail.email)
+		+formMessages
 
 		.reconfirm-notification
-			div(data-ol-not-sent style="width:100%;")
+			div(data-ol-not-sent style='width: 100%')
 				i.fa.fa-warning
 
 				- var ssoEnabled = userEmail.affiliation && userEmail.affiliation.institution && userEmail.affiliation.institution.ssoEnabled
@@ -18,16 +15,16 @@ mixin reconfirmAffiliationNotification-marketing(userEmail, location)
 						data-ol-slow-link
 						href=`${settings.saml.ukamf.initPath}?university_id=${institutionId}&reconfirm=${location}`
 					)
-						span(data-ol-inflight="idle") #{translate("confirm_affiliation")}
-						span(hidden data-ol-inflight="pending") #{translate("pending")}…
+						span(data-ol-inflight='idle') #{translate("confirm_affiliation")}
+						span(hidden data-ol-inflight='pending') #{translate("pending")}…
 
 				else
 					button.btn-reconfirm.btn.btn-sm.btn-info(
-						type="submit"
+						type='submit'
 						data-ol-disabled-inflight
 					)
-						span(data-ol-inflight="idle") #{translate("confirm_affiliation")}
-						span(hidden data-ol-inflight="pending") #{translate("pending")}…
+						span(data-ol-inflight='idle') #{translate("confirm_affiliation")}
+						span(hidden data-ol-inflight='pending') #{translate("pending")}…
 
 				| !{translate("are_you_still_at", {institutionName: userEmail.affiliation.institution.name}, ['strong'])}&nbsp;
 
@@ -39,22 +36,19 @@ mixin reconfirmAffiliationNotification-marketing(userEmail, location)
 					| !{translate("please_reconfirm_institutional_email", {}, [{name: 'a', attrs: {href: '/user/settings?remove=' + userEmail.email}}])}
 
 				| &nbsp;
-				a(href="/learn/how-to/Institutional_Email_Reconfirmation" target="_blank") #{translate("learn_more")}
+				a(href='/learn/how-to/Institutional_Email_Reconfirmation' target='_blank') #{translate("learn_more")}
 
 			div(hidden data-ol-sent)
 				| !{translate("please_check_your_inbox_to_confirm", {institutionName: userEmail.affiliation.institution.name}, ['strong'])}
 				| &nbsp;
-				button.btn-inline-link(
-					type="submit"
-					data-ol-disabled-inflight
-				)
-					span(data-ol-inflight="idle") #{translate('resend_confirmation_email')}
-					span(hidden data-ol-inflight="pending") #{translate("pending")}…
+				button.btn-inline-link(type='submit' data-ol-disabled-inflight)
+					span(data-ol-inflight='idle') #{translate('resend_confirmation_email')}
+					span(hidden data-ol-inflight='pending') #{translate("pending")}…
 
 mixin reconfirmedAffiliationNotification-marketing(userEmail)
 	.alert.alert-info
 		.reconfirm-notification
-			div(style="width:100%;")
+			div(style='width: 100%')
 				//- extra div for flex styling
 				| !{translate("your_affiliation_is_confirmed", {institutionName: userEmail.affiliation.institution.name}, ['strong'])}
 				|
diff --git a/services/web/app/views/_mixins/terms_of_service.pug b/services/web/app/views/_mixins/terms_of_service.pug
index 0fc3887b42..b0b5aaf81d 100644
--- a/services/web/app/views/_mixins/terms_of_service.pug
+++ b/services/web/app/views/_mixins/terms_of_service.pug
@@ -1,3 +1,3 @@
 mixin termsOfServiceAgreement
-	div.tos-agreement-notice
+	.tos-agreement-notice
 		| !{translate("by_registering_you_agree_to_our_terms_of_service", {}, [{name: 'a', attrs: {href: '/legal#Terms', target: '_blank'}}, {name: 'a', attrs: {href: '/legal#Privacy', target: '_blank'}}])}
diff --git a/services/web/app/views/admin/index.pug b/services/web/app/views/admin/index.pug
index aaf2228cbc..7a284d1f41 100644
--- a/services/web/app/views/admin/index.pug
+++ b/services/web/app/views/admin/index.pug
@@ -2,7 +2,7 @@ extends ../layout-marketing
 include ../_mixins/bookmarkable_tabset
 
 block content
-	.content.content-alt#main-content
+	#main-content.content.content-alt
 		.container
 			.row
 				.col-sm-12
@@ -12,7 +12,7 @@ block content
 								h1 Admin Panel
 							.ol-tabs(data-ol-bookmarkable-tabset)
 								.nav-tabs-container
-									ul.nav.nav-tabs.align-left(role="tablist")
+									ul.nav.nav-tabs.align-left(role='tablist')
 										+bookmarkable-tabset-header('system-messages', 'System Messages', true)
 										+bookmarkable-tabset-header('open-sockets', 'Open Sockets')
 										+bookmarkable-tabset-header('open-close-editor', 'Open/Close Editor')
@@ -20,29 +20,28 @@ block content
 											+bookmarkable-tabset-header('tpds', 'TPDS/Dropbox Management')
 
 								.tab-content
-									.tab-pane.active(
-										role="tabpanel"
-										id='system-messages'
-									)
+									.tab-pane.active(role='tabpanel' id='system-messages')
 										each message in systemMessages
 											ul.system-messages
 												li.system-message.row-spaced #{message.content}
 										hr
-										form(method='post', action='/admin/messages')
-											input(name="_csrf", type="hidden", value=csrfToken)
+										form(method='post' action='/admin/messages')
+											input(name='_csrf' type='hidden' value=csrfToken)
 											.form-group
-												label.form-label(for="content")
-												input.form-control(name="content", type="text", placeholder="Message…", required)
-											button.btn.btn-primary(type="submit") Post Message
+												label.form-label(for='content')
+												input.form-control(
+													name='content'
+													type='text'
+													placeholder='Message…'
+													required
+												)
+											button.btn.btn-primary(type='submit') Post Message
 										hr
-										form(method='post', action='/admin/messages/clear')
-											input(name="_csrf", type="hidden", value=csrfToken)
-											button.btn.btn-danger(type="submit") Clear all messages
+										form(method='post' action='/admin/messages/clear')
+											input(name='_csrf' type='hidden' value=csrfToken)
+											button.btn.btn-danger(type='submit') Clear all messages
 
-									.tab-pane(
-										role="tabpanel"
-										id='open-sockets'
-									)
+									.tab-pane(role='tabpanel' id='open-sockets')
 										.row-spaced
 											ul
 												each agents, url in openSockets
@@ -51,52 +50,56 @@ block content
 															each agent in agents
 																li #{agent}
 
-									.tab-pane(
-										role="tabpanel"
-										id='open-close-editor'
-									)
+									.tab-pane(role='tabpanel' id='open-close-editor')
 										if hasFeature('saas')
 											| The "Open/Close Editor" feature is not available in SAAS.
 										else
 											.row-spaced
-												form(method='post',action='/admin/closeEditor')
-													input(name="_csrf", type="hidden", value=csrfToken)
-													button.btn.btn-danger(type="submit") Close Editor
+												form(method='post' action='/admin/closeEditor')
+													input(name='_csrf' type='hidden' value=csrfToken)
+													button.btn.btn-danger(type='submit') Close Editor
 												p.small Will stop anyone opening the editor. Will NOT disconnect already connected users.
 
 											.row-spaced
-												form(method='post',action='/admin/disconnectAllUsers')
-													input(name="_csrf", type="hidden", value=csrfToken)
-													button.btn.btn-danger(type="submit") Disconnect all users
+												form(method='post' action='/admin/disconnectAllUsers')
+													input(name='_csrf' type='hidden' value=csrfToken)
+													button.btn.btn-danger(type='submit') Disconnect all users
 												p.small Will force disconnect all users with the editor open. Make sure to close the editor first to avoid them reconnecting.
 
 											.row-spaced
-												form(method='post',action='/admin/openEditor')
-													input(name="_csrf", type="hidden", value=csrfToken)
-													button.btn.btn-danger(type="submit") Reopen Editor
+												form(method='post' action='/admin/openEditor')
+													input(name='_csrf' type='hidden' value=csrfToken)
+													button.btn.btn-danger(type='submit') Reopen Editor
 												p.small Will reopen the editor after closing.
 
 									if hasFeature('saas')
-										.tab-pane(
-											role="tabpanel"
-											id='tpds'
-										)
+										.tab-pane(role='tabpanel' id='tpds')
 											h3 Flush project to TPDS
 											.row
-												form.col-xs-6(method='post',action='/admin/flushProjectToTpds')
-													input(name="_csrf", type="hidden", value=csrfToken)
+												form.col-xs-6(method='post' action='/admin/flushProjectToTpds')
+													input(name='_csrf' type='hidden' value=csrfToken)
 													.form-group
 														label.form-label(for='project_id') project_id
-														input.form-control(type='text',  name='project_id', placeholder='project_id', required)
+														input.form-control(
+															name='project_id'
+															type='text'
+															placeholder='project_id'
+															required
+														)
 													.form-group
 														button.btn-primary.btn(type='submit') Flush
 											hr
 											h3 Poll Dropbox for user
 											.row
-												form.col-xs-6(method='post',action='/admin/pollDropboxForUser')
-													input(name="_csrf", type="hidden", value=csrfToken)
+												form.col-xs-6(method='post' action='/admin/pollDropboxForUser')
+													input(name='_csrf' type='hidden' value=csrfToken)
 													.form-group
 														label.form-label(for='user_id') user_id
-														input.form-control(type='text',  name='user_id', placeholder='user_id', required)
+														input.form-control(
+															name='user_id'
+															type='text'
+															placeholder='user_id'
+															required
+														)
 													.form-group
 														button.btn-primary.btn(type='submit') Poll
diff --git a/services/web/app/views/beta_program/opt_in.pug b/services/web/app/views/beta_program/opt_in.pug
index 3122dc127f..c30cb78d9a 100644
--- a/services/web/app/views/beta_program/opt_in.pug
+++ b/services/web/app/views/beta_program/opt_in.pug
@@ -2,14 +2,14 @@ extends ../layout-marketing
 include ../_mixins/back_to_btns
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container.beta-opt-in-wrapper
 			.row
 				.col-lg-10.offset-lg-1.col-xl-8.offset-xl-2
 					.card
 						.card-body
 							.page-header
-								h1 
+								h1
 									| #{translate("sharelatex_beta_program")}
 							.beta-opt-in
 								.container-fluid
@@ -28,7 +28,9 @@ block content
 											ul
 												li
 													| #{translate("beta_program_badge_description")}&nbsp;
-													span.badge.bg-warning-light-bg.text-warning(aria-label=translate("beta_feature_badge"))
+													span.badge.bg-warning-light-bg.text-warning(
+														aria-label=translate('beta_feature_badge')
+													)
 														span.badge-content β
 												li !{translate("you_will_be_able_to_contact_us_any_time_to_share_your_feedback", {}, ['strong'])}.
 												li !{translate("we_may_also_contact_you_from_time_to_time_by_email_with_a_survey", {}, ['strong'])}.
@@ -40,37 +42,30 @@ block content
 											if user.betaProgram
 												form(
 													data-ol-regular-form
-													method="post"
-													action="/beta/opt-out"
+													method='post'
+													action='/beta/opt-out'
 													novalidate
 												)
-													input(type="hidden", name="_csrf", value=csrfToken)
+													input(name='_csrf' type='hidden' value=csrfToken)
 													.form-group
-														a(
-															href="https://forms.gle/CFEsmvZQTAwHCd3X9"
-															target="_blank"
-															rel="noopener noreferrer"
-														).btn.btn-primary.btn-lg #{translate("give_feedback")}
+														a.btn.btn-primary.btn-lg(
+															href='https://forms.gle/CFEsmvZQTAwHCd3X9'
+															target='_blank'
+															rel='noopener noreferrer'
+														) #{translate("give_feedback")}
 													.form-group
 														button.btn.btn-secondary-info.btn-secondary.btn-sm(
-															type="submit"
+															type='submit'
 															data-ol-disabled-inflight
 														)
-															span(data-ol-inflight="idle") #{translate("beta_program_opt_out_action")}
-															span(hidden data-ol-inflight="pending") #{translate("processing")}…
+															span(data-ol-inflight='idle') #{translate("beta_program_opt_out_action")}
+															span(hidden data-ol-inflight='pending') #{translate("processing")}…
 											else
-												form(
-													data-ol-regular-form
-													method="post",
-													action="/beta/opt-in"
-												)
-													input(type="hidden", name="_csrf", value=csrfToken)
+												form(data-ol-regular-form method='post' action='/beta/opt-in')
+													input(name='_csrf' type='hidden' value=csrfToken)
 													.form-group
-														button.btn.btn-primary(
-															type="submit"
-															data-ol-disabled-inflight
-														)
-															span(data-ol-inflight="idle") #{translate("beta_program_opt_in_action")}
-															span(hidden data-ol-inflight="pending") #{translate("joining")}…
+														button.btn.btn-primary(type='submit' data-ol-disabled-inflight)
+															span(data-ol-inflight='idle') #{translate("beta_program_opt_in_action")}
+															span(hidden data-ol-inflight='pending') #{translate("joining")}…
 								.page-separator
-								+back-to-btns()
+								+back-to-btns
diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug
index fcc3007e6f..5dad09910f 100644
--- a/services/web/app/views/general/400.pug
+++ b/services/web/app/views/general/400.pug
@@ -1,29 +1,29 @@
 extends ../layout/layout-no-js
 
 block vars
-	- metadata = { title: 'Something went wrong' }
+	- metadata = {title: 'Something went wrong'}
 
 block body
 	body.full-height
-		main.content.content-alt.full-height#main-content
+		main#main-content.content.content-alt.full-height
 			.container.full-height
 				.error-container.full-height
 					.error-details
 						p.error-status Something went wrong, sorry.
 						p.error-description
 							| There was a problem with your request.
-							if(message)
+							if message
 								|
 								| The error is:
-						if(message)
+						if message
 							p.error-box
 								| #{message}
 						p.error-description
 							| Please go back and try again.
 							| If the problem persists, please contact us at
 							|
-							a(href="mailto:" + settings.adminEmail) #{settings.adminEmail}
+							a(href='mailto:' + settings.adminEmail) #{settings.adminEmail}
 							| .
 						p.error-actions
-							a.error-btn(href="javascript:history.back()") Back
-							a.btn.btn-secondary(href="/") Home
+							a.error-btn(href='javascript:history.back()') Back
+							a.btn.btn-secondary(href='/') Home
diff --git a/services/web/app/views/general/404.pug b/services/web/app/views/general/404.pug
index f76eac6997..ce92d6d56e 100644
--- a/services/web/app/views/general/404.pug
+++ b/services/web/app/views/general/404.pug
@@ -1,11 +1,11 @@
 extends ../layout-marketing
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.error-container
 				.error-details
 					p.error-status Not found
 					p.error-description #{translate("cant_find_page")}
 					p.error-actions
-						a.error-btn(href="/") Home
+						a.error-btn(href='/') Home
diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug
index 41e7440e0d..22d6ceb35c 100644
--- a/services/web/app/views/general/500.pug
+++ b/services/web/app/views/general/500.pug
@@ -1,11 +1,11 @@
 extends ../layout/layout-no-js
 
 block vars
-	- metadata = { title: 'Something went wrong' }
+	- metadata = {title: 'Something went wrong'}
 
 block body
 	body.full-height
-		main.content.content-alt.full-height#main-content
+		main#main-content.content.content-alt.full-height
 			.container.full-height
 				.error-container.full-height
 					.error-details
@@ -13,11 +13,11 @@ block body
 						p.error-description Our staff are probably looking into this, but if it continues, please check our status page at
 							|
 							|
-							a(href="http://" + settings.statusPageUrl) #{settings.statusPageUrl}
+							a(href='http://' + settings.statusPageUrl) #{settings.statusPageUrl}
 							|
 							| or contact us at
 							|
-							a(href="mailto:" + settings.adminEmail) #{settings.adminEmail}
+							a(href='mailto:' + settings.adminEmail) #{settings.adminEmail}
 							| .
 						p.error-actions
-							a.error-btn(href="/") Home
+							a.error-btn(href='/') Home
diff --git a/services/web/app/views/general/closed.pug b/services/web/app/views/general/closed.pug
index b3f8ea2c04..3c1196a4cc 100644
--- a/services/web/app/views/general/closed.pug
+++ b/services/web/app/views/general/closed.pug
@@ -1,7 +1,7 @@
 extends ../layout-marketing
 
 block content
-	main.content#main-content
+	main#main-content.content
 		.container
 			.row
 				.col-lg-8.offset-lg-2.text-center
diff --git a/services/web/app/views/general/post-gateway.pug b/services/web/app/views/general/post-gateway.pug
index b17e61cb41..c6bbc92d01 100644
--- a/services/web/app/views/general/post-gateway.pug
+++ b/services/web/app/views/general/post-gateway.pug
@@ -15,12 +15,8 @@ block content
 						.card-body
 							p.text-center #{translate('processing_your_request')}
 
-	form(
-		data-ol-regular-form
-		data-ol-auto-submit
-		method="POST"
-	)
-		input(name="_csrf" type="hidden" value=csrfToken)
-		input(hidden name="viaGateway" type="submit" value="true")
-		for name in Object.keys(form_data)
-			input(name=name type="hidden" value=form_data[name])
+	form(data-ol-regular-form data-ol-auto-submit method='POST')
+		input(name='_csrf' type='hidden' value=csrfToken)
+		input(name='viaGateway' hidden type='submit' value='true')
+		each name in Object.keys(form_data)
+			input(name=name type='hidden' value=form_data[name])
diff --git a/services/web/app/views/general/unsupported-browser.pug b/services/web/app/views/general/unsupported-browser.pug
index a2c2216315..1fd2c42bdb 100644
--- a/services/web/app/views/general/unsupported-browser.pug
+++ b/services/web/app/views/general/unsupported-browser.pug
@@ -1,11 +1,11 @@
 extends ../layout/layout-no-js
 
 block vars
-	- metadata = { title: 'Unsupported browser' }
+	- metadata = {title: 'Unsupported browser'}
 
 block body
 	body.full-height
-		main.content.content-alt.full-height#main-content
+		main#main-content.content.content-alt.full-height
 			.container.full-height
 				.error-container.full-height
 					.error-details
@@ -15,7 +15,7 @@ block body
 							br
 							| If you think you're seeing this message in error,
 							|
-							a(href="mailto:" + settings.adminEmail) please let us know
+							a(href='mailto:' + settings.adminEmail) please let us know
 							| .
 
 						if fromURL
@@ -33,7 +33,7 @@ block body
 						p
 							| Support for beta or developer-preview browser versions cannot be guaranteed. Please
 							|
-							a(href="mailto:" + settings.adminEmail) get in touch
+							a(href='mailto:' + settings.adminEmail) get in touch
 							|
 							| if you encounter any issues while using the service with beta or developer-preview releases of supported browsers.
 						p
@@ -41,5 +41,5 @@ block body
 						p
 							| If you cannot upgrade to one of the supported browsers,
 							|
-							a(href="mailto:" + settings.adminEmail) please let us know
+							a(href='mailto:' + settings.adminEmail) please let us know
 							| .
diff --git a/services/web/app/views/layout-base.pug b/services/web/app/views/layout-base.pug
index 0493281353..b590618387 100644
--- a/services/web/app/views/layout-base.pug
+++ b/services/web/app/views/layout-base.pug
@@ -2,8 +2,8 @@ include ./_mixins/foot_scripts
 
 doctype html
 html(
-	lang=(currentLngCode || 'en')
-	class=(fixedSizeDocument ? 'fixed-size-document' : undefined)
+	lang=currentLngCode || 'en'
+	class=fixedSizeDocument ? 'fixed-size-document' : undefined
 )
 	- metadata = metadata || {}
 	- let bootstrap5PageStatus = 'enabled' // One of 'disabled' and 'enabled'
@@ -22,91 +22,128 @@ html(
 		include ./_metadata.pug
 
 		- const bootstrapVersion = bootstrap5PageStatus !== 'disabled' && (bootstrap5Override || bootstrap5PageSplitTest === '' || splitTestVariants[bootstrap5PageSplitTest] === 'enabled') ? 5 : 3
-	
+
 		//- Stylesheet
-		link(rel='stylesheet', href=buildCssPath(getCssThemeModifier(userSettings, brandVariation, enableIeeeBranding), bootstrapVersion), id="main-stylesheet")
+		link(
+			rel='stylesheet'
+			href=buildCssPath(getCssThemeModifier(userSettings, brandVariation, enableIeeeBranding), bootstrapVersion)
+			id='main-stylesheet'
+		)
 		block css
 			each file in entrypointStyles(entrypoint)
-				link(rel='stylesheet', href=file)
+				link(rel='stylesheet' href=file)
 
 		block _headLinks
 
-		if (typeof suppressRelAlternateLinks == "undefined")
+		if typeof suppressRelAlternateLinks == 'undefined'
 			if settings.i18n.subdomainLang
 				each subdomainDetails in settings.i18n.subdomainLang
 					if !subdomainDetails.hide
-						link(rel="alternate", href=subdomainDetails.url + currentUrl, hreflang=subdomainDetails.lngCode)
+						link(
+							rel='alternate'
+							href=subdomainDetails.url + currentUrl
+							hreflang=subdomainDetails.lngCode
+						)
 
-		if (entrypoint !== 'marketing')
-			link(rel="preload", href=buildJsPath(currentLngCode + "-json.js"), as="script", nonce=scriptNonce)
+		if entrypoint !== 'marketing'
+			link(
+				rel='preload'
+				href=buildJsPath(currentLngCode + '-json.js')
+				as='script'
+				nonce=scriptNonce
+			)
 
 		//- Scripts
-		if (typeof suppressGoogleAnalytics == "undefined")
+		if typeof suppressGoogleAnalytics == 'undefined'
 			include _google_analytics
 
 		block meta
-			meta(name="ol-csrfToken" content=csrfToken)
+			meta(name='ol-csrfToken' content=csrfToken)
 			//- Configure dynamically loaded assets (via webpack) to be downloaded from CDN
 			//- See: https://webpack.js.org/guides/public-path/#on-the-fly
-			meta(name="ol-baseAssetPath" content=buildBaseAssetPath())
-			meta(name="ol-mathJaxPath" content=mathJaxPath)
-			meta(name="ol-dictionariesRoot" content=dictionariesRoot)
+			meta(name='ol-baseAssetPath' content=buildBaseAssetPath())
+			meta(name='ol-mathJaxPath' content=mathJaxPath)
+			meta(name='ol-dictionariesRoot' content=dictionariesRoot)
 
-			meta(name="ol-usersEmail" content=getUserEmail())
-			meta(name="ol-ab" data-type="json" content={})
-			meta(name="ol-user_id" content=getLoggedInUserId())
+			meta(name='ol-usersEmail' content=getUserEmail())
+			meta(name='ol-ab' data-type='json' content={})
+			meta(name='ol-user_id' content=getLoggedInUserId())
 			//- Internationalisation settings
-			meta(name="ol-i18n" data-type="json" content={
-				currentLangCode: currentLngCode
-			})
+			meta(
+				name='ol-i18n'
+				data-type='json'
+				content={
+					currentLangCode: currentLngCode,
+				}
+			)
 			//- Expose some settings globally to the frontend
-			meta(name="ol-ExposedSettings" data-type="json" content=ExposedSettings)
-			meta(name="ol-splitTestVariants" data-type="json" content=splitTestVariants || {})
-			meta(name="ol-splitTestInfo" data-type="json" content=splitTestInfo || {})
+			meta(name='ol-ExposedSettings' data-type='json' content=ExposedSettings)
+			meta(
+				name='ol-splitTestVariants'
+				data-type='json'
+				content=splitTestVariants || {}
+			)
+			meta(name='ol-splitTestInfo' data-type='json' content=splitTestInfo || {})
 
-			if (typeof settings.algolia != "undefined")
-				meta(name="ol-algolia" data-type="json" content={
-					appId: settings.algolia.app_id,
-					apiKey: settings.algolia.read_only_api_key,
-					indexes: settings.algolia.indexes
-				})
+			if typeof settings.algolia != 'undefined'
+				meta(
+					name='ol-algolia'
+					data-type='json'
+					content={
+						appId: settings.algolia.app_id,
+						apiKey: settings.algolia.read_only_api_key,
+						indexes: settings.algolia.indexes,
+					}
+				)
 
-			meta(name="ol-isManagedAccount" data-type="boolean" content=isManagedAccount)
+			meta(
+				name='ol-isManagedAccount'
+				data-type='boolean'
+				content=isManagedAccount
+			)
 			each restriction in userRestrictions || []
-				meta(name='ol-cannot-' + restriction data-type="boolean" content=true)
-			meta(name="ol-bootstrapVersion" data-type="json" content=bootstrapVersion)
+				meta(name='ol-cannot-' + restriction data-type='boolean' content)
+			meta(name='ol-bootstrapVersion' data-type='json' content=bootstrapVersion)
 
 		block head-scripts
 
-	body(class={
-		'thin-footer': showThinFooter,
-		'website-redesign': isWebsiteRedesign === true || websiteRedesignOverride,
-		'application-page': isApplicationPage
-	}, data-theme="default")
-		if(settings.recaptcha && settings.recaptcha.siteKeyV3)
-			script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=" + settings.recaptcha.siteKeyV3, defer=deferScripts)
+	body(
+		class={
+			'thin-footer': showThinFooter,
+			'website-redesign': isWebsiteRedesign === true || websiteRedesignOverride,
+			'application-page': isApplicationPage,
+		}
+		data-theme='default'
+	)
+		if settings.recaptcha && settings.recaptcha.siteKeyV3
+			script(
+				type='text/javascript'
+				nonce=scriptNonce
+				src='https://www.recaptcha.net/recaptcha/api.js?render=' + settings.recaptcha.siteKeyV3
+				defer=deferScripts
+			)
 
-		if (typeof suppressSkipToContent == "undefined")
-			a(class="skip-to-content" href="#main-content") #{translate('skip_to_content')}
+		if typeof suppressSkipToContent == 'undefined'
+			a(class='skip-to-content' href='#main-content') #{translate('skip_to_content')}
 
 		block body
 
-		if (settings.devToolbar.enabled)
-			div#dev-toolbar
+		if settings.devToolbar.enabled
+			#dev-toolbar
 
 	block foot-scripts
 		+foot-scripts
 
 	include _customer_io
 
-	script(type="text/javascript", nonce=scriptNonce).
-		window.addEventListener('DOMContentLoaded', function() {
+	script(type='text/javascript' nonce=scriptNonce).
+		window.addEventListener('DOMContentLoaded', function () {
 			//- Look for bundle
 			var cdnBlocked = typeof Frontend === 'undefined'
 			//- Prevent loops
-			var noCdnAlreadyInUrl = window.location.href.indexOf("nocdn=true") != -1
-			if (cdnBlocked && !noCdnAlreadyInUrl && navigator.userAgent.indexOf("Googlebot") == -1) {
+			var noCdnAlreadyInUrl = window.location.href.indexOf('nocdn=true') != -1
+			if (cdnBlocked && !noCdnAlreadyInUrl && navigator.userAgent.indexOf('Googlebot') == -1) {
 				//- Set query param, server will not set CDN url
-				window.location.search += "&nocdn=true";
+				window.location.search += '&nocdn=true'
 			}
 		})
diff --git a/services/web/app/views/layout-marketing.pug b/services/web/app/views/layout-marketing.pug
index 20126beda3..b54c30f033 100644
--- a/services/web/app/views/layout-marketing.pug
+++ b/services/web/app/views/layout-marketing.pug
@@ -7,7 +7,7 @@ block entrypointVar
 	- entrypoint = 'marketing'
 
 block body
-	if (typeof suppressNavbar === "undefined")
+	if typeof suppressNavbar === 'undefined'
 		if bootstrapVersion === 5
 			include layout/navbar-marketing-bootstrap-5
 		else
@@ -15,7 +15,7 @@ block body
 
 	block content
 
-	if (typeof suppressFooter === "undefined")
+	if typeof suppressFooter === 'undefined'
 		if showThinFooter
 			if bootstrapVersion === 5
 				include layout/thin-footer-bootstrap-5
@@ -24,13 +24,13 @@ block body
 		else
 			include layout/fat-footer
 
-	if (typeof(suppressCookieBanner) == 'undefined')
+	if typeof suppressCookieBanner == 'undefined'
 		include _cookie_banner
 
 	if bootstrapVersion === 5
-		!= moduleIncludes("contactModal-marketing-bootstrap-5", locals)
+		!= moduleIncludes('contactModal-marketing-bootstrap-5', locals)
 	else
-		!= moduleIncludes("contactModal-marketing", locals)
+		!= moduleIncludes('contactModal-marketing', locals)
 
 block prepend foot-scripts
 	+bootstrap-js(bootstrapVersion)
diff --git a/services/web/app/views/layout-react.pug b/services/web/app/views/layout-react.pug
index be875b29f8..94ff3ba247 100644
--- a/services/web/app/views/layout-react.pug
+++ b/services/web/app/views/layout-react.pug
@@ -7,10 +7,10 @@ include ./_mixins/bootstrap_js
 
 block entrypointVar
 	- entrypoint = 'marketing'
-		
+
 block isApplicationPageVar
 	- isApplicationPage = true
-		
+
 block append meta
 	- const canDisplayAdminMenu = hasAdminAccess()
 	- const canDisplayAdminRedirect = canRedirectToAdminDomain()
@@ -22,44 +22,52 @@ block append meta
 	- const enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
 	- const showSignUpLink = hasFeature('registration-page')
 
-	meta(name="ol-navbar" data-type="json" content={
-		customLogo: settings.nav.custom_logo,
-		title: nav.title,
-		canDisplayAdminMenu,
-		canDisplayAdminRedirect,
-		canDisplaySplitTestMenu,
-		canDisplaySurveyMenu,
-		canDisplayScriptLogMenu,
-		enableUpgradeButton,
-		suppressNavbarRight: !!suppressNavbarRight,
-		suppressNavContentLinks: !!suppressNavContentLinks,
-		showSubscriptionLink: nav.showSubscriptionLink,
-		showSignUpLink: showSignUpLink,
-		currentUrl: currentUrl,
-		sessionUser: sessionUser ? { email: sessionUser.email} : undefined,
-		adminUrl: settings.adminUrl,
-		items: cloneAndTranslateText(nav.header_extras)
-	})
-	meta(name="ol-footer" data-type="json" content={
-		showThinFooter: showThinFooter,
-		showPoweredBy: !hasFeature('saas') && !settings.nav.hide_powered_by,
-		subdomainLang: settings.i18n.subdomainLang,
-		translatedLanguages: settings.translatedLanguages,
-		leftItems: cloneAndTranslateText(settings.nav.left_footer),
-		rightItems: settings.nav.right_footer
-	})
+	meta(
+		name='ol-navbar'
+		data-type='json'
+		content={
+			customLogo: settings.nav.custom_logo,
+			title: nav.title,
+			canDisplayAdminMenu,
+			canDisplayAdminRedirect,
+			canDisplaySplitTestMenu,
+			canDisplaySurveyMenu,
+			canDisplayScriptLogMenu,
+			enableUpgradeButton,
+			suppressNavbarRight: !!suppressNavbarRight,
+			suppressNavContentLinks: !!suppressNavContentLinks,
+			showSubscriptionLink: nav.showSubscriptionLink,
+			showSignUpLink: showSignUpLink,
+			currentUrl: currentUrl,
+			sessionUser: sessionUser ? {email: sessionUser.email} : undefined,
+			adminUrl: settings.adminUrl,
+			items: cloneAndTranslateText(nav.header_extras),
+		}
+	)
+	meta(
+		name='ol-footer'
+		data-type='json'
+		content={
+			showThinFooter: showThinFooter,
+			showPoweredBy: !hasFeature('saas') && !settings.nav.hide_powered_by,
+			subdomainLang: settings.i18n.subdomainLang,
+			translatedLanguages: settings.translatedLanguages,
+			leftItems: cloneAndTranslateText(settings.nav.left_footer),
+			rightItems: settings.nav.right_footer,
+		}
+	)
 
 block body
-	if (typeof suppressNavbar === "undefined")
+	if typeof suppressNavbar === 'undefined'
 		include layout/navbar-marketing-react-bootstrap-5
 
 	block content
 
-	if (typeof suppressFooter === "undefined")
+	if typeof suppressFooter === 'undefined'
 		if showThinFooter
 			include layout/thin-footer-bootstrap-5
 		else
 			include layout/fat-footer-react-bootstrap-5
 
-	if (typeof suppressCookieBanner === "undefined")
+	if typeof suppressCookieBanner === 'undefined'
 		include _cookie_banner
diff --git a/services/web/app/views/layout-website-redesign.pug b/services/web/app/views/layout-website-redesign.pug
index d04d4b1202..5d7bce6c4d 100644
--- a/services/web/app/views/layout-website-redesign.pug
+++ b/services/web/app/views/layout-website-redesign.pug
@@ -7,7 +7,7 @@ block entrypointVar
 	- entrypoint = 'marketing'
 
 block body
-	if (typeof(suppressNavbar) == "undefined")
+	if typeof suppressNavbar == 'undefined'
 		if bootstrapVersion === 5
 			include layout/navbar-marketing-bootstrap-5
 		else
@@ -17,23 +17,23 @@ block body
 
 	//- bootstrapVersion needed here, because plans.pug uses both BS version
 	//- If the `plans-page-bs5` split test has been completed, remove bootstrapVersion logic
-	if (typeof(suppressFooter) == "undefined")
+	if typeof suppressFooter == 'undefined'
 		if showThinFooter
 			if bootstrapVersion === 5
 				include layout/thin-footer-bootstrap-5
-			else 
+			else
 				include layout/thin-footer
 		else
 			include layout/fat-footer-website-redesign
 
-	if (typeof(suppressCookieBanner) == 'undefined')
+	if typeof suppressCookieBanner == 'undefined'
 		include _cookie_banner
 
 	block contactModal
 		if bootstrapVersion === 5
-			!= moduleIncludes("contactModal-marketing-bootstrap-5", locals)
+			!= moduleIncludes('contactModal-marketing-bootstrap-5', locals)
 		else
-			!= moduleIncludes("contactModal-marketing", locals)
+			!= moduleIncludes('contactModal-marketing', locals)
 
 block prepend foot-scripts
 	+bootstrap-js(bootstrapVersion)
diff --git a/services/web/app/views/layout/fat-footer-base.pug b/services/web/app/views/layout/fat-footer-base.pug
index 2e3dd2074f..e8380939f6 100644
--- a/services/web/app/views/layout/fat-footer-base.pug
+++ b/services/web/app/views/layout/fat-footer-base.pug
@@ -1,9 +1,9 @@
 .fat-footer-base
 	.fat-footer-base-section.fat-footer-base-meta
-		.fat-footer-base-item 
+		.fat-footer-base-item
 			.fat-footer-base-copyright © #{new Date().getFullYear()} Overleaf
-			a(href="/legal") #{translate('privacy_and_terms')}
-			a(href="https://www.digital-science.com/security-certifications/") #{translate('compliance')}
+			a(href='/legal') #{translate('privacy_and_terms')}
+			a(href='https://www.digital-science.com/security-certifications/') #{translate('compliance')}
 		ul.fat-footer-base-item.list-unstyled.fat-footer-base-language
 			if bootstrapVersion === 5
 				include language-picker-bootstrap-5
@@ -11,22 +11,53 @@
 				include language-picker
 	.fat-footer-base-section.fat-footer-base-social
 		.fat-footer-base-item
-			a.fat-footer-social.x-logo(href="https://x.com/overleaf")
-				svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 1227" height="25")
-					path(d="M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z")
+			a.fat-footer-social.x-logo(href='https://x.com/overleaf')
+				svg(
+					xmlns='http://www.w3.org/2000/svg'
+					viewBox='0 0 1200 1227'
+					height='25'
+				)
+					path(
+						d='M714.163 519.284L1160.89 0H1055.03L667.137 450.887L357.328 0H0L468.492 681.821L0 1226.37H105.866L515.491 750.218L842.672 1226.37H1200L714.137 519.284H714.163ZM569.165 687.828L521.697 619.934L144.011 79.6944H306.615L611.412 515.685L658.88 583.579L1055.08 1150.3H892.476L569.165 687.854V687.828Z'
+					)
 				span.visually-hidden #{translate("app_on_x", {social: "X"})}
-			a.fat-footer-social.facebook-logo(href="https://www.facebook.com/overleaf.editor")
-				svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 666.66668 666.66717" height="25")
+			a.fat-footer-social.facebook-logo(
+				href='https://www.facebook.com/overleaf.editor'
+			)
+				svg(
+					xmlns='http://www.w3.org/2000/svg'
+					viewBox='0 0 666.66668 666.66717'
+					height='25'
+				)
 					defs
-						clipPath(id="a" clipPathUnits="userSpaceOnUse")
-							path(d="M0 700h700V0H0Z")
-					g(clip-path="url(#a)" transform="matrix(1.33333 0 0 -1.33333 -133.333 800)")
-						path.background(d="M0 0c0 138.071-111.929 250-250 250S-500 138.071-500 0c0-117.245 80.715-215.622 189.606-242.638v166.242h-51.552V0h51.552v32.919c0 85.092 38.508 124.532 122.048 124.532 15.838 0 43.167-3.105 54.347-6.211V81.986c-5.901.621-16.149.932-28.882.932-40.993 0-56.832-15.528-56.832-55.9V0h81.659l-14.028-76.396h-67.631v-171.773C-95.927-233.218 0-127.818 0 0" fill="#0866ff" transform="translate(600 350)")
-						path.text(d="m0 0 14.029 76.396H-67.63v27.019c0 40.372 15.838 55.899 56.831 55.899 12.733 0 22.981-.31 28.882-.931v69.253c-11.18 3.106-38.509 6.212-54.347 6.212-83.539 0-122.048-39.441-122.048-124.533V76.396h-51.552V0h51.552v-166.242a250.559 250.559 0 0 1 60.394-7.362c10.254 0 20.358.632 30.288 1.831V0Z" fill="#fff" transform="translate(447.918 273.604)")
+						clipPath(id='a' clipPathUnits='userSpaceOnUse')
+							path(d='M0 700h700V0H0Z')
+					g(
+						clip-path='url(#a)'
+						transform='matrix(1.33333 0 0 -1.33333 -133.333 800)'
+					)
+						path.background(
+							d='M0 0c0 138.071-111.929 250-250 250S-500 138.071-500 0c0-117.245 80.715-215.622 189.606-242.638v166.242h-51.552V0h51.552v32.919c0 85.092 38.508 124.532 122.048 124.532 15.838 0 43.167-3.105 54.347-6.211V81.986c-5.901.621-16.149.932-28.882.932-40.993 0-56.832-15.528-56.832-55.9V0h81.659l-14.028-76.396h-67.631v-171.773C-95.927-233.218 0-127.818 0 0'
+							fill='#0866ff'
+							transform='translate(600 350)'
+						)
+						path.text(
+							d='m0 0 14.029 76.396H-67.63v27.019c0 40.372 15.838 55.899 56.831 55.899 12.733 0 22.981-.31 28.882-.931v69.253c-11.18 3.106-38.509 6.212-54.347 6.212-83.539 0-122.048-39.441-122.048-124.533V76.396h-51.552V0h51.552v-166.242a250.559 250.559 0 0 1 60.394-7.362c10.254 0 20.358.632 30.288 1.831V0Z'
+							fill='#fff'
+							transform='translate(447.918 273.604)'
+						)
 				span.visually-hidden #{translate("app_on_x", {social: "Facebook"})}
-			a.fat-footer-social.linkedin-logo(href="https://www.linkedin.com/company/writelatex-limited")
-				svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72" height="25")
-					g(fill="none" fill-rule="evenodd")
-						path.background(fill="#0B66C3" d="M8 72h56a8 8 0 0 0 8-8V8a8 8 0 0 0-8-8H8a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8")
-						path.text(fill="#FFF" d="M62 62H51.316V43.802c0-4.99-1.896-7.777-5.845-7.777-4.296 0-6.54 2.901-6.54 7.777V62H28.632V27.333H38.93v4.67s3.096-5.729 10.453-5.729c7.353 0 12.617 4.49 12.617 13.777zM16.35 22.794c-3.508 0-6.35-2.864-6.35-6.397C10 12.864 12.842 10 16.35 10c3.507 0 6.347 2.864 6.347 6.397 0 3.533-2.84 6.397-6.348 6.397ZM11.032 62h10.736V27.333H11.033V62")
+			a.fat-footer-social.linkedin-logo(
+				href='https://www.linkedin.com/company/writelatex-limited'
+			)
+				svg(xmlns='http://www.w3.org/2000/svg' viewBox='0 0 72 72' height='25')
+					g(fill='none' fill-rule='evenodd')
+						path.background(
+							fill='#0B66C3'
+							d='M8 72h56a8 8 0 0 0 8-8V8a8 8 0 0 0-8-8H8a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8'
+						)
+						path.text(
+							fill='#FFF'
+							d='M62 62H51.316V43.802c0-4.99-1.896-7.777-5.845-7.777-4.296 0-6.54 2.901-6.54 7.777V62H28.632V27.333H38.93v4.67s3.096-5.729 10.453-5.729c7.353 0 12.617 4.49 12.617 13.777zM16.35 22.794c-3.508 0-6.35-2.864-6.35-6.397C10 12.864 12.842 10 16.35 10c3.507 0 6.347 2.864 6.347 6.397 0 3.533-2.84 6.397-6.348 6.397ZM11.032 62h10.736V27.333H11.033V62'
+						)
 				span.visually-hidden #{translate("app_on_x", {social: "LinkedIn"})}
diff --git a/services/web/app/views/layout/fat-footer-website-redesign.pug b/services/web/app/views/layout/fat-footer-website-redesign.pug
index cd68e1daf6..ba6286a296 100644
--- a/services/web/app/views/layout/fat-footer-website-redesign.pug
+++ b/services/web/app/views/layout/fat-footer-website-redesign.pug
@@ -1,84 +1,87 @@
 footer.fat-footer.hidden-print.website-redesign-fat-footer
-	.fat-footer-container(role="navigation" aria-label=translate('footer_navigation'))
+	.fat-footer-container(
+		role='navigation'
+		aria-label=translate('footer_navigation')
+	)
 		.fat-footer-sections(class=hideFatFooter ? 'hidden' : undefined)
-			.footer-section#footer-brand
-				a(href='/', aria-label=settings.appName).footer-brand
-					
+			#footer-brand.footer-section
+				a.footer-brand(href='/' aria-label=settings.appName)
+
 			.footer-section
 				h2.footer-section-heading #{translate('About')}
-					
+
 				ul.list-unstyled
 					li
-						a(href="/about") #{translate('footer_about_us')}
+						a(href='/about') #{translate('footer_about_us')}
 					li
-						a(href="/about/values") #{translate('our_values')}
+						a(href='/about/values') #{translate('our_values')}
 					li
-						a(href="https://digitalscience.pinpointhq.com/") #{translate('careers')}
+						a(href='https://digitalscience.pinpointhq.com/') #{translate('careers')}
 					li
-						a(href="/for/press") !{translate('press_and_awards')}
+						a(href='/for/press') !{translate('press_and_awards')}
 					li
-						a(href="/blog") #{translate('blog')}
-						
+						a(href='/blog') #{translate('blog')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('learn')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/learn/latex/Learn_LaTeX_in_30_minutes") #{translate('latex_in_thirty_minutes')}
+						a(href='/learn/latex/Learn_LaTeX_in_30_minutes') #{translate('latex_in_thirty_minutes')}
 					li
-						a(href="/latex/templates") #{translate('templates')}
+						a(href='/latex/templates') #{translate('templates')}
 					li
-						a(href="/events/webinars") #{translate('webinars')}
+						a(href='/events/webinars') #{translate('webinars')}
 					li
-						a(href="/learn/latex/Tutorials") #{translate('tutorials')}
+						a(href='/learn/latex/Tutorials') #{translate('tutorials')}
 					li
-						a(href="/learn/latex/Inserting_Images") #{translate('how_to_insert_images')}
+						a(href='/learn/latex/Inserting_Images') #{translate('how_to_insert_images')}
 					li
-						a(href="/learn/latex/Tables") #{translate('how_to_create_tables')}
-						
+						a(href='/learn/latex/Tables') #{translate('how_to_create_tables')}
+
 			.footer-section
 				h2.footer-section-heading !{translate('footer_plans_and_pricing')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/learn/how-to/Overleaf_premium_features") #{translate('premium_features')}
+						a(href='/learn/how-to/Overleaf_premium_features') #{translate('premium_features')}
 					li
-						a(href="/user/subscription/plans?itm_referrer=footer-for-indv-groups") !{translate('for_individuals_and_groups')}
+						a(href='/user/subscription/plans?itm_referrer=footer-for-indv-groups') !{translate('for_individuals_and_groups')}
 					li
-						a(href="/for/enterprises") #{translate('for_business')}
+						a(href='/for/enterprises') #{translate('for_business')}
 					li
-						a(href="/for/universities") #{translate('for_universities')}
+						a(href='/for/universities') #{translate('for_universities')}
 					li
 						a(
 							data-ol-for-students-link
-							href="/user/subscription/plans?itm_referrer=footer-for-students#student-annual"
+							href='/user/subscription/plans?itm_referrer=footer-for-students#student-annual'
 						) #{translate('for_students')}
 					li
-						a(href="/for/government") #{translate('for_government')}
-						
+						a(href='/for/government') #{translate('for_government')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('get_involved')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/for/community/advisors") #{translate('become_an_advisor')}
+						a(href='/for/community/advisors') #{translate('become_an_advisor')}
 					li
-						a(href="https://forms.gle/67PSpN1bLnjGCmPQ9") #{translate('let_us_know_what_you_think')}
+						a(href='https://forms.gle/67PSpN1bLnjGCmPQ9') #{translate('let_us_know_what_you_think')}
 					if user
 						li
-							a(href="/beta/participate") #{translate('join_beta_program')}
-		
+							a(href='/beta/participate') #{translate('join_beta_program')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('help')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/about/why-latex") #{translate('why_latex')}
+						a(href='/about/why-latex') #{translate('why_latex')}
 					li
-						a(href="/learn") #{translate('Documentation')} 
+						a(href='/learn') #{translate('Documentation')} 
 					li
-						a(href="/contact") #{translate('footer_contact_us')}  
+						a(href='/contact') #{translate('footer_contact_us')} 
 					li
-						a(href="https://status.overleaf.com/") #{translate('website_status')}
-					
+						a(href='https://status.overleaf.com/') #{translate('website_status')}
+
 		include fat-footer-base
diff --git a/services/web/app/views/layout/fat-footer.pug b/services/web/app/views/layout/fat-footer.pug
index d319a217cb..c7c19bd4a3 100644
--- a/services/web/app/views/layout/fat-footer.pug
+++ b/services/web/app/views/layout/fat-footer.pug
@@ -1,84 +1,87 @@
 footer.fat-footer.hidden-print
-	.fat-footer-container(role="navigation" aria-label=translate('footer_navigation'))
+	.fat-footer-container(
+		role='navigation'
+		aria-label=translate('footer_navigation')
+	)
 		.fat-footer-sections(class=hideFatFooter ? 'hidden' : undefined)
-			.footer-section#footer-brand
-				a(href='/', aria-label=settings.appName).footer-brand
-					
+			#footer-brand.footer-section
+				a.footer-brand(href='/' aria-label=settings.appName)
+
 			.footer-section
 				h2.footer-section-heading #{translate('About')}
-					
+
 				ul.list-unstyled
 					li
-						a(href="/about") #{translate('footer_about_us')}
+						a(href='/about') #{translate('footer_about_us')}
 					li
-						a(href="/about/values") #{translate('our_values')}
+						a(href='/about/values') #{translate('our_values')}
 					li
-						a(href="https://digitalscience.pinpointhq.com/") #{translate('careers')}
+						a(href='https://digitalscience.pinpointhq.com/') #{translate('careers')}
 					li
-						a(href="/for/press") !{translate('press_and_awards')}
+						a(href='/for/press') !{translate('press_and_awards')}
 					li
-						a(href="/blog") #{translate('blog')}
-						
+						a(href='/blog') #{translate('blog')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('learn')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/learn/latex/Learn_LaTeX_in_30_minutes") #{translate('latex_in_thirty_minutes')}
+						a(href='/learn/latex/Learn_LaTeX_in_30_minutes') #{translate('latex_in_thirty_minutes')}
 					li
-						a(href="/latex/templates") #{translate('templates')}
+						a(href='/latex/templates') #{translate('templates')}
 					li
-						a(href="/events/webinars") #{translate('webinars')}
+						a(href='/events/webinars') #{translate('webinars')}
 					li
-						a(href="/learn/latex/Tutorials") #{translate('tutorials')}
+						a(href='/learn/latex/Tutorials') #{translate('tutorials')}
 					li
-						a(href="/learn/latex/Inserting_Images") #{translate('how_to_insert_images')}
+						a(href='/learn/latex/Inserting_Images') #{translate('how_to_insert_images')}
 					li
-						a(href="/learn/latex/Tables") #{translate('how_to_create_tables')}
-						
+						a(href='/learn/latex/Tables') #{translate('how_to_create_tables')}
+
 			.footer-section
 				h2.footer-section-heading !{translate('footer_plans_and_pricing')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/learn/how-to/Overleaf_premium_features") #{translate('premium_features')}
+						a(href='/learn/how-to/Overleaf_premium_features') #{translate('premium_features')}
 					li
-						a(href="/user/subscription/plans?itm_referrer=footer-for-indv-groups") !{translate('for_individuals_and_groups')}
+						a(href='/user/subscription/plans?itm_referrer=footer-for-indv-groups') !{translate('for_individuals_and_groups')}
 					li
-						a(href="/for/enterprises") #{translate('for_enterprise')}
+						a(href='/for/enterprises') #{translate('for_enterprise')}
 					li
-						a(href="/for/universities") #{translate('for_universities')}
+						a(href='/for/universities') #{translate('for_universities')}
 					li
 						a(
 							data-ol-for-students-link
-							href="/user/subscription/plans?itm_referrer=footer-for-students#student-annual"
+							href='/user/subscription/plans?itm_referrer=footer-for-students#student-annual'
 						) #{translate('for_students')}
 					li
-						a(href="/for/government") #{translate('for_government')}
-						
+						a(href='/for/government') #{translate('for_government')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('get_involved')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/for/community/advisors") #{translate('become_an_advisor')}
+						a(href='/for/community/advisors') #{translate('become_an_advisor')}
 					li
-						a(href="https://forms.gle/67PSpN1bLnjGCmPQ9") #{translate('let_us_know_what_you_think')}
+						a(href='https://forms.gle/67PSpN1bLnjGCmPQ9') #{translate('let_us_know_what_you_think')}
 					if user
 						li
-							a(href="/beta/participate") #{translate('join_beta_program')}
-		
+							a(href='/beta/participate') #{translate('join_beta_program')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('help')}
-		
+
 				ul.list-unstyled
 					li
-						a(href="/about/why-latex") #{translate('why_latex')}
+						a(href='/about/why-latex') #{translate('why_latex')}
 					li
-						a(href="/learn") #{translate('Documentation')} 
+						a(href='/learn') #{translate('Documentation')} 
 					li
-						a(href="/contact") #{translate('footer_contact_us')}  
+						a(href='/contact') #{translate('footer_contact_us')} 
 					li
-						a(href="https://status.overleaf.com/") #{translate('website_status')}
-					
+						a(href='https://status.overleaf.com/') #{translate('website_status')}
+
 		include fat-footer-base
diff --git a/services/web/app/views/layout/language-picker-bootstrap-5.pug b/services/web/app/views/layout/language-picker-bootstrap-5.pug
index 44997a8ca4..09f8f58c7d 100644
--- a/services/web/app/views/layout/language-picker-bootstrap-5.pug
+++ b/services/web/app/views/layout/language-picker-bootstrap-5.pug
@@ -1,27 +1,35 @@
 include ../_mixins/material_symbol
 
-li.dropdown.dropup.subdued(dropdown).language-picker
+li.dropdown.dropup.subdued.language-picker(dropdown)
 	button#language-picker-toggle.btn.btn-link.btn-inline-link(
-		dropdown-toggle,
-		data-ol-lang-selector-tooltip,
-		data-bs-toggle="dropdown",
-		aria-haspopup="true",
-		aria-expanded="false",
-		aria-label="Select " + translate('language'),
+		dropdown-toggle
+		data-ol-lang-selector-tooltip
+		data-bs-toggle='dropdown'
+		aria-haspopup='true'
+		aria-expanded='false'
+		aria-label='Select ' + translate('language')
 		tooltip=translate('language')
 		title=translate('language')
 	)
-		+material-symbol("translate")
+		+material-symbol('translate')
 		| &nbsp;
 		span.language-picker-text #{settings.translatedLanguages[currentLngCode]}
 
-	ul.dropdown-menu.dropdown-menu-sm-width(role="menu" aria-labelledby="language-picker-toggle")
+	ul.dropdown-menu.dropdown-menu-sm-width(
+		role='menu'
+		aria-labelledby='language-picker-toggle'
+	)
 		li.dropdown-header #{translate("language")}
 		each subdomainDetails, subdomain in settings.i18n.subdomainLang
 			if !subdomainDetails.hide
 				- let isActive = subdomainDetails.lngCode === currentLngCode
 				li.lng-option
-					a.menu-indent(href=subdomainDetails.url+currentUrlWithQueryParams, role="menuitem", class=isActive ? 'dropdown-item active' : 'dropdown-item', aria-selected=isActive ? 'true' : 'false')
+					a.menu-indent(
+						href=subdomainDetails.url + currentUrlWithQueryParams
+						role='menuitem'
+						class=isActive ? 'dropdown-item active' : 'dropdown-item'
+						aria-selected=isActive ? 'true' : 'false'
+					)
 						| #{settings.translatedLanguages[subdomainDetails.lngCode]}
 						if subdomainDetails.lngCode === currentLngCode
-							+material-symbol("check", "dropdown-item-trailing-icon")
+							+material-symbol('check', 'dropdown-item-trailing-icon')
diff --git a/services/web/app/views/layout/language-picker.pug b/services/web/app/views/layout/language-picker.pug
index d26d8a8bf7..e88ff716ec 100644
--- a/services/web/app/views/layout/language-picker.pug
+++ b/services/web/app/views/layout/language-picker.pug
@@ -1,13 +1,13 @@
-li.dropdown.dropup.subdued(dropdown).language-picker
-	a.dropdown-toggle#language-picker-toggle(
-		href="#",
-		dropdown-toggle,
-		data-ol-lang-selector-tooltip,
-		data-toggle="dropdown",
-		role="button"
-		aria-haspopup="true",
-		aria-expanded="false",
-		aria-label="Select " + translate('language'),
+li.dropdown.dropup.subdued.language-picker(dropdown)
+	a#language-picker-toggle.dropdown-toggle(
+		href='#'
+		dropdown-toggle
+		data-ol-lang-selector-tooltip
+		data-toggle='dropdown'
+		role='button'
+		aria-haspopup='true'
+		aria-expanded='false'
+		aria-label='Select ' + translate('language')
 		tooltip=translate('language')
 		title=translate('language')
 	)
@@ -15,10 +15,13 @@ li.dropdown.dropup.subdued(dropdown).language-picker
 		|
 		| #{settings.translatedLanguages[currentLngCode]}
 
-	ul.dropdown-menu(role="menu" aria-labelledby="language-picker-toggle")
+	ul.dropdown-menu(role='menu' aria-labelledby='language-picker-toggle')
 		li.dropdown-header #{translate("language")}
 		each subdomainDetails, subdomain in settings.i18n.subdomainLang
 			if !subdomainDetails.hide
 				li.lng-option
-					a.menu-indent(href=subdomainDetails.url+currentUrlWithQueryParams role="menuitem")
+					a.menu-indent(
+						href=subdomainDetails.url + currentUrlWithQueryParams
+						role='menuitem'
+					)
 						| #{settings.translatedLanguages[subdomainDetails.lngCode]}
diff --git a/services/web/app/views/layout/layout-no-js.pug b/services/web/app/views/layout/layout-no-js.pug
index b5bf3cc434..76a31b72a5 100644
--- a/services/web/app/views/layout/layout-no-js.pug
+++ b/services/web/app/views/layout/layout-no-js.pug
@@ -1,18 +1,20 @@
 doctype html
-html(lang="en")
-
+html(lang='en')
 	- metadata = metadata || {}
 	block vars
 
 	head
-		if (metadata && metadata.title)
+		if metadata && metadata.title
 			title= metadata.title
 		if metadata && metadata.viewport
-			meta(name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes")
+			meta(
+				name='viewport'
+				content='width=device-width, initial-scale=1.0, user-scalable=yes'
+			)
 
-		link(rel="icon", href="/favicon.ico")
+		link(rel='icon' href='/favicon.ico')
 
 		if buildCssPath
-			link(rel="stylesheet", href=buildCssPath('', 5))
+			link(rel='stylesheet' href=buildCssPath('', 5))
 
 block body
diff --git a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
index c581ab29ce..29b12a056d 100644
--- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
+++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
@@ -1,26 +1,32 @@
 include ../_mixins/navbar
 
-nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
-	'website-redesign-navbar': isWebsiteRedesign
-})
+nav.navbar.navbar-default.navbar-main.navbar-expand-lg(
+	class={
+		'website-redesign-navbar': isWebsiteRedesign,
+	}
+)
 	.container-fluid.navbar-container
 		.navbar-header
 			if settings.nav.custom_logo
-				a(href='/', aria-label=settings.appName, style='background-image:url("'+settings.nav.custom_logo+'")').navbar-brand
-			else if (nav.title)
-				a(href='/', aria-label=settings.appName).navbar-title #{nav.title}
+				a.navbar-brand(
+					href='/'
+					aria-label=settings.appName
+					style='background-image:url("' + settings.nav.custom_logo + '")'
+				)
+			else if nav.title
+				a.navbar-title(href='/' aria-label=settings.appName) #{nav.title}
 			else
-				a(href='/', aria-label=settings.appName).navbar-brand
+				a.navbar-brand(href='/' aria-label=settings.appName)
 
 			- var enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
-			if (enableUpgradeButton)
+			if enableUpgradeButton
 				a.btn.btn-primary.me-2.d-md-none(
-					href="/user/subscription/plans"
-					event-tracking="upgrade-button-click"
-					event-tracking-mb="true"
-					event-tracking-label="upgrade"
-					event-tracking-trigger="click"
-					event-segmentation='{"source": "dashboard-top", "project-dashboard-react": "enabled", "is-dashboard-sidebar-hidden": "true", "is-screen-width-less-than-768px": "true"}'
+					href='/user/subscription/plans'
+					event-tracking='upgrade-button-click'
+					event-tracking-mb='true'
+					event-tracking-label='upgrade'
+					event-tracking-trigger='click'
+					event-segmentation={source: 'dashboard-top', projectDashboardReact: 'enabled', isDashboardSidebarHidden: 'true', isScreenWidthLessThan768px: 'true'}
 				) #{translate("upgrade")}
 
 		- var canDisplayAdminMenu = hasAdminAccess()
@@ -29,45 +35,45 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 		- var canDisplaySurveyMenu = hasFeature('saas') && canDisplayAdminMenu
 		- var canDisplayScriptLogMenu = hasFeature('saas') && canDisplayAdminMenu
 
-		if (typeof suppressNavbarRight === "undefined")
+		if typeof suppressNavbarRight === 'undefined'
 			button.navbar-toggler.collapsed(
-				type="button",
-				data-bs-toggle="collapse",
-				data-bs-target="#navbar-main-collapse"
-				aria-controls="navbar-main-collapse"
-				aria-expanded="false"
-				aria-label="Toggle " + translate('navigation')
+				type='button'
+				data-bs-toggle='collapse'
+				data-bs-target='#navbar-main-collapse'
+				aria-controls='navbar-main-collapse'
+				aria-expanded='false'
+				aria-label='Toggle ' + translate('navigation')
 			)
-				i.fa.fa-bars(aria-hidden="true")
+				i.fa.fa-bars(aria-hidden='true')
 
-			.navbar-collapse.collapse#navbar-main-collapse
-				ul.nav.navbar-nav.navbar-right.ms-auto(role="menubar")
-					if (canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu)
+			#navbar-main-collapse.navbar-collapse.collapse
+				ul.nav.navbar-nav.navbar-right.ms-auto(role='menubar')
+					if canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu
 						+nav-item.dropdown.subdued
 							button.dropdown-toggle(
-								aria-haspopup="true",
-								aria-expanded="false",
-								data-bs-toggle="dropdown"
-								role="menuitem"
-								event-tracking="menu-expand"
-								event-tracking-mb="true"
-								event-tracking-trigger="click"
-								event-segmentation={"item": "admin", "location": "top-menu"}
+								aria-haspopup='true'
+								aria-expanded='false'
+								data-bs-toggle='dropdown'
+								role='menuitem'
+								event-tracking='menu-expand'
+								event-tracking-mb='true'
+								event-tracking-trigger='click'
+								event-segmentation={item: 'admin', location: 'top-menu'}
 							)
 								| Admin
 							+dropdown-menu.dropdown-menu-end
 								if canDisplayAdminMenu
-									+dropdown-menu-link-item()(href="/admin") Manage Site
-									+dropdown-menu-link-item()(href="/admin/user") Manage Users
-									+dropdown-menu-link-item()(href="/admin/project") Project URL Lookup
+									+dropdown-menu-link-item(href='/admin') Manage Site
+									+dropdown-menu-link-item(href='/admin/user') Manage Users
+									+dropdown-menu-link-item(href='/admin/project') Project URL Lookup
 								if canDisplayAdminRedirect
-									+dropdown-menu-link-item()(href=settings.adminUrl) Switch to Admin
+									+dropdown-menu-link-item(href=settings.adminUrl) Switch to Admin
 								if canDisplaySplitTestMenu
-									+dropdown-menu-link-item()(href="/admin/split-test") Manage Feature Flags
+									+dropdown-menu-link-item(href='/admin/split-test') Manage Feature Flags
 								if canDisplaySurveyMenu
-									+dropdown-menu-link-item()(href="/admin/survey") Manage Surveys
+									+dropdown-menu-link-item(href='/admin/survey') Manage Surveys
 								if canDisplayScriptLogMenu
-									+dropdown-menu-link-item()(href="/admin/script-logs") View Script Logs
+									+dropdown-menu-link-item(href='/admin/script-logs') View Script Logs
 
 					// loop over header_extras
 					each item in nav.header_extras
@@ -86,14 +92,14 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 							if item.dropdown
 								+nav-item.dropdown(class=item.class)
 									button.dropdown-toggle(
-										aria-haspopup="true",
-										aria-expanded="false",
-										data-bs-toggle="dropdown"
-										role="menuitem"
-										event-tracking="menu-expand"
-										event-tracking-mb="true"
-										event-tracking-trigger="click"
-										event-segmentation={"item": item.trackingKey, "location": "top-menu"}
+										aria-haspopup='true'
+										aria-expanded='false'
+										data-bs-toggle='dropdown'
+										role='menuitem'
+										event-tracking='menu-expand'
+										event-tracking-mb='true'
+										event-tracking-trigger='click'
+										event-segmentation={item: item.trackingKey, location: 'top-menu'}
 									)
 										| !{translate(item.text)}
 									+dropdown-menu.dropdown-menu-end
@@ -101,31 +107,41 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 											if child.divider
 												+dropdown-menu-divider
 											else if child.isContactUs
-												+dropdown-menu-link-item()(data-ol-open-contact-form-modal="contact-us" data-bs-target="#contactUsModal" href data-bs-toggle="modal" event-tracking="menu-click" event-tracking-mb="true" event-tracking-trigger="click" event-segmentation={"item": "contact", "location": "top-menu"})
+												+dropdown-menu-link-item(
+													data-ol-open-contact-form-modal='contact-us'
+													data-bs-target='#contactUsModal'
+													href
+													data-bs-toggle='modal'
+													event-tracking='menu-click'
+													event-tracking-mb='true'
+													event-tracking-trigger='click'
+													event-segmentation={item: 'contact', location: 'top-menu'}
+												)
 													span
 														| #{translate("contact_us")}
 											else
 												if child.url
-													+dropdown-menu-link-item()(
-														href=child.url,
-														class=child.class,
-														event-tracking="menu-click"
-														event-tracking-mb="true"
-														event-tracking-trigger="click"
-														event-segmentation={ item: child.trackingKey, location: 'top-menu' }
+													+dropdown-menu-link-item(
+														href=child.url
+														class=child.class
+														event-tracking='menu-click'
+														event-tracking-mb='true'
+														event-tracking-trigger='click'
+														event-segmentation={item: child.trackingKey, location: 'top-menu'}
 													) !{translate(child.text)}
 												else
-													+dropdown-menu-item !{translate(child.text)}
+													+dropdown-menu-item
+														| !{translate(child.text)}
 							else
 								+nav-item(class=item.class)
 									if item.url
 										+nav-link(
-											href=item.url,
-											class=item.class,
-											event-tracking="menu-click"
-											event-tracking-mb="true"
-											event-tracking-trigger="click"
-											event-segmentation={ item: item.trackingKey, location: 'top-menu' }
+											href=item.url
+											class=item.class
+											event-tracking='menu-click'
+											event-tracking-mb='true'
+											event-tracking-trigger='click'
+											event-segmentation={item: item.trackingKey, location: 'top-menu'}
 										) !{translate(item.text)}
 									else
 										| !{translate(item.text)}
@@ -136,48 +152,48 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 						if hasFeature('registration-page')
 							+nav-item.primary
 								+nav-link(
-									href="/register"
-									event-tracking="menu-click"
-									event-tracking-action="clicked"
-									event-tracking-trigger="click"
-									event-tracking-mb="true"
-									event-segmentation={ page: currentUrl, item: 'register', location: 'top-menu' }
+									href='/register'
+									event-tracking='menu-click'
+									event-tracking-action='clicked'
+									event-tracking-trigger='click'
+									event-tracking-mb='true'
+									event-segmentation={page: currentUrl, item: 'register', location: 'top-menu'}
 								) #{translate('sign_up')}
 
 						// login link
 						+nav-item
 							+nav-link(
-								href="/login"
-								event-tracking="menu-click"
-								event-tracking-action="clicked"
-								event-tracking-trigger="click"
-								event-tracking-mb="true"
-								event-segmentation={ page: currentUrl, item: 'login', location: 'top-menu' }
+								href='/login'
+								event-tracking='menu-click'
+								event-tracking-action='clicked'
+								event-tracking-trigger='click'
+								event-tracking-mb='true'
+								event-segmentation={page: currentUrl, item: 'login', location: 'top-menu'}
 							) #{translate('log_in')}
 
 					// projects link and account menu
 					if getSessionUser()
 						+nav-item
-							+nav-link(href="/project") #{translate('Projects')}
+							+nav-link(href='/project') #{translate('Projects')}
 						+nav-item.dropdown
 							button.dropdown-toggle(
-								aria-haspopup="true",
-								aria-expanded="false",
-								data-bs-toggle="dropdown"
-								role="menuitem"
-								event-tracking="menu-expand"
-								event-tracking-mb="true"
-								event-tracking-trigger="click"
-								event-segmentation={"item": "account", "location": "top-menu"}
+								aria-haspopup='true'
+								aria-expanded='false'
+								data-bs-toggle='dropdown'
+								role='menuitem'
+								event-tracking='menu-expand'
+								event-tracking-mb='true'
+								event-tracking-trigger='click'
+								event-segmentation={item: 'account', location: 'top-menu'}
 							)
 								| #{translate('Account')}
 							+dropdown-menu.dropdown-menu-end
 								+dropdown-menu-item
-									div.disabled.dropdown-item #{getSessionUser().email}
+									.disabled.dropdown-item #{getSessionUser().email}
 								+dropdown-menu-divider
-								+dropdown-menu-link-item()(href="/user/settings") #{translate('account_settings')}
+								+dropdown-menu-link-item(href='/user/settings') #{translate('account_settings')}
 								if nav.showSubscriptionLink
-									+dropdown-menu-link-item()(href="/user/subscription") #{translate('subscription')}
+									+dropdown-menu-link-item(href='/user/subscription') #{translate('subscription')}
 								+dropdown-menu-divider
 								+dropdown-menu-item
 									//-
@@ -185,14 +201,10 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
 										this is that if the button is inside the form, screen readers will not count it in the total
 										number of menu items.
 									button.btn-link.text-left.dropdown-menu-button.dropdown-item(
-										role="menuitem",
-										tabindex="-1"
-										form="logOutForm"
+										role='menuitem'
+										tabindex='-1'
+										form='logOutForm'
 									)
 										| #{translate('log_out')}
-									form(
-										method="POST",
-										action="/logout",
-										id="logOutForm"
-									)
-										input(name='_csrf', type='hidden', value=csrfToken)
+									form(method='POST' action='/logout' id='logOutForm')
+										input(name='_csrf' type='hidden' value=csrfToken)
diff --git a/services/web/app/views/layout/navbar-marketing.pug b/services/web/app/views/layout/navbar-marketing.pug
index c5e9f2e0bf..4d374bd8ad 100644
--- a/services/web/app/views/layout/navbar-marketing.pug
+++ b/services/web/app/views/layout/navbar-marketing.pug
@@ -1,32 +1,44 @@
-nav.navbar.navbar-default.navbar-main(class={
-	'website-redesign-navbar': isWebsiteRedesign
-})
+nav.navbar.navbar-default.navbar-main(
+	class={
+		'website-redesign-navbar': isWebsiteRedesign,
+	}
+)
 	.container-fluid
 		.navbar-header
-			if (typeof(suppressNavbarRight) == "undefined")
+			if typeof suppressNavbarRight == 'undefined'
 				button.navbar-toggle.collapsed(
-					type="button",
-					data-toggle="collapse",
-					data-target="#navbar-main-collapse"
-					aria-label="Toggle " + translate('navigation')
+					type='button'
+					data-toggle='collapse'
+					data-target='#navbar-main-collapse'
+					aria-label='Toggle ' + translate('navigation')
 				)
-					i.fa.fa-bars(aria-hidden="true")
+					i.fa.fa-bars(aria-hidden='true')
 			- var enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
-			if (enableUpgradeButton)
+			if enableUpgradeButton
+				//- prettier-ignore
 				a.btn.btn-primary.pull-right.me-2.visible-xs(
-					href="/user/subscription/plans"
-					event-tracking="upgrade-button-click"
-					event-tracking-mb="true"
-					event-tracking-label="upgrade"
-					event-tracking-trigger="click"
-					event-segmentation='{"source": "dashboard-top", "project-dashboard-react": "enabled", "is-dashboard-sidebar-hidden": "true", "is-screen-width-less-than-768px": "true"}'
+					href='/user/subscription/plans'
+					event-tracking='upgrade-button-click'
+					event-tracking-mb='true'
+					event-tracking-label='upgrade'
+					event-tracking-trigger='click'
+					event-segmentation={
+						source: "dashboard-top",
+						"project-dashboard-react": "enabled",
+						"is-dashboard-sidebar-hidden": "true",
+						"is-screen-width-less-than-768px": "true"
+					}
 				) #{translate("upgrade")}
 			if settings.nav.custom_logo
-				a(href='/', aria-label=settings.appName, style='background-image:url("'+settings.nav.custom_logo+'")').navbar-brand
-			else if (nav.title)
-				a(href='/', aria-label=settings.appName).navbar-title #{nav.title}
+				a.navbar-brand(
+					href='/'
+					aria-label=settings.appName
+					style='background-image:url("' + settings.nav.custom_logo + '")'
+				)
+			else if nav.title
+				a.navbar-title(href='/' aria-label=settings.appName) #{nav.title}
 			else
-				a(href='/', aria-label=settings.appName).navbar-brand
+				a.navbar-brand(href='/' aria-label=settings.appName)
 
 		- var canDisplayAdminMenu = hasAdminAccess()
 		- var canDisplayAdminRedirect = canRedirectToAdminDomain()
@@ -34,44 +46,44 @@ nav.navbar.navbar-default.navbar-main(class={
 		- var canDisplaySurveyMenu = hasFeature('saas') && canDisplayAdminMenu
 		- var canDisplayScriptLogMenu = hasFeature('saas') && canDisplayAdminMenu
 
-		if (typeof(suppressNavbarRight) == "undefined")
-			.navbar-collapse.collapse#navbar-main-collapse
+		if typeof suppressNavbarRight == 'undefined'
+			#navbar-main-collapse.navbar-collapse.collapse
 				ul.nav.navbar-nav.navbar-right
-					if (canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu)
+					if canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu
 						li.dropdown.subdued
 							a.dropdown-toggle(
-								href="#",
-								role="button",
-								aria-haspopup="true",
-								aria-expanded="false",
-								data-toggle="dropdown"
-								event-tracking="menu-expand"
-								event-tracking-mb="true"
-								event-tracking-trigger="click"
-								event-segmentation={"item": "admin", "location": "top-menu"}
+								href='#'
+								role='button'
+								aria-haspopup='true'
+								aria-expanded='false'
+								data-toggle='dropdown'
+								event-tracking='menu-expand'
+								event-tracking-mb='true'
+								event-tracking-trigger='click'
+								event-segmentation={item: 'admin', location: 'top-menu'}
 							)
 								| Admin
 								span.caret
 							ul.dropdown-menu
 								if canDisplayAdminMenu
 									li
-										a(href="/admin") Manage Site
+										a(href='/admin') Manage Site
 									li
-										a(href="/admin/user") Manage Users
+										a(href='/admin/user') Manage Users
 									li
-										a(href="/admin/project") Project URL Lookup
+										a(href='/admin/project') Project URL Lookup
 								if canDisplayAdminRedirect
 									li
 										a(href=settings.adminUrl) Switch to Admin
 								if canDisplaySplitTestMenu
 									li
-										a(href="/admin/split-test") Manage Feature Flags
+										a(href='/admin/split-test') Manage Feature Flags
 								if canDisplaySurveyMenu
 									li
-										a(href="/admin/survey") Manage Surveys
+										a(href='/admin/survey') Manage Surveys
 								if canDisplayScriptLogMenu
 									li
-										a(href="/admin/script-logs") View Script Logs
+										a(href='/admin/script-logs') View Script Logs
 
 					// loop over header_extras
 					each item in nav.header_extras
@@ -90,15 +102,15 @@ nav.navbar.navbar-default.navbar-main(class={
 							if item.dropdown
 								li.dropdown(class=item.class)
 									a.dropdown-toggle(
-										href="#",
-										role="button",
-										aria-haspopup="true",
-										aria-expanded="false",
-										data-toggle="dropdown"
-										event-tracking="menu-expand"
-										event-tracking-mb="true"
-										event-tracking-trigger="click"
-										event-segmentation={"item": item.trackingKey, "location": "top-menu"}
+										href='#'
+										role='button'
+										aria-haspopup='true'
+										aria-expanded='false'
+										data-toggle='dropdown'
+										event-tracking='menu-expand'
+										event-tracking-mb='true'
+										event-tracking-trigger='click'
+										event-segmentation={item: item.trackingKey, location: 'top-menu'}
 									)
 										| !{translate(item.text)}
 										span.caret
@@ -108,18 +120,25 @@ nav.navbar.navbar-default.navbar-main(class={
 												li.divider
 											else if child.isContactUs
 												li
-													a(data-ol-open-contact-form-modal="contact-us" href event-tracking="menu-click" event-tracking-mb="true" event-tracking-trigger="click" event-segmentation={"item": "contact", "location": "top-menu"})
+													a(
+														data-ol-open-contact-form-modal='contact-us'
+														href
+														event-tracking='menu-click'
+														event-tracking-mb='true'
+														event-tracking-trigger='click'
+														event-segmentation={item: 'contact', location: 'top-menu'}
+													)
 														span
 															| #{translate("contact_us")}
 											else
 												li
 													if child.url
 														a(
-															href=child.url,
-															class=child.class,
-															event-tracking="menu-click"
-															event-tracking-mb="true"
-															event-tracking-trigger="click"
+															href=child.url
+															class=child.class
+															event-tracking='menu-click'
+															event-tracking-mb='true'
+															event-tracking-trigger='click'
 															event-segmentation={item: item.trackingKey, location: 'top-menu'}
 														) !{translate(child.text)}
 													else
@@ -128,12 +147,12 @@ nav.navbar.navbar-default.navbar-main(class={
 								li(class=item.class)
 									if item.url
 										a(
-											href=item.url,
-											class=item.class,
-											event-tracking="menu-click"
-											event-tracking-mb="true"
-											event-tracking-trigger="click"
-											event-segmentation={ item: item.trackingKey, location: 'top-menu' }
+											href=item.url
+											class=item.class
+											event-tracking='menu-click'
+											event-tracking-mb='true'
+											event-tracking-trigger='click'
+											event-segmentation={item: item.trackingKey, location: 'top-menu'}
 										) !{translate(item.text)}
 									else
 										| !{translate(item.text)}
@@ -144,54 +163,54 @@ nav.navbar.navbar-default.navbar-main(class={
 						if hasFeature('registration-page')
 							li.primary
 								a(
-									href="/register"
-									event-tracking="menu-click"
-									event-tracking-action="clicked"
-									event-tracking-trigger="click"
-									event-tracking-mb="true"
-									event-segmentation={ page: currentUrl, item: 'register', location: 'top-menu' }
+									href='/register'
+									event-tracking='menu-click'
+									event-tracking-action='clicked'
+									event-tracking-trigger='click'
+									event-tracking-mb='true'
+									event-segmentation={page: currentUrl, item: 'register', location: 'top-menu'}
 								) #{translate('sign_up')}
 
 						// login link
 						li
 							a(
-								href="/login"
-								event-tracking="menu-click"
-								event-tracking-action="clicked"
-								event-tracking-trigger="click"
-								event-tracking-mb="true"
-								event-segmentation={ page: currentUrl, item: 'login', location: 'top-menu' }
+								href='/login'
+								event-tracking='menu-click'
+								event-tracking-action='clicked'
+								event-tracking-trigger='click'
+								event-tracking-mb='true'
+								event-segmentation={page: currentUrl, item: 'login', location: 'top-menu'}
 							) #{translate('log_in')}
 
 					// projects link and account menu
 					if getSessionUser()
 						li
-							a(href="/project") #{translate('Projects')}
+							a(href='/project') #{translate('Projects')}
 						li.dropdown
 							a.dropdown-toggle(
-								href="#",
-								role="button",
-								aria-haspopup="true",
-								aria-expanded="false",
-								data-toggle="dropdown"
-								event-tracking="menu-expand"
-								event-tracking-mb="true"
-								event-tracking-trigger="click"
-								event-segmentation={"item": "account", "location": "top-menu"}
+								href='#'
+								role='button'
+								aria-haspopup='true'
+								aria-expanded='false'
+								data-toggle='dropdown'
+								event-tracking='menu-expand'
+								event-tracking-mb='true'
+								event-tracking-trigger='click'
+								event-segmentation={item: 'account', location: 'top-menu'}
 							)
 								| #{translate('Account')}
 								span.caret
 							ul.dropdown-menu
 								li
-									div.subdued #{getSessionUser().email}
+									.subdued #{getSessionUser().email}
 								li.divider.hidden-xs.hidden-sm
 								li
-									a(href="/user/settings") #{translate('account_settings')}
+									a(href='/user/settings') #{translate('account_settings')}
 								if nav.showSubscriptionLink
 									li
-										a(href="/user/subscription") #{translate('subscription')}
+										a(href='/user/subscription') #{translate('subscription')}
 								li.divider.hidden-xs.hidden-sm
 								li
-									form(method="POST" action="/logout")
-										input(name='_csrf', type='hidden', value=csrfToken)
+									form(method='POST' action='/logout')
+										input(name='_csrf' type='hidden' value=csrfToken)
 										button.btn-link.text-left.dropdown-menu-button #{translate('log_out')}
diff --git a/services/web/app/views/layout/navbar-website-redesign.pug b/services/web/app/views/layout/navbar-website-redesign.pug
index 8ea71861c0..0a8337c2f5 100644
--- a/services/web/app/views/layout/navbar-website-redesign.pug
+++ b/services/web/app/views/layout/navbar-website-redesign.pug
@@ -1,30 +1,39 @@
 nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 	.container-fluid
 		.navbar-header
-			if (typeof(suppressNavbarRight) == "undefined")
+			if typeof suppressNavbarRight == 'undefined'
 				button.navbar-toggle.collapsed(
-					type="button",
-					data-toggle="collapse",
-					data-target="#navbar-main-collapse"
-					aria-label="Toggle " + translate('navigation')
+					type='button'
+					data-toggle='collapse'
+					data-target='#navbar-main-collapse'
+					aria-label='Toggle ' + translate('navigation')
 				)
-					i.fa.fa-bars(aria-hidden="true")
+					i.fa.fa-bars(aria-hidden='true')
 			- var enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
-			if (enableUpgradeButton)
+			if enableUpgradeButton
 				a.btn.btn-primary.pull-right.me-2.visible-xs(
-					href="/user/subscription/plans"
-					event-tracking="upgrade-button-click"
-					event-tracking-mb="true"
-					event-tracking-label="upgrade"
-					event-tracking-trigger="click"
-					event-segmentation='{"source": "dashboard-top", "project-dashboard-react": "enabled", "is-dashboard-sidebar-hidden": "true", "is-screen-width-less-than-768px": "true"}'
+					href='/user/subscription/plans'
+					event-tracking='upgrade-button-click'
+					event-tracking-mb='true'
+					event-tracking-label='upgrade'
+					event-tracking-trigger='click'
+					event-segmentation={
+						source: 'dashboard-top',
+						projectDashboardReact: 'enabled',
+						isDashboardSidebarHidden: 'true',
+						isScreenWidthLessThan768px: 'true',
+					}
 				) #{translate("upgrade")}
 			if settings.nav.custom_logo
-				a(href='/', aria-label=settings.appName, style='background-image:url("'+settings.nav.custom_logo+'")').navbar-brand
-			else if (nav.title)
-				a(href='/', aria-label=settings.appName).navbar-title #{nav.title}
+				a.navbar-brand(
+					href='/'
+					aria-label=settings.appName
+					style='background-image:url("' + settings.nav.custom_logo + '")'
+				)
+			else if nav.title
+				a.navbar-title(href='/' aria-label=settings.appName) #{nav.title}
 			else
-				a(href='/', aria-label=settings.appName).navbar-brand
+				a.navbar-brand(href='/' aria-label=settings.appName)
 
 		- var canDisplayAdminMenu = hasAdminAccess()
 		- var canDisplayAdminRedirect = canRedirectToAdminDomain()
@@ -32,44 +41,44 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 		- var canDisplaySurveyMenu = hasFeature('saas') && canDisplayAdminMenu
 		- var canDisplayScriptLogMenu = hasFeature('saas') && canDisplayAdminMenu
 
-		if (typeof(suppressNavbarRight) == "undefined")
-			.navbar-collapse.collapse#navbar-main-collapse
+		if typeof suppressNavbarRight == 'undefined'
+			#navbar-main-collapse.navbar-collapse.collapse
 				ul.nav.navbar-nav.navbar-right
-					if (canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu)
+					if canDisplayAdminMenu || canDisplayAdminRedirect || canDisplaySplitTestMenu
 						li.dropdown.subdued
 							a.dropdown-toggle(
-								href="#",
-								role="button",
-								aria-haspopup="true",
-								aria-expanded="false",
-								data-toggle="dropdown"
-								event-tracking="menu-expand"
-								event-tracking-mb="true"
-								event-tracking-trigger="click"
-								event-segmentation={"item": "admin", "location": "top-menu"}
+								href='#'
+								role='button'
+								aria-haspopup='true'
+								aria-expanded='false'
+								data-toggle='dropdown'
+								event-tracking='menu-expand'
+								event-tracking-mb='true'
+								event-tracking-trigger='click'
+								event-segmentation={item: 'admin', location: 'top-menu'}
 							)
 								| Admin
 								span.caret
 							ul.dropdown-menu
 								if canDisplayAdminMenu
 									li
-										a(href="/admin") Manage Site
+										a(href='/admin') Manage Site
 									li
-										a(href="/admin/user") Manage Users
+										a(href='/admin/user') Manage Users
 									li
-										a(href="/admin/project") Project URL Lookup
+										a(href='/admin/project') Project URL Lookup
 								if canDisplayAdminRedirect
 									li
 										a(href=settings.adminUrl) Switch to Admin
 								if canDisplaySplitTestMenu
 									li
-										a(href="/admin/split-test") Manage Feature Flags
+										a(href='/admin/split-test') Manage Feature Flags
 								if canDisplaySurveyMenu
 									li
-										a(href="/admin/survey") Manage Surveys
+										a(href='/admin/survey') Manage Surveys
 								if canDisplayScriptLogMenu
 									li
-										a(href="/admin/script-logs") View Script Logs
+										a(href='/admin/script-logs') View Script Logs
 
 					// loop over header_extras
 					each item in nav.header_extras
@@ -88,15 +97,15 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 							if item.dropdown
 								li.dropdown(class=item.class)
 									a.dropdown-toggle(
-										href="#",
-										role="button",
-										aria-haspopup="true",
-										aria-expanded="false",
-										data-toggle="dropdown"
-										event-tracking="menu-expand"
-										event-tracking-mb="true"
-										event-tracking-trigger="click"
-										event-segmentation={"item": item.trackingKey, "location": "top-menu"}
+										href='#'
+										role='button'
+										aria-haspopup='true'
+										aria-expanded='false'
+										data-toggle='dropdown'
+										event-tracking='menu-expand'
+										event-tracking-mb='true'
+										event-tracking-trigger='click'
+										event-segmentation={item: item.trackingKey, location: 'top-menu'}
 									)
 										| !{translate(item.text)}
 										span.caret
@@ -106,18 +115,25 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 												li.divider
 											else if child.isContactUs
 												li
-													a(data-ol-open-contact-form-modal="contact-us" href event-tracking="menu-click" event-tracking-mb="true" event-tracking-trigger="click" event-segmentation={"item": "contact", "location": "top-menu"})
+													a(
+														data-ol-open-contact-form-modal='contact-us'
+														href
+														event-tracking='menu-click'
+														event-tracking-mb='true'
+														event-tracking-trigger='click'
+														event-segmentation={item: 'contact', location: 'top-menu'}
+													)
 														span
 															| #{translate("contact_us")}
 											else
 												li
 													if child.url
 														a(
-															href=child.url,
-															class=child.class,
-															event-tracking="menu-click"
-															event-tracking-mb="true"
-															event-tracking-trigger="click"
+															href=child.url
+															class=child.class
+															event-tracking='menu-click'
+															event-tracking-mb='true'
+															event-tracking-trigger='click'
 															event-segmentation={item: child.trackingKey, location: 'top-menu'}
 														) !{translate(child.text)}
 													else
@@ -126,12 +142,12 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 								li(class=item.class)
 									if item.url
 										a(
-											href=item.url,
-											class=item.class,
-											event-tracking="menu-click"
-											event-tracking-mb="true"
-											event-tracking-trigger="click"
-											event-segmentation={ item: item.trackingKey, location: 'top-menu' }
+											href=item.url
+											class=item.class
+											event-tracking='menu-click'
+											event-tracking-mb='true'
+											event-tracking-trigger='click'
+											event-segmentation={item: item.trackingKey, location: 'top-menu'}
 										) !{translate(item.text)}
 									else
 										| !{translate(item.text)}
@@ -142,54 +158,54 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 						if hasFeature('registration-page')
 							li.primary
 								a(
-									href="/register"
-									event-tracking="menu-click"
-									event-tracking-action="clicked"
-									event-tracking-trigger="click"
-									event-tracking-mb="true"
-									event-segmentation={ page: currentUrl, item: 'register', location: 'top-menu' }
+									href='/register'
+									event-tracking='menu-click'
+									event-tracking-action='clicked'
+									event-tracking-trigger='click'
+									event-tracking-mb='true'
+									event-segmentation={page: currentUrl, item: 'register', location: 'top-menu'}
 								) #{translate('sign_up')}
 
 						// login link
 						li.secondary
 							a(
-								href="/login"
-								event-tracking="menu-click"
-								event-tracking-action="clicked"
-								event-tracking-trigger="click"
-								event-tracking-mb="true"
-								event-segmentation={ page: currentUrl, item: 'login', location: 'top-menu' }
+								href='/login'
+								event-tracking='menu-click'
+								event-tracking-action='clicked'
+								event-tracking-trigger='click'
+								event-tracking-mb='true'
+								event-segmentation={page: currentUrl, item: 'login', location: 'top-menu'}
 							) #{translate('log_in')}
 
 					// projects link and account menu
 					if getSessionUser()
 						li.secondary
-							a(href="/project") #{translate('Projects')}
+							a(href='/project') #{translate('Projects')}
 						li.secondary.dropdown
 							a.dropdown-toggle(
-								href="#",
-								role="button",
-								aria-haspopup="true",
-								aria-expanded="false",
-								data-toggle="dropdown"
-								event-tracking="menu-expand"
-								event-tracking-mb="true"
-								event-tracking-trigger="click"
-								event-segmentation={"item": "account", "location": "top-menu"}
+								href='#'
+								role='button'
+								aria-haspopup='true'
+								aria-expanded='false'
+								data-toggle='dropdown'
+								event-tracking='menu-expand'
+								event-tracking-mb='true'
+								event-tracking-trigger='click'
+								event-segmentation={item: 'account', location: 'top-menu'}
 							)
 								| #{translate('Account')}
 								span.caret
 							ul.dropdown-menu
 								li
-									div.subdued #{getSessionUser().email}
+									.subdued #{getSessionUser().email}
 								li.divider.hidden-xs.hidden-sm
 								li
-									a(href="/user/settings") #{translate('account_settings')}
+									a(href='/user/settings') #{translate('account_settings')}
 								if nav.showSubscriptionLink
 									li
-										a(href="/user/subscription") #{translate('subscription')}
+										a(href='/user/subscription') #{translate('subscription')}
 								li.divider.hidden-xs.hidden-sm
 								li
-									form(method="POST" action="/logout")
-										input(name='_csrf', type='hidden', value=csrfToken)
+									form(method='POST' action='/logout')
+										input(name='_csrf' type='hidden' value=csrfToken)
 										button.btn-link.text-left.dropdown-menu-button #{translate('log_out')}
diff --git a/services/web/app/views/layout/thin-footer-bootstrap-5.pug b/services/web/app/views/layout/thin-footer-bootstrap-5.pug
index 1f06a054fc..4c29933ab1 100644
--- a/services/web/app/views/layout/thin-footer-bootstrap-5.pug
+++ b/services/web/app/views/layout/thin-footer-bootstrap-5.pug
@@ -25,7 +25,7 @@ footer.site-footer
 				each item in nav.left_footer
 					li
 						if item.url
-							a(href=item.url, class=item.class) !{translate(item.text)}
+							a(href=item.url class=item.class) !{translate(item.text)}
 						else
 							| !{item.text}
 
@@ -33,6 +33,6 @@ footer.site-footer
 				each item in nav.right_footer
 					li
 						if item.url
-							a(href=item.url, class=item.class, aria-label=item.label) !{item.text}
+							a(href=item.url class=item.class aria-label=item.label) !{item.text}
 						else
 							| !{item.text}
diff --git a/services/web/app/views/layout/thin-footer.pug b/services/web/app/views/layout/thin-footer.pug
index 6eeecf628a..879e337983 100644
--- a/services/web/app/views/layout/thin-footer.pug
+++ b/services/web/app/views/layout/thin-footer.pug
@@ -27,7 +27,7 @@ footer.site-footer
 				each item in nav.left_footer
 					li
 						if item.url
-							a(href=item.url, class=item.class) !{translate(item.text)}
+							a(href=item.url class=item.class) !{translate(item.text)}
 						else
 							| !{item.text}
 
@@ -35,6 +35,6 @@ footer.site-footer
 				each item in nav.right_footer
 					li
 						if item.url
-							a(href=item.url, class=item.class, aria-label=item.label) !{item.text}
+							a(href=item.url class=item.class aria-label=item.label) !{item.text}
 						else
 							| !{item.text}
diff --git a/services/web/app/views/project/editor/new_from_template.pug b/services/web/app/views/project/editor/new_from_template.pug
index b1b5ae1e25..c84288a21a 100644
--- a/services/web/app/views/project/editor/new_from_template.pug
+++ b/services/web/app/views/project/editor/new_from_template.pug
@@ -1,36 +1,36 @@
 extends ../../layout-marketing
 
 block vars
-  - var suppressFooter = true
-  - var suppressCookieBanner = true
-  - var suppressSkipToContent = true
+	- var suppressFooter = true
+	- var suppressCookieBanner = true
+	- var suppressSkipToContent = true
 
 block content
-  .editor.full-size
-    .loading-screen()
-      .loading-screen-brand-container
-        .loading-screen-brand(
-          style="height: 20%;"
-        )
+	.editor.full-size
+		.loading-screen()
+			.loading-screen-brand-container
+				.loading-screen-brand(
+					style="height: 20%;"
+				)
 
-      h3.loading-screen-label() #{translate("Opening template")}
-        span.loading-screen-ellip .
-        span.loading-screen-ellip .
-        span.loading-screen-ellip .
+			h3.loading-screen-label() #{translate("Opening template")}
+				span.loading-screen-ellip .
+				span.loading-screen-ellip .
+				span.loading-screen-ellip .
 
-  form(
-    data-ol-regular-form
-    data-ol-auto-submit
-    method='POST'
-    action='/project/new/template/'
-  )
-    input(type="hidden", name="_csrf", value=csrfToken)
-    input(type="hidden" name="templateId" value=templateId)
-    input(type="hidden" name="templateVersionId" value=templateVersionId)
-    input(type="hidden" name="templateName" value=name)
-    input(type="hidden" name="compiler" value=compiler)
-    input(type="hidden" name="imageName" value=imageName)
-    input(type="hidden" name="mainFile" value=mainFile)
-    if brandVariationId
-      input(type="hidden" name="brandVariationId" value=brandVariationId)
-    input(hidden type="submit")
+	form(
+		data-ol-regular-form
+		data-ol-auto-submit
+		method='POST'
+		action='/project/new/template/'
+	)
+		input(type="hidden", name="_csrf", value=csrfToken)
+		input(type="hidden" name="templateId" value=templateId)
+		input(type="hidden" name="templateVersionId" value=templateVersionId)
+		input(type="hidden" name="templateName" value=name)
+		input(type="hidden" name="compiler" value=compiler)
+		input(type="hidden" name="imageName" value=imageName)
+		input(type="hidden" name="mainFile" value=mainFile)
+		if brandVariationId
+			input(type="hidden" name="brandVariationId" value=brandVariationId)
+		input(hidden type="submit")
diff --git a/services/web/app/views/project/ide-react-detached.pug b/services/web/app/views/project/ide-react-detached.pug
index 8109da7f74..ca1a178bbf 100644
--- a/services/web/app/views/project/ide-react-detached.pug
+++ b/services/web/app/views/project/ide-react-detached.pug
@@ -11,7 +11,7 @@ block vars
 	- metadata.robotsNoindexNofollow = true
 
 block content
-	#pdf-preview-detached-root()
+	#pdf-preview-detached-root
 
 block append meta
 	include editor/_meta
diff --git a/services/web/app/views/project/ide-react.pug b/services/web/app/views/project/ide-react.pug
index bc30f69202..8af9de8296 100644
--- a/services/web/app/views/project/ide-react.pug
+++ b/services/web/app/views/project/ide-react.pug
@@ -15,7 +15,7 @@ block content
 	main#ide-root
 		.loading-screen
 			.loading-screen-brand-container
-				.loading-screen-brand(style="height: 20%;")
+				.loading-screen-brand(style='height: 20%')
 			h3.loading-screen-label #{translate("loading")}
 				span.loading-screen-ellip .
 				span.loading-screen-ellip .
@@ -25,4 +25,9 @@ block append meta
 	include editor/_meta
 
 block prepend foot-scripts
-	script(type="text/javascript", nonce=scriptNonce, src=(wsUrl || '/socket.io') + '/socket.io.js', defer=deferScripts)
+	script(
+		type='text/javascript'
+		nonce=scriptNonce
+		src=(wsUrl || '/socket.io') + '/socket.io.js'
+		defer=deferScripts
+	)
diff --git a/services/web/app/views/project/invite/not-valid.pug b/services/web/app/views/project/invite/not-valid.pug
index b4cbc1be1b..3722ab7919 100644
--- a/services/web/app/views/project/invite/not-valid.pug
+++ b/services/web/app/views/project/invite/not-valid.pug
@@ -1,18 +1,18 @@
 extends ../../layout-marketing
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-md-8.col-md-offset-2.offset-md-2
 					.card.project-invite-invalid
 						.card-body
 							.page-header.text-center
-								h1  #{translate("invite_not_valid")}
+								h1 #{translate("invite_not_valid")}
 							.row.text-center
 								.col-12.col-md-12
 									p
 										| #{translate("invite_not_valid_description")}.
 							.row.text-center.actions
 								.col-12.col-md-12
-									a.btn.btn-secondary-info.btn-secondary(href="/project") #{translate("back_to_your_projects")}
+									a.btn.btn-secondary-info.btn-secondary(href='/project') #{translate("back_to_your_projects")}
diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug
index a18518c716..503ec78796 100644
--- a/services/web/app/views/project/invite/show.pug
+++ b/services/web/app/views/project/invite/show.pug
@@ -1,7 +1,7 @@
 extends ../../layout-marketing
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-12.col-md-8.col-md-offset-2.offset-md-2
@@ -20,16 +20,16 @@ block content
 								.col-12.col-md-12
 									form.form(
 										data-ol-regular-form
-										method="POST",
-										action="/project/"+invite.projectId+"/invite/token/"+token+"/accept"
+										method='POST'
+										action='/project/' + invite.projectId + '/invite/token/' + token + '/accept'
 									)
-										input(name='_csrf', type='hidden', value=csrfToken)
-										input(name='token', type='hidden', value=token)
+										input(name='_csrf' type='hidden' value=csrfToken)
+										input(name='token' type='hidden' value=token)
 										.form-group.text-center
 											button.btn.btn-lg.btn-primary(
-												type="submit"
+												type='submit'
 												data-ol-disabled-inflight
 											)
-												span(data-ol-inflight="idle") #{translate("join_project")}
-												span(hidden data-ol-inflight="pending") #{translate("joining")}…
+												span(data-ol-inflight='idle') #{translate("join_project")}
+												span(hidden data-ol-inflight='pending') #{translate("joining")}…
 										.form-group.text-center
diff --git a/services/web/app/views/project/list-react.pug b/services/web/app/views/project/list-react.pug
index 60e7d0c0fc..fa7bc24c09 100644
--- a/services/web/app/views/project/list-react.pug
+++ b/services/web/app/views/project/list-react.pug
@@ -9,35 +9,83 @@ block vars
 	- const suppressFooter = true
 
 block append meta
-	meta(name="ol-usersBestSubscription" data-type="json" content=usersBestSubscription)
-	meta(name="ol-notifications" data-type="json" content=notifications)
-	meta(name="ol-notificationsInstitution" data-type="json" content=notificationsInstitution)
-	meta(name="ol-userEmails" data-type="json" content=userEmails)
-	meta(name="ol-allInReconfirmNotificationPeriods" data-type="json" content=allInReconfirmNotificationPeriods)
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-userAffiliations" data-type="json" content=userAffiliations)
-	meta(name="ol-reconfirmedViaSAML" content=reconfirmedViaSAML)
-	meta(name="ol-survey" data-type="json" content=survey)
-	meta(name="ol-tags" data-type="json" content=tags)
-	meta(name="ol-portalTemplates" data-type="json" content=portalTemplates)
-	meta(name="ol-prefetchedProjectsBlob" data-type="json" content=prefetchedProjectsBlob)
-	if (suggestedLanguageSubdomainConfig)
-		meta(name="ol-suggestedLanguage" data-type="json" content=Object.assign(suggestedLanguageSubdomainConfig, {
-			lngName: translate(suggestedLanguageSubdomainConfig.lngCode),
-			imgUrl: buildImgPath("flags/24/" + suggestedLanguageSubdomainConfig.lngCode + ".png")
-		}))
-	meta(name="ol-currentUrl" data-type="string" content=currentUrl)
-	meta(name="ol-showGroupsAndEnterpriseBanner" data-type="boolean" content=showGroupsAndEnterpriseBanner)
-	meta(name="ol-groupsAndEnterpriseBannerVariant" data-type="string" content=groupsAndEnterpriseBannerVariant)
-	meta(name="ol-showInrGeoBanner" data-type="boolean" content=showInrGeoBanner)
-	meta(name="ol-showBrlGeoBanner" data-type="boolean" content=showBrlGeoBanner)
-	meta(name="ol-recommendedCurrency" data-type="string" content=recommendedCurrency)
-	meta(name="ol-showLATAMBanner" data-type="boolean" content=showLATAMBanner)
-	meta(name="ol-groupSubscriptionsPendingEnrollment" data-type="json" content=groupSubscriptionsPendingEnrollment)
-	meta(name="ol-hasIndividualPaidSubscription" data-type="boolean" content=hasIndividualPaidSubscription)
-	meta(name="ol-groupSsoSetupSuccess" data-type="boolean" content=groupSsoSetupSuccess)
-	meta(name="ol-showUSGovBanner" data-type="boolean" content=showUSGovBanner)
-	meta(name="ol-usGovBannerVariant" data-type="string" content=usGovBannerVariant)
+	meta(
+		name='ol-usersBestSubscription'
+		data-type='json'
+		content=usersBestSubscription
+	)
+	meta(name='ol-notifications' data-type='json' content=notifications)
+	meta(
+		name='ol-notificationsInstitution'
+		data-type='json'
+		content=notificationsInstitution
+	)
+	meta(name='ol-userEmails' data-type='json' content=userEmails)
+	meta(
+		name='ol-allInReconfirmNotificationPeriods'
+		data-type='json'
+		content=allInReconfirmNotificationPeriods
+	)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-userAffiliations' data-type='json' content=userAffiliations)
+	meta(name='ol-reconfirmedViaSAML' content=reconfirmedViaSAML)
+	meta(name='ol-survey' data-type='json' content=survey)
+	meta(name='ol-tags' data-type='json' content=tags)
+	meta(name='ol-portalTemplates' data-type='json' content=portalTemplates)
+	meta(
+		name='ol-prefetchedProjectsBlob'
+		data-type='json'
+		content=prefetchedProjectsBlob
+	)
+	if suggestedLanguageSubdomainConfig
+		meta(
+			name='ol-suggestedLanguage'
+			data-type='json'
+			content=Object.assign(suggestedLanguageSubdomainConfig, {
+				lngName: translate(suggestedLanguageSubdomainConfig.lngCode),
+				imgUrl: buildImgPath('flags/24/' + suggestedLanguageSubdomainConfig.lngCode + '.png'),
+			})
+		)
+	meta(name='ol-currentUrl' data-type='string' content=currentUrl)
+	meta(
+		name='ol-showGroupsAndEnterpriseBanner'
+		data-type='boolean'
+		content=showGroupsAndEnterpriseBanner
+	)
+	meta(
+		name='ol-groupsAndEnterpriseBannerVariant'
+		data-type='string'
+		content=groupsAndEnterpriseBannerVariant
+	)
+	meta(name='ol-showInrGeoBanner' data-type='boolean' content=showInrGeoBanner)
+	meta(name='ol-showBrlGeoBanner' data-type='boolean' content=showBrlGeoBanner)
+	meta(
+		name='ol-recommendedCurrency'
+		data-type='string'
+		content=recommendedCurrency
+	)
+	meta(name='ol-showLATAMBanner' data-type='boolean' content=showLATAMBanner)
+	meta(
+		name='ol-groupSubscriptionsPendingEnrollment'
+		data-type='json'
+		content=groupSubscriptionsPendingEnrollment
+	)
+	meta(
+		name='ol-hasIndividualPaidSubscription'
+		data-type='boolean'
+		content=hasIndividualPaidSubscription
+	)
+	meta(
+		name='ol-groupSsoSetupSuccess'
+		data-type='boolean'
+		content=groupSsoSetupSuccess
+	)
+	meta(name='ol-showUSGovBanner' data-type='boolean' content=showUSGovBanner)
+	meta(
+		name='ol-usGovBannerVariant'
+		data-type='string'
+		content=usGovBannerVariant
+	)
 
 block content
 	#project-list-root
diff --git a/services/web/app/views/project/token/access-react.pug b/services/web/app/views/project/token/access-react.pug
index eabfd18eb6..80b91f1a99 100644
--- a/services/web/app/views/project/token/access-react.pug
+++ b/services/web/app/views/project/token/access-react.pug
@@ -7,11 +7,11 @@ block vars
 	- var suppressFooter = true
 	- var suppressCookieBanner = true
 	- var suppressSkipToContent = true
-		
+
 block append meta
-	meta(name="ol-postUrl" data-type="string" content=postUrl)
-	meta(name="ol-user" data-type="json" content=user)
+	meta(name='ol-postUrl' data-type='string' content=postUrl)
+	meta(name='ol-user' data-type='json' content=user)
 
 block content
-	.content.content-alt#main-content
-		div#token-access-page
+	#main-content.content.content-alt
+		#token-access-page
diff --git a/services/web/app/views/project/token/sharing-updates.pug b/services/web/app/views/project/token/sharing-updates.pug
index 66d8ac9077..d1818be0af 100644
--- a/services/web/app/views/project/token/sharing-updates.pug
+++ b/services/web/app/views/project/token/sharing-updates.pug
@@ -9,9 +9,9 @@ block vars
 	- var suppressSkipToContent = true
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-project_id" data-type="string" content=projectId)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-project_id' data-type='string' content=projectId)
 
 block content
-	.content.content-alt#main-content
-		div#sharing-updates-page
+	#main-content.content.content-alt
+		#sharing-updates-page
diff --git a/services/web/app/views/subscriptions/add-seats.pug b/services/web/app/views/subscriptions/add-seats.pug
index bcbf5be666..6fa644ee46 100644
--- a/services/web/app/views/subscriptions/add-seats.pug
+++ b/services/web/app/views/subscriptions/add-seats.pug
@@ -4,13 +4,17 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/add-seats'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-groupName", data-type="string", content=groupName)
-	meta(name="ol-subscriptionId", data-type="string", content=subscriptionId)
-	meta(name="ol-totalLicenses", data-type="number", content=totalLicenses)
-	meta(name="ol-isProfessional", data-type="boolean", content=isProfessional)
-	meta(name="ol-isCollectionMethodManual", data-type="boolean", content=isCollectionMethodManual)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-groupName' data-type='string' content=groupName)
+	meta(name='ol-subscriptionId' data-type='string' content=subscriptionId)
+	meta(name='ol-totalLicenses' data-type='number' content=totalLicenses)
+	meta(name='ol-isProfessional' data-type='boolean' content=isProfessional)
+	meta(
+		name='ol-isCollectionMethodManual'
+		data-type='boolean'
+		content=isCollectionMethodManual
+	)
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		#add-seats-root
diff --git a/services/web/app/views/subscriptions/canceled-subscription-react.pug b/services/web/app/views/subscriptions/canceled-subscription-react.pug
index 3a89234fd9..a33732e1f6 100644
--- a/services/web/app/views/subscriptions/canceled-subscription-react.pug
+++ b/services/web/app/views/subscriptions/canceled-subscription-react.pug
@@ -4,7 +4,7 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/canceled-subscription'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
+	meta(name='ol-user' data-type='json' content=user)
 
 block content
-	main.content.content-alt#subscription-canceled-root
+	main#subscription-canceled-root.content.content-alt
diff --git a/services/web/app/views/subscriptions/dashboard-react.pug b/services/web/app/views/subscriptions/dashboard-react.pug
index 2b6251f2a3..b253097d25 100644
--- a/services/web/app/views/subscriptions/dashboard-react.pug
+++ b/services/web/app/views/subscriptions/dashboard-react.pug
@@ -1,36 +1,91 @@
 extends ../layout-react
 
 block entrypointVar
-  - entrypoint = 'pages/user/subscription/dashboard'
+	- entrypoint = 'pages/user/subscription/dashboard'
 
 block head-scripts
-  script(type="text/javascript", nonce=scriptNonce, src="https://js.recurly.com/v4/recurly.js")
+	script(
+		type='text/javascript'
+		nonce=scriptNonce
+		src='https://js.recurly.com/v4/recurly.js'
+	)
 
 block append meta
-  meta(name="ol-subscription" data-type="json" content=personalSubscription)
-  meta(name="ol-userCanExtendTrial" data-type="boolean" content=userCanExtendTrial)
-  meta(name="ol-managedGroupSubscriptions" data-type="json" content=managedGroupSubscriptions)
-  meta(name="ol-memberGroupSubscriptions" data-type="json" content=memberGroupSubscriptions)
-  meta(name="ol-managedInstitutions" data-type="json" content=managedInstitutions)
-  meta(name="ol-managedPublishers" data-type="json" content=managedPublishers)
-  meta(name="ol-planCodesChangingAtTermEnd" data-type="json", content=planCodesChangingAtTermEnd)
-  meta(name="ol-currentInstitutionsWithLicence" data-type="json" content=currentInstitutionsWithLicence)
-  meta(name="ol-hasSubscription" data-type="boolean" content=hasSubscription)
-  meta(name="ol-fromPlansPage" data-type="boolean" content=fromPlansPage)
-  meta(name="ol-plans" data-type="json" content=plans)
-  meta(name="ol-groupSettingsAdvertisedFor" data-type="json" content=groupSettingsAdvertisedFor)
-  meta(name="ol-canUseFlexibleLicensing" data-type="boolean", content=canUseFlexibleLicensing)
-  meta(name="ol-showGroupDiscount" data-type="boolean", content=showGroupDiscount)
-  meta(name="ol-groupSettingsEnabledFor" data-type="json" content=groupSettingsEnabledFor)
-  meta(name="ol-hasAiAssistViaWritefull" data-type="boolean", content=hasAiAssistViaWritefull)
-  meta(name="ol-aiAssistViaWritefullSource" data-type="string", content=aiAssistViaWritefullSource)
-  meta(name="ol-user" data-type="json" content=user)
-  if (personalSubscription && personalSubscription.payment)
-    meta(name="ol-recurlyApiKey" content=settings.apis.recurly.publicKey)
-    meta(name="ol-stripeUKApiKey" content=settings.apis.stripeUK.publishableKey)
-    meta(name="ol-recommendedCurrency" content=personalSubscription.payment.currency)
-    meta(name="ol-groupPlans" data-type="json" content=groupPlans)
+	meta(name='ol-subscription' data-type='json' content=personalSubscription)
+	meta(
+		name='ol-userCanExtendTrial'
+		data-type='boolean'
+		content=userCanExtendTrial
+	)
+	meta(
+		name='ol-managedGroupSubscriptions'
+		data-type='json'
+		content=managedGroupSubscriptions
+	)
+	meta(
+		name='ol-memberGroupSubscriptions'
+		data-type='json'
+		content=memberGroupSubscriptions
+	)
+	meta(
+		name='ol-managedInstitutions'
+		data-type='json'
+		content=managedInstitutions
+	)
+	meta(name='ol-managedPublishers' data-type='json' content=managedPublishers)
+	meta(
+		name='ol-planCodesChangingAtTermEnd'
+		data-type='json'
+		content=planCodesChangingAtTermEnd
+	)
+	meta(
+		name='ol-currentInstitutionsWithLicence'
+		data-type='json'
+		content=currentInstitutionsWithLicence
+	)
+	meta(name='ol-hasSubscription' data-type='boolean' content=hasSubscription)
+	meta(name='ol-fromPlansPage' data-type='boolean' content=fromPlansPage)
+	meta(name='ol-plans' data-type='json' content=plans)
+	meta(
+		name='ol-groupSettingsAdvertisedFor'
+		data-type='json'
+		content=groupSettingsAdvertisedFor
+	)
+	meta(
+		name='ol-canUseFlexibleLicensing'
+		data-type='boolean'
+		content=canUseFlexibleLicensing
+	)
+	meta(
+		name='ol-showGroupDiscount'
+		data-type='boolean'
+		content=showGroupDiscount
+	)
+	meta(
+		name='ol-groupSettingsEnabledFor'
+		data-type='json'
+		content=groupSettingsEnabledFor
+	)
+	meta(
+		name='ol-hasAiAssistViaWritefull'
+		data-type='boolean'
+		content=hasAiAssistViaWritefull
+	)
+	meta(
+		name='ol-aiAssistViaWritefullSource'
+		data-type='string'
+		content=aiAssistViaWritefullSource
+	)
+	meta(name='ol-user' data-type='json' content=user)
+	if personalSubscription && personalSubscription.payment
+		meta(name='ol-recurlyApiKey' content=settings.apis.recurly.publicKey)
+		meta(name='ol-stripeUKApiKey' content=settings.apis.stripeUK.publishableKey)
+		meta(
+			name='ol-recommendedCurrency'
+			content=personalSubscription.payment.currency
+		)
+		meta(name='ol-groupPlans' data-type='json' content=groupPlans)
 
 block content
-  main.content.content-alt#main-content
-    #subscription-dashboard-root
+	main#main-content.content.content-alt
+		#subscription-dashboard-root
diff --git a/services/web/app/views/subscriptions/manually-collected-subscription.pug b/services/web/app/views/subscriptions/manually-collected-subscription.pug
index ba6bf73473..a693ac749f 100644
--- a/services/web/app/views/subscriptions/manually-collected-subscription.pug
+++ b/services/web/app/views/subscriptions/manually-collected-subscription.pug
@@ -4,8 +4,8 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/manually-collected-subscription'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-groupName", data-type="string", content=groupName)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-groupName' data-type='string' content=groupName)
 
 block content
-	main.content.content-alt#manually-collected-subscription-root
+	main#manually-collected-subscription-root.content.content-alt
diff --git a/services/web/app/views/subscriptions/missing-billing-information.pug b/services/web/app/views/subscriptions/missing-billing-information.pug
index 416bac65f5..d0a0e05ae8 100644
--- a/services/web/app/views/subscriptions/missing-billing-information.pug
+++ b/services/web/app/views/subscriptions/missing-billing-information.pug
@@ -4,8 +4,8 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/missing-billing-information'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-groupName", data-type="string", content=groupName)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-groupName' data-type='string' content=groupName)
 
 block content
-	main.content.content-alt#missing-billing-information-root
+	main#missing-billing-information-root.content.content-alt
diff --git a/services/web/app/views/subscriptions/plans/_faq_new.pug b/services/web/app/views/subscriptions/plans/_faq_new.pug
index 3c926fb22d..760f27b1a4 100644
--- a/services/web/app/views/subscriptions/plans/_faq_new.pug
+++ b/services/web/app/views/subscriptions/plans/_faq_new.pug
@@ -9,7 +9,7 @@ include ../../_mixins/material_symbol
 	.row.row-spaced-extra-large
 		.col-md-12.faq-heading-container
 			h2
-				+eyebrow(translate("frequently_asked_questions"))
+				+eyebrow(translate('frequently_asked_questions'))
 				| #{translate("your_questions_answered")}
 
 	.row
@@ -18,74 +18,62 @@ include ../../_mixins/material_symbol
 				class={
 					'plans-faq-tabs': bootstrapVersion === 5,
 					'ol-tabs': bootstrapVersion === 5,
-					'ol-tabs-scrollable': bootstrapVersion === 3
+					'ol-tabs-scrollable': bootstrapVersion === 3,
 				}
 			)
 				.nav-tabs-container
-					ul.nav.nav-tabs(role="tablist")
+					ul.nav.nav-tabs(role='tablist')
 						//- In the bs5 version of plans page, the `active` class need to be added to the `a` tag instead of the parent `li` tag
 						//- If the `plans-page-bs5` split test has been completed, remove the `active` class from the `li` tag since we're not using it anymore
 						//- If the `plans-page-bs5` split test has been completed, remove the `data-toggle` because it is not needed anymore (bs5 uses `data-bs-toggle`)
-						li(
-							role="presentation"
-							class={
-								active: bootstrapVersion === 3
-							}
-						)
+						li(role='presentation' class={
+							active: bootstrapVersion === 3,
+						})
 							a(
-								role="tab"
-								data-toggle="tab"
-								data-bs-toggle="tab"
+								role='tab'
+								data-toggle='tab'
+								data-bs-toggle='tab'
 								href='#' + managingYourSubscription
 								aria-controls=managingYourSubscription
 								class={
-									active: bootstrapVersion === 5
+									active: bootstrapVersion === 5,
 								}
 							)
 								| #{translate('managing_your_subscription')}
-						li(role="presentation")
+						li(role='presentation')
 							a(
-								role="tab"
-								data-toggle="tab"
-								data-bs-toggle="tab"
+								role='tab'
+								data-toggle='tab'
+								data-bs-toggle='tab'
 								href='#' + overleafIndividualPlans
 								aria-controls=overleafIndividualPlans
 							)
 								| #{translate('overleaf_individual_plans')}
-						li(role="presentation")
+						li(role='presentation')
 							a(
-								role="tab"
-								data-toggle="tab"
-								data-bs-toggle="tab"
+								role='tab'
+								data-toggle='tab'
+								data-bs-toggle='tab'
 								href='#' + overleafGroupPlans
 								aria-controls=overleafGroupPlans
 							)
 								| #{translate('overleaf_group_plans')}
 
 				.tab-content
-					.tab-pane.active(
-						role="tabpanel"
-						id=managingYourSubscription
-					)
-						+managingYourSubscription()
-					.tab-pane(
-						role="tabpanel"
-						id=overleafIndividualPlans
-					)
-						+overleafIndividualPlans()
-					.tab-pane(
-						role="tabpanel"
-						id=overleafGroupPlans
-					)
-						+overleafGroupPlans()
+					.tab-pane.active(role='tabpanel' id=managingYourSubscription)
+						+managingYourSubscription
+					.tab-pane(role='tabpanel' id=overleafIndividualPlans)
+						+overleafIndividualPlans
+					.tab-pane(role='tabpanel' id=overleafGroupPlans)
+						+overleafGroupPlans
 
 	.row
 		.col-xs-12.plans-faq-support
 			span #{translate('still_have_questions')}
 			button(
-				data-ol-open-contact-form-modal="general"
-				data-bs-toggle=bootstrapVersion === 5 ? "modal" : undefined
-				data-bs-target=bootstrapVersion === 5 ? "#contactUsModal" : undefined
+				data-ol-open-contact-form-modal='general'
+				data-bs-toggle=bootstrapVersion === 5 ? 'modal' : undefined
+				data-bs-target=bootstrapVersion === 5 ? '#contactUsModal' : undefined
 			)
-				span(style="margin-right: 4px") #{translate('contact_support')}
-				+material-symbol-rounded("arrow_right_alt", "icon-md")
+				span(style='margin-right: 4px') #{translate('contact_support')}
+				+material-symbol-rounded('arrow_right_alt', 'icon-md')
diff --git a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
index a598f4774c..59eac8efac 100644
--- a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
+++ b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
@@ -1,357 +1,353 @@
 //- If the `plans-page-bs5` split test has been completed, remove the `data-toggle` and `data-target` because it is not needed anymore (bs5 uses `data-bs-toggle` and `data-bs-target`)
 include ../../_mixins/material_symbol
-	
-mixin managingYourSubscription()
+
+mixin managingYourSubscription
 	.ol-accordions-container
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#managingYourSubscriptionQ1"
-				data-bs-toggle="collapse"
-				data-bs-target="#managingYourSubscriptionQ1"
-				aria-expanded="false"
-				aria-controls="managingYourSubscriptionQ1"
+				type='button'
+				data-toggle='collapse'
+				data-target='#managingYourSubscriptionQ1'
+				data-bs-toggle='collapse'
+				data-bs-target='#managingYourSubscriptionQ1'
+				aria-expanded='false'
+				aria-controls='managingYourSubscriptionQ1'
 			)
 				| Can I change plans or cancel later?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="managingYourSubscriptionQ1")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='managingYourSubscriptionQ1')
 				.custom-accordion-body
-					span Yes, you can do this at any time by going to 
-					strong Account > Subscription 
+					span Yes, you can do this at any time by going to
+					strong Account > Subscription
 					span when logged in to Overleaf. You can change plans, switch between monthly and annual billing options, or cancel to downgrade to the free plan. When canceling, your subscription will continue until the end of the billing period.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#managingYourSubscriptionQ2"
-				data-bs-toggle="collapse"
-				data-bs-target="#managingYourSubscriptionQ2"
-				aria-expanded="false"
-				aria-controls="managingYourSubscriptionQ2"
+				type='button'
+				data-toggle='collapse'
+				data-target='#managingYourSubscriptionQ2'
+				data-bs-toggle='collapse'
+				data-bs-target='#managingYourSubscriptionQ2'
+				aria-expanded='false'
+				aria-controls='managingYourSubscriptionQ2'
 			)
 				| If I change or cancel my Overleaf plan, will I lose my projects?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="managingYourSubscriptionQ2")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='managingYourSubscriptionQ2')
 				.custom-accordion-body
 					| No. Changing or canceling your plan won’t affect your projects, the only change will be to the features available to you. You can see which features are available only on paid plans in the comparison table.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#managingYourSubscriptionQ3"
-				data-bs-toggle="collapse"
-				data-bs-target="#managingYourSubscriptionQ3"
-				aria-expanded="false"
-				aria-controls="managingYourSubscriptionQ3"
+				type='button'
+				data-toggle='collapse'
+				data-target='#managingYourSubscriptionQ3'
+				data-bs-toggle='collapse'
+				data-bs-target='#managingYourSubscriptionQ3'
+				aria-expanded='false'
+				aria-controls='managingYourSubscriptionQ3'
 			)
 				| Can I pay by invoice or purchase order?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="managingYourSubscriptionQ3")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='managingYourSubscriptionQ3')
 				.custom-accordion-body
 					| This is possible when you’re purchasing a group subscription for five or more people, or a site license. For individual subscriptions, we can only accept payment online via credit card, debit card, or PayPal.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#managingYourSubscriptionQ4"
-				data-bs-toggle="collapse"
-				data-bs-target="#managingYourSubscriptionQ4"
-				aria-expanded="false"
-				aria-controls="managingYourSubscriptionQ4"
+				type='button'
+				data-toggle='collapse'
+				data-target='#managingYourSubscriptionQ4'
+				data-bs-toggle='collapse'
+				data-bs-target='#managingYourSubscriptionQ4'
+				aria-expanded='false'
+				aria-controls='managingYourSubscriptionQ4'
 			)
 				| How do I view/update the credit card being charged for my subscription?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="managingYourSubscriptionQ4")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='managingYourSubscriptionQ4')
 				.custom-accordion-body
-					| You can view and update the card on file by going to Account > 
+					| You can view and update the card on file by going to Account >
 					a.inline-green-link(
-						target="_blank"
-						href="/user/subscription"
-						event-tracking="plans-page-click"
-						event-tracking-mb="true"
-						event-tracking-trigger="click"
-						event-segmentation={ button: 'contact', location: 'faq' }
+						target='_blank'
+						href='/user/subscription'
+						event-tracking='plans-page-click'
+						event-tracking-mb='true'
+						event-tracking-trigger='click'
+						event-segmentation={button: 'contact', location: 'faq'}
 					)
 						span Subscription
 					| .
 
-
-
-
-mixin overleafIndividualPlans()
+mixin overleafIndividualPlans
 	.ol-accordions-container
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafIndividualPlansQ1"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafIndividualPlansQ1"
-				aria-expanded="false"
-				aria-controls="overleafIndividualPlansQ1"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafIndividualPlansQ1'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafIndividualPlansQ1'
+				aria-expanded='false'
+				aria-controls='overleafIndividualPlansQ1'
 			)
 				| How does the free trial work?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafIndividualPlansQ1")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafIndividualPlansQ1')
 				.custom-accordion-body
-					span You get full access to your chosen plan during your 7-day free trial, and there’s no obligation to continue beyond the trial. Your card will be charged at the end of your trial unless you cancel before then. To cancel, go to 
-					strong Account > 
+					span You get full access to your chosen plan during your 7-day free trial, and there’s no obligation to continue beyond the trial. Your card will be charged at the end of your trial unless you cancel before then. To cancel, go to
+					strong Account >
+						|
 						a.inline-green-link(
-							target="_blank"
-							href="/user/subscription"
-							event-tracking="plans-page-click"
-							event-tracking-mb="true"
-							event-tracking-trigger="click"
-							event-segmentation={ button: 'contact', location: 'faq' }
+							target='_blank'
+							href='/user/subscription'
+							event-tracking='plans-page-click'
+							event-tracking-mb='true'
+							event-tracking-trigger='click'
+							event-segmentation={button: 'contact', location: 'faq'}
 						)
 							span Subscription
-					span  when logged in to Overleaf (the trial will continue for the full 7 days).
+					span when logged in to Overleaf (the trial will continue for the full 7 days).
 
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafIndividualPlansQ2"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafIndividualPlansQ2"
-				aria-expanded="false"
-				aria-controls="overleafIndividualPlansQ2"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafIndividualPlansQ2'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafIndividualPlansQ2'
+				aria-expanded='false'
+				aria-controls='overleafIndividualPlansQ2'
 			)
 				| What’s a collaborator on an Overleaf individual subscription?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafIndividualPlansQ2")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafIndividualPlansQ2')
 				.custom-accordion-body
-					| A collaborator is someone you invite to work with you on a project. So, for example, on our Standard plan you can have up to 10 people collaborating with you on any given project. 
+					| A collaborator is someone you invite to work with you on a project. So, for example, on our Standard plan you can have up to 10 people collaborating with you on any given project.
 
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafIndividualPlansQ3"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafIndividualPlansQ3"
-				aria-expanded="false"
-				aria-controls="overleafIndividualPlansQ3"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafIndividualPlansQ3'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafIndividualPlansQ3'
+				aria-expanded='false'
+				aria-controls='overleafIndividualPlansQ3'
 			)
 				| The individual Standard plan has 10 project collaborators, does it mean that 10 people will be upgraded?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafIndividualPlansQ3")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafIndividualPlansQ3')
 				.custom-accordion-body
-					span No. Only the subscriber’s account will be upgraded. An individual Standard subscription allows you to invite 10 people per project to edit the project with you. Your collaborators can access features such as the full document history and extended compile time, but 
-					strong only 
+					span No. Only the subscriber’s account will be upgraded. An individual Standard subscription allows you to invite 10 people per project to edit the project with you. Your collaborators can access features such as the full document history and extended compile time, but
+					strong only
 					span for the project(s) they’re working on with you. If your collaborators want access to those features on their own projects, they will need to purchase their own subscription. (If you work with the same people regularly, you might find a group subscription more cost effective.)
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafIndividualPlansQ4"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafIndividualPlansQ4"
-				aria-expanded="false"
-				aria-controls="overleafIndividualPlansQ4"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafIndividualPlansQ4'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafIndividualPlansQ4'
+				aria-expanded='false'
+				aria-controls='overleafIndividualPlansQ4'
 			)
 				| Do collaborators also have access to the editing and collaboration features I’ve paid for?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafIndividualPlansQ4")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafIndividualPlansQ4')
 				.custom-accordion-body
-					span If you have an Overleaf subscription, then your project collaborators will have access to features like real-time track changes and document history, but 
-					strong only 
+					span If you have an Overleaf subscription, then your project collaborators will have access to features like real-time track changes and document history, but
+					strong only
 					span for the project(s) they’re working on with you. If your collaborators want access to those features on their own projects, they will need to purchase their own subscription. (If you work with the same people regularly, you might find a group subscription more cost effective.)
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafIndividualPlansQ5"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafIndividualPlansQ5"
-				aria-expanded="false"
-				aria-controls="overleafIndividualPlansQ5"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafIndividualPlansQ5'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafIndividualPlansQ5'
+				aria-expanded='false'
+				aria-controls='overleafIndividualPlansQ5'
 			)
 				| Can I purchase an individual plan on behalf of someone else?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafIndividualPlansQ5")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafIndividualPlansQ5')
 				.custom-accordion-body
-					| Individual subscriptions must be purchased by the account that will be the end user. If you want to purchase a plan for someone else, you’ll need to provide them with relevant payment details to enable them to make the purchase. 
+					| Individual subscriptions must be purchased by the account that will be the end user. If you want to purchase a plan for someone else, you’ll need to provide them with relevant payment details to enable them to make the purchase.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafIndividualPlansQ6"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafIndividualPlansQ6"
-				aria-expanded="false"
-				aria-controls="overleafIndividualPlansQ6"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafIndividualPlansQ6'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafIndividualPlansQ6'
+				aria-expanded='false'
+				aria-controls='overleafIndividualPlansQ6'
 			)
 				| Who is eligible for the Student plan?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafIndividualPlansQ6")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafIndividualPlansQ6')
 				.custom-accordion-body
 					| As the name suggests, the Student plan is only for students at educational institutions. This includes graduate students.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafIndividualPlansQ7"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafIndividualPlansQ7"
-				aria-expanded="false"
-				aria-controls="overleafIndividualPlansQ7"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafIndividualPlansQ7'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafIndividualPlansQ7'
+				aria-expanded='false'
+				aria-controls='overleafIndividualPlansQ7'
 			)
 				| Can I transfer an individual subscription to someone else?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafIndividualPlansQ7")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafIndividualPlansQ7')
 				.custom-accordion-body
-					| No. Individual plans can’t be transferred. 
+					| No. Individual plans can’t be transferred.
 
-
-
-
-
-mixin overleafGroupPlans()
+mixin overleafGroupPlans
 	.ol-accordions-container
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafGroupPlansQ1"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafGroupPlansQ1"
-				aria-expanded="false"
-				aria-controls="overleafGroupPlansQ1"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafGroupPlansQ1'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafGroupPlansQ1'
+				aria-expanded='false'
+				aria-controls='overleafGroupPlansQ1'
 			)
 				| What’s the difference between users and collaborators on an Overleaf group subscription?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafGroupPlansQ1")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafGroupPlansQ1')
 				.custom-accordion-body
-					div On any of our group plans, the number of users refers to the number of people you can invite to join your group. All of these people will have access to the plan’s paid-for features across all their projects, such as real-time track changes and document history. 
-					div.mt-2 Collaborators are people that your group users may invite to work with them on their projects. So, for example, if you have the Group Standard plan, the users in your group can invite up to 10 people to work with them on a project. And if you have the Group Professional plan, your users can invite as many people to work with them as they want.
+					div On any of our group plans, the number of users refers to the number of people you can invite to join your group. All of these people will have access to the plan’s paid-for features across all their projects, such as real-time track changes and document history.
+					.mt-2 Collaborators are people that your group users may invite to work with them on their projects. So, for example, if you have the Group Standard plan, the users in your group can invite up to 10 people to work with them on a project. And if you have the Group Professional plan, your users can invite as many people to work with them as they want.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafGroupPlansQ2"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafGroupPlansQ2"
-				aria-expanded="false"
-				aria-controls="overleafGroupPlansQ2"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafGroupPlansQ2'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafGroupPlansQ2'
+				aria-expanded='false'
+				aria-controls='overleafGroupPlansQ2'
 			)
 				| What is the benefit of purchasing an Overleaf Group plan?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafGroupPlansQ2")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafGroupPlansQ2')
 				.custom-accordion-body
-					| Our Group subscriptions allow you to purchase access to our premium features for multiple people. They’re easy to manage, help save on paperwork, and allow groups of 5 or more to purchase via purchase order (PO). We also offer discounts on purchases of Group subscriptions for more than 20 users; just get in touch with our 
+					| Our Group subscriptions allow you to purchase access to our premium features for multiple people. They’re easy to manage, help save on paperwork, and allow groups of 5 or more to purchase via purchase order (PO). We also offer discounts on purchases of Group subscriptions for more than 20 users; just get in touch with our
 					a.inline-green-link(
-						target="_blank"
-						href="/for/contact-sales"
-						event-tracking="plans-page-click"
-						event-tracking-mb="true"
-						event-tracking-trigger="click"
-						event-segmentation={ button: 'contact', location: 'faq' }
+						target='_blank'
+						href='/for/contact-sales'
+						event-tracking='plans-page-click'
+						event-tracking-mb='true'
+						event-tracking-trigger='click'
+						event-segmentation={button: 'contact', location: 'faq'}
 					)
 						span Sales team
 					| .
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafGroupPlansQ3"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafGroupPlansQ3"
-				aria-expanded="false"
-				aria-controls="overleafGroupPlansQ3"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafGroupPlansQ3'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafGroupPlansQ3'
+				aria-expanded='false'
+				aria-controls='overleafGroupPlansQ3'
 			)
 				| Who is eligible for the educational discount?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafGroupPlansQ3")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafGroupPlansQ3')
 				.custom-accordion-body
-					| The educational discount for group subscriptions is for students or faculty who are using Overleaf primarily for teaching. 
+					| The educational discount for group subscriptions is for students or faculty who are using Overleaf primarily for teaching.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafGroupPlansQ4"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafGroupPlansQ4"
-				aria-expanded="false"
-				aria-controls="overleafGroupPlansQ4"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafGroupPlansQ4'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafGroupPlansQ4'
+				aria-expanded='false'
+				aria-controls='overleafGroupPlansQ4'
 			)
 				| How do I add more licenses to my group subscription, and what will it cost?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafGroupPlansQ4")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafGroupPlansQ4')
 				.custom-accordion-body
-					div 
-						| You can add up to 20 licenses using the 
+					div
+						| You can add up to 20 licenses using the
 						a.inline-green-link(
-							target="_blank"
-							href="/user/subscription"
-							event-tracking="plans-page-click"
-							event-tracking-mb="true"
-							event-tracking-trigger="click"
-							event-segmentation={ button: 'contact', location: 'faq' }
+							target='_blank'
+							href='/user/subscription'
+							event-tracking='plans-page-click'
+							event-tracking-mb='true'
+							event-tracking-trigger='click'
+							event-segmentation={button: 'contact', location: 'faq'}
 						)
 							span subscription management page
-						|  accessed by going to Account > 
+						|
+						| accessed by going to Account >
 						a.inline-green-link(
-							target="_blank"
-							href="/user/subscription"
-							event-tracking="plans-page-click"
-							event-tracking-mb="true"
-							event-tracking-trigger="click"
-							event-segmentation={ button: 'contact', location: 'faq' }
+							target='_blank'
+							href='/user/subscription'
+							event-tracking='plans-page-click'
+							event-tracking-mb='true'
+							event-tracking-trigger='click'
+							event-segmentation={button: 'contact', location: 'faq'}
 						)
 							span Subscription
-						|  when logged into Overleaf. The cost per license will be prorated at the current per license rate, and will end with your existing renewal date.
-					div.mt-2 
-						| If you need more than 20 licenses added to your subscription, please 
+						|
+						| when logged into Overleaf. The cost per license will be prorated at the current per license rate, and will end with your existing renewal date.
+					.mt-2
+						| If you need more than 20 licenses added to your subscription, please
 						a.inline-green-link(
-							target="_blank"
-							href="/for/contact-sales"
-							event-tracking="plans-page-click"
-							event-tracking-mb="true"
-							event-tracking-trigger="click"
-							event-segmentation={ button: 'contact', location: 'faq' }
+							target='_blank'
+							href='/for/contact-sales'
+							event-tracking='plans-page-click'
+							event-tracking-mb='true'
+							event-tracking-trigger='click'
+							event-segmentation={button: 'contact', location: 'faq'}
 						)
 							span contact the Sales team
 						| .
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
-				type="button"
-				data-toggle="collapse"
-				data-target="#overleafGroupPlansQ5"
-				data-bs-toggle="collapse"
-				data-bs-target="#overleafGroupPlansQ5"
-				aria-expanded="false"
-				aria-controls="overleafGroupPlansQ5"
+				type='button'
+				data-toggle='collapse'
+				data-target='#overleafGroupPlansQ5'
+				data-bs-toggle='collapse'
+				data-bs-target='#overleafGroupPlansQ5'
+				aria-expanded='false'
+				aria-controls='overleafGroupPlansQ5'
 			)
 				| How do I upgrade my plan from Group Standard to Group Professional?
 				span.custom-accordion-icon
-					+material-symbol-outlined("keyboard_arrow_down")
-			.collapse(id="overleafGroupPlansQ5")
+					+material-symbol-outlined('keyboard_arrow_down')
+			.collapse(id='overleafGroupPlansQ5')
 				.custom-accordion-body
-					| You can upgrade your plan from Group Standard to Group Professional on the 
+					| You can upgrade your plan from Group Standard to Group Professional on the
 					a.inline-green-link(
-						target="_blank"
-						href="/user/subscription"
-						event-tracking="plans-page-click"
-						event-tracking-mb="true"
-						event-tracking-trigger="click"
-						event-segmentation={ button: 'contact', location: 'faq' }
+						target='_blank'
+						href='/user/subscription'
+						event-tracking='plans-page-click'
+						event-tracking-mb='true'
+						event-tracking-trigger='click'
+						event-segmentation={button: 'contact', location: 'faq'}
 					)
 						span subscription management page
 					| .
diff --git a/services/web/app/views/subscriptions/preview-change.pug b/services/web/app/views/subscriptions/preview-change.pug
index 5330eb8684..2eaca5ac6a 100644
--- a/services/web/app/views/subscriptions/preview-change.pug
+++ b/services/web/app/views/subscriptions/preview-change.pug
@@ -4,10 +4,14 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/preview-change'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-subscriptionChangePreview" data-type="json" content=changePreview)
-	meta(name="ol-purchaseReferrer" data-type="string" content=purchaseReferrer)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(
+		name='ol-subscriptionChangePreview'
+		data-type='json'
+		content=changePreview
+	)
+	meta(name='ol-purchaseReferrer' data-type='string' content=purchaseReferrer)
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		#subscription-preview-change
diff --git a/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug b/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug
index 4457383e93..df734232d6 100644
--- a/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug
+++ b/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug
@@ -4,8 +4,8 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/subtotal-limit-exceeded'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-groupName", data-type="string", content=groupName)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-groupName' data-type='string' content=groupName)
 
 block content
-	main.content.content-alt#subtotal-limit-exceeded-root
+	main#subtotal-limit-exceeded-root.content.content-alt
diff --git a/services/web/app/views/subscriptions/successful-subscription-react.pug b/services/web/app/views/subscriptions/successful-subscription-react.pug
index 5ce208b034..9437b93b67 100644
--- a/services/web/app/views/subscriptions/successful-subscription-react.pug
+++ b/services/web/app/views/subscriptions/successful-subscription-react.pug
@@ -4,9 +4,9 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/successful-subscription'
 
 block append meta
-	meta(name="ol-subscription" data-type="json" content=personalSubscription)
-	meta(name="ol-postCheckoutRedirect" content=postCheckoutRedirect)
-	meta(name="ol-user" data-type="json" content=user)
+	meta(name='ol-subscription' data-type='json' content=personalSubscription)
+	meta(name='ol-postCheckoutRedirect' content=postCheckoutRedirect)
+	meta(name='ol-user' data-type='json' content=user)
 
 block content
-	main.content.content-alt#subscription-success-root
+	main#subscription-success-root.content.content-alt
diff --git a/services/web/app/views/subscriptions/team/group-invites.pug b/services/web/app/views/subscriptions/team/group-invites.pug
index 81c70f1885..18286fd403 100644
--- a/services/web/app/views/subscriptions/team/group-invites.pug
+++ b/services/web/app/views/subscriptions/team/group-invites.pug
@@ -4,8 +4,8 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-invites'
 
 block append meta
-	meta(name="ol-teamInvites" data-type="json" content=teamInvites)
-	meta(name="ol-user" data-type="json" content=user)
+	meta(name='ol-teamInvites' data-type='json' content=teamInvites)
+	meta(name='ol-user' data-type='json' content=user)
 
 block content
-	main.content.content-alt.team-invite#group-invites-root
+	main#group-invites-root.content.content-alt.team-invite
diff --git a/services/web/app/views/subscriptions/team/invite-managed.pug b/services/web/app/views/subscriptions/team/invite-managed.pug
index d31f12656b..4010731c3f 100644
--- a/services/web/app/views/subscriptions/team/invite-managed.pug
+++ b/services/web/app/views/subscriptions/team/invite-managed.pug
@@ -4,16 +4,20 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/invite-managed'
 
 block append meta
-	meta(name="ol-inviteToken" content=inviteToken)
-	meta(name="ol-inviterName" content=inviterName)
-	meta(name="ol-expired" data-type="boolean" content=expired)
-	meta(name="ol-alreadyEnrolled" data-type="boolean" content=alreadyEnrolled)
-	meta(name="ol-validationStatus" data-type="json" content=validationStatus)
-	meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail)
-	meta(name="ol-groupSSOActive" data-type="boolean" content=groupSSOActive)
-	meta(name="ol-subscriptionId" data-type="string" content=subscriptionId)
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-usersSubscription" data-type="json" content=usersSubscription)
+	meta(name='ol-inviteToken' content=inviteToken)
+	meta(name='ol-inviterName' content=inviterName)
+	meta(name='ol-expired' data-type='boolean' content=expired)
+	meta(name='ol-alreadyEnrolled' data-type='boolean' content=alreadyEnrolled)
+	meta(name='ol-validationStatus' data-type='json' content=validationStatus)
+	meta(
+		name='ol-currentManagedUserAdminEmail'
+		data-type='string'
+		content=currentManagedUserAdminEmail
+	)
+	meta(name='ol-groupSSOActive' data-type='boolean' content=groupSSOActive)
+	meta(name='ol-subscriptionId' data-type='string' content=subscriptionId)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-usersSubscription' data-type='json' content=usersSubscription)
 
 block content
-	main.content.content-alt.team-invite#invite-managed-root
+	main#invite-managed-root.content.content-alt.team-invite
diff --git a/services/web/app/views/subscriptions/team/invite.pug b/services/web/app/views/subscriptions/team/invite.pug
index 1b2ecb4646..717ccef611 100644
--- a/services/web/app/views/subscriptions/team/invite.pug
+++ b/services/web/app/views/subscriptions/team/invite.pug
@@ -4,14 +4,22 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/invite'
 
 block append meta
-	meta(name="ol-hasIndividualPaidSubscription" data-type="boolean" content=hasIndividualPaidSubscription)
-	meta(name="ol-inviterName" data-type="string" content=inviterName)
-	meta(name="ol-inviteToken" data-type="string" content=inviteToken)
-	meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail)
-	meta(name="ol-expired" data-type="boolean" content=expired)
-	meta(name="ol-groupSSOActive" data-type="boolean" content=groupSSOActive)
-	meta(name="ol-subscriptionId" data-type="string" content=subscriptionId)
-	meta(name="ol-user" data-type="json" content=user)
+	meta(
+		name='ol-hasIndividualPaidSubscription'
+		data-type='boolean'
+		content=hasIndividualPaidSubscription
+	)
+	meta(name='ol-inviterName' data-type='string' content=inviterName)
+	meta(name='ol-inviteToken' data-type='string' content=inviteToken)
+	meta(
+		name='ol-currentManagedUserAdminEmail'
+		data-type='string'
+		content=currentManagedUserAdminEmail
+	)
+	meta(name='ol-expired' data-type='boolean' content=expired)
+	meta(name='ol-groupSSOActive' data-type='boolean' content=groupSSOActive)
+	meta(name='ol-subscriptionId' data-type='string' content=subscriptionId)
+	meta(name='ol-user' data-type='json' content=user)
 
 block content
-	main.content.content-alt#invite-root
+	main#invite-root.content.content-alt
diff --git a/services/web/app/views/subscriptions/team/invite_logged_out.pug b/services/web/app/views/subscriptions/team/invite_logged_out.pug
index e5930aba4f..3e471fb4c9 100644
--- a/services/web/app/views/subscriptions/team/invite_logged_out.pug
+++ b/services/web/app/views/subscriptions/team/invite_logged_out.pug
@@ -1,12 +1,12 @@
 extends ../../layout-marketing
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
+	meta(name='ol-user' data-type='json' content=user)
 
 block content
 	- var colClass = bootstrapVersion === 5 ? 'col-lg-8 m-auto' : 'col-md-8 col-md-offset-2'
 
-	main.content.content-alt.team-invite#main-content
+	main#main-content.content.content-alt.team-invite
 		.container
 			.row
 				div(class=colClass)
@@ -16,15 +16,19 @@ block content
 								// TODO: Remove `team-invite-name` once we fully migrated to Bootstrap 5
 								h1.text-center !{translate("invited_to_group", {inviterName: inviterName, appName: appName }, [{name: 'span', attrs: {class: 'team-invite-name'}}])}
 
-							if (accountExists)
+							if accountExists
 								div
 									p #{translate("invited_to_group_login_benefits", {appName: appName})}
 									p #{translate("invited_to_group_login", {emailAddress: emailAddress})}
 									p
-										a.btn.btn-primary(href=`/login?redir=/subscription/invites/${inviteToken}${groupSSOActive ? "&hide_sso_login=true" : ""}`) #{translate("login_to_accept_invitation")}
+										a.btn.btn-primary(
+											href=`/login?redir=/subscription/invites/${inviteToken}${groupSSOActive ? "&hide_sso_login=true" : ""}`
+										) #{translate("login_to_accept_invitation")}
 							else
 								div
 									p #{translate("invited_to_group_register_benefits", {appName: appName})}
 									p #{translate("invited_to_group_register", {inviterName: inviterName})}
 									p
-										a.btn.btn-primary(href=`/register?redir=/subscription/invites/${inviteToken}${groupSSOActive ? "&hide_sso_login=true" : ""}`) #{translate("register_to_accept_invitation")}
+										a.btn.btn-primary(
+											href=`/register?redir=/subscription/invites/${inviteToken}${groupSSOActive ? "&hide_sso_login=true" : ""}`
+										) #{translate("register_to_accept_invitation")}
diff --git a/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug b/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug
index 4347a2a633..0c7f4ce993 100644
--- a/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug
+++ b/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug
@@ -4,10 +4,14 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/upgrade-group-subscription'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-subscriptionChangePreview" data-type="json" content=changePreview)
-	meta(name="ol-totalLicenses", data-type="number", content=totalLicenses)
-	meta(name="ol-groupName", data-type="string", content=groupName)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(
+		name='ol-subscriptionChangePreview'
+		data-type='json'
+		content=changePreview
+	)
+	meta(name='ol-totalLicenses' data-type='number' content=totalLicenses)
+	meta(name='ol-groupName' data-type='string' content=groupName)
 
 block content
-	main.content.content-alt#upgrade-group-subscription-root
+	main#upgrade-group-subscription-root.content.content-alt
diff --git a/services/web/app/views/user/accountSuspended.pug b/services/web/app/views/user/accountSuspended.pug
index 7231713416..1a03beb4df 100644
--- a/services/web/app/views/user/accountSuspended.pug
+++ b/services/web/app/views/user/accountSuspended.pug
@@ -6,7 +6,7 @@ block vars
 	- metadata.robotsNoindexNofollow = true
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container-custom-sm.mx-auto
 			.card
 				.card-body
diff --git a/services/web/app/views/user/compromised_password.pug b/services/web/app/views/user/compromised_password.pug
index c66a07415a..48017b0ea7 100644
--- a/services/web/app/views/user/compromised_password.pug
+++ b/services/web/app/views/user/compromised_password.pug
@@ -9,5 +9,5 @@ block entrypointVar
 	- entrypoint = 'pages/compromised-password'
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		#compromised-password
diff --git a/services/web/app/views/user/confirmSecondaryEmail.pug b/services/web/app/views/user/confirmSecondaryEmail.pug
index 181e58e4ce..4f143c16dc 100644
--- a/services/web/app/views/user/confirmSecondaryEmail.pug
+++ b/services/web/app/views/user/confirmSecondaryEmail.pug
@@ -8,7 +8,7 @@ block entrypointVar
 	- entrypoint = 'pages/user/confirm-secondary-email'
 
 block append meta
-	meta(name="ol-email" content=email)
+	meta(name='ol-email' content=email)
 
 block content
 	main.content.content-alt
diff --git a/services/web/app/views/user/confirm_email.pug b/services/web/app/views/user/confirm_email.pug
index 13e911f386..d783996076 100644
--- a/services/web/app/views/user/confirm_email.pug
+++ b/services/web/app/views/user/confirm_email.pug
@@ -2,56 +2,50 @@ extends ../layout-marketing
 include ../_mixins/notification
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-lg-8.offset-lg-2.col-xl-6.offset-xl-3
 					.card
 						.card-body
-							.page-header(data-ol-hide-on-error-message="confirm-email-wrong-user")
+							.page-header(data-ol-hide-on-error-message='confirm-email-wrong-user')
 								h1 #{translate("confirm_email")}
+							form(method='POST' action='/logout' id='logoutForm')
+								input(name='_csrf' type='hidden' value=csrfToken)
+								input(name='redirect' type='hidden' value=currentUrlWithQueryParams)
 							form(
-								method="POST"
-								action="/logout"
-								id="logoutForm"
+								name='confirmEmailForm'
+								data-ol-async-form
+								data-ol-auto-submit
+								action='/user/emails/confirm'
+								method='POST'
+								id='confirmEmailForm'
 							)
-								input(type="hidden", name="_csrf", value=csrfToken)
-								input(type="hidden", name="redirect", value=currentUrlWithQueryParams)
-							form(
-								data-ol-async-form,
-								data-ol-auto-submit,
-								name="confirmEmailForm"
-								action="/user/emails/confirm",
-								method="POST",
-								id="confirmEmailForm",
-							)
-								input(type="hidden", name="_csrf", value=csrfToken)
-								input(type="hidden", name="token", value=token)
+								input(name='_csrf' type='hidden' value=csrfToken)
+								input(name='token' type='hidden' value=token)
 
 								div(data-ol-not-sent)
-									+formMessages()
-									div(data-ol-custom-form-message="confirm-email-wrong-user" hidden)
+									+formMessages
+									div(data-ol-custom-form-message='confirm-email-wrong-user' hidden)
 										h1.h3 #{translate("we_cant_confirm_this_email")}
 										p !{translate("to_confirm_email_address_you_must_be_logged_in_with_the_requesting_account")}
 										p !{translate("you_are_currently_logged_in_as", {email: getUserEmail()})}
 										.actions
-											button.btn-primary.btn.w-100(
-												form="logoutForm"
-											) #{translate('log_in_with_a_different_account')}
+											button.btn-primary.btn.w-100(form='logoutForm') #{translate('log_in_with_a_different_account')}
 
 									.actions
 										button.btn-primary.btn.w-100(
-											type='submit',
+											type='submit'
 											data-ol-disabled-inflight
-											data-ol-hide-on-error-message="confirm-email-wrong-user"
+											data-ol-hide-on-error-message='confirm-email-wrong-user'
 										)
-											span(data-ol-inflight="idle")
+											span(data-ol-inflight='idle')
 												| #{translate('confirm')}
-											span(hidden data-ol-inflight="pending")
-												span(role='status').spinner-border.spinner-border-sm.mx-2
+											span(hidden data-ol-inflight='pending')
+												span.spinner-border.spinner-border-sm.mx-2(role='status')
 
 								div(hidden data-ol-sent)
-									+notification({ariaLive: 'polite', type: 'success', className: 'mb-3', content: translate("thank_you_email_confirmed")})
-									div.text-center
-										a.btn.btn-primary(href="/user/settings")
+									+notification({ariaLive: 'polite', type: 'success', className: 'mb-3', content: translate('thank_you_email_confirmed')})
+									.text-center
+										a.btn.btn-primary(href='/user/settings')
 											| #{translate('go_to_account_settings')}
diff --git a/services/web/app/views/user/email-preferences.pug b/services/web/app/views/user/email-preferences.pug
index 86ebc5f841..2071f64705 100644
--- a/services/web/app/views/user/email-preferences.pug
+++ b/services/web/app/views/user/email-preferences.pug
@@ -2,7 +2,7 @@ extends ../layout-marketing
 include ../_mixins/back_to_btns
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-lg-10.offset-lg-1.col-xl-8.offset-xl-2
@@ -10,9 +10,9 @@ block content
 						.card-body
 							.page-header
 								h1 #{translate("newsletter_info_title")}
-	
+
 							p #{translate("newsletter_info_summary")}
-	
+
 							- var submitAction
 							if subscribed
 								- submitAction = '/user/newsletter/unsubscribe'
@@ -20,28 +20,28 @@ block content
 							else
 								- submitAction = '/user/newsletter/subscribe'
 								p !{translate("newsletter_info_unsubscribed", {}, ['strong'])}
-	
+
 							form(
+								name='newsletterForm'
 								data-ol-async-form
 								data-ol-reload-on-success
-								name="newsletterForm"
 								action=submitAction
-								method="POST"
+								method='POST'
 							)
-								input(name='_csrf', type='hidden', value=csrfToken)
-								+formMessages()
+								input(name='_csrf' type='hidden' value=csrfToken)
+								+formMessages
 								p.actions.text-center
 									if subscribed
-										button.btn-danger.btn(type='submit', data-ol-disabled-inflight)
-											span(data-ol-inflight="idle") #{translate("unsubscribe")}
-											span(hidden data-ol-inflight="pending") #{translate("saving")}…
+										button.btn-danger.btn(type='submit' data-ol-disabled-inflight)
+											span(data-ol-inflight='idle') #{translate("unsubscribe")}
+											span(hidden data-ol-inflight='pending') #{translate("saving")}…
 									else
-										button.btn-primary.btn(type='submit', data-ol-disabled-inflight)
-											span(data-ol-inflight="idle") #{translate("subscribe")}
-											span(hidden data-ol-inflight="pending") #{translate("saving")}…
-	
+										button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+											span(data-ol-inflight='idle') #{translate("subscribe")}
+											span(hidden data-ol-inflight='pending') #{translate("saving")}…
+
 							if subscribed
 								p #{translate("newsletter_info_note")}
-	
+
 							.page-separator
-							+back-to-btns()
+							+back-to-btns
diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index 1ad77cb8b4..03112a0e16 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -1,7 +1,7 @@
 extends ../layout-marketing
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-lg-6.offset-lg-3.col-xl-4.offset-xl-4
@@ -11,10 +11,10 @@ block content
 								if login_support_title
 									h1 !{login_support_title}
 								else
-									h1 #{translate("log_in")}					
-							form(data-ol-async-form, name="loginForm", action='/login', method="POST")
-								input(name='_csrf', type='hidden', value=csrfToken)
-								+formMessagesNewStyle()
+									h1 #{translate("log_in")} 
+							form(name='loginForm' data-ol-async-form action='/login' method='POST')
+								input(name='_csrf' type='hidden' value=csrfToken)
+								+formMessagesNewStyle
 								+customFormMessageNewStyle('invalid-password-retry-or-reset', 'danger')
 									| !{translate('email_or_password_wrong_try_again_or_reset', {}, [{ name: 'a', attrs: { href: '/user/password/reset', 'aria-describedby': 'resetPasswordDescription' } }])}
 									span.visually-hidden(id='resetPasswordDescription')
@@ -23,28 +23,24 @@ block content
 									| !{translate('password_compromised_try_again_or_use_known_device_or_reset', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}, {name: 'a', attrs: {href: '/user/password/reset', target: '_blank'}}])}.
 								.form-group
 									input.form-control(
-										type='email',
-										name='email',
-										required,
-										placeholder='email@example.com',
-										autofocus="true"
+										name='email'
+										type='email'
+										required
+										placeholder='email@example.com'
+										autofocus='true'
 									)
 								.form-group
 									input.form-control(
-										type='password',
-										name='password',
-										required,
-										placeholder='********',
+										name='password'
+										type='password'
+										required
+										placeholder='********'
 									)
 								.actions
-									button.btn-primary.btn(
-										type='submit',
-										data-ol-disabled-inflight
-									)
-										span(data-ol-inflight="idle") #{translate("login")}
-										span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
+									button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+										span(data-ol-inflight='idle') #{translate("login")}
+										span(hidden data-ol-inflight='pending') #{translate("logging_in")}…
 									a.float-end(href='/user/password/reset') #{translate("forgot_your_password")}?
 								if login_support_text
 									hr
-									p.text-center !{login_support_text}	
-		
+									p.text-center !{login_support_text}
diff --git a/services/web/app/views/user/one_time_login.pug b/services/web/app/views/user/one_time_login.pug
index 648f6d93c1..e5d50c5a2d 100644
--- a/services/web/app/views/user/one_time_login.pug
+++ b/services/web/app/views/user/one_time_login.pug
@@ -1,7 +1,7 @@
 extends ../layout-marketing
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-lg-6.offset-lg-3.col-xl-4.offset-xl-4
@@ -13,6 +13,6 @@ block content
 							p
 								| Please
 								|
-								a(href="/login") log in
+								a(href='/login') log in
 								|
 								| to continue working on your projects.
diff --git a/services/web/app/views/user/passwordReset-bs5.pug b/services/web/app/views/user/passwordReset-bs5.pug
index 08e0a71b9d..f69553b849 100644
--- a/services/web/app/views/user/passwordReset-bs5.pug
+++ b/services/web/app/views/user/passwordReset-bs5.pug
@@ -11,51 +11,55 @@ block content
 	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
 
 	if showCaptcha
-		script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=explicit")
+		script(
+			type='text/javascript'
+			nonce=scriptNonce
+			src='https://www.recaptcha.net/recaptcha/api.js?render=explicit'
+		)
 		div(
-			id="recaptcha"
-			class="g-recaptcha"
+			id='recaptcha'
+			class='g-recaptcha'
 			data-sitekey=settings.recaptcha.siteKey
-			data-size="invisible"
-			data-badge="inline"
+			data-size='invisible'
+			data-badge='inline'
 		)
 
-	main#main-content(data-ol-captcha-retry-trigger-area="")
-		a.auth-aux-logo(href="/")
-			img(src=buildImgPath("ol-brand/overleaf-o-dark.svg") alt=settings.appName)
+	main#main-content(data-ol-captcha-retry-trigger-area='')
+		a.auth-aux-logo(href='/')
+			img(src=buildImgPath('ol-brand/overleaf-o-dark.svg') alt=settings.appName)
 		.auth-aux-container
 			form(
+				name='passwordResetForm'
+				captcha-action-name=showCaptcha ? 'passwordReset' : false
 				data-ol-async-form
-				name="passwordResetForm"
-				action="/user/password/reset"
-				method="POST"
-				captcha=(showCaptcha ? '' : false)
-				captcha-action-name=(showCaptcha ? "passwordReset" : false)
+				action='/user/password/reset'
+				method='POST'
+				captcha=showCaptcha ? '' : false
 			)
 				if error === 'password_reset_token_expired'
 					h1.h3.mb-3.mt-0 #{translate("sorry_your_token_expired")}
 					p #{translate('please_request_a_new_password_reset_email_and_follow_the_link')}.
 				else
 					h1.h3.mb-3.mt-0(data-ol-not-sent) #{translate("password_reset_sentence_case")}
-					h1.h3.mb-3.mt-0(hidden data-ol-sent) #{translate("check_your_email")}   
+					h1.h3.mb-3.mt-0(hidden data-ol-sent) #{translate("check_your_email")} 
 					p.mb-3.pb-3(data-ol-not-sent) #{translate("enter_your_email_address_below_and_we_will_send_you_a_link_to_reset_your_password")}.
 
 				div(data-ol-not-sent)
-					+formMessagesNewStyle()
+					+formMessagesNewStyle
 					if error && error !== 'password_reset_token_expired'
 						+notification({ariaLive: 'assertive', type: 'error', className: 'mb-3', content: translate(error)})
 
-					div(data-ol-custom-form-message="no-password-allowed-due-to-sso" hidden)
-						+notification({ariaLive: 'polite', type: 'error', className: 'mb-3', content: translate("you_cant_reset_password_due_to_sso", {}, [{name: 'a', attrs: {href: '/sso-login'}}])})
-					input(type="hidden" name="_csrf" value=csrfToken)
+					div(data-ol-custom-form-message='no-password-allowed-due-to-sso' hidden)
+						+notification({ariaLive: 'polite', type: 'error', className: 'mb-3', content: translate('you_cant_reset_password_due_to_sso', {}, [{name: 'a', attrs: {href: '/sso-login'}}])})
+					input(name='_csrf' type='hidden' value=csrfToken)
 					.form-group.mb-3
 						label.form-label(for='email') #{translate("email")}
-						input.form-control#email(
-							aria-label="email"
-							type='email'
+						input#email.form-control(
 							name='email'
+							aria-label='email'
+							type='email'
 							required
-							autocomplete="username"
+							autocomplete='username'
 							autofocus
 						)
 					.actions
@@ -64,14 +68,14 @@ block content
 							data-ol-disabled-inflight
 							aria-label=translate('reset_password_sentence_case')
 						)
-							span(data-ol-inflight="idle")
+							span(data-ol-inflight='idle')
 								| #{translate("reset_password_sentence_case")}
-							span(hidden data-ol-inflight="pending")
+							span(hidden data-ol-inflight='pending')
 								| #{translate("requesting_password_reset")}…
-						a.btn.btn-ghost.w-100.mb-3(href="/login") #{translate("back_to_log_in")}
+						a.btn.btn-ghost.w-100.mb-3(href='/login') #{translate("back_to_log_in")}
 				div(hidden data-ol-sent)
 					p.mb-4 #{translate('password_reset_email_sent')}
-					a.btn.btn-primary.w-100.mb-3(href="/login") #{translate('back_to_log_in')}
+					a.btn.btn-primary.w-100.mb-3(href='/login') #{translate('back_to_log_in')}
 
 			if showCaptcha
 				+recaptchaConditions
diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug
index ed806c32cd..e3396a5cc0 100644
--- a/services/web/app/views/user/passwordReset.pug
+++ b/services/web/app/views/user/passwordReset.pug
@@ -9,77 +9,81 @@ block content
 	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
 
 	if showCaptcha
-		script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=explicit")
+		script(
+			type='text/javascript'
+			nonce=scriptNonce
+			src='https://www.recaptcha.net/recaptcha/api.js?render=explicit'
+		)
 		div(
-			id="recaptcha"
-			class="g-recaptcha"
+			id='recaptcha'
+			class='g-recaptcha'
 			data-sitekey=settings.recaptcha.siteKey
-			data-size="invisible"
-			data-badge="inline"
+			data-size='invisible'
+			data-badge='inline'
 		)
 
-	main.content.content-alt#main-content(data-ol-captcha-retry-trigger-area="")
+	main#main-content.content.content-alt(data-ol-captcha-retry-trigger-area='')
 		.container-custom-sm.mx-auto
 			.card
 				form(
+					name='passwordResetForm'
+					captcha-action-name=showCaptcha ? 'passwordReset' : false
 					data-ol-async-form
-					name="passwordResetForm"
-					action="/user/password/reset",
-					method="POST",
-					captcha=(showCaptcha ? '' : false),
-					captcha-action-name=(showCaptcha ? "passwordReset" : false),
+					action='/user/password/reset'
+					method='POST'
+					captcha=showCaptcha ? '' : false
 				)
 					if error === 'password_reset_token_expired'
 						h3.mt-0.mb-2 #{translate("sorry_your_token_expired")}
 						p #{translate('please_request_a_new_password_reset_email_and_follow_the_link')}.
 					else
 						h3.mt-0.mb-2(data-ol-not-sent) #{translate("password_reset")}
-						h3.mt-0.mb-2(hidden data-ol-sent) #{translate("check_your_email")}	
+						h3.mt-0.mb-2(hidden data-ol-sent) #{translate("check_your_email")}
 						p(data-ol-not-sent) #{translate("enter_your_email_address_below_and_we_will_send_you_a_link_to_reset_your_password")}.
 
 					div(data-ol-not-sent)
-						+formMessages()
+						+formMessages
 						if error && error !== 'password_reset_token_expired'
-							div.alert.alert-danger.mb-2(
-								role="alert"
-								aria-live="assertive"
-							)
+							.alert.alert-danger.mb-2(role='alert' aria-live='assertive')
 								| #{translate(error)}
 
-						div(data-ol-custom-form-message="no-password-allowed-due-to-sso" hidden)
-							.notification.notification-type-error(aria-live="polite" style="margin-bottom: 10px;")
+						div(data-ol-custom-form-message='no-password-allowed-due-to-sso' hidden)
+							.notification.notification-type-error(
+								aria-live='polite'
+								style='margin-bottom: 10px'
+							)
 								.notification-icon
-									+material-symbol-rounded("error")
+									+material-symbol-rounded('error')
 								.notification-content-and-cta
 									.notification-content
 										p
 											| !{translate("you_cant_reset_password_due_to_sso", {}, [{name: 'a', attrs: {href: '/sso-login'}}])}
 
-						input(type="hidden", name="_csrf", value=csrfToken)
+						input(name='_csrf' type='hidden' value=csrfToken)
 						.form-group.mb-3
 							label(for='email') #{translate("email")}
-							input.form-control#email(
-								aria-label="email"
-								type='email',
-								name='email',
-								placeholder=translate("enter_your_email_address"),
-								required,
-								autocomplete="username",
+							input#email.form-control(
+								name='email'
+								aria-label='email'
+								type='email'
+								placeholder=translate('enter_your_email_address')
+								required
+								autocomplete='username'
 								autofocus
 							)
 						.actions
 							button.btn.btn-primary.w-100(
-								type='submit',
-								data-ol-disabled-inflight,
+								type='submit'
+								data-ol-disabled-inflight
 								aria-label=translate('request_password_reset_to_reconfirm')
 							)
-								span(data-ol-inflight="idle")
+								span(data-ol-inflight='idle')
 									| #{translate("request_password_reset")}
-								span(hidden data-ol-inflight="pending")
+								span(hidden data-ol-inflight='pending')
 									| #{translate("requesting_password_reset")}…
 					div(hidden data-ol-sent)
 						p.mb-4 #{translate('password_reset_email_sent')}
-						a(href="/login") #{translate('back_to_log_in')}
+						a(href='/login') #{translate('back_to_log_in')}
 
 			if showCaptcha
 				+recaptchaConditions
diff --git a/services/web/app/views/user/primaryEmailCheck-bs5.pug b/services/web/app/views/user/primaryEmailCheck-bs5.pug
index b25136927a..f45f15d0ca 100644
--- a/services/web/app/views/user/primaryEmailCheck-bs5.pug
+++ b/services/web/app/views/user/primaryEmailCheck-bs5.pug
@@ -7,36 +7,36 @@ block vars
 block content
 	main#main-content
 		.auth-aux-container
-			img.w-50.d-block(src=buildImgPath("ol-brand/overleaf.svg") alt=settings.appName)
+			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"
+					action='/user/emails/primary-email-check'
+					method='POST'
 				)
-					input(name='_csrf', type='hidden', value=csrfToken)
-					+formMessagesNewStyle()
+					input(name='_csrf' type='hidden' value=csrfToken)
+					+formMessagesNewStyle
 
-					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")}…
+					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"
+					href='/user/settings#add-email'
 					data-ol-slow-link
-					event-tracking="primary-email-check-change-email"
-					event-tracking-mb="true"
-					event-tracking-trigger="click"
+					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")}…  
+					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")}
+					| #{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' }}])}
+					| !{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/app/views/user/reconfirm-bs5.pug b/services/web/app/views/user/reconfirm-bs5.pug
index fce9a44295..e8e640d10c 100644
--- a/services/web/app/views/user/reconfirm-bs5.pug
+++ b/services/web/app/views/user/reconfirm-bs5.pug
@@ -5,46 +5,50 @@ block vars
 	- isWebsiteRedesign = true
 
 block content
-	- var email = reconfirm_email ? reconfirm_email : ""
+	- var email = reconfirm_email ? reconfirm_email : ''
 	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
 
 	if showCaptcha
-		script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=explicit")
+		script(
+			type='text/javascript'
+			nonce=scriptNonce
+			src='https://www.recaptcha.net/recaptcha/api.js?render=explicit'
+		)
 		div(
-			id="recaptcha"
-			class="g-recaptcha"
+			id='recaptcha'
+			class='g-recaptcha'
 			data-sitekey=settings.recaptcha.siteKey
-			data-size="invisible"
-			data-badge="inline"
+			data-size='invisible'
+			data-badge='inline'
 		)
 
-	main#main-content(data-ol-captcha-retry-trigger-area="")
-		.container.auth-aux-container(style="max-width: 420px;")
+	main#main-content(data-ol-captcha-retry-trigger-area='')
+		.container.auth-aux-container(style='max-width: 420px')
 			form(
+				name='reconfirmAccountForm'
+				captcha-action-name=showCaptcha ? 'passwordReset' : false
 				data-ol-async-form
-				name="reconfirmAccountForm"
-				action="/user/reconfirm"
-				method="POST"
+				action='/user/reconfirm'
+				method='POST'
 				aria-label=translate('request_reconfirmation_email')
-				captcha=(showCaptcha ? '' : false)
-				captcha-action-name=(showCaptcha ? "passwordReset" : false)
+				captcha=showCaptcha ? '' : false
 			)
 				h1.h5.mb-3 #{translate("reconfirm_account")}
 				p #{translate('reconfirm_explained')}
-					| 
+					|
 					a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
 					| .
-				
-				div(data-ol-not-sent)
-					+formMessagesNewStyle()
 
-					input(type="hidden" name="_csrf" value=csrfToken)
+				div(data-ol-not-sent)
+					+formMessagesNewStyle
+
+					input(name='_csrf' type='hidden' value=csrfToken)
 					.form-group.mb-3
 						label.form-label(for='email') #{translate("please_enter_email")}
 						input.form-control(
-							aria-label="email"
-							type='email'
 							name='email'
+							aria-label='email'
+							type='email'
 							placeholder='email@example.com'
 							required
 							autofocus
@@ -52,20 +56,17 @@ block content
 						)
 					.actions
 						button.btn.btn-primary.w-100(
-							style="white-space: normal;"
+							style='white-space: normal'
 							type='submit'
 							data-ol-disabled-inflight
 							aria-label=translate('request_password_reset_to_reconfirm')
 						)
-							span(data-ol-inflight="idle")
+							span(data-ol-inflight='idle')
 								| #{translate('request_password_reset_to_reconfirm')}
-							span(hidden data-ol-inflight="pending")
+							span(hidden data-ol-inflight='pending')
 								| #{translate('request_password_reset_to_reconfirm')}… 
 				div(hidden data-ol-sent)
-					div.alert.alert-success(
-						role="alert"
-						aria-live="polite"
-					)
+					.alert.alert-success(role='alert' aria-live='polite')
 						span #{translate('password_reset_email_sent')}
 
 			if showCaptcha
diff --git a/services/web/app/views/user/reconfirm.pug b/services/web/app/views/user/reconfirm.pug
index 23b77d278d..8cfe2ec218 100644
--- a/services/web/app/views/user/reconfirm.pug
+++ b/services/web/app/views/user/reconfirm.pug
@@ -5,20 +5,24 @@ block vars
 	- bootstrap5PageStatus = 'disabled'
 
 block content
-	- var email = reconfirm_email ? reconfirm_email : ""
+	- var email = reconfirm_email ? reconfirm_email : ''
 	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
 
 	if showCaptcha
-		script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=explicit")
+		script(
+			type='text/javascript'
+			nonce=scriptNonce
+			src='https://www.recaptcha.net/recaptcha/api.js?render=explicit'
+		)
 		div(
-			id="recaptcha"
-			class="g-recaptcha"
+			id='recaptcha'
+			class='g-recaptcha'
 			data-sitekey=settings.recaptcha.siteKey
-			data-size="invisible"
-			data-badge="inline"
+			data-size='invisible'
+			data-badge='inline'
 		)
 
-	main.content.content-alt#main-content(data-ol-captcha-retry-trigger-area="")
+	main#main-content.content.content-alt(data-ol-captcha-retry-trigger-area='')
 		.container
 			.row
 				.col-sm-12.col-md-6.col-md-offset-3
@@ -28,44 +32,41 @@ block content
 							a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
 							| .
 						form(
+							name='reconfirmAccountForm'
+							captcha-action-name=showCaptcha ? 'passwordReset' : false
 							data-ol-async-form
-							name="reconfirmAccountForm"
-							action="/user/reconfirm",
-							method="POST",
+							action='/user/reconfirm'
+							method='POST'
 							aria-label=translate('request_reconfirmation_email')
-							captcha=(showCaptcha ? '' : false),
-							captcha-action-name=(showCaptcha ? "passwordReset" : false)
+							captcha=showCaptcha ? '' : false
 						)
 							div(data-ol-not-sent)
-								+formMessages()
-	
-								input(type="hidden", name="_csrf", value=csrfToken)
+								+formMessages
+
+								input(name='_csrf' type='hidden' value=csrfToken)
 								.form-group
 									label(for='email') #{translate("please_enter_email")}
 									input.form-control(
-										aria-label="email"
-										type='email',
-										name='email',
-										placeholder='email@example.com',
-										required,
+										name='email'
+										aria-label='email'
+										type='email'
+										placeholder='email@example.com'
+										required
 										autofocus
 										value=email
 									)
 								.actions
 									button.btn.btn-primary(
-										type='submit',
-										data-ol-disabled-inflight,
+										type='submit'
+										data-ol-disabled-inflight
 										aria-label=translate('request_password_reset_to_reconfirm')
 									)
-										span(data-ol-inflight="idle")
+										span(data-ol-inflight='idle')
 											| #{translate('request_password_reset_to_reconfirm')}
-										span(hidden data-ol-inflight="pending")
+										span(hidden data-ol-inflight='pending')
 											| #{translate('request_password_reset_to_reconfirm')}… 
 							div(hidden data-ol-sent)
-								div.alert.alert-success(
-									role="alert"
-									aria-live="polite"
-								)
+								.alert.alert-success(role='alert' aria-live='polite')
 									span #{translate('password_reset_email_sent')}
 			.row
 				.col-sm-12.col-md-6.col-md-offset-3
diff --git a/services/web/app/views/user/register.pug b/services/web/app/views/user/register.pug
index c35f3c04f0..8aa40e8b35 100644
--- a/services/web/app/views/user/register.pug
+++ b/services/web/app/views/user/register.pug
@@ -4,7 +4,7 @@ block vars
 	- bootstrap5PageStatus = 'disabled'
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.registration_message
@@ -15,12 +15,12 @@ block content
 							| #{translate("join_sl_to_view_project")}.
 						div
 							| #{translate("already_have_sl_account")}
-							a(href="/login")  #{translate("login_here")}
+							a(href='/login') #{translate("login_here")}
 					else if newTemplateData.templateName !== undefined
 						h1 #{translate("register_to_edit_template", {templateName:newTemplateData.templateName})}
 
 						div #{translate("already_have_sl_account")}
-							a(href="/login")  #{translate("login_here")}
+							a(href='/login') #{translate("login_here")}
 
 			.row
 				.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3
diff --git a/services/web/app/views/user/sessions.pug b/services/web/app/views/user/sessions.pug
index ffd65a3548..744b804687 100644
--- a/services/web/app/views/user/sessions.pug
+++ b/services/web/app/views/user/sessions.pug
@@ -1,15 +1,15 @@
 extends ../layout-marketing
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-lg-10.offset-lg-1.col-xl-8.offset-xl-2
 					.card.clear-user-sessions
 						.card-body
 							.page-header
-								h1  #{translate("your_sessions")}
-	
+								h1 #{translate("your_sessions")}
+
 							if currentSession.ip_address && currentSession.session_created
 								h3 #{translate("current_session")}
 								div
@@ -21,47 +21,43 @@ block content
 											tr
 												td #{currentSession.ip_address}
 												td #{moment(currentSession.session_created).utc().format('Do MMM YYYY, h:mm a')} UTC
-	
+
 							h3 #{translate("other_sessions")}
 							div
 								p.small
 									| !{translate("clear_sessions_description")}
-	
-							form(
-								data-ol-async-form
-								action='/user/sessions/clear'
-								method='POST'
-							)
+
+							form(data-ol-async-form action='/user/sessions/clear' method='POST')
 								input(name='_csrf' type='hidden' value=csrfToken)
 								div(data-ol-not-sent)
 									if sessions.length == 0
 										p.text-center
 											| #{translate("no_other_sessions")}
-	
+
 									if sessions.length > 0
 										table.table.table-striped
 											thead
 												tr
 													th #{translate("ip_address")}
 													th #{translate("session_created_at")}
-											for session in sessions
+											each session in sessions
 												tr
 													td #{session.ip_address}
 													td #{moment(session.session_created).utc().format('Do MMM YYYY, h:mm a')} UTC
-	
+
 										p.actions
 											.text-center
 												button.btn.btn-lg.btn-primary(
-													type="submit"
+													type='submit'
 													data-ol-disable-inflight
 												)
-													span(data-ol-inflight="idle") #{translate('clear_sessions')}
-													span(hidden data-ol-inflight="pending") #{translate("processing")}…
-	
+													span(data-ol-inflight='idle') #{translate('clear_sessions')}
+													span(hidden data-ol-inflight='pending') #{translate("processing")}…
+
 								div(hidden data-ol-sent)
 									p.text-center
 										| #{translate("no_other_sessions")}
-	
+
 									p.text-success.text-center
 										| #{translate('clear_sessions_success')}
 							.page-separator
diff --git a/services/web/app/views/user/setPassword-bs5.pug b/services/web/app/views/user/setPassword-bs5.pug
index 83c3a531bb..5081d22409 100644
--- a/services/web/app/views/user/setPassword-bs5.pug
+++ b/services/web/app/views/user/setPassword-bs5.pug
@@ -7,28 +7,25 @@ block vars
 
 block content
 	main#main-content
-		a.auth-aux-logo(href="/")
-			img(src=buildImgPath("ol-brand/overleaf-o-dark.svg") alt=settings.appName)
+		a.auth-aux-logo(href='/')
+			img(src=buildImgPath('ol-brand/overleaf-o-dark.svg') alt=settings.appName)
 		.auth-aux-container
 			form(
+				name='passwordResetForm'
 				data-ol-async-form
-				name="passwordResetForm"
-				action="/user/password/set"
-				method="POST"
-				data-ol-hide-on-error="token-expired"
+				action='/user/password/set'
+				method='POST'
+				data-ol-hide-on-error='token-expired'
 			)
-				div(
-					hidden
-					data-ol-sent
-				)
+				div(hidden data-ol-sent)
 					h1.h3.mb-3.mt-0 #{translate("password_updated")}
 					p.mb-4 #{translate("your_password_has_been_successfully_changed")}.
 					a.btn.btn-primary.w-100(href='/login') #{translate("log_in_now")}
 
 				div(data-ol-not-sent)
 					h1.h3.mb-3.mt-0 #{translate("reset_your_password")}
-					p(data-ol-hide-on-error-message="token-expired") #{translate("create_a_new_password_for_your_account")}.
-					+formMessagesNewStyle()
+					p(data-ol-hide-on-error-message='token-expired') #{translate("create_a_new_password_for_your_account")}.
+					+formMessagesNewStyle
 
 					+customFormMessageNewStyle('password-contains-email', 'danger')
 						| #{translate('invalid_password_contains_email')}.
@@ -41,18 +38,21 @@ block content
 					+customFormMessageNewStyle('token-expired', 'danger')
 						| #{translate('password_reset_token_expired')}
 						br
-						a(href="/user/password/reset")
+						a(href='/user/password/reset')
 							| #{translate('request_new_password_reset_email')}
 
-					input(type="hidden" name="_csrf" value=csrfToken)
-					input(type="text" hidden name="email" autocomplete="username" value=email)
+					input(name='_csrf' type='hidden' value=csrfToken)
+					input(name='email' type='text' hidden autocomplete='username' value=email)
 
 					.form-group.mb-3
-						label.form-label(for='passwordField', data-ol-hide-on-error-message="token-expired") #{translate("new_password")}
-						input.form-control.auth-aux-new-password#passwordField(
-							type='password'
+						label.form-label(
+							for='passwordField'
+							data-ol-hide-on-error-message='token-expired'
+						) #{translate("new_password")}
+						input#passwordField.form-control.auth-aux-new-password(
 							name='password'
-							autocomplete="new-password"
+							type='password'
+							autocomplete='new-password'
 							autofocus
 							required
 							minlength=settings.passwordStrengthOptions.length.min
@@ -68,12 +68,8 @@ block content
 							| !{translate('password_was_detected_on_a_public_list_of_known_compromised_passwords', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}])}.
 							| #{translate('use_a_different_password')}.
 
-						input(
-							type="hidden"
-							name="passwordResetToken"
-							value=passwordResetToken
-						)
-					div(data-ol-hide-on-error-message="token-expired")
+						input(name='passwordResetToken' type='hidden' value=passwordResetToken)
+					div(data-ol-hide-on-error-message='token-expired')
 						div #{translate('in_order_to_have_a_secure_account_make_sure_your_password')}
 						ul.mb-3.ps-4
 							li #{translate('is_longer_than_n_characters', {n: settings.passwordStrengthOptions.length.min})}
@@ -85,7 +81,7 @@ block content
 							data-ol-disabled-inflight
 							aria-label=translate('set_new_password')
 						) 
-							span(data-ol-inflight="idle")
+							span(data-ol-inflight='idle')
 								| #{translate('set_new_password')}
-							span(hidden data-ol-inflight="pending")
+							span(hidden data-ol-inflight='pending')
 								| #{translate('set_new_password')}…
diff --git a/services/web/app/views/user/setPassword.pug b/services/web/app/views/user/setPassword.pug
index 5da2b6b59a..653bc52045 100644
--- a/services/web/app/views/user/setPassword.pug
+++ b/services/web/app/views/user/setPassword.pug
@@ -4,28 +4,25 @@ block vars
 	- bootstrap5PageStatus = 'disabled'
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container-custom-sm.mx-auto
 			.card
 				form(
-					data-ol-async-form,
-					name="passwordResetForm",
-					action="/user/password/set",
-					method="POST",
-					data-ol-hide-on-error="token-expired"
+					name='passwordResetForm'
+					data-ol-async-form
+					action='/user/password/set'
+					method='POST'
+					data-ol-hide-on-error='token-expired'
 				)
-					div(
-						hidden
-						data-ol-sent
-					)
+					div(hidden data-ol-sent)
 						h3.mt-0.mb-2 #{translate("password_updated")}
 						p.mb-4 #{translate("your_password_has_been_successfully_changed")}.
 						a(href='/login') #{translate("log_in_now")}
 
 					div(data-ol-not-sent)
 						h3.mt-0.mb-2 #{translate("reset_your_password")}
-						p(data-ol-hide-on-error-message="token-expired") #{translate("create_a_new_password_for_your_account")}.
-						+formMessages()
+						p(data-ol-hide-on-error-message='token-expired') #{translate("create_a_new_password_for_your_account")}.
+						+formMessages
 
 						+customFormMessage('password-contains-email', 'danger')
 							| #{translate('invalid_password_contains_email')}.
@@ -38,21 +35,30 @@ block content
 						+customFormMessage('token-expired', 'danger')
 							| #{translate('password_reset_token_expired')}
 							br
-							a(href="/user/password/reset")
+							a(href='/user/password/reset')
 								| #{translate('request_new_password_reset_email')}
 
-						input(type="hidden", name="_csrf", value=csrfToken)
-						input(type="text" hidden name="email" autocomplete="username" value=email)
+						input(name='_csrf' type='hidden' value=csrfToken)
+						input(
+							name='email'
+							type='text'
+							hidden
+							autocomplete='username'
+							value=email
+						)
 
 						.form-group
-							label(for='passwordField', data-ol-hide-on-error-message="token-expired") #{translate("new_password")}
-							input.form-control#passwordField(
-								type='password',
-								name='password',
-								placeholder=translate("enter_your_new_password"),
-								autocomplete="new-password",
-								autofocus,
-								required,
+							label(
+								for='passwordField'
+								data-ol-hide-on-error-message='token-expired'
+							) #{translate("new_password")}
+							input#passwordField.form-control(
+								name='password'
+								type='password'
+								placeholder=translate('enter_your_new_password')
+								autocomplete='new-password'
+								autofocus
+								required
 								minlength=settings.passwordStrengthOptions.length.min
 							)
 
@@ -66,12 +72,8 @@ block content
 								| !{translate('password_was_detected_on_a_public_list_of_known_compromised_passwords', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}])}.
 								| #{translate('use_a_different_password')}.
 
-							input(
-								type="hidden",
-								name="passwordResetToken",
-								value=passwordResetToken
-							)
-						div(data-ol-hide-on-error-message="token-expired")
+							input(name='passwordResetToken' type='hidden' value=passwordResetToken)
+						div(data-ol-hide-on-error-message='token-expired')
 							div #{translate('in_order_to_have_a_secure_account_make_sure_your_password')}
 							ul.mb-4.ps-4
 								li #{translate('is_longer_than_n_characters', {n: settings.passwordStrengthOptions.length.min})}
@@ -79,11 +81,11 @@ block content
 								li #{translate('is_not_used_on_any_other_website')}
 						.actions
 							button.btn.btn-primary.w-100(
-								type='submit',
+								type='submit'
 								data-ol-disabled-inflight
 								aria-label=translate('set_new_password')
 							) 
-								span(data-ol-inflight="idle")
+								span(data-ol-inflight='idle')
 									| #{translate('set_new_password')}
-								span(hidden data-ol-inflight="pending")
+								span(hidden data-ol-inflight='pending')
 									| #{translate('set_new_password')}… 
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index 4ac35bef71..dc63e27abe 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -2,38 +2,65 @@ extends ../layout-react
 
 block entrypointVar
 	- entrypoint = 'pages/user/settings'
-		
+
 block vars
 	- isWebsiteRedesign = true
 
 block append meta
-	meta(name="ol-hasPassword" data-type="boolean" content=hasPassword)
-	meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails)
-	meta(name="ol-oauthProviders", data-type="json", content=oauthProviders)
-	meta(name="ol-institutionLinked", data-type="json", content=institutionLinked)
-	meta(name="ol-samlError", data-type="json", content=samlError)
-	meta(name="ol-institutionEmailNonCanonical", content=institutionEmailNonCanonical)
+	meta(name='ol-hasPassword' data-type='boolean' content=hasPassword)
+	meta(
+		name='ol-shouldAllowEditingDetails'
+		data-type='boolean'
+		content=shouldAllowEditingDetails
+	)
+	meta(name='ol-oauthProviders' data-type='json' content=oauthProviders)
+	meta(name='ol-institutionLinked' data-type='json' content=institutionLinked)
+	meta(name='ol-samlError' data-type='json' content=samlError)
+	meta(
+		name='ol-institutionEmailNonCanonical'
+		content=institutionEmailNonCanonical
+	)
 
-	meta(name="ol-reconfirmedViaSAML", content=reconfirmedViaSAML)
-	meta(name="ol-reconfirmationRemoveEmail", content=reconfirmationRemoveEmail)
-	meta(name="ol-samlBeta", content=samlBeta)
-	meta(name="ol-ssoErrorMessage", content=ssoErrorMessage)
-	meta(name="ol-thirdPartyIds", data-type="json", content=thirdPartyIds || {})
-	meta(name="ol-passwordStrengthOptions", data-type="json", content=settings.passwordStrengthOptions || {})
-	meta(name="ol-isExternalAuthenticationSystemUsed" data-type="boolean" content=externalAuthenticationSystemUsed())
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-labsExperiments" data-type="json" content=labsExperiments)
-	meta(name="ol-dropbox" data-type="json" content=dropbox)
-	meta(name="ol-github" data-type="json" content=github)
-	meta(name="ol-projectSyncSuccessMessage", content=projectSyncSuccessMessage)
-	meta(name="ol-personalAccessTokens", data-type="json" content=personalAccessTokens)
-	meta(name="ol-emailAddressLimit", data-type="json", content=emailAddressLimit)
-	meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail)
-	meta(name="ol-gitBridgeEnabled" data-type="boolean" content=gitBridgeEnabled)
-	meta(name="ol-isSaas" data-type="boolean" content=isSaas)
-	meta(name="ol-memberOfSSOEnabledGroups" data-type="json" content=memberOfSSOEnabledGroups)
-	meta(name="ol-capabilities" data-type="json" content=capabilities)
+	meta(name='ol-reconfirmedViaSAML' content=reconfirmedViaSAML)
+	meta(name='ol-reconfirmationRemoveEmail' content=reconfirmationRemoveEmail)
+	meta(name='ol-samlBeta' content=samlBeta)
+	meta(name='ol-ssoErrorMessage' content=ssoErrorMessage)
+	meta(name='ol-thirdPartyIds' data-type='json' content=thirdPartyIds || {})
+	meta(
+		name='ol-passwordStrengthOptions'
+		data-type='json'
+		content=settings.passwordStrengthOptions || {}
+	)
+	meta(
+		name='ol-isExternalAuthenticationSystemUsed'
+		data-type='boolean'
+		content=externalAuthenticationSystemUsed()
+	)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-labsExperiments' data-type='json' content=labsExperiments)
+	meta(name='ol-dropbox' data-type='json' content=dropbox)
+	meta(name='ol-github' data-type='json' content=github)
+	meta(name='ol-projectSyncSuccessMessage' content=projectSyncSuccessMessage)
+	meta(
+		name='ol-personalAccessTokens'
+		data-type='json'
+		content=personalAccessTokens
+	)
+	meta(name='ol-emailAddressLimit' data-type='json' content=emailAddressLimit)
+	meta(
+		name='ol-currentManagedUserAdminEmail'
+		data-type='string'
+		content=currentManagedUserAdminEmail
+	)
+	meta(name='ol-gitBridgeEnabled' data-type='boolean' content=gitBridgeEnabled)
+	meta(name='ol-isSaas' data-type='boolean' content=isSaas)
+	meta(
+		name='ol-memberOfSSOEnabledGroups'
+		data-type='json'
+		content=memberOfSSOEnabledGroups
+	)
+	meta(name='ol-capabilities' data-type='json' content=capabilities)
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		#settings-page-root
diff --git a/services/web/app/views/user_membership/group-managers-react.pug b/services/web/app/views/user_membership/group-managers-react.pug
index d227a7a511..34414ddbf2 100644
--- a/services/web/app/views/user_membership/group-managers-react.pug
+++ b/services/web/app/views/user_membership/group-managers-react.pug
@@ -4,10 +4,10 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/group-managers'
 
 block append meta
-	meta(name="ol-user", data-type="json", content=user)
-	meta(name="ol-users", data-type="json", content=users)
-	meta(name="ol-groupId", data-type="string", content=groupId)
-	meta(name="ol-groupName", data-type="string", content=name)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-users' data-type='json' content=users)
+	meta(name='ol-groupId' data-type='string' content=groupId)
+	meta(name='ol-groupName' data-type='string' content=name)
 
 block content
-	main.content.content-alt#subscription-manage-group-root
+	main#subscription-manage-group-root.content.content-alt
diff --git a/services/web/app/views/user_membership/group-members-react.pug b/services/web/app/views/user_membership/group-members-react.pug
index 05327c4b6d..4020ebdf58 100644
--- a/services/web/app/views/user_membership/group-members-react.pug
+++ b/services/web/app/views/user_membership/group-members-react.pug
@@ -2,18 +2,34 @@ extends ../layout-react
 
 block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/group-members'
-		
+
 block append meta
-	meta(name="ol-user", data-type="json", content=user)
-	meta(name="ol-users", data-type="json", content=users)
-	meta(name="ol-groupId", data-type="string", content=groupId)
-	meta(name="ol-groupName", data-type="string", content=name)
-	meta(name="ol-groupSize", data-type="json", content=groupSize)
-	meta(name="ol-managedUsersActive", data-type="boolean", content=managedUsersActive)
-	meta(name="ol-isUserGroupManager", data-type="boolean", content=isUserGroupManager)
-	meta(name="ol-groupSSOActive", data-type="boolean", content=groupSSOActive)
-	meta(name="ol-canUseFlexibleLicensing", data-type="boolean", content=canUseFlexibleLicensing)
-	meta(name="ol-canUseAddSeatsFeature", data-type="boolean", content=canUseAddSeatsFeature)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-users' data-type='json' content=users)
+	meta(name='ol-groupId' data-type='string' content=groupId)
+	meta(name='ol-groupName' data-type='string' content=name)
+	meta(name='ol-groupSize' data-type='json' content=groupSize)
+	meta(
+		name='ol-managedUsersActive'
+		data-type='boolean'
+		content=managedUsersActive
+	)
+	meta(
+		name='ol-isUserGroupManager'
+		data-type='boolean'
+		content=isUserGroupManager
+	)
+	meta(name='ol-groupSSOActive' data-type='boolean' content=groupSSOActive)
+	meta(
+		name='ol-canUseFlexibleLicensing'
+		data-type='boolean'
+		content=canUseFlexibleLicensing
+	)
+	meta(
+		name='ol-canUseAddSeatsFeature'
+		data-type='boolean'
+		content=canUseAddSeatsFeature
+	)
 
 block content
-	main.content.content-alt#subscription-manage-group-root
+	main#subscription-manage-group-root.content.content-alt
diff --git a/services/web/app/views/user_membership/institution-managers-react.pug b/services/web/app/views/user_membership/institution-managers-react.pug
index ee62fcd430..9793058f6f 100644
--- a/services/web/app/views/user_membership/institution-managers-react.pug
+++ b/services/web/app/views/user_membership/institution-managers-react.pug
@@ -4,10 +4,10 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/institution-managers'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-users", data-type="json", content=users)
-	meta(name="ol-groupId", data-type="string", content=groupId)
-	meta(name="ol-groupName", data-type="string", content=name)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-users' data-type='json' content=users)
+	meta(name='ol-groupId' data-type='string' content=groupId)
+	meta(name='ol-groupName' data-type='string' content=name)
 
 block content
-	main.content.content-alt#subscription-manage-group-root
+	main#subscription-manage-group-root.content.content-alt
diff --git a/services/web/app/views/user_membership/new.pug b/services/web/app/views/user_membership/new.pug
index c59837b107..4e52ea160a 100644
--- a/services/web/app/views/user_membership/new.pug
+++ b/services/web/app/views/user_membership/new.pug
@@ -4,20 +4,13 @@ block vars
 	- bootstrap5PageStatus = 'disabled'
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
 			.row
 				.col-md-10.col-md-offset-1
 					h3 #{entityName} "#{entityId}" does not exists in v2
-					form(
-						data-ol-regular-form
-						method='post',
-						action=''
-					)
-						input(name="_csrf", type="hidden", value=csrfToken)
-						button.btn.btn-primary(
-							type="submit",
-							data-ol-disabled-inflight
-						)
-							span(data-ol-inflight="idle") Create #{entityName} in v2
-							span(hidden data-ol-inflight="pending") #{translate("creating")}…
+					form(data-ol-regular-form method='post' action='')
+						input(name='_csrf' type='hidden' value=csrfToken)
+						button.btn.btn-primary(type='submit' data-ol-disabled-inflight)
+							span(data-ol-inflight='idle') Create #{entityName} in v2
+							span(hidden data-ol-inflight='pending') #{translate("creating")}…
diff --git a/services/web/app/views/user_membership/publisher-managers-react.pug b/services/web/app/views/user_membership/publisher-managers-react.pug
index a956e30c35..2f805079a7 100644
--- a/services/web/app/views/user_membership/publisher-managers-react.pug
+++ b/services/web/app/views/user_membership/publisher-managers-react.pug
@@ -4,10 +4,10 @@ block entrypointVar
 	- entrypoint = 'pages/user/subscription/group-management/publisher-managers'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
-	meta(name="ol-users", data-type="json", content=users)
-	meta(name="ol-groupId", data-type="string", content=groupId)
-	meta(name="ol-groupName", data-type="string", content=name)
+	meta(name='ol-user' data-type='json' content=user)
+	meta(name='ol-users' data-type='json' content=users)
+	meta(name='ol-groupId' data-type='string' content=groupId)
+	meta(name='ol-groupName' data-type='string' content=name)
 
 block content
-	main.content.content-alt#subscription-manage-group-root
+	main#subscription-manage-group-root.content.content-alt
diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug
index fdf0576c4a..ff917eeb74 100644
--- a/services/web/modules/launchpad/app/views/launchpad.pug
+++ b/services/web/modules/launchpad/app/views/launchpad.pug
@@ -2,39 +2,43 @@ extends ../../../../app/views/layout-marketing
 
 mixin launchpad-check(section)
 	div(data-ol-launchpad-check=section)
-		span(data-ol-inflight="pending")
+		span(data-ol-inflight='pending')
 			i.fa.fa-fw.fa-spinner.fa-spin
 			span &nbsp;#{translate('checking')}
-	
-		span(hidden data-ol-inflight="idle")
-			div(data-ol-result="success")
+
+		span(hidden data-ol-inflight='idle')
+			div(data-ol-result='success')
 				i.fa.fa-check
 				span &nbsp;#{translate('ok')}
 				button.btn.btn-inline-link
 					span.text-danger &nbsp;#{translate('retry')}
-			div(hidden data-ol-result="error")
+			div(hidden data-ol-result='error')
 				i.fa.fa-exclamation
 				span &nbsp;#{translate('error')}
 				button.btn.btn-inline-link
 					span.text-danger &nbsp;#{translate('retry')}
-				div.alert.alert-danger
+				.alert.alert-danger
 					span(data-ol-error)
 
 block entrypointVar
 	- entrypoint = 'modules/launchpad/pages/launchpad'
-					
+
 block vars
 	- metadata = metadata || {}
 	- bootstrap5PageStatus = 'disabled'
 
 block append meta
-	meta(name="ol-adminUserExists" data-type="boolean" content=adminUserExists)
-	meta(name="ol-ideJsPath" content=buildJsPath('ide.js'))
+	meta(name='ol-adminUserExists' data-type='boolean' content=adminUserExists)
+	meta(name='ol-ideJsPath' content=buildJsPath('ide.js'))
 
 block content
-	script(type="text/javascript", nonce=scriptNonce, src=(wsUrl || '/socket.io') + '/socket.io.js')
+	script(
+		type='text/javascript'
+		nonce=scriptNonce
+		src=(wsUrl || '/socket.io') + '/socket.io.js'
+	)
 
-	.content.content-alt#main-content
+	#main-content.content.content-alt
 		.container
 			.row
 				.col-md-8.col-md-offset-2
@@ -49,8 +53,6 @@ block content
 						<!-- wrapper -->
 						.row
 							.col-md-8.col-md-offset-2
-
-
 								<!-- create first admin form -->
 								if !adminUserExists
 									.row(data-ol-not-sent)
@@ -62,37 +64,34 @@ block content
 												form(
 													data-ol-async-form
 													data-ol-register-admin
-													action="/launchpad/register_admin"
-													method="POST"
+													action='/launchpad/register_admin'
+													method='POST'
 												)
-													input(name='_csrf', type='hidden', value=csrfToken)
-													+formMessages()
+													input(name='_csrf' type='hidden' value=csrfToken)
+													+formMessages
 													.form-group
 														label(for='email') #{translate("email")}
 														input.form-control(
-															type='email',
-															name='email',
-															placeholder="email@example.com"
-															autocomplete="username"
-															required,
-															autofocus="true"
+															name='email'
+															type='email'
+															placeholder='email@example.com'
+															autocomplete='username'
+															required
+															autofocus='true'
 														)
 													.form-group
 														label(for='password') #{translate("password")}
-														input.form-control#passwordField(
-															type='password',
-															name='password',
-															placeholder="********",
-															autocomplete="new-password"
-															required,
+														input#passwordField.form-control(
+															name='password'
+															type='password'
+															placeholder='********'
+															autocomplete='new-password'
+															required
 														)
 													.actions
-														button.btn-primary.btn(
-															type='submit'
-															data-ol-disabled-inflight
-														)
-															span(data-ol-inflight="idle") #{translate("register")}
-															span(hidden data-ol-inflight="pending") #{translate("registering")}…
+														button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+															span(data-ol-inflight='idle') #{translate("register")}
+															span(hidden data-ol-inflight='pending') #{translate("registering")}…
 
 											// Ldap Form
 											if authMethod === 'ldap'
@@ -103,28 +102,25 @@ block content
 												form(
 													data-ol-async-form
 													data-ol-register-admin
-													action="/launchpad/register_ldap_admin"
-													method="POST"
+													action='/launchpad/register_ldap_admin'
+													method='POST'
 												)
-													input(name='_csrf', type='hidden', value=csrfToken)
-													+formMessages()
+													input(name='_csrf' type='hidden' value=csrfToken)
+													+formMessages
 													.form-group
 														label(for='email') #{translate("email")}
 														input.form-control(
-															type='email',
-															name='email',
-															placeholder="email@example.com"
-															autocomplete="username"
-															required,
-															autofocus="true"
+															name='email'
+															type='email'
+															placeholder='email@example.com'
+															autocomplete='username'
+															required
+															autofocus='true'
 														)
 													.actions
-														button.btn-primary.btn(
-															type='submit'
-															data-ol-disabled-inflight
-														)
-															span(data-ol-inflight="idle") #{translate("register")}
-															span(hidden data-ol-inflight="pending") #{translate("registering")}…
+														button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+															span(data-ol-inflight='idle') #{translate("register")}
+															span(hidden data-ol-inflight='pending') #{translate("registering")}…
 
 											// Saml Form
 											if authMethod === 'saml'
@@ -135,28 +131,25 @@ block content
 												form(
 													data-ol-async-form
 													data-ol-register-admin
-													action="/launchpad/register_saml_admin"
-													method="POST"
+													action='/launchpad/register_saml_admin'
+													method='POST'
 												)
-													input(name='_csrf', type='hidden', value=csrfToken)
-													+formMessages()
+													input(name='_csrf' type='hidden' value=csrfToken)
+													+formMessages
 													.form-group
 														label(for='email') #{translate("email")}
 														input.form-control(
-															type='email',
-															name='email',
-															placeholder="email@example.com"
-															autocomplete="username"
-															required,
-															autofocus="true"
+															name='email'
+															type='email'
+															placeholder='email@example.com'
+															autocomplete='username'
+															required
+															autofocus='true'
 														)
 													.actions
-														button.btn-primary.btn(
-															type='submit'
-															data-ol-disabled-inflight
-														)
-															span(data-ol-inflight="idle") #{translate("register")}
-															span(hidden data-ol-inflight="pending") #{translate("registering")}…
+														button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+															span(data-ol-inflight='idle') #{translate("register")}
+															span(hidden data-ol-inflight='pending') #{translate("registering")}…
 
 									br
 
@@ -164,7 +157,6 @@ block content
 								if adminUserExists
 									.row
 										.col-md-12.status-indicators
-
 											h2 #{translate('status_checks')}
 
 											<!-- websocket -->
@@ -185,42 +177,31 @@ block content
 											h3 #{translate('send_test_email')}
 											form.form(
 												data-ol-async-form
-												action="/launchpad/send_test_email"
-												method="POST"
+												action='/launchpad/send_test_email'
+												method='POST'
 											)
 												.form-group
-													label(for="email") Email
-													input.form-control(
-														type="text"
-														id="email"
-														name="email"
-														required
-													)
-												button.btn-primary.btn(
-													type='submit'
-													data-ol-disabled-inflight
-												)
-													span(data-ol-inflight="idle") #{translate("send")}
-													span(hidden data-ol-inflight="pending") #{translate("sending")}…
+													label(for='email') Email
+													input.form-control(name='email' type='text' id='email' required)
+												button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+													span(data-ol-inflight='idle') #{translate("send")}
+													span(hidden data-ol-inflight='pending') #{translate("sending")}…
 
 												p
-													+formMessages()
-
-
+													+formMessages
 
 									<!-- break -->
 									hr.thin
 
-
 									<!-- Go to app -->
 									.row
 										.col-md-12
 											.text-center
 												br
 												p
-													a(href="/admin").btn.btn-info
+													a.btn.btn-info(href='/admin')
 														| Go To Admin Panel
 													| &nbsp;
-													a(href="/project").btn.btn-primary
+													a.btn.btn-primary(href='/project')
 														| Start Using #{settings.appName}
 												br
diff --git a/services/web/modules/user-activate/app/views/user/activate.pug b/services/web/modules/user-activate/app/views/user/activate.pug
index deebe0b08a..82671f90a7 100644
--- a/services/web/modules/user-activate/app/views/user/activate.pug
+++ b/services/web/modules/user-activate/app/views/user/activate.pug
@@ -6,14 +6,14 @@ block vars
 include ../../../../../app/views/_mixins/material_symbol
 
 block content
-	main.content.content-alt#main-content
+	main#main-content.content.content-alt
 		.container
-			div.col-lg-6.col-xl-4.m-auto
+			.col-lg-6.col-xl-4.m-auto
 				.notification-list
-					.notification.notification-type-success(aria-live="off" role="alert")
+					.notification.notification-type-success(aria-live='off' role='alert')
 						.notification-content-and-cta
 							.notification-icon
-								+material-symbol("check_circle")
+								+material-symbol('check_circle')
 							.notification-content
 								p
 									| #{translate("nearly_activated")}
@@ -21,12 +21,12 @@ block content
 				h1.h3 #{translate("please_set_a_password")}
 
 				form(
+					name='activationForm'
 					data-ol-async-form
-					name="activationForm",
-					action="/user/password/set",
-					method="POST",
+					action='/user/password/set'
+					method='POST'
 				)
-					+formMessages()
+					+formMessages
 
 					+customFormMessage('token-expired', 'danger')
 						| #{translate("activation_token_expired")}
@@ -34,43 +34,39 @@ block content
 					+customFormMessage('invalid-password', 'danger')
 						| #{translate('invalid_password')}
 
-					input(name='_csrf', type='hidden', value=csrfToken)
-					input(
-						type="hidden",
-						name="passwordResetToken",
-						value=token
-					)
+					input(name='_csrf' type='hidden' value=csrfToken)
+					input(name='passwordResetToken' type='hidden' value=token)
 
 					.form-group
 						label(for='emailField') #{translate("email")}
-						input.form-control#emailField(
-							aria-label="email",
-							type='email',
-							name='email',
-							placeholder="email@example.com",
-							autocomplete="username"
+						input#emailField.form-control(
+							name='email'
+							aria-label='email'
+							type='email'
+							placeholder='email@example.com'
+							autocomplete='username'
 							value=email
-							required,
+							required
 							disabled
 						)
 					.form-group
 						label(for='passwordField') #{translate("password")}
-						input.form-control#passwordField(
-							type='password',
-							name='password',
-							placeholder="********",
-							autocomplete="new-password",
-							autofocus,
-							required,
+						input#passwordField.form-control(
+							name='password'
+							type='password'
+							placeholder='********'
+							autocomplete='new-password'
+							autofocus
+							required
 							minlength=settings.passwordStrengthOptions.length.min
 						)
 					.actions
 						button.btn.btn-primary(
-							type='submit',
+							type='submit'
 							data-ol-disabled-inflight
 							aria-label=translate('activate')
 						)
-							span(data-ol-inflight="idle")
+							span(data-ol-inflight='idle')
 								| #{translate('activate')}
-							span(hidden data-ol-inflight="pending")
+							span(hidden data-ol-inflight='pending')
 								| #{translate('activating')}…
diff --git a/services/web/modules/user-activate/app/views/user/register.pug b/services/web/modules/user-activate/app/views/user/register.pug
index 0f3e5f2f91..27e6f8215c 100644
--- a/services/web/modules/user-activate/app/views/user/register.pug
+++ b/services/web/modules/user-activate/app/views/user/register.pug
@@ -4,9 +4,9 @@ block entrypointVar
 	- entrypoint = 'modules/user-activate/pages/user-activate-page'
 
 block append meta
-	meta(name="ol-user" data-type="json" content=user)
+	meta(name='ol-user' data-type='json' content=user)
 
 block content
-	.content.content-alt#main-content
+	#main-content.content.content-alt
 		.container
 			#user-activate-register-container
diff --git a/services/web/package.json b/services/web/package.json
index 59825e0e68..bdc42673bb 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -28,6 +28,8 @@
     "format:fix": "prettier --write $PWD/'**/*.{js,jsx,mjs,ts,tsx,json}'",
     "format:styles": "prettier --list-different $PWD/'**/*.{css,less,scss}'",
     "format:styles:fix": "prettier --write $PWD/'**/*.{css,less,scss}'",
+    "format:pug": "prettier --list-different $PWD/'**/*.pug'",
+    "format:pug:fix": "prettier --write $PWD/'**/*.pug'",
     "lint": "eslint --max-warnings 0 --format unix --ext .js,.jsx,.mjs,.ts,.tsx .",
     "lint:fix": "eslint --fix --ext .js,.jsx,.mjs,.ts,.tsx .",
     "lint:styles": "stylelint '**/*.scss'",
@@ -209,6 +211,7 @@
     "@pollyjs/adapter-node-http": "^6.0.6",
     "@pollyjs/core": "^6.0.6",
     "@pollyjs/persister-fs": "^6.0.6",
+    "@prettier/plugin-pug": "^3.4.0",
     "@replit/codemirror-emacs": "overleaf/codemirror-emacs#4394c03858f27053f8768258e9493866e06e938e",
     "@replit/codemirror-indentation-markers": "overleaf/codemirror-indentation-markers#78264032eb286bc47871569ae87bff5ca1c6c161",
     "@replit/codemirror-vim": "overleaf/codemirror-vim#1bef138382d948018f3f9b8a4d7a70ab61774e4b",

From 46555d27b07a9985fe6c569a2f3a644d400568a0 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Mon, 23 Jun 2025 11:09:08 +0200
Subject: [PATCH 013/274] [web] Add `window.` prefix to globals and add
 `no-restricted-globals` rule (#26422)

* Add `no-restricted-globals` eslint rule

Co-authored-by: Rebeka <rebeka.dekany@overleaf.com>

* Change `self` to `window.self`

* Change `innerWidth` to `window.innerWidth`

* Change `confirm` to `window.confirm`

* Change `location` to `window.location`

* Use `location` from `useLocation` hook

* Use location from useLocation hook
Co-authored-by: Antoine <antoine.clausse@overleaf.com>

* Disable no-restricted-globals eslint rule for use of 'self'

* Use `confusing-browser-globals` from npm

* Prevent unexpected globals in workers, using `no-undef`

* Use `self` as a global in workers

* Use unexpected globals in workers, using `no-restricted-globals` in workers

---------

Co-authored-by: Rebeka <rebeka.dekany@overleaf.com>
Co-authored-by: Rebeka <o.dekany@gmail.com>
GitOrigin-RevId: 526986799f5f2edf53c7d978fa85c1e98189565f
---
 package-lock.json                             | 22 +++++++++++++++++++
 services/web/.eslintrc.js                     | 17 ++++++++++++++
 .../emails/add-secondary-email-prompt.tsx     |  2 ++
 .../components/emails/confirm-email-form.tsx  |  2 ++
 .../components/sharing-updates-root.tsx       |  8 ++++---
 .../js/infrastructure/error-reporter.ts       |  2 +-
 services/web/package.json                     |  2 ++
 7 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53388a5732..c38221dd63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18024,6 +18024,13 @@
         "proto-list": "~1.2.1"
       }
     },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/connect-flash": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz",
@@ -45366,6 +45373,7 @@
         "chartjs-plugin-datalabels": "^2.2.0",
         "cheerio": "^1.0.0-rc.3",
         "classnames": "^2.2.6",
+        "confusing-browser-globals": "^1.0.11",
         "cookie-signature": "^1.2.1",
         "copy-webpack-plugin": "^11.0.0",
         "core-js": "^3.41.0",
@@ -45392,6 +45400,7 @@
         "formik": "^2.2.9",
         "fuse.js": "^3.0.0",
         "glob": "^7.1.6",
+        "globals": "^16.2.0",
         "handlebars": "^4.7.8",
         "handlebars-loader": "^1.7.3",
         "html-webpack-plugin": "^5.5.3",
@@ -46342,6 +46351,19 @@
         "node": ">=18.11.0"
       }
     },
+    "services/web/node_modules/globals": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz",
+      "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "services/web/node_modules/google-auth-library": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.7.0.tgz",
diff --git a/services/web/.eslintrc.js b/services/web/.eslintrc.js
index ef3cf11de5..7dd154c942 100644
--- a/services/web/.eslintrc.js
+++ b/services/web/.eslintrc.js
@@ -1,3 +1,7 @@
+const _ = require('lodash')
+const confusingBrowserGlobals = require('confusing-browser-globals')
+const globals = require('globals')
+
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
@@ -19,6 +23,7 @@ module.exports = {
   },
   rules: {
     'no-constant-binary-expression': 'error',
+    'no-restricted-globals': ['error', ...confusingBrowserGlobals],
 
     // do not allow importing of implicit dependencies.
     'import/no-extraneous-dependencies': 'error',
@@ -531,5 +536,17 @@ module.exports = {
         'no-console': 'error',
       },
     },
+    {
+      files: ['**/*.worker.{js,ts}'],
+      rules: {
+        'no-restricted-globals': [
+          'error',
+          ..._.difference(
+            Object.keys({ ...globals.browser, ...globals.node }),
+            Object.keys(globals.worker)
+          ),
+        ],
+      },
+    },
   ],
 }
diff --git a/services/web/frontend/js/features/settings/components/emails/add-secondary-email-prompt.tsx b/services/web/frontend/js/features/settings/components/emails/add-secondary-email-prompt.tsx
index 04bc4edbd1..8355138a14 100644
--- a/services/web/frontend/js/features/settings/components/emails/add-secondary-email-prompt.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/add-secondary-email-prompt.tsx
@@ -8,6 +8,7 @@ import MaterialIcon from '@/shared/components/material-icon'
 import { sendMB } from '@/infrastructure/event-tracking'
 import { ReCaptcha2 } from '../../../../shared/components/recaptcha-2'
 import { useRecaptcha } from '../../../../shared/hooks/use-recaptcha'
+import { useLocation } from '@/shared/hooks/use-location'
 
 import { postJSON } from '../../../../infrastructure/fetch-json'
 import RecaptchaConditions from '@/shared/components/recaptcha-conditions'
@@ -25,6 +26,7 @@ export function AddSecondaryEmailPrompt() {
   const [error, setError] = useState<AddSecondaryEmailError | undefined>()
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false)
   const { ref: recaptchaRef, getReCaptchaToken } = useRecaptcha()
+  const location = useLocation()
 
   if (!isReady) {
     return null
diff --git a/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx b/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx
index d82a43315c..bf08b5dcfd 100644
--- a/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx
@@ -9,6 +9,7 @@ import MaterialIcon from '@/shared/components/material-icon'
 import { sendMB } from '@/infrastructure/event-tracking'
 import OLFormLabel from '@/features/ui/components/ol/ol-form-label'
 import OLButton from '@/features/ui/components/ol/ol-button'
+import { useLocation } from '@/shared/hooks/use-location'
 
 type Feedback = {
   type: 'input' | 'alert'
@@ -267,6 +268,7 @@ function ConfirmEmailSuccessfullForm({
   successButtonText: string
   redirectTo: string
 }) {
+  const location = useLocation()
   const submitHandler = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault()
     location.assign(redirectTo)
diff --git a/services/web/frontend/js/features/token-access/components/sharing-updates-root.tsx b/services/web/frontend/js/features/token-access/components/sharing-updates-root.tsx
index e7b0d96c2a..ade94ba304 100644
--- a/services/web/frontend/js/features/token-access/components/sharing-updates-root.tsx
+++ b/services/web/frontend/js/features/token-access/components/sharing-updates-root.tsx
@@ -12,6 +12,7 @@ import { sendMB } from '@/infrastructure/event-tracking'
 
 import LeaveProjectModal from './leave-project-modal'
 import OLButton from '@/features/ui/components/ol/ol-button'
+import { useLocation } from '@/shared/hooks/use-location'
 
 function SharingUpdatesRoot() {
   const [showModal, setShowModal] = useState(false)
@@ -20,6 +21,7 @@ function SharingUpdatesRoot() {
   const { isLoading, isSuccess, isError, runAsync } = useAsync()
   const projectId = getMeta('ol-project_id')
 
+  const location = useLocation()
   const joinProject = useCallback(() => {
     sendMB('notification-click', {
       name: 'link-sharing-collaborator',
@@ -30,7 +32,7 @@ function SharingUpdatesRoot() {
         location.assign(`/project/${projectId}`)
       })
       .catch(debugConsole.error)
-  }, [runAsync, projectId])
+  }, [runAsync, projectId, location])
 
   const viewProject = useCallback(() => {
     sendMB('notification-click', {
@@ -42,7 +44,7 @@ function SharingUpdatesRoot() {
         location.assign(`/project/${projectId}`)
       })
       .catch(debugConsole.error)
-  }, [runAsync, projectId])
+  }, [runAsync, projectId, location])
 
   const leaveProject = useCallback(() => {
     sendMB('notification-click', {
@@ -54,7 +56,7 @@ function SharingUpdatesRoot() {
         location.assign('/project')
       })
       .catch(debugConsole.error)
-  }, [runAsync, projectId])
+  }, [runAsync, projectId, location])
 
   if (!isReady) {
     return null
diff --git a/services/web/frontend/js/infrastructure/error-reporter.ts b/services/web/frontend/js/infrastructure/error-reporter.ts
index 5d5734535a..e70833860c 100644
--- a/services/web/frontend/js/infrastructure/error-reporter.ts
+++ b/services/web/frontend/js/infrastructure/error-reporter.ts
@@ -78,7 +78,7 @@ function sentryReporter() {
               const refererUrl = new URL(event.request.headers.Referer)
 
               if (
-                refererUrl.hostname === location.hostname &&
+                refererUrl.hostname === window.location.hostname &&
                 refererUrl.pathname.startsWith('/read/')
               ) {
                 refererUrl.pathname = '/read/'
diff --git a/services/web/package.json b/services/web/package.json
index bdc42673bb..d946c62151 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -278,6 +278,7 @@
     "chartjs-plugin-datalabels": "^2.2.0",
     "cheerio": "^1.0.0-rc.3",
     "classnames": "^2.2.6",
+    "confusing-browser-globals": "^1.0.11",
     "cookie-signature": "^1.2.1",
     "copy-webpack-plugin": "^11.0.0",
     "core-js": "^3.41.0",
@@ -304,6 +305,7 @@
     "formik": "^2.2.9",
     "fuse.js": "^3.0.0",
     "glob": "^7.1.6",
+    "globals": "^16.2.0",
     "handlebars": "^4.7.8",
     "handlebars-loader": "^1.7.3",
     "html-webpack-plugin": "^5.5.3",

From 2d5a3efc128b0222296dbe6474396d69bdd73b50 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Mon, 23 Jun 2025 11:09:26 +0200
Subject: [PATCH 014/274] [web] Add compilation indicator favicon (#25990)

* Import changes from Hackathon

https://github.com/overleaf/internal/pull/24501

* Update compile status: allow errors

* Update favicons. Use the ones from Figma

* Optimize and reuse path from favicon.svg

* Clear status favicon after 5s on active tab

* Rename hook from useCompileNotification to useStatusFavicon

* Add tests

* Revert changes to favicon.svg

* Query favicon on document.head

GitOrigin-RevId: 3972b1981abaf6c80273e0ed5b1bc05eb51bd689
---
 .../ide-react/components/layout/ide-page.tsx  |   2 +
 .../ide-react/hooks/use-status-favicon.ts     |  75 ++++++++++
 services/web/public/favicon-compiled.svg      |   9 ++
 services/web/public/favicon-compiling.svg     |   9 ++
 services/web/public/favicon-error.svg         |   9 ++
 .../ide-react/unit/use-status-favicon.test.ts | 131 ++++++++++++++++++
 6 files changed, 235 insertions(+)
 create mode 100644 services/web/frontend/js/features/ide-react/hooks/use-status-favicon.ts
 create mode 100644 services/web/public/favicon-compiled.svg
 create mode 100644 services/web/public/favicon-compiling.svg
 create mode 100644 services/web/public/favicon-error.svg
 create mode 100644 services/web/test/frontend/features/ide-react/unit/use-status-favicon.test.ts

diff --git a/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx b/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx
index 6a03d5b205..488d5476a7 100644
--- a/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx
+++ b/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx
@@ -16,6 +16,7 @@ import {
 } from '@/features/ide-redesign/utils/new-editor-utils'
 import EditorSurvey from '../editor-survey'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
+import { useStatusFavicon } from '@/features/ide-react/hooks/use-status-favicon'
 
 const MainLayoutNew = lazy(
   () => import('@/features/ide-redesign/components/main-layout')
@@ -30,6 +31,7 @@ export default function IdePage() {
   useEditingSessionHeartbeat() // send a batched event when user is active
   useRegisterUserActivity() // record activity and ensure connection when user is active
   useHasLintingError() // pass editor:lint hasLintingError to the compiler
+  useStatusFavicon() // update the favicon based on the compile status
 
   const newEditor = useIsNewEditorEnabled()
   const canAccessNewEditor = canUseNewEditor()
diff --git a/services/web/frontend/js/features/ide-react/hooks/use-status-favicon.ts b/services/web/frontend/js/features/ide-react/hooks/use-status-favicon.ts
new file mode 100644
index 0000000000..c65d49e042
--- /dev/null
+++ b/services/web/frontend/js/features/ide-react/hooks/use-status-favicon.ts
@@ -0,0 +1,75 @@
+import { useDetachCompileContext as useCompileContext } from '@/shared/context/detach-compile-context'
+import { useEffect, useState } from 'react'
+import usePreviousValue from '@/shared/hooks/use-previous-value'
+
+const RESET_AFTER_MS = 5_000
+
+const COMPILE_ICONS = {
+  ERROR: '/favicon-error.svg',
+  COMPILING: '/favicon-compiling.svg',
+  COMPILED: '/favicon-compiled.svg',
+  UNCOMPILED: '/favicon.svg',
+}
+
+type CompileStatus = keyof typeof COMPILE_ICONS
+
+const useCompileStatus = (): CompileStatus => {
+  const compileContext = useCompileContext()
+  if (compileContext.uncompiled) return 'UNCOMPILED'
+  if (compileContext.compiling) return 'COMPILING'
+  if (compileContext.error) return 'ERROR'
+  return 'COMPILED'
+}
+
+const removeFavicon = () => {
+  const existingFavicons = document.head.querySelectorAll(
+    "link[rel='icon']"
+  ) as NodeListOf<HTMLLinkElement>
+  existingFavicons.forEach(favicon => {
+    if (favicon.href.endsWith('.svg')) favicon.parentNode?.removeChild(favicon)
+  })
+}
+
+const updateFavicon = (status: CompileStatus = 'UNCOMPILED') => {
+  removeFavicon()
+  const linkElement = document.createElement('link')
+  linkElement.rel = 'icon'
+  linkElement.href = COMPILE_ICONS[status]
+  linkElement.type = 'image/svg+xml'
+  linkElement.setAttribute('data-compile-status', 'true')
+  document.head.appendChild(linkElement)
+}
+
+const isActive = () => !document.hidden
+
+const useIsWindowActive = () => {
+  const [isWindowActive, setIsWindowActive] = useState(isActive())
+  useEffect(() => {
+    const handleVisibilityChange = () => setIsWindowActive(isActive())
+    document.addEventListener('visibilitychange', handleVisibilityChange)
+    return () => {
+      document.removeEventListener('visibilitychange', handleVisibilityChange)
+    }
+  }, [])
+  return isWindowActive
+}
+
+export const useStatusFavicon = () => {
+  const compileStatus = useCompileStatus()
+  const previousCompileStatus = usePreviousValue(compileStatus)
+  const isWindowActive = useIsWindowActive()
+
+  useEffect(() => {
+    if (previousCompileStatus !== compileStatus) {
+      return updateFavicon(compileStatus)
+    }
+
+    if (
+      isWindowActive &&
+      (compileStatus === 'COMPILED' || compileStatus === 'ERROR')
+    ) {
+      const timeout = setTimeout(updateFavicon, RESET_AFTER_MS)
+      return () => clearTimeout(timeout)
+    }
+  }, [compileStatus, isWindowActive, previousCompileStatus])
+}
diff --git a/services/web/public/favicon-compiled.svg b/services/web/public/favicon-compiled.svg
new file mode 100644
index 0000000000..8bee787bb2
--- /dev/null
+++ b/services/web/public/favicon-compiled.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="8" cy="8" r="8" fill="#fff"/>
+  <path
+    d="M13.0748 3.19694C11.6883 2.6541 6.67193 2.45789 6.66539 5.45331C5.20038 6.38857 4.23242 7.91244 4.23242 9.5475C4.23242 11.5226 5.83478 13.125 7.80992 13.125C9.78507 13.125 11.3874 11.5226 11.3874 9.5475C11.3874 8.02362 10.4326 6.71558 9.08527 6.20544C8.82366 6.10734 8.2612 5.93075 7.81646 5.96999C7.17552 6.37549 6.3907 7.21263 6.02444 8.04978C6.57382 7.38922 7.43059 7.10145 8.1958 7.22571C9.31418 7.40884 10.1709 8.37679 10.1709 9.55404C10.1709 10.8555 9.11797 11.9085 7.81646 11.9085C7.09704 11.9085 6.4561 11.588 6.02444 11.0844C5.37696 10.3323 5.21346 9.52133 5.34426 8.72997C5.79554 5.95691 9.08527 4.38072 11.5313 3.77248C10.7334 4.19759 9.29456 4.89085 8.28736 5.64298C11.2239 6.78098 11.7014 4.30223 13.0748 3.19694Z"
+    fill="#046530"/>
+  <circle cx="10.5" cy="11.5" r="3.5" fill="#fff"/>
+  <path fill="#000"
+        d="m9.615 12.032 2.75-2.921a.31.31 0 0 1 .26-.111q.146 0 .26.122a.395.395 0 0 1 0 .555l-3 3.2a.349.349 0 0 1-.531 0l-1.24-1.322a.395.395 0 0 1 0-.556.35.35 0 0 1 .261-.122q.146 0 .26.122z"/>
+</svg>
diff --git a/services/web/public/favicon-compiling.svg b/services/web/public/favicon-compiling.svg
new file mode 100644
index 0000000000..fed675637c
--- /dev/null
+++ b/services/web/public/favicon-compiling.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="8" cy="8" r="8" fill="#fff"/>
+  <path
+    d="M13.0748 3.19694C11.6883 2.6541 6.67193 2.45789 6.66539 5.45331C5.20038 6.38857 4.23242 7.91244 4.23242 9.5475C4.23242 11.5226 5.83478 13.125 7.80992 13.125C9.78507 13.125 11.3874 11.5226 11.3874 9.5475C11.3874 8.02362 10.4326 6.71558 9.08527 6.20544C8.82366 6.10734 8.2612 5.93075 7.81646 5.96999C7.17552 6.37549 6.3907 7.21263 6.02444 8.04978C6.57382 7.38922 7.43059 7.10145 8.1958 7.22571C9.31418 7.40884 10.1709 8.37679 10.1709 9.55404C10.1709 10.8555 9.11797 11.9085 7.81646 11.9085C7.09704 11.9085 6.4561 11.588 6.02444 11.0844C5.37696 10.3323 5.21346 9.52133 5.34426 8.72997C5.79554 5.95691 9.08527 4.38072 11.5313 3.77248C10.7334 4.19759 9.29456 4.89085 8.28736 5.64298C11.2239 6.78098 11.7014 4.30223 13.0748 3.19694Z"
+    fill="#046530"/>
+  <circle cx="10.5" cy="11.5" r="3.5" fill="#fff"/>
+  <path fill="#000"
+        d="M9.1 11.4q0 .4.158.742.167.341.442.583V12.5q0-.125.083-.208A.3.3 0 0 1 10 12.2a.27.27 0 0 1 .208.092.27.27 0 0 1 .092.208v1q0 .125-.092.217A.28.28 0 0 1 10 13.8H9a.3.3 0 0 1-.217-.083.3.3 0 0 1-.083-.217q0-.125.083-.208A.3.3 0 0 1 9 13.2h.317a2.6 2.6 0 0 1-.6-.792A2.4 2.4 0 0 1 8.5 11.4q0-.708.367-1.275.366-.575.966-.867a.22.22 0 0 1 .217 0 .28.28 0 0 1 .15.167.3.3 0 0 1-.008.233.3.3 0 0 1-.15.167 1.8 1.8 0 0 0-.684.65q-.258.408-.258.925m3.6 0a1.7 1.7 0 0 0-.167-.742 1.7 1.7 0 0 0-.433-.583v.225q0 .125-.092.217a.28.28 0 0 1-.208.083.3.3 0 0 1-.217-.083.3.3 0 0 1-.083-.217v-1q0-.125.083-.208A.3.3 0 0 1 11.8 9h1a.27.27 0 0 1 .208.092.27.27 0 0 1 .092.208q0 .125-.092.217a.28.28 0 0 1-.208.083h-.317q.376.333.592.8.225.459.225 1 0 .708-.367 1.283a2.36 2.36 0 0 1-.966.859.23.23 0 0 1-.217.008.3.3 0 0 1-.15-.175.35.35 0 0 1-.008-.225.3.3 0 0 1 .15-.167q.425-.225.691-.641a1.7 1.7 0 0 0 .267-.942"/>
+</svg>
diff --git a/services/web/public/favicon-error.svg b/services/web/public/favicon-error.svg
new file mode 100644
index 0000000000..5b88401356
--- /dev/null
+++ b/services/web/public/favicon-error.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="8" cy="8" r="8" fill="#fff"/>
+  <path
+    d="M13.0748 3.19694C11.6883 2.6541 6.67193 2.45789 6.66539 5.45331C5.20038 6.38857 4.23242 7.91244 4.23242 9.5475C4.23242 11.5226 5.83478 13.125 7.80992 13.125C9.78507 13.125 11.3874 11.5226 11.3874 9.5475C11.3874 8.02362 10.4326 6.71558 9.08527 6.20544C8.82366 6.10734 8.2612 5.93075 7.81646 5.96999C7.17552 6.37549 6.3907 7.21263 6.02444 8.04978C6.57382 7.38922 7.43059 7.10145 8.1958 7.22571C9.31418 7.40884 10.1709 8.37679 10.1709 9.55404C10.1709 10.8555 9.11797 11.9085 7.81646 11.9085C7.09704 11.9085 6.4561 11.588 6.02444 11.0844C5.37696 10.3323 5.21346 9.52133 5.34426 8.72997C5.79554 5.95691 9.08527 4.38072 11.5313 3.77248C10.7334 4.19759 9.29456 4.89085 8.28736 5.64298C11.2239 6.78098 11.7014 4.30223 13.0748 3.19694Z"
+    fill="#046530"/>
+  <circle cx="10.5" cy="11.5" r="3.5" fill="#fff"/>
+  <path fill="#000"
+        d="m10.5 12.064-1.814 1.814a.38.38 0 0 1-.277.122.43.43 0 0 1-.276-.133.38.38 0 0 1-.122-.276q0-.166.122-.288L9.936 11.5 8.122 9.686A.38.38 0 0 1 8 9.409a.44.44 0 0 1 .133-.287A.38.38 0 0 1 8.409 9q.166 0 .288.122l1.803 1.814 1.814-1.814A.38.38 0 0 1 12.591 9q.165 0 .287.122a.4.4 0 0 1 .122.287q0 .156-.122.277L11.064 11.5l1.814 1.814a.38.38 0 0 1 .122.277q0 .155-.122.276a.4.4 0 0 1-.287.122.38.38 0 0 1-.277-.122z"/>
+</svg>
diff --git a/services/web/test/frontend/features/ide-react/unit/use-status-favicon.test.ts b/services/web/test/frontend/features/ide-react/unit/use-status-favicon.test.ts
new file mode 100644
index 0000000000..f3a9294eb1
--- /dev/null
+++ b/services/web/test/frontend/features/ide-react/unit/use-status-favicon.test.ts
@@ -0,0 +1,131 @@
+import { expect } from 'chai'
+import sinon from 'sinon'
+import { renderHook } from '@testing-library/react'
+import * as CompileContext from '@/shared/context/detach-compile-context'
+
+import { useStatusFavicon } from '@/features/ide-react/hooks/use-status-favicon'
+
+type Compilation = { uncompiled: boolean; compiling: boolean; error: boolean }
+
+describe('useStatusFavicon', function () {
+  let mockUseDetachCompileContext: sinon.SinonStub
+  let clock: sinon.SinonFakeTimers
+  let originalHidden: PropertyDescriptor | undefined
+
+  const setCompilation = (compileContext: Compilation) => {
+    mockUseDetachCompileContext.returns(compileContext)
+  }
+  const setHidden = (hidden: boolean) => {
+    Object.defineProperty(document, 'hidden', {
+      writable: true,
+      configurable: true,
+      value: hidden,
+    })
+    document.dispatchEvent(new Event('visibilitychange'))
+  }
+
+  const getFaviconElements = () =>
+    document.querySelectorAll('link[data-compile-status="true"]')
+
+  const getCurrentFaviconHref = () => {
+    const favicon = document.querySelector(
+      'link[data-compile-status="true"]'
+    ) as HTMLLinkElement
+    return favicon?.href || null
+  }
+
+  beforeEach(function () {
+    mockUseDetachCompileContext = sinon.stub(
+      CompileContext,
+      'useDetachCompileContext'
+    )
+
+    // Mock timers for timeout testing
+    clock = sinon.useFakeTimers()
+
+    // Store original document.hidden descriptor
+    originalHidden = Object.getOwnPropertyDescriptor(
+      Document.prototype,
+      'hidden'
+    )
+
+    // Clean up any existing favicon elements
+    document
+      .querySelectorAll('link[data-compile-status="true"]')
+      .forEach(el => el.remove())
+  })
+
+  afterEach(function () {
+    sinon.restore()
+    clock.restore()
+
+    // Restore original document.hidden
+    if (originalHidden) {
+      Object.defineProperty(document, 'hidden', originalHidden)
+    }
+
+    // Clean up favicon elements
+    document
+      .querySelectorAll('link[data-compile-status="true"]')
+      .forEach(el => el.remove())
+  })
+
+  it('updates favicon to reflect status: UNCOMPILED', function () {
+    setCompilation({ uncompiled: true, compiling: false, error: false })
+    renderHook(() => useStatusFavicon())
+    expect(getCurrentFaviconHref()).to.include('/favicon.svg')
+  })
+
+  it('updates favicon to reflect status: COMPILING', function () {
+    setCompilation({ uncompiled: false, compiling: true, error: false })
+    renderHook(() => useStatusFavicon())
+    expect(getCurrentFaviconHref()).to.include('/favicon-compiling.svg')
+  })
+
+  it('updates favicon to reflect status: COMPILED', function () {
+    setCompilation({ uncompiled: false, compiling: false, error: false })
+    renderHook(() => useStatusFavicon())
+    expect(getCurrentFaviconHref()).to.include('/favicon-compiled.svg')
+  })
+
+  it('updates favicon to reflect status: ERROR', function () {
+    setCompilation({ uncompiled: false, compiling: false, error: true })
+    renderHook(() => useStatusFavicon())
+    expect(getCurrentFaviconHref()).to.include('/favicon-error.svg')
+  })
+
+  it('keeps the COMPILED favicon for 5 seconds when the window is active', function () {
+    setCompilation({ uncompiled: false, compiling: false, error: false })
+    const { rerender } = renderHook(() => useStatusFavicon())
+    setHidden(false)
+    rerender()
+    expect(getCurrentFaviconHref()).to.include('/favicon-compiled.svg')
+    clock.tick(4500)
+    expect(getCurrentFaviconHref()).to.include('/favicon-compiled.svg')
+    clock.tick(1000)
+    expect(getCurrentFaviconHref()).to.include('/favicon.svg')
+  })
+
+  it('keeps the COMPILED favicon forever when the window is hidden', function () {
+    setCompilation({ uncompiled: false, compiling: false, error: false })
+    const { rerender } = renderHook(() => useStatusFavicon())
+    setHidden(true)
+    rerender()
+
+    expect(getCurrentFaviconHref()).to.include('/favicon-compiled.svg')
+    clock.tick(90000)
+    expect(getCurrentFaviconHref()).to.include('/favicon-compiled.svg')
+  })
+
+  it('should only have one favicon element at a time', function () {
+    setCompilation({ uncompiled: true, compiling: false, error: false })
+    const { rerender } = renderHook(() => useStatusFavicon())
+    expect(getFaviconElements()).to.have.length(1)
+    expect(getCurrentFaviconHref()).to.include('/favicon.svg')
+
+    setCompilation({ uncompiled: false, compiling: true, error: false })
+    rerender()
+    expect(getFaviconElements()).to.have.length(1)
+    expect(getCurrentFaviconHref()).to.include('/favicon-compiling.svg')
+  })
+})

From de1ab31bfd877a3874320938713ce0884a34d114 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:25:35 +0100
Subject: [PATCH 015/274] Merge pull request #26469 from
 overleaf/td-bs5-sp-ce-register

Migrate SP/CE registration page to Bootstrap 5

GitOrigin-RevId: 5e99a6a091d725ea3ab54e7cf6a4d1ea4f6bfab6
---
 services/web/app/views/user/register.pug      | 26 ++++++++--------
 .../frontend/stylesheets/app/register.less    | 31 -------------------
 .../bootstrap-5/pages/register.scss           |  8 +++--
 .../web/frontend/stylesheets/main-style.less  |  1 -
 4 files changed, 18 insertions(+), 48 deletions(-)
 delete mode 100644 services/web/frontend/stylesheets/app/register.less

diff --git a/services/web/app/views/user/register.pug b/services/web/app/views/user/register.pug
index 8aa40e8b35..ff53002ccb 100644
--- a/services/web/app/views/user/register.pug
+++ b/services/web/app/views/user/register.pug
@@ -1,13 +1,10 @@
 extends ../layout-marketing
 
-block vars
-	- bootstrap5PageStatus = 'disabled'
-
 block content
 	main#main-content.content.content-alt
 		.container
 			.row
-				.registration_message
+				.registration-message
 					if sharedProjectData.user_first_name !== undefined
 						h1 #{translate("user_wants_you_to_see_project", {username:sharedProjectData.user_first_name, projectname:""})}
 							em #{sharedProjectData.project_name}
@@ -15,21 +12,24 @@ block content
 							| #{translate("join_sl_to_view_project")}.
 						div
 							| #{translate("already_have_sl_account")}
+							|
 							a(href='/login') #{translate("login_here")}
 					else if newTemplateData.templateName !== undefined
 						h1 #{translate("register_to_edit_template", {templateName:newTemplateData.templateName})}
 
 						div #{translate("already_have_sl_account")}
+							|
 							a(href='/login') #{translate("login_here")}
 
 			.row
-				.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3
+				.col-lg-8.offset-lg-2.col-xl-6.offset-xl-3
 					.card
-						.page-header
-							h1 #{translate("register")}
-						p
-							| Please contact
-							|
-							strong #{settings.adminEmail}
-							|
-							| to create an account.
+						.card-body
+							.page-header
+								h1 #{translate("register")}
+							p
+								| Please contact
+								|
+								strong #{settings.adminEmail}
+								|
+								| to create an account.
diff --git a/services/web/frontend/stylesheets/app/register.less b/services/web/frontend/stylesheets/app/register.less
deleted file mode 100644
index 61c7b79102..0000000000
--- a/services/web/frontend/stylesheets/app/register.less
+++ /dev/null
@@ -1,31 +0,0 @@
-.registration_message {
-  text-align: center;
-  padding-bottom: 20px;
-}
-// for focus-registration and focus-login split test variant
-.registration_logo {
-  width: 130px;
-  padding: 8px 0;
-}
-
-.website-redesign {
-  .login-register-header-focus {
-    padding-top: unset;
-  }
-}
-
-.login-register-header-heading-focus {
-  color: @neutral-90;
-  margin-bottom: 0;
-}
-
-.website-redesign {
-  .login-register-form-focus {
-    padding: @line-height-computed 0 0 0;
-    border-bottom: unset;
-    border-bottom: solid 1px @hr-border;
-    &:last-child {
-      border-bottom-width: 0;
-    }
-  }
-}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/register.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/register.scss
index 85711e1609..90a90f32ce 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/register.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/register.scss
@@ -1,3 +1,8 @@
+.registration-message {
+  text-align: center;
+  padding-bottom: var(--spacing-07);
+}
+
 .register-container {
   h1 {
     @include heading-sm;
@@ -33,9 +38,6 @@
       }
 
       .registration-message {
-        text-align: center;
-        padding-bottom: var(--spacing-07);
-
         .registration-message-heading {
           color: var(--neutral-70);
           font-size: var(--font-size-05);
diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less
index 040c6ac695..85368ea36e 100644
--- a/services/web/frontend/stylesheets/main-style.less
+++ b/services/web/frontend/stylesheets/main-style.less
@@ -104,7 +104,6 @@
 @import 'app/plans.less';
 @import 'app/recurly.less';
 @import 'app/bonus.less';
-@import 'app/register.less';
 @import 'app/blog.less';
 @import 'app/features.less';
 @import 'app/templates.less';

From ab140f578d5d41bdd761ef6c5d996dcacb4ede4d Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:25:47 +0100
Subject: [PATCH 016/274] Merge pull request #26244 from
 overleaf/td-limit-browser-translate-ide

Prevent browser translation of stuff that shouldn't be translated in IDE page

GitOrigin-RevId: 96a75b51c3c8efc4cbcec7eb17d9e331a03e2c96
---
 services/web/app/views/_metadata.pug          |  6 +++---
 .../chat/components/message-content.tsx       |  2 +-
 .../js/features/chat/components/message.tsx   |  2 +-
 .../components/dictionary-modal-content.tsx   |  4 +++-
 .../components/left-menu-button.tsx           |  8 ++++---
 .../components/settings/settings-compiler.tsx |  1 +
 .../components/settings/settings-document.tsx |  1 +
 .../settings/settings-editor-theme.tsx        |  1 +
 .../settings/settings-font-family.tsx         |  1 +
 .../settings/settings-image-name.tsx          |  1 +
 .../settings/settings-menu-select.tsx         |  3 +++
 .../settings/settings-pdf-viewer.tsx          |  1 +
 .../components/online-users-widget.tsx        |  1 +
 .../file-tree/components/file-tree-doc.tsx    |  1 +
 .../file-tree/components/file-tree-folder.tsx |  1 +
 .../components/change-list/changes.tsx        |  2 ++
 .../components/change-list/tag-tooltip.tsx    | 21 +++++++++++++------
 .../user-name-with-colored-badge.tsx          | 10 ++++++++-
 .../file-tree/history-file-tree-doc.tsx       |  1 +
 .../file-tree/history-file-tree-folder.tsx    |  1 +
 .../ide-redesign/components/breadcrumbs.tsx   |  2 +-
 .../editor-theme-setting.tsx                  |  1 +
 .../font-family-setting.tsx                   |  1 +
 .../compiler-settings/compiler-setting.tsx    |  1 +
 .../compiler-settings/image-name-setting.tsx  |  1 +
 .../root-document-setting.tsx                 |  1 +
 .../components/settings/dropdown-setting.tsx  |  3 +++
 .../editor-settings/pdf-viewer-setting.tsx    |  1 +
 .../components/toolbar/project-title.tsx      |  4 +++-
 .../outline/components/outline-item.tsx       |  1 +
 .../components/pdf-log-entry-raw-content.tsx  |  2 +-
 .../components/preview-log-entry-header.tsx   |  8 +++++--
 .../components/review-panel-entry-user.tsx    |  2 +-
 .../review-panel-expandable-content.tsx       |  3 +++
 .../components/review-panel-message.tsx       |  1 +
 .../review-panel-resolved-thread.tsx          |  6 +++++-
 .../extensions/toolbar/toolbar-panel.ts       |  2 +-
 .../components/collapsible-file-header.tsx    |  1 +
 .../acceptance/src/ProjectInviteTests.mjs     |  8 ++++---
 .../src/helpers/expectErrorResponse.mjs       |  2 +-
 .../src/steps/100_loadProjectDashboard.js     |  3 ++-
 41 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/services/web/app/views/_metadata.pug b/services/web/app/views/_metadata.pug
index 6d7c599546..b28ca6abd2 100644
--- a/services/web/app/views/_metadata.pug
+++ b/services/web/app/views/_metadata.pug
@@ -1,10 +1,10 @@
 //- Title
 if metadata && metadata.title
-	title= metadata.title + ' - ' + settings.appName + ', ' + translate('online_latex_editor')
+	title(translate='no')= metadata.title + ' - ' + settings.appName + ', ' + translate('online_latex_editor')
 	meta(name='twitter:title' content=metadata.title)
 	meta(name='og:title' content=metadata.title)
 else if typeof title == 'undefined'
-	title= settings.appName + ', ' + translate('online_latex_editor')
+	title(translate='no')= settings.appName + ', ' + translate('online_latex_editor')
 	meta(
 		name='twitter:title'
 		content=settings.appName + ', ' + translate('online_latex_editor')
@@ -14,7 +14,7 @@ else if typeof title == 'undefined'
 		content=settings.appName + ', ' + translate('online_latex_editor')
 	)
 else
-	title= translate(title) + ' - ' + settings.appName + ', ' + translate('online_latex_editor')
+	title(translate='no')= translate(title) + ' - ' + settings.appName + ', ' + translate('online_latex_editor')
 	//- to do - not translate?
 	meta(name='twitter:title' content=translate(title))
 	meta(name='og:title' content=translate(title))
diff --git a/services/web/frontend/js/features/chat/components/message-content.tsx b/services/web/frontend/js/features/chat/components/message-content.tsx
index ad2e6a623f..3d86b4be68 100644
--- a/services/web/frontend/js/features/chat/components/message-content.tsx
+++ b/services/web/frontend/js/features/chat/components/message-content.tsx
@@ -34,7 +34,7 @@ const MessageContent: FC<{ content: string }> = ({ content }) => {
   }, [content, mounted])
 
   return (
-    <p ref={root}>
+    <p ref={root} translate="no">
       <Linkify>{content}</Linkify>
     </p>
   )
diff --git a/services/web/frontend/js/features/chat/components/message.tsx b/services/web/frontend/js/features/chat/components/message.tsx
index aa2779f1e8..8a410c0d9d 100644
--- a/services/web/frontend/js/features/chat/components/message.tsx
+++ b/services/web/frontend/js/features/chat/components/message.tsx
@@ -29,7 +29,7 @@ function Message({ message, fromSelf }: MessageProps) {
   return (
     <div className="message-wrapper">
       {!fromSelf && (
-        <div className="name">
+        <div className="name" translate="no">
           <span>{message.user.first_name || message.user.email}</span>
         </div>
       )}
diff --git a/services/web/frontend/js/features/dictionary/components/dictionary-modal-content.tsx b/services/web/frontend/js/features/dictionary/components/dictionary-modal-content.tsx
index 38795e145c..52664de105 100644
--- a/services/web/frontend/js/features/dictionary/components/dictionary-modal-content.tsx
+++ b/services/web/frontend/js/features/dictionary/components/dictionary-modal-content.tsx
@@ -68,7 +68,9 @@ export default function DictionaryModalContent({
           <ul className="list-unstyled dictionary-entries-list">
             {[...learnedWords].sort(wordsSortFunction).map(learnedWord => (
               <li key={learnedWord} className="dictionary-entry">
-                <span className="dictionary-entry-name">{learnedWord}</span>
+                <span className="dictionary-entry-name" translate="no">
+                  {learnedWord}
+                </span>
                 <OLTooltip
                   id={`tooltip-remove-learned-word-${learnedWord}`}
                   description={t('edit_dictionary_remove')}
diff --git a/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx b/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx
index e827c7e528..4d4efe6dbc 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx
@@ -9,6 +9,7 @@ type Props = {
   disabledAccesibilityText?: string
   type?: 'button' | 'link'
   href?: string
+  translate?: React.HTMLAttributes<HTMLElement>['translate']
 }
 
 function LeftMenuButtonIcon({
@@ -34,12 +35,13 @@ export default function LeftMenuButton({
   disabledAccesibilityText,
   type = 'button',
   href,
+  translate,
 }: PropsWithChildren<Props>) {
   if (disabled) {
     return (
       <div className="left-menu-button link-disabled">
         <LeftMenuButtonIcon svgIcon={svgIcon} icon={icon} />
-        <span>{children}</span>
+        <span translate={translate}>{children}</span>
         {disabledAccesibilityText ? (
           <span className="sr-only">{disabledAccesibilityText}</span>
         ) : null}
@@ -51,7 +53,7 @@ export default function LeftMenuButton({
     return (
       <button onClick={onClick} className="left-menu-button">
         <LeftMenuButtonIcon svgIcon={svgIcon} icon={icon} />
-        <span>{children}</span>
+        <span translate={translate}>{children}</span>
       </button>
     )
   } else {
@@ -63,7 +65,7 @@ export default function LeftMenuButton({
         className="left-menu-button"
       >
         <LeftMenuButtonIcon svgIcon={svgIcon} icon={icon} />
-        <span>{children}</span>
+        <span translate={translate}>{children}</span>
       </a>
     )
   }
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx
index 8d7076ebd4..2eab7f25b5 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx
@@ -34,6 +34,7 @@ export default function SettingsCompiler() {
       ]}
       label={t('compiler')}
       name="compiler"
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx
index 839bd499eb..8655a63cfc 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx
@@ -43,6 +43,7 @@ export default function SettingsDocument() {
       options={validDocsOptions}
       label={t('main_document')}
       name="rootDocId"
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx
index 5f9ad51869..870ce48ca1 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx
@@ -40,6 +40,7 @@ export default function SettingsEditorTheme() {
       options={options}
       label={t('editor_theme')}
       name="editorTheme"
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
index 5a327093a4..a0c2ec49dc 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
@@ -29,6 +29,7 @@ export default function SettingsFontFamily() {
         ]}
         label={t('font_family')}
         name="fontFamily"
+        translateOptions="no"
       />
       <BetaBadge
         phase="release"
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-image-name.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-image-name.tsx
index f52347814a..a0499fe569 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-image-name.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-image-name.tsx
@@ -37,6 +37,7 @@ export default function SettingsImageName() {
       options={options}
       label={t('tex_live_version')}
       name="imageName"
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx
index 6b1f06ec36..c48486ec1c 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx
@@ -28,6 +28,7 @@ type SettingsMenuSelectProps<T extends PossibleValue = string> = {
   onChange: (val: T) => void
   value?: T
   disabled?: boolean
+  translateOptions?: 'yes' | 'no'
 }
 
 export default function SettingsMenuSelect<T extends PossibleValue = string>({
@@ -39,6 +40,7 @@ export default function SettingsMenuSelect<T extends PossibleValue = string>({
   onChange,
   value,
   disabled = false,
+  translateOptions,
 }: SettingsMenuSelectProps<T>) {
   const handleChange: ChangeEventHandler<HTMLSelectElement> = useCallback(
     event => {
@@ -95,6 +97,7 @@ export default function SettingsMenuSelect<T extends PossibleValue = string>({
           value={value?.toString()}
           disabled={disabled}
           ref={selectRef}
+          translate={translateOptions}
         >
           {options.map(option => (
             <option
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-pdf-viewer.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-pdf-viewer.tsx
index 7adea8c57c..3a0269693e 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-pdf-viewer.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-pdf-viewer.tsx
@@ -23,6 +23,7 @@ export default function SettingsPdfViewer() {
       ]}
       label={t('pdf_viewer')}
       name="pdfViewer"
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx
index 6188d5e8ea..e9d8f52506 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx
@@ -60,6 +60,7 @@ function OnlineUsersWidget({
             id="online-user"
             description={user.name}
             overlayProps={{ placement: 'bottom', trigger: ['hover', 'focus'] }}
+            tooltipProps={{ translate: 'no' }}
           >
             <span>
               {/* OverlayTrigger won't fire unless UserIcon is wrapped in a span */}
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx
index 3b67073316..48006b0dee 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx
@@ -28,6 +28,7 @@ function FileTreeDoc({
       {...selectableEntityProps}
       aria-label={name}
       tabIndex={0}
+      translate="no"
     >
       <FileTreeItemInner
         id={id}
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-folder.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-folder.tsx
index 5ad8481349..a35646b6d6 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-folder.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-folder.tsx
@@ -67,6 +67,7 @@ function FileTreeFolder({
         className={classNames(selectableEntityProps.className, {
           'dnd-droppable-hover': isOverRoot || isOverList,
         })}
+        translate="no"
       >
         <FileTreeItemInner
           id={id}
diff --git a/services/web/frontend/js/features/history/components/change-list/changes.tsx b/services/web/frontend/js/features/history/components/change-list/changes.tsx
index ea5e495be3..6e3c1ca30e 100644
--- a/services/web/frontend/js/features/history/components/change-list/changes.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/changes.tsx
@@ -23,6 +23,7 @@ function Changes({ pathnames, projectOps }: ChangesProps) {
           <div
             className="history-version-change-doc"
             data-testid="history-version-change-doc"
+            translate="no"
           >
             {pathname}
           </div>
@@ -41,6 +42,7 @@ function Changes({ pathnames, projectOps }: ChangesProps) {
           <div
             className="history-version-change-doc"
             data-testid="history-version-change-doc"
+            translate="no"
           >
             {getProjectOpDoc(op)}
           </div>
diff --git a/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx b/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx
index 18736c4f37..c766c4e25b 100644
--- a/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx
@@ -87,6 +87,7 @@ const ChangeTag = forwardRef<HTMLElement, TagProps>(
           className="history-version-badge"
           data-testid="history-version-badge"
           {...props}
+          translate={isPseudoCurrentStateLabel ? 'yes' : 'no'}
         >
           {isPseudoCurrentStateLabel
             ? t('history_label_project_current_state')
@@ -147,24 +148,32 @@ function TagTooltip({ label, currentUserId, showTooltip }: LabelBadgesProps) {
 
   const isPseudoCurrentStateLabel = isPseudoLabel(label)
   const currentLabelData = allLabels?.find(({ id }) => id === label.id)
-  const labelOwnerName =
-    currentLabelData && !isPseudoLabel(currentLabelData)
-      ? currentLabelData.user_display_name
-      : t('anonymous')
+  const isAnonymous = !currentLabelData || isPseudoLabel(currentLabelData)
+  const labelOwnerName = isAnonymous
+    ? t('anonymous')
+    : currentLabelData.user_display_name
+  const labelOwnerNameComponent = isAnonymous ? (
+    labelOwnerName
+  ) : (
+    <span translate="no">{labelOwnerName}</span>
+  )
 
   return !isPseudoCurrentStateLabel ? (
     <OLTooltip
       description={
         <div className="history-version-label-tooltip">
           <div className="history-version-label-tooltip-row">
-            <b className="history-version-label-tooltip-row-comment">
+            <b
+              className="history-version-label-tooltip-row-comment"
+              translate="no"
+            >
               <OLTagIcon />
               &nbsp;
               {label.comment}
             </b>
           </div>
           <div className="history-version-label-tooltip-row">
-            {t('history_label_created_by')} {labelOwnerName}
+            {t('history_label_created_by')} {labelOwnerNameComponent}
           </div>
           <div className="history-version-label-tooltip-row">
             <time>
diff --git a/services/web/frontend/js/features/history/components/change-list/user-name-with-colored-badge.tsx b/services/web/frontend/js/features/history/components/change-list/user-name-with-colored-badge.tsx
index ed1da6e757..b72eeb2fc4 100644
--- a/services/web/frontend/js/features/history/components/change-list/user-name-with-colored-badge.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/user-name-with-colored-badge.tsx
@@ -14,6 +14,7 @@ function UserNameWithColoredBadge({
   currentUserId,
 }: UserNameWithColoredBadgeProps) {
   const { t } = useTranslation()
+  let allowBrowserTranslate = true
 
   let userName: string
   if (!user) {
@@ -22,8 +23,10 @@ function UserNameWithColoredBadge({
     userName = t('you')
   } else if ('displayName' in user) {
     userName = user.displayName
+    allowBrowserTranslate = false
   } else {
     userName = formatUserName(user)
+    allowBrowserTranslate = false
   }
 
   return (
@@ -32,7 +35,12 @@ function UserNameWithColoredBadge({
         className="history-version-user-badge-color"
         style={{ backgroundColor: getBackgroundColorForUserId(user?.id) }}
       />
-      <span className="history-version-user-badge-text">{userName}</span>
+      <span
+        className="history-version-user-badge-text"
+        translate={allowBrowserTranslate ? 'yes' : 'no'}
+      >
+        {userName}
+      </span>
     </>
   )
 }
diff --git a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx
index e3543ef527..7088588e27 100644
--- a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx
+++ b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-doc.tsx
@@ -42,6 +42,7 @@ function HistoryFileTreeDoc({
       aria-selected={selected}
       aria-label={name}
       tabIndex={0}
+      translate="no"
     >
       <HistoryFileTreeItem
         name={name}
diff --git a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx
index 44cb7f2921..738b0a4688 100644
--- a/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx
+++ b/services/web/frontend/js/features/history/components/file-tree/history-file-tree-folder.tsx
@@ -79,6 +79,7 @@ function HistoryFileTreeFolder({
             setExpanded(!expanded)
           }
         }}
+        translate="no"
       >
         <HistoryFileTreeItem name={name} icons={icons} />
       </li>
diff --git a/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx b/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx
index 9949b98c7f..1c21df0f82 100644
--- a/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/breadcrumbs.tsx
@@ -83,7 +83,7 @@ export default function Breadcrumbs() {
   const numOutlineItems = outlineHierarchy.length
 
   return (
-    <div className="ol-cm-breadcrumbs">
+    <div className="ol-cm-breadcrumbs" translate="no">
       {folderHierarchy.map(folder => (
         <Fragment key={folder._id}>
           <div>{folder.name}</div>
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting.tsx
index eba0fc5b6c..1a1a3f1c1e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting.tsx
@@ -41,6 +41,7 @@ export default function EditorThemeSetting() {
       options={options}
       onChange={setEditorTheme}
       value={editorTheme}
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-family-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-family-setting.tsx
index d0310e2b1b..f1c279cf23 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-family-setting.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-family-setting.tsx
@@ -27,6 +27,7 @@ export default function FontFamilySetting() {
       onChange={setFontFamily}
       value={fontFamily}
       width="wide"
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx
index c007a0608e..1da6a167c6 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx
@@ -38,6 +38,7 @@ export default function CompilerSetting() {
       options={OPTIONS}
       onChange={setCompiler}
       value={compiler}
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/image-name-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/image-name-setting.tsx
index 0574657971..0a7166ae68 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/image-name-setting.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/image-name-setting.tsx
@@ -38,6 +38,7 @@ export default function ImageNameSetting() {
       options={options}
       onChange={setImageName}
       value={imageName}
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/root-document-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/root-document-setting.tsx
index bd493a018a..719ea4da5a 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/root-document-setting.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/root-document-setting.tsx
@@ -44,6 +44,7 @@ export default function RootDocumentSetting() {
       options={validDocsOptions}
       onChange={setRootDocId}
       value={rootDocId}
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/dropdown-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/dropdown-setting.tsx
index 47c5c54ef0..3d9db79c3d 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/dropdown-setting.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/dropdown-setting.tsx
@@ -31,6 +31,7 @@ type SettingsMenuSelectProps<T extends PossibleValue = string> = {
   disabled?: boolean
   width?: 'default' | 'wide'
   loading?: boolean
+  translateOptions?: 'yes' | 'no'
 }
 
 export default function DropdownSetting<T extends PossibleValue = string>({
@@ -44,6 +45,7 @@ export default function DropdownSetting<T extends PossibleValue = string>({
   disabled = false,
   width = 'default',
   loading = false,
+  translateOptions,
 }: SettingsMenuSelectProps<T>) {
   const handleChange: ChangeEventHandler<HTMLSelectElement> = useCallback(
     event => {
@@ -78,6 +80,7 @@ export default function DropdownSetting<T extends PossibleValue = string>({
           onChange={handleChange}
           value={value?.toString()}
           disabled={disabled}
+          translate={translateOptions}
         >
           {options.map(option => (
             <option
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting.tsx
index 20d1e56d11..87e5bba5cc 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting.tsx
@@ -22,6 +22,7 @@ export default function PDFViewerSetting() {
       ]}
       onChange={setPdfViewer}
       value={pdfViewer}
+      translateOptions="no"
     />
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
index 61e29023a0..43e5c678d7 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
@@ -58,7 +58,9 @@ export const ToolbarProjectTitle = () => {
         id="project-title-options"
         className="ide-redesign-toolbar-project-dropdown-toggle ide-redesign-toolbar-dropdown-toggle-subdued fw-bold ide-redesign-toolbar-button-subdued"
       >
-        <span className="ide-redesign-toolbar-project-name">{name}</span>
+        <span className="ide-redesign-toolbar-project-name" translate="no">
+          {name}
+        </span>
         <MaterialIcon
           type="keyboard_arrow_down"
           accessibilityLabel={t('project_title_options')}
diff --git a/services/web/frontend/js/features/outline/components/outline-item.tsx b/services/web/frontend/js/features/outline/components/outline-item.tsx
index 08a6b0f942..05539bdf13 100644
--- a/services/web/frontend/js/features/outline/components/outline-item.tsx
+++ b/services/web/frontend/js/features/outline/components/outline-item.tsx
@@ -62,6 +62,7 @@ const OutlineItem = memo(function OutlineItem({
       role="treeitem"
       aria-current={isHighlighted}
       aria-label={outlineItem.title}
+      translate="no"
     >
       <div className="outline-item-row">
         {!!outlineItem.children && (
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
index 0e9cc5246d..2ace1667f3 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
@@ -39,7 +39,7 @@ export default function PdfLogEntryRawContent({
           height: expanded || !needsExpander ? 'auto' : collapsedSize,
         }}
       >
-        <pre className="log-entry-content-raw" ref={elementRef}>
+        <pre className="log-entry-content-raw" ref={elementRef} translate="no">
           {rawContent.trim()}
         </pre>
       </div>
diff --git a/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx b/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx
index 8ce318b1c8..f5b1f49ce6 100644
--- a/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx
+++ b/services/web/frontend/js/features/preview/components/preview-log-entry-header.tsx
@@ -86,7 +86,11 @@ function PreviewLogEntryHeader({
       onClick={onSourceLocationClick}
     >
       <MaterialIcon type="link" />
-      <span ref={logLocationSpanRef} className="log-entry-header-link-location">
+      <span
+        ref={logLocationSpanRef}
+        className="log-entry-header-link-location"
+        translate="no"
+      >
         {`\u202A${locationLinkText}\u202C`}
       </span>
     </OLButton>
@@ -105,7 +109,7 @@ function PreviewLogEntryHeader({
           id={locationLinkText}
           description={locationLinkText}
           overlayProps={{ placement: 'left' }}
-          tooltipProps={{ className: 'log-location-tooltip' }}
+          tooltipProps={{ className: 'log-location-tooltip', translate: 'no' }}
         >
           {locationLink}
         </OLTooltip>
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx
index 932813faef..ae53fbc8c8 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx
@@ -12,7 +12,7 @@ const ReviewPanelEntryUser = ({
   const userName = buildName(user)
 
   return (
-    <div className="review-panel-entry-user">
+    <div className="review-panel-entry-user" translate="no">
       <span
         className="review-panel-entry-user-color-badge"
         style={{
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-expandable-content.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-expandable-content.tsx
index 7a8d29f032..2e107159ed 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-expandable-content.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-expandable-content.tsx
@@ -11,6 +11,7 @@ export const ExpandableContent = memo<{
   newLineCharsLimit?: number
   checkNewLines?: boolean
   inline?: boolean
+  translate?: 'yes' | 'no'
 }>(function ExpandableContent({
   content,
   className,
@@ -18,6 +19,7 @@ export const ExpandableContent = memo<{
   newLineCharsLimit = 3,
   checkNewLines = true,
   inline = false,
+  translate,
 }) {
   const { t } = useTranslation()
   const contentRef = useRef<HTMLDivElement>(null)
@@ -50,6 +52,7 @@ export const ExpandableContent = memo<{
       <div
         ref={contentRef}
         className={classNames('review-panel-expandable-content', className)}
+        translate={translate}
       >
         {isExpanded ? content : content.slice(0, limit)}
         {isOverflowing && !isExpanded && '...'}
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
index ae3a66f729..d6017208d8 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
@@ -135,6 +135,7 @@ export const ReviewPanelMessage: FC<{
           contentLimit={100}
           checkNewLines
           content={message.content}
+          translate="no"
         />
       )}
 
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-thread.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-thread.tsx
index 53ac6d2192..76a12cd1c3 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-thread.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-resolved-thread.tsx
@@ -73,7 +73,10 @@ export const ReviewPanelResolvedThread: FC<{
             i18nKey="from_filename"
             components={[
               // eslint-disable-next-line react/jsx-key
-              <span className="review-panel-resolved-comment-filename" />,
+              <span
+                className="review-panel-resolved-comment-filename"
+                translate="no"
+              />,
             ]}
             values={{ filename: docName }}
             shouldUnescape
@@ -121,6 +124,7 @@ export const ReviewPanelResolvedThread: FC<{
           className="review-panel-resolved-comment-quoted-text-quote"
           content={comment?.op.c}
           checkNewLines
+          translate="no"
         />
       </div>
 
diff --git a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
index a2fd37473f..30eb0098f8 100644
--- a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
@@ -238,7 +238,7 @@ const toolbarTheme = EditorView.theme({
       color: 'inherit',
     },
     '& .ol-cm-toolbar-menu': {
-      width: '120px',
+      minWidth: '120px',
       display: 'flex',
       flexDirection: 'column',
       boxSizing: 'border-box',
diff --git a/services/web/frontend/js/shared/components/collapsible-file-header.tsx b/services/web/frontend/js/shared/components/collapsible-file-header.tsx
index efcd51a74f..b12239fd85 100644
--- a/services/web/frontend/js/shared/components/collapsible-file-header.tsx
+++ b/services/web/frontend/js/shared/components/collapsible-file-header.tsx
@@ -11,6 +11,7 @@ export const CollapsibleFileHeader: FC<{
     type="button"
     className="collapsible-file-header"
     onClick={toggleCollapsed}
+    translate="no"
   >
     <MaterialIcon
       type={collapsed ? 'keyboard_arrow_right' : 'keyboard_arrow_down'}
diff --git a/services/web/test/acceptance/src/ProjectInviteTests.mjs b/services/web/test/acceptance/src/ProjectInviteTests.mjs
index df13d71d37..e61feff6c9 100644
--- a/services/web/test/acceptance/src/ProjectInviteTests.mjs
+++ b/services/web/test/acceptance/src/ProjectInviteTests.mjs
@@ -200,7 +200,7 @@ const expectInvitePage = (user, link, callback) => {
   tryFollowInviteLink(user, link, (err, response, body) => {
     expect(err).not.to.exist
     expect(response.statusCode).to.equal(200)
-    expect(body).to.match(/<title>Project Invite - .*<\/title>/)
+    expect(body).to.match(/<title[^>]*>Project Invite - .*<\/title>/)
     callback()
   })
 }
@@ -210,7 +210,7 @@ const expectInvalidInvitePage = (user, link, callback) => {
   tryFollowInviteLink(user, link, (err, response, body) => {
     expect(err).not.to.exist
     expect(response.statusCode).to.equal(404)
-    expect(body).to.match(/<title>Invalid Invite - .*<\/title>/)
+    expect(body).to.match(/<title[^>]*>Invalid Invite - .*<\/title>/)
     callback()
   })
 }
@@ -237,7 +237,9 @@ const expectLoginPage = (user, callback) => {
   tryFollowLoginLink(user, '/login', (err, response, body) => {
     expect(err).not.to.exist
     expect(response.statusCode).to.equal(200)
-    expect(body).to.match(/<title>(Login|Log in to Overleaf) - .*<\/title>/)
+    expect(body).to.match(
+      /<title[^>]*>(Login|Log in to Overleaf) - .*<\/title>/
+    )
     callback()
   })
 }
diff --git a/services/web/test/acceptance/src/helpers/expectErrorResponse.mjs b/services/web/test/acceptance/src/helpers/expectErrorResponse.mjs
index e79bfd5b2e..2bc3010412 100644
--- a/services/web/test/acceptance/src/helpers/expectErrorResponse.mjs
+++ b/services/web/test/acceptance/src/helpers/expectErrorResponse.mjs
@@ -12,7 +12,7 @@ export default {
   restricted: {
     html(response, body) {
       expect(response.statusCode).to.equal(403)
-      expect(body).to.match(/<head><title>Restricted/)
+      expect(body).to.match(/<head><title translate="no">Restricted/)
     },
     json(response, body) {
       expect(response.statusCode).to.equal(403)
diff --git a/services/web/test/smoke/src/steps/100_loadProjectDashboard.js b/services/web/test/smoke/src/steps/100_loadProjectDashboard.js
index 2a60f8d4b3..aa471e0672 100644
--- a/services/web/test/smoke/src/steps/100_loadProjectDashboard.js
+++ b/services/web/test/smoke/src/steps/100_loadProjectDashboard.js
@@ -1,4 +1,5 @@
-const TITLE_REGEX = /<title>Your projects - .*, Online LaTeX Editor<\/title>/
+const TITLE_REGEX =
+  /<title[^>]*>Your projects - .*, Online LaTeX Editor<\/title>/
 
 async function run({ request, assertHasStatusCode }) {
   const response = await request('/project')

From 9e189e7d591b7c8a54b874a1e50e6a306348baaa Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Tue, 24 Jun 2025 10:05:34 +0200
Subject: [PATCH 017/274] [web] Move UI scope to React states (#26403)

* Move `ui.view` to setState

* Move `openFile` to setState

* Move `ui.leftMenuShown` to setState

* Move `ui.miniReviewPanelVisible` to setState

* Move `ui.pdfLayout` to setState

* Move `ui.chatOpen` to setState

* Move `ui.reviewPanelOpen` to setState

* Cleanup: remove layout-context-adapter and imports

* Replace `ui` scope by mocked `LayoutProvider` in tests

* Update test

* Remove unnecessary `scopeStore.set('ui.chatOpen' ...`

GitOrigin-RevId: 81578bfdc958239eac492905f714a6074c81d0f5
---
 .../context/editor-manager-context.tsx        |   6 +-
 .../context/file-tree-open-context.tsx        |   5 +-
 .../ide-react/context/ide-react-context.tsx   |   2 -
 .../scope-adapters/layout-context-adapter.ts  |  14 -
 .../js/shared/context/layout-context.tsx      |  32 +-
 .../web/frontend/stories/decorators/scope.tsx |   4 -
 .../editor-left-menu.spec.tsx                 | 285 ++++++++----------
 .../components/editor-left-menu/scope.tsx     |   5 -
 .../frontend/components/pdf-preview/scope.tsx |   4 -
 .../layout-dropdown-button.test.jsx           |  17 +-
 .../components/full-project-search.spec.tsx   |   2 +
 .../history/components/change-list.spec.tsx   | 160 +++++-----
 .../history/components/toolbar.spec.tsx       |  15 +-
 .../switch-to-editor-button.spec.tsx          |  18 +-
 .../components/switch-to-pdf-button.spec.tsx  |  10 +-
 .../source-editor/helpers/mock-scope.ts       |   3 -
 .../frontend/helpers/editor-providers.jsx     | 134 +++++++-
 17 files changed, 406 insertions(+), 310 deletions(-)
 delete mode 100644 services/web/frontend/js/features/ide-react/scope-adapters/layout-context-adapter.ts

diff --git a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
index e830d7ec1a..3a96bfc48d 100644
--- a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
@@ -36,8 +36,6 @@ import { DocId } from '../../../../../types/project-settings'
 import { Update } from '@/features/history/services/types/update'
 import { useDebugDiffTracker } from '../hooks/use-debug-diff-tracker'
 import { useEditorContext } from '@/shared/context/editor-context'
-import useScopeValueSetterOnly from '@/shared/hooks/use-scope-value-setter-only'
-import { BinaryFile } from '@/features/file-view/types/binary-file'
 import { convertFileRefToBinaryFile } from '@/features/ide-react/util/file-view'
 
 export interface GotoOffsetOptions {
@@ -97,7 +95,7 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
   const { reportError, eventEmitter, projectId } = useIdeReactContext()
   const { setOutOfSync } = useEditorContext()
   const { socket, closeConnection, connectionState } = useConnectionContext()
-  const { view, setView } = useLayoutContext()
+  const { view, setView, setOpenFile } = useLayoutContext()
   const { showGenericMessageModal, genericModalVisible, showOutOfSyncModal } =
     useModalsContext()
   const { id: userId } = useUserContext()
@@ -521,8 +519,6 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
     [fileTreeData, openDoc]
   )
 
-  const [, setOpenFile] = useScopeValueSetterOnly<BinaryFile | null>('openFile')
-
   const openFileWithId = useCallback(
     (fileRefId: string) => {
       const fileRef = findFileRefEntityById(fileTreeData, fileRefId)
diff --git a/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx b/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
index b46ac158c7..b4afd446da 100644
--- a/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
@@ -11,8 +11,6 @@ import {
 import { useProjectContext } from '@/shared/context/project-context'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
-import useScopeValueSetterOnly from '@/shared/hooks/use-scope-value-setter-only'
-import { BinaryFile } from '@/features/file-view/types/binary-file'
 import {
   FileTreeDocumentFindResult,
   FileTreeFileRefFindResult,
@@ -22,6 +20,7 @@ import { debugConsole } from '@/utils/debugging'
 import { convertFileRefToBinaryFile } from '@/features/ide-react/util/file-view'
 import { sendMB } from '@/infrastructure/event-tracking'
 import { FileRef } from '../../../../../types/file-ref'
+import { useLayoutContext } from '@/shared/context/layout-context'
 
 const FileTreeOpenContext = createContext<
   | {
@@ -43,7 +42,7 @@ export const FileTreeOpenProvider: FC<React.PropsWithChildren> = ({
   const { eventEmitter, projectJoined } = useIdeReactContext()
   const { openDocWithId, currentDocumentId, openInitialDoc } =
     useEditorManagerContext()
-  const [, setOpenFile] = useScopeValueSetterOnly<BinaryFile | null>('openFile')
+  const { setOpenFile } = useLayoutContext()
   const [openEntity, setOpenEntity] = useState<
     FileTreeDocumentFindResult | FileTreeFileRefFindResult | null
   >(null)
diff --git a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
index 51ecbdc6c9..63734d91aa 100644
--- a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
@@ -8,7 +8,6 @@ import React, {
   useCallback,
 } from 'react'
 import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/react-scope-value-store'
-import populateLayoutScope from '@/features/ide-react/scope-adapters/layout-context-adapter'
 import { IdeProvider } from '@/shared/context/ide-context'
 import {
   createIdeEventEmitter,
@@ -67,7 +66,6 @@ export function createReactScopeValueStore(projectId: string) {
   // necessary values in the store, but this is simpler for now
   populateIdeReactScope(scopeStore)
   populateEditorScope(scopeStore, projectId)
-  populateLayoutScope(scopeStore)
   populateProjectScope(scopeStore)
   populatePdfScope(scopeStore)
 
diff --git a/services/web/frontend/js/features/ide-react/scope-adapters/layout-context-adapter.ts b/services/web/frontend/js/features/ide-react/scope-adapters/layout-context-adapter.ts
deleted file mode 100644
index 88f252f70b..0000000000
--- a/services/web/frontend/js/features/ide-react/scope-adapters/layout-context-adapter.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ReactScopeValueStore } from '../scope-value-store/react-scope-value-store'
-import getMeta from '@/utils/meta'
-
-const reviewPanelStorageKey = `ui.reviewPanelOpen.${getMeta('ol-project_id')}`
-
-export default function populateLayoutScope(store: ReactScopeValueStore) {
-  store.set('ui.view', 'editor')
-  store.set('openFile', null)
-  store.persisted('ui.chatOpen', false, 'ui.chatOpen')
-  store.persisted('ui.reviewPanelOpen', false, reviewPanelStorageKey)
-  store.set('ui.leftMenuShown', false)
-  store.set('ui.miniReviewPanelVisible', false)
-  store.set('ui.pdfLayout', 'sideBySide')
-}
diff --git a/services/web/frontend/js/shared/context/layout-context.tsx b/services/web/frontend/js/shared/context/layout-context.tsx
index 050e679de7..c59efae270 100644
--- a/services/web/frontend/js/shared/context/layout-context.tsx
+++ b/services/web/frontend/js/shared/context/layout-context.tsx
@@ -9,7 +9,6 @@ import {
   FC,
   useState,
 } from 'react'
-import useScopeValue from '../hooks/use-scope-value'
 import useDetachLayout from '../hooks/use-detach-layout'
 import localStorage from '../../infrastructure/local-storage'
 import getMeta from '../../utils/meta'
@@ -21,6 +20,7 @@ import useEventListener from '@/shared/hooks/use-event-listener'
 import { isMac } from '@/shared/utils/os'
 import { sendSearchEvent } from '@/features/event-tracking/search-events'
 import { useRailContext } from '@/features/ide-redesign/contexts/rail-context'
+import usePersistedState from '@/shared/hooks/use-persisted-state'
 
 export type IdeLayout = 'sideBySide' | 'flat'
 export type IdeView = 'editor' | 'file' | 'pdf' | 'history'
@@ -55,6 +55,8 @@ export type LayoutContextValue = {
   pdfPreviewOpen: boolean
   projectSearchIsOpen: boolean
   setProjectSearchIsOpen: Dispatch<SetStateAction<boolean>>
+  openFile: BinaryFile | null
+  setOpenFile: Dispatch<SetStateAction<BinaryFile | null>>
 }
 
 const debugPdfDetach = getMeta('ol-debugPdfDetach')
@@ -70,10 +72,12 @@ function setLayoutInLocalStorage(pdfLayout: IdeLayout) {
   )
 }
 
+const reviewPanelStorageKey = `ui.reviewPanelOpen.${getMeta('ol-project_id')}`
+
 export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
   // what to show in the "flat" view (editor or pdf)
-  const [view, _setView] = useScopeValue<IdeView | null>('ui.view')
-  const [openFile] = useScopeValue<BinaryFile | null>('openFile')
+  const [view, _setView] = useState<IdeView | null>('editor')
+  const [openFile, setOpenFile] = useState<BinaryFile | null>(null)
   const historyToggleEmitter = useScopeEventEmitter('history:toggle', true)
   const { isOpen: railIsOpen, setIsOpen: setRailIsOpen } = useRailContext()
   const [prevRailIsOpen, setPrevRailIsOpen] = useState(railIsOpen)
@@ -118,19 +122,23 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
   )
 
   // whether the chat pane is open
-  const [chatIsOpen, setChatIsOpen] = useScopeValue<boolean>('ui.chatOpen')
+  const [chatIsOpen, setChatIsOpen] = usePersistedState<boolean>(
+    'ui.chatOpen',
+    false
+  )
 
   // whether the review pane is open
-  const [reviewPanelOpen, setReviewPanelOpen] =
-    useScopeValue<boolean>('ui.reviewPanelOpen')
+  const [reviewPanelOpen, setReviewPanelOpen] = usePersistedState<boolean>(
+    reviewPanelStorageKey,
+    false
+  )
 
   // whether the review pane is collapsed
   const [miniReviewPanelVisible, setMiniReviewPanelVisible] =
-    useScopeValue<boolean>('ui.miniReviewPanelVisible')
+    useState<boolean>(false)
 
   // whether the menu pane is open
-  const [leftMenuShown, setLeftMenuShown] =
-    useScopeValue<boolean>('ui.leftMenuShown')
+  const [leftMenuShown, setLeftMenuShown] = useState<boolean>(false)
 
   // whether the project search is open
   const [projectSearchIsOpen, setProjectSearchIsOpen] = useState(false)
@@ -173,7 +181,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
   )
 
   // whether to display the editor and preview side-by-side or full-width ("flat")
-  const [pdfLayout, setPdfLayout] = useScopeValue<IdeLayout>('ui.pdfLayout')
+  const [pdfLayout, setPdfLayout] = useState<IdeLayout>('sideBySide')
 
   // whether stylesheet on theme is loading
   const [loadingStyleSheet, setLoadingStyleSheet] = useState(false)
@@ -238,6 +246,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
       changeLayout,
       chatIsOpen,
       leftMenuShown,
+      openFile,
       pdfLayout,
       pdfPreviewOpen,
       projectSearchIsOpen,
@@ -247,6 +256,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
       loadingStyleSheet,
       setChatIsOpen,
       setLeftMenuShown,
+      setOpenFile,
       setPdfLayout,
       setReviewPanelOpen,
       setMiniReviewPanelVisible,
@@ -262,6 +272,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
       changeLayout,
       chatIsOpen,
       leftMenuShown,
+      openFile,
       pdfLayout,
       pdfPreviewOpen,
       projectSearchIsOpen,
@@ -271,6 +282,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
       loadingStyleSheet,
       setChatIsOpen,
       setLeftMenuShown,
+      setOpenFile,
       setPdfLayout,
       setReviewPanelOpen,
       setMiniReviewPanelVisible,
diff --git a/services/web/frontend/stories/decorators/scope.tsx b/services/web/frontend/stories/decorators/scope.tsx
index 31f38c79f4..00ad7f7daa 100644
--- a/services/web/frontend/stories/decorators/scope.tsx
+++ b/services/web/frontend/stories/decorators/scope.tsx
@@ -59,10 +59,6 @@ const project: Project = {
 const initialScope = {
   user,
   project,
-  ui: {
-    chatOpen: true,
-    pdfLayout: 'flat',
-  },
   settings: {
     pdfViewer: 'js',
     syntaxValidation: true,
diff --git a/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx b/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx
index 808f97bd4b..72955f38e6 100644
--- a/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx
+++ b/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx
@@ -56,14 +56,10 @@ describe('<EditorLeftMenu />', function () {
     })
 
     it('render full menu', function () {
-      const scope = mockScope({
-        ui: {
-          leftMenuShown: true,
-        },
-      })
+      const scope = mockScope()
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} layoutContext={{ leftMenuShown: true }}>
           <EditorLeftMenu />
         </EditorProviders>
       )
@@ -110,14 +106,12 @@ describe('<EditorLeftMenu />', function () {
 
     describe('download menu', function () {
       it('have a correct source & pdf download url', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
-
+        const scope = mockScope()
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -142,14 +136,13 @@ describe('<EditorLeftMenu />', function () {
           },
         })
 
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -184,14 +177,13 @@ describe('<EditorLeftMenu />', function () {
           },
         }).as('wordCount')
 
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -217,9 +209,6 @@ describe('<EditorLeftMenu />', function () {
         })
 
         const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
           project: {
             members: [],
             owner: {
@@ -234,7 +223,10 @@ describe('<EditorLeftMenu />', function () {
         })
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -245,9 +237,6 @@ describe('<EditorLeftMenu />', function () {
 
       it('shows git modal correctly', function () {
         const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
           project: {
             owner: {
               _id: '123',
@@ -259,7 +248,10 @@ describe('<EditorLeftMenu />', function () {
         })
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -271,9 +263,6 @@ describe('<EditorLeftMenu />', function () {
 
       it('shows git modal paywall correctly', function () {
         const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
           project: {
             owner: {
               _id: '123',
@@ -285,7 +274,10 @@ describe('<EditorLeftMenu />', function () {
         })
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -304,14 +296,13 @@ describe('<EditorLeftMenu />', function () {
           enabled: false,
         }).as('project-status')
 
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -335,14 +326,13 @@ describe('<EditorLeftMenu />', function () {
 
     describe('settings menu', function () {
       it('shows compiler menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -369,14 +359,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows texlive version menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -410,14 +399,14 @@ describe('<EditorLeftMenu />', function () {
           folders: [],
         }
 
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope} rootFolder={[rootFolder as any]}>
+          <EditorProviders
+            layoutContext={{ leftMenuShown: true }}
+            scope={scope}
+            rootFolder={[rootFolder as any]}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -451,14 +440,13 @@ describe('<EditorLeftMenu />', function () {
 
         window.metaAttributesCache.set('ol-languages', languages)
 
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -475,14 +463,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows dictionary modal correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -493,14 +480,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows auto-complete menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -517,14 +503,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows auto-close brackets menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -541,14 +526,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows code check menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -579,14 +563,13 @@ describe('<EditorLeftMenu />', function () {
           legacyEditorThemes
         )
 
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -619,14 +602,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows overall theme menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -643,14 +625,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows keybindings menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -667,14 +648,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows font size menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -713,14 +693,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows font family menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -741,14 +720,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows line height menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -765,14 +743,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows pdf viewer menu correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -791,14 +768,13 @@ describe('<EditorLeftMenu />', function () {
 
     describe('help menu', function () {
       it('shows hotkeys modal correctly', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -808,14 +784,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows correct url for documentation', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -828,14 +803,13 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows correct contact us modal', function () {
-        const scope = mockScope({
-          ui: {
-            leftMenuShown: true,
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            layoutContext={{ leftMenuShown: true }}
+          >
             <EditorLeftMenu />
           </EditorProviders>
         )
@@ -848,16 +822,13 @@ describe('<EditorLeftMenu />', function () {
 
   describe('for anonymous users', function () {
     it('render minimal menu', function () {
-      const scope = mockScope({
-        ui: {
-          leftMenuShown: true,
-        },
-      })
+      const scope = mockScope()
+
       window.metaAttributesCache.set('ol-anonymous', true)
       Object.assign(getMeta('ol-ExposedSettings'), { ieeeBrandId: 123 })
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} layoutContext={{ leftMenuShown: true }}>
           <EditorLeftMenu />
         </EditorProviders>
       )
diff --git a/services/web/test/frontend/components/editor-left-menu/scope.tsx b/services/web/test/frontend/components/editor-left-menu/scope.tsx
index ba1764c359..4c58c01f53 100644
--- a/services/web/test/frontend/components/editor-left-menu/scope.tsx
+++ b/services/web/test/frontend/components/editor-left-menu/scope.tsx
@@ -47,10 +47,5 @@ export const mockScope = (scope?: Scope) => ({
     },
   },
   hasLintingError: false,
-  ui: {
-    view: 'editor',
-    pdfLayout: 'sideBySide',
-    leftMenuShown: false,
-  },
   ...scope,
 })
diff --git a/services/web/test/frontend/components/pdf-preview/scope.tsx b/services/web/test/frontend/components/pdf-preview/scope.tsx
index bb4e4d9d1d..e174efbf73 100644
--- a/services/web/test/frontend/components/pdf-preview/scope.tsx
+++ b/services/web/test/frontend/components/pdf-preview/scope.tsx
@@ -17,8 +17,4 @@ export const mockScope = () => ({
     }),
   },
   hasLintingError: false,
-  ui: {
-    view: 'editor',
-    pdfLayout: 'sideBySide',
-  },
 })
diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.jsx b/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.jsx
index 55a5213a09..f8ac817c36 100644
--- a/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.jsx
+++ b/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.jsx
@@ -9,9 +9,11 @@ import * as eventTracking from '@/infrastructure/event-tracking'
 describe('<LayoutDropdownButton />', function () {
   let openStub
   let sendMBSpy
-  const defaultUi = {
+
+  const defaultLayout = {
     pdfLayout: 'flat',
     view: 'pdf',
+    chatIsOpen: false,
   }
 
   beforeEach(function () {
@@ -27,7 +29,9 @@ describe('<LayoutDropdownButton />', function () {
 
   it('should mark current layout option as selected', async function () {
     // Selected is aria-label, visually we show a checkmark
-    renderWithEditorContext(<LayoutDropdownButton />, { ui: defaultUi })
+    renderWithEditorContext(<LayoutDropdownButton />, {
+      layoutContext: defaultLayout,
+    })
 
     screen.getByRole('button', { name: 'Layout' }).click()
 
@@ -69,7 +73,7 @@ describe('<LayoutDropdownButton />', function () {
   it('should not select any option in history view', async function () {
     // Selected is aria-label, visually we show a checkmark
     renderWithEditorContext(<LayoutDropdownButton />, {
-      ui: { ...defaultUi, view: 'history' },
+      layoutContext: { ...defaultLayout, view: 'history' },
     })
 
     screen.getByRole('button', { name: 'Layout' }).click()
@@ -112,9 +116,10 @@ describe('<LayoutDropdownButton />', function () {
   it('should treat file and editor views the same way', async function () {
     // Selected is aria-label, visually we show a checkmark
     renderWithEditorContext(<LayoutDropdownButton />, {
-      ui: {
+      layoutContext: {
         pdfLayout: 'flat',
         view: 'file',
+        chatIsOpen: false,
       },
     })
 
@@ -161,7 +166,7 @@ describe('<LayoutDropdownButton />', function () {
       window.BroadcastChannel = originalBroadcastChannel || true // ensure that window.BroadcastChannel is truthy
 
       renderWithEditorContext(<LayoutDropdownButton />, {
-        ui: { ...defaultUi, view: 'editor' },
+        layoutContext: { ...defaultLayout, view: 'editor' },
       })
 
       screen.getByRole('button', { name: 'Layout' }).click()
@@ -192,7 +197,7 @@ describe('<LayoutDropdownButton />', function () {
     beforeEach(async function () {
       window.metaAttributesCache.set('ol-detachRole', 'detacher')
       renderWithEditorContext(<LayoutDropdownButton />, {
-        ui: { ...defaultUi, view: 'editor' },
+        layoutContext: { ...defaultLayout, view: 'editor' },
       })
 
       screen.getByRole('button', { name: 'Layout' }).click()
diff --git a/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx b/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx
index 261d43017f..e87467ee30 100644
--- a/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx
+++ b/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx
@@ -93,6 +93,8 @@ const createInitialValue = () =>
     pdfPreviewOpen: false,
     projectSearchIsOpen: true,
     setProjectSearchIsOpen: cy.stub(),
+    openFile: null,
+    setOpenFile: cy.stub(),
   }) satisfies LayoutContextValue
 
 const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
diff --git a/services/web/test/frontend/features/history/components/change-list.spec.tsx b/services/web/test/frontend/features/history/components/change-list.spec.tsx
index 763845db54..03c5a90592 100644
--- a/services/web/test/frontend/features/history/components/change-list.spec.tsx
+++ b/services/web/test/frontend/features/history/components/change-list.spec.tsx
@@ -14,11 +14,10 @@ import { withTestContainerErrorBoundary } from '../../../helpers/error-boundary'
 
 const TestContainerWithoutErrorBoundary: FC<{
   component: React.ReactNode
-  scope: Record<string, unknown>
   props: Record<string, unknown>
-}> = ({ component, scope, props }) => {
+}> = ({ component, props }) => {
   return (
-    <EditorProviders scope={scope} {...props}>
+    <EditorProviders {...props}>
       <HistoryProvider>
         <div style={{ display: 'flex', justifyContent: 'center' }}>
           <div className="history-react">{component}</div>
@@ -34,17 +33,12 @@ const TestContainer = withTestContainerErrorBoundary(
 
 const mountWithEditorProviders = (
   component: React.ReactNode,
-  scope: Record<string, unknown> = {},
   props: Record<string, unknown> = {}
 ) => {
-  cy.mount(<TestContainer component={component} scope={scope} props={props} />)
+  cy.mount(<TestContainer component={component} props={props} />)
 }
 
 describe('change list (Bootstrap 5)', function () {
-  const scope = {
-    ui: { view: 'history', pdfLayout: 'sideBySide', chatOpen: true },
-  }
-
   const waitForData = () => {
     cy.wait('@updates')
     cy.wait('@labels')
@@ -101,7 +95,8 @@ describe('change list (Bootstrap 5)', function () {
 
   describe('tags', function () {
     it('renders tags', function () {
-      mountWithEditorProviders(<ChangeList />, scope, {
+      mountWithEditorProviders(<ChangeList />, {
+        layoutContext: { view: 'history' },
         user: {
           id: USER_ID,
           email: USER_EMAIL,
@@ -173,13 +168,18 @@ describe('change list (Bootstrap 5)', function () {
     })
 
     it('deletes tag', function () {
-      mountWithEditorProviders(<ChangeList />, scope, {
-        user: {
-          id: USER_ID,
-          email: USER_EMAIL,
-          isAdmin: true,
-        },
-      })
+      mountWithEditorProviders(
+        <ChangeList />,
+
+        {
+          layoutContext: { view: 'history' },
+          user: {
+            id: USER_ID,
+            email: USER_EMAIL,
+            isAdmin: true,
+          },
+        }
+      )
       waitForData()
 
       cy.findByLabelText(/all history/i).click({ force: true })
@@ -235,7 +235,8 @@ describe('change list (Bootstrap 5)', function () {
     })
 
     it('verifies that selecting the same list item will not trigger a new diff', function () {
-      mountWithEditorProviders(<ChangeList />, scope, {
+      mountWithEditorProviders(<ChangeList />, {
+        layoutContext: { view: 'history' },
         user: {
           id: USER_ID,
           email: USER_EMAIL,
@@ -257,13 +258,18 @@ describe('change list (Bootstrap 5)', function () {
 
   describe('all history', function () {
     beforeEach(function () {
-      mountWithEditorProviders(<ChangeList />, scope, {
-        user: {
-          id: USER_ID,
-          email: USER_EMAIL,
-          isAdmin: true,
-        },
-      })
+      mountWithEditorProviders(
+        <ChangeList />,
+
+        {
+          layoutContext: { view: 'history' },
+          user: {
+            id: USER_ID,
+            email: USER_EMAIL,
+            isAdmin: true,
+          },
+        }
+      )
       waitForData()
     })
 
@@ -318,13 +324,18 @@ describe('change list (Bootstrap 5)', function () {
 
   describe('labels only', function () {
     beforeEach(function () {
-      mountWithEditorProviders(<ChangeList />, scope, {
-        user: {
-          id: USER_ID,
-          email: USER_EMAIL,
-          isAdmin: true,
-        },
-      })
+      mountWithEditorProviders(
+        <ChangeList />,
+
+        {
+          layoutContext: { view: 'history' },
+          user: {
+            id: USER_ID,
+            email: USER_EMAIL,
+            isAdmin: true,
+          },
+        }
+      )
       waitForData()
       cy.findByLabelText(/labels/i).click({ force: true })
     })
@@ -399,13 +410,18 @@ describe('change list (Bootstrap 5)', function () {
 
   describe('compare mode', function () {
     beforeEach(function () {
-      mountWithEditorProviders(<ChangeList />, scope, {
-        user: {
-          id: USER_ID,
-          email: USER_EMAIL,
-          isAdmin: true,
-        },
-      })
+      mountWithEditorProviders(
+        <ChangeList />,
+
+        {
+          layoutContext: { view: 'history' },
+          user: {
+            id: USER_ID,
+            email: USER_EMAIL,
+            isAdmin: true,
+          },
+        }
+      )
       waitForData()
     })
 
@@ -435,13 +451,18 @@ describe('change list (Bootstrap 5)', function () {
 
   describe('dropdown', function () {
     beforeEach(function () {
-      mountWithEditorProviders(<ChangeList />, scope, {
-        user: {
-          id: USER_ID,
-          email: USER_EMAIL,
-          isAdmin: true,
-        },
-      })
+      mountWithEditorProviders(
+        <ChangeList />,
+
+        {
+          layoutContext: { view: 'history' },
+          user: {
+            id: USER_ID,
+            email: USER_EMAIL,
+            isAdmin: true,
+          },
+        }
+      )
       waitForData()
     })
 
@@ -610,21 +631,18 @@ describe('change list (Bootstrap 5)', function () {
     })
 
     it('shows non-owner paywall', function () {
-      const scope = {
-        ui: {
-          view: 'history',
-          pdfLayout: 'sideBySide',
-          chatOpen: true,
-        },
-      }
+      mountWithEditorProviders(
+        <ChangeList />,
 
-      mountWithEditorProviders(<ChangeList />, scope, {
-        user: {
-          id: USER_ID,
-          email: USER_EMAIL,
-          isAdmin: false,
-        },
-      })
+        {
+          layoutContext: { view: 'history' },
+          user: {
+            id: USER_ID,
+            email: USER_EMAIL,
+            isAdmin: false,
+          },
+        }
+      )
 
       waitForData()
 
@@ -634,15 +652,8 @@ describe('change list (Bootstrap 5)', function () {
     })
 
     it('shows owner paywall', function () {
-      const scope = {
-        ui: {
-          view: 'history',
-          pdfLayout: 'sideBySide',
-          chatOpen: true,
-        },
-      }
-
-      mountWithEditorProviders(<ChangeList />, scope, {
+      mountWithEditorProviders(<ChangeList />, {
+        layoutContext: { view: 'history' },
         user: {
           id: USER_ID,
           email: USER_EMAIL,
@@ -662,15 +673,8 @@ describe('change list (Bootstrap 5)', function () {
     })
 
     it('shows all labels in free tier', function () {
-      const scope = {
-        ui: {
-          view: 'history',
-          pdfLayout: 'sideBySide',
-          chatOpen: true,
-        },
-      }
-
-      mountWithEditorProviders(<ChangeList />, scope, {
+      mountWithEditorProviders(<ChangeList />, {
+        layoutContext: { view: 'history' },
         user: {
           id: USER_ID,
           email: USER_EMAIL,
diff --git a/services/web/test/frontend/features/history/components/toolbar.spec.tsx b/services/web/test/frontend/features/history/components/toolbar.spec.tsx
index f60beff7ce..bc2b518eae 100644
--- a/services/web/test/frontend/features/history/components/toolbar.spec.tsx
+++ b/services/web/test/frontend/features/history/components/toolbar.spec.tsx
@@ -5,14 +5,15 @@ import { Diff } from '../../../../../frontend/js/features/history/services/types
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { FC } from 'react'
 import { withTestContainerErrorBoundary } from '../../../helpers/error-boundary'
+import { LayoutContextValue } from '@/shared/context/layout-context'
 
 const TestContainerWithoutErrorBoundary: FC<{
-  scope: Record<string, unknown>
+  layoutContext: LayoutContextValue
   diff: Diff
   selection: HistoryContextValue['selection']
-}> = ({ scope, diff, selection }) => {
+}> = ({ diff, selection, layoutContext }) => {
   return (
-    <EditorProviders scope={scope}>
+    <EditorProviders layoutContext={layoutContext}>
       <HistoryProvider>
         <div className="history-react">
           <Toolbar diff={diff} selection={selection} />
@@ -27,10 +28,6 @@ const TestContainer = withTestContainerErrorBoundary(
 )
 
 describe('history toolbar', function () {
-  const editorProvidersScope = {
-    ui: { view: 'history', pdfLayout: 'sideBySide', chatOpen: true },
-  }
-
   const diff: Diff = {
     binary: false,
     docDiff: {
@@ -81,7 +78,7 @@ describe('history toolbar', function () {
 
     cy.mount(
       <TestContainer
-        scope={editorProvidersScope}
+        layoutContext={{ view: 'history' }}
         diff={diff}
         selection={selection}
       />
@@ -129,7 +126,7 @@ describe('history toolbar', function () {
 
     cy.mount(
       <TestContainer
-        scope={editorProvidersScope}
+        layoutContext={{ view: 'history' }}
         diff={diff}
         selection={selection}
       />
diff --git a/services/web/test/frontend/features/layout/components/switch-to-editor-button.spec.tsx b/services/web/test/frontend/features/layout/components/switch-to-editor-button.spec.tsx
index 3cb8ea2fee..9efd500dff 100644
--- a/services/web/test/frontend/features/layout/components/switch-to-editor-button.spec.tsx
+++ b/services/web/test/frontend/features/layout/components/switch-to-editor-button.spec.tsx
@@ -4,7 +4,9 @@ import SwitchToEditorButton from '@/features/pdf-preview/components/switch-to-ed
 describe('<SwitchToEditorButton />', function () {
   it('shows button in full screen pdf layout', function () {
     cy.mount(
-      <EditorProviders ui={{ view: 'pdf', pdfLayout: 'flat', chatOpen: false }}>
+      <EditorProviders
+        layoutContext={{ view: 'pdf', pdfLayout: 'flat', chatIsOpen: false }}
+      >
         <SwitchToEditorButton />
       </EditorProviders>
     )
@@ -15,7 +17,11 @@ describe('<SwitchToEditorButton />', function () {
   it('does not show button in split screen layout', function () {
     cy.mount(
       <EditorProviders
-        ui={{ view: 'pdf', pdfLayout: 'sideBySide', chatOpen: false }}
+        layoutContext={{
+          view: 'pdf',
+          pdfLayout: 'sideBySide',
+          chatIsOpen: false,
+        }}
       >
         <SwitchToEditorButton />
       </EditorProviders>
@@ -28,7 +34,13 @@ describe('<SwitchToEditorButton />', function () {
     window.metaAttributesCache.set('ol-detachRole', 'detacher')
 
     cy.mount(
-      <EditorProviders ui={{ view: 'pdf', pdfLayout: 'flat', chatOpen: false }}>
+      <EditorProviders
+        layoutContext={{
+          view: 'pdf',
+          pdfLayout: 'flat',
+          chatIsOpen: false,
+        }}
+      >
         <SwitchToEditorButton />
       </EditorProviders>
     )
diff --git a/services/web/test/frontend/features/layout/components/switch-to-pdf-button.spec.tsx b/services/web/test/frontend/features/layout/components/switch-to-pdf-button.spec.tsx
index 43fc1cabfc..04e20250d8 100644
--- a/services/web/test/frontend/features/layout/components/switch-to-pdf-button.spec.tsx
+++ b/services/web/test/frontend/features/layout/components/switch-to-pdf-button.spec.tsx
@@ -5,7 +5,7 @@ describe('<SwitchToPDFButton />', function () {
   it('shows button in full screen editor layout', function () {
     cy.mount(
       <EditorProviders
-        ui={{ view: 'editor', pdfLayout: 'flat', chatOpen: false }}
+        layoutContext={{ view: 'editor', pdfLayout: 'flat', chatIsOpen: false }}
       >
         <SwitchToPDFButton />
       </EditorProviders>
@@ -17,7 +17,11 @@ describe('<SwitchToPDFButton />', function () {
   it('does not show button in split screen layout', function () {
     cy.mount(
       <EditorProviders
-        ui={{ view: 'editor', pdfLayout: 'sideBySide', chatOpen: false }}
+        layoutContext={{
+          view: 'editor',
+          pdfLayout: 'sideBySide',
+          chatIsOpen: false,
+        }}
       >
         <SwitchToPDFButton />
       </EditorProviders>
@@ -31,7 +35,7 @@ describe('<SwitchToPDFButton />', function () {
 
     cy.mount(
       <EditorProviders
-        ui={{ view: 'editor', pdfLayout: 'flat', chatOpen: false }}
+        layoutContext={{ view: 'editor', pdfLayout: 'flat', chatIsOpen: false }}
       >
         <SwitchToPDFButton />
       </EditorProviders>
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
index 621bdecd3c..1f78dcf93a 100644
--- a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
@@ -81,9 +81,6 @@ export const mockScope = (
       write: true,
       ...permissions,
     },
-    ui: {
-      reviewPanelOpen: false,
-    },
     toggleReviewPanel: cy.stub(),
     toggleTrackChangesForEveryone: cy.stub(),
     refreshResolvedCommentsDropdown: cy.stub(() => sleep(1000)),
diff --git a/services/web/test/frontend/helpers/editor-providers.jsx b/services/web/test/frontend/helpers/editor-providers.jsx
index 1fe143a8e3..4f722525c7 100644
--- a/services/web/test/frontend/helpers/editor-providers.jsx
+++ b/services/web/test/frontend/helpers/editor-providers.jsx
@@ -3,7 +3,7 @@
 import { merge } from 'lodash'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
 import { IdeContext } from '@/shared/context/ide-context'
-import React, { useEffect, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import {
   createReactScopeValueStore,
   IdeReactContext,
@@ -12,6 +12,9 @@ import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
 import { ConnectionContext } from '@/features/ide-react/context/connection-context'
 import { ReactContextRoot } from '@/features/ide-react/context/react-context-root'
+import useEventListener from '@/shared/hooks/use-event-listener'
+import useDetachLayout from '@/shared/hooks/use-detach-layout'
+import { LayoutContext } from '@/shared/context/layout-context'
 
 // these constants can be imported in tests instead of
 // using magic strings
@@ -35,6 +38,22 @@ const defaultUserSettings = {
   mathPreview: true,
 }
 
+/**
+ * @typedef {import('@/shared/context/layout-context').LayoutContextValue} LayoutContextValue
+ * @type Partial<LayoutContextValue>
+ */
+const layoutContextDefault = {
+  view: 'editor',
+  openFile: null,
+  chatIsOpen: true, // false in the application, true in tests
+  reviewPanelOpen: false,
+  miniReviewPanelVisible: false,
+  leftMenuShown: false,
+  projectSearchIsOpen: false,
+  pdfLayout: 'sideBySide',
+  loadingStyleSheet: false,
+}
+
 export function EditorProviders({
   user = { id: USER_ID, email: USER_EMAIL },
   projectId = PROJECT_ID,
@@ -68,7 +87,8 @@ export function EditorProviders({
       fileRefs: [],
     },
   ],
-  ui = { view: 'editor', pdfLayout: 'sideBySide', chatOpen: true },
+  /** @type {Partial<LayoutContext>} */
+  layoutContext = layoutContextDefault,
   userSettings = {},
   providers = {},
 }) {
@@ -110,7 +130,6 @@ export function EditorProviders({
         imageName,
         compiler,
       },
-      ui,
       permissionsLevel,
     },
     defaultScope
@@ -125,6 +144,7 @@ export function EditorProviders({
       providers={{
         ConnectionProvider: makeConnectionProvider(socket),
         IdeReactProvider: makeIdeReactProvider(scope, socket),
+        LayoutProvider: makeLayoutProvider(layoutContext),
         ...providers,
       }}
     >
@@ -183,7 +203,6 @@ const makeIdeReactProvider = (scope, socket) => {
         scopeStore.set(key, value)
       }
       scopeStore.set('editor.sharejs_doc', scope.editor.sharejs_doc)
-      scopeStore.set('ui.chatOpen', scope.ui.chatOpen)
       const scopeEventEmitter = new ReactScopeEventEmitter(
         new IdeEventEmitter()
       )
@@ -215,3 +234,110 @@ const makeIdeReactProvider = (scope, socket) => {
   }
   return IdeReactProvider
 }
+
+const makeLayoutProvider = layoutContextOverrides => {
+  const layout = {
+    ...layoutContextDefault,
+    ...layoutContextOverrides,
+  }
+  const LayoutProvider = ({ children }) => {
+    const [view, setView] = useState(layout.view)
+    const [openFile, setOpenFile] = useState(layout.openFile)
+    const [chatIsOpen, setChatIsOpen] = useState(layout.chatIsOpen)
+    const [reviewPanelOpen, setReviewPanelOpen] = useState(
+      layout.reviewPanelOpen
+    )
+    const [miniReviewPanelVisible, setMiniReviewPanelVisible] = useState(
+      layout.miniReviewPanelVisible
+    )
+    const [leftMenuShown, setLeftMenuShown] = useState(layout.leftMenuShown)
+    const [projectSearchIsOpen, setProjectSearchIsOpen] = useState(
+      layout.projectSearchIsOpen
+    )
+    const [pdfLayout, setPdfLayout] = useState(layout.pdfLayout)
+    const [loadingStyleSheet, setLoadingStyleSheet] = useState(
+      layout.loadingStyleSheet
+    )
+
+    useEventListener(
+      'ui.toggle-review-panel',
+      useCallback(() => {
+        setReviewPanelOpen(open => !open)
+      }, [setReviewPanelOpen])
+    )
+    const changeLayout = useCallback(
+      (newLayout, newView = 'editor') => {
+        setPdfLayout(newLayout)
+        setView(newLayout === 'sideBySide' ? 'editor' : newView)
+      },
+      [setPdfLayout, setView]
+    )
+    const {
+      reattach,
+      detach,
+      isLinked: detachIsLinked,
+      role: detachRole,
+    } = useDetachLayout()
+    const pdfPreviewOpen =
+      pdfLayout === 'sideBySide' || view === 'pdf' || detachRole === 'detacher'
+    const value = useMemo(
+      () => ({
+        reattach,
+        detach,
+        detachIsLinked,
+        detachRole,
+        changeLayout,
+        chatIsOpen,
+        leftMenuShown,
+        openFile,
+        pdfLayout,
+        pdfPreviewOpen,
+        projectSearchIsOpen,
+        setProjectSearchIsOpen,
+        reviewPanelOpen,
+        miniReviewPanelVisible,
+        loadingStyleSheet,
+        setChatIsOpen,
+        setLeftMenuShown,
+        setOpenFile,
+        setPdfLayout,
+        setReviewPanelOpen,
+        setMiniReviewPanelVisible,
+        setLoadingStyleSheet,
+        setView,
+        view,
+      }),
+      [
+        reattach,
+        detach,
+        detachIsLinked,
+        detachRole,
+        changeLayout,
+        chatIsOpen,
+        leftMenuShown,
+        openFile,
+        pdfLayout,
+        pdfPreviewOpen,
+        projectSearchIsOpen,
+        setProjectSearchIsOpen,
+        reviewPanelOpen,
+        miniReviewPanelVisible,
+        loadingStyleSheet,
+        setChatIsOpen,
+        setLeftMenuShown,
+        setOpenFile,
+        setPdfLayout,
+        setReviewPanelOpen,
+        setMiniReviewPanelVisible,
+        setLoadingStyleSheet,
+        setView,
+        view,
+      ]
+    )
+
+    return (
+      <LayoutContext.Provider value={value}>{children}</LayoutContext.Provider>
+    )
+  }
+  return LayoutProvider
+}

From e6d09ca748e7cb5a48a9d161b55e8c4e8a5a2837 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Tue, 24 Jun 2025 10:10:36 +0200
Subject: [PATCH 018/274] [web] Fix Editor Stories (#26535)

* Fix storybook stories

* Add `chat` to `ol-capabilities` in Storybook

GitOrigin-RevId: 0816c82170ebc3bfe9ca2d7f02766364c693365a
---
 services/web/.storybook/preview.tsx                         | 6 ++++++
 .../web/frontend/stories/file-view/file-view.stories.jsx    | 1 +
 services/web/frontend/stories/fixtures/compile.js           | 2 +-
 services/web/frontend/stories/pdf-preview.stories.jsx       | 2 +-
 .../stories/source-editor/source-editor.stories.tsx         | 3 +++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/services/web/.storybook/preview.tsx b/services/web/.storybook/preview.tsx
index 320caac144..c5d50da27a 100644
--- a/services/web/.storybook/preview.tsx
+++ b/services/web/.storybook/preview.tsx
@@ -13,6 +13,12 @@ import en from '../../../services/web/locales/en.json'
 function resetMeta() {
   window.metaAttributesCache = new Map()
   window.metaAttributesCache.set('ol-i18n', { currentLangCode: 'en' })
+  window.metaAttributesCache.set('ol-projectHistoryBlobsEnabled', true)
+  window.metaAttributesCache.set('ol-capabilities', ['chat'])
+  window.metaAttributesCache.set('ol-compileSettings', {
+    reducedTimeoutWarning: 'default',
+    compileTimeout: 20,
+  })
   window.metaAttributesCache.set('ol-ExposedSettings', {
     adminEmail: 'placeholder@example.com',
     appName: 'Overleaf',
diff --git a/services/web/frontend/stories/file-view/file-view.stories.jsx b/services/web/frontend/stories/file-view/file-view.stories.jsx
index 5622e6eb52..80c4363c9d 100644
--- a/services/web/frontend/stories/file-view/file-view.stories.jsx
+++ b/services/web/frontend/stories/file-view/file-view.stories.jsx
@@ -35,6 +35,7 @@ const setupFetchMock = fetchMock => {
 const fileData = {
   id: 'file-id',
   name: 'file.tex',
+  hash: 'c0ffee',
   created: new Date().toISOString(),
 }
 
diff --git a/services/web/frontend/stories/fixtures/compile.js b/services/web/frontend/stories/fixtures/compile.js
index bc7ebfae8b..e31a4488e4 100644
--- a/services/web/frontend/stories/fixtures/compile.js
+++ b/services/web/frontend/stories/fixtures/compile.js
@@ -100,7 +100,7 @@ export const mockClearCache = fetchMock =>
   })
 
 export const mockBuildFile = fetchMock =>
-  fetchMock.get('express:/build/:file', url => {
+  fetchMock.get('express:/build/:file', ({ url }) => {
     const { pathname } = new URL(url, 'https://example.com')
 
     switch (pathname) {
diff --git a/services/web/frontend/stories/pdf-preview.stories.jsx b/services/web/frontend/stories/pdf-preview.stories.jsx
index 0233006a00..df0429734e 100644
--- a/services/web/frontend/stories/pdf-preview.stories.jsx
+++ b/services/web/frontend/stories/pdf-preview.stories.jsx
@@ -319,7 +319,7 @@ export const HybridToolbar = () => {
 
 export const FileList = () => {
   const fileList = useMemo(() => {
-    return buildFileList(cloneDeep(outputFiles))
+    return buildFileList(cloneDeep(outputFiles), {})
   }, [])
 
   return (
diff --git a/services/web/frontend/stories/source-editor/source-editor.stories.tsx b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
index 3cc6b1c95f..184c4faa46 100644
--- a/services/web/frontend/stories/source-editor/source-editor.stories.tsx
+++ b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
@@ -189,6 +189,9 @@ const mockDoc = (content: string, changes: Array<Record<string, any>> = []) => {
     detachFromCM6: () => {
       // Do nothing
     },
+    getType: () => {
+      return 'history-ot'
+    },
     on: () => {
       // Do nothing
     },

From f0c63b6ccdbfe35c5e4f42554840608fc2142a3e Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Tue, 24 Jun 2025 09:40:31 +0100
Subject: [PATCH 019/274] Merge pull request #26175 from
 overleaf/bg-fix-logging-in-project-deletion

test logging in user and project deletion

GitOrigin-RevId: ea51082aeada81f8e7ae356966cda0f57f7cd072
---
 .../src/Features/Project/ProjectDeleter.js    |  2 +-
 .../web/test/acceptance/src/DeletionTests.mjs | 36 +++++++++++++++++++
 .../unit/src/Project/ProjectDeleterTests.js   | 11 ++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js
index b81281e319..b4f6a2b779 100644
--- a/services/web/app/src/Features/Project/ProjectDeleter.js
+++ b/services/web/app/src/Features/Project/ProjectDeleter.js
@@ -385,7 +385,7 @@ async function expireDeletedProject(projectId) {
       )
       return
     }
-    const userId = deletedProject.deletedProjectOwnerId
+    const userId = deletedProject.deleterData?.deletedProjectOwnerId?.toString()
     const historyId =
       deletedProject.project.overleaf &&
       deletedProject.project.overleaf.history &&
diff --git a/services/web/test/acceptance/src/DeletionTests.mjs b/services/web/test/acceptance/src/DeletionTests.mjs
index 121c2580d8..e589be9474 100644
--- a/services/web/test/acceptance/src/DeletionTests.mjs
+++ b/services/web/test/acceptance/src/DeletionTests.mjs
@@ -1,3 +1,5 @@
+import logger from '@overleaf/logger'
+import sinon from 'sinon'
 import User from './helpers/User.mjs'
 import Subscription from './helpers/Subscription.mjs'
 import request from './helpers/request.js'
@@ -18,6 +20,8 @@ let MockDocstoreApi,
   MockGitBridgeApi,
   MockHistoryBackupDeletionApi
 
+let spy
+
 before(function () {
   MockDocstoreApi = MockDocstoreApiClass.instance()
   MockFilestoreApi = MockFilestoreApiClass.instance()
@@ -28,6 +32,7 @@ before(function () {
 
 describe('Deleting a user', function () {
   beforeEach(function (done) {
+    spy = sinon.spy(logger, 'info')
     async.auto(
       {
         user: cb => {
@@ -64,6 +69,10 @@ describe('Deleting a user', function () {
     )
   })
 
+  afterEach(function () {
+    spy.restore()
+  })
+
   it('Should remove the user from active users', function (done) {
     this.user.get((error, user) => {
       expect(error).not.to.exist
@@ -183,6 +192,7 @@ describe('Deleting a user', function () {
 
 describe('Deleting a project', function () {
   beforeEach(function (done) {
+    spy = sinon.spy(logger, 'info')
     this.user = new User()
     this.projectName = 'wombat'
     this.user.ensureUserExists(() => {
@@ -195,6 +205,10 @@ describe('Deleting a project', function () {
     })
   })
 
+  afterEach(function () {
+    logger.info.restore()
+  })
+
   it('Should remove the project from active projects', function (done) {
     this.user.getProject(this.projectId, (error, project) => {
       expect(error).not.to.exist
@@ -292,6 +306,28 @@ describe('Deleting a project', function () {
         })
       })
 
+      it('Should log a successful deletion', function (done) {
+        request.post(
+          `/internal/project/${this.projectId}/expire-deleted-project`,
+          {
+            auth: {
+              user: settings.apis.web.user,
+              pass: settings.apis.web.pass,
+              sendImmediately: true,
+            },
+          },
+          (error, res) => {
+            expect(error).not.to.exist
+            expect(res.statusCode).to.equal(200)
+            expect(spy).to.have.been.calledWithMatch(
+              { projectId: this.projectId, userId: this.user._id },
+              'expired deleted project successfully'
+            )
+            done()
+          }
+        )
+      })
+
       it('Should destroy the docs', function (done) {
         expect(
           MockDocstoreApi.docs[this.projectId.toString()][this.docId.toString()]
diff --git a/services/web/test/unit/src/Project/ProjectDeleterTests.js b/services/web/test/unit/src/Project/ProjectDeleterTests.js
index 20f8cf2ead..199b8518e7 100644
--- a/services/web/test/unit/src/Project/ProjectDeleterTests.js
+++ b/services/web/test/unit/src/Project/ProjectDeleterTests.js
@@ -36,6 +36,7 @@ describe('ProjectDeleter', function () {
           deleterId: '588f3ddae8ebc1bac07c9fa4',
           deleterIpAddress: '172.19.0.1',
           deletedProjectId: '5cf9270b4eff6e186cf8b05e',
+          deletedProjectOwnerId: this.user._id,
         },
         project: {
           _id: '5cf9270b4eff6e186cf8b05e',
@@ -501,6 +502,16 @@ describe('ProjectDeleter', function () {
           projectId: this.deletedProjects[0].project._id,
         })
       })
+
+      it('should log a completed deletion', async function () {
+        expect(this.logger.info).to.have.been.calledWith(
+          {
+            projectId: this.deletedProjects[0].project._id,
+            userId: this.user._id,
+          },
+          'expired deleted project successfully'
+        )
+      })
     })
 
     describe('on an active project (from an incomplete delete)', function () {

From f53a13ae1e36fa65dc7fbada3d4b35592e11dbd5 Mon Sep 17 00:00:00 2001
From: Lucie Germain <116178070+lucie-germain@users.noreply.github.com>
Date: Tue, 24 Jun 2025 09:50:19 +0100
Subject: [PATCH 020/274] Merge pull request #26604 from
 overleaf/mf-resync-recurly-state-single-subscription

Add script to sync recurlyStatus.state for a single subscriptionId

GitOrigin-RevId: 69af89a44b4043d92853862baee65d8b7f84b88f
---
 ...sync_recurly_state_single_subscription.mjs | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 services/web/scripts/recurly/resync_recurly_state_single_subscription.mjs

diff --git a/services/web/scripts/recurly/resync_recurly_state_single_subscription.mjs b/services/web/scripts/recurly/resync_recurly_state_single_subscription.mjs
new file mode 100644
index 0000000000..85d3e3eb77
--- /dev/null
+++ b/services/web/scripts/recurly/resync_recurly_state_single_subscription.mjs
@@ -0,0 +1,137 @@
+import { Subscription } from '../../app/src/models/Subscription.js'
+import RecurlyWrapper from '../../app/src/Features/Subscription/RecurlyWrapper.js'
+import SubscriptionUpdater from '../../app/src/Features/Subscription/SubscriptionUpdater.js'
+import minimist from 'minimist'
+import { setTimeout } from 'node:timers/promises'
+import util from 'node:util'
+
+util.inspect.defaultOptions.maxArrayLength = null
+
+const handleSyncSubscriptionError = async (subscription, error) => {
+  console.warn(`Errors with subscription id=${subscription._id}:`, error)
+
+  if (typeof error === 'string' && error.match(/429$/)) {
+    console.warn('Recurly rate limit hit (429). Waiting for 5 minutes...')
+    await setTimeout(1000 * 60 * 5)
+    return
+  }
+  if (typeof error === 'string' && error.match(/5\d\d$/)) {
+    console.warn('Recurly server error (5xx). Retrying in 1 minute...')
+    await setTimeout(1000 * 60)
+    await syncRecurlyStateInSubscription(subscription)
+    return
+  }
+  await setTimeout(80)
+}
+
+const syncRecurlyStateInSubscription = async subscription => {
+  let recurlySubscription
+
+  try {
+    recurlySubscription = await RecurlyWrapper.promises.getSubscription(
+      subscription.recurlySubscription_id
+    )
+  } catch (error) {
+    await handleSyncSubscriptionError(subscription, error)
+    return
+  }
+
+  if (!subscription.recurlyStatus) {
+    subscription.recurlyStatus = {}
+  }
+
+  if (subscription.recurlyStatus.state !== recurlySubscription.state) {
+    console.log(
+      `Mismatched recurlyStatus.state for subscription ID ${subscription._id}. ` +
+        `Our database: '${subscription.recurlyStatus.state || 'undefined/null'}', recurly: '${recurlySubscription.state}'.`
+    )
+
+    subscription.recurlyStatus.state = recurlySubscription.state
+
+    if (COMMIT) {
+      try {
+        console.log(
+          `Committing update for subscription ID: ${subscription._id}`
+        )
+        await SubscriptionUpdater.promises.updateSubscriptionFromRecurly(
+          recurlySubscription,
+          subscription,
+          {}
+        )
+      } catch (error) {
+        await handleSyncSubscriptionError(subscription, error)
+      }
+
+      console.log(
+        `Successfully updated subscription ID ${subscription._id} with new recurlyStatus.state: ${subscription.recurlyStatus.state}`
+      )
+    }
+  } else {
+    console.log(
+      `Subscription ID ${subscription._id}: recurlyStatus.state is already in sync.`
+    )
+  }
+
+  await setTimeout(80)
+}
+
+let COMMIT, SUBSCRIPTION_ID
+
+const setup = () => {
+  const argv = minimist(process.argv.slice(2))
+
+  SUBSCRIPTION_ID = argv.subscriptionId
+  if (!SUBSCRIPTION_ID) {
+    console.error(
+      'Error: Please provide a subscription ID using --subscriptionId=<id>'
+    )
+    process.exit(1)
+  }
+  console.log(
+    `Attempting to sync subscription.recurlyStatus with ID: ${SUBSCRIPTION_ID}`
+  )
+
+  COMMIT = argv.commit !== undefined
+  if (!COMMIT) {
+    console.warn(
+      'Doing dry run without --commit. No database changes will be made.'
+    )
+  }
+}
+
+const run = async () => {
+  try {
+    const subscription = await Subscription.findById(SUBSCRIPTION_ID).exec()
+
+    if (!subscription) {
+      console.error(
+        `Error: Subscription with ID ${SUBSCRIPTION_ID} not found in the database.`
+      )
+      process.exit(1)
+    }
+
+    if (!subscription.recurlySubscription_id) {
+      console.error(
+        `Error: Subscription ID ${SUBSCRIPTION_ID} does not have a Recurly subscription ID.`
+      )
+      process.exit(1)
+    }
+
+    console.log(
+      `Found subscription: ${subscription._id}, Recurly ID: ${subscription.recurlySubscription_id}`
+    )
+
+    await syncRecurlyStateInSubscription(subscription)
+
+    console.log('DONE')
+  } catch (error) {
+    console.error('An unhandled error occurred during script execution:', error)
+    process.exit(1)
+  }
+}
+
+setup()
+
+await run()
+
+process.exit(0)

From fda96b2fdf38b0b2ef8fb3dbd814ed81bbbf1eea Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Tue, 24 Jun 2025 11:29:53 +0200
Subject: [PATCH 021/274] Add promo notifications for AI assist (#26514)

* Add promo notifications for AI assist

* format pug

GitOrigin-RevId: 8895145e1e5dcd8e28f29bf2601a4bd21456a407
---
 .../Project/ProjectListController.mjs         |  24 +++-
 services/web/app/views/project/list-react.pug |   5 +
 .../web/frontend/extracted-translations.json  |   6 +
 .../notifications/ai-assist-banner.tsx        | 128 ++++++++++++++++++
 .../components/notifications/notification.tsx |   9 +-
 .../notifications/user-notifications.tsx      |   2 +
 .../js/shared/components/notification.tsx     |  21 ++-
 .../js/shared/svgs/sparkle-2-stars.svg        |  16 +++
 services/web/frontend/js/utils/meta.ts        |   1 +
 .../bootstrap-5/components/notifications.scss |   6 +
 services/web/locales/en.json                  |   6 +
 .../components/project-list-root.test.tsx     |   6 +-
 .../Project/ProjectListController.test.mjs    |  25 ++++
 13 files changed, 248 insertions(+), 7 deletions(-)
 create mode 100644 services/web/frontend/js/features/project-list/components/notifications/ai-assist-banner.tsx
 create mode 100644 services/web/frontend/js/shared/svgs/sparkle-2-stars.svg

diff --git a/services/web/app/src/Features/Project/ProjectListController.mjs b/services/web/app/src/Features/Project/ProjectListController.mjs
index ab2b0e3082..b12d1c3cc9 100644
--- a/services/web/app/src/Features/Project/ProjectListController.mjs
+++ b/services/web/app/src/Features/Project/ProjectListController.mjs
@@ -27,6 +27,8 @@ import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 import SplitTestSessionHandler from '../SplitTests/SplitTestSessionHandler.js'
 import TutorialHandler from '../Tutorial/TutorialHandler.js'
 import SubscriptionHelper from '../Subscription/SubscriptionHelper.js'
+import PermissionsManager from '../Authorization/PermissionsManager.js'
+import SubscriptionLocator from '../Subscription/SubscriptionLocator.js'
 
 /**
  * @import { GetProjectsRequest, GetProjectsResponse, AllUsersProjects, MongoProject } from "./types"
@@ -117,7 +119,7 @@ async function projectListPage(req, res, next) {
   const user = await User.findById(
     userId,
     `email emails features alphaProgram betaProgram lastPrimaryEmailCheck signUpDate refProviders${
-      isSaas ? ' enrollment writefull completedTutorials' : ''
+      isSaas ? ' enrollment writefull completedTutorials aiErrorAssistant' : ''
     }`
   )
 
@@ -409,6 +411,25 @@ async function projectListPage(req, res, next) {
     'papers-notification-banner'
   )
 
+  await SplitTestHandler.promises.getAssignment(
+    req,
+    res,
+    'ai-assist-notification'
+  )
+
+  const canUseAi = await PermissionsManager.promises.checkUserPermissions(
+    user,
+    ['use-ai']
+  )
+  const assistantDisabled = user.aiErrorAssistant?.enabled === false // the assistant has been manually disabled by the user
+  const subscription =
+    await SubscriptionLocator.promises.getUsersSubscription(userId)
+  const hasManuallyCollectedSubscription =
+    subscription?.collectionMethod === 'manual'
+  const canUseAiAssist =
+    canUseAi && !hasManuallyCollectedSubscription && !assistantDisabled
+  const hasAiAssist = user.features?.aiErrorAssistant
+
   const customerIoEnabled =
     await SplitTestHandler.promises.hasUserBeenAssignedToVariant(
       req,
@@ -450,6 +471,7 @@ async function projectListPage(req, res, next) {
     hasIndividualPaidSubscription,
     userRestrictions: Array.from(req.userRestrictions || []),
     customerIoEnabled,
+    showAiAssistNotification: canUseAiAssist && !hasAiAssist,
   })
 }
 
diff --git a/services/web/app/views/project/list-react.pug b/services/web/app/views/project/list-react.pug
index fa7bc24c09..78103e75a6 100644
--- a/services/web/app/views/project/list-react.pug
+++ b/services/web/app/views/project/list-react.pug
@@ -86,6 +86,11 @@ block append meta
 		data-type='string'
 		content=usGovBannerVariant
 	)
+	meta(
+		name='ol-showAiAssistNotification'
+		data-type='boolean'
+		content=showAiAssistNotification
+	)
 
 block content
 	#project-list-root
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 156ec9df3f..b404e428a5 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -420,6 +420,8 @@
   "disconnected": "",
   "discount": "",
   "discount_of": "",
+  "discover_research_writing_toolkit": "",
+  "discover_research_writing_toolkit_description": "",
   "discover_the_fastest_way_to_search_and_cite": "",
   "display": "",
   "display_deleted_user": "",
@@ -2098,9 +2100,13 @@
   "work_in_vim_or_emacs_emulation_mode": "",
   "work_offline": "",
   "work_offline_pull_to_overleaf": "",
+  "work_smarter_with_ai_assist": "",
+  "work_smarter_with_ai_assist_description": "",
   "work_with_non_overleaf_users": "",
   "work_with_other_github_users": "",
   "write_faster_smarter_with_overleaf_and_writefull_ai_tools": "",
+  "write_smarter_right_now": "",
+  "write_smarter_right_now_description": "",
   "writefull": "",
   "writefull_loading_error_body": "",
   "writefull_loading_error_title": "",
diff --git a/services/web/frontend/js/features/project-list/components/notifications/ai-assist-banner.tsx b/services/web/frontend/js/features/project-list/components/notifications/ai-assist-banner.tsx
new file mode 100644
index 0000000000..dd6d0a0e97
--- /dev/null
+++ b/services/web/frontend/js/features/project-list/components/notifications/ai-assist-banner.tsx
@@ -0,0 +1,128 @@
+import { memo, useCallback, useEffect } from 'react'
+import Notification from './notification'
+import { useTranslation } from 'react-i18next'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import { sendMB } from '@/infrastructure/event-tracking'
+import sparkle from '@/shared/svgs/sparkle-2-stars.svg'
+import { useSplitTest } from '@/shared/context/split-test-context'
+import { useProjectListContext } from '../../context/project-list-context'
+import getMeta from '@/utils/meta'
+import usePersistedState from '@/shared/hooks/use-persisted-state'
+
+function AiAssistBanner() {
+  const { title, description, cta } = useTitleDescription()
+  const { totalProjectsCount } = useProjectListContext()
+  const [dismissed, setDismissed] = usePersistedState(
+    'ai-assist-notification-banner-dismissed',
+    false
+  )
+  const { variant } = useSplitTest('ai-assist-notification')
+  const { t } = useTranslation()
+
+  useEffect(() => {
+    if (!dismissed) {
+      sendMB('promo-prompt', {
+        location: 'dashboard-banner',
+        name: 'ai-assist',
+        variant,
+      })
+    }
+  }, [dismissed, variant])
+
+  const handleClose = useCallback(() => {
+    sendMB('promo-dismiss', {
+      location: 'dashboard-banner',
+      name: 'ai-assist',
+      variant,
+    })
+    setDismissed(true)
+  }, [setDismissed, variant])
+
+  const handleUpgradeClick = useCallback(() => {
+    sendMB('promo-click', {
+      location: 'dashboard-banner',
+      name: 'ai-assist',
+      variant,
+      type: 'click-upgrade',
+    })
+  }, [variant])
+
+  const handleLearnMoreClick = useCallback(() => {
+    sendMB('promo-click', {
+      location: 'dashboard-banner',
+      name: 'ai-assist',
+      type: 'click-learn-more',
+      variant,
+    })
+  }, [variant])
+
+  if (
+    !title ||
+    dismissed ||
+    totalProjectsCount === 0 ||
+    !getMeta('ol-showAiAssistNotification')
+  ) {
+    return null
+  }
+
+  return (
+    <Notification
+      type="offer"
+      customIcon={<img aria-hidden="true" alt="" src={sparkle} width={32} />}
+      iconPlacement="center"
+      title={title}
+      onDismiss={handleClose}
+      content={
+        <p>
+          {description}{' '}
+          <a onClick={handleLearnMoreClick} href="/about/ai-features">
+            {t('learn_more')}
+          </a>
+          .
+        </p>
+      }
+      action={
+        <OLButton
+          variant="secondary"
+          href="/user/subscription/plans#ai-assist"
+          onClick={handleUpgradeClick}
+        >
+          {cta}
+        </OLButton>
+      }
+    />
+  )
+}
+
+function useTitleDescription() {
+  const { variant } = useSplitTest('ai-assist-notification')
+  const { t } = useTranslation()
+
+  switch (variant) {
+    case 'work-smarter':
+      return {
+        title: t('work_smarter_with_ai_assist'),
+        description: t('work_smarter_with_ai_assist_description'),
+        cta: t('add_ai_assist'),
+      }
+    case 'discover-toolkit':
+      return {
+        title: t('discover_research_writing_toolkit'),
+        description: t('discover_research_writing_toolkit_description'),
+        cta: t('add_ai_assist'),
+      }
+    case 'write-smarter':
+      return {
+        title: t('write_smarter_right_now'),
+        description: t('write_smarter_right_now_description'),
+        cta: t('add_ai_assist'),
+      }
+    default:
+      return {
+        title: null,
+        description: null,
+        cta: null,
+      }
+  }
+}
+export default memo(AiAssistBanner)
diff --git a/services/web/frontend/js/features/project-list/components/notifications/notification.tsx b/services/web/frontend/js/features/project-list/components/notifications/notification.tsx
index b8c399d2f2..46b53da673 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/notification.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/notification.tsx
@@ -3,7 +3,14 @@ import NewNotification from '@/shared/components/notification'
 
 type NotificationProps = Pick<
   React.ComponentProps<typeof NewNotification>,
-  'type' | 'action' | 'content' | 'onDismiss' | 'className' | 'title'
+  | 'type'
+  | 'action'
+  | 'content'
+  | 'onDismiss'
+  | 'className'
+  | 'title'
+  | 'customIcon'
+  | 'iconPlacement'
 >
 
 function Notification({ className, ...props }: NotificationProps) {
diff --git a/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx b/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx
index 8edb6a53cc..b21cfd28ea 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx
@@ -14,6 +14,7 @@ import {
   isDeprecatedBrowser,
 } from '@/shared/components/deprecated-browser'
 import PapersNotificationBanner from './papers-notification-banner'
+import AiAssistBanner from './ai-assist-banner'
 import { usePapersNotification } from './hooks/use-papers-notification'
 
 const [enrollmentNotificationModule] = importOverleafModules(
@@ -57,6 +58,7 @@ function UserNotifications() {
         {USGovBanner && <USGovBanner />}
 
         {showPapersNotificationBanner && <PapersNotificationBanner />}
+        <AiAssistBanner />
         <AccessibilitySurveyBanner />
 
         {isDeprecatedBrowser() && <DeprecatedBrowser />}
diff --git a/services/web/frontend/js/shared/components/notification.tsx b/services/web/frontend/js/shared/components/notification.tsx
index e4be7d5cab..2ebda05298 100644
--- a/services/web/frontend/js/shared/components/notification.tsx
+++ b/services/web/frontend/js/shared/components/notification.tsx
@@ -18,6 +18,7 @@ export type NotificationProps = {
   className?: string
   content: React.ReactNode
   customIcon?: React.ReactElement | null
+  iconPlacement?: 'top' | 'center'
   disclaimer?: React.ReactElement | string
   isDismissible?: boolean
   isActionBelowContent?: boolean
@@ -30,9 +31,11 @@ export type NotificationProps = {
 export function NotificationIcon({
   notificationType,
   customIcon,
+  iconPlacement,
 }: {
   notificationType: NotificationType
   customIcon?: ReactElement
+  iconPlacement?: 'top' | 'center'
 }) {
   let icon = <MaterialIcon type="info" />
 
@@ -47,7 +50,16 @@ export function NotificationIcon({
   } else if (notificationType === 'offer') {
     icon = <MaterialIcon type="campaign" />
   }
-  return <div className="notification-icon">{icon}</div>
+  return (
+    <div
+      className={classNames(
+        'notification-icon',
+        iconPlacement ? `notification-icon-${iconPlacement}` : ''
+      )}
+    >
+      {icon}
+    </div>
+  )
 }
 
 function Notification({
@@ -56,6 +68,7 @@ function Notification({
   className = '',
   content,
   customIcon,
+  iconPlacement = 'top',
   disclaimer,
   isActionBelowContent,
   isDismissible,
@@ -94,7 +107,11 @@ function Notification({
       id={id}
     >
       {customIcon !== null && (
-        <NotificationIcon notificationType={type} customIcon={customIcon} />
+        <NotificationIcon
+          notificationType={type}
+          customIcon={customIcon}
+          iconPlacement={iconPlacement}
+        />
       )}
 
       <div className="notification-content-and-cta">
diff --git a/services/web/frontend/js/shared/svgs/sparkle-2-stars.svg b/services/web/frontend/js/shared/svgs/sparkle-2-stars.svg
new file mode 100644
index 0000000000..5e4fc5e657
--- /dev/null
+++ b/services/web/frontend/js/shared/svgs/sparkle-2-stars.svg
@@ -0,0 +1,16 @@
+<svg width="41" height="40" viewBox="0 0 41 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.2344 23.5171C20.275 21.2682 18.7323 19.7255 16.4837 9.76641C16.3807 9.31122 15.9756 8.987 15.5074 8.987C15.0392 8.987 14.6341 9.3112 14.531 9.76641C12.281 19.7259 10.7394 21.2686 0.780336 23.5171C0.324219 23.6212 0 24.0253 0 24.4935C0 24.9616 0.324203 25.3659 0.780336 25.4698C10.7398 27.7199 12.2813 29.2624 14.531 39.2205C14.6341 39.6757 15.0392 39.9999 15.5074 39.9999C15.9756 39.9999 16.3807 39.6757 16.4837 39.2205C18.7338 29.2622 20.2754 27.7196 30.2344 25.4698C30.6906 25.3657 31.0139 24.9616 31.0139 24.4935C31.0139 24.0253 30.6897 23.6211 30.2344 23.5171Z" fill="url(#paint0_linear_4820_1102)"/>
+<path d="M39.2371 8.01179C33.9428 6.81627 33.1993 6.07299 32.004 0.779476C31.8998 0.32336 31.4958 6.10352e-05 31.0276 6.10352e-05C30.5595 6.10352e-05 30.1552 0.323168 30.0513 0.779476C28.8558 6.07255 28.1125 6.81607 22.819 8.01179C22.3628 8.11589 22.0396 8.51996 22.0396 8.98812C22.0396 9.45629 22.3627 9.86054 22.819 9.96447C28.112 11.16 28.8556 11.9033 30.0513 17.1976C30.1554 17.6528 30.5595 17.977 31.0276 17.977C31.4958 17.977 31.9 17.6528 32.004 17.1976C33.1995 11.9033 33.9427 11.1598 39.2371 9.96447C39.6923 9.86036 40.0165 9.45629 40.0165 8.98812C40.0165 8.51996 39.6923 8.11571 39.2371 8.01179Z" fill="url(#paint1_linear_4820_1102)"/>
+<defs>
+<linearGradient id="paint0_linear_4820_1102" x1="31.0139" y1="8.987" x2="-5.13702" y2="25.3634" gradientUnits="userSpaceOnUse">
+<stop stop-color="#214475"/>
+<stop offset="0.295154" stop-color="#254C84"/>
+<stop offset="1" stop-color="#6597E0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4820_1102" x1="40.0165" y1="6.2448e-05" x2="19.0617" y2="9.49231" gradientUnits="userSpaceOnUse">
+<stop stop-color="#214475"/>
+<stop offset="0.295154" stop-color="#254C84"/>
+<stop offset="1" stop-color="#6597E0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 8e1b5bdf61..8c620d234e 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -228,6 +228,7 @@ export interface Meta {
   'ol-settingsPlans': Plan[]
   'ol-shouldAllowEditingDetails': boolean
   'ol-shouldLoadHotjar': boolean
+  'ol-showAiAssistNotification': boolean
   'ol-showAiErrorAssistant': boolean
   'ol-showBrlGeoBanner': boolean
   'ol-showCouponField': boolean
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss b/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss
index ece1a465a4..c0e713c212 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss
@@ -70,6 +70,12 @@
     padding: 18px $spacing-06 0 0;
   }
 
+  .notification-icon.notification-icon-center {
+    padding-top: 0;
+    display: flex;
+    align-items: center;
+  }
+
   .notification-content-and-cta {
     // shared container to align cta with text on smaller screens
     display: flex;
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 5c6ab42fee..f48929be4b 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -549,6 +549,8 @@
   "discount": "Discount",
   "discount_of": "Discount of __amount__",
   "discover_latex_templates_and_examples": "Discover LaTeX templates and examples to help with everything from writing a journal article to using a specific LaTeX package.",
+  "discover_research_writing_toolkit": "NEW: Discover the ultimate research writing toolkit",
+  "discover_research_writing_toolkit_description": "Add AI Assist to get unlimited access to LaTeX-tailored AI tools from Overleaf and Writefull.",
   "discover_the_fastest_way_to_search_and_cite": "Discover the fastest way to search and cite",
   "discover_why_over_people_worldwide_trust_overleaf": "Discover why over __count__ million people worldwide trust Overleaf with their work.",
   "display": "Display",
@@ -2655,9 +2657,13 @@
   "work_offline": "Work offline",
   "work_offline_pull_to_overleaf": "Work offline, then pull to __appName__",
   "work_or_university_sso": "Work/university single sign-on",
+  "work_smarter_with_ai_assist": "Work smarter with AI Assist: AI tools built by TeXperts, for LaTeX",
+  "work_smarter_with_ai_assist_description": "Get help with everything from language suggestions and writing support to generating LaTeX tables and fixing errors.",
   "work_with_non_overleaf_users": "Work with non Overleaf users",
   "work_with_other_github_users": "Work with other GitHub users",
   "write_faster_smarter_with_overleaf_and_writefull_ai_tools": "Write faster, smarter, and with confidence with Overleaf and Writefull AI tools",
+  "write_smarter_right_now": "Write smarter, right now",
+  "write_smarter_right_now_description": "Write faster and with confidence with AI Assist—LaTeX-tailored AI tools from Overleaf and Writefull.",
   "writefull": "Writefull",
   "writefull_loading_error_body": "Try refreshing the page. If this doesn’t work, try disabling any active browser extensions to check they aren’t blocking Writefull from loading.",
   "writefull_loading_error_title": "Writefull didn’t load correctly",
diff --git a/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx b/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx
index abc92eefd1..f6068f106b 100644
--- a/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/project-list-root.test.tsx
@@ -875,7 +875,7 @@ describe('<ProjectListRoot />', function () {
             const modals = await screen.findAllByRole('dialog')
             const modal = modals[0]
 
-            expect(sendMBSpy).to.have.been.calledTwice
+            expect(sendMBSpy).to.have.been.calledThrice
             expect(sendMBSpy).to.have.been.calledWith('loads_v2_dash')
             expect(sendMBSpy).to.have.been.calledWith(
               'project-list-page-interaction',
@@ -1014,7 +1014,7 @@ describe('<ProjectListRoot />', function () {
               )
             ).to.be.true
 
-            expect(sendMBSpy).to.have.been.calledTwice
+            expect(sendMBSpy).to.have.been.calledThrice
             expect(sendMBSpy).to.have.been.calledWith('loads_v2_dash')
             expect(sendMBSpy).to.have.been.calledWith(
               'project-list-page-interaction',
@@ -1179,7 +1179,7 @@ describe('<ProjectListRoot />', function () {
 
         await fetchMock.callHistory.flush(true)
 
-        expect(sendMBSpy).to.have.been.calledTwice
+        expect(sendMBSpy).to.have.been.calledThrice
         expect(sendMBSpy).to.have.been.calledWith('loads_v2_dash')
         expect(sendMBSpy).to.have.been.calledWith(
           'project-list-page-interaction',
diff --git a/services/web/test/unit/src/Project/ProjectListController.test.mjs b/services/web/test/unit/src/Project/ProjectListController.test.mjs
index ae1bc72210..101d3128f6 100644
--- a/services/web/test/unit/src/Project/ProjectListController.test.mjs
+++ b/services/web/test/unit/src/Project/ProjectListController.test.mjs
@@ -145,6 +145,18 @@ describe('ProjectListController', function () {
       },
     }
 
+    ctx.PermissionsManager = {
+      promises: {
+        checkUserPermissions: sinon.stub().resolves(true),
+      },
+    }
+
+    ctx.SubscriptionLocator = {
+      promises: {
+        getUsersSubscription: sinon.stub().resolves({}),
+      },
+    }
+
     vi.doMock('mongodb-legacy', () => ({
       default: { ObjectId },
     }))
@@ -250,6 +262,19 @@ describe('ProjectListController', function () {
       default: ctx.TutorialHandler,
     }))
 
+    vi.doMock(
+      '../../../../app/src/Features/Authorization/PermissionsManager',
+      () => ({
+        default: ctx.PermissionsManager,
+      })
+    )
+    vi.doMock(
+      '../../../../app/src/Features/Subscription/SubscriptionLocator',
+      () => ({
+        default: ctx.SubscriptionLocator,
+      })
+    )
+
     ctx.ProjectListController = (await import(MODULE_PATH)).default
 
     ctx.req = {

From 50b5aa33b12b7d79acc4d687bf688dd87079df8b Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Tue, 24 Jun 2025 10:30:17 +0100
Subject: [PATCH 022/274] Merge pull request #26495 from
 overleaf/rh-prevent-pause-cancel-last-term

Redirect to support if trying to cancel in last month of pause

GitOrigin-RevId: d92f84c79482bb7c409f4e3070337b0ac958756a
---
 .../active/cancel-subscription-button.tsx     | 14 +++++++--
 .../dashboard/states/active/active.test.tsx   | 29 +++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-subscription-button.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-subscription-button.tsx
index 7713b4671d..f99b145b9b 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-subscription-button.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-subscription-button.tsx
@@ -4,6 +4,7 @@ import { useSubscriptionDashboardContext } from '../../../../context/subscriptio
 import OLButton from '@/features/ui/components/ol/ol-button'
 import { PaidSubscription } from '../../../../../../../../types/subscription/dashboard/subscription'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
+import { useLocation } from '@/shared/hooks/use-location'
 
 export function CancelSubscriptionButton() {
   const { t } = useTranslation()
@@ -13,6 +14,7 @@ export function CancelSubscriptionButton() {
     setModalIdShown,
     setShowCancellation,
   } = useSubscriptionDashboardContext()
+  const location = useLocation()
 
   const subscription = personalSubscription as PaidSubscription
   const isInTrial =
@@ -29,14 +31,22 @@ export function CancelSubscriptionButton() {
     useFeatureFlag('pause-subscription') &&
     !hasPendingOrActivePause &&
     planIsEligibleForPause
+  const shouldContactSupport =
+    subscription.payment.state === 'paused' &&
+    subscription.payment.remainingPauseCycles === 0
 
   function handleCancelSubscriptionClick() {
     eventTracking.sendMB('subscription-page-cancel-button-click', {
       plan_code: subscription?.planCode,
       is_trial: isInTrial,
     })
-    if (enablePause) setModalIdShown('pause-subscription')
-    else setShowCancellation(true)
+    if (shouldContactSupport) {
+      location.assign('/contact')
+    } else if (enablePause) {
+      setModalIdShown('pause-subscription')
+    } else {
+      setShowCancellation(true)
+    }
   }
 
   if (recurlyLoadError) return null
diff --git a/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx
index baada41976..f5802a2368 100644
--- a/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx
+++ b/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx
@@ -516,6 +516,35 @@ describe('<ActiveSubscription />', function () {
     })
   })
 
+  describe('contact support for paused subscription with 0 remaining cycles', function () {
+    beforeEach(function () {
+      this.locationWrapperSandbox = sinon.createSandbox()
+      this.locationWrapperStub = this.locationWrapperSandbox.stub(location)
+    })
+
+    afterEach(function () {
+      this.locationWrapperSandbox.restore()
+    })
+
+    it('redirects to contact page when cancel button clicked', function () {
+      const pausedSubscription = cloneDeep(annualActiveSubscription)
+      pausedSubscription.payment.state = 'paused'
+      pausedSubscription.payment.remainingPauseCycles = 0
+
+      renderActiveSubscription(pausedSubscription)
+
+      const button = screen.getByRole('button', {
+        name: 'Cancel your subscription',
+      })
+      fireEvent.click(button)
+
+      expect(sendMBSpy).to.be.calledOnceWith(
+        'subscription-page-cancel-button-click'
+      )
+      expect(this.locationWrapperStub.assign).to.be.calledOnceWith('/contact')
+    })
+  })
+
   describe('group plans', function () {
     it('does not show "Change plan" option for group plans', function () {
       renderActiveSubscription(groupActiveSubscription)

From 48379a9d86f3fc94a6e434ac5eae9bc31240f0d2 Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Tue, 24 Jun 2025 14:33:46 +0200
Subject: [PATCH 023/274] Refactor AI assist notification logic in project list
 page (#26613)

GitOrigin-RevId: 849ab62b814f321452e5d6e53d968943cec60417
---
 .../Project/ProjectListController.mjs         | 66 ++++++++++++++-----
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectListController.mjs b/services/web/app/src/Features/Project/ProjectListController.mjs
index b12d1c3cc9..24e0ae44e8 100644
--- a/services/web/app/src/Features/Project/ProjectListController.mjs
+++ b/services/web/app/src/Features/Project/ProjectListController.mjs
@@ -411,24 +411,17 @@ async function projectListPage(req, res, next) {
     'papers-notification-banner'
   )
 
-  await SplitTestHandler.promises.getAssignment(
-    req,
-    res,
-    'ai-assist-notification'
-  )
+  const aiAssistNotificationAssignment =
+    await SplitTestHandler.promises.getAssignment(
+      req,
+      res,
+      'ai-assist-notification'
+    )
 
-  const canUseAi = await PermissionsManager.promises.checkUserPermissions(
-    user,
-    ['use-ai']
-  )
-  const assistantDisabled = user.aiErrorAssistant?.enabled === false // the assistant has been manually disabled by the user
-  const subscription =
-    await SubscriptionLocator.promises.getUsersSubscription(userId)
-  const hasManuallyCollectedSubscription =
-    subscription?.collectionMethod === 'manual'
-  const canUseAiAssist =
-    canUseAi && !hasManuallyCollectedSubscription && !assistantDisabled
-  const hasAiAssist = user.features?.aiErrorAssistant
+  let showAiAssistNotification = false
+  if (aiAssistNotificationAssignment.variant !== 'default') {
+    showAiAssistNotification = await _showAiAssistNotification(user)
+  }
 
   const customerIoEnabled =
     await SplitTestHandler.promises.hasUserBeenAssignedToVariant(
@@ -471,7 +464,7 @@ async function projectListPage(req, res, next) {
     hasIndividualPaidSubscription,
     userRestrictions: Array.from(req.userRestrictions || []),
     customerIoEnabled,
-    showAiAssistNotification: canUseAiAssist && !hasAiAssist,
+    showAiAssistNotification,
   })
 }
 
@@ -756,6 +749,43 @@ function _hasActiveFilter(filters) {
   )
 }
 
+async function _showAiAssistNotification(user) {
+  // Check if the assistant has been manually disabled by the user
+  if (user.aiErrorAssistant?.enabled === false) {
+    return false
+  }
+
+  // Check if the user can use AI features (policy check)
+  const canUseAi = await PermissionsManager.promises.checkUserPermissions(
+    user,
+    ['use-ai']
+  )
+  if (!canUseAi) {
+    return false
+  }
+
+  // Check if the user has a subscription with manually collected group admins (#22822)
+  const subscription = await SubscriptionLocator.promises.getUsersSubscription(
+    user._id
+  )
+  if (subscription?.collectionMethod === 'manual') {
+    return false
+  }
+
+  // Check if the user already has AI Assist via Overleaf
+  if (user.features?.aiErrorAssistant) {
+    return false
+  }
+  // Check if the user already has AI Assist via Writefull
+  const { isPremium: hasAiAssistViaWritefull } =
+    await UserGetter.promises.getWritefullData(user._id)
+  if (hasAiAssistViaWritefull) {
+    return false
+  }
+
+  return true
+}
+
 export default {
   projectListPage: expressify(projectListPage),
   getProjectsJson: expressify(getProjectsJson),

From 4157f8ca00efee46347b6843c81abc079fa80697 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Wed, 19 Mar 2025 10:57:53 +0000
Subject: [PATCH 024/274] Add a list directory method to the S3 persistor

GitOrigin-RevId: 6ecff3eb457dc2168ca49ff9409bb09fa932781c
---
 .../src/PerProjectEncryptedS3Persistor.js     | 18 ++++-
 libraries/object-persistor/src/S3Persistor.js | 68 +++++++++++++------
 libraries/object-persistor/src/types.d.ts     |  6 ++
 3 files changed, 70 insertions(+), 22 deletions(-)
 create mode 100644 libraries/object-persistor/src/types.d.ts

diff --git a/libraries/object-persistor/src/PerProjectEncryptedS3Persistor.js b/libraries/object-persistor/src/PerProjectEncryptedS3Persistor.js
index 7bd4bb93e5..a0230128fe 100644
--- a/libraries/object-persistor/src/PerProjectEncryptedS3Persistor.js
+++ b/libraries/object-persistor/src/PerProjectEncryptedS3Persistor.js
@@ -33,6 +33,10 @@ const AES256_KEY_LENGTH = 32
  * @property {() => Promise<Array<RootKeyEncryptionKey>>} getRootKeyEncryptionKeys
  */
 
+/**
+ * @typedef {import('./types').ListDirectoryResult} ListDirectoryResult
+ */
+
 /**
  * Helper function to make TS happy when accessing error properties
  * AWSError is not an actual class, so we cannot use instanceof.
@@ -391,9 +395,9 @@ class PerProjectEncryptedS3Persistor extends S3Persistor {
  * A general "cache" for project keys is another alternative. For now, use a helper class.
  */
 class CachedPerProjectEncryptedS3Persistor {
-  /** @type SSECOptions */
+  /** @type SSECOptions  */
   #projectKeyOptions
-  /** @type PerProjectEncryptedS3Persistor */
+  /** @type PerProjectEncryptedS3Persistor  */
   #parent
 
   /**
@@ -424,6 +428,16 @@ class CachedPerProjectEncryptedS3Persistor {
     return await this.#parent.getObjectSize(bucketName, path)
   }
 
+  /**
+   *
+   * @param {string} bucketName
+   * @param {string} path
+   * @return {Promise<ListDirectoryResult>}
+   */
+  async listDirectory(bucketName, path) {
+    return await this.#parent.listDirectory(bucketName, path)
+  }
+
   /**
    * @param {string} bucketName
    * @param {string} path
diff --git a/libraries/object-persistor/src/S3Persistor.js b/libraries/object-persistor/src/S3Persistor.js
index 2835a271ff..1849838ba4 100644
--- a/libraries/object-persistor/src/S3Persistor.js
+++ b/libraries/object-persistor/src/S3Persistor.js
@@ -20,6 +20,18 @@ const { URL } = require('node:url')
 const { WriteError, ReadError, NotFoundError } = require('./Errors')
 const zlib = require('node:zlib')
 
+/**
+ * @typedef {import('aws-sdk/clients/s3').ListObjectsV2Output} ListObjectsV2Output
+ */
+
+/**
+ * @typedef {import('aws-sdk/clients/s3').Object} S3Object
+ */
+
+/**
+ * @typedef {import('./types').ListDirectoryResult} ListDirectoryResult
+ */
+
 /**
  * Wrapper with private fields to avoid revealing them on console, JSON.stringify or similar.
  */
@@ -266,26 +278,12 @@ class S3Persistor extends AbstractPersistor {
    * @return {Promise<void>}
    */
   async deleteDirectory(bucketName, key, continuationToken) {
-    let response
-    const options = { Bucket: bucketName, Prefix: key }
-    if (continuationToken) {
-      options.ContinuationToken = continuationToken
-    }
-
-    try {
-      response = await this._getClientForBucket(bucketName)
-        .listObjectsV2(options)
-        .promise()
-    } catch (err) {
-      throw PersistorHelper.wrapError(
-        err,
-        'failed to list objects in S3',
-        { bucketName, key },
-        ReadError
-      )
-    }
-
-    const objects = response.Contents?.map(item => ({ Key: item.Key || '' }))
+    const { contents, response } = await this.listDirectory(
+      bucketName,
+      key,
+      continuationToken
+    )
+    const objects = contents.map(item => ({ Key: item.Key || '' }))
     if (objects?.length) {
       try {
         await this._getClientForBucket(bucketName)
@@ -316,6 +314,36 @@ class S3Persistor extends AbstractPersistor {
     }
   }
 
+  /**
+   *
+   * @param {string} bucketName
+   * @param {string} key
+   * @param {string} [continuationToken]
+   * @return {Promise<ListDirectoryResult>}
+   */
+  async listDirectory(bucketName, key, continuationToken) {
+    let response
+    const options = { Bucket: bucketName, Prefix: key }
+    if (continuationToken) {
+      options.ContinuationToken = continuationToken
+    }
+
+    try {
+      response = await this._getClientForBucket(bucketName)
+        .listObjectsV2(options)
+        .promise()
+    } catch (err) {
+      throw PersistorHelper.wrapError(
+        err,
+        'failed to list objects in S3',
+        { bucketName, key },
+        ReadError
+      )
+    }
+
+    return { contents: response.Contents ?? [], response }
+  }
+
   /**
    * @param {string} bucketName
    * @param {string} key
diff --git a/libraries/object-persistor/src/types.d.ts b/libraries/object-persistor/src/types.d.ts
new file mode 100644
index 0000000000..5640685a5f
--- /dev/null
+++ b/libraries/object-persistor/src/types.d.ts
@@ -0,0 +1,6 @@
+import type { ListObjectsV2Output, Object } from 'aws-sdk/clients/s3'
+
+export type ListDirectoryResult = {
+  contents: Array<Object>
+  response: ListObjectsV2Output
+}

From 25a911d4cb54215374d053d68d87259e1001f375 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Wed, 19 Mar 2025 10:55:22 +0000
Subject: [PATCH 025/274] Export loadChunk from verifier to allow code reuse

GitOrigin-RevId: fc5f2de50583ab2469e8ab3c86776c55501ba2e2
---
 services/history-v1/storage/lib/backupVerifier.mjs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/history-v1/storage/lib/backupVerifier.mjs b/services/history-v1/storage/lib/backupVerifier.mjs
index 14b84cd320..6e767b21ba 100644
--- a/services/history-v1/storage/lib/backupVerifier.mjs
+++ b/services/history-v1/storage/lib/backupVerifier.mjs
@@ -115,7 +115,11 @@ export async function verifyProjectWithErrorContext(
  * @param {CachedPerProjectEncryptedS3Persistor} backupPersistorForProject
  * @return {Promise<any>}
  */
-async function loadChunk(historyId, startVersion, backupPersistorForProject) {
+export async function loadChunk(
+  historyId,
+  startVersion,
+  backupPersistorForProject
+) {
   const key = path.join(
     projectKey.format(historyId),
     projectKey.pad(startVersion)

From 3600aa4b75b240662a17d7e8f827fa9f77e49c5d Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Wed, 19 Mar 2025 10:55:42 +0000
Subject: [PATCH 026/274] Add script for restoring projects from backup

GitOrigin-RevId: b639d74989afa17638bbcba0f8ee34c978fcd5d9
---
 .../history-v1/storage/lib/backupArchiver.mjs | 236 ++++++++++++++++++
 .../scripts/recover_zip_from_backup.mjs       | 162 ++++++++++++
 2 files changed, 398 insertions(+)
 create mode 100644 services/history-v1/storage/lib/backupArchiver.mjs
 create mode 100644 services/history-v1/storage/scripts/recover_zip_from_backup.mjs

diff --git a/services/history-v1/storage/lib/backupArchiver.mjs b/services/history-v1/storage/lib/backupArchiver.mjs
new file mode 100644
index 0000000000..7e831140be
--- /dev/null
+++ b/services/history-v1/storage/lib/backupArchiver.mjs
@@ -0,0 +1,236 @@
+// @ts-check
+import path from 'node:path'
+import projectKey from './project_key.js'
+import {
+  chunksBucket,
+  backupPersistor,
+  projectBlobsBucket,
+} from './backupPersistor.mjs'
+import archiver from 'archiver'
+import { Chunk, History } from 'overleaf-editor-core'
+import { GLOBAL_BLOBS, makeProjectKey } from './blob_store/index.js'
+import streams from './streams.js'
+import objectPersistor from '@overleaf/object-persistor'
+import OError from '@overleaf/o-error'
+import chunkStore from './chunk_store/index.js'
+import { loadChunk } from './backupVerifier.mjs'
+import logger from '@overleaf/logger'
+
+/**
+ * @typedef {(import('@overleaf/object-persistor/src/PerProjectEncryptedS3Persistor.js').CachedPerProjectEncryptedS3Persistor)} CachedPerProjectEncryptedS3Persistor
+ */
+
+/**
+ * @typedef {(import('archiver').Archiver)} Archiver
+ */
+
+/**
+ * @typedef {(import('overleaf-editor-core').FileMap)} FileMap
+ */
+
+/**
+ *
+ * @param historyId
+ * @return {Promise<CachedPerProjectEncryptedS3Persistor>}
+ */
+async function getProjectPersistor(historyId) {
+  return await backupPersistor.forProjectRO(
+    projectBlobsBucket,
+    makeProjectKey(historyId, '')
+  )
+}
+
+/**
+ *
+ * @param persistor
+ * @param {string} key
+ * @return {Promise<{chunkData: any, buffer: Buffer}>}
+ */
+async function loadChunkByKey(persistor, key) {
+  try {
+    const buf = await streams.gunzipStreamToBuffer(
+      await persistor.getObjectStream(chunksBucket, key)
+    )
+    return { chunkData: JSON.parse(buf.toString('utf-8')), buffer: buf }
+  } catch (err) {
+    if (err instanceof objectPersistor.Errors.NotFoundError) {
+      throw new Chunk.NotPersistedError('chunk not found')
+    }
+    if (err instanceof Error) {
+      throw OError.tag(err, 'Failed to load chunk', { key })
+    }
+    throw err
+  }
+}
+
+/**
+ *
+ * @param {string} historyId
+ * @param {string} hash
+ * @param {CachedPerProjectEncryptedS3Persistor} persistor
+ * @return {Promise<NodeJS.ReadableStream>}
+ */
+async function fetchBlob(historyId, hash, persistor) {
+  const path = makeProjectKey(historyId, hash)
+  return await persistor.getObjectStream(projectBlobsBucket, path, {
+    autoGunzip: true,
+  })
+}
+
+/**
+ *
+ * @param {History} history
+ * @param {Archiver} archive
+ * @param {CachedPerProjectEncryptedS3Persistor} projectCache
+ * @param {string} historyId
+ * @param {string} [prefix] Should include trailing slash (if length > 0)
+ * @returns {Promise<void>}
+ */
+async function addChunkToArchive(
+  history,
+  archive,
+  projectCache,
+  historyId,
+  prefix = ''
+) {
+  const chunkBlobs = new Set()
+  history.findBlobHashes(chunkBlobs)
+  const files = getBlobMap(history, chunkBlobs)
+
+  logger.debug({ chunkBlobs, files }, 'Adding blobs to archive')
+
+  for (const chunkBlob of chunkBlobs) {
+    if (GLOBAL_BLOBS.has(chunkBlob)) {
+      logger.debug('Skipping global blob:', chunkBlob)
+      continue
+    }
+    const blobStream = await fetchBlob(historyId, chunkBlob, projectCache)
+
+    let name = chunkBlob
+
+    if (files.has(chunkBlob)) {
+      name = files.get(chunkBlob)
+    } else {
+      logger.debug('Blob not found in file map:', chunkBlob)
+    }
+
+    archive.append(blobStream, {
+      name: `${prefix}${name}`,
+    })
+  }
+}
+
+/**
+ *
+ * @param {string} historyId
+ * @return {Promise<number>}
+ */
+async function findStartVersionOfLatestChunk(historyId) {
+  const backend = chunkStore.getBackend(historyId)
+  const chunk = await backend.getLatestChunk(historyId, { readOnly: true })
+  if (!chunk) {
+    throw new Error('Latest chunk could not be loaded')
+  }
+  return chunk.startVersion
+}
+
+/**
+ *
+ * @param {History} history
+ * @param {Set<string>} chunkBlobs
+ * @return {Map<string, string>}
+ */
+function getBlobMap(history, chunkBlobs) {
+  const files = new Map()
+
+  history.changes.forEach(change => {
+    change.operations.forEach(operation => {
+      if (operation.getFile) {
+        const file = operation.getFile()
+        if (chunkBlobs.has(file.data.hash)) {
+          files.set(file.data.hash, operation.pathname)
+        }
+      }
+    })
+  })
+  return files
+}
+
+/**
+ * Restore a project from the latest snapshot
+ *
+ * There is an assumption that the database backup has been restored.
+ *
+ * @param {Archiver} archive
+ * @param {string} historyId
+ * @return {Promise<void>}
+ */
+export async function archiveLatestChunk(archive, historyId) {
+  const projectCache = await getProjectPersistor(historyId)
+
+  const startVersion = await findStartVersionOfLatestChunk(historyId)
+
+  const backedUpChunkRaw = await loadChunk(
+    historyId,
+    startVersion,
+    projectCache
+  )
+
+  const backedUpChunk = History.fromRaw(backedUpChunkRaw)
+
+  await addChunkToArchive(backedUpChunk, archive, projectCache, historyId)
+
+  return archive
+}
+
+/**
+ * Download raw files from the backup.
+ *
+ * This can work without the database being backed up.
+ *
+ * It will split the project into chunks per directory and download the blobs alongside the chunk.
+ *
+ * @param {Archiver} archive
+ * @param {string} historyId
+ * @return {Promise<void>}
+ */
+export async function archiveRawProject(archive, historyId) {
+  const projectCache = await getProjectPersistor(historyId)
+
+  const key = path.join(projectKey.format(historyId), projectKey.pad(0))
+
+  const { contents: chunks } = await projectCache.listDirectory(
+    chunksBucket,
+    key
+  )
+
+  if (chunks.length === 0) {
+    throw new Error('No chunks found')
+  }
+
+  for (const chunkRecord of chunks) {
+    logger.debug({ key: chunkRecord.Key }, 'Processing chunk')
+    if (!chunkRecord.Key) {
+      continue
+    }
+    const chunkId = chunkRecord.Key.split('/').pop()
+    const { chunkData, buffer } = await loadChunkByKey(
+      projectCache,
+      chunkRecord.Key
+    )
+
+    archive.append(buffer, {
+      name: `${historyId}/chunks/${chunkId}/chunk.json`,
+    })
+
+    const chunk = History.fromRaw(chunkData)
+
+    await addChunkToArchive(
+      chunk,
+      archive,
+      projectCache,
+      historyId,
+      `${historyId}/chunks/${chunkId}/`
+    )
+  }
+}
diff --git a/services/history-v1/storage/scripts/recover_zip_from_backup.mjs b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
new file mode 100644
index 0000000000..cd63086c89
--- /dev/null
+++ b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
@@ -0,0 +1,162 @@
+// @ts-check
+import { loadGlobalBlobs } from '../lib/blob_store/index.js'
+import commandLineArgs from 'command-line-args'
+import assert from '../lib/assert.js'
+import fs from 'node:fs'
+import { setTimeout } from 'node:timers/promises'
+import {
+  archiveLatestChunk,
+  archiveRawProject,
+} from '../lib/backupArchiver.mjs'
+import knex from '../lib/knex.js'
+import { client } from '../lib/mongodb.js'
+import archiver from 'archiver'
+
+const SUPPORTED_MODES = ['raw', 'latest']
+
+// outputFile needs to be available in the shutdown function (which may be called before it's declared)
+// eslint-disable-next-line prefer-const
+let outputFile
+
+/**
+ * Gracefully shutdown the process
+ * @param {number} code
+ */
+async function shutdown(code = 0) {
+  if (outputFile) {
+    outputFile.close()
+  }
+  await Promise.all([knex.destroy(), client.close()])
+  await setTimeout(1000)
+  process.exit(code)
+}
+
+/**
+ * @typedef {import('archiver').ZipArchive} ZipArchive
+ */
+
+/**
+ * @typedef {import('archiver').ProgressData} ProgressData
+ */
+
+/**
+ * @typedef {import('archiver').EntryData} EntryData
+ */
+
+/**
+ * @typedef {Object} ArchiverError
+ * @property {string} message
+ * @property {string} code
+ * @property {Object} data
+ */
+
+const { historyId, mode, output, verbose } = commandLineArgs([
+  { name: 'historyId', type: String },
+  { name: 'output', type: String },
+  { name: 'mode', type: String, defaultValue: 'raw' },
+  { name: 'verbose', type: String, defaultValue: false },
+])
+
+if (!historyId) {
+  console.error('missing --historyId')
+  await shutdown(1)
+}
+
+if (!output) {
+  console.error('missing --output')
+
+  await shutdown(1)
+}
+
+try {
+  assert.projectId(historyId)
+} catch (error) {
+  console.error('Invalid history ID')
+  await shutdown(1)
+}
+
+if (!SUPPORTED_MODES.includes(mode)) {
+  console.error(
+    'Invalid mode; supported modes are: ' + SUPPORTED_MODES.join(', ')
+  )
+  await shutdown(1)
+}
+
+await loadGlobalBlobs()
+
+outputFile = fs.createWriteStream(output)
+
+const archive = archiver.create('zip', {})
+
+archive.on('close', function () {
+  console.log(archive.pointer() + ' total bytes')
+  console.log(`Wrote ${output}`)
+  shutdown().catch(e => console.error('Error shutting down', e))
+})
+
+archive.on(
+  'error',
+  /**
+   *
+   * @param {ArchiverError} e
+   */
+  function (e) {
+    console.error(`Error writing archive: ${e.message}`)
+  }
+)
+
+archive.on('end', function () {
+  console.log(`Wrote ${archive.pointer()} total bytes to ${output}`)
+  shutdown().catch(e => console.error('Error shutting down', e))
+})
+
+archive.on(
+  'progress',
+  /**
+   *
+   * @param {ProgressData} progress
+   */
+  function (progress) {
+    if (verbose) {
+      console.log(`${progress.entries.processed} / ${progress.entries.total}`)
+    }
+  }
+)
+
+archive.on(
+  'entry',
+  /**
+   *
+   * @param {EntryData} entry
+   */
+  function (entry) {
+    if (verbose) {
+      console.log(`${entry.name} added`)
+    }
+  }
+)
+
+archive.on(
+  'warning',
+  /**
+   *
+   * @param {ArchiverError} warning
+   */
+  function (warning) {
+    console.warn(`Warning writing archive: ${warning.message}`)
+  }
+)
+
+switch (mode) {
+  case 'latest':
+    await archiveLatestChunk(archive, historyId)
+    break
+  case 'raw':
+  default:
+    await archiveRawProject(archive, historyId)
+    break
+}
+
+archive.pipe(outputFile)
+
+await archive.finalize()

From 392037efd6ea19e7853928aa888808c64d078137 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Thu, 27 Mar 2025 17:13:51 +0000
Subject: [PATCH 027/274] Improve types and export functions we want to use

GitOrigin-RevId: 25fd93214f88c425bee23d43de113cf754f89524
---
 services/history-v1/api/controllers/with_tmp_dir.js | 2 +-
 services/history-v1/storage/lib/blob_hash.js        | 2 +-
 services/history-v1/storage/lib/blob_store/index.js | 7 +++++++
 services/history-v1/storage/scripts/backup.mjs      | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/services/history-v1/api/controllers/with_tmp_dir.js b/services/history-v1/api/controllers/with_tmp_dir.js
index a9c2e9fb47..2e0737ba69 100644
--- a/services/history-v1/api/controllers/with_tmp_dir.js
+++ b/services/history-v1/api/controllers/with_tmp_dir.js
@@ -9,7 +9,7 @@ const path = require('node:path')
  * after.
  *
  * @param {string} prefix - prefix for the temporary directory name
- * @param {Function} fn - async function to call
+ * @param {(tmpDir: string) => Promise<void>} fn - async function to call
  */
 async function withTmpDir(prefix, fn) {
   const tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), prefix))
diff --git a/services/history-v1/storage/lib/blob_hash.js b/services/history-v1/storage/lib/blob_hash.js
index 6309637d08..10ac64b87b 100644
--- a/services/history-v1/storage/lib/blob_hash.js
+++ b/services/history-v1/storage/lib/blob_hash.js
@@ -63,7 +63,7 @@ exports.fromString = function blobHashFromString(string) {
  * Compute the git blob hash for the content of a file
  *
  * @param  {string} filePath
- * @return {string} hexadecimal SHA-1 hash
+ * @return {Promise<string>} hexadecimal SHA-1 hash
  */
 exports.fromFile = function blobHashFromFile(pathname) {
   assert.string(pathname, 'blobHash: bad pathname')
diff --git a/services/history-v1/storage/lib/blob_store/index.js b/services/history-v1/storage/lib/blob_store/index.js
index b4a7d1682f..033e288554 100644
--- a/services/history-v1/storage/lib/blob_store/index.js
+++ b/services/history-v1/storage/lib/blob_store/index.js
@@ -24,6 +24,7 @@ const logger = require('@overleaf/logger')
 
 /** @import { Readable } from 'stream' */
 
+/** @type {Map<string, { blob: core.Blob, demoted: boolean}>} */
 const GLOBAL_BLOBS = new Map()
 
 function makeGlobalKey(hash) {
@@ -343,6 +344,11 @@ class BlobStore {
     return blob
   }
 
+  /**
+   *
+   * @param {Array<string>} hashes
+   * @return {Promise<*[]>}
+   */
   async getBlobs(hashes) {
     assert.array(hashes, 'bad hashes')
     const nonGlobalHashes = []
@@ -427,6 +433,7 @@ module.exports = {
   getProjectBlobsBatch,
   loadGlobalBlobs,
   makeProjectKey,
+  makeGlobalKey,
   makeBlobForFile,
   getStringLengthOfFile,
   GLOBAL_BLOBS,
diff --git a/services/history-v1/storage/scripts/backup.mjs b/services/history-v1/storage/scripts/backup.mjs
index 94df24f66d..8cbbadfe12 100644
--- a/services/history-v1/storage/scripts/backup.mjs
+++ b/services/history-v1/storage/scripts/backup.mjs
@@ -915,7 +915,7 @@ async function compareBackups(projectId, options) {
           const globalBlob = GLOBAL_BLOBS.get(blob.hash)
           console.log(
             `  ✓ Blob ${blob.hash} is a global blob`,
-            globalBlob.demoted ? '(demoted)' : ''
+            globalBlob?.demoted ? '(demoted)' : ''
           )
           continue
         }

From b42b0a8d3e3f6239facfe929354cc6f7d16b1171 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Mon, 7 Apr 2025 17:04:43 +0100
Subject: [PATCH 028/274] Make file related BlobStore type more specific

GitOrigin-RevId: d5e70b13cbdfe1faf133eb4c040b0bbf6fa47dea
---
 libraries/overleaf-editor-core/lib/change.js          | 4 ++--
 libraries/overleaf-editor-core/lib/history.js         | 4 ++--
 libraries/overleaf-editor-core/lib/operation/index.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/overleaf-editor-core/lib/change.js b/libraries/overleaf-editor-core/lib/change.js
index ff4b973a3c..cfc3447251 100644
--- a/libraries/overleaf-editor-core/lib/change.js
+++ b/libraries/overleaf-editor-core/lib/change.js
@@ -13,7 +13,7 @@ const V2DocVersions = require('./v2_doc_versions')
 
 /**
  * @import Author from "./author"
- * @import { BlobStore, RawChange } from "./types"
+ * @import { BlobStore, RawChange, ReadonlyBlobStore } from "./types"
  */
 
 /**
@@ -219,7 +219,7 @@ class Change {
    * If this Change contains any File objects, load them.
    *
    * @param {string} kind see {File#load}
-   * @param {BlobStore} blobStore
+   * @param {ReadonlyBlobStore} blobStore
    * @return {Promise<void>}
    */
   async loadFiles(kind, blobStore) {
diff --git a/libraries/overleaf-editor-core/lib/history.js b/libraries/overleaf-editor-core/lib/history.js
index d9d1253f34..6a97a6f8a9 100644
--- a/libraries/overleaf-editor-core/lib/history.js
+++ b/libraries/overleaf-editor-core/lib/history.js
@@ -7,7 +7,7 @@ const Change = require('./change')
 const Snapshot = require('./snapshot')
 
 /**
- * @import { BlobStore } from "./types"
+ * @import { BlobStore, ReadonlyBlobStore } from "./types"
  */
 
 class History {
@@ -85,7 +85,7 @@ class History {
    * If this History contains any File objects, load them.
    *
    * @param {string} kind see {File#load}
-   * @param {BlobStore} blobStore
+   * @param {ReadonlyBlobStore} blobStore
    * @return {Promise<void>}
    */
   async loadFiles(kind, blobStore) {
diff --git a/libraries/overleaf-editor-core/lib/operation/index.js b/libraries/overleaf-editor-core/lib/operation/index.js
index ebc6f73907..ae7f2bcf01 100644
--- a/libraries/overleaf-editor-core/lib/operation/index.js
+++ b/libraries/overleaf-editor-core/lib/operation/index.js
@@ -13,7 +13,7 @@ let EditFileOperation = null
 let SetFileMetadataOperation = null
 
 /**
- * @import { BlobStore } from "../types"
+ * @import { ReadonlyBlobStore } from "../types"
  * @import Snapshot from "../snapshot"
  */
 
@@ -80,7 +80,7 @@ class Operation {
    * If this operation references any files, load the files.
    *
    * @param {string} kind see {File#load}
-   * @param {BlobStore} blobStore
+   * @param {ReadOnlyBlobStore} blobStore
    * @return {Promise<void>}
    */
   async loadFiles(kind, blobStore) {}

From 797f29d40afbe6987ffd6e23331b4da2a89a57ec Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Tue, 13 May 2025 17:03:51 +0100
Subject: [PATCH 029/274] Handle errors when processing command line arguments

GitOrigin-RevId: 7c1f011e705d6e4b6fbf0afee3dc3aab749f0de4
---
 .../scripts/recover_zip_from_backup.mjs       | 83 ++++++++++++++-----
 1 file changed, 64 insertions(+), 19 deletions(-)

diff --git a/services/history-v1/storage/scripts/recover_zip_from_backup.mjs b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
index cd63086c89..7770057962 100644
--- a/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
+++ b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
@@ -31,6 +31,16 @@ async function shutdown(code = 0) {
   process.exit(code)
 }
 
+function usage() {
+  console.log(
+    'Usage: node recover_zip_from_backup.mjs --historyId=<historyId> --output=<output> [--mode=<mode>] [--verbose] [--useBackupGlobalBlobs]'
+  )
+  console.log('Supported modes: ' + SUPPORTED_MODES.join(', '))
+  console.log(
+    '--useBackupGlobalBlobs can be used if the global blobs have not been restored from the backup yet.'
+  )
+}
+
 /**
  * @typedef {import('archiver').ZipArchive} ZipArchive
  */
@@ -50,21 +60,37 @@ async function shutdown(code = 0) {
  * @property {Object} data
  */
 
-const { historyId, mode, output, verbose } = commandLineArgs([
-  { name: 'historyId', type: String },
-  { name: 'output', type: String },
-  { name: 'mode', type: String, defaultValue: 'raw' },
-  { name: 'verbose', type: String, defaultValue: false },
-])
+let historyId, help, mode, output, useBackupGlobalBlobs, verbose
+
+try {
+  ;({ historyId, help, mode, output, useBackupGlobalBlobs, verbose } =
+    commandLineArgs([
+      { name: 'historyId', type: String },
+      { name: 'output', type: String },
+      { name: 'mode', type: String, defaultValue: 'raw' },
+      { name: 'verbose', type: Boolean, defaultValue: false },
+      { name: 'useBackupGlobalBlobs', type: Boolean, defaultValue: false },
+      { name: 'help', type: Boolean },
+    ]))
+} catch (err) {
+  console.error(err.message)
+  help = true
+}
+
+if (help) {
+  usage()
+  await shutdown(0)
+}
 
 if (!historyId) {
   console.error('missing --historyId')
+  usage()
   await shutdown(1)
 }
 
 if (!output) {
   console.error('missing --output')
-
+  usage()
   await shutdown(1)
 }
 
@@ -147,16 +173,35 @@ archive.on(
   }
 )
 
-switch (mode) {
-  case 'latest':
-    await archiveLatestChunk(archive, historyId)
-    break
-  case 'raw':
-  default:
-    await archiveRawProject(archive, historyId)
-    break
+try {
+  switch (mode) {
+    case 'latest':
+      await archiveLatestChunk(archive, historyId, useBackupGlobalBlobs)
+      break
+    case 'raw':
+    default:
+      await archiveRawProject(archive, historyId, useBackupGlobalBlobs)
+      break
+  }
+  archive.pipe(outputFile)
+} catch (error) {
+  if (error instanceof BackupPersistorError) {
+    console.error(error.message)
+  }
+  if (error instanceof Chunk.NotPersistedError) {
+    console.error('Chunk not found. Project may not have been fully backed up.')
+  }
+  if (verbose) {
+    console.error(error)
+  } else {
+    console.error('Error encountered when writing archive')
+  }
+} finally {
+  await Promise.race([
+    await archive.finalize(),
+    setTimeout(10000).then(() => {
+      console.error('Archive did not finalize in time')
+      return shutdown(1)
+    }),
+  ])
 }
-
-archive.pipe(outputFile)
-
-await archive.finalize()

From f2b0a982ac25bd2aaeb5bdf34803a758b5157aa6 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Thu, 27 Mar 2025 17:14:19 +0000
Subject: [PATCH 030/274] Use BackupBlobStore to get chunk content

GitOrigin-RevId: 91de53101ea289b43bdb08352aecc09ae89d0f74
---
 .../history-v1/storage/lib/backupArchiver.mjs | 321 ++++++++++++++----
 .../scripts/recover_zip_from_backup.mjs       |  17 +-
 2 files changed, 271 insertions(+), 67 deletions(-)

diff --git a/services/history-v1/storage/lib/backupArchiver.mjs b/services/history-v1/storage/lib/backupArchiver.mjs
index 7e831140be..30a9708879 100644
--- a/services/history-v1/storage/lib/backupArchiver.mjs
+++ b/services/history-v1/storage/lib/backupArchiver.mjs
@@ -5,16 +5,172 @@ import {
   chunksBucket,
   backupPersistor,
   projectBlobsBucket,
+  globalBlobsBucket as backupGlobalBlobsBucket,
 } from './backupPersistor.mjs'
-import archiver from 'archiver'
-import { Chunk, History } from 'overleaf-editor-core'
-import { GLOBAL_BLOBS, makeProjectKey } from './blob_store/index.js'
+import core, { Chunk, History } from 'overleaf-editor-core'
+import {
+  GLOBAL_BLOBS,
+  makeProjectKey,
+  getStringLengthOfFile,
+  makeGlobalKey,
+} from './blob_store/index.js'
 import streams from './streams.js'
 import objectPersistor from '@overleaf/object-persistor'
 import OError from '@overleaf/o-error'
 import chunkStore from './chunk_store/index.js'
-import { loadChunk } from './backupVerifier.mjs'
 import logger from '@overleaf/logger'
+import fs from 'node:fs'
+import { pipeline } from 'node:stream/promises'
+import withTmpDir from '../../api/controllers/with_tmp_dir.js'
+import { loadChunk } from './backupVerifier.mjs'
+import globalBlobPersistor from './persistor.js'
+import config from 'config'
+import { NoKEKMatchedError } from '@overleaf/object-persistor/src/Errors.js'
+
+const globalBlobsBucket = config.get('blobStore.globalBucket')
+
+class BackupBlobStore {
+  /**
+   *
+   * @param {string} historyId
+   * @param {string} tmp
+   * @param {CachedPerProjectEncryptedS3Persistor} persistor
+   * @param {boolean} useBackupGlobalBlobs
+   */
+  constructor(historyId, tmp, persistor, useBackupGlobalBlobs) {
+    this.historyId = historyId
+    this.tmp = tmp
+    this.blobs = new Map()
+    this.persistor = persistor
+    this.useBackupGlobalBlobs = useBackupGlobalBlobs
+  }
+
+  /**
+   * Required for BlobStore interface - not supported.
+   *
+   * @template T
+   * @return {Promise<T>}
+   */
+  async getObject() {
+    throw new Error('Not implemented')
+  }
+
+  /**
+   *
+   * @param {Set<string>} hashes
+   * @return {Promise<void>}
+   */
+  async fetchBlobs(hashes) {
+    for await (const hash of hashes) {
+      if (this.blobs.has(hash)) return
+      const path = `${this.tmp}/${hash}`
+      /** @type {core.Blob} */
+      let blob
+      /** @type {NodeJS.ReadableStream} */
+      let blobStream
+      if (GLOBAL_BLOBS.has(hash)) {
+        try {
+          const blobData = await this.fetchGlobalBlob(hash)
+          await pipeline(blobData.stream, fs.createWriteStream(path))
+          blob = blobData.blob
+        } catch (err) {
+          logger.warn({ hash, err }, 'Failed to fetch global blob')
+          continue
+        }
+      } else {
+        try {
+          blobStream = await fetchBlob(this.historyId, hash, this.persistor)
+          await pipeline(blobStream, fs.createWriteStream(path))
+          blob = await this.makeBlob(hash, path)
+        } catch (err) {
+          logger.warn({ err, hash }, 'Failed to fetch chunk blob')
+          continue
+        }
+      }
+
+      this.blobs.set(hash, blob)
+    }
+  }
+
+  /**
+   *
+   * @param {string} hash
+   * @return {Promise<{ blob: core.Blob, stream: NodeJS.ReadableStream }>}
+   */
+  async fetchGlobalBlob(hash) {
+    const globalBlob = GLOBAL_BLOBS.get(hash)
+    if (!globalBlob) {
+      throw new Error('blob does not exist or is not a global blob')
+    }
+    let stream
+
+    const key = makeGlobalKey(hash)
+
+    if (this.useBackupGlobalBlobs) {
+      stream = await this.persistor.getObjectStream(
+        backupGlobalBlobsBucket,
+        key
+      )
+    } else {
+      stream = await globalBlobPersistor.getObjectStream(globalBlobsBucket, key)
+    }
+    return { blob: globalBlob.blob, stream }
+  }
+
+  /**
+   *
+   * @param {string} hash
+   * @param {string} pathname
+   * @return {Promise<core.Blob>}
+   */
+  async makeBlob(hash, pathname) {
+    const stat = await fs.promises.stat(pathname)
+    const byteLength = stat.size
+    const stringLength = await getStringLengthOfFile(byteLength, pathname)
+    if (stringLength) {
+      return new core.Blob(hash, byteLength, stringLength)
+    }
+    return new core.Blob(hash, byteLength)
+  }
+
+  /**
+   *
+   * @param {string} hash
+   * @return {Promise<string>}
+   */
+  async getString(hash) {
+    const stream = await this.getStream(hash)
+    const buffer = await streams.readStreamToBuffer(stream)
+    return buffer.toString()
+  }
+
+  /**
+   *
+   * @param {string} hash
+   * @return {Promise<fs.ReadStream>}
+   */
+  async getStream(hash) {
+    return fs.createReadStream(this.getBlobPathname(hash))
+  }
+
+  /**
+   *
+   * @param {string} hash
+   * @return {Promise<core.Blob>}
+   */
+  async getBlob(hash) {
+    return this.blobs.get(hash)
+  }
+
+  /**
+   *
+   * @param {string} hash
+   * @return {string}
+   */
+  getBlobPathname(hash) {
+    return path.join(this.tmp, hash)
+  }
+}
 
 /**
  * @typedef {(import('@overleaf/object-persistor/src/PerProjectEncryptedS3Persistor.js').CachedPerProjectEncryptedS3Persistor)} CachedPerProjectEncryptedS3Persistor
@@ -34,10 +190,21 @@ import logger from '@overleaf/logger'
  * @return {Promise<CachedPerProjectEncryptedS3Persistor>}
  */
 async function getProjectPersistor(historyId) {
-  return await backupPersistor.forProjectRO(
-    projectBlobsBucket,
-    makeProjectKey(historyId, '')
-  )
+  try {
+    return await backupPersistor.forProjectRO(
+      projectBlobsBucket,
+      makeProjectKey(historyId, '')
+    )
+  } catch (error) {
+    if (error instanceof NoKEKMatchedError) {
+      logger.info({}, 'no kek matched')
+    }
+    throw new BackupPersistorError(
+      'Failed to get project persistor',
+      { historyId },
+      error instanceof Error ? error : undefined
+    )
+  }
 }
 
 /**
@@ -77,13 +244,19 @@ async function fetchBlob(historyId, hash, persistor) {
   })
 }
 
+/**
+ * @typedef {object} AddChunkOptions
+ * @property {string} [prefix] Should include trailing slash (if length > 0)
+ * @property {boolean} [useBackupGlobalBlobs]
+ */
+
 /**
  *
  * @param {History} history
  * @param {Archiver} archive
  * @param {CachedPerProjectEncryptedS3Persistor} projectCache
  * @param {string} historyId
- * @param {string} [prefix] Should include trailing slash (if length > 0)
+ * @param {AddChunkOptions} [options]
  * @returns {Promise<void>}
  */
 async function addChunkToArchive(
@@ -91,33 +264,64 @@ async function addChunkToArchive(
   archive,
   projectCache,
   historyId,
-  prefix = ''
+  { prefix = '', useBackupGlobalBlobs = false } = {}
 ) {
   const chunkBlobs = new Set()
   history.findBlobHashes(chunkBlobs)
-  const files = getBlobMap(history, chunkBlobs)
 
-  logger.debug({ chunkBlobs, files }, 'Adding blobs to archive')
+  await withTmpDir('recovery-blob-', async tmpDir => {
+    const blobStore = new BackupBlobStore(
+      historyId,
+      tmpDir,
+      projectCache,
+      useBackupGlobalBlobs
+    )
+    await blobStore.fetchBlobs(chunkBlobs)
 
-  for (const chunkBlob of chunkBlobs) {
-    if (GLOBAL_BLOBS.has(chunkBlob)) {
-      logger.debug('Skipping global blob:', chunkBlob)
-      continue
+    await history.loadFiles('lazy', blobStore)
+
+    const snapshot = history.getSnapshot()
+    snapshot.applyAll(history.getChanges())
+
+    const filePaths = snapshot.getFilePathnames()
+
+    if (filePaths.length === 0) {
+      logger.warn(
+        { historyId, projectVersion: snapshot.projectVersion },
+        'No files found in snapshot backup'
+      )
     }
-    const blobStream = await fetchBlob(historyId, chunkBlob, projectCache)
+    for (const filePath of filePaths) {
+      /** @type {core.File | null | undefined} */
+      const file = snapshot.getFile(filePath)
+      if (!file) {
+        logger.error({ filePath }, 'File not found in snapshot')
+        continue
+      }
+      await file.load('eager', blobStore)
 
-    let name = chunkBlob
+      const hash = file.getHash()
 
-    if (files.has(chunkBlob)) {
-      name = files.get(chunkBlob)
-    } else {
-      logger.debug('Blob not found in file map:', chunkBlob)
+      /** @type {string | fs.ReadStream | null | undefined} */
+      let content = file.getContent({ filterTrackedDeletes: true })
+
+      if (content === null) {
+        if (!hash) {
+          logger.error({ filePath }, 'File does not have a hash')
+          continue
+        }
+        const blob = await blobStore.getBlob(hash)
+        if (!blob) {
+          logger.error({ filePath }, 'Blob not found in blob store')
+          continue
+        }
+        content = await blobStore.getStream(hash)
+      }
+      archive.append(content, {
+        name: `${prefix}${filePath}`,
+      })
     }
-
-    archive.append(blobStream, {
-      name: `${prefix}${name}`,
-    })
-  }
+  })
 }
 
 /**
@@ -134,28 +338,6 @@ async function findStartVersionOfLatestChunk(historyId) {
   return chunk.startVersion
 }
 
-/**
- *
- * @param {History} history
- * @param {Set<string>} chunkBlobs
- * @return {Map<string, string>}
- */
-function getBlobMap(history, chunkBlobs) {
-  const files = new Map()
-
-  history.changes.forEach(change => {
-    change.operations.forEach(operation => {
-      if (operation.getFile) {
-        const file = operation.getFile()
-        if (chunkBlobs.has(file.data.hash)) {
-          files.set(file.data.hash, operation.pathname)
-        }
-      }
-    })
-  })
-  return files
-}
-
 /**
  * Restore a project from the latest snapshot
  *
@@ -163,9 +345,16 @@ function getBlobMap(history, chunkBlobs) {
  *
  * @param {Archiver} archive
  * @param {string} historyId
+ * @param {boolean} [useBackupGlobalBlobs]
  * @return {Promise<void>}
  */
-export async function archiveLatestChunk(archive, historyId) {
+export async function archiveLatestChunk(
+  archive,
+  historyId,
+  useBackupGlobalBlobs = false
+) {
+  logger.info({ historyId, useBackupGlobalBlobs }, 'Archiving latest chunk')
+
   const projectCache = await getProjectPersistor(historyId)
 
   const startVersion = await findStartVersionOfLatestChunk(historyId)
@@ -178,7 +367,9 @@ export async function archiveLatestChunk(archive, historyId) {
 
   const backedUpChunk = History.fromRaw(backedUpChunkRaw)
 
-  await addChunkToArchive(backedUpChunk, archive, projectCache, historyId)
+  await addChunkToArchive(backedUpChunk, archive, projectCache, historyId, {
+    useBackupGlobalBlobs,
+  })
 
   return archive
 }
@@ -192,16 +383,19 @@ export async function archiveLatestChunk(archive, historyId) {
  *
  * @param {Archiver} archive
  * @param {string} historyId
+ * @param {boolean} [useBackupGlobalBlobs]
  * @return {Promise<void>}
  */
-export async function archiveRawProject(archive, historyId) {
+export async function archiveRawProject(
+  archive,
+  historyId,
+  useBackupGlobalBlobs = false
+) {
   const projectCache = await getProjectPersistor(historyId)
 
-  const key = path.join(projectKey.format(historyId), projectKey.pad(0))
-
   const { contents: chunks } = await projectCache.listDirectory(
     chunksBucket,
-    key
+    projectKey.format(historyId)
   )
 
   if (chunks.length === 0) {
@@ -209,11 +403,13 @@ export async function archiveRawProject(archive, historyId) {
   }
 
   for (const chunkRecord of chunks) {
-    logger.debug({ key: chunkRecord.Key }, 'Processing chunk')
     if (!chunkRecord.Key) {
+      logger.debug({ chunkRecord }, 'no key')
       continue
     }
     const chunkId = chunkRecord.Key.split('/').pop()
+    logger.debug({ chunkId, key: chunkRecord.Key }, 'Processing chunk')
+
     const { chunkData, buffer } = await loadChunkByKey(
       projectCache,
       chunkRecord.Key
@@ -225,12 +421,11 @@ export async function archiveRawProject(archive, historyId) {
 
     const chunk = History.fromRaw(chunkData)
 
-    await addChunkToArchive(
-      chunk,
-      archive,
-      projectCache,
-      historyId,
-      `${historyId}/chunks/${chunkId}/`
-    )
+    await addChunkToArchive(chunk, archive, projectCache, historyId, {
+      prefix: `${historyId}/chunks/${chunkId}/`,
+      useBackupGlobalBlobs,
+    })
   }
 }
+
+export class BackupPersistorError extends OError {}
diff --git a/services/history-v1/storage/scripts/recover_zip_from_backup.mjs b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
index 7770057962..a16c450092 100644
--- a/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
+++ b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
@@ -7,10 +7,16 @@ import { setTimeout } from 'node:timers/promises'
 import {
   archiveLatestChunk,
   archiveRawProject,
+  BackupPersistorError,
 } from '../lib/backupArchiver.mjs'
 import knex from '../lib/knex.js'
 import { client } from '../lib/mongodb.js'
 import archiver from 'archiver'
+import Events from 'node:events'
+import { Chunk } from 'overleaf-editor-core'
+
+// Silence warning.
+Events.setMaxListeners(20)
 
 const SUPPORTED_MODES = ['raw', 'latest']
 
@@ -26,7 +32,8 @@ async function shutdown(code = 0) {
   if (outputFile) {
     outputFile.close()
   }
-  await Promise.all([knex.destroy(), client.close()])
+  await knex.destroy()
+  await client.close()
   await setTimeout(1000)
   process.exit(code)
 }
@@ -73,7 +80,7 @@ try {
       { name: 'help', type: Boolean },
     ]))
 } catch (err) {
-  console.error(err.message)
+  console.error(err instanceof Error ? err.message : err)
   help = true
 }
 
@@ -144,7 +151,9 @@ archive.on(
    */
   function (progress) {
     if (verbose) {
-      console.log(`${progress.entries.processed} / ${progress.entries.total}`)
+      console.log(
+        `${progress.entries.processed} processed out of ${progress.entries.total}`
+      )
     }
   }
 )
@@ -169,7 +178,7 @@ archive.on(
    * @param {ArchiverError} warning
    */
   function (warning) {
-    console.warn(`Warning writing archive: ${warning.message}`)
+    console.warn(`Warning encountered when writing archive: ${warning.message}`)
   }
 )
 

From 6ed488cc650b1c312872c00a71b2e8ac92163aa6 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 6 Jun 2025 12:26:16 +0100
Subject: [PATCH 031/274] Change raw mode to just fetch all raw content from
 backup

GitOrigin-RevId: 397060d63c824dbe688d187312dd78d1f3e4bf5d
---
 .../history-v1/storage/lib/backupArchiver.mjs | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/services/history-v1/storage/lib/backupArchiver.mjs b/services/history-v1/storage/lib/backupArchiver.mjs
index 30a9708879..4e762df1ba 100644
--- a/services/history-v1/storage/lib/backupArchiver.mjs
+++ b/services/history-v1/storage/lib/backupArchiver.mjs
@@ -374,6 +374,41 @@ export async function archiveLatestChunk(
   return archive
 }
 
+/**
+ * Fetches all raw blobs from the project and adds them to the archive.
+ *
+ * @param {string} historyId
+ * @param {Archiver} archive
+ * @param {CachedPerProjectEncryptedS3Persistor} projectCache
+ * @return {Promise<void>}
+ */
+async function addRawBlobsToArchive(historyId, archive, projectCache) {
+  const key = projectKey.format(historyId)
+  const { contents } = await projectCache.listDirectory(projectBlobsBucket, key)
+  for (const blobRecord of contents) {
+    if (!blobRecord.Key) {
+      logger.debug({ blobRecord }, 'no key')
+      continue
+    }
+    const blobKey = blobRecord.Key
+    try {
+      const stream = await projectCache.getObjectStream(
+        projectBlobsBucket,
+        blobKey,
+        { autoGunzip: true }
+      )
+      archive.append(stream, {
+        name: path.join(historyId, 'blobs', blobKey),
+      })
+    } catch (err) {
+      logger.warn(
+        { err, path: blobRecord.Key },
+        'Failed to append blob to archive'
+      )
+    }
+  }
+}
+
 /**
  * Download raw files from the backup.
  *
@@ -410,22 +445,13 @@ export async function archiveRawProject(
     const chunkId = chunkRecord.Key.split('/').pop()
     logger.debug({ chunkId, key: chunkRecord.Key }, 'Processing chunk')
 
-    const { chunkData, buffer } = await loadChunkByKey(
-      projectCache,
-      chunkRecord.Key
-    )
+    const { buffer } = await loadChunkByKey(projectCache, chunkRecord.Key)
 
     archive.append(buffer, {
       name: `${historyId}/chunks/${chunkId}/chunk.json`,
     })
-
-    const chunk = History.fromRaw(chunkData)
-
-    await addChunkToArchive(chunk, archive, projectCache, historyId, {
-      prefix: `${historyId}/chunks/${chunkId}/`,
-      useBackupGlobalBlobs,
-    })
   }
+  await addRawBlobsToArchive(historyId, archive, projectCache)
 }
 
 export class BackupPersistorError extends OError {}

From 745043ca9269c87750ba29fae37d576afe7b22bb Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 6 Jun 2025 12:37:18 +0100
Subject: [PATCH 032/274] Add more detail for the modes

GitOrigin-RevId: 44b63b76b1edb8bfb78049c9c8560934e340ef96
---
 .../scripts/recover_zip_from_backup.mjs       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/services/history-v1/storage/scripts/recover_zip_from_backup.mjs b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
index a16c450092..4cf7051fcd 100644
--- a/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
+++ b/services/history-v1/storage/scripts/recover_zip_from_backup.mjs
@@ -14,12 +14,24 @@ import { client } from '../lib/mongodb.js'
 import archiver from 'archiver'
 import Events from 'node:events'
 import { Chunk } from 'overleaf-editor-core'
+import _ from 'lodash'
 
 // Silence warning.
 Events.setMaxListeners(20)
 
 const SUPPORTED_MODES = ['raw', 'latest']
 
+// Pads the mode name to a fixed length for better alignment in output.
+const padModeName = _.partialRight(
+  _.padEnd,
+  Math.max(...SUPPORTED_MODES.map(mode => mode.length))
+)
+
+const SUPPORTED_MODES_HELP = {
+  raw: 'Retrieve all chunk and blob files from the project backup.',
+  latest: 'Retrieves the last backed up state of the project.',
+}
+
 // outputFile needs to be available in the shutdown function (which may be called before it's declared)
 // eslint-disable-next-line prefer-const
 let outputFile
@@ -42,10 +54,15 @@ function usage() {
   console.log(
     'Usage: node recover_zip_from_backup.mjs --historyId=<historyId> --output=<output> [--mode=<mode>] [--verbose] [--useBackupGlobalBlobs]'
   )
-  console.log('Supported modes: ' + SUPPORTED_MODES.join(', '))
   console.log(
     '--useBackupGlobalBlobs can be used if the global blobs have not been restored from the backup yet.'
   )
+  console.log('Supported modes: ' + SUPPORTED_MODES.join(', '))
+  SUPPORTED_MODES.forEach(mode => {
+    console.log(
+      `    --mode=${padModeName(mode)} -  ${SUPPORTED_MODES_HELP[mode] || ''}`
+    )
+  })
 }
 
 /**

From 34b674aa6fcf1fe1d2e7aa5d984e8393b7d1f9e6 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Tue, 24 Jun 2025 12:12:17 +0100
Subject: [PATCH 033/274] Handle errors when converting lazyfiles to eagerfiles

GitOrigin-RevId: 6ada48e2f2b7ffee9c8560856436dc5e2076099d
---
 services/history-v1/storage/lib/backupArchiver.mjs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/services/history-v1/storage/lib/backupArchiver.mjs b/services/history-v1/storage/lib/backupArchiver.mjs
index 4e762df1ba..a10284070e 100644
--- a/services/history-v1/storage/lib/backupArchiver.mjs
+++ b/services/history-v1/storage/lib/backupArchiver.mjs
@@ -298,7 +298,16 @@ async function addChunkToArchive(
         logger.error({ filePath }, 'File not found in snapshot')
         continue
       }
-      await file.load('eager', blobStore)
+
+      try {
+        await file.load('eager', blobStore)
+      } catch (err) {
+        logger.error(
+          { filePath, err },
+          'Failed to load file from snapshot, skipping'
+        )
+        continue
+      }
 
       const hash = file.getHash()
 

From 903277c222ded5602b177520b7eed05065390b35 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Tue, 24 Jun 2025 12:12:45 +0100
Subject: [PATCH 034/274] Handle rangeHashes

GitOrigin-RevId: 9b9a67d8e45f17e948d003aed33cef6128a25744
---
 services/history-v1/storage/lib/backupArchiver.mjs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/services/history-v1/storage/lib/backupArchiver.mjs b/services/history-v1/storage/lib/backupArchiver.mjs
index a10284070e..c6f0e3755d 100644
--- a/services/history-v1/storage/lib/backupArchiver.mjs
+++ b/services/history-v1/storage/lib/backupArchiver.mjs
@@ -49,10 +49,18 @@ class BackupBlobStore {
    * Required for BlobStore interface - not supported.
    *
    * @template T
+   * @param {string} hash
    * @return {Promise<T>}
    */
-  async getObject() {
-    throw new Error('Not implemented')
+  async getObject(hash) {
+    try {
+      const stream = await this.getStream(hash)
+      const buffer = await streams.readStreamToBuffer(stream)
+      return JSON.parse(buffer.toString())
+    } catch (err) {
+      logger.warn({ err, hash }, 'Failed to fetch chunk blob')
+      throw err
+    }
   }
 
   /**

From c7ae851d39848c14b59f82b7d157570105446c85 Mon Sep 17 00:00:00 2001
From: Liangjun Song <146005915+adai26@users.noreply.github.com>
Date: Tue, 24 Jun 2025 14:27:18 +0100
Subject: [PATCH 035/274] Merge pull request #26519 from
 overleaf/ls-group-plan-upgrade-in-stripe

Support group plan upgrade in Stripe

GitOrigin-RevId: 44ae35c6221bf96a0b91526178d6ab1aff80f2a3
---
 .../Subscription/SubscriptionGroupHandler.js  | 44 ++-------
 .../config/settings.test.defaults.js          | 24 +++++
 .../SubscriptionGroupHandlerTests.js          | 92 +------------------
 3 files changed, 33 insertions(+), 127 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
index ba862baa67..d3cce35b32 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
@@ -296,39 +296,12 @@ async function updateSubscriptionPaymentTerms(
   await RecurlyClient.promises.updateSubscriptionDetails(updateRequest)
 }
 
-async function _getUpgradeTargetPlanCodeMaybeThrow(subscription) {
-  if (
-    subscription.planCode.includes('professional') ||
-    !subscription.groupPlan
-  ) {
-    throw new Error('Not eligible for group plan upgrade')
-  }
-
-  return subscription.planCode.replace('collaborator', 'professional')
-}
-
-async function _getGroupPlanUpgradeChangeRequest(ownerId) {
-  const olSubscription =
-    await SubscriptionLocator.promises.getUsersSubscription(ownerId)
-
-  await ensureSubscriptionIsActive(olSubscription)
-
-  const newPlanCode = await _getUpgradeTargetPlanCodeMaybeThrow(olSubscription)
-  const recurlySubscription = await RecurlyClient.promises.getSubscription(
-    olSubscription.recurlySubscription_id
-  )
-
-  await ensureSubscriptionCollectionMethodIsNotManual(recurlySubscription)
-  await ensureSubscriptionHasNoPendingChanges(recurlySubscription)
-
-  return recurlySubscription.getRequestForGroupPlanUpgrade(newPlanCode)
-}
-
 async function getGroupPlanUpgradePreview(ownerId) {
-  const changeRequest = await _getGroupPlanUpgradeChangeRequest(ownerId)
-  const subscriptionChange =
-    await RecurlyClient.promises.previewSubscriptionChange(changeRequest)
-  const paymentMethod = await RecurlyClient.promises.getPaymentMethod(ownerId)
+  const preview = await Modules.promises.hooks.fire(
+    'previewGroupPlanUpgrade',
+    ownerId
+  )
+  const { subscriptionChange, paymentMethod } = preview[0]
   return SubscriptionController.makeChangePreview(
     {
       type: 'group-plan-upgrade',
@@ -345,12 +318,7 @@ async function getGroupPlanUpgradePreview(ownerId) {
 }
 
 async function upgradeGroupPlan(ownerId) {
-  const changeRequest = await _getGroupPlanUpgradeChangeRequest(ownerId)
-  await RecurlyClient.promises.applySubscriptionChangeRequest(changeRequest)
-  await SubscriptionHandler.promises.syncSubscription(
-    { uuid: changeRequest.subscription.id },
-    ownerId
-  )
+  await Modules.promises.hooks.fire('upgradeGroupPlan', ownerId)
 }
 
 async function updateGroupMembersBulk(
diff --git a/services/web/test/acceptance/config/settings.test.defaults.js b/services/web/test/acceptance/config/settings.test.defaults.js
index b0db7f7449..b4a7006951 100644
--- a/services/web/test/acceptance/config/settings.test.defaults.js
+++ b/services/web/test/acceptance/config/settings.test.defaults.js
@@ -199,6 +199,30 @@ module.exports = {
       price_in_cents: 3000,
       features: features.professional,
     },
+    {
+      planCode: 'group_professional',
+      name: 'Professional - Group Account - Enterprise',
+      hideFromUsers: true,
+      price_in_cents: 0,
+      annual: true,
+      features: features.professional,
+      groupPlan: true,
+      membersLimit: 0,
+      membersLimitAddOn: 'additional-license',
+      canUseFlexibleLicensing: true,
+    },
+    {
+      planCode: 'group_collaborator',
+      name: 'Collaborator - Group Account - Enterprise',
+      hideFromUsers: true,
+      price_in_cents: 0,
+      annual: true,
+      features: features.collaborator,
+      groupPlan: true,
+      membersLimit: 0,
+      membersLimitAddOn: 'additional-license',
+      canUseFlexibleLicensing: true,
+    },
   ],
 
   bonus_features: {
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
index 1c314458da..c29ab4a1c0 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
@@ -779,100 +779,14 @@ describe('SubscriptionGroupHandler', function () {
     })
   })
 
-  describe('upgradeGroupPlan', function () {
-    it('should upgrade the subscription for flexible licensing group plans', async function () {
-      this.SubscriptionLocator.promises.getUsersSubscription = sinon
-        .stub()
-        .resolves({
-          groupPlan: true,
-          recurlyStatus: {
-            state: 'active',
-          },
-          planCode: 'group_collaborator',
-        })
-      await this.Handler.promises.upgradeGroupPlan(this.user_id)
-      this.recurlySubscription.getRequestForGroupPlanUpgrade
-        .calledWith('group_professional')
-        .should.equal(true)
-      this.RecurlyClient.promises.applySubscriptionChangeRequest
-        .calledWith(this.changeRequest)
-        .should.equal(true)
-      this.SubscriptionHandler.promises.syncSubscription
-        .calledWith({ uuid: this.changeRequest.subscription.id }, this.user_id)
-        .should.equal(true)
-    })
-
-    it('should upgrade the subscription for legacy group plans', async function () {
-      this.SubscriptionLocator.promises.getUsersSubscription = sinon
-        .stub()
-        .resolves({
-          groupPlan: true,
-          recurlyStatus: {
-            state: 'active',
-          },
-          planCode: 'group_collaborator_10_educational',
-        })
-      await this.Handler.promises.upgradeGroupPlan(this.user_id)
-      this.recurlySubscription.getRequestForGroupPlanUpgrade
-        .calledWith('group_professional_10_educational')
-        .should.equal(true)
-      this.RecurlyClient.promises.applySubscriptionChangeRequest
-        .calledWith(this.changeRequest)
-        .should.equal(true)
-      this.SubscriptionHandler.promises.syncSubscription
-        .calledWith({ uuid: this.changeRequest.subscription.id }, this.user_id)
-        .should.equal(true)
-    })
-
-    it('should fail the upgrade if is professional already', async function () {
-      this.SubscriptionLocator.promises.getUsersSubscription = sinon
-        .stub()
-        .resolves({
-          groupPlan: true,
-          recurlyStatus: {
-            state: 'active',
-          },
-          planCode: 'group_professional',
-        })
-      await expect(
-        this.Handler.promises.upgradeGroupPlan(this.user_id)
-      ).to.be.rejectedWith('Not eligible for group plan upgrade')
-    })
-
-    it('should fail the upgrade if not group plan', async function () {
-      this.SubscriptionLocator.promises.getUsersSubscription = sinon
-        .stub()
-        .resolves({
-          groupPlan: false,
-          recurlyStatus: {
-            state: 'active',
-          },
-          planCode: 'test_plan_code',
-        })
-      await expect(
-        this.Handler.promises.upgradeGroupPlan(this.user_id)
-      ).to.be.rejectedWith('Not eligible for group plan upgrade')
-    })
-  })
-
   describe('getGroupPlanUpgradePreview', function () {
     it('should generate preview for subscription upgrade', async function () {
-      this.SubscriptionLocator.promises.getUsersSubscription = sinon
-        .stub()
-        .resolves({
-          groupPlan: true,
-          recurlyStatus: {
-            state: 'active',
-          },
-          planCode: 'group_collaborator',
-        })
+      this.Modules.promises.hooks.fire.resolves([
+        { subscriptionChange: this.previewSubscriptionChange },
+      ])
       const result = await this.Handler.promises.getGroupPlanUpgradePreview(
         this.user_id
       )
-      this.RecurlyClient.promises.previewSubscriptionChange
-        .calledWith(this.changeRequest)
-        .should.equal(true)
-
       result.should.equal(this.changePreview)
     })
   })

From e76a8ff267a02511689605f65c7184a4cfe84218 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Thu, 12 Jun 2025 16:30:49 +0100
Subject: [PATCH 036/274] Convert return new Promise to await new Promise

GitOrigin-RevId: 49404748cc90cb7bdef0460f7e9837196f81cae8
---
 .../unit/src/LaunchpadController.test.mjs     |   4 +-
 .../unit/src/UserActivateController.test.mjs  |  23 +--
 .../Analytics/AnalyticsController.test.mjs    |  12 +-
 .../BetaProgramController.test.mjs            |  66 ++++-----
 .../BetaProgram/BetaProgramHandler.test.mjs   |  32 ++---
 .../CollaboratorsController.test.mjs          |  56 ++++----
 .../CollaboratorsInviteController.test.mjs    | 104 +++++++-------
 .../src/Contact/ContactController.test.mjs    |  18 +--
 .../src/Documents/DocumentController.test.mjs |  16 +--
 .../ProjectZipStreamManager.test.mjs          |  12 +-
 .../src/Exports/ExportsController.test.mjs    |  20 +--
 .../unit/src/Exports/ExportsHandler.test.mjs  |  81 +++++------
 .../FileStore/FileStoreController.test.mjs    |   8 +-
 .../LinkedFilesController.test.mjs            |   8 +-
 .../NotificationsController.test.mjs          |  12 +-
 .../PasswordResetController.test.mjs          | 104 +++++++-------
 .../PasswordResetHandler.test.mjs             |  52 +++----
 .../src/Project/ProjectApiController.test.mjs |   4 +-
 .../Project/ProjectListController.test.mjs    |  68 ++++-----
 .../unit/src/Referal/ReferalConnect.test.mjs  |  44 +++---
 .../References/ReferencesController.test.mjs  |  48 +++----
 .../src/References/ReferencesHandler.test.mjs |  56 ++++----
 .../SubscriptionGroupController.test.mjs      | 117 ++++++++--------
 .../TeamInvitesController.test.mjs            |  28 ++--
 .../unit/src/Tags/TagsController.test.mjs     |  44 +++---
 .../TpdsController.test.mjs                   |  56 ++++----
 .../TpdsUpdateHandler.test.mjs                |   4 +-
 .../TokenAccessController.test.mjs            |  97 ++++++-------
 .../Uploads/ProjectUploadController.test.mjs  |   4 +-
 .../src/User/UserPagesController.test.mjs     | 132 +++++++++---------
 .../UserMembershipController.test.mjs         |  48 +++----
 31 files changed, 691 insertions(+), 687 deletions(-)

diff --git a/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs b/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
index e34a3583b0..a92fca04de 100644
--- a/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
+++ b/services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
@@ -281,8 +281,8 @@ describe('LaunchpadController', function () {
           .rejects(new Error('woops'))
       })
 
-      it('should call next with an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should call next with an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.next = sinon.stub().callsFake(err => {
             expect(err).to.be.instanceof(Error)
             ctx.next.callCount.should.equal(1)
diff --git a/services/web/modules/user-activate/test/unit/src/UserActivateController.test.mjs b/services/web/modules/user-activate/test/unit/src/UserActivateController.test.mjs
index 9019e525d7..be59eecf97 100644
--- a/services/web/modules/user-activate/test/unit/src/UserActivateController.test.mjs
+++ b/services/web/modules/user-activate/test/unit/src/UserActivateController.test.mjs
@@ -77,38 +77,39 @@ describe('UserActivateController', function () {
 
     it('should 404 without a user_id', async function (ctx) {
       delete ctx.req.query.user_id
-      return new Promise(resolve => {
+
+      await new Promise(resolve => {
         ctx.ErrorController.notFound = () => resolve()
         ctx.UserActivateController.activateAccountPage(ctx.req, ctx.res)
       })
     })
 
-    it('should 404 without a token', function (ctx) {
-      return new Promise(resolve => {
+    it('should 404 without a token', async function (ctx) {
+      await new Promise(resolve => {
         delete ctx.req.query.token
         ctx.ErrorController.notFound = resolve
         ctx.UserActivateController.activateAccountPage(ctx.req, ctx.res)
       })
     })
 
-    it('should 404 without a valid user_id', function (ctx) {
-      return new Promise(resolve => {
+    it('should 404 without a valid user_id', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserGetter.promises.getUser = sinon.stub().resolves(null)
         ctx.ErrorController.notFound = resolve
         ctx.UserActivateController.activateAccountPage(ctx.req, ctx.res)
       })
     })
 
-    it('should 403 for complex user_id', function (ctx) {
-      return new Promise(resolve => {
+    it('should 403 for complex user_id', async function (ctx) {
+      await new Promise(resolve => {
         ctx.ErrorController.forbidden = resolve
         ctx.req.query.user_id = { first_name: 'X' }
         ctx.UserActivateController.activateAccountPage(ctx.req, ctx.res)
       })
     })
 
-    it('should redirect activated users to login', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect activated users to login', async function (ctx) {
+      await new Promise(resolve => {
         ctx.user.loginCount = 1
         ctx.res.redirect = url => {
           sinon.assert.calledWith(ctx.UserGetter.promises.getUser, ctx.user_id)
@@ -119,8 +120,8 @@ describe('UserActivateController', function () {
       })
     })
 
-    it('render the activation page if the user has not logged in before', function (ctx) {
-      return new Promise(resolve => {
+    it('render the activation page if the user has not logged in before', async function (ctx) {
+      await new Promise(resolve => {
         ctx.user.loginCount = 0
         ctx.res.render = (page, opts) => {
           page.should.equal(VIEW_PATH)
diff --git a/services/web/test/unit/src/Analytics/AnalyticsController.test.mjs b/services/web/test/unit/src/Analytics/AnalyticsController.test.mjs
index 4019f2bce9..f0d047ef28 100644
--- a/services/web/test/unit/src/Analytics/AnalyticsController.test.mjs
+++ b/services/web/test/unit/src/Analytics/AnalyticsController.test.mjs
@@ -68,8 +68,8 @@ describe('AnalyticsController', function () {
         .resolves({ country_code: 'XY' })
     })
 
-    it('delegates to the AnalyticsManager', function (ctx) {
-      return new Promise(resolve => {
+    it('delegates to the AnalyticsManager', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SessionManager.getLoggedInUserId.returns('1234')
         ctx.res.callback = () => {
           sinon.assert.calledWith(
@@ -105,8 +105,8 @@ describe('AnalyticsController', function () {
       delete ctx.expectedData._csrf
     })
 
-    it('should use the session', function (ctx) {
-      return new Promise(resolve => {
+    it('should use the session', async function (ctx) {
+      await new Promise(resolve => {
         ctx.controller.recordEvent(ctx.req, ctx.res)
         sinon.assert.calledWith(
           ctx.AnalyticsManager.recordEventForSession,
@@ -118,8 +118,8 @@ describe('AnalyticsController', function () {
       })
     })
 
-    it('should remove the CSRF token before sending to the manager', function (ctx) {
-      return new Promise(resolve => {
+    it('should remove the CSRF token before sending to the manager', async function (ctx) {
+      await new Promise(resolve => {
         ctx.controller.recordEvent(ctx.req, ctx.res)
         sinon.assert.calledWith(
           ctx.AnalyticsManager.recordEventForSession,
diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
index 23dd4dc1c8..921f65cbab 100644
--- a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
+++ b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
@@ -79,14 +79,14 @@ describe('BetaProgramController', function () {
   })
 
   describe('optIn', function () {
-    it("should redirect to '/beta/participate'", function (ctx) {
-      return new Promise(resolve => {
+    it("should redirect to '/beta/participate'", async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.redirectedTo.should.equal('/beta/participate')
           resolve()
         }
         ctx.BetaProgramController.optIn(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
     it('should not call next with an error', function (ctx) {
@@ -99,8 +99,8 @@ describe('BetaProgramController', function () {
       ctx.BetaProgramHandler.promises.optIn.callCount.should.equal(1)
     })
 
-    it('should invoke the session maintenance', function (ctx) {
-      return new Promise(resolve => {
+    it('should invoke the session maintenance', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.SplitTestSessionHandler.promises.sessionMaintenance.should.have.been.calledWith(
             ctx.req
@@ -108,7 +108,7 @@ describe('BetaProgramController', function () {
           resolve()
         }
         ctx.BetaProgramController.optIn(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
     describe('when BetaProgramHandler.opIn produces an error', function () {
@@ -121,50 +121,50 @@ describe('BetaProgramController', function () {
         ctx.res.redirect.callCount.should.equal(0)
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function(ctx) {
+        await new Promise(resolve => {
           ctx.BetaProgramController.optIn(ctx.req, ctx.res, err => {
             expect(err).to.be.instanceof(Error)
             resolve()
           })
-        })
+        });
       })
     })
   })
 
   describe('optOut', function () {
-    it("should redirect to '/beta/participate'", function (ctx) {
-      return new Promise(resolve => {
+    it("should redirect to '/beta/participate'", async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.redirectedTo).to.equal('/beta/participate')
           resolve()
         }
         ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should not call next with an error', function (ctx) {
-      return new Promise(resolve => {
+    it('should not call next with an error', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.next.callCount.should.equal(0)
           resolve()
         }
         ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should call BetaProgramHandler.optOut', function (ctx) {
-      return new Promise(resolve => {
+    it('should call BetaProgramHandler.optOut', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.BetaProgramHandler.promises.optOut.callCount.should.equal(1)
           resolve()
         }
         ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should invoke the session maintenance', function (ctx) {
-      return new Promise(resolve => {
+    it('should invoke the session maintenance', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.SplitTestSessionHandler.promises.sessionMaintenance.should.have.been.calledWith(
             ctx.req,
@@ -173,7 +173,7 @@ describe('BetaProgramController', function () {
           resolve()
         }
         ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
     describe('when BetaProgramHandler.optOut produces an error', function () {
@@ -181,23 +181,23 @@ describe('BetaProgramController', function () {
         ctx.BetaProgramHandler.promises.optOut.throws(new Error('woops'))
       })
 
-      it("should not redirect to '/beta/participate'", function (ctx) {
-        return new Promise(resolve => {
+      it("should not redirect to '/beta/participate'", async function(ctx) {
+        await new Promise(resolve => {
           ctx.BetaProgramController.optOut(ctx.req, ctx.res, error => {
             expect(error).to.exist
             expect(ctx.res.redirected).to.equal(false)
             resolve()
           })
-        })
+        });
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function(ctx) {
+        await new Promise(resolve => {
           ctx.BetaProgramController.optOut(ctx.req, ctx.res, error => {
             expect(error).to.exist
             resolve()
           })
-        })
+        });
       })
     })
   })
@@ -207,14 +207,14 @@ describe('BetaProgramController', function () {
       ctx.UserGetter.promises.getUser.resolves(ctx.user)
     })
 
-    it('should render the opt-in page', function (ctx) {
-      return new Promise(resolve => {
+    it('should render the opt-in page', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedTemplate).to.equal('beta_program/opt_in')
           resolve()
         }
         ctx.BetaProgramController.optInPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
     describe('when UserGetter.getUser produces an error', function () {
@@ -227,14 +227,14 @@ describe('BetaProgramController', function () {
         ctx.res.render.callCount.should.equal(0)
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function(ctx) {
+        await new Promise(resolve => {
           ctx.BetaProgramController.optInPage(ctx.req, ctx.res, error => {
             expect(error).to.exist
             expect(error).to.be.instanceof(Error)
             resolve()
           })
-        })
+        });
       })
     })
   })
diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
index 4034835666..2e6ffb4568 100644
--- a/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
+++ b/services/web/test/unit/src/BetaProgram/BetaProgramHandler.test.mjs
@@ -56,8 +56,8 @@ describe('BetaProgramHandler', function () {
       }
     })
 
-    it('should call userUpdater', function (ctx) {
-      return new Promise(resolve => {
+    it('should call userUpdater', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(err => {
           expect(err).to.not.exist
           ctx.UserUpdater.promises.updateUser.callCount.should.equal(1)
@@ -66,8 +66,8 @@ describe('BetaProgramHandler', function () {
       })
     })
 
-    it('should set beta-program user property to true', function (ctx) {
-      return new Promise(resolve => {
+    it('should set beta-program user property to true', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(err => {
           expect(err).to.not.exist
           sinon.assert.calledWith(
@@ -81,8 +81,8 @@ describe('BetaProgramHandler', function () {
       })
     })
 
-    it('should not produce an error', function (ctx) {
-      return new Promise(resolve => {
+    it('should not produce an error', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(err => {
           expect(err).to.not.exist
           resolve()
@@ -95,8 +95,8 @@ describe('BetaProgramHandler', function () {
         ctx.UserUpdater.promises.updateUser.rejects()
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(err => {
             expect(err).to.exist
             expect(err).to.be.instanceof(Error)
@@ -115,8 +115,8 @@ describe('BetaProgramHandler', function () {
       }
     })
 
-    it('should call userUpdater', function (ctx) {
-      return new Promise(resolve => {
+    it('should call userUpdater', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(err => {
           expect(err).to.not.exist
           ctx.UserUpdater.promises.updateUser.callCount.should.equal(1)
@@ -125,8 +125,8 @@ describe('BetaProgramHandler', function () {
       })
     })
 
-    it('should set beta-program user property to false', function (ctx) {
-      return new Promise(resolve => {
+    it('should set beta-program user property to false', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(err => {
           expect(err).to.not.exist
           sinon.assert.calledWith(
@@ -140,8 +140,8 @@ describe('BetaProgramHandler', function () {
       })
     })
 
-    it('should not produce an error', function (ctx) {
-      return new Promise(resolve => {
+    it('should not produce an error', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(err => {
           expect(err).to.not.exist
           resolve()
@@ -154,8 +154,8 @@ describe('BetaProgramHandler', function () {
         ctx.UserUpdater.promises.updateUser.rejects()
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(err => {
             expect(err).to.exist
             expect(err).to.be.instanceof(Error)
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
index 1d8345a195..85beb949b7 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsController.test.mjs
@@ -169,8 +169,8 @@ describe('CollaboratorsController', function () {
   })
 
   describe('removeUserFromProject', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.params = {
           Project_id: ctx.projectId,
           user_id: ctx.user._id,
@@ -219,8 +219,8 @@ describe('CollaboratorsController', function () {
   })
 
   describe('removeSelfFromProject', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.params = { Project_id: ctx.projectId }
         ctx.res.sendStatus = sinon.spy(() => {
           resolve()
@@ -264,8 +264,8 @@ describe('CollaboratorsController', function () {
   })
 
   describe('getAllMembers', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.params = { Project_id: ctx.projectId }
         ctx.res.json = sinon.spy(() => {
           resolve()
@@ -294,8 +294,8 @@ describe('CollaboratorsController', function () {
     })
 
     describe('when CollaboratorsGetter.getAllInvitedMembers produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.json = sinon.stub()
           ctx.next = sinon.spy(() => {
             resolve()
@@ -329,8 +329,8 @@ describe('CollaboratorsController', function () {
       ctx.req.body = { privilegeLevel: 'readOnly' }
     })
 
-    it('should set the collaborator privilege level', function (ctx) {
-      return new Promise(resolve => {
+    it('should set the collaborator privilege level', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.sendStatus = status => {
           expect(status).to.equal(204)
           expect(
@@ -342,8 +342,8 @@ describe('CollaboratorsController', function () {
       })
     })
 
-    it('should return a 404 when the project or collaborator is not found', function (ctx) {
-      return new Promise(resolve => {
+    it('should return a 404 when the project or collaborator is not found', async function (ctx) {
+      await new Promise(resolve => {
         ctx.HttpErrorHandler.notFound = sinon.spy((req, res) => {
           expect(req).to.equal(ctx.req)
           expect(res).to.equal(ctx.res)
@@ -357,8 +357,8 @@ describe('CollaboratorsController', function () {
       })
     })
 
-    it('should pass the error to the next handler when setting the privilege level fails', function (ctx) {
-      return new Promise(resolve => {
+    it('should pass the error to the next handler when setting the privilege level fails', async function (ctx) {
+      await new Promise(resolve => {
         ctx.next = sinon.spy(err => {
           expect(err).instanceOf(Error)
           resolve()
@@ -381,8 +381,8 @@ describe('CollaboratorsController', function () {
       })
 
       describe('when owner can add new edit collaborators', function () {
-        it('should set privilege level after checking collaborators can be added', function (ctx) {
-          return new Promise(resolve => {
+        it('should set privilege level after checking collaborators can be added', async function (ctx) {
+          await new Promise(resolve => {
             ctx.res.sendStatus = status => {
               expect(status).to.equal(204)
               expect(
@@ -407,8 +407,8 @@ describe('CollaboratorsController', function () {
           )
         })
 
-        it('should return a 403 if trying to set a new edit collaborator', function (ctx) {
-          return new Promise(resolve => {
+        it('should return a 403 if trying to set a new edit collaborator', async function (ctx) {
+          await new Promise(resolve => {
             ctx.HttpErrorHandler.forbidden = sinon.spy((req, res) => {
               expect(req).to.equal(ctx.req)
               expect(res).to.equal(ctx.res)
@@ -443,8 +443,8 @@ describe('CollaboratorsController', function () {
           )
         })
 
-        it('should always allow setting a collaborator to viewer even if user cant add edit collaborators', function (ctx) {
-          return new Promise(resolve => {
+        it('should always allow setting a collaborator to viewer even if user cant add edit collaborators', async function (ctx) {
+          await new Promise(resolve => {
             ctx.res.sendStatus = status => {
               expect(status).to.equal(204)
               expect(ctx.LimitationsManager.promises.canAddXEditCollaborators)
@@ -466,8 +466,8 @@ describe('CollaboratorsController', function () {
       ctx.req.body = { user_id: ctx.user._id.toString() }
     })
 
-    it('returns 204 on success', function (ctx) {
-      return new Promise(resolve => {
+    it('returns 204 on success', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.sendStatus = status => {
           expect(status).to.equal(204)
           resolve()
@@ -476,8 +476,8 @@ describe('CollaboratorsController', function () {
       })
     })
 
-    it('returns 404 if the project does not exist', function (ctx) {
-      return new Promise(resolve => {
+    it('returns 404 if the project does not exist', async function (ctx) {
+      await new Promise(resolve => {
         ctx.HttpErrorHandler.notFound = sinon.spy((req, res, message) => {
           expect(req).to.equal(ctx.req)
           expect(res).to.equal(ctx.res)
@@ -491,8 +491,8 @@ describe('CollaboratorsController', function () {
       })
     })
 
-    it('returns 404 if the user does not exist', function (ctx) {
-      return new Promise(resolve => {
+    it('returns 404 if the user does not exist', async function (ctx) {
+      await new Promise(resolve => {
         ctx.HttpErrorHandler.notFound = sinon.spy((req, res, message) => {
           expect(req).to.equal(ctx.req)
           expect(res).to.equal(ctx.res)
@@ -506,8 +506,8 @@ describe('CollaboratorsController', function () {
       })
     })
 
-    it('invokes HTTP forbidden error handler if the user is not a collaborator', function (ctx) {
-      return new Promise(resolve => {
+    it('invokes HTTP forbidden error handler if the user is not a collaborator', async function (ctx) {
+      await new Promise(resolve => {
         ctx.HttpErrorHandler.forbidden = sinon.spy(() => resolve())
         ctx.OwnershipTransferHandler.promises.transferOwnership.rejects(
           new Errors.UserNotCollaboratorError()
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs b/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
index edac9c6c92..aafbb0dbc0 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsInviteController.test.mjs
@@ -229,8 +229,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when all goes well', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteGetter.promises.getAllInvites.resolves(
             ctx.fakeInvites
           )
@@ -263,8 +263,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when CollaboratorsInviteHandler.getAllInvites produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteGetter.promises.getAllInvites.rejects(
             new Error('woops')
           )
@@ -378,8 +378,8 @@ describe('CollaboratorsInviteController', function () {
       })
 
       describe('readAndWrite collaborator', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.privileges = 'readAndWrite'
             ctx.CollaboratorsInviteController._checkShouldInviteEmail = sinon
               .stub()
@@ -420,8 +420,8 @@ describe('CollaboratorsInviteController', function () {
       })
 
       describe('readOnly collaborator (always allowed)', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.req.body = {
               email: ctx.targetEmail,
               privileges: (ctx.privileges = 'readOnly'),
@@ -500,8 +500,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when inviteToProject produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteController._checkShouldInviteEmail = sinon
             .stub()
             .resolves(true)
@@ -559,8 +559,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when _checkShouldInviteEmail disallows the invite', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteController._checkShouldInviteEmail = sinon
             .stub()
             .resolves(false)
@@ -601,8 +601,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when _checkShouldInviteEmail produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteController._checkShouldInviteEmail = sinon
             .stub()
             .rejects(new Error('woops'))
@@ -748,8 +748,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when the token is valid', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = () => resolve()
           ctx.CollaboratorsInviteController.viewInvite(
             ctx.req,
@@ -802,8 +802,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when not logged in', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.SessionManager.getSessionUser.returns(null)
 
           ctx.res.callback = () => resolve()
@@ -833,8 +833,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when user is already a member of the project', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
             true
           )
@@ -883,8 +883,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when isUserInvitedMemberOfProject produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.rejects(
             new Error('woops')
           )
@@ -927,8 +927,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when the getInviteByToken produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteGetter.promises.getInviteByToken.rejects(
             new Error('woops')
           )
@@ -974,8 +974,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when the getInviteByToken does not produce an invite', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteGetter.promises.getInviteByToken.resolves(null)
           ctx.res.callback = () => resolve()
           ctx.CollaboratorsInviteController.viewInvite(
@@ -1023,8 +1023,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when User.getUser produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.UserGetter.promises.getUser.rejects(new Error('woops'))
           ctx.next.callsFake(() => resolve())
           ctx.CollaboratorsInviteController.viewInvite(
@@ -1068,8 +1068,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when User.getUser does not find a user', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.UserGetter.promises.getUser.resolves(null)
           ctx.res.callback = () => resolve()
           ctx.CollaboratorsInviteController.viewInvite(
@@ -1117,8 +1117,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when getProject produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ProjectGetter.promises.getProject.rejects(new Error('woops'))
           ctx.next.callsFake(() => resolve())
           ctx.CollaboratorsInviteController.viewInvite(
@@ -1162,8 +1162,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when Project.getUser does not find a user', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ProjectGetter.promises.getProject.resolves(null)
           ctx.res.callback = () => resolve()
           ctx.CollaboratorsInviteController.viewInvite(
@@ -1224,8 +1224,8 @@ describe('CollaboratorsInviteController', function () {
 
     describe('when generateNewInvite does not produce an error', function () {
       describe('and returns an invite object', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.res.callback = () => resolve()
             ctx.CollaboratorsInviteController.generateNewInvite(
               ctx.req,
@@ -1274,8 +1274,8 @@ describe('CollaboratorsInviteController', function () {
       })
 
       describe('and returns a null invite', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.CollaboratorsInviteHandler.promises.generateNewInvite.resolves(
               null
             )
@@ -1303,8 +1303,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when generateNewInvite produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteHandler.promises.generateNewInvite.rejects(
             new Error('woops')
           )
@@ -1343,8 +1343,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when revokeInvite does not produce an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = () => resolve()
           ctx.CollaboratorsInviteController.revokeInvite(
             ctx.req,
@@ -1387,8 +1387,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when revokeInvite produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteHandler.promises.revokeInvite.rejects(
             new Error('woops')
           )
@@ -1427,8 +1427,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when acceptInvite does not produce an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = () => resolve()
           ctx.CollaboratorsInviteController.acceptInvite(
             ctx.req,
@@ -1476,8 +1476,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when the invite is not found', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteGetter.promises.getInviteByToken.resolves(null)
           ctx.next.callsFake(() => resolve())
           ctx.CollaboratorsInviteController.acceptInvite(
@@ -1496,8 +1496,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when acceptInvite produces an error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.CollaboratorsInviteHandler.promises.acceptInvite.rejects(
             new Error('woops')
           )
@@ -1527,8 +1527,8 @@ describe('CollaboratorsInviteController', function () {
     })
 
     describe('when the project audit log entry fails', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ProjectAuditLogHandler.promises.addEntry.rejects(
             new Error('oops')
           )
diff --git a/services/web/test/unit/src/Contact/ContactController.test.mjs b/services/web/test/unit/src/Contact/ContactController.test.mjs
index 13f70c81f6..577bbb8e9a 100644
--- a/services/web/test/unit/src/Contact/ContactController.test.mjs
+++ b/services/web/test/unit/src/Contact/ContactController.test.mjs
@@ -88,8 +88,8 @@ describe('ContactController', function () {
       ctx.ContactController.getContacts(ctx.req, ctx.res)
     })
 
-    it('should populate the users contacts ids', function (ctx) {
-      return new Promise(resolve => {
+    it('should populate the users contacts ids', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.UserGetter.promises.getUsers).to.have.been.calledWith(
             ctx.contact_ids,
@@ -103,11 +103,11 @@ describe('ContactController', function () {
           resolve()
         }
         ctx.ContactController.getContacts(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should fire the getContact module hook', function (ctx) {
-      return new Promise(resolve => {
+    it('should fire the getContact module hook', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.Modules.promises.hooks.fire).to.have.been.calledWith(
             'getContacts',
@@ -116,11 +116,11 @@ describe('ContactController', function () {
           resolve()
         }
         ctx.ContactController.getContacts(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should return a formatted list of contacts in contact list order, without holding accounts', function (ctx) {
-      return new Promise(resolve => {
+    it('should return a formatted list of contacts in contact list order, without holding accounts', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.json.args[0][0].contacts.should.deep.equal([
             {
@@ -141,7 +141,7 @@ describe('ContactController', function () {
           resolve()
         }
         ctx.ContactController.getContacts(ctx.req, ctx.res, resolve)
-      })
+      });
     })
   })
 })
diff --git a/services/web/test/unit/src/Documents/DocumentController.test.mjs b/services/web/test/unit/src/Documents/DocumentController.test.mjs
index 06c971be91..e3fe3bdec2 100644
--- a/services/web/test/unit/src/Documents/DocumentController.test.mjs
+++ b/services/web/test/unit/src/Documents/DocumentController.test.mjs
@@ -125,8 +125,8 @@ describe('DocumentController', function () {
     })
 
     describe('when project exists with project history enabled', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = err => {
             resolve(err)
           }
@@ -151,8 +151,8 @@ describe('DocumentController', function () {
     })
 
     describe('when the project does not exist', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ProjectGetter.promises.getProject.resolves(null)
           ctx.res.callback = err => {
             resolve(err)
@@ -176,8 +176,8 @@ describe('DocumentController', function () {
     })
 
     describe('when the document exists', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.body = {
             lines: ctx.doc_lines,
             version: ctx.version,
@@ -211,8 +211,8 @@ describe('DocumentController', function () {
     })
 
     describe("when the document doesn't exist", function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ProjectEntityUpdateHandler.promises.updateDocLines.rejects(
             new Errors.NotFoundError('document does not exist')
           )
diff --git a/services/web/test/unit/src/Downloads/ProjectZipStreamManager.test.mjs b/services/web/test/unit/src/Downloads/ProjectZipStreamManager.test.mjs
index df7486e11d..deb9275c5f 100644
--- a/services/web/test/unit/src/Downloads/ProjectZipStreamManager.test.mjs
+++ b/services/web/test/unit/src/Downloads/ProjectZipStreamManager.test.mjs
@@ -72,8 +72,8 @@ describe('ProjectZipStreamManager', function () {
 
   describe('createZipStreamForMultipleProjects', function () {
     describe('successfully', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.project_ids = ['project-1', 'project-2']
           ctx.zip_streams = {
             'project-1': new EventEmitter(),
@@ -154,8 +154,8 @@ describe('ProjectZipStreamManager', function () {
     })
 
     describe('with a project not existing', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.project_ids = ['project-1', 'wrong-id']
           ctx.project_names = {
             'project-1': 'Project One Name',
@@ -346,8 +346,8 @@ describe('ProjectZipStreamManager', function () {
   })
 
   describe('addAllDocsToArchive', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.docs = {
           '/main.tex': {
             lines: [
diff --git a/services/web/test/unit/src/Exports/ExportsController.test.mjs b/services/web/test/unit/src/Exports/ExportsController.test.mjs
index cd8f4ba7a9..9e92a8c6d5 100644
--- a/services/web/test/unit/src/Exports/ExportsController.test.mjs
+++ b/services/web/test/unit/src/Exports/ExportsController.test.mjs
@@ -65,8 +65,8 @@ describe('ExportsController', function () {
   })
 
   describe('without gallery fields', function () {
-    it('should ask the handler to perform the export', function (ctx) {
-      return new Promise(resolve => {
+    it('should ask the handler to perform the export', async function (ctx) {
+      await new Promise(resolve => {
         ctx.handler.exportProject = sinon
           .stub()
           .yields(null, { iAmAnExport: true, v1_id: 897 })
@@ -92,8 +92,8 @@ describe('ExportsController', function () {
   })
 
   describe('with a message from v1', function () {
-    it('should ask the handler to perform the export', function (ctx) {
-      return new Promise(resolve => {
+    it('should ask the handler to perform the export', async function (ctx) {
+      await new Promise(resolve => {
         ctx.handler.exportProject = sinon.stub().yields(null, {
           iAmAnExport: true,
           v1_id: 897,
@@ -129,8 +129,8 @@ describe('ExportsController', function () {
       return (ctx.req.body.showSource = true)
     })
 
-    it('should ask the handler to perform the export', function (ctx) {
-      return new Promise(resolve => {
+    it('should ask the handler to perform the export', async function (ctx) {
+      await new Promise(resolve => {
         ctx.handler.exportProject = sinon
           .stub()
           .yields(null, { iAmAnExport: true, v1_id: 897 })
@@ -161,8 +161,8 @@ describe('ExportsController', function () {
   })
 
   describe('with an error return from v1 to forward to the publish modal', function () {
-    it('should forward the response onward', function (ctx) {
-      return new Promise(resolve => {
+    it('should forward the response onward', async function (ctx) {
+      await new Promise(resolve => {
         ctx.error_json = { status: 422, message: 'nope' }
         ctx.handler.exportProject = sinon
           .stub()
@@ -175,8 +175,8 @@ describe('ExportsController', function () {
     })
   })
 
-  it('should ask the handler to return the status of an export', function (ctx) {
-    return new Promise(resolve => {
+  it('should ask the handler to return the status of an export', async function (ctx) {
+    await new Promise(resolve => {
       ctx.handler.fetchExport = sinon.stub().yields(
         null,
         `{
diff --git a/services/web/test/unit/src/Exports/ExportsHandler.test.mjs b/services/web/test/unit/src/Exports/ExportsHandler.test.mjs
index a7944beced..05523834a6 100644
--- a/services/web/test/unit/src/Exports/ExportsHandler.test.mjs
+++ b/services/web/test/unit/src/Exports/ExportsHandler.test.mjs
@@ -81,8 +81,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when all goes well', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ExportsHandler.exportProject(
             ctx.export_params,
             (error, exportData) => {
@@ -111,8 +111,8 @@ describe('ExportsHandler', function () {
     })
 
     describe("when request can't be built", function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ExportsHandler._buildExport = sinon
             .stub()
             .yields(new Error('cannot export project without root doc'))
@@ -132,8 +132,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when export request returns an error to forward to the user', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.error_json = { status: 422, message: 'nope' }
           ctx.ExportsHandler._requestExport = sinon
             .stub()
@@ -158,8 +158,8 @@ describe('ExportsHandler', function () {
   })
 
   describe('_buildExport', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.project = {
           id: ctx.project_id,
           rootDoc_id: 'doc1_id',
@@ -202,8 +202,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when all goes well', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ExportsHandler._buildExport(
             ctx.export_params,
             (error, exportData) => {
@@ -262,8 +262,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when we send replacement user first and last name', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.custom_first_name = 'FIRST'
           ctx.custom_last_name = 'LAST'
           ctx.export_params.first_name = ctx.custom_first_name
@@ -316,8 +316,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when project is not found', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ProjectGetter.getProject = sinon
             .stub()
             .yields(new Error('project not found'))
@@ -338,8 +338,8 @@ describe('ExportsHandler', function () {
 
     describe('when project has no root doc', function () {
       describe('when a root doc can be set automatically', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.project.rootDoc_id = null
             ctx.ProjectLocator.findRootDoc = sinon
               .stub()
@@ -400,8 +400,8 @@ describe('ExportsHandler', function () {
 
     describe('when project has an invalid root doc', function () {
       describe('when a new root doc can be set automatically', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.fakeDoc_id = '1a2b3c4d5e6f'
             ctx.project.rootDoc_id = ctx.fakeDoc_id
             ctx.ProjectLocator.findRootDoc = sinon
@@ -461,8 +461,8 @@ describe('ExportsHandler', function () {
       })
 
       describe('when no root doc can be identified', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.ProjectLocator.findRootDoc = sinon
               .stub()
               .yields(null, [null, null])
@@ -483,8 +483,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when user is not found', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.UserGetter.getUser = sinon
             .stub()
             .yields(new Error('user not found'))
@@ -504,8 +504,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when project history request fails', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.ExportsHandler._requestVersion = sinon
             .stub()
             .yields(new Error('project history call failed'))
@@ -526,8 +526,8 @@ describe('ExportsHandler', function () {
   })
 
   describe('_requestExport', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.settings.apis = {
           v1: {
             url: 'http://127.0.0.1:5000',
@@ -546,8 +546,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when all goes well', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.stubRequest.post = ctx.stubPost
           ctx.ExportsHandler._requestExport(
             ctx.export_data,
@@ -579,8 +579,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when the request fails', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.stubRequest.post = sinon
             .stub()
             .yields(new Error('export request failed'))
@@ -600,13 +600,14 @@ describe('ExportsHandler', function () {
     })
 
     describe('when the request returns an error response to forward', function () {
-      beforeEach(function (ctx) {
+      beforeEach(async function (ctx) {
         ctx.error_code = 422
         ctx.error_json = { status: ctx.error_code, message: 'nope' }
         ctx.stubRequest.post = sinon
           .stub()
           .yields(null, { statusCode: ctx.error_code }, ctx.error_json)
-        return new Promise(resolve => {
+
+        await new Promise(resolve => {
           ctx.ExportsHandler._requestExport(
             ctx.export_data,
             (error, exportV1Id) => {
@@ -627,8 +628,8 @@ describe('ExportsHandler', function () {
   })
 
   describe('fetchExport', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.settings.apis = {
           v1: {
             url: 'http://127.0.0.1:5000',
@@ -647,8 +648,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when all goes well', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.stubRequest.get = ctx.stubGet
           ctx.ExportsHandler.fetchExport(ctx.export_id, (error, body) => {
             ctx.callback(error, body)
@@ -678,8 +679,8 @@ describe('ExportsHandler', function () {
   })
 
   describe('fetchDownload', function () {
-    beforeEach(function (ctx) {
-      return new Promise(resolve => {
+    beforeEach(async function (ctx) {
+      await new Promise(resolve => {
         ctx.settings.apis = {
           v1: {
             url: 'http://127.0.0.1:5000',
@@ -699,8 +700,8 @@ describe('ExportsHandler', function () {
     })
 
     describe('when all goes well', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.stubRequest.get = ctx.stubGet
           ctx.ExportsHandler.fetchDownload(
             ctx.export_id,
diff --git a/services/web/test/unit/src/FileStore/FileStoreController.test.mjs b/services/web/test/unit/src/FileStore/FileStoreController.test.mjs
index ba0670d49c..2119c72a53 100644
--- a/services/web/test/unit/src/FileStore/FileStoreController.test.mjs
+++ b/services/web/test/unit/src/FileStore/FileStoreController.test.mjs
@@ -214,8 +214,8 @@ describe('FileStoreController', function () {
       ctx.ProjectLocator.promises.findElement.resolves({ element: ctx.file })
     })
 
-    it('reports the file size', function (ctx) {
-      return new Promise(resolve => {
+    it('reports the file size', async function (ctx) {
+      await new Promise(resolve => {
         const expectedFileSize = 99393
         ctx.FileStoreHandler.promises.getFileSize.rejects(
           new Error('getFileSize: unexpected arguments')
@@ -237,8 +237,8 @@ describe('FileStoreController', function () {
       })
     })
 
-    it('returns 404 on NotFoundError', function (ctx) {
-      return new Promise(resolve => {
+    it('returns 404 on NotFoundError', async function (ctx) {
+      await new Promise(resolve => {
         ctx.FileStoreHandler.promises.getFileSize.rejects(
           new Errors.NotFoundError()
         )
diff --git a/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs b/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
index e712d17198..d75a853c84 100644
--- a/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
+++ b/services/web/test/unit/src/LinkedFiles/LinkedFilesController.test.mjs
@@ -132,8 +132,8 @@ describe('LinkedFilesController', function () {
       ctx.next = sinon.stub()
     })
 
-    it('sets importedAt timestamp on linkedFileData', function (ctx) {
-      return new Promise(resolve => {
+    it('sets importedAt timestamp on linkedFileData', async function (ctx) {
+      await new Promise(resolve => {
         ctx.next = sinon.stub().callsFake(() => resolve('unexpected error'))
         ctx.res = {
           json: () => {
@@ -177,8 +177,8 @@ describe('LinkedFilesController', function () {
       ctx.next = sinon.stub()
     })
 
-    it('resets importedAt timestamp on linkedFileData', function (ctx) {
-      return new Promise(resolve => {
+    it('resets importedAt timestamp on linkedFileData', async function (ctx) {
+      await new Promise(resolve => {
         ctx.next = sinon.stub().callsFake(() => resolve('unexpected error'))
         ctx.res = {
           json: () => {
diff --git a/services/web/test/unit/src/Notifications/NotificationsController.test.mjs b/services/web/test/unit/src/Notifications/NotificationsController.test.mjs
index 1bc5c51b31..43d9c0c07e 100644
--- a/services/web/test/unit/src/Notifications/NotificationsController.test.mjs
+++ b/services/web/test/unit/src/Notifications/NotificationsController.test.mjs
@@ -52,8 +52,8 @@ describe('NotificationsController', function () {
     ctx.controller = (await import(modulePath)).default
   })
 
-  it('should ask the handler for all unread notifications', function (ctx) {
-    return new Promise(resolve => {
+  it('should ask the handler for all unread notifications', async function (ctx) {
+    await new Promise(resolve => {
       const allNotifications = [{ _id: notificationId, user_id: userId }]
       ctx.handler.getUserNotifications = sinon
         .stub()
@@ -68,8 +68,8 @@ describe('NotificationsController', function () {
     })
   })
 
-  it('should send a delete request when a delete has been received to mark a notification', function (ctx) {
-    return new Promise(resolve => {
+  it('should send a delete request when a delete has been received to mark a notification', async function (ctx) {
+    await new Promise(resolve => {
       ctx.controller.markNotificationAsRead(ctx.req, {
         sendStatus: () => {
           ctx.handler.markAsRead
@@ -81,8 +81,8 @@ describe('NotificationsController', function () {
     })
   })
 
-  it('should get a notification by notification id', function (ctx) {
-    return new Promise(resolve => {
+  it('should get a notification by notification id', async function (ctx) {
+    await new Promise(resolve => {
       const notification = { _id: notificationId, user_id: userId }
       ctx.handler.getUserNotifications = sinon
         .stub()
diff --git a/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs b/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
index 05bbfdb433..70439baa33 100644
--- a/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
+++ b/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
@@ -123,8 +123,8 @@ describe('PasswordResetController', function () {
   })
 
   describe('requestReset', function () {
-    it('should tell the handler to process that email', function (ctx) {
-      return new Promise(resolve => {
+    it('should tell the handler to process that email', async function (ctx) {
+      await new Promise(resolve => {
         ctx.PasswordResetHandler.promises.generateAndEmailResetToken.resolves(
           'primary'
         )
@@ -141,8 +141,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should send a 500 if there is an error', function (ctx) {
-      return new Promise(resolve => {
+    it('should send a 500 if there is an error', async function (ctx) {
+      await new Promise(resolve => {
         ctx.PasswordResetHandler.promises.generateAndEmailResetToken.rejects(
           new Error('error')
         )
@@ -153,8 +153,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it("should send a 404 if the email doesn't exist", function (ctx) {
-      return new Promise(resolve => {
+    it("should send a 404 if the email doesn't exist", async function (ctx) {
+      await new Promise(resolve => {
         ctx.PasswordResetHandler.promises.generateAndEmailResetToken.resolves(
           null
         )
@@ -167,8 +167,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should send a 404 if the email is registered as a secondard email', function (ctx) {
-      return new Promise(resolve => {
+    it('should send a 404 if the email is registered as a secondard email', async function (ctx) {
+      await new Promise(resolve => {
         ctx.PasswordResetHandler.promises.generateAndEmailResetToken.resolves(
           'secondary'
         )
@@ -181,8 +181,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should normalize the email address', function (ctx) {
-      return new Promise(resolve => {
+    it('should normalize the email address', async function (ctx) {
+      await new Promise(resolve => {
         ctx.email = '  UPperCaseEMAILWithSpacesAround@example.Com '
         ctx.req.body.email = ctx.email
         ctx.PasswordResetHandler.promises.generateAndEmailResetToken.resolves(
@@ -203,8 +203,8 @@ describe('PasswordResetController', function () {
       ctx.req.session.resetToken = ctx.token
     })
 
-    it('should tell the user handler to reset the password', function (ctx) {
-      return new Promise(resolve => {
+    it('should tell the user handler to reset the password', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.sendStatus = code => {
           code.should.equal(200)
           ctx.PasswordResetHandler.promises.setNewUserPassword
@@ -216,8 +216,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should preserve spaces in the password', function (ctx) {
-      return new Promise(resolve => {
+    it('should preserve spaces in the password', async function (ctx) {
+      await new Promise(resolve => {
         ctx.password = ctx.req.body.password = ' oh! clever! spaces around!   '
         ctx.res.sendStatus = code => {
           code.should.equal(200)
@@ -231,8 +231,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should send 404 if the token was not found', function (ctx) {
-      return new Promise(resolve => {
+    it('should send 404 if the token was not found', async function (ctx) {
+      await new Promise(resolve => {
         ctx.PasswordResetHandler.promises.setNewUserPassword.resolves({
           found: false,
           reset: false,
@@ -250,8 +250,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should return 500 if not reset', function (ctx) {
-      return new Promise(resolve => {
+    it('should return 500 if not reset', async function (ctx) {
+      await new Promise(resolve => {
         ctx.PasswordResetHandler.promises.setNewUserPassword.resolves({
           found: true,
           reset: false,
@@ -269,8 +269,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should return 400 (Bad Request) if there is no password', function (ctx) {
-      return new Promise(resolve => {
+    it('should return 400 (Bad Request) if there is no password', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body.password = ''
         ctx.res.status = code => {
           code.should.equal(400)
@@ -287,8 +287,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should return 400 (Bad Request) if there is no passwordResetToken', function (ctx) {
-      return new Promise(resolve => {
+    it('should return 400 (Bad Request) if there is no passwordResetToken', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body.passwordResetToken = ''
         ctx.res.status = code => {
           code.should.equal(400)
@@ -305,8 +305,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should return 400 (Bad Request) if the password is invalid', function (ctx) {
-      return new Promise(resolve => {
+    it('should return 400 (Bad Request) if the password is invalid', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body.password = 'correct horse battery staple'
         const err = new Error('bad')
         err.name = 'InvalidPasswordError'
@@ -326,8 +326,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should clear sessions', function (ctx) {
-      return new Promise(resolve => {
+    it('should clear sessions', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.sendStatus = code => {
           ctx.UserSessionsManager.promises.removeSessionsFromRedis.callCount.should.equal(
             1
@@ -338,8 +338,8 @@ describe('PasswordResetController', function () {
       })
     })
 
-    it('should call removeReconfirmFlag if user.must_reconfirm', function (ctx) {
-      return new Promise(resolve => {
+    it('should call removeReconfirmFlag if user.must_reconfirm', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.sendStatus = code => {
           ctx.UserUpdater.promises.removeReconfirmFlag.callCount.should.equal(1)
           resolve()
@@ -349,8 +349,8 @@ describe('PasswordResetController', function () {
     })
 
     describe('catch errors', function () {
-      it('should return 404 for NotFoundError', function (ctx) {
-        return new Promise(resolve => {
+      it('should return 404 for NotFoundError', async function (ctx) {
+        await new Promise(resolve => {
           const anError = new Error('oops')
           anError.name = 'NotFoundError'
           ctx.PasswordResetHandler.promises.setNewUserPassword.rejects(anError)
@@ -365,8 +365,8 @@ describe('PasswordResetController', function () {
           ctx.PasswordResetController.setNewUserPassword(ctx.req, ctx.res)
         })
       })
-      it('should return 400 for InvalidPasswordError', function (ctx) {
-        return new Promise(resolve => {
+      it('should return 400 for InvalidPasswordError', async function (ctx) {
+        await new Promise(resolve => {
           const anError = new Error('oops')
           anError.name = 'InvalidPasswordError'
           ctx.PasswordResetHandler.promises.setNewUserPassword.rejects(anError)
@@ -381,8 +381,8 @@ describe('PasswordResetController', function () {
           ctx.PasswordResetController.setNewUserPassword(ctx.req, ctx.res)
         })
       })
-      it('should return 500 for other errors', function (ctx) {
-        return new Promise(resolve => {
+      it('should return 500 for other errors', async function (ctx) {
+        await new Promise(resolve => {
           const anError = new Error('oops')
           ctx.PasswordResetHandler.promises.setNewUserPassword.rejects(anError)
           ctx.res.status = code => {
@@ -412,8 +412,8 @@ describe('PasswordResetController', function () {
         ctx.req.session.doLoginAfterPasswordReset = 'true'
       })
 
-      it('should login user', function (ctx) {
-        return new Promise(resolve => {
+      it('should login user', async function (ctx) {
+        await new Promise(resolve => {
           ctx.AuthenticationController.finishLogin.callsFake((...args) => {
             expect(args[0]).to.equal(ctx.user)
             resolve()
@@ -430,8 +430,8 @@ describe('PasswordResetController', function () {
         ctx.req.query.passwordResetToken = ctx.token
       })
 
-      it('should set session.resetToken and redirect', function (ctx) {
-        return new Promise(resolve => {
+      it('should set session.resetToken and redirect', async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.session.should.not.have.property('resetToken')
           ctx.res.redirect = path => {
             path.should.equal('/user/password/set')
@@ -452,8 +452,8 @@ describe('PasswordResetController', function () {
           .resolves({ user: { _id: ctx.user_id }, remainingPeeks: 0 })
       })
 
-      it('should redirect to the reset request page with an error message', function (ctx) {
-        return new Promise(resolve => {
+      it('should redirect to the reset request page with an error message', async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.redirect = path => {
             path.should.equal('/user/password/reset?error=token_expired')
             ctx.req.session.should.not.have.property('resetToken')
@@ -473,8 +473,8 @@ describe('PasswordResetController', function () {
         ctx.req.query.email = 'foo@bar.com'
       })
 
-      it('should set session.resetToken and redirect with email', function (ctx) {
-        return new Promise(resolve => {
+      it('should set session.resetToken and redirect with email', async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.session.should.not.have.property('resetToken')
           ctx.res.redirect = path => {
             path.should.equal('/user/password/set?email=foo%40bar.com')
@@ -492,8 +492,8 @@ describe('PasswordResetController', function () {
         ctx.req.query.email = 'not-an-email'
       })
 
-      it('should set session.resetToken and redirect without email', function (ctx) {
-        return new Promise(resolve => {
+      it('should set session.resetToken and redirect without email', async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.session.should.not.have.property('resetToken')
           ctx.res.redirect = path => {
             path.should.equal('/user/password/set')
@@ -511,8 +511,8 @@ describe('PasswordResetController', function () {
         ctx.req.query.email = { foo: 'bar' }
       })
 
-      it('should set session.resetToken and redirect without email', function (ctx) {
-        return new Promise(resolve => {
+      it('should set session.resetToken and redirect without email', async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.session.should.not.have.property('resetToken')
           ctx.res.redirect = path => {
             path.should.equal('/user/password/set')
@@ -530,8 +530,8 @@ describe('PasswordResetController', function () {
           ctx.req.session.resetToken = ctx.token
         })
 
-        it('should render the page, passing the reset token', function (ctx) {
-          return new Promise(resolve => {
+        it('should render the page, passing the reset token', async function (ctx) {
+          await new Promise(resolve => {
             ctx.res.render = (templatePath, options) => {
               options.passwordResetToken.should.equal(ctx.token)
               resolve()
@@ -540,8 +540,8 @@ describe('PasswordResetController', function () {
           })
         })
 
-        it('should clear the req.session.resetToken', function (ctx) {
-          return new Promise(resolve => {
+        it('should clear the req.session.resetToken', async function (ctx) {
+          await new Promise(resolve => {
             ctx.res.render = (templatePath, options) => {
               ctx.req.session.should.not.have.property('resetToken')
               resolve()
@@ -552,8 +552,8 @@ describe('PasswordResetController', function () {
       })
 
       describe('without a token in session', function () {
-        it('should redirect to the reset request page', function (ctx) {
-          return new Promise(resolve => {
+        it('should redirect to the reset request page', async function (ctx) {
+          await new Promise(resolve => {
             ctx.res.redirect = path => {
               path.should.equal('/user/password/reset')
               ctx.req.session.should.not.have.property('resetToken')
diff --git a/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs b/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
index aab46ae2bf..0eb52c4410 100644
--- a/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
+++ b/services/web/test/unit/src/PasswordReset/PasswordResetHandler.test.mjs
@@ -103,8 +103,8 @@ describe('PasswordResetHandler', function () {
       )
     })
 
-    it('should send the email with the token', function (ctx) {
-      return new Promise(resolve => {
+    it('should send the email with the token', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserGetter.promises.getUserByAnyEmail.resolves(ctx.user)
         ctx.OneTimeTokenHandler.promises.getNewToken.resolves(ctx.token)
         ctx.EmailHandler.promises.sendEmail.resolves()
@@ -127,8 +127,8 @@ describe('PasswordResetHandler', function () {
       })
     })
 
-    it('should return errors from getUserByAnyEmail', function (ctx) {
-      return new Promise(resolve => {
+    it('should return errors from getUserByAnyEmail', async function (ctx) {
+      await new Promise(resolve => {
         const err = new Error('oops')
         ctx.UserGetter.promises.getUserByAnyEmail.rejects(err)
         ctx.PasswordResetHandler.generateAndEmailResetToken(
@@ -273,8 +273,8 @@ describe('PasswordResetHandler', function () {
             .yields(null, null)
         })
 
-        it('should return found == false and reset == false', function (ctx) {
-          return new Promise(resolve => {
+        it('should return found == false and reset == false', async function (ctx) {
+          await new Promise(resolve => {
             ctx.PasswordResetHandler.setNewUserPassword(
               ctx.token,
               ctx.password,
@@ -302,8 +302,8 @@ describe('PasswordResetHandler', function () {
           ctx.OneTimeTokenHandler.expireToken.callsArgWith(2, null)
         })
 
-        it('should return found == false and reset == false', function (ctx) {
-          return new Promise(resolve => {
+        it('should return found == false and reset == false', async function (ctx) {
+          await new Promise(resolve => {
             ctx.PasswordResetHandler.setNewUserPassword(
               ctx.token,
               ctx.password,
@@ -332,8 +332,8 @@ describe('PasswordResetHandler', function () {
               .callsArgWith(2, null)
           })
 
-          it('should update the user audit log', function (ctx) {
-            return new Promise(resolve => {
+          it('should update the user audit log', async function (ctx) {
+            await new Promise(resolve => {
               ctx.PasswordResetHandler.setNewUserPassword(
                 ctx.token,
                 ctx.password,
@@ -354,8 +354,8 @@ describe('PasswordResetHandler', function () {
             })
           })
 
-          it('should return reset == true and the user id', function (ctx) {
-            return new Promise(resolve => {
+          it('should return reset == true and the user id', async function (ctx) {
+            await new Promise(resolve => {
               ctx.PasswordResetHandler.setNewUserPassword(
                 ctx.token,
                 ctx.password,
@@ -371,8 +371,8 @@ describe('PasswordResetHandler', function () {
             })
           })
 
-          it('should expire the token', function (ctx) {
-            return new Promise(resolve => {
+          it('should expire the token', async function (ctx) {
+            await new Promise(resolve => {
               ctx.PasswordResetHandler.setNewUserPassword(
                 ctx.token,
                 ctx.password,
@@ -391,8 +391,8 @@ describe('PasswordResetHandler', function () {
             beforeEach(function (ctx) {
               ctx.auditLog.initiatorId = ctx.user_id
             })
-            it('should update the user audit log with initiatorId', function (ctx) {
-              return new Promise(resolve => {
+            it('should update the user audit log with initiatorId', async function (ctx) {
+              await new Promise(resolve => {
                 ctx.PasswordResetHandler.setNewUserPassword(
                   ctx.token,
                   ctx.password,
@@ -424,8 +424,8 @@ describe('PasswordResetHandler', function () {
                 .withArgs(ctx.user, ctx.password)
                 .rejects()
             })
-            it('should return the error', function (ctx) {
-              return new Promise(resolve => {
+            it('should return the error', async function (ctx) {
+              await new Promise(resolve => {
                 ctx.PasswordResetHandler.setNewUserPassword(
                   ctx.token,
                   ctx.password,
@@ -450,8 +450,8 @@ describe('PasswordResetHandler', function () {
                 new Error('oops')
               )
             })
-            it('should return the error', function (ctx) {
-              return new Promise(resolve => {
+            it('should return the error', async function (ctx) {
+              await new Promise(resolve => {
                 ctx.PasswordResetHandler.setNewUserPassword(
                   ctx.token,
                   ctx.password,
@@ -495,8 +495,8 @@ describe('PasswordResetHandler', function () {
             .yields(null, null)
         })
 
-        it('should return reset == false', function (ctx) {
-          return new Promise(resolve => {
+        it('should return reset == false', async function (ctx) {
+          await new Promise(resolve => {
             ctx.PasswordResetHandler.setNewUserPassword(
               ctx.token,
               ctx.password,
@@ -524,8 +524,8 @@ describe('PasswordResetHandler', function () {
           })
         })
 
-        it('should return reset == false', function (ctx) {
-          return new Promise(resolve => {
+        it('should return reset == false', async function (ctx) {
+          await new Promise(resolve => {
             ctx.PasswordResetHandler.setNewUserPassword(
               ctx.token,
               ctx.password,
@@ -549,8 +549,8 @@ describe('PasswordResetHandler', function () {
           ctx.UserGetter.promises.getUserByMainEmail.resolves(ctx.user)
         })
 
-        it('should return reset == true and the user id', function (ctx) {
-          return new Promise(resolve => {
+        it('should return reset == true and the user id', async function (ctx) {
+          await new Promise(resolve => {
             ctx.PasswordResetHandler.setNewUserPassword(
               ctx.token,
               ctx.password,
diff --git a/services/web/test/unit/src/Project/ProjectApiController.test.mjs b/services/web/test/unit/src/Project/ProjectApiController.test.mjs
index c73f327cd2..f23a81280e 100644
--- a/services/web/test/unit/src/Project/ProjectApiController.test.mjs
+++ b/services/web/test/unit/src/Project/ProjectApiController.test.mjs
@@ -30,8 +30,8 @@ describe('Project api controller', function () {
   })
 
   describe('getProjectDetails', function () {
-    it('should ask the project details handler for proj details', function (ctx) {
-      return new Promise(resolve => {
+    it('should ask the project details handler for proj details', async function (ctx) {
+      await new Promise(resolve => {
         ctx.ProjectDetailsHandler.getDetails.callsArgWith(
           1,
           null,
diff --git a/services/web/test/unit/src/Project/ProjectListController.test.mjs b/services/web/test/unit/src/Project/ProjectListController.test.mjs
index 101d3128f6..3ff120ce4c 100644
--- a/services/web/test/unit/src/Project/ProjectListController.test.mjs
+++ b/services/web/test/unit/src/Project/ProjectListController.test.mjs
@@ -322,8 +322,8 @@ describe('ProjectListController', function () {
       ctx.ProjectGetter.promises.findAllUsersProjects.resolves(ctx.allProjects)
     })
 
-    it('should render the project/list-react page', function (ctx) {
-      return new Promise(resolve => {
+    it('should render the project/list-react page', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.render = (pageName, opts) => {
           pageName.should.equal('project/list-react')
           resolve()
@@ -332,8 +332,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should invoke the session maintenance', function (ctx) {
-      return new Promise(resolve => {
+    it('should invoke the session maintenance', async function (ctx) {
+      await new Promise(resolve => {
         ctx.Features.hasFeature.withArgs('saas').returns(true)
         ctx.res.render = () => {
           ctx.SplitTestSessionHandler.promises.sessionMaintenance.should.have.been.calledWith(
@@ -346,8 +346,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should send the tags', function (ctx) {
-      return new Promise(resolve => {
+    it('should send the tags', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.render = (pageName, opts) => {
           opts.tags.length.should.equal(ctx.tags.length)
           resolve()
@@ -356,8 +356,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should create trigger ip matcher notifications', function (ctx) {
-      return new Promise(resolve => {
+    it('should create trigger ip matcher notifications', async function (ctx) {
+      await new Promise(resolve => {
         ctx.settings.overleaf = true
         ctx.req.ip = '111.111.111.111'
         ctx.res.render = (pageName, opts) => {
@@ -370,8 +370,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should send the projects', function (ctx) {
-      return new Promise(resolve => {
+    it('should send the projects', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.render = (pageName, opts) => {
           opts.prefetchedProjectsBlob.projects.length.should.equal(
             ctx.projects.length +
@@ -387,8 +387,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should send the user', function (ctx) {
-      return new Promise(resolve => {
+    it('should send the user', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.render = (pageName, opts) => {
           opts.user.should.deep.equal(ctx.user)
           resolve()
@@ -397,8 +397,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should inject the users', function (ctx) {
-      return new Promise(resolve => {
+    it('should inject the users', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.render = (pageName, opts) => {
           const projects = opts.prefetchedProjectsBlob.projects
 
@@ -426,8 +426,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it("should send the user's best subscription when saas feature present", function (ctx) {
-      return new Promise(resolve => {
+    it("should send the user's best subscription when saas feature present", async function (ctx) {
+      await new Promise(resolve => {
         ctx.Features.hasFeature.withArgs('saas').returns(true)
         ctx.res.render = (pageName, opts) => {
           expect(opts.usersBestSubscription).to.deep.include({ type: 'free' })
@@ -437,8 +437,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should not return a best subscription without saas feature', function (ctx) {
-      return new Promise(resolve => {
+    it('should not return a best subscription without saas feature', async function (ctx) {
+      await new Promise(resolve => {
         ctx.Features.hasFeature.withArgs('saas').returns(false)
         ctx.res.render = (pageName, opts) => {
           expect(opts.usersBestSubscription).to.be.undefined
@@ -448,8 +448,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should show INR Banner for Indian users with free account', function (ctx) {
-      return new Promise(resolve => {
+    it('should show INR Banner for Indian users with free account', async function (ctx) {
+      await new Promise(resolve => {
         // usersBestSubscription is only available when saas feature is present
         ctx.Features.hasFeature.withArgs('saas').returns(true)
         ctx.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails.resolves(
@@ -470,8 +470,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should not show INR Banner for Indian users with premium account', function (ctx) {
-      return new Promise(resolve => {
+    it('should not show INR Banner for Indian users with premium account', async function (ctx) {
+      await new Promise(resolve => {
         // usersBestSubscription is only available when saas feature is present
         ctx.Features.hasFeature.withArgs('saas').returns(true)
         ctx.SubscriptionViewModelBuilder.promises.getUsersSubscriptionDetails.resolves(
@@ -493,8 +493,8 @@ describe('ProjectListController', function () {
     })
 
     describe('With Institution SSO feature', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.institutionEmail = 'test@overleaf.com'
           ctx.institutionName = 'Overleaf'
           ctx.Features.hasFeature.withArgs('saml').returns(true)
@@ -624,8 +624,8 @@ describe('ProjectListController', function () {
       })
 
       describe('for an unconfirmed domain for an SSO institution', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.UserGetter.promises.getUserFullEmails.resolves([
               {
                 email: 'test@overleaf-uncofirmed.com',
@@ -673,8 +673,8 @@ describe('ProjectListController', function () {
         })
       })
       describe('Institution with SSO beta testable', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.UserGetter.promises.getUserFullEmails.resolves([
               {
                 email: 'beta@beta.com',
@@ -720,8 +720,8 @@ describe('ProjectListController', function () {
     })
 
     describe('Without Institution SSO feature', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.Features.hasFeature.withArgs('saml').returns(false)
           resolve()
         })
@@ -859,8 +859,8 @@ describe('ProjectListController', function () {
       ctx.ProjectGetter.promises.findAllUsersProjects.resolves(ctx.allProjects)
     })
 
-    it('should render the project/list-react page', function (ctx) {
-      return new Promise(resolve => {
+    it('should render the project/list-react page', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.render = (pageName, opts) => {
           pageName.should.equal('project/list-react')
           resolve()
@@ -869,8 +869,8 @@ describe('ProjectListController', function () {
       })
     })
 
-    it('should omit one of the projects', function (ctx) {
-      return new Promise(resolve => {
+    it('should omit one of the projects', async function (ctx) {
+      await new Promise(resolve => {
         ctx.res.render = (pageName, opts) => {
           opts.prefetchedProjectsBlob.projects.length.should.equal(
             ctx.projects.length +
diff --git a/services/web/test/unit/src/Referal/ReferalConnect.test.mjs b/services/web/test/unit/src/Referal/ReferalConnect.test.mjs
index 33e6c6816e..c4b66228b2 100644
--- a/services/web/test/unit/src/Referal/ReferalConnect.test.mjs
+++ b/services/web/test/unit/src/Referal/ReferalConnect.test.mjs
@@ -8,8 +8,8 @@ describe('Referal connect middle wear', function () {
     ctx.connect = (await import(modulePath)).default
   })
 
-  it('should take a referal query string and put it on the session if it exists', function (ctx) {
-    return new Promise(resolve => {
+  it('should take a referal query string and put it on the session if it exists', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { referal: '12345' },
         session: {},
@@ -21,8 +21,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should not change the referal_id on the session if not in query', function (ctx) {
-    return new Promise(resolve => {
+  it('should not change the referal_id on the session if not in query', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: {},
         session: { referal_id: 'same' },
@@ -34,8 +34,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should take a facebook referal query string and put it on the session if it exists', function (ctx) {
-    return new Promise(resolve => {
+  it('should take a facebook referal query string and put it on the session if it exists', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { fb_ref: '12345' },
         session: {},
@@ -47,8 +47,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the facebook medium into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the facebook medium into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rm: 'fb' },
         session: {},
@@ -60,8 +60,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the twitter medium into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the twitter medium into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rm: 't' },
         session: {},
@@ -73,8 +73,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the google plus medium into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the google plus medium into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rm: 'gp' },
         session: {},
@@ -86,8 +86,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the email medium into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the email medium into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rm: 'e' },
         session: {},
@@ -99,8 +99,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the direct medium into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the direct medium into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rm: 'd' },
         session: {},
@@ -112,8 +112,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the bonus source into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the bonus source into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rs: 'b' },
         session: {},
@@ -125,8 +125,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the public share source into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the public share source into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rs: 'ps' },
         session: {},
@@ -138,8 +138,8 @@ describe('Referal connect middle wear', function () {
     })
   })
 
-  it('should map the collaborator invite into the session', function (ctx) {
-    return new Promise(resolve => {
+  it('should map the collaborator invite into the session', async function (ctx) {
+    await new Promise(resolve => {
       const req = {
         query: { rs: 'ci' },
         session: {},
diff --git a/services/web/test/unit/src/References/ReferencesController.test.mjs b/services/web/test/unit/src/References/ReferencesController.test.mjs
index 679e835840..c578712f45 100644
--- a/services/web/test/unit/src/References/ReferencesController.test.mjs
+++ b/services/web/test/unit/src/References/ReferencesController.test.mjs
@@ -61,8 +61,8 @@ describe('ReferencesController', function () {
       }
     })
 
-    it('should not produce an error', function (ctx) {
-      return new Promise(resolve => {
+    it('should not produce an error', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(() => {
           ctx.res.sendStatus.callCount.should.equal(0)
           ctx.res.sendStatus.calledWith(500).should.equal(false)
@@ -72,8 +72,8 @@ describe('ReferencesController', function () {
       })
     })
 
-    it('should return data', function (ctx) {
-      return new Promise(resolve => {
+    it('should return data', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(() => {
           ctx.res.json.callCount.should.equal(1)
           ctx.res.json.calledWith(ctx.fakeResponseData).should.equal(true)
@@ -82,8 +82,8 @@ describe('ReferencesController', function () {
       })
     })
 
-    it('should call ReferencesHandler.indexAll', function (ctx) {
-      return new Promise(resolve => {
+    it('should call ReferencesHandler.indexAll', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(() => {
           ctx.ReferencesHandler.indexAll.callCount.should.equal(1)
           ctx.ReferencesHandler.indexAll
@@ -100,8 +100,8 @@ describe('ReferencesController', function () {
         ctx.req.body.shouldBroadcast = true
       })
 
-      it('should call EditorRealTimeController.emitToRoom', function (ctx) {
-        return new Promise(resolve => {
+      it('should call EditorRealTimeController.emitToRoom', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.EditorRealTimeController.emitToRoom.callCount.should.equal(1)
             resolve()
@@ -109,8 +109,8 @@ describe('ReferencesController', function () {
         })
       })
 
-      it('should not produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should not produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.res.sendStatus.callCount.should.equal(0)
             ctx.res.sendStatus.calledWith(500).should.equal(false)
@@ -120,8 +120,8 @@ describe('ReferencesController', function () {
         })
       })
 
-      it('should still return data', function (ctx) {
-        return new Promise(resolve => {
+      it('should still return data', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.res.json.callCount.should.equal(1)
             ctx.res.json.calledWith(ctx.fakeResponseData).should.equal(true)
@@ -137,8 +137,8 @@ describe('ReferencesController', function () {
         ctx.req.body.shouldBroadcast = false
       })
 
-      it('should not call EditorRealTimeController.emitToRoom', function (ctx) {
-        return new Promise(resolve => {
+      it('should not call EditorRealTimeController.emitToRoom', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.EditorRealTimeController.emitToRoom.callCount.should.equal(0)
             resolve()
@@ -146,8 +146,8 @@ describe('ReferencesController', function () {
         })
       })
 
-      it('should not produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should not produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.res.sendStatus.callCount.should.equal(0)
             ctx.res.sendStatus.calledWith(500).should.equal(false)
@@ -157,8 +157,8 @@ describe('ReferencesController', function () {
         })
       })
 
-      it('should still return data', function (ctx) {
-        return new Promise(resolve => {
+      it('should still return data', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.res.json.callCount.should.equal(1)
             ctx.res.json.calledWith(ctx.fakeResponseData).should.equal(true)
@@ -178,8 +178,8 @@ describe('ReferencesController', function () {
       }
     })
 
-    it('should not call EditorRealTimeController.emitToRoom', function (ctx) {
-      return new Promise(resolve => {
+    it('should not call EditorRealTimeController.emitToRoom', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(() => {
           ctx.EditorRealTimeController.emitToRoom.callCount.should.equal(0)
           resolve()
@@ -187,8 +187,8 @@ describe('ReferencesController', function () {
       })
     })
 
-    it('should not produce an error', function (ctx) {
-      return new Promise(resolve => {
+    it('should not produce an error', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(() => {
           ctx.res.sendStatus.callCount.should.equal(0)
           ctx.res.sendStatus.calledWith(500).should.equal(false)
@@ -198,8 +198,8 @@ describe('ReferencesController', function () {
       })
     })
 
-    it('should send a response with an empty keys list', function (ctx) {
-      return new Promise(resolve => {
+    it('should send a response with an empty keys list', async function (ctx) {
+      await new Promise(resolve => {
         ctx.call(() => {
           ctx.res.json.called.should.equal(true)
           ctx.res.json
diff --git a/services/web/test/unit/src/References/ReferencesHandler.test.mjs b/services/web/test/unit/src/References/ReferencesHandler.test.mjs
index 92666e6bcc..1b5d2c1ba0 100644
--- a/services/web/test/unit/src/References/ReferencesHandler.test.mjs
+++ b/services/web/test/unit/src/References/ReferencesHandler.test.mjs
@@ -113,8 +113,8 @@ describe('ReferencesHandler', function () {
       })
     })
 
-    it('should call _findBibDocIds', function (ctx) {
-      return new Promise(resolve => {
+    it('should call _findBibDocIds', async function (ctx) {
+      await new Promise(resolve => {
         return ctx.call((err, data) => {
           expect(err).to.be.null
           ctx.handler._findBibDocIds.callCount.should.equal(1)
@@ -126,8 +126,8 @@ describe('ReferencesHandler', function () {
       })
     })
 
-    it('should call _findBibFileRefs', function (ctx) {
-      return new Promise(resolve => {
+    it('should call _findBibFileRefs', async function (ctx) {
+      await new Promise(resolve => {
         return ctx.call((err, data) => {
           expect(err).to.be.null
           ctx.handler._findBibDocIds.callCount.should.equal(1)
@@ -139,8 +139,8 @@ describe('ReferencesHandler', function () {
       })
     })
 
-    it('should call DocumentUpdaterHandler.flushDocToMongo', function (ctx) {
-      return new Promise(resolve => {
+    it('should call DocumentUpdaterHandler.flushDocToMongo', async function (ctx) {
+      await new Promise(resolve => {
         return ctx.call((err, data) => {
           expect(err).to.be.null
           ctx.DocumentUpdaterHandler.flushDocToMongo.callCount.should.equal(2)
@@ -149,8 +149,8 @@ describe('ReferencesHandler', function () {
       })
     })
 
-    it('should make a request to references service', function (ctx) {
-      return new Promise(resolve => {
+    it('should make a request to references service', async function (ctx) {
+      await new Promise(resolve => {
         return ctx.call((err, data) => {
           expect(err).to.be.null
           ctx.request.post.callCount.should.equal(1)
@@ -189,8 +189,8 @@ describe('ReferencesHandler', function () {
       })
     })
 
-    it('should not produce an error', function (ctx) {
-      return new Promise(resolve => {
+    it('should not produce an error', async function (ctx) {
+      await new Promise(resolve => {
         return ctx.call((err, data) => {
           expect(err).to.equal(null)
           return resolve()
@@ -198,8 +198,8 @@ describe('ReferencesHandler', function () {
       })
     })
 
-    it('should return data', function (ctx) {
-      return new Promise(resolve => {
+    it('should return data', async function (ctx) {
+      await new Promise(resolve => {
         return ctx.call((err, data) => {
           expect(err).to.be.null
           expect(data).to.not.equal(null)
@@ -215,8 +215,8 @@ describe('ReferencesHandler', function () {
         ctx.ProjectGetter.getProject.callsArgWith(2, new Error('woops'))
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call((err, data) => {
             expect(err).to.not.equal(null)
             expect(err).to.be.instanceof(Error)
@@ -226,8 +226,8 @@ describe('ReferencesHandler', function () {
         })
       })
 
-      it('should not send request', function (ctx) {
-        return new Promise(resolve => {
+      it('should not send request', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.request.post.callCount.should.equal(0)
             resolve()
@@ -241,8 +241,8 @@ describe('ReferencesHandler', function () {
         ctx.ProjectGetter.getProject.callsArgWith(2, null)
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call((err, data) => {
             expect(err).to.not.equal(null)
             expect(err).to.be.instanceof(Errors.NotFoundError)
@@ -252,8 +252,8 @@ describe('ReferencesHandler', function () {
         })
       })
 
-      it('should not send request', function (ctx) {
-        return new Promise(resolve => {
+      it('should not send request', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.request.post.callCount.should.equal(0)
             resolve()
@@ -268,8 +268,8 @@ describe('ReferencesHandler', function () {
         ctx.handler._isFullIndex.callsArgWith(1, new Error('woops'))
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call((err, data) => {
             expect(err).to.not.equal(null)
             expect(err).to.be.instanceof(Error)
@@ -279,8 +279,8 @@ describe('ReferencesHandler', function () {
         })
       })
 
-      it('should not send request', function (ctx) {
-        return new Promise(resolve => {
+      it('should not send request', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.request.post.callCount.should.equal(0)
             resolve()
@@ -299,8 +299,8 @@ describe('ReferencesHandler', function () {
         )
       })
 
-      it('should produce an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should produce an error', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call((err, data) => {
             expect(err).to.not.equal(null)
             expect(err).to.be.instanceof(Error)
@@ -310,8 +310,8 @@ describe('ReferencesHandler', function () {
         })
       })
 
-      it('should not send request', function (ctx) {
-        return new Promise(resolve => {
+      it('should not send request', async function (ctx) {
+        await new Promise(resolve => {
           ctx.call(() => {
             ctx.request.post.callCount.should.equal(0)
             resolve()
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index 30301ec8cc..74aea91b89 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -231,8 +231,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('removeUserFromGroup', function () {
-    it('should use the subscription id for the logged in user and take the user id from the params', function (ctx) {
-      return new Promise(resolve => {
+    it('should use the subscription id for the logged in user and take the user id from the params', async function (ctx) {
+      await new Promise(resolve => {
         const userIdToRemove = '31231'
         ctx.req.params = { user_id: userIdToRemove }
         ctx.req.entity = ctx.subscription
@@ -252,8 +252,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should log that the user has been removed', function (ctx) {
-      return new Promise(resolve => {
+    it('should log that the user has been removed', async function (ctx) {
+      await new Promise(resolve => {
         const userIdToRemove = '31231'
         ctx.req.params = { user_id: userIdToRemove }
         ctx.req.entity = ctx.subscription
@@ -275,8 +275,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should call the group SSO hooks with group SSO enabled', function (ctx) {
-      return new Promise(resolve => {
+    it('should call the group SSO hooks with group SSO enabled', async function (ctx) {
+      await new Promise(resolve => {
         const userIdToRemove = '31231'
         ctx.req.params = { user_id: userIdToRemove }
         ctx.req.entity = ctx.subscription
@@ -304,8 +304,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should call the group SSO hooks with group SSO disabled', function (ctx) {
-      return new Promise(resolve => {
+    it('should call the group SSO hooks with group SSO disabled', async function (ctx) {
+      await new Promise(resolve => {
         const userIdToRemove = '31231'
         ctx.req.params = { user_id: userIdToRemove }
         ctx.req.entity = ctx.subscription
@@ -328,8 +328,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('removeSelfFromGroup', function () {
-    it('gets subscription and remove user', function (ctx) {
-      return new Promise(resolve => {
+    it('gets subscription and remove user', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.query = { subscriptionId: ctx.subscriptionId }
         const memberUserIdToremove = 123456789
         ctx.req.session.user._id = memberUserIdToremove
@@ -356,8 +356,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should log that the user has left the subscription', function (ctx) {
-      return new Promise(resolve => {
+    it('should log that the user has left the subscription', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.query = { subscriptionId: ctx.subscriptionId }
         const memberUserIdToremove = '123456789'
         ctx.req.session.user._id = memberUserIdToremove
@@ -379,8 +379,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should call the group SSO hooks with group SSO enabled', function (ctx) {
-      return new Promise(resolve => {
+    it('should call the group SSO hooks with group SSO enabled', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.query = { subscriptionId: ctx.subscriptionId }
         const memberUserIdToremove = '123456789'
         ctx.req.session.user._id = memberUserIdToremove
@@ -409,8 +409,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should call the group SSO hooks with group SSO disabled', function (ctx) {
-      return new Promise(resolve => {
+    it('should call the group SSO hooks with group SSO disabled', async function (ctx) {
+      await new Promise(resolve => {
         const userIdToRemove = '31231'
         ctx.req.session.user._id = userIdToRemove
         ctx.req.params = { user_id: userIdToRemove }
@@ -434,8 +434,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('addSeatsToGroupSubscription', function () {
-    it('should render the "add seats" page', function (ctx) {
-      return new Promise((resolve, reject) => {
+    it('should render the "add seats" page', async function (ctx) {
+      await new Promise((resolve, reject) => {
         const res = {
           render: (page, props) => {
             ctx.SubscriptionGroupHandler.promises.getUsersGroupSubscriptionDetails
@@ -470,8 +470,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to subscription page when getting subscription details fails', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to subscription page when getting subscription details fails', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.getUsersGroupSubscriptionDetails =
           sinon.stub().rejects()
 
@@ -486,8 +486,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to subscription page when flexible licensing is not enabled', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to subscription page when flexible licensing is not enabled', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.ensureFlexibleLicensingEnabled =
           sinon.stub().rejects()
 
@@ -502,8 +502,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to missing billing information page when billing information is missing', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to missing billing information page when billing information is missing', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.checkBillingInfoExistence = sinon
           .stub()
           .throws(new ctx.Errors.MissingBillingInfoError())
@@ -521,8 +521,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to subscription page when there is a pending change', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to subscription page when there is a pending change', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPendingChanges =
           sinon.stub().throws(new ctx.Errors.PendingChangeError())
 
@@ -537,8 +537,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to subscription page when subscription is not active', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to subscription page when subscription is not active', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.ensureSubscriptionIsActive = sinon
           .stub()
           .rejects()
@@ -554,10 +554,11 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to subscription page when subscription has pending invoice', function (ctx) {
+    it('should redirect to subscription page when subscription has pending invoice', async function (ctx) {
       ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPastDueInvoice =
         sinon.stub().rejects()
-      return new Promise(resolve => {
+
+      await new Promise(resolve => {
         const res = {
           redirect: url => {
             url.should.equal('/user/subscription')
@@ -571,8 +572,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('previewAddSeatsSubscriptionChange', function () {
-    it('should preview "add seats" change', function (ctx) {
-      return new Promise(resolve => {
+    it('should preview "add seats" change', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body = { adding: 2 }
 
         const res = {
@@ -589,8 +590,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should fail previewing "add seats" change', function (ctx) {
-      return new Promise(resolve => {
+    it('should fail previewing "add seats" change', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.previewAddSeatsSubscriptionChange =
           sinon.stub().rejects()
 
@@ -610,8 +611,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should fail previewing "add seats" change with SubtotalLimitExceededError', function (ctx) {
-      return new Promise(resolve => {
+    it('should fail previewing "add seats" change with SubtotalLimitExceededError', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body = { adding: 2 }
         ctx.SubscriptionGroupHandler.promises.previewAddSeatsSubscriptionChange =
           sinon.stub().throws(new ctx.Errors.SubtotalLimitExceededError())
@@ -638,8 +639,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('createAddSeatsSubscriptionChange', function () {
-    it('should apply "add seats" change', function (ctx) {
-      return new Promise(resolve => {
+    it('should apply "add seats" change', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body = { adding: 2 }
 
         const res = {
@@ -656,8 +657,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should fail applying "add seats" change', function (ctx) {
-      return new Promise(resolve => {
+    it('should fail applying "add seats" change', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.createAddSeatsSubscriptionChange =
           sinon.stub().rejects()
 
@@ -677,8 +678,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should fail applying "add seats" change with SubtotalLimitExceededError', function (ctx) {
-      return new Promise(resolve => {
+    it('should fail applying "add seats" change with SubtotalLimitExceededError', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body = { adding: 2 }
         ctx.SubscriptionGroupHandler.promises.createAddSeatsSubscriptionChange =
           sinon.stub().throws(new ctx.Errors.SubtotalLimitExceededError())
@@ -705,8 +706,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('submitForm', function () {
-    it('should build and pass the request body to the sales submit handler', function (ctx) {
-      return new Promise(resolve => {
+    it('should build and pass the request body to the sales submit handler', async function (ctx) {
+      await new Promise(resolve => {
         const adding = 100
         const poNumber = 'PO123456'
         ctx.req.body = { adding, poNumber }
@@ -747,8 +748,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('subscriptionUpgradePage', function () {
-    it('should render "subscription upgrade" page', function (ctx) {
-      return new Promise(resolve => {
+    it('should render "subscription upgrade" page', async function (ctx) {
+      await new Promise(resolve => {
         const olSubscription = { membersLimit: 1, teamName: 'test team' }
         ctx.SubscriptionModel.Subscription.findOne = () => {
           return {
@@ -773,8 +774,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect if failed to generate preview', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect if failed to generate preview', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
           .stub()
           .rejects()
@@ -790,8 +791,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to missing billing information page when billing information is missing', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to missing billing information page when billing information is missing', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
           .stub()
           .throws(new ctx.Errors.MissingBillingInfoError())
@@ -809,8 +810,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to manually collected subscription error page when collection method is manual', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to manually collected subscription error page when collection method is manual', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
           .stub()
           .throws(new ctx.Errors.ManuallyCollectedError())
@@ -828,8 +829,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to subtotal limit exceeded page', function (ctx) {
-      return new Promise(resolve => {
+    it('should redirect to subtotal limit exceeded page', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.getGroupPlanUpgradePreview = sinon
           .stub()
           .throws(new ctx.Errors.SubtotalLimitExceededError())
@@ -847,8 +848,8 @@ describe('SubscriptionGroupController', function () {
   })
 
   describe('upgradeSubscription', function () {
-    it('should send 200 response', function (ctx) {
-      return new Promise(resolve => {
+    it('should send 200 response', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.upgradeGroupPlan = sinon
           .stub()
           .resolves()
@@ -864,8 +865,8 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should send 500 response', function (ctx) {
-      return new Promise(resolve => {
+    it('should send 500 response', async function (ctx) {
+      await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.upgradeGroupPlan = sinon
           .stub()
           .rejects()
diff --git a/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs b/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
index be5fe26670..0d777a5b44 100644
--- a/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
+++ b/services/web/test/unit/src/Subscription/TeamInvitesController.test.mjs
@@ -144,8 +144,8 @@ describe('TeamInvitesController', function () {
   })
 
   describe('acceptInvite', function () {
-    it('should add an audit log entry', function (ctx) {
-      return new Promise(resolve => {
+    it('should add an audit log entry', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.params.token = 'foo'
         ctx.req.session.user = ctx.user
         const res = {
@@ -176,8 +176,8 @@ describe('TeamInvitesController', function () {
     }
 
     describe('hasIndividualPaidSubscription', function () {
-      it('is true for personal subscription', function (ctx) {
-        return new Promise(resolve => {
+      it('is true for personal subscription', async function (ctx) {
+        await new Promise(resolve => {
           ctx.SubscriptionLocator.promises.getUsersSubscription.resolves({
             recurlySubscription_id: 'subscription123',
             groupPlan: false,
@@ -192,8 +192,8 @@ describe('TeamInvitesController', function () {
         })
       })
 
-      it('is true for group subscriptions', function (ctx) {
-        return new Promise(resolve => {
+      it('is true for group subscriptions', async function (ctx) {
+        await new Promise(resolve => {
           ctx.SubscriptionLocator.promises.getUsersSubscription.resolves({
             recurlySubscription_id: 'subscription123',
             groupPlan: true,
@@ -208,8 +208,8 @@ describe('TeamInvitesController', function () {
         })
       })
 
-      it('is false for canceled subscriptions', function (ctx) {
-        return new Promise(resolve => {
+      it('is false for canceled subscriptions', async function (ctx) {
+        await new Promise(resolve => {
           ctx.SubscriptionLocator.promises.getUsersSubscription.resolves({
             recurlySubscription_id: 'subscription123',
             groupPlan: false,
@@ -229,8 +229,8 @@ describe('TeamInvitesController', function () {
     })
 
     describe('when user is logged out', function () {
-      it('renders logged out invite page', function (ctx) {
-        return new Promise(resolve => {
+      it('renders logged out invite page', async function (ctx) {
+        await new Promise(resolve => {
           const res = {
             render: (template, data) => {
               expect(template).to.equal('subscriptions/team/invite_logged_out')
@@ -245,8 +245,8 @@ describe('TeamInvitesController', function () {
         })
       })
 
-      it('includes groupSSOActive flag when the group has SSO enabled', function (ctx) {
-        return new Promise(resolve => {
+      it('includes groupSSOActive flag when the group has SSO enabled', async function (ctx) {
+        await new Promise(resolve => {
           ctx.Modules.promises.hooks.fire = sinon.stub().resolves([true])
           const res = {
             render: (template, data) => {
@@ -262,8 +262,8 @@ describe('TeamInvitesController', function () {
       })
     })
 
-    it('renders the view', function (ctx) {
-      return new Promise(resolve => {
+    it('renders the view', async function (ctx) {
+      await new Promise(resolve => {
         const res = {
           render: template => {
             expect(template).to.equal('subscriptions/team/invite')
diff --git a/services/web/test/unit/src/Tags/TagsController.test.mjs b/services/web/test/unit/src/Tags/TagsController.test.mjs
index c8cb739d0e..178217a834 100644
--- a/services/web/test/unit/src/Tags/TagsController.test.mjs
+++ b/services/web/test/unit/src/Tags/TagsController.test.mjs
@@ -56,8 +56,8 @@ describe('TagsController', function () {
     ctx.res.json = sinon.stub()
   })
 
-  it('get all tags', function (ctx) {
-    return new Promise(resolve => {
+  it('get all tags', async function (ctx) {
+    await new Promise(resolve => {
       const allTags = [{ name: 'tag', projects: ['123423', '423423'] }]
       ctx.TagsHandler.promises.getAllTags = sinon.stub().resolves(allTags)
       ctx.TagsController.getAllTags(ctx.req, {
@@ -74,8 +74,8 @@ describe('TagsController', function () {
   })
 
   describe('create a tag', function (done) {
-    it('without a color', function (ctx) {
-      return new Promise(resolve => {
+    it('without a color', async function (ctx) {
+      await new Promise(resolve => {
         ctx.tag = { mock: 'tag' }
         ctx.TagsHandler.promises.createTag = sinon.stub().resolves(ctx.tag)
         ctx.req.session.user._id = ctx.userId = 'user-id-123'
@@ -96,8 +96,8 @@ describe('TagsController', function () {
       })
     })
 
-    it('with a color', function (ctx) {
-      return new Promise(resolve => {
+    it('with a color', async function (ctx) {
+      await new Promise(resolve => {
         ctx.tag = { mock: 'tag' }
         ctx.TagsHandler.promises.createTag = sinon.stub().resolves(ctx.tag)
         ctx.req.session.user._id = ctx.userId = 'user-id-123'
@@ -123,8 +123,8 @@ describe('TagsController', function () {
     })
   })
 
-  it('delete a tag', function (ctx) {
-    return new Promise(resolve => {
+  it('delete a tag', async function (ctx) {
+    await new Promise(resolve => {
       ctx.req.params.tagId = ctx.tagId = 'tag-id-123'
       ctx.req.session.user._id = ctx.userId = 'user-id-123'
       ctx.TagsController.deleteTag(ctx.req, {
@@ -150,8 +150,8 @@ describe('TagsController', function () {
       ctx.req.session.user._id = ctx.userId = 'user-id-123'
     })
 
-    it('with a name and no color', function (ctx) {
-      return new Promise(resolve => {
+    it('with a name and no color', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body = {
           name: (ctx.tagName = 'new-name'),
         }
@@ -173,8 +173,8 @@ describe('TagsController', function () {
       })
     })
 
-    it('with a name and color', function (ctx) {
-      return new Promise(resolve => {
+    it('with a name and color', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body = {
           name: (ctx.tagName = 'new-name'),
           color: (ctx.color = '#FF0011'),
@@ -198,8 +198,8 @@ describe('TagsController', function () {
       })
     })
 
-    it('without a name', function (ctx) {
-      return new Promise(resolve => {
+    it('without a name', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body = { name: undefined }
         ctx.TagsController.renameTag(ctx.req, {
           status: code => {
@@ -215,8 +215,8 @@ describe('TagsController', function () {
     })
   })
 
-  it('add a project to a tag', function (ctx) {
-    return new Promise(resolve => {
+  it('add a project to a tag', async function (ctx) {
+    await new Promise(resolve => {
       ctx.req.params.tagId = ctx.tagId = 'tag-id-123'
       ctx.req.params.projectId = ctx.projectId = 'project-id-123'
       ctx.req.session.user._id = ctx.userId = 'user-id-123'
@@ -238,8 +238,8 @@ describe('TagsController', function () {
     })
   })
 
-  it('add projects to a tag', function (ctx) {
-    return new Promise(resolve => {
+  it('add projects to a tag', async function (ctx) {
+    await new Promise(resolve => {
       ctx.req.params.tagId = ctx.tagId = 'tag-id-123'
       ctx.req.body.projectIds = ctx.projectIds = [
         'project-id-123',
@@ -264,8 +264,8 @@ describe('TagsController', function () {
     })
   })
 
-  it('remove a project from a tag', function (ctx) {
-    return new Promise(resolve => {
+  it('remove a project from a tag', async function (ctx) {
+    await new Promise(resolve => {
       ctx.req.params.tagId = ctx.tagId = 'tag-id-123'
       ctx.req.params.projectId = ctx.projectId = 'project-id-123'
       ctx.req.session.user._id = ctx.userId = 'user-id-123'
@@ -287,8 +287,8 @@ describe('TagsController', function () {
     })
   })
 
-  it('remove projects from a tag', function (ctx) {
-    return new Promise(resolve => {
+  it('remove projects from a tag', async function (ctx) {
+    await new Promise(resolve => {
       ctx.req.params.tagId = ctx.tagId = 'tag-id-123'
       ctx.req.body.projectIds = ctx.projectIds = [
         'project-id-123',
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs b/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
index 29daa00efc..b38e3c2bab 100644
--- a/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
+++ b/services/web/test/unit/src/ThirdPartyDataStore/TpdsController.test.mjs
@@ -116,8 +116,8 @@ describe('TpdsController', function () {
   })
 
   describe('creating a project', function () {
-    it('should yield the new projects id', function (ctx) {
-      return new Promise(resolve => {
+    it('should yield the new projects id', async function (ctx) {
+      await new Promise(resolve => {
         const res = new MockResponse()
         const req = new MockRequest()
         req.params.user_id = ctx.user_id
@@ -161,8 +161,8 @@ describe('TpdsController', function () {
       }
     })
 
-    it('should process the update with the update receiver by name', function (ctx) {
-      return new Promise(resolve => {
+    it('should process the update with the update receiver by name', async function (ctx) {
+      await new Promise(resolve => {
         const res = {
           json: payload => {
             expect(payload).to.deep.equal({
@@ -190,8 +190,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it('should indicate in the response when the update was rejected', function (ctx) {
-      return new Promise(resolve => {
+    it('should indicate in the response when the update was rejected', async function (ctx) {
+      await new Promise(resolve => {
         ctx.TpdsUpdateHandler.promises.newUpdate.resolves(null)
         const res = {
           json: payload => {
@@ -203,8 +203,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it('should process the update with the update receiver by id', function (ctx) {
-      return new Promise(resolve => {
+    it('should process the update with the update receiver by id', async function (ctx) {
+      await new Promise(resolve => {
         const path = '/here.txt'
         const req = {
           pause() {},
@@ -233,8 +233,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it('should return a 500 error when the update receiver fails', function (ctx) {
-      return new Promise(resolve => {
+    it('should return a 500 error when the update receiver fails', async function (ctx) {
+      await new Promise(resolve => {
         ctx.TpdsUpdateHandler.promises.newUpdate.rejects(new Error())
         const res = {
           json: sinon.stub(),
@@ -247,8 +247,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it('should return a 400 error when the project is too big', function (ctx) {
-      return new Promise(resolve => {
+    it('should return a 400 error when the project is too big', async function (ctx) {
+      await new Promise(resolve => {
         ctx.TpdsUpdateHandler.promises.newUpdate.rejects({
           message: 'project_has_too_many_files',
         })
@@ -265,8 +265,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it('should return a 429 error when the update receiver fails due to too many requests error', function (ctx) {
-      return new Promise(resolve => {
+    it('should return a 429 error when the update receiver fails due to too many requests error', async function (ctx) {
+      await new Promise(resolve => {
         ctx.TpdsUpdateHandler.promises.newUpdate.rejects(
           new Errors.TooManyRequestsError('project on cooldown')
         )
@@ -282,8 +282,8 @@ describe('TpdsController', function () {
   })
 
   describe('getting a delete update', function () {
-    it('should process the delete with the update receiver by name', function (ctx) {
-      return new Promise(resolve => {
+    it('should process the delete with the update receiver by name', async function (ctx) {
+      await new Promise(resolve => {
         const path = '/projectName/here.txt'
         const req = {
           params: { 0: path, user_id: ctx.user_id, project_id: '' },
@@ -312,8 +312,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it('should process the delete with the update receiver by id', function (ctx) {
-      return new Promise(resolve => {
+    it('should process the delete with the update receiver by id', async function (ctx) {
+      await new Promise(resolve => {
         const path = '/here.txt'
         const req = {
           params: { 0: path, user_id: ctx.user_id, project_id: '123' },
@@ -351,8 +351,8 @@ describe('TpdsController', function () {
       }
     })
 
-    it("creates a folder if it doesn't exist", function (ctx) {
-      return new Promise(resolve => {
+    it("creates a folder if it doesn't exist", async function (ctx) {
+      await new Promise(resolve => {
         const metadata = {
           folderId: new ObjectId(),
           projectId: new ObjectId(),
@@ -373,8 +373,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it('supports top level folders', function (ctx) {
-      return new Promise(resolve => {
+    it('supports top level folders', async function (ctx) {
+      await new Promise(resolve => {
         const metadata = {
           folderId: new ObjectId(),
           projectId: new ObjectId(),
@@ -395,8 +395,8 @@ describe('TpdsController', function () {
       })
     })
 
-    it("returns a 409 if the folder couldn't be created", function (ctx) {
-      return new Promise(resolve => {
+    it("returns a 409 if the folder couldn't be created", async function (ctx) {
+      await new Promise(resolve => {
         ctx.TpdsUpdateHandler.promises.createFolder.resolves(null)
         ctx.HttpErrorHandler.conflict.callsFake((req, res) => {
           expect(req).to.equal(ctx.req)
@@ -523,8 +523,8 @@ describe('TpdsController', function () {
     })
 
     describe('success', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.json.callsFake(() => {
             resolve()
           })
@@ -546,8 +546,8 @@ describe('TpdsController', function () {
     })
 
     describe('error', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.err = new Error()
           ctx.TpdsQueueManager.promises.getQueues = sinon
             .stub()
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
index 08a7dcf494..f58ef6ec1c 100644
--- a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
+++ b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateHandler.test.mjs
@@ -491,8 +491,8 @@ function receiveFileDelete() {
 }
 
 function receiveFileDeleteById() {
-  beforeEach(function (ctx) {
-    return new Promise(resolve => {
+  beforeEach(async function (ctx) {
+    await new Promise(resolve => {
       ctx.TpdsUpdateHandler.deleteUpdate(
         ctx.userId,
         ctx.projectId,
diff --git a/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs b/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
index 96d2d19b04..03f68476f8 100644
--- a/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
+++ b/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
@@ -285,8 +285,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('normal case (edit slot available)', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.LimitationsManager.promises.canAcceptEditCollaboratorInvite.resolves(
             true
           )
@@ -361,8 +361,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('when there are no edit collaborator slots available', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.LimitationsManager.promises.canAcceptEditCollaboratorInvite.resolves(
             false
           )
@@ -439,8 +439,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('when the access was already granted', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.project.tokenAccessReadAndWrite_refs.push(ctx.user._id)
           ctx.req.params = { token: ctx.token }
           ctx.req.body = { confirmedByUser: true }
@@ -479,8 +479,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('hash prefix missing in request', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.params = { token: ctx.token }
           ctx.req.body = { confirmedByUser: true }
           ctx.res.callback = resolve
@@ -517,8 +517,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('user is owner of project', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.AuthorizationManager.promises.getPrivilegeLevelForProject.returns(
             PrivilegeLevels.OWNER
           )
@@ -555,8 +555,8 @@ describe('TokenAccessController', function () {
         ctx.req.body = { tokenHashPrefix: '#prefix' }
       })
       describe('ANONYMOUS_READ_AND_WRITE_ENABLED is undefined', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.res.callback = resolve
             ctx.TokenAccessController.grantTokenAccessReadAndWrite(
               ctx.req,
@@ -595,8 +595,8 @@ describe('TokenAccessController', function () {
       })
 
       describe('ANONYMOUS_READ_AND_WRITE_ENABLED is true', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.TokenAccessHandler.ANONYMOUS_READ_AND_WRITE_ENABLED = true
             ctx.res.callback = resolve
 
@@ -637,8 +637,8 @@ describe('TokenAccessController', function () {
         ctx.Settings.overleaf = {}
       })
       describe('when token is for v1 project', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.TokenAccessHandler.promises.getProjectByToken.resolves(
               undefined
             )
@@ -683,8 +683,8 @@ describe('TokenAccessController', function () {
       })
 
       describe('when token is not for a v1 or v2 project', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.TokenAccessHandler.promises.getProjectByToken.resolves(
               undefined
             )
@@ -726,8 +726,8 @@ describe('TokenAccessController', function () {
         ctx.req.params = { token: ctx.token }
         ctx.req.body = { tokenHashPrefix: '#prefix' }
       })
-      it('passes Errors.NotFoundError to next when project not found and still checks token hash', function (ctx) {
-        return new Promise(resolve => {
+      it('passes Errors.NotFoundError to next when project not found and still checks token hash', async function (ctx) {
+        await new Promise(resolve => {
           ctx.TokenAccessController.grantTokenAccessReadAndWrite(
             ctx.req,
             ctx.res,
@@ -763,11 +763,12 @@ describe('TokenAccessController', function () {
         ctx.req.body = { confirmedByUser: true, tokenHashPrefix: '#prefix' }
       })
 
-      it('redirects if project owner is non-admin', function (ctx) {
+      it('redirects if project owner is non-admin', async function (ctx) {
         ctx.UserGetter.promises.getUserConfirmedEmails = sinon
           .stub()
           .resolves([{ email: 'test@not-overleaf.com' }])
-        return new Promise(resolve => {
+
+        await new Promise(resolve => {
           ctx.res.callback = () => {
             expect(ctx.res.json).to.have.been.calledWith({
               redirect: `${ctx.Settings.adminUrl}/#prefix`,
@@ -811,8 +812,8 @@ describe('TokenAccessController', function () {
       })
     })
 
-    it('passes Errors.NotFoundError to next when token access is not enabled but still checks token hash', function (ctx) {
-      return new Promise(resolve => {
+    it('passes Errors.NotFoundError to next when token access is not enabled but still checks token hash', async function (ctx) {
+      await new Promise(resolve => {
         ctx.TokenAccessHandler.tokenAccessEnabledForProject.returns(false)
         ctx.req.params = { token: ctx.token }
         ctx.req.body = { tokenHashPrefix: '#prefix' }
@@ -852,8 +853,8 @@ describe('TokenAccessController', function () {
 
   describe('grantTokenAccessReadOnly', function () {
     describe('normal case', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.params = { token: ctx.token }
           ctx.req.body = { confirmedByUser: true, tokenHashPrefix: '#prefix' }
           ctx.res.callback = resolve
@@ -901,8 +902,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('when the access was already granted', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.project.tokenAccessReadOnly_refs.push(ctx.user._id)
           ctx.req.params = { token: ctx.token }
           ctx.req.body = { confirmedByUser: true }
@@ -942,8 +943,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('anonymous users', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.req.params = { token: ctx.token }
           ctx.SessionManager.getLoggedInUserId.returns(null)
           ctx.res.callback = resolve
@@ -972,8 +973,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('user is owner of project', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.AuthorizationManager.promises.getPrivilegeLevelForProject.returns(
             PrivilegeLevels.OWNER
           )
@@ -1003,8 +1004,8 @@ describe('TokenAccessController', function () {
       })
     })
 
-    it('passes Errors.NotFoundError to next when token access is not enabled but still checks token hash', function (ctx) {
-      return new Promise(resolve => {
+    it('passes Errors.NotFoundError to next when token access is not enabled but still checks token hash', async function (ctx) {
+      await new Promise(resolve => {
         ctx.TokenAccessHandler.tokenAccessEnabledForProject.returns(false)
         ctx.req.params = { token: ctx.token }
         ctx.req.body = { tokenHashPrefix: '#prefix' }
@@ -1040,8 +1041,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('when not in link sharing changes test', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.AsyncFormHelper.redirect = sinon.stub().callsFake(() => resolve())
           ctx.TokenAccessController.ensureUserCanUseSharingUpdatesConsentPage(
             ctx.req,
@@ -1068,8 +1069,8 @@ describe('TokenAccessController', function () {
       })
 
       describe('when user is not an invited editor and is a read write token member', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.CollaboratorsGetter.promises.isUserInvitedReadWriteMemberOfProject.resolves(
               false
             )
@@ -1099,8 +1100,8 @@ describe('TokenAccessController', function () {
       })
 
       describe('when user is already an invited editor', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.CollaboratorsGetter.promises.isUserInvitedReadWriteMemberOfProject.resolves(
               true
             )
@@ -1125,8 +1126,8 @@ describe('TokenAccessController', function () {
       })
 
       describe('when user not a read write token member', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.CollaboratorsGetter.promises.userIsReadWriteTokenMember.resolves(
               false
             )
@@ -1165,8 +1166,8 @@ describe('TokenAccessController', function () {
       })
 
       describe('previously joined token access user moving to named collaborator', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
               false
             )
@@ -1204,8 +1205,8 @@ describe('TokenAccessController', function () {
       })
 
       describe('previously joined token access user moving to named collaborator', function () {
-        beforeEach(function (ctx) {
-          return new Promise(resolve => {
+        beforeEach(async function (ctx) {
+          await new Promise(resolve => {
             ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
               false
             )
@@ -1243,8 +1244,8 @@ describe('TokenAccessController', function () {
     })
 
     describe('previously joined token access user moving to anonymous viewer', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.moveReadWriteToReadOnly(
             ctx.req,
diff --git a/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs b/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
index 443578f747..b36d596da2 100644
--- a/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
+++ b/services/web/test/unit/src/Uploads/ProjectUploadController.test.mjs
@@ -264,8 +264,8 @@ describe('ProjectUploadController', function () {
     })
 
     describe('with folder structure', function () {
-      beforeEach(function (ctx) {
-        return new Promise(resolve => {
+      beforeEach(async function (ctx) {
+        await new Promise(resolve => {
           ctx.entity = {
             _id: '1234',
             type: 'file',
diff --git a/services/web/test/unit/src/User/UserPagesController.test.mjs b/services/web/test/unit/src/User/UserPagesController.test.mjs
index 1fa908d1be..142d3aa91f 100644
--- a/services/web/test/unit/src/User/UserPagesController.test.mjs
+++ b/services/web/test/unit/src/User/UserPagesController.test.mjs
@@ -160,18 +160,18 @@ describe('UserPagesController', function () {
   })
 
   describe('registerPage', function () {
-    it('should render the register page', function (ctx) {
-      return new Promise(resolve => {
+    it('should render the register page', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/register')
           resolve()
         }
         ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should set sharedProjectData', function (ctx) {
-      return new Promise(resolve => {
+    it('should set sharedProjectData', async function(ctx) {
+      await new Promise(resolve => {
         ctx.req.session.sharedProjectData = {
           project_name: 'myProject',
           user_first_name: 'user_first_name_here',
@@ -187,11 +187,11 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should set newTemplateData', function (ctx) {
-      return new Promise(resolve => {
+    it('should set newTemplateData', async function(ctx) {
+      await new Promise(resolve => {
         ctx.req.session.templateData = { templateName: 'templateName' }
 
         ctx.res.callback = () => {
@@ -201,11 +201,11 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should not set the newTemplateData if there is nothing in the session', function (ctx) {
-      return new Promise(resolve => {
+    it('should not set the newTemplateData if there is nothing in the session', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           assert.equal(
             ctx.res.renderedVariables.newTemplateData.templateName,
@@ -214,19 +214,19 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
   })
 
   describe('loginForm', function () {
-    it('should render the login page', function (ctx) {
-      return new Promise(resolve => {
+    it('should render the login page', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/login')
           resolve()
         }
         ctx.UserPagesController.loginPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
     describe('when an explicit redirect is set via query string', function () {
@@ -238,8 +238,8 @@ describe('UserPagesController', function () {
         ctx.req.query.redir = '/somewhere/in/particular'
       })
 
-      it('should set a redirect', function (ctx) {
-        return new Promise(resolve => {
+      it('should set a redirect', async function(ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = page => {
             ctx.AuthenticationController.setRedirectInSession.callCount.should.equal(
               1
@@ -250,7 +250,7 @@ describe('UserPagesController', function () {
             resolve()
           }
           ctx.UserPagesController.loginPage(ctx.req, ctx.res, resolve)
-        })
+        });
       })
     })
   })
@@ -260,18 +260,18 @@ describe('UserPagesController', function () {
       ctx.UserSessionsManager.getAllUserSessions.callsArgWith(2, null, [])
     })
 
-    it('should render user/sessions', function (ctx) {
-      return new Promise(resolve => {
+    it('should render user/sessions', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/sessions')
           resolve()
         }
         ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should include current session data in the view', function (ctx) {
-      return new Promise(resolve => {
+    it('should include current session data in the view', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedVariables.currentSession).to.deep.equal({
             ip_address: '1.1.1.1',
@@ -280,17 +280,17 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should have called getAllUserSessions', function (ctx) {
-      return new Promise(resolve => {
+    it('should have called getAllUserSessions', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = page => {
           ctx.UserSessionsManager.getAllUserSessions.callCount.should.equal(1)
           resolve()
         }
         ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
     describe('when getAllUserSessions produces an error', function () {
@@ -301,15 +301,15 @@ describe('UserPagesController', function () {
         )
       })
 
-      it('should call next with an error', function (ctx) {
-        return new Promise(resolve => {
+      it('should call next with an error', async function(ctx) {
+        await new Promise(resolve => {
           ctx.next = err => {
             assert(err !== null)
             assert(err instanceof Error)
             resolve()
           }
           ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, ctx.next)
-        })
+        });
       })
     })
   })
@@ -319,8 +319,8 @@ describe('UserPagesController', function () {
       ctx.UserGetter.getUser = sinon.stub().yields(null, ctx.user)
     })
 
-    it('render page with subscribed status', function (ctx) {
-      return new Promise(resolve => {
+    it('render page with subscribed status', async function(ctx) {
+      await new Promise(resolve => {
         ctx.NewsletterManager.subscribed.yields(null, true)
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/email-preferences')
@@ -329,11 +329,11 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('render page with unsubscribed status', function (ctx) {
-      return new Promise(resolve => {
+    it('render page with unsubscribed status', async function(ctx) {
+      await new Promise(resolve => {
         ctx.NewsletterManager.subscribed.yields(null, false)
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/email-preferences')
@@ -342,7 +342,7 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
   })
 
@@ -354,39 +354,39 @@ describe('UserPagesController', function () {
       ctx.UserGetter.promises.getUser = sinon.stub().resolves(ctx.user)
     })
 
-    it('should render user/settings', function (ctx) {
-      return new Promise(resolve => {
+    it('should render user/settings', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/settings')
           resolve()
         }
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should send user', function (ctx) {
-      return new Promise(resolve => {
+    it('should send user', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.user.id.should.equal(ctx.user._id)
           ctx.res.renderedVariables.user.email.should.equal(ctx.user.email)
           resolve()
         }
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it("should set 'shouldAllowEditingDetails' to true", function (ctx) {
-      return new Promise(resolve => {
+    it("should set 'shouldAllowEditingDetails' to true", async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(true)
           resolve()
         }
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should restructure thirdPartyIdentifiers data for template use', function (ctx) {
-      return new Promise(resolve => {
+    it('should restructure thirdPartyIdentifiers data for template use', async function(ctx) {
+      await new Promise(resolve => {
         const expectedResult = {
           google: 'testId',
         }
@@ -397,11 +397,11 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it("should set and clear 'projectSyncSuccessMessage'", function (ctx) {
-      return new Promise(resolve => {
+    it("should set and clear 'projectSyncSuccessMessage'", async function(ctx) {
+      await new Promise(resolve => {
         ctx.req.session.projectSyncSuccessMessage = 'Some Sync Success'
         ctx.res.callback = () => {
           ctx.res.renderedVariables.projectSyncSuccessMessage.should.equal(
@@ -411,11 +411,11 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should cast refProviders to booleans', function (ctx) {
-      return new Promise(resolve => {
+    it('should cast refProviders to booleans', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedVariables.user.refProviders).to.deep.equal({
             mendeley: true,
@@ -425,11 +425,11 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should send the correct managed user admin email', function (ctx) {
-      return new Promise(resolve => {
+    it('should send the correct managed user admin email', async function(ctx) {
+      await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(
             ctx.res.renderedVariables.currentManagedUserAdminEmail
@@ -437,11 +437,11 @@ describe('UserPagesController', function () {
           resolve()
         }
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
-    it('should send info for groups with SSO enabled', function (ctx) {
-      return new Promise(resolve => {
+    it('should send info for groups with SSO enabled', async function(ctx) {
+      await new Promise(resolve => {
         ctx.user.enrollment = {
           sso: [
             {
@@ -492,7 +492,7 @@ describe('UserPagesController', function () {
         }
 
         ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      })
+      });
     })
 
     describe('when ldap.updateUserDetailsOnLogin is true', function () {
@@ -504,8 +504,8 @@ describe('UserPagesController', function () {
         delete ctx.settings.ldap
       })
 
-      it('should set "shouldAllowEditingDetails" to false', function (ctx) {
-        return new Promise(resolve => {
+      it('should set "shouldAllowEditingDetails" to false', async function(ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = () => {
             ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(
               false
@@ -513,7 +513,7 @@ describe('UserPagesController', function () {
             resolve()
           }
           ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-        })
+        });
       })
     })
 
@@ -526,8 +526,8 @@ describe('UserPagesController', function () {
         delete ctx.settings.saml
       })
 
-      it('should set "shouldAllowEditingDetails" to false', function (ctx) {
-        return new Promise(resolve => {
+      it('should set "shouldAllowEditingDetails" to false', async function(ctx) {
+        await new Promise(resolve => {
           ctx.res.callback = () => {
             ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(
               false
@@ -535,7 +535,7 @@ describe('UserPagesController', function () {
             resolve()
           }
           ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-        })
+        });
       })
     })
   })
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs b/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
index 18e2d8526b..de2391275d 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
+++ b/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
@@ -221,8 +221,8 @@ describe('UserMembershipController', function () {
       ctx.req.entityConfig = EntityConfigs.groupManagers
     })
 
-    it('add user', function (ctx) {
-      return new Promise(resolve => {
+    it('add user', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipController.add(ctx.req, {
           json: () => {
             sinon.assert.calledWithMatch(
@@ -237,8 +237,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('return user object', function (ctx) {
-      return new Promise(resolve => {
+    it('return user object', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipController.add(ctx.req, {
           json: payload => {
             payload.user.should.equal(ctx.newUser)
@@ -248,8 +248,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('handle readOnly entity', function (ctx) {
-      return new Promise(resolve => {
+    it('handle readOnly entity', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.entityConfig = EntityConfigs.group
         ctx.UserMembershipController.add(ctx.req, null, error => {
           expect(error).to.exist
@@ -259,8 +259,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('handle user already added', function (ctx) {
-      return new Promise(resolve => {
+    it('handle user already added', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipHandler.addUser.yields(new UserAlreadyAddedError())
         ctx.UserMembershipController.add(ctx.req, {
           status: () => ({
@@ -273,8 +273,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('handle user not found', function (ctx) {
-      return new Promise(resolve => {
+    it('handle user not found', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipHandler.addUser.yields(new UserNotFoundError())
         ctx.UserMembershipController.add(ctx.req, {
           status: () => ({
@@ -287,8 +287,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('handle invalid email', function (ctx) {
-      return new Promise(resolve => {
+    it('handle invalid email', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.body.email = 'not_valid_email'
         ctx.UserMembershipController.add(ctx.req, {
           status: () => ({
@@ -309,8 +309,8 @@ describe('UserMembershipController', function () {
       ctx.req.entityConfig = EntityConfigs.groupManagers
     })
 
-    it('remove user', function (ctx) {
-      return new Promise(resolve => {
+    it('remove user', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipController.remove(ctx.req, {
           sendStatus: () => {
             sinon.assert.calledWithMatch(
@@ -325,8 +325,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('handle readOnly entity', function (ctx) {
-      return new Promise(resolve => {
+    it('handle readOnly entity', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.entityConfig = EntityConfigs.group
         ctx.UserMembershipController.remove(ctx.req, null, error => {
           expect(error).to.exist
@@ -336,8 +336,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('prevent self removal', function (ctx) {
-      return new Promise(resolve => {
+    it('prevent self removal', async function (ctx) {
+      await new Promise(resolve => {
         ctx.req.params.userId = ctx.user._id
         ctx.UserMembershipController.remove(ctx.req, {
           status: () => ({
@@ -350,8 +350,8 @@ describe('UserMembershipController', function () {
       })
     })
 
-    it('prevent admin removal', function (ctx) {
-      return new Promise(resolve => {
+    it('prevent admin removal', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipHandler.removeUser.yields(new UserIsManagerError())
         ctx.UserMembershipController.remove(ctx.req, {
           status: () => ({
@@ -409,8 +409,8 @@ describe('UserMembershipController', function () {
       ctx.req.params.id = 'abc'
     })
 
-    it('renders view', function (ctx) {
-      return new Promise(resolve => {
+    it('renders view', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipController.new(ctx.req, {
           render: (viewPath, data) => {
             expect(data.entityName).to.eq('publisher')
@@ -429,8 +429,8 @@ describe('UserMembershipController', function () {
       ctx.req.params.id = 123
     })
 
-    it('creates institution', function (ctx) {
-      return new Promise(resolve => {
+    it('creates institution', async function (ctx) {
+      await new Promise(resolve => {
         ctx.UserMembershipController.create(ctx.req, {
           redirect: path => {
             expect(path).to.eq(EntityConfigs.institution.pathsFor(123).index)

From d3d56744361ecd2c0749df82efec800a3c5c10ee Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 13 Jun 2025 09:06:16 +0100
Subject: [PATCH 037/274] Remove resolve when passed as next

GitOrigin-RevId: 071ce6a4cab210f2db0d278aeb08d31fbba4cbfc
---
 .../BetaProgramController.test.mjs            |  58 ++++----
 .../src/Contact/ContactController.test.mjs    |  18 +--
 .../src/User/UserPagesController.test.mjs     | 130 +++++++++---------
 3 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
index 921f65cbab..586aaf195d 100644
--- a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
+++ b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
@@ -79,14 +79,14 @@ describe('BetaProgramController', function () {
   })
 
   describe('optIn', function () {
-    it("should redirect to '/beta/participate'", async function(ctx) {
+    it("should redirect to '/beta/participate'", async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.redirectedTo.should.equal('/beta/participate')
           resolve()
         }
-        ctx.BetaProgramController.optIn(ctx.req, ctx.res, resolve)
-      });
+        ctx.BetaProgramController.optIn(ctx.req, ctx.res)
+      })
     })
 
     it('should not call next with an error', function (ctx) {
@@ -99,7 +99,7 @@ describe('BetaProgramController', function () {
       ctx.BetaProgramHandler.promises.optIn.callCount.should.equal(1)
     })
 
-    it('should invoke the session maintenance', async function(ctx) {
+    it('should invoke the session maintenance', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.SplitTestSessionHandler.promises.sessionMaintenance.should.have.been.calledWith(
@@ -107,8 +107,8 @@ describe('BetaProgramController', function () {
           )
           resolve()
         }
-        ctx.BetaProgramController.optIn(ctx.req, ctx.res, resolve)
-      });
+        ctx.BetaProgramController.optIn(ctx.req, ctx.res)
+      })
     })
 
     describe('when BetaProgramHandler.opIn produces an error', function () {
@@ -121,49 +121,49 @@ describe('BetaProgramController', function () {
         ctx.res.redirect.callCount.should.equal(0)
       })
 
-      it('should produce an error', async function(ctx) {
+      it('should produce an error', async function (ctx) {
         await new Promise(resolve => {
           ctx.BetaProgramController.optIn(ctx.req, ctx.res, err => {
             expect(err).to.be.instanceof(Error)
             resolve()
           })
-        });
+        })
       })
     })
   })
 
   describe('optOut', function () {
-    it("should redirect to '/beta/participate'", async function(ctx) {
+    it("should redirect to '/beta/participate'", async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.redirectedTo).to.equal('/beta/participate')
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      });
+        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+      })
     })
 
-    it('should not call next with an error', async function(ctx) {
+    it('should not call next with an error', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.next.callCount.should.equal(0)
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      });
+        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+      })
     })
 
-    it('should call BetaProgramHandler.optOut', async function(ctx) {
+    it('should call BetaProgramHandler.optOut', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.BetaProgramHandler.promises.optOut.callCount.should.equal(1)
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      });
+        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+      })
     })
 
-    it('should invoke the session maintenance', async function(ctx) {
+    it('should invoke the session maintenance', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.SplitTestSessionHandler.promises.sessionMaintenance.should.have.been.calledWith(
@@ -172,8 +172,8 @@ describe('BetaProgramController', function () {
           )
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res, resolve)
-      });
+        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+      })
     })
 
     describe('when BetaProgramHandler.optOut produces an error', function () {
@@ -181,23 +181,23 @@ describe('BetaProgramController', function () {
         ctx.BetaProgramHandler.promises.optOut.throws(new Error('woops'))
       })
 
-      it("should not redirect to '/beta/participate'", async function(ctx) {
+      it("should not redirect to '/beta/participate'", async function (ctx) {
         await new Promise(resolve => {
           ctx.BetaProgramController.optOut(ctx.req, ctx.res, error => {
             expect(error).to.exist
             expect(ctx.res.redirected).to.equal(false)
             resolve()
           })
-        });
+        })
       })
 
-      it('should produce an error', async function(ctx) {
+      it('should produce an error', async function (ctx) {
         await new Promise(resolve => {
           ctx.BetaProgramController.optOut(ctx.req, ctx.res, error => {
             expect(error).to.exist
             resolve()
           })
-        });
+        })
       })
     })
   })
@@ -207,14 +207,14 @@ describe('BetaProgramController', function () {
       ctx.UserGetter.promises.getUser.resolves(ctx.user)
     })
 
-    it('should render the opt-in page', async function(ctx) {
+    it('should render the opt-in page', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedTemplate).to.equal('beta_program/opt_in')
           resolve()
         }
-        ctx.BetaProgramController.optInPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.BetaProgramController.optInPage(ctx.req, ctx.res)
+      })
     })
 
     describe('when UserGetter.getUser produces an error', function () {
@@ -227,14 +227,14 @@ describe('BetaProgramController', function () {
         ctx.res.render.callCount.should.equal(0)
       })
 
-      it('should produce an error', async function(ctx) {
+      it('should produce an error', async function (ctx) {
         await new Promise(resolve => {
           ctx.BetaProgramController.optInPage(ctx.req, ctx.res, error => {
             expect(error).to.exist
             expect(error).to.be.instanceof(Error)
             resolve()
           })
-        });
+        })
       })
     })
   })
diff --git a/services/web/test/unit/src/Contact/ContactController.test.mjs b/services/web/test/unit/src/Contact/ContactController.test.mjs
index 577bbb8e9a..fa23677a5b 100644
--- a/services/web/test/unit/src/Contact/ContactController.test.mjs
+++ b/services/web/test/unit/src/Contact/ContactController.test.mjs
@@ -88,7 +88,7 @@ describe('ContactController', function () {
       ctx.ContactController.getContacts(ctx.req, ctx.res)
     })
 
-    it('should populate the users contacts ids', async function(ctx) {
+    it('should populate the users contacts ids', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.UserGetter.promises.getUsers).to.have.been.calledWith(
@@ -102,11 +102,11 @@ describe('ContactController', function () {
           )
           resolve()
         }
-        ctx.ContactController.getContacts(ctx.req, ctx.res, resolve)
-      });
+        ctx.ContactController.getContacts(ctx.req, ctx.res)
+      })
     })
 
-    it('should fire the getContact module hook', async function(ctx) {
+    it('should fire the getContact module hook', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.Modules.promises.hooks.fire).to.have.been.calledWith(
@@ -115,11 +115,11 @@ describe('ContactController', function () {
           )
           resolve()
         }
-        ctx.ContactController.getContacts(ctx.req, ctx.res, resolve)
-      });
+        ctx.ContactController.getContacts(ctx.req, ctx.res)
+      })
     })
 
-    it('should return a formatted list of contacts in contact list order, without holding accounts', async function(ctx) {
+    it('should return a formatted list of contacts in contact list order, without holding accounts', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.json.args[0][0].contacts.should.deep.equal([
@@ -140,8 +140,8 @@ describe('ContactController', function () {
           ])
           resolve()
         }
-        ctx.ContactController.getContacts(ctx.req, ctx.res, resolve)
-      });
+        ctx.ContactController.getContacts(ctx.req, ctx.res)
+      })
     })
   })
 })
diff --git a/services/web/test/unit/src/User/UserPagesController.test.mjs b/services/web/test/unit/src/User/UserPagesController.test.mjs
index 142d3aa91f..8afc49c40f 100644
--- a/services/web/test/unit/src/User/UserPagesController.test.mjs
+++ b/services/web/test/unit/src/User/UserPagesController.test.mjs
@@ -160,17 +160,17 @@ describe('UserPagesController', function () {
   })
 
   describe('registerPage', function () {
-    it('should render the register page', async function(ctx) {
+    it('should render the register page', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/register')
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should set sharedProjectData', async function(ctx) {
+    it('should set sharedProjectData', async function (ctx) {
       await new Promise(resolve => {
         ctx.req.session.sharedProjectData = {
           project_name: 'myProject',
@@ -186,11 +186,11 @@ describe('UserPagesController', function () {
           )
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should set newTemplateData', async function(ctx) {
+    it('should set newTemplateData', async function (ctx) {
       await new Promise(resolve => {
         ctx.req.session.templateData = { templateName: 'templateName' }
 
@@ -200,11 +200,11 @@ describe('UserPagesController', function () {
           )
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should not set the newTemplateData if there is nothing in the session', async function(ctx) {
+    it('should not set the newTemplateData if there is nothing in the session', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           assert.equal(
@@ -213,20 +213,20 @@ describe('UserPagesController', function () {
           )
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+      })
     })
   })
 
   describe('loginForm', function () {
-    it('should render the login page', async function(ctx) {
+    it('should render the login page', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/login')
           resolve()
         }
-        ctx.UserPagesController.loginPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.loginPage(ctx.req, ctx.res)
+      })
     })
 
     describe('when an explicit redirect is set via query string', function () {
@@ -238,7 +238,7 @@ describe('UserPagesController', function () {
         ctx.req.query.redir = '/somewhere/in/particular'
       })
 
-      it('should set a redirect', async function(ctx) {
+      it('should set a redirect', async function (ctx) {
         await new Promise(resolve => {
           ctx.res.callback = page => {
             ctx.AuthenticationController.setRedirectInSession.callCount.should.equal(
@@ -249,8 +249,8 @@ describe('UserPagesController', function () {
             ).to.equal(ctx.req.query.redir)
             resolve()
           }
-          ctx.UserPagesController.loginPage(ctx.req, ctx.res, resolve)
-        });
+          ctx.UserPagesController.loginPage(ctx.req, ctx.res)
+        })
       })
     })
   })
@@ -260,17 +260,17 @@ describe('UserPagesController', function () {
       ctx.UserSessionsManager.getAllUserSessions.callsArgWith(2, null, [])
     })
 
-    it('should render user/sessions', async function(ctx) {
+    it('should render user/sessions', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/sessions')
           resolve()
         }
-        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should include current session data in the view', async function(ctx) {
+    it('should include current session data in the view', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedVariables.currentSession).to.deep.equal({
@@ -279,18 +279,18 @@ describe('UserPagesController', function () {
           })
           resolve()
         }
-        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should have called getAllUserSessions', async function(ctx) {
+    it('should have called getAllUserSessions', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = page => {
           ctx.UserSessionsManager.getAllUserSessions.callCount.should.equal(1)
           resolve()
         }
-        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res)
+      })
     })
 
     describe('when getAllUserSessions produces an error', function () {
@@ -301,7 +301,7 @@ describe('UserPagesController', function () {
         )
       })
 
-      it('should call next with an error', async function(ctx) {
+      it('should call next with an error', async function (ctx) {
         await new Promise(resolve => {
           ctx.next = err => {
             assert(err !== null)
@@ -309,7 +309,7 @@ describe('UserPagesController', function () {
             resolve()
           }
           ctx.UserPagesController.sessionsPage(ctx.req, ctx.res, ctx.next)
-        });
+        })
       })
     })
   })
@@ -319,7 +319,7 @@ describe('UserPagesController', function () {
       ctx.UserGetter.getUser = sinon.stub().yields(null, ctx.user)
     })
 
-    it('render page with subscribed status', async function(ctx) {
+    it('render page with subscribed status', async function (ctx) {
       await new Promise(resolve => {
         ctx.NewsletterManager.subscribed.yields(null, true)
         ctx.res.callback = () => {
@@ -328,11 +328,11 @@ describe('UserPagesController', function () {
           ctx.res.renderedVariables.subscribed.should.equal(true)
           resolve()
         }
-        ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res)
+      })
     })
 
-    it('render page with unsubscribed status', async function(ctx) {
+    it('render page with unsubscribed status', async function (ctx) {
       await new Promise(resolve => {
         ctx.NewsletterManager.subscribed.yields(null, false)
         ctx.res.callback = () => {
@@ -341,8 +341,8 @@ describe('UserPagesController', function () {
           ctx.res.renderedVariables.subscribed.should.equal(false)
           resolve()
         }
-        ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res)
+      })
     })
   })
 
@@ -354,38 +354,38 @@ describe('UserPagesController', function () {
       ctx.UserGetter.promises.getUser = sinon.stub().resolves(ctx.user)
     })
 
-    it('should render user/settings', async function(ctx) {
+    it('should render user/settings', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/settings')
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should send user', async function(ctx) {
+    it('should send user', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.user.id.should.equal(ctx.user._id)
           ctx.res.renderedVariables.user.email.should.equal(ctx.user.email)
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
-    it("should set 'shouldAllowEditingDetails' to true", async function(ctx) {
+    it("should set 'shouldAllowEditingDetails' to true", async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(true)
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should restructure thirdPartyIdentifiers data for template use', async function(ctx) {
+    it('should restructure thirdPartyIdentifiers data for template use', async function (ctx) {
       await new Promise(resolve => {
         const expectedResult = {
           google: 'testId',
@@ -396,11 +396,11 @@ describe('UserPagesController', function () {
           )
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
-    it("should set and clear 'projectSyncSuccessMessage'", async function(ctx) {
+    it("should set and clear 'projectSyncSuccessMessage'", async function (ctx) {
       await new Promise(resolve => {
         ctx.req.session.projectSyncSuccessMessage = 'Some Sync Success'
         ctx.res.callback = () => {
@@ -410,11 +410,11 @@ describe('UserPagesController', function () {
           expect(ctx.req.session.projectSyncSuccessMessage).to.not.exist
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should cast refProviders to booleans', async function(ctx) {
+    it('should cast refProviders to booleans', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedVariables.user.refProviders).to.deep.equal({
@@ -424,11 +424,11 @@ describe('UserPagesController', function () {
           })
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should send the correct managed user admin email', async function(ctx) {
+    it('should send the correct managed user admin email', async function (ctx) {
       await new Promise(resolve => {
         ctx.res.callback = () => {
           expect(
@@ -436,11 +436,11 @@ describe('UserPagesController', function () {
           ).to.equal(ctx.adminEmail)
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
-    it('should send info for groups with SSO enabled', async function(ctx) {
+    it('should send info for groups with SSO enabled', async function (ctx) {
       await new Promise(resolve => {
         ctx.user.enrollment = {
           sso: [
@@ -491,8 +491,8 @@ describe('UserPagesController', function () {
           resolve()
         }
 
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-      });
+        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+      })
     })
 
     describe('when ldap.updateUserDetailsOnLogin is true', function () {
@@ -504,7 +504,7 @@ describe('UserPagesController', function () {
         delete ctx.settings.ldap
       })
 
-      it('should set "shouldAllowEditingDetails" to false', async function(ctx) {
+      it('should set "shouldAllowEditingDetails" to false', async function (ctx) {
         await new Promise(resolve => {
           ctx.res.callback = () => {
             ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(
@@ -512,8 +512,8 @@ describe('UserPagesController', function () {
             )
             resolve()
           }
-          ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-        });
+          ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        })
       })
     })
 
@@ -526,7 +526,7 @@ describe('UserPagesController', function () {
         delete ctx.settings.saml
       })
 
-      it('should set "shouldAllowEditingDetails" to false', async function(ctx) {
+      it('should set "shouldAllowEditingDetails" to false', async function (ctx) {
         await new Promise(resolve => {
           ctx.res.callback = () => {
             ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(
@@ -534,8 +534,8 @@ describe('UserPagesController', function () {
             )
             resolve()
           }
-          ctx.UserPagesController.settingsPage(ctx.req, ctx.res, resolve)
-        });
+          ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        })
       })
     })
   })

From 4550cfc6a0e0f7f3327844f3adfe3002aec1e1d6 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 13 Jun 2025 14:34:05 +0100
Subject: [PATCH 038/274] Use a context function to replicate the behaviour of
 done

This is slightly different than done because done would resolve but I
think it is safer for the purpose done was being used in these changes.

GitOrigin-RevId: e60a912b82a8e544444a2776ea6aab7d2ea83bdb
---
 .../BetaProgramController.test.mjs            |  48 +++-
 .../src/Contact/ContactController.test.mjs    |  24 +-
 .../src/User/UserPagesController.test.mjs     | 242 ++++++++++++------
 services/web/test/unit/vitest_bootstrap.mjs   |   8 +
 4 files changed, 224 insertions(+), 98 deletions(-)

diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
index 586aaf195d..b1fc8cf2fa 100644
--- a/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
+++ b/services/web/test/unit/src/BetaProgram/BetaProgramController.test.mjs
@@ -80,12 +80,16 @@ describe('BetaProgramController', function () {
 
   describe('optIn', function () {
     it("should redirect to '/beta/participate'", async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.redirectedTo.should.equal('/beta/participate')
           resolve()
         }
-        ctx.BetaProgramController.optIn(ctx.req, ctx.res)
+        ctx.BetaProgramController.optIn(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
@@ -134,37 +138,49 @@ describe('BetaProgramController', function () {
 
   describe('optOut', function () {
     it("should redirect to '/beta/participate'", async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(ctx.res.redirectedTo).to.equal('/beta/participate')
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+        ctx.BetaProgramController.optOut(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should not call next with an error', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.next.callCount.should.equal(0)
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+        ctx.BetaProgramController.optOut(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should call BetaProgramHandler.optOut', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.BetaProgramHandler.promises.optOut.callCount.should.equal(1)
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+        ctx.BetaProgramController.optOut(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should invoke the session maintenance', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.SplitTestSessionHandler.promises.sessionMaintenance.should.have.been.calledWith(
             ctx.req,
@@ -172,7 +188,11 @@ describe('BetaProgramController', function () {
           )
           resolve()
         }
-        ctx.BetaProgramController.optOut(ctx.req, ctx.res)
+        ctx.BetaProgramController.optOut(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
@@ -208,12 +228,16 @@ describe('BetaProgramController', function () {
     })
 
     it('should render the opt-in page', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedTemplate).to.equal('beta_program/opt_in')
           resolve()
         }
-        ctx.BetaProgramController.optInPage(ctx.req, ctx.res)
+        ctx.BetaProgramController.optInPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
diff --git a/services/web/test/unit/src/Contact/ContactController.test.mjs b/services/web/test/unit/src/Contact/ContactController.test.mjs
index fa23677a5b..06dd5b768a 100644
--- a/services/web/test/unit/src/Contact/ContactController.test.mjs
+++ b/services/web/test/unit/src/Contact/ContactController.test.mjs
@@ -89,7 +89,7 @@ describe('ContactController', function () {
     })
 
     it('should populate the users contacts ids', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(ctx.UserGetter.promises.getUsers).to.have.been.calledWith(
             ctx.contact_ids,
@@ -102,12 +102,16 @@ describe('ContactController', function () {
           )
           resolve()
         }
-        ctx.ContactController.getContacts(ctx.req, ctx.res)
+        ctx.ContactController.getContacts(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should fire the getContact module hook', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(ctx.Modules.promises.hooks.fire).to.have.been.calledWith(
             'getContacts',
@@ -115,12 +119,16 @@ describe('ContactController', function () {
           )
           resolve()
         }
-        ctx.ContactController.getContacts(ctx.req, ctx.res)
+        ctx.ContactController.getContacts(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should return a formatted list of contacts in contact list order, without holding accounts', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.json.args[0][0].contacts.should.deep.equal([
             {
@@ -140,7 +148,11 @@ describe('ContactController', function () {
           ])
           resolve()
         }
-        ctx.ContactController.getContacts(ctx.req, ctx.res)
+        ctx.ContactController.getContacts(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
   })
diff --git a/services/web/test/unit/src/User/UserPagesController.test.mjs b/services/web/test/unit/src/User/UserPagesController.test.mjs
index 8afc49c40f..f6252faa94 100644
--- a/services/web/test/unit/src/User/UserPagesController.test.mjs
+++ b/services/web/test/unit/src/User/UserPagesController.test.mjs
@@ -161,22 +161,25 @@ describe('UserPagesController', function () {
 
   describe('registerPage', function () {
     it('should render the register page', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/register')
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+        ctx.UserPagesController.registerPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should set sharedProjectData', async function (ctx) {
-      await new Promise(resolve => {
-        ctx.req.session.sharedProjectData = {
-          project_name: 'myProject',
-          user_first_name: 'user_first_name_here',
-        }
-
+      ctx.req.session.sharedProjectData = {
+        project_name: 'myProject',
+        user_first_name: 'user_first_name_here',
+      }
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.sharedProjectData.project_name.should.equal(
             'myProject'
@@ -186,12 +189,16 @@ describe('UserPagesController', function () {
           )
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+        ctx.UserPagesController.registerPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should set newTemplateData', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.req.session.templateData = { templateName: 'templateName' }
 
         ctx.res.callback = () => {
@@ -200,12 +207,16 @@ describe('UserPagesController', function () {
           )
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+        ctx.UserPagesController.registerPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should not set the newTemplateData if there is nothing in the session', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           assert.equal(
             ctx.res.renderedVariables.newTemplateData.templateName,
@@ -213,19 +224,27 @@ describe('UserPagesController', function () {
           )
           resolve()
         }
-        ctx.UserPagesController.registerPage(ctx.req, ctx.res)
+        ctx.UserPagesController.registerPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
   })
 
   describe('loginForm', function () {
     it('should render the login page', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/login')
           resolve()
         }
-        ctx.UserPagesController.loginPage(ctx.req, ctx.res)
+        ctx.UserPagesController.loginPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
@@ -239,7 +258,7 @@ describe('UserPagesController', function () {
       })
 
       it('should set a redirect', async function (ctx) {
-        await new Promise(resolve => {
+        await new Promise((resolve, reject) => {
           ctx.res.callback = page => {
             ctx.AuthenticationController.setRedirectInSession.callCount.should.equal(
               1
@@ -249,7 +268,11 @@ describe('UserPagesController', function () {
             ).to.equal(ctx.req.query.redir)
             resolve()
           }
-          ctx.UserPagesController.loginPage(ctx.req, ctx.res)
+          ctx.UserPagesController.loginPage(
+            ctx.req,
+            ctx.res,
+            ctx.rejectOnError(reject)
+          )
         })
       })
     })
@@ -261,17 +284,21 @@ describe('UserPagesController', function () {
     })
 
     it('should render user/sessions', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/sessions')
           resolve()
         }
-        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.sessionsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should include current session data in the view', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedVariables.currentSession).to.deep.equal({
             ip_address: '1.1.1.1',
@@ -279,17 +306,25 @@ describe('UserPagesController', function () {
           })
           resolve()
         }
-        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.sessionsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should have called getAllUserSessions', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = page => {
           ctx.UserSessionsManager.getAllUserSessions.callCount.should.equal(1)
           resolve()
         }
-        ctx.UserPagesController.sessionsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.sessionsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
@@ -320,28 +355,36 @@ describe('UserPagesController', function () {
     })
 
     it('render page with subscribed status', async function (ctx) {
-      await new Promise(resolve => {
-        ctx.NewsletterManager.subscribed.yields(null, true)
+      ctx.NewsletterManager.subscribed.yields(null, true)
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/email-preferences')
           ctx.res.renderedVariables.title.should.equal('newsletter_info_title')
           ctx.res.renderedVariables.subscribed.should.equal(true)
           resolve()
         }
-        ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res)
+        ctx.UserPagesController.emailPreferencesPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('render page with unsubscribed status', async function (ctx) {
-      await new Promise(resolve => {
-        ctx.NewsletterManager.subscribed.yields(null, false)
+      ctx.NewsletterManager.subscribed.yields(null, false)
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/email-preferences')
           ctx.res.renderedVariables.title.should.equal('newsletter_info_title')
           ctx.res.renderedVariables.subscribed.should.equal(false)
           resolve()
         }
-        ctx.UserPagesController.emailPreferencesPage(ctx.req, ctx.res)
+        ctx.UserPagesController.emailPreferencesPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
   })
@@ -355,54 +398,70 @@ describe('UserPagesController', function () {
     })
 
     it('should render user/settings', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedTemplate.should.equal('user/settings')
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should send user', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.user.id.should.equal(ctx.user._id)
           ctx.res.renderedVariables.user.email.should.equal(ctx.user.email)
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it("should set 'shouldAllowEditingDetails' to true", async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(true)
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should restructure thirdPartyIdentifiers data for template use', async function (ctx) {
-      await new Promise(resolve => {
-        const expectedResult = {
-          google: 'testId',
-        }
+      const expectedResult = {
+        google: 'testId',
+      }
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedVariables.thirdPartyIds).to.include(
             expectedResult
           )
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it("should set and clear 'projectSyncSuccessMessage'", async function (ctx) {
-      await new Promise(resolve => {
-        ctx.req.session.projectSyncSuccessMessage = 'Some Sync Success'
+      ctx.req.session.projectSyncSuccessMessage = 'Some Sync Success'
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           ctx.res.renderedVariables.projectSyncSuccessMessage.should.equal(
             'Some Sync Success'
@@ -410,12 +469,16 @@ describe('UserPagesController', function () {
           expect(ctx.req.session.projectSyncSuccessMessage).to.not.exist
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should cast refProviders to booleans', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(ctx.res.renderedVariables.user.refProviders).to.deep.equal({
             mendeley: true,
@@ -424,53 +487,60 @@ describe('UserPagesController', function () {
           })
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should send the correct managed user admin email', async function (ctx) {
-      await new Promise(resolve => {
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(
             ctx.res.renderedVariables.currentManagedUserAdminEmail
           ).to.equal(ctx.adminEmail)
           resolve()
         }
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
     it('should send info for groups with SSO enabled', async function (ctx) {
-      await new Promise(resolve => {
-        ctx.user.enrollment = {
-          sso: [
-            {
-              groupId: 'abc123abc123',
-              primary: true,
-              linkedAt: new Date(),
-            },
-          ],
-        }
-        const group1 = {
-          _id: 'abc123abc123',
-          teamName: 'Group SSO Rulz',
-          admin_id: {
-            email: 'admin.email@ssolove.com',
+      ctx.user.enrollment = {
+        sso: [
+          {
+            groupId: 'abc123abc123',
+            primary: true,
+            linkedAt: new Date(),
           },
-          linked: true,
-        }
-        const group2 = {
-          _id: 'def456def456',
-          admin_id: {
-            email: 'someone.else@noname.co.uk',
-          },
-          linked: false,
-        }
-
-        ctx.Modules.promises.hooks.fire
-          .withArgs('getUserGroupsSSOEnrollmentStatus')
-          .resolves([[group1, group2]])
+        ],
+      }
+      const group1 = {
+        _id: 'abc123abc123',
+        teamName: 'Group SSO Rulz',
+        admin_id: {
+          email: 'admin.email@ssolove.com',
+        },
+        linked: true,
+      }
+      const group2 = {
+        _id: 'def456def456',
+        admin_id: {
+          email: 'someone.else@noname.co.uk',
+        },
+        linked: false,
+      }
 
+      ctx.Modules.promises.hooks.fire
+        .withArgs('getUserGroupsSSOEnrollmentStatus')
+        .resolves([[group1, group2]])
+      await new Promise((resolve, reject) => {
         ctx.res.callback = () => {
           expect(
             ctx.res.renderedVariables.memberOfSSOEnabledGroups
@@ -491,7 +561,11 @@ describe('UserPagesController', function () {
           resolve()
         }
 
-        ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+        ctx.UserPagesController.settingsPage(
+          ctx.req,
+          ctx.res,
+          ctx.rejectOnError(reject)
+        )
       })
     })
 
@@ -505,14 +579,18 @@ describe('UserPagesController', function () {
       })
 
       it('should set "shouldAllowEditingDetails" to false', async function (ctx) {
-        await new Promise(resolve => {
+        await new Promise((resolve, reject) => {
           ctx.res.callback = () => {
             ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(
               false
             )
             resolve()
           }
-          ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+          ctx.UserPagesController.settingsPage(
+            ctx.req,
+            ctx.res,
+            ctx.rejectOnError(reject)
+          )
         })
       })
     })
@@ -527,14 +605,18 @@ describe('UserPagesController', function () {
       })
 
       it('should set "shouldAllowEditingDetails" to false', async function (ctx) {
-        await new Promise(resolve => {
+        await new Promise((resolve, reject) => {
           ctx.res.callback = () => {
             ctx.res.renderedVariables.shouldAllowEditingDetails.should.equal(
               false
             )
             resolve()
           }
-          ctx.UserPagesController.settingsPage(ctx.req, ctx.res)
+          ctx.UserPagesController.settingsPage(
+            ctx.req,
+            ctx.res,
+            ctx.rejectOnError(reject)
+          )
         })
       })
     })
diff --git a/services/web/test/unit/vitest_bootstrap.mjs b/services/web/test/unit/vitest_bootstrap.mjs
index 5a39b2d587..e00720c5d6 100644
--- a/services/web/test/unit/vitest_bootstrap.mjs
+++ b/services/web/test/unit/vitest_bootstrap.mjs
@@ -36,6 +36,14 @@ vi.mock('@overleaf/logger', async () => {
 })
 
 beforeEach(ctx => {
+  // This function is a utility to duplicate the behaviour of passing `done` in place of `next` in an express route handler.
+  ctx.rejectOnError = reject => {
+    return err => {
+      if (err) {
+        reject(err)
+      }
+    }
+  }
   ctx.logger = logger
 })
 

From 12a1a85a2f779b08c5acb33db5214a46eeb344a5 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Tue, 24 Jun 2025 17:09:37 +0100
Subject: [PATCH 039/274] Make sure req.capabilitySet is defined

GitOrigin-RevId: 408dcb3463884d1bbdc56f409121728d1275f501
---
 services/web/test/unit/src/User/UserPagesController.test.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/test/unit/src/User/UserPagesController.test.mjs b/services/web/test/unit/src/User/UserPagesController.test.mjs
index f6252faa94..0a05cbfb3c 100644
--- a/services/web/test/unit/src/User/UserPagesController.test.mjs
+++ b/services/web/test/unit/src/User/UserPagesController.test.mjs
@@ -155,6 +155,7 @@ describe('UserPagesController', function () {
 
     ctx.UserPagesController = (await import(modulePath)).default
     ctx.req = new MockRequest()
+    ctx.req.capabilitySet = new Set()
     ctx.req.session.user = ctx.user
     ctx.res = new MockResponse()
   })

From 1543f0a53e364bfc4cce952cc15da4774ee0163d Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 25 Jun 2025 10:00:58 +0200
Subject: [PATCH 040/274] Merge pull request #26580 from
 overleaf/jpa-fix-null-array

[web] add migration for fixing collaborator arrays on projects

GitOrigin-RevId: 73178b56501025bf23f463e8f9822fc33ecaaea0
---
 ...50620152657_ensure_collaborator_arrays.mjs | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 services/web/migrations/20250620152657_ensure_collaborator_arrays.mjs

diff --git a/services/web/migrations/20250620152657_ensure_collaborator_arrays.mjs b/services/web/migrations/20250620152657_ensure_collaborator_arrays.mjs
new file mode 100644
index 0000000000..3caa210d41
--- /dev/null
+++ b/services/web/migrations/20250620152657_ensure_collaborator_arrays.mjs
@@ -0,0 +1,29 @@
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
+import { db } from '../app/src/infrastructure/mongodb.js'
+
+const tags = ['server-ce', 'server-pro', 'saas']
+
+const migrate = async () => {
+  const fields = [
+    'collaberator_refs',
+    'pendingEditor_refs',
+    'pendingReviewer_refs',
+    'readOnly_refs',
+    'reviewer_refs',
+  ]
+  for (const field of fields) {
+    await batchedUpdate(
+      db.projects,
+      { [field]: { $type: 'null' } },
+      { $set: { [field]: [] } }
+    )
+  }
+}
+
+const rollback = async () => {}
+
+export default {
+  tags,
+  migrate,
+  rollback,
+}

From 19980b41b8a76c374d7972cb2a52d6609e00d49e Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 25 Jun 2025 10:02:19 +0200
Subject: [PATCH 041/274] [web] switch migrations for fixing dates to
 batchedUpdate (#26582)

* [web] switch migration for fixing confirmedAt dates to batchedUpdate

* [web] switch migration for fixing assignedAt dates to batchedUpdate

* [web] make eslint happy

GitOrigin-RevId: d898d28dc2aa1084e8d3af20b98f49e3fda8a1c6
---
 ...3_convert_confirmedAt_strings_to_dates.mjs |  31 +++-
 ...lit_tests_assigned_at_strings_to_dates.mjs |  25 +++-
 .../web/scripts/confirmed_at_to_dates.mjs     |  53 -------
 .../split_tests_assigned_at_to_dates.mjs      |  46 ------
 .../src/ConvertEmailConfirmedAtToDates.js     |  69 +++++++++
 .../src/ConvertSplitTestAssignedAtToDates.js  | 134 ++++++++++++++++++
 6 files changed, 251 insertions(+), 107 deletions(-)
 delete mode 100644 services/web/scripts/confirmed_at_to_dates.mjs
 delete mode 100644 services/web/scripts/split_tests_assigned_at_to_dates.mjs
 create mode 100644 services/web/test/acceptance/src/ConvertEmailConfirmedAtToDates.js
 create mode 100644 services/web/test/acceptance/src/ConvertSplitTestAssignedAtToDates.js

diff --git a/services/web/migrations/20210726083523_convert_confirmedAt_strings_to_dates.mjs b/services/web/migrations/20210726083523_convert_confirmedAt_strings_to_dates.mjs
index 8dbac841c6..064e365a86 100644
--- a/services/web/migrations/20210726083523_convert_confirmedAt_strings_to_dates.mjs
+++ b/services/web/migrations/20210726083523_convert_confirmedAt_strings_to_dates.mjs
@@ -1,12 +1,35 @@
-import updateStringDates from '../scripts/confirmed_at_to_dates.mjs'
+import { db } from '../app/src/infrastructure/mongodb.js'
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
 
 const tags = ['saas']
 
-const migrate = async client => {
-  await updateStringDates()
+const migrate = async () => {
+  await batchedUpdate(
+    db.users,
+    { 'emails.confirmedAt': { $type: 'string' } },
+    async function (batch) {
+      for (const user of batch) {
+        for (const email of user.emails) {
+          if (typeof email.confirmedAt === 'string') {
+            await db.users.updateOne(
+              { _id: user._id, 'emails.email': email.email },
+              {
+                $set: {
+                  'emails.$.confirmedAt': new Date(
+                    email.confirmedAt.replace(/ UTC$/, '')
+                  ),
+                },
+              }
+            )
+          }
+        }
+      }
+    },
+    { emails: 1 }
+  )
 }
 
-const rollback = async client => {
+const rollback = async () => {
   /* nothing to do */
 }
 
diff --git a/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs b/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs
index 094f3501c3..b13d636d0f 100644
--- a/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs
+++ b/services/web/migrations/20210726083523_convert_split_tests_assigned_at_strings_to_dates.mjs
@@ -1,12 +1,29 @@
-import updateStringDates from '../scripts/split_tests_assigned_at_to_dates.mjs'
+import { db } from '../app/src/infrastructure/mongodb.js'
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
 
 const tags = ['saas']
 
-const migrate = async client => {
-  await updateStringDates()
+const migrate = async () => {
+  await batchedUpdate(
+    db.users,
+    { splitTests: { $exists: true } },
+    async function (batch) {
+      for (const user of batch) {
+        const splitTests = user.splitTests
+        for (const splitTest of Object.values(user.splitTests)) {
+          for (const variant of splitTest) {
+            variant.assignedAt = new Date(variant.assignedAt)
+          }
+        }
+
+        await db.users.updateOne({ _id: user._id }, { $set: { splitTests } })
+      }
+    },
+    { splitTests: 1 }
+  )
 }
 
-const rollback = async client => {
+const rollback = async () => {
   /* nothing to do */
 }
 
diff --git a/services/web/scripts/confirmed_at_to_dates.mjs b/services/web/scripts/confirmed_at_to_dates.mjs
deleted file mode 100644
index 60fcc543fd..0000000000
--- a/services/web/scripts/confirmed_at_to_dates.mjs
+++ /dev/null
@@ -1,53 +0,0 @@
-import { db } from '../app/src/infrastructure/mongodb.js'
-import { fileURLToPath } from 'node:url'
-
-async function updateStringDates() {
-  const users = await db.users.aggregate([
-    { $unwind: { path: '$emails' } },
-    {
-      $match: { 'emails.confirmedAt': { $exists: true, $type: 'string' } },
-    },
-    {
-      $project: {
-        _id: 1,
-        'emails.email': 1,
-        'emails.confirmedAt': 1,
-      },
-    },
-  ])
-
-  let user
-  let count = 0
-  while ((user = await users.next())) {
-    count += 1
-    if (count % 10000 === 0) {
-      console.log(`processed ${count} users`)
-    }
-    const confirmedAt = user.emails.confirmedAt
-    const dateConfirmedAt = new Date(confirmedAt.replace(/ UTC$/, ''))
-    await db.users.updateOne(
-      {
-        _id: user._id,
-        'emails.email': user.emails.email,
-      },
-      {
-        $set: {
-          'emails.$.confirmedAt': dateConfirmedAt,
-        },
-      }
-    )
-  }
-  console.log(`Updated ${count} confirmedAt strings to dates!`)
-}
-
-if (fileURLToPath(import.meta.url) === process.argv[1]) {
-  try {
-    await updateStringDates()
-    process.exit(0)
-  } catch (error) {
-    console.error(error)
-    process.exit(1)
-  }
-}
-
-export default updateStringDates
diff --git a/services/web/scripts/split_tests_assigned_at_to_dates.mjs b/services/web/scripts/split_tests_assigned_at_to_dates.mjs
deleted file mode 100644
index ea6fd3fbea..0000000000
--- a/services/web/scripts/split_tests_assigned_at_to_dates.mjs
+++ /dev/null
@@ -1,46 +0,0 @@
-import { db } from '../app/src/infrastructure/mongodb.js'
-import { fileURLToPath } from 'node:url'
-
-async function updateStringDates() {
-  const users = db.users.find({
-    splitTests: { $exists: true },
-  })
-
-  let user
-  let count = 0
-  while ((user = await users.next())) {
-    count += 1
-    if (count % 10000 === 0) {
-      console.log(`processed ${count} users...`)
-    }
-
-    const splitTests = user.splitTests
-    for (const splitTestKey of Object.keys(splitTests)) {
-      for (const variantIndex in splitTests[splitTestKey]) {
-        splitTests[splitTestKey][variantIndex].assignedAt = new Date(
-          splitTests[splitTestKey][variantIndex].assignedAt
-        )
-      }
-    }
-
-    await db.users.updateOne(
-      {
-        _id: user._id,
-      },
-      { $set: { splitTests } }
-    )
-  }
-  console.log(`Updated ${count} assignedAt strings to dates!`)
-}
-
-if (fileURLToPath(import.meta.url) === process.argv[1]) {
-  try {
-    await updateStringDates()
-    process.exit(0)
-  } catch (error) {
-    console.error(error)
-    process.exit(1)
-  }
-}
-
-export default updateStringDates
diff --git a/services/web/test/acceptance/src/ConvertEmailConfirmedAtToDates.js b/services/web/test/acceptance/src/ConvertEmailConfirmedAtToDates.js
new file mode 100644
index 0000000000..da5f842bb6
--- /dev/null
+++ b/services/web/test/acceptance/src/ConvertEmailConfirmedAtToDates.js
@@ -0,0 +1,69 @@
+import { expect } from 'chai'
+import { db } from '../../../app/src/infrastructure/mongodb.js'
+import { exec } from 'node:child_process'
+
+describe('ConvertEmailConfirmedAtToDates', function () {
+  beforeEach('insert data', async function () {
+    await db.users.insertMany([
+      { email: 'foo0@bar.com', emails: [{ email: 'foo0@bar.com' }] },
+      {
+        email: 'foo1@bar.com',
+        emails: [
+          { email: 'foo1@bar.com', confirmedAt: '2025-06-20 15:53:31 UTC' },
+        ],
+      },
+      {
+        email: 'foo2@bar.com',
+        emails: [
+          { email: 'foo2@bar.com', confirmedAt: '2025-06-20 15:53:32 UTC' },
+          { email: 'foo3@bar.com', confirmedAt: '2025-06-20 15:53:33 UTC' },
+          {
+            email: 'foo4@bar.com',
+            confirmedAt: new Date('2025-06-20T15:53:31.134Z'),
+          },
+        ],
+      },
+    ])
+  })
+
+  beforeEach('run migration', function (done) {
+    exec(
+      'east migrate -t saas --force 20210726083523_convert_confirmedAt_strings_to_dates',
+      done
+    )
+  })
+
+  it('should update the dates', async function () {
+    expect(
+      await db.users.find({}, { projection: { _id: 0 } }).toArray()
+    ).to.deep.equal([
+      { email: 'foo0@bar.com', emails: [{ email: 'foo0@bar.com' }] },
+      {
+        email: 'foo1@bar.com',
+        emails: [
+          {
+            email: 'foo1@bar.com',
+            confirmedAt: new Date('2025-06-20T15:53:31.000Z'),
+          },
+        ],
+      },
+      {
+        email: 'foo2@bar.com',
+        emails: [
+          {
+            email: 'foo2@bar.com',
+            confirmedAt: new Date('2025-06-20T15:53:32.000Z'),
+          },
+          {
+            email: 'foo3@bar.com',
+            confirmedAt: new Date('2025-06-20T15:53:33.000Z'),
+          },
+          {
+            email: 'foo4@bar.com',
+            confirmedAt: new Date('2025-06-20T15:53:31.134Z'),
+          },
+        ],
+      },
+    ])
+  })
+})
diff --git a/services/web/test/acceptance/src/ConvertSplitTestAssignedAtToDates.js b/services/web/test/acceptance/src/ConvertSplitTestAssignedAtToDates.js
new file mode 100644
index 0000000000..bfec1d1fb2
--- /dev/null
+++ b/services/web/test/acceptance/src/ConvertSplitTestAssignedAtToDates.js
@@ -0,0 +1,134 @@
+import { expect } from 'chai'
+import { db } from '../../../app/src/infrastructure/mongodb.js'
+import { exec } from 'node:child_process'
+
+describe('ConvertSplitTestAssignedAtToDates', function () {
+  beforeEach('insert data', async function () {
+    await db.users.insertMany([
+      {
+        email: 'foo0@bar.com',
+        splitTests: {
+          'split-test-1': [
+            {
+              variantName: 'enabled',
+              versionNumber: 4,
+              phase: 'release',
+              assignedAt: '2025-03-18T13:19:46.627Z',
+            },
+            {
+              variantName: 'default',
+              versionNumber: 5,
+              phase: 'release',
+              assignedAt: new Date('2025-04-30T08:52:13.783Z'),
+            },
+          ],
+          'split-test-2': [
+            {
+              variantName: 'active',
+              versionNumber: 5,
+              phase: 'release',
+              assignedAt: new Date('2025-02-14T09:08:30.190Z'),
+            },
+            {
+              variantName: 'active',
+              versionNumber: 7,
+              phase: 'release',
+              assignedAt: new Date('2025-03-11T11:05:13.640Z'),
+            },
+          ],
+        },
+      },
+      {
+        email: 'foo1@bar.com',
+        splitTests: {
+          'split-test-3': [
+            {
+              variantName: 'default',
+              versionNumber: 1,
+              phase: 'release',
+              assignedAt: '2025-02-11T14:55:38.470Z',
+            },
+            {
+              variantName: 'enabled',
+              versionNumber: 21,
+              phase: 'release',
+              assignedAt: '2025-03-18T13:19:46.826Z',
+            },
+          ],
+        },
+      },
+      {
+        email: 'foo2@bar.com',
+      },
+    ])
+  })
+
+  beforeEach('run migration', function (done) {
+    exec(
+      'east migrate -t saas --force 20210726083523_convert_split_tests_assigned_at_strings_to_dates',
+      done
+    )
+  })
+
+  it('should update the dates', async function () {
+    expect(
+      await db.users.find({}, { projection: { _id: 0 } }).toArray()
+    ).to.deep.equal([
+      {
+        email: 'foo0@bar.com',
+        splitTests: {
+          'split-test-1': [
+            {
+              variantName: 'enabled',
+              versionNumber: 4,
+              phase: 'release',
+              assignedAt: new Date('2025-03-18T13:19:46.627Z'),
+            },
+            {
+              variantName: 'default',
+              versionNumber: 5,
+              phase: 'release',
+              assignedAt: new Date('2025-04-30T08:52:13.783Z'),
+            },
+          ],
+          'split-test-2': [
+            {
+              variantName: 'active',
+              versionNumber: 5,
+              phase: 'release',
+              assignedAt: new Date('2025-02-14T09:08:30.190Z'),
+            },
+            {
+              variantName: 'active',
+              versionNumber: 7,
+              phase: 'release',
+              assignedAt: new Date('2025-03-11T11:05:13.640Z'),
+            },
+          ],
+        },
+      },
+      {
+        email: 'foo1@bar.com',
+        splitTests: {
+          'split-test-3': [
+            {
+              variantName: 'default',
+              versionNumber: 1,
+              phase: 'release',
+              assignedAt: new Date('2025-02-11T14:55:38.470Z'),
+            },
+            {
+              variantName: 'enabled',
+              versionNumber: 21,
+              phase: 'release',
+              assignedAt: new Date('2025-03-18T13:19:46.826Z'),
+            },
+          ],
+        },
+      },
+      {
+        email: 'foo2@bar.com',
+      },
+    ])
+  })
+})

From 87de73333a4df89978f7de362b7015f044ca70ca Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 25 Jun 2025 10:03:57 +0200
Subject: [PATCH 042/274] Merge pull request #26575 from
 overleaf/jpa-archived-state

[web] remove runtime migration for project.archived/trashed state

GitOrigin-RevId: 69064878f3dfdcde3727a4e3eb555deb75c70588
---
 .../Collaborators/CollaboratorsHandler.js     |  64 +++------
 .../src/Features/Project/ProjectDeleter.js    |  92 +++----------
 .../app/src/Features/Project/ProjectHelper.js |  38 ------
 ...111111111_ce_sp_convert_archived_state.mjs |  51 ++++++-
 services/web/migrations/lib/adapter.mjs       |   4 +-
 .../web/scripts/convert_archived_state.mjs    |  93 -------------
 .../acceptance/src/ConvertArchivedState.mjs   |   2 +-
 .../test/acceptance/src/ProjectCRUDTests.mjs  |  19 ---
 .../CollaboratorsHandlerTests.js              | 113 ----------------
 .../unit/src/Project/ProjectDeleterTests.js   |  79 +----------
 .../unit/src/Project/ProjectHelperTests.js    | 128 ------------------
 11 files changed, 94 insertions(+), 589 deletions(-)
 delete mode 100644 services/web/scripts/convert_archived_state.mjs

diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
index 8b5b1bc3c2..c70131a520 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
@@ -2,7 +2,6 @@ const { callbackify } = require('util')
 const OError = require('@overleaf/o-error')
 const { Project } = require('../../models/Project')
 const ProjectGetter = require('../Project/ProjectGetter')
-const ProjectHelper = require('../Project/ProjectHelper')
 const logger = require('@overleaf/logger')
 const ContactManager = require('../Contacts/ContactManager')
 const PrivilegeLevels = require('../Authorization/PrivilegeLevels')
@@ -53,55 +52,24 @@ async function fixNullCollaboratorRefs(projectId) {
 
 async function removeUserFromProject(projectId, userId) {
   try {
-    const project = await Project.findOne({ _id: projectId }).exec()
-
     await fixNullCollaboratorRefs(projectId)
 
-    // Deal with the old type of boolean value for archived
-    // In order to clear it
-    if (typeof project.archived === 'boolean') {
-      let archived = ProjectHelper.calculateArchivedArray(
-        project,
-        userId,
-        'ARCHIVE'
-      )
-
-      archived = archived.filter(id => id.toString() !== userId.toString())
-
-      await Project.updateOne(
-        { _id: projectId },
-        {
-          $set: { archived },
-          $pull: {
-            collaberator_refs: userId,
-            reviewer_refs: userId,
-            readOnly_refs: userId,
-            pendingEditor_refs: userId,
-            pendingReviewer_refs: userId,
-            tokenAccessReadOnly_refs: userId,
-            tokenAccessReadAndWrite_refs: userId,
-            trashed: userId,
-          },
-        }
-      )
-    } else {
-      await Project.updateOne(
-        { _id: projectId },
-        {
-          $pull: {
-            collaberator_refs: userId,
-            readOnly_refs: userId,
-            reviewer_refs: userId,
-            pendingEditor_refs: userId,
-            pendingReviewer_refs: userId,
-            tokenAccessReadOnly_refs: userId,
-            tokenAccessReadAndWrite_refs: userId,
-            archived: userId,
-            trashed: userId,
-          },
-        }
-      )
-    }
+    await Project.updateOne(
+      { _id: projectId },
+      {
+        $pull: {
+          collaberator_refs: userId,
+          readOnly_refs: userId,
+          reviewer_refs: userId,
+          pendingEditor_refs: userId,
+          pendingReviewer_refs: userId,
+          tokenAccessReadOnly_refs: userId,
+          tokenAccessReadAndWrite_refs: userId,
+          archived: userId,
+          trashed: userId,
+        },
+      }
+    )
   } catch (err) {
     throw OError.tag(err, 'problem removing user from project collaborators', {
       projectId,
diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js
index b4f6a2b779..bbf5553ae1 100644
--- a/services/web/app/src/Features/Project/ProjectDeleter.js
+++ b/services/web/app/src/Features/Project/ProjectDeleter.js
@@ -9,7 +9,6 @@ const Errors = require('../Errors/Errors')
 const logger = require('@overleaf/logger')
 const DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 const TagsHandler = require('../Tags/TagsHandler')
-const ProjectHelper = require('./ProjectHelper')
 const ProjectDetailsHandler = require('./ProjectDetailsHandler')
 const CollaboratorsHandler = require('../Collaborators/CollaboratorsHandler')
 const CollaboratorsGetter = require('../Collaborators/CollaboratorsGetter')
@@ -135,88 +134,37 @@ async function restoreProject(projectId) {
 }
 
 async function archiveProject(projectId, userId) {
-  try {
-    const project = await Project.findOne({ _id: projectId }).exec()
-    if (!project) {
-      throw new Errors.NotFoundError('project not found')
+  await Project.updateOne(
+    { _id: projectId },
+    {
+      $addToSet: { archived: new ObjectId(userId) },
+      $pull: { trashed: new ObjectId(userId) },
     }
-    const archived = ProjectHelper.calculateArchivedArray(
-      project,
-      userId,
-      'ARCHIVE'
-    )
-
-    await Project.updateOne(
-      { _id: projectId },
-      { $set: { archived }, $pull: { trashed: new ObjectId(userId) } }
-    )
-  } catch (err) {
-    logger.warn({ err }, 'problem archiving project')
-    throw err
-  }
+  )
 }
 
 async function unarchiveProject(projectId, userId) {
-  try {
-    const project = await Project.findOne({ _id: projectId }).exec()
-    if (!project) {
-      throw new Errors.NotFoundError('project not found')
-    }
-
-    const archived = ProjectHelper.calculateArchivedArray(
-      project,
-      userId,
-      'UNARCHIVE'
-    )
-
-    await Project.updateOne({ _id: projectId }, { $set: { archived } })
-  } catch (err) {
-    logger.warn({ err }, 'problem unarchiving project')
-    throw err
-  }
+  await Project.updateOne(
+    { _id: projectId },
+    { $pull: { archived: new ObjectId(userId) } }
+  )
 }
 
 async function trashProject(projectId, userId) {
-  try {
-    const project = await Project.findOne({ _id: projectId }).exec()
-    if (!project) {
-      throw new Errors.NotFoundError('project not found')
+  await Project.updateOne(
+    { _id: projectId },
+    {
+      $addToSet: { trashed: new ObjectId(userId) },
+      $pull: { archived: new ObjectId(userId) },
     }
-
-    const archived = ProjectHelper.calculateArchivedArray(
-      project,
-      userId,
-      'UNARCHIVE'
-    )
-
-    await Project.updateOne(
-      { _id: projectId },
-      {
-        $addToSet: { trashed: new ObjectId(userId) },
-        $set: { archived },
-      }
-    )
-  } catch (err) {
-    logger.warn({ err }, 'problem trashing project')
-    throw err
-  }
+  )
 }
 
 async function untrashProject(projectId, userId) {
-  try {
-    const project = await Project.findOne({ _id: projectId }).exec()
-    if (!project) {
-      throw new Errors.NotFoundError('project not found')
-    }
-
-    await Project.updateOne(
-      { _id: projectId },
-      { $pull: { trashed: new ObjectId(userId) } }
-    )
-  } catch (err) {
-    logger.warn({ err }, 'problem untrashing project')
-    throw err
-  }
+  await Project.updateOne(
+    { _id: projectId },
+    { $pull: { trashed: new ObjectId(userId) } }
+  )
 }
 
 async function deleteProject(projectId, options = {}) {
diff --git a/services/web/app/src/Features/Project/ProjectHelper.js b/services/web/app/src/Features/Project/ProjectHelper.js
index dc64fbfe1f..ef2e671e85 100644
--- a/services/web/app/src/Features/Project/ProjectHelper.js
+++ b/services/web/app/src/Features/Project/ProjectHelper.js
@@ -20,7 +20,6 @@ module.exports = {
   isArchived,
   isTrashed,
   isArchivedOrTrashed,
-  calculateArchivedArray,
   ensureNameIsUnique,
   getAllowedImagesForUser,
   promises: {
@@ -63,38 +62,6 @@ function isArchivedOrTrashed(project, userId) {
   return isArchived(project, userId) || isTrashed(project, userId)
 }
 
-function _allCollaborators(project) {
-  return _.unionWith(
-    [project.owner_ref],
-    project.collaberator_refs,
-    project.readOnly_refs,
-    project.tokenAccessReadAndWrite_refs,
-    project.tokenAccessReadOnly_refs,
-    _objectIdEquals
-  )
-}
-
-function calculateArchivedArray(project, userId, action) {
-  let archived = project.archived
-  userId = new ObjectId(userId)
-
-  if (archived === true) {
-    archived = _allCollaborators(project)
-  } else if (!archived) {
-    archived = []
-  }
-
-  if (action === 'ARCHIVE') {
-    archived = _.unionWith(archived, [userId], _objectIdEquals)
-  } else if (action === 'UNARCHIVE') {
-    archived = archived.filter(id => !_objectIdEquals(id, userId))
-  } else {
-    throw new Error('Unrecognised action')
-  }
-
-  return archived
-}
-
 function ensureNameIsUnique(nameList, name, suffixes, maxLength, callback) {
   // create a set of all project names
   if (suffixes == null) {
@@ -122,11 +89,6 @@ function ensureNameIsUnique(nameList, name, suffixes, maxLength, callback) {
   }
 }
 
-function _objectIdEquals(firstVal, secondVal) {
-  // For use as a comparator for unionWith
-  return firstVal.toString() === secondVal.toString()
-}
-
 function _addSuffixToProjectName(name, suffix, maxLength) {
   // append the suffix and truncate the project title if needed
   if (suffix == null) {
diff --git a/services/web/migrations/20221111111111_ce_sp_convert_archived_state.mjs b/services/web/migrations/20221111111111_ce_sp_convert_archived_state.mjs
index 6adc8adb6e..284429cd2c 100644
--- a/services/web/migrations/20221111111111_ce_sp_convert_archived_state.mjs
+++ b/services/web/migrations/20221111111111_ce_sp_convert_archived_state.mjs
@@ -1,9 +1,56 @@
-import runScript from '../scripts/convert_archived_state.mjs'
+import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
+import { promiseMapWithLimit } from '@overleaf/promise-utils'
+import { db } from '../app/src/infrastructure/mongodb.js'
+import _ from 'lodash'
 
 const tags = ['server-ce', 'server-pro']
 
+const WRITE_CONCURRENCY = parseInt(process.env.WRITE_CONCURRENCY, 10) || 10
+
+function getAllUserIds(project) {
+  return _.unionWith(
+    [project.owner_ref],
+    project.collaberator_refs,
+    project.readOnly_refs,
+    project.tokenAccessReadAndWrite_refs,
+    project.tokenAccessReadOnly_refs,
+    (a, b) => a.toString() === b.toString()
+  )
+}
+
+async function migrateField(field) {
+  await batchedUpdate(
+    db.projects,
+    { [field]: false },
+    { $set: { [field]: [] } }
+  )
+
+  await batchedUpdate(
+    db.projects,
+    { [field]: true },
+    async nextBatch => {
+      await promiseMapWithLimit(WRITE_CONCURRENCY, nextBatch, async project => {
+        await db.projects.updateOne(
+          { _id: project._id },
+          { $set: { [field]: getAllUserIds(project) } }
+        )
+      })
+    },
+    {
+      _id: 1,
+      owner_ref: 1,
+      collaberator_refs: 1,
+      readOnly_refs: 1,
+      tokenAccessReadAndWrite_refs: 1,
+      tokenAccessReadOnly_refs: 1,
+    }
+  )
+}
+
 const migrate = async () => {
-  await runScript('FIRST,SECOND')
+  for (const field of ['archived', 'trashed']) {
+    await migrateField(field)
+  }
 }
 
 const rollback = async () => {}
diff --git a/services/web/migrations/lib/adapter.mjs b/services/web/migrations/lib/adapter.mjs
index e1d4c072d1..0f4cecdd05 100644
--- a/services/web/migrations/lib/adapter.mjs
+++ b/services/web/migrations/lib/adapter.mjs
@@ -10,9 +10,9 @@ class Adapter {
     if (
       !process.env.SKIP_TAG_CHECK &&
       !process.argv.includes('create') &&
-      !(process.argv.includes('-t') || process.argv.includes('--tags'))
+      !(process.argv.includes('-t') || process.argv.includes('--tag'))
     ) {
-      console.error("ERROR: must pass tags using '-t' or '--tags', exiting")
+      console.error("ERROR: must pass tags using '-t' or '--tag', exiting")
       process.exit(1)
     }
     this.params = params || {}
diff --git a/services/web/scripts/convert_archived_state.mjs b/services/web/scripts/convert_archived_state.mjs
deleted file mode 100644
index e2c108ed80..0000000000
--- a/services/web/scripts/convert_archived_state.mjs
+++ /dev/null
@@ -1,93 +0,0 @@
-import _ from 'lodash'
-import { db } from '../app/src/infrastructure/mongodb.js'
-import { batchedUpdate } from '@overleaf/mongo-utils/batchedUpdate.js'
-import { promiseMapWithLimit } from '@overleaf/promise-utils'
-import { fileURLToPath } from 'node:url'
-
-const WRITE_CONCURRENCY = parseInt(process.env.WRITE_CONCURRENCY, 10) || 10
-
-// $ node scripts/convert_archived_state.mjs FIRST,SECOND
-
-async function main(STAGE) {
-  for (const FIELD of ['archived', 'trashed']) {
-    if (STAGE.includes('FIRST')) {
-      await batchedUpdate(
-        db.projects,
-        { [FIELD]: false },
-        {
-          $set: { [FIELD]: [] },
-        }
-      )
-
-      console.error('Done, with first part for field:', FIELD)
-    }
-
-    if (STAGE.includes('SECOND')) {
-      await batchedUpdate(
-        db.projects,
-        { [FIELD]: true },
-        async function performUpdate(nextBatch) {
-          await promiseMapWithLimit(
-            WRITE_CONCURRENCY,
-            nextBatch,
-            async project => {
-              try {
-                await upgradeFieldToArray({ project, FIELD })
-              } catch (err) {
-                console.error(project._id, err)
-                throw err
-              }
-            }
-          )
-        },
-        {
-          _id: 1,
-          owner_ref: 1,
-          collaberator_refs: 1,
-          readOnly_refs: 1,
-          tokenAccessReadAndWrite_refs: 1,
-          tokenAccessReadOnly_refs: 1,
-        }
-      )
-
-      console.error('Done, with second part for field:', FIELD)
-    }
-  }
-}
-
-async function upgradeFieldToArray({ project, FIELD }) {
-  return db.projects.updateOne(
-    { _id: project._id },
-    {
-      $set: { [FIELD]: getAllUserIds(project) },
-    }
-  )
-}
-
-function getAllUserIds(project) {
-  return _.unionWith(
-    [project.owner_ref],
-    project.collaberator_refs,
-    project.readOnly_refs,
-    project.tokenAccessReadAndWrite_refs,
-    project.tokenAccessReadOnly_refs,
-    _objectIdEquals
-  )
-}
-
-function _objectIdEquals(firstVal, secondVal) {
-  // For use as a comparator for unionWith
-  return firstVal.toString() === secondVal.toString()
-}
-
-if (fileURLToPath(import.meta.url) === process.argv[1]) {
-  try {
-    await main(process.argv.pop())
-    process.exit(0)
-  } catch (error) {
-    console.error({ error })
-    process.exit(1)
-  }
-}
-
-export default main
diff --git a/services/web/test/acceptance/src/ConvertArchivedState.mjs b/services/web/test/acceptance/src/ConvertArchivedState.mjs
index 53e2278974..06ce5e3b15 100644
--- a/services/web/test/acceptance/src/ConvertArchivedState.mjs
+++ b/services/web/test/acceptance/src/ConvertArchivedState.mjs
@@ -120,7 +120,7 @@ describe('ConvertArchivedState', function () {
 
   beforeEach(function (done) {
     exec(
-      'CONNECT_DELAY=1 node scripts/convert_archived_state.mjs FIRST,SECOND',
+      'east migrate --tag server-ce --force 20221111111111_ce_sp_convert_archived_state',
       error => {
         if (error) {
           return done(error)
diff --git a/services/web/test/acceptance/src/ProjectCRUDTests.mjs b/services/web/test/acceptance/src/ProjectCRUDTests.mjs
index 2212dc8e8b..082499ba91 100644
--- a/services/web/test/acceptance/src/ProjectCRUDTests.mjs
+++ b/services/web/test/acceptance/src/ProjectCRUDTests.mjs
@@ -125,25 +125,6 @@ describe('Project CRUD', function () {
         expectObjectIdArrayEqual(trashedProject.archived, [])
       })
     })
-
-    describe('with a legacy boolean state', function () {
-      it('should mark the project as not archived for the user', async function () {
-        await Project.updateOne(
-          { _id: this.projectId },
-          { $set: { archived: true } }
-        ).exec()
-
-        const { response } = await this.user.doRequest(
-          'POST',
-          `/project/${this.projectId}/trash`
-        )
-
-        expect(response.statusCode).to.equal(200)
-
-        const trashedProject = await Project.findById(this.projectId).exec()
-        expectObjectIdArrayEqual(trashedProject.archived, [])
-      })
-    })
   })
 
   describe('when untrashing a project', function () {
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
index 73fb699772..e31dbd4d40 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
@@ -24,16 +24,6 @@ describe('CollaboratorsHandler', function () {
       name: 'Foo',
     }
 
-    this.archivedProject = {
-      _id: new ObjectId(),
-      archived: [new ObjectId(this.userId)],
-    }
-
-    this.oldArchivedProject = {
-      _id: new ObjectId(),
-      archived: true,
-    }
-
     this.UserGetter = {
       promises: {
         getUser: sinon.stub().resolves(null),
@@ -59,9 +49,6 @@ describe('CollaboratorsHandler', function () {
       },
     }
 
-    this.ProjectHelper = {
-      calculateArchivedArray: sinon.stub(),
-    }
     this.CollaboratorsGetter = {
       promises: {
         dangerouslyGetAllProjectsUserIsMemberOf: sinon.stub(),
@@ -77,7 +64,6 @@ describe('CollaboratorsHandler', function () {
         '../ThirdPartyDataStore/TpdsProjectFlusher': this.TpdsProjectFlusher,
         '../ThirdPartyDataStore/TpdsUpdateSender': this.TpdsUpdateSender,
         '../Project/ProjectGetter': this.ProjectGetter,
-        '../Project/ProjectHelper': this.ProjectHelper,
         '../Editor/EditorRealTimeController': this.EditorRealTimeController,
         './CollaboratorsGetter': this.CollaboratorsGetter,
       },
@@ -130,15 +116,6 @@ describe('CollaboratorsHandler', function () {
 
   describe('removeUserFromProject', function () {
     describe('a non-archived project', function () {
-      beforeEach(function () {
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: this.project._id,
-          })
-          .chain('exec')
-          .resolves(this.project)
-      })
-
       it('should remove the user from mongo', async function () {
         this.expectNullReferenceCleanup(this.project._id)
         this.ProjectMock.expects('updateOne')
@@ -168,89 +145,6 @@ describe('CollaboratorsHandler', function () {
         )
       })
     })
-
-    describe('an archived project, archived with a boolean value', function () {
-      beforeEach(function () {
-        const archived = [new ObjectId(this.userId)]
-        this.ProjectHelper.calculateArchivedArray.returns(archived)
-
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: this.oldArchivedProject._id,
-          })
-          .chain('exec')
-          .resolves(this.oldArchivedProject)
-      })
-
-      it('should remove the user from mongo', async function () {
-        this.expectNullReferenceCleanup(this.oldArchivedProject._id)
-        this.ProjectMock.expects('updateOne')
-          .withArgs(
-            {
-              _id: this.oldArchivedProject._id,
-            },
-            {
-              $set: {
-                archived: [],
-              },
-              $pull: {
-                collaberator_refs: this.userId,
-                reviewer_refs: this.userId,
-                readOnly_refs: this.userId,
-                pendingEditor_refs: this.userId,
-                pendingReviewer_refs: this.userId,
-                tokenAccessReadOnly_refs: this.userId,
-                tokenAccessReadAndWrite_refs: this.userId,
-                trashed: this.userId,
-              },
-            }
-          )
-          .resolves()
-        await this.CollaboratorsHandler.promises.removeUserFromProject(
-          this.oldArchivedProject._id,
-          this.userId
-        )
-      })
-    })
-
-    describe('an archived project, archived with an array value', function () {
-      beforeEach(function () {
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: this.archivedProject._id,
-          })
-          .chain('exec')
-          .resolves(this.archivedProject)
-      })
-
-      it('should remove the user from mongo', async function () {
-        this.expectNullReferenceCleanup(this.archivedProject._id)
-        this.ProjectMock.expects('updateOne')
-          .withArgs(
-            {
-              _id: this.archivedProject._id,
-            },
-            {
-              $pull: {
-                collaberator_refs: this.userId,
-                reviewer_refs: this.userId,
-                readOnly_refs: this.userId,
-                pendingEditor_refs: this.userId,
-                pendingReviewer_refs: this.userId,
-                tokenAccessReadOnly_refs: this.userId,
-                tokenAccessReadAndWrite_refs: this.userId,
-                archived: this.userId,
-                trashed: this.userId,
-              },
-            }
-          )
-          .resolves()
-        await this.CollaboratorsHandler.promises.removeUserFromProject(
-          this.archivedProject._id,
-          this.userId
-        )
-      })
-    })
   })
 
   describe('addUserIdToProject', function () {
@@ -539,13 +433,6 @@ describe('CollaboratorsHandler', function () {
         'token-read-only-1',
       ]
       for (const projectId of expectedProjects) {
-        this.ProjectMock.expects('findOne')
-          .withArgs({
-            _id: projectId,
-          })
-          .chain('exec')
-          .resolves({ _id: projectId })
-
         this.expectNullReferenceCleanup(projectId)
         this.ProjectMock.expects('updateOne')
           .withArgs(
diff --git a/services/web/test/unit/src/Project/ProjectDeleterTests.js b/services/web/test/unit/src/Project/ProjectDeleterTests.js
index 199b8518e7..ee01037d14 100644
--- a/services/web/test/unit/src/Project/ProjectDeleterTests.js
+++ b/services/web/test/unit/src/Project/ProjectDeleterTests.js
@@ -95,10 +95,6 @@ describe('ProjectDeleter', function () {
       },
     }
 
-    this.ProjectHelper = {
-      calculateArchivedArray: sinon.stub(),
-    }
-
     this.db = {
       projects: {
         insertOne: sinon.stub().resolves(),
@@ -143,7 +139,6 @@ describe('ProjectDeleter', function () {
         '../../infrastructure/Features': this.Features,
         '../Editor/EditorRealTimeController': this.EditorRealTimeController,
         '../../models/Project': { Project },
-        './ProjectHelper': this.ProjectHelper,
         '../../models/DeletedProject': { DeletedProject },
         '../DocumentUpdater/DocumentUpdaterHandler':
           this.DocumentUpdaterHandler,
@@ -559,19 +554,11 @@ describe('ProjectDeleter', function () {
 
   describe('archiveProject', function () {
     beforeEach(function () {
-      const archived = [new ObjectId(this.user._id)]
-      this.ProjectHelper.calculateArchivedArray.returns(archived)
-
-      this.ProjectMock.expects('findOne')
-        .withArgs({ _id: this.project._id })
-        .chain('exec')
-        .resolves(this.project)
-
       this.ProjectMock.expects('updateOne')
         .withArgs(
           { _id: this.project._id },
           {
-            $set: { archived },
+            $addToSet: { archived: new ObjectId(this.user._id) },
             $pull: { trashed: new ObjectId(this.user._id) },
           }
         )
@@ -585,32 +572,15 @@ describe('ProjectDeleter', function () {
       )
       this.ProjectMock.verify()
     })
-
-    it('calculates the archived array', async function () {
-      await this.ProjectDeleter.promises.archiveProject(
-        this.project._id,
-        this.user._id
-      )
-      expect(this.ProjectHelper.calculateArchivedArray).to.have.been.calledWith(
-        this.project,
-        this.user._id,
-        'ARCHIVE'
-      )
-    })
   })
 
   describe('unarchiveProject', function () {
     beforeEach(function () {
-      const archived = [new ObjectId(this.user._id)]
-      this.ProjectHelper.calculateArchivedArray.returns(archived)
-
-      this.ProjectMock.expects('findOne')
-        .withArgs({ _id: this.project._id })
-        .chain('exec')
-        .resolves(this.project)
-
       this.ProjectMock.expects('updateOne')
-        .withArgs({ _id: this.project._id }, { $set: { archived } })
+        .withArgs(
+          { _id: this.project._id },
+          { $pull: { archived: new ObjectId(this.user._id) } }
+        )
         .resolves()
     })
 
@@ -621,36 +591,16 @@ describe('ProjectDeleter', function () {
       )
       this.ProjectMock.verify()
     })
-
-    it('calculates the archived array', async function () {
-      await this.ProjectDeleter.promises.unarchiveProject(
-        this.project._id,
-        this.user._id
-      )
-      expect(this.ProjectHelper.calculateArchivedArray).to.have.been.calledWith(
-        this.project,
-        this.user._id,
-        'UNARCHIVE'
-      )
-    })
   })
 
   describe('trashProject', function () {
     beforeEach(function () {
-      const archived = [new ObjectId(this.user._id)]
-      this.ProjectHelper.calculateArchivedArray.returns(archived)
-
-      this.ProjectMock.expects('findOne')
-        .withArgs({ _id: this.project._id })
-        .chain('exec')
-        .resolves(this.project)
-
       this.ProjectMock.expects('updateOne')
         .withArgs(
           { _id: this.project._id },
           {
             $addToSet: { trashed: new ObjectId(this.user._id) },
-            $set: { archived },
+            $pull: { archived: new ObjectId(this.user._id) },
           }
         )
         .resolves()
@@ -663,27 +613,10 @@ describe('ProjectDeleter', function () {
       )
       this.ProjectMock.verify()
     })
-
-    it('unarchives the project', async function () {
-      await this.ProjectDeleter.promises.trashProject(
-        this.project._id,
-        this.user._id
-      )
-      expect(this.ProjectHelper.calculateArchivedArray).to.have.been.calledWith(
-        this.project,
-        this.user._id,
-        'UNARCHIVE'
-      )
-    })
   })
 
   describe('untrashProject', function () {
     beforeEach(function () {
-      this.ProjectMock.expects('findOne')
-        .withArgs({ _id: this.project._id })
-        .chain('exec')
-        .resolves(this.project)
-
       this.ProjectMock.expects('updateOne')
         .withArgs(
           { _id: this.project._id },
diff --git a/services/web/test/unit/src/Project/ProjectHelperTests.js b/services/web/test/unit/src/Project/ProjectHelperTests.js
index 7dc2343313..9aee9fc363 100644
--- a/services/web/test/unit/src/Project/ProjectHelperTests.js
+++ b/services/web/test/unit/src/Project/ProjectHelperTests.js
@@ -101,134 +101,6 @@ describe('ProjectHelper', function () {
     })
   })
 
-  describe('calculateArchivedArray', function () {
-    describe('project.archived being an array', function () {
-      it('returns an array adding the current user id when archiving', function () {
-        const project = { archived: [] }
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          new ObjectId('5c922599cdb09e014aa7d499'),
-          'ARCHIVE'
-        )
-        expect(result).to.deep.equal([new ObjectId('5c922599cdb09e014aa7d499')])
-      })
-
-      it('returns an array without the current user id when unarchiving', function () {
-        const project = { archived: [new ObjectId('5c922599cdb09e014aa7d499')] }
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          new ObjectId('5c922599cdb09e014aa7d499'),
-          'UNARCHIVE'
-        )
-        expect(result).to.deep.equal([])
-      })
-    })
-
-    describe('project.archived being a boolean and being true', function () {
-      it('returns an array of all associated user ids when archiving', function () {
-        const project = {
-          archived: true,
-          owner_ref: this.user._id,
-          collaberator_refs: [
-            new ObjectId('4f2cfb341eb5855a5b000f8b'),
-            new ObjectId('5c45f3bd425ead01488675aa'),
-          ],
-          readOnly_refs: [new ObjectId('5c92243fcdb09e014aa7d487')],
-          tokenAccessReadAndWrite_refs: [
-            new ObjectId('5c922599cdb09e014aa7d499'),
-          ],
-          tokenAccessReadOnly_refs: [],
-        }
-
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          this.user._id,
-          'ARCHIVE'
-        )
-        expect(result).to.deep.equal([
-          this.user._id,
-          new ObjectId('4f2cfb341eb5855a5b000f8b'),
-          new ObjectId('5c45f3bd425ead01488675aa'),
-          new ObjectId('5c92243fcdb09e014aa7d487'),
-          new ObjectId('5c922599cdb09e014aa7d499'),
-        ])
-      })
-
-      it('returns an array of all associated users without the current user id when unarchived', function () {
-        const project = {
-          archived: true,
-          owner_ref: this.user._id,
-          collaberator_refs: [
-            new ObjectId('4f2cfb341eb5855a5b000f8b'),
-            new ObjectId('5c45f3bd425ead01488675aa'),
-            new ObjectId('5c922599cdb09e014aa7d499'),
-          ],
-          readOnly_refs: [new ObjectId('5c92243fcdb09e014aa7d487')],
-          tokenAccessReadAndWrite_refs: [
-            new ObjectId('5c922599cdb09e014aa7d499'),
-          ],
-          tokenAccessReadOnly_refs: [],
-        }
-
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          this.user._id,
-          'UNARCHIVE'
-        )
-        expect(result).to.deep.equal([
-          new ObjectId('4f2cfb341eb5855a5b000f8b'),
-          new ObjectId('5c45f3bd425ead01488675aa'),
-          new ObjectId('5c922599cdb09e014aa7d499'),
-          new ObjectId('5c92243fcdb09e014aa7d487'),
-        ])
-      })
-    })
-
-    describe('project.archived being a boolean and being false', function () {
-      it('returns an array adding the current user id when archiving', function () {
-        const project = { archived: false }
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          new ObjectId('5c922599cdb09e014aa7d499'),
-          'ARCHIVE'
-        )
-        expect(result).to.deep.equal([new ObjectId('5c922599cdb09e014aa7d499')])
-      })
-
-      it('returns an empty array when unarchiving', function () {
-        const project = { archived: false }
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          new ObjectId('5c922599cdb09e014aa7d499'),
-          'UNARCHIVE'
-        )
-        expect(result).to.deep.equal([])
-      })
-    })
-
-    describe('project.archived not being set', function () {
-      it('returns an array adding the current user id when archiving', function () {
-        const project = { archived: undefined }
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          new ObjectId('5c922599cdb09e014aa7d499'),
-          'ARCHIVE'
-        )
-        expect(result).to.deep.equal([new ObjectId('5c922599cdb09e014aa7d499')])
-      })
-
-      it('returns an empty array when unarchiving', function () {
-        const project = { archived: undefined }
-        const result = this.ProjectHelper.calculateArchivedArray(
-          project,
-          new ObjectId('5c922599cdb09e014aa7d499'),
-          'UNARCHIVE'
-        )
-        expect(result).to.deep.equal([])
-      })
-    })
-  })
-
   describe('compilerFromV1Engine', function () {
     it('returns the correct engine for latex_dvipdf', function () {
       expect(this.ProjectHelper.compilerFromV1Engine('latex_dvipdf')).to.equal(

From 886bad10717822c1afddd81e154236d1863de9ff Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 25 Jun 2025 10:04:14 +0200
Subject: [PATCH 043/274] [web] remove runtime migration for fixing
 collaborator lists on projects (#26581)

GitOrigin-RevId: f6a4c142e010e168c79b59cb96dddb147093d4a0
---
 .../Collaborators/CollaboratorsHandler.js     | 26 ---------
 .../CollaboratorsHandlerTests.js              | 56 -------------------
 2 files changed, 82 deletions(-)

diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
index c70131a520..2411dc3ad0 100644
--- a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
+++ b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
@@ -27,33 +27,9 @@ module.exports = {
     convertTrackChangesToExplicitFormat,
   },
 }
-// Forces null pendingReviewer_refs, readOnly_refs, and reviewer_refs to
-// be empty arrays to avoid errors during $pull ops
-// See https://github.com/overleaf/internal/issues/24610
-async function fixNullCollaboratorRefs(projectId) {
-  // Temporary cleanup for the case where pendingReviewer_refs is null
-  await Project.updateOne(
-    { _id: projectId, pendingReviewer_refs: { $type: 'null' } },
-    { $set: { pendingReviewer_refs: [] } }
-  ).exec()
-
-  // Temporary cleanup for the case where readOnly_refs is null
-  await Project.updateOne(
-    { _id: projectId, readOnly_refs: { $type: 'null' } },
-    { $set: { readOnly_refs: [] } }
-  ).exec()
-
-  // Temporary cleanup for the case where reviewer_refs is null
-  await Project.updateOne(
-    { _id: projectId, reviewer_refs: { $type: 'null' } },
-    { $set: { reviewer_refs: [] } }
-  ).exec()
-}
 
 async function removeUserFromProject(projectId, userId) {
   try {
-    await fixNullCollaboratorRefs(projectId)
-
     await Project.updateOne(
       { _id: projectId },
       {
@@ -306,8 +282,6 @@ async function setCollaboratorPrivilegeLevel(
   }
   let update
 
-  await fixNullCollaboratorRefs(projectId)
-
   switch (privilegeLevel) {
     case PrivilegeLevels.READ_AND_WRITE: {
       update = {
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
index e31dbd4d40..c97e4f2fe8 100644
--- a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
+++ b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
@@ -68,46 +68,6 @@ describe('CollaboratorsHandler', function () {
         './CollaboratorsGetter': this.CollaboratorsGetter,
       },
     })
-
-    // Helper function to set up mock expectations for null reference cleanup
-    this.expectNullReferenceCleanup = projectId => {
-      this.ProjectMock.expects('updateOne')
-        .withArgs(
-          {
-            _id: projectId,
-            pendingReviewer_refs: { $type: 'null' },
-          },
-          {
-            $set: { pendingReviewer_refs: [] },
-          }
-        )
-        .chain('exec')
-        .resolves()
-      this.ProjectMock.expects('updateOne')
-        .withArgs(
-          {
-            _id: projectId,
-            readOnly_refs: { $type: 'null' },
-          },
-          {
-            $set: { readOnly_refs: [] },
-          }
-        )
-        .chain('exec')
-        .resolves()
-      this.ProjectMock.expects('updateOne')
-        .withArgs(
-          {
-            _id: projectId,
-            reviewer_refs: { $type: 'null' },
-          },
-          {
-            $set: { reviewer_refs: [] },
-          }
-        )
-        .chain('exec')
-        .resolves()
-    }
   })
 
   afterEach(function () {
@@ -117,7 +77,6 @@ describe('CollaboratorsHandler', function () {
   describe('removeUserFromProject', function () {
     describe('a non-archived project', function () {
       it('should remove the user from mongo', async function () {
-        this.expectNullReferenceCleanup(this.project._id)
         this.ProjectMock.expects('updateOne')
           .withArgs(
             {
@@ -433,7 +392,6 @@ describe('CollaboratorsHandler', function () {
         'token-read-only-1',
       ]
       for (const projectId of expectedProjects) {
-        this.expectNullReferenceCleanup(projectId)
         this.ProjectMock.expects('updateOne')
           .withArgs(
             {
@@ -596,8 +554,6 @@ describe('CollaboratorsHandler', function () {
 
   describe('setCollaboratorPrivilegeLevel', function () {
     it('sets a collaborator to read-only', async function () {
-      this.expectNullReferenceCleanup(this.project._id)
-
       this.ProjectMock.expects('updateOne')
         .withArgs(
           {
@@ -628,8 +584,6 @@ describe('CollaboratorsHandler', function () {
     })
 
     it('sets a collaborator to read-write', async function () {
-      this.expectNullReferenceCleanup(this.project._id)
-
       this.ProjectMock.expects('updateOne')
         .withArgs(
           {
@@ -669,8 +623,6 @@ describe('CollaboratorsHandler', function () {
         })
       })
       it('should correctly update the project', async function () {
-        this.expectNullReferenceCleanup(this.project._id)
-
         this.ProjectMock.expects('updateOne')
           .withArgs(
             {
@@ -714,8 +666,6 @@ describe('CollaboratorsHandler', function () {
         })
       })
       it('should correctly update the project', async function () {
-        this.expectNullReferenceCleanup(this.project._id)
-
         this.ProjectMock.expects('updateOne')
           .withArgs(
             {
@@ -748,8 +698,6 @@ describe('CollaboratorsHandler', function () {
     })
 
     it('sets a collaborator to read-only as a pendingEditor', async function () {
-      this.expectNullReferenceCleanup(this.project._id)
-
       this.ProjectMock.expects('updateOne')
         .withArgs(
           {
@@ -783,8 +731,6 @@ describe('CollaboratorsHandler', function () {
     })
 
     it('sets a collaborator to read-only as a pendingReviewer', async function () {
-      this.expectNullReferenceCleanup(this.project._id)
-
       this.ProjectMock.expects('updateOne')
         .withArgs(
           {
@@ -818,8 +764,6 @@ describe('CollaboratorsHandler', function () {
     })
 
     it('throws a NotFoundError if the project or collaborator does not exist', async function () {
-      this.expectNullReferenceCleanup(this.project._id)
-
       this.ProjectMock.expects('updateOne')
         .chain('exec')
         .resolves({ matchedCount: 0 })

From 73ae6f480fbf4a6e27b31103e76360cbdf286245 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 25 Jun 2025 10:24:11 +0200
Subject: [PATCH 044/274] [web] change status page URL to HTTPS everywhere
 (#26587)

* [web] change status page URL to HTTPS everywhere

Also open all links to the status page or admin email in a new tab.

* [server-ce] explicit protocol matching

Co-authored-by: Brian Gough <brian.gough@overleaf.com>

---------

Co-authored-by: Brian Gough <brian.gough@overleaf.com>
GitOrigin-RevId: d7d12eef4efc737c5d70fc969c862acae9faf14c
---
 server-ce/config/settings.js                  |  5 ++++-
 .../src/Features/Errors/HttpErrorHandler.js   |  2 +-
 services/web/app/views/general/400.pug        |  2 +-
 services/web/app/views/general/500.pug        | 20 ++++++++++++-------
 services/web/app/views/general/closed.pug     |  2 +-
 .../app/views/general/unsupported-browser.pug |  6 +++---
 .../config/settings.test.defaults.js          |  2 +-
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/server-ce/config/settings.js b/server-ce/config/settings.js
index a7e8219858..47d34fd870 100644
--- a/server-ce/config/settings.js
+++ b/server-ce/config/settings.js
@@ -184,7 +184,10 @@ const settings = {
   siteUrl: (siteUrl = process.env.OVERLEAF_SITE_URL || 'http://localhost'),
 
   // Status page URL as displayed on the maintenance/500 pages.
-  statusPageUrl: process.env.OVERLEAF_STATUS_PAGE_URL,
+  statusPageUrl: process.env.OVERLEAF_STATUS_PAGE_URL ?
+    // Add https:// protocol prefix if not set (Allow plain-text http:// for Server Pro/CE).
+    (process.env.OVERLEAF_STATUS_PAGE_URL.startsWith('http://') || process.env.OVERLEAF_STATUS_PAGE_URL.startsWith('https://')) ? process.env.OVERLEAF_STATUS_PAGE_URL : `https://${process.env.OVERLEAF_STATUS_PAGE_URL}`
+    : undefined,
 
   // The name this is used to describe your Overleaf Community Edition Installation
   appName: process.env.OVERLEAF_APP_NAME || 'Overleaf Community Edition',
diff --git a/services/web/app/src/Features/Errors/HttpErrorHandler.js b/services/web/app/src/Features/Errors/HttpErrorHandler.js
index c3fab886fa..0908a1b3e2 100644
--- a/services/web/app/src/Features/Errors/HttpErrorHandler.js
+++ b/services/web/app/src/Features/Errors/HttpErrorHandler.js
@@ -146,7 +146,7 @@ module.exports = HttpErrorHandler = {
     }
     let message = `${Settings.appName} is currently down for maintenance.`
     if (Settings.statusPageUrl) {
-      message += ` Please check https://${Settings.statusPageUrl} for updates.`
+      message += ` Please check ${Settings.statusPageUrl} for updates.`
     }
     switch (req.accepts(['html', 'json'])) {
       case 'html':
diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug
index 5dad09910f..48d1fff5eb 100644
--- a/services/web/app/views/general/400.pug
+++ b/services/web/app/views/general/400.pug
@@ -22,7 +22,7 @@ block body
 							| Please go back and try again.
 							| If the problem persists, please contact us at
 							|
-							a(href='mailto:' + settings.adminEmail) #{settings.adminEmail}
+							a(href='mailto:' + settings.adminEmail target='_blank') #{settings.adminEmail}
 							| .
 						p.error-actions
 							a.error-btn(href='javascript:history.back()') Back
diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug
index 22d6ceb35c..4ee242f242 100644
--- a/services/web/app/views/general/500.pug
+++ b/services/web/app/views/general/500.pug
@@ -10,14 +10,20 @@ block body
 				.error-container.full-height
 					.error-details
 						p.error-status Something went wrong, sorry.
-						p.error-description Our staff are probably looking into this, but if it continues, please check our status page at
+						if settings.statusPageUrl
+							p.error-description Our staff are probably looking into this, but if it continues, please check our status page at
+								|
+								|
+								a(href=settings.statusPageUrl target='_blank') #{new URL(settings.statusPageUrl).hostname}
+								|
+								| or contact us at
+								|
+								a(href='mailto:' + settings.adminEmail target='_blank') #{settings.adminEmail}
+								| .
+						else
+							| If the problem persists, please contact us at
 							|
-							|
-							a(href='http://' + settings.statusPageUrl) #{settings.statusPageUrl}
-							|
-							| or contact us at
-							|
-							a(href='mailto:' + settings.adminEmail) #{settings.adminEmail}
+							a(href='mailto:' + settings.adminEmail target='_blank') #{settings.adminEmail}
 							| .
 						p.error-actions
 							a.error-btn(href='/') Home
diff --git a/services/web/app/views/general/closed.pug b/services/web/app/views/general/closed.pug
index 3c1196a4cc..5725e35ea6 100644
--- a/services/web/app/views/general/closed.pug
+++ b/services/web/app/views/general/closed.pug
@@ -10,7 +10,7 @@ block content
 					p
 						if settings.statusPageUrl
 							| #{settings.appName} is currently down for maintenance.
-							| Please check our #[a(href='https://' + settings.statusPageUrl) status page]
+							| Please check our #[a(href=settings.statusPageUrl target='_blank') status page]
 							| for updates.
 						else
 							| #{settings.appName} is currently down for maintenance.
diff --git a/services/web/app/views/general/unsupported-browser.pug b/services/web/app/views/general/unsupported-browser.pug
index 1fd2c42bdb..fbe6c218eb 100644
--- a/services/web/app/views/general/unsupported-browser.pug
+++ b/services/web/app/views/general/unsupported-browser.pug
@@ -15,7 +15,7 @@ block body
 							br
 							| If you think you're seeing this message in error,
 							|
-							a(href='mailto:' + settings.adminEmail) please let us know
+							a(href='mailto:' + settings.adminEmail target='_blank') please let us know
 							| .
 
 						if fromURL
@@ -33,7 +33,7 @@ block body
 						p
 							| Support for beta or developer-preview browser versions cannot be guaranteed. Please
 							|
-							a(href='mailto:' + settings.adminEmail) get in touch
+							a(href='mailto:' + settings.adminEmail target='_blank') get in touch
 							|
 							| if you encounter any issues while using the service with beta or developer-preview releases of supported browsers.
 						p
@@ -41,5 +41,5 @@ block body
 						p
 							| If you cannot upgrade to one of the supported browsers,
 							|
-							a(href='mailto:' + settings.adminEmail) please let us know
+							a(href='mailto:' + settings.adminEmail target='_blank') please let us know
 							| .
diff --git a/services/web/test/acceptance/config/settings.test.defaults.js b/services/web/test/acceptance/config/settings.test.defaults.js
index b4a7006951..860b5e2066 100644
--- a/services/web/test/acceptance/config/settings.test.defaults.js
+++ b/services/web/test/acceptance/config/settings.test.defaults.js
@@ -24,7 +24,7 @@ module.exports = {
     ? JSON.parse(process.env.ADMIN_DOMAINS)
     : ['example.com'],
 
-  statusPageUrl: 'status.example.com',
+  statusPageUrl: 'https://status.example.com',
   cdn: {
     web: {
       host: 'cdn.example.com',

From e562e3d1bfda23c593c47b80c9199cc61217a47c Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Wed, 25 Jun 2025 10:54:17 +0100
Subject: [PATCH 045/274] Merge pull request #26399 from
 overleaf/mj-ide-co-branding

[web] Editor redesign: Add cobranding logo to toolbar

GitOrigin-RevId: 9f9138bb4ebc2cc7d39e38f8bee77c7fbde8b781
---
 .../ide-redesign/components/toolbar/logos.tsx | 46 ++++++++++++++++
 .../components/toolbar/toolbar.tsx            | 54 ++++++-------------
 .../pages/editor/toolbar-redesign.scss        | 30 +++++++++++
 3 files changed, 91 insertions(+), 39 deletions(-)
 create mode 100644 services/web/frontend/js/features/ide-redesign/components/toolbar/logos.tsx

diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/logos.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/logos.tsx
new file mode 100644
index 0000000000..8f6c60682c
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/logos.tsx
@@ -0,0 +1,46 @@
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import MaterialIcon from '@/shared/components/material-icon'
+import { useTranslation } from 'react-i18next'
+import { Cobranding } from '../../../../../../types/cobranding'
+
+type ToolbarLogosProps = {
+  cobranding?: Cobranding
+}
+
+export const ToolbarLogos = ({ cobranding }: ToolbarLogosProps) => {
+  const { t } = useTranslation()
+
+  return (
+    <div className="ide-redesign-toolbar-logos">
+      <OLTooltip
+        id="tooltip-home-button"
+        description={t('back_to_your_projects')}
+        overlayProps={{ delay: 0, placement: 'bottom' }}
+      >
+        <div className="ide-redesign-toolbar-home-button">
+          <a href="/project" className="ide-redesign-toolbar-home-link">
+            <span className="toolbar-ol-logo" aria-label={t('overleaf_logo')} />
+            <MaterialIcon type="home" className="toolbar-ol-home-button" />
+          </a>
+        </div>
+      </OLTooltip>
+      {cobranding && cobranding.logoImgUrl && (
+        <>
+          <span className="ide-redesign-toolbar-cobranding-separator" />
+          <a
+            className="ide-redesign-toolbar-cobranding-link"
+            href={cobranding.brandVariationHomeUrl}
+            target="_blank"
+            rel="noreferrer noopener"
+          >
+            <img
+              src={cobranding.logoImgUrl}
+              className="ide-redesign-toolbar-cobranding-logo"
+              alt={cobranding.brandVariationName}
+            />
+          </a>
+        </>
+      )}
+    </div>
+  )
+}
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
index 298e6f8e93..c8418e00e4 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
@@ -1,5 +1,3 @@
-import MaterialIcon from '@/shared/components/material-icon'
-import { useTranslation } from 'react-i18next'
 import { ToolbarMenuBar } from './menu-bar'
 import { ToolbarProjectTitle } from './project-title'
 import { OnlineUsers } from './online-users'
@@ -11,12 +9,14 @@ import { useLayoutContext } from '@/shared/context/layout-context'
 import BackToEditorButton from '@/features/editor-navigation-toolbar/components/back-to-editor-button'
 import { useCallback } from 'react'
 import * as eventTracking from '../../../../infrastructure/event-tracking'
-import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import { ToolbarLogos } from './logos'
+import { useEditorContext } from '@/shared/context/editor-context'
 import UpgradeButton from './upgrade-button'
 import getMeta from '@/utils/meta'
 
 export const Toolbar = () => {
   const { view, setView } = useLayoutContext()
+  const { cobranding } = useEditorContext()
 
   const handleBackToEditorClick = useCallback(() => {
     eventTracking.sendMB('navigation-clicked-history', { action: 'close' })
@@ -37,43 +37,19 @@ export const Toolbar = () => {
 
   return (
     <div className="ide-redesign-toolbar">
-      <ToolbarMenus />
+      <div className="ide-redesign-toolbar-menu">
+        <ToolbarLogos cobranding={cobranding} />
+        <ToolbarMenuBar />
+      </div>
       <ToolbarProjectTitle />
-      <ToolbarButtons />
-    </div>
-  )
-}
-
-const ToolbarMenus = () => {
-  const { t } = useTranslation()
-  return (
-    <div className="ide-redesign-toolbar-menu">
-      <OLTooltip
-        id="tooltip-home-button"
-        description={t('back_to_your_projects')}
-        overlayProps={{ delay: 0, placement: 'bottom' }}
-      >
-        <div className="ide-redesign-toolbar-home-button">
-          <a href="/project" className="ide-redesign-toolbar-home-link">
-            <span className="toolbar-ol-logo" aria-label={t('overleaf_logo')} />
-            <MaterialIcon type="home" className="toolbar-ol-home-button" />
-          </a>
-        </div>
-      </OLTooltip>
-      <ToolbarMenuBar />
-    </div>
-  )
-}
-
-const ToolbarButtons = () => {
-  return (
-    <div className="ide-redesign-toolbar-actions">
-      <LabsActions />
-      <OnlineUsers />
-      <ShowHistoryButton />
-      <ChangeLayoutButton />
-      <ShareProjectButton />
-      {getMeta('ol-showUpgradePrompt') && <UpgradeButton />}
+      <div className="ide-redesign-toolbar-actions">
+        <LabsActions />
+        <OnlineUsers />
+        <ShowHistoryButton />
+        <ChangeLayoutButton />
+        <ShareProjectButton />
+        {getMeta('ol-showUpgradePrompt') && <UpgradeButton />}
+      </div>
     </div>
   )
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar-redesign.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar-redesign.scss
index a4df2e4e36..10ef617386 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar-redesign.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar-redesign.scss
@@ -148,6 +148,36 @@
       vertical-align: middle;
     }
   }
+
+  .ide-redesign-toolbar-logos {
+    display: flex;
+  }
+
+  .ide-redesign-toolbar-cobranding-separator {
+    $separator-height: 16px;
+
+    border-radius: var(--border-radius-base);
+    width: 1px;
+    height: $separator-height;
+    margin-top: math.div($toolbar-height - $separator-height, 2);
+
+    // To account for the 1px border of the rail so that they're aligned.
+    margin-left: calc(var(--spacing-02) - 1px);
+    margin-right: var(--spacing-01);
+    background: var(--redesign-toolbar-border-divider);
+  }
+
+  .ide-redesign-toolbar-cobranding-link {
+    display: inline-flex;
+    flex-direction: column;
+    justify-content: center;
+    padding: 0 var(--spacing-02);
+  }
+
+  .ide-redesign-toolbar-cobranding-logo {
+    max-height: calc($toolbar-height - var(--spacing-04) * 2);
+    max-width: 150px;
+  }
 }
 
 .ide-redesign-toolbar-menu-bar {

From 4fd9c6fd18656fe632937f81c85a855433ca0a0b Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Wed, 25 Jun 2025 10:54:32 +0100
Subject: [PATCH 046/274] Merge pull request #26440 from
 overleaf/mj-ide-co-branding-submit

[web] Editor redesign: Add co-branded submit button to toolbar

GitOrigin-RevId: 45f7ba93de8b28868d88a4ad913f6543e0f7e0a6
---
 .../BrandVariations/BrandVariationsHandler.js    |  4 ++++
 .../components/toolbar/project-title.tsx         |  5 +++--
 .../ide-redesign/components/toolbar/toolbar.tsx  | 12 +++++++++++-
 .../js/shared/context/editor-context.tsx         |  1 +
 .../BrandVariationsHandlerTests.js               | 16 ++++++++++++++++
 services/web/types/cobranding.ts                 |  1 +
 6 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js
index 942fa3a6ab..33fa764048 100644
--- a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js
+++ b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js
@@ -74,6 +74,10 @@ function sanitizeBrandVariationDetails(details) {
       details.submit_button_html,
       settings.modules.sanitize.options
     )
+    details.submit_button_html_no_br = sanitizeHtml(
+      details.submit_button_html.replace(/<br\s*\/?>/gi, ' '),
+      settings.modules.sanitize.options
+    )
   }
 }
 
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
index 43e5c678d7..bf3320d8b9 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
@@ -16,9 +16,10 @@ import EditableLabel from './editable-label'
 import { DuplicateProject } from './duplicate-project'
 
 const [publishModalModules] = importOverleafModules('publishModal')
-const SubmitProjectButton = publishModalModules?.import.NewPublishToolbarButton
+const SubmitProjectButton = publishModalModules?.import.NewPublishDropdownButton
 
 export const ToolbarProjectTitle = () => {
+  const { cobranding } = useEditorContext()
   const { t } = useTranslation()
   const { permissionsLevel, renameProject } = useEditorContext()
   const { name } = useProjectContext()
@@ -67,7 +68,7 @@ export const ToolbarProjectTitle = () => {
         />
       </DropdownToggle>
       <DropdownMenu renderOnMount>
-        {shouldDisplaySubmitButton && (
+        {shouldDisplaySubmitButton && !cobranding && (
           <>
             <SubmitProjectButton />
             <DropdownDivider />
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
index c8418e00e4..2af70eb9ce 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
@@ -11,12 +11,19 @@ import { useCallback } from 'react'
 import * as eventTracking from '../../../../infrastructure/event-tracking'
 import { ToolbarLogos } from './logos'
 import { useEditorContext } from '@/shared/context/editor-context'
+import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
 import UpgradeButton from './upgrade-button'
 import getMeta from '@/utils/meta'
 
+const [publishModalModules] = importOverleafModules('publishModal')
+const SubmitProjectButton = publishModalModules?.import.NewPublishToolbarButton
+
 export const Toolbar = () => {
   const { view, setView } = useLayoutContext()
-  const { cobranding } = useEditorContext()
+  const { cobranding, permissionsLevel } = useEditorContext()
+  const shouldDisplaySubmitButton =
+    (permissionsLevel === 'owner' || permissionsLevel === 'readAndWrite') &&
+    SubmitProjectButton
 
   const handleBackToEditorClick = useCallback(() => {
     eventTracking.sendMB('navigation-clicked-history', { action: 'close' })
@@ -47,6 +54,9 @@ export const Toolbar = () => {
         <OnlineUsers />
         <ShowHistoryButton />
         <ChangeLayoutButton />
+        {shouldDisplaySubmitButton && cobranding && (
+          <SubmitProjectButton cobranding={cobranding} />
+        )}
         <ShareProjectButton />
         {getMeta('ol-showUpgradePrompt') && <UpgradeButton />}
       </div>
diff --git a/services/web/frontend/js/shared/context/editor-context.tsx b/services/web/frontend/js/shared/context/editor-context.tsx
index 2ebab1be7b..12763aab58 100644
--- a/services/web/frontend/js/shared/context/editor-context.tsx
+++ b/services/web/frontend/js/shared/context/editor-context.tsx
@@ -72,6 +72,7 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
         partner: brandVariation.partner,
         brandedMenu: brandVariation.branded_menu,
         submitBtnHtml: brandVariation.submit_button_html,
+        submitBtnHtmlNoBreaks: brandVariation.submit_button_html_no_br,
       }
     )
   }, [])
diff --git a/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js b/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js
index 47d96406f9..75adfd7e9b 100644
--- a/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js
+++ b/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js
@@ -118,5 +118,21 @@ describe('BrandVariationsHandler', function () {
         '<br /><strong style="color:#B39500">AGU Journal</strong>hello'
       )
     })
+
+    it("should sanitize and remove breaks in 'submit_button_html_no_br'", async function () {
+      this.mockedBrandVariationDetails.submit_button_html =
+        'Submit to<br class="break"/><strong style="color:#B39500">AGU Journal</strong><iframe>hello</iframe>'
+      this.V1Api.request.callsArgWith(
+        1,
+        null,
+        { statusCode: 200 },
+        this.mockedBrandVariationDetails
+      )
+      const brandVariationDetails =
+        await this.BrandVariationsHandler.promises.getBrandVariationById('12')
+      expect(brandVariationDetails.submit_button_html_no_br).to.equal(
+        'Submit to <strong style="color:#B39500">AGU Journal</strong>hello'
+      )
+    })
   })
 })
diff --git a/services/web/types/cobranding.ts b/services/web/types/cobranding.ts
index dc6822be84..dc6ae75964 100644
--- a/services/web/types/cobranding.ts
+++ b/services/web/types/cobranding.ts
@@ -8,4 +8,5 @@ export type Cobranding = {
   partner?: string
   brandedMenu?: boolean
   submitBtnHtml?: string
+  submitBtnHtmlNoBreaks?: string
 }

From 9d267f0803fb0391794594a2c49efe87d95959d2 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Wed, 25 Jun 2025 10:55:20 +0100
Subject: [PATCH 047/274] Merge pull request #26499 from
 overleaf/dp-pdf-couldnt-compile

Update handling of "suggest fix" in new editor

GitOrigin-RevId: 80d6fa479bc1d12d7e5b82a8c504830c9f4db182
---
 .../error-logs/log-entry-header.tsx           | 10 +--
 .../pdf-preview/hooks/use-log-events.ts       | 80 ++++++++++++++++++-
 .../shared/context/local-compile-context.tsx  | 22 -----
 3 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
index ce43af3744..c3a81f737e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
@@ -104,6 +104,8 @@ function LogEntryHeader({
         overlayProps={{ placement: 'bottom' }}
       >
         <button
+          data-action="expand-collapse"
+          data-collapsed={collapsed}
           className="log-entry-header-button"
           onClick={onToggleCollapsed}
           aria-label={collapsed ? t('expand') : t('collapse')}
@@ -150,13 +152,7 @@ function LogEntryHeader({
             </OLTooltip>
           )}
           {actionComponents.map(({ import: { default: Component }, path }) => (
-            <Component
-              key={path}
-              collapsed={collapsed}
-              onToggleCollapsed={onToggleCollapsed}
-              logEntry={logEntry}
-              id={id}
-            />
+            <Component key={path} logEntry={logEntry} id={id} />
           ))}
         </div>
       )}
diff --git a/services/web/frontend/js/features/pdf-preview/hooks/use-log-events.ts b/services/web/frontend/js/features/pdf-preview/hooks/use-log-events.ts
index d849786026..771a2d3b4e 100644
--- a/services/web/frontend/js/features/pdf-preview/hooks/use-log-events.ts
+++ b/services/web/frontend/js/features/pdf-preview/hooks/use-log-events.ts
@@ -1,14 +1,20 @@
-import { useEffect } from 'react'
+import { useCallback, useEffect } from 'react'
 import { useLayoutContext } from '@/shared/context/layout-context'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
+import { useRailContext } from '@/features/ide-redesign/contexts/rail-context'
+import { useEditorContext } from '@/shared/context/editor-context'
 
 /**
  * This hook adds an event listener for events dispatched from the editor to the compile logs pane
  */
 export const useLogEvents = (setShowLogs: (show: boolean) => void) => {
   const { pdfLayout, setView } = useLayoutContext()
+  const newEditor = useIsNewEditorEnabled()
+  const { openTab: openRailTab } = useRailContext()
+  const { hasPremiumSuggestion } = useEditorContext()
 
-  useEffect(() => {
-    const listener = (event: Event) => {
+  const handleViewCompileLogEntryEventOldEditor = useCallback(
+    (event: Event) => {
       const { id, suggestFix } = (
         event as CustomEvent<{ id: string; suggestFix?: boolean }>
       ).detail
@@ -52,6 +58,68 @@ export const useLogEvents = (setShowLogs: (show: boolean) => void) => {
           }
         }
       })
+    },
+    [pdfLayout, setView, setShowLogs]
+  )
+
+  const handleViewCompileLogEntryEventNewEditor = useCallback(
+    (event: Event) => {
+      const { id, suggestFix } = (
+        event as CustomEvent<{ id: string; suggestFix?: boolean }>
+      ).detail
+
+      openRailTab('errors')
+
+      window.setTimeout(() => {
+        const logEntry = document.querySelector(
+          `.log-entry[data-log-entry-id="${id}"]`
+        )
+
+        if (logEntry) {
+          logEntry.scrollIntoView({
+            block: 'start',
+            inline: 'nearest',
+          })
+
+          const expandCollapseButton =
+            logEntry.querySelector<HTMLButtonElement>(
+              'button[data-action="expand-collapse"]'
+            )
+
+          const collapsed = expandCollapseButton?.dataset.collapsed === 'true'
+
+          if (collapsed) {
+            expandCollapseButton.click()
+          }
+
+          if (suggestFix) {
+            if (hasPremiumSuggestion) {
+              logEntry
+                .querySelector<HTMLButtonElement>(
+                  'button[data-action="suggest-fix"]'
+                )
+                ?.click()
+            } else {
+              window.dispatchEvent(
+                new CustomEvent('aiAssist:showPaywall', {
+                  detail: { origin: 'suggest-fix' },
+                })
+              )
+            }
+          }
+        }
+      })
+    },
+    [openRailTab, hasPremiumSuggestion]
+  )
+
+  useEffect(() => {
+    const listener = (event: Event) => {
+      if (newEditor) {
+        handleViewCompileLogEntryEventNewEditor(event)
+      } else {
+        handleViewCompileLogEntryEventOldEditor(event)
+      }
     }
 
     window.addEventListener('editor:view-compile-log-entry', listener)
@@ -59,5 +127,9 @@ export const useLogEvents = (setShowLogs: (show: boolean) => void) => {
     return () => {
       window.removeEventListener('editor:view-compile-log-entry', listener)
     }
-  }, [pdfLayout, setView, setShowLogs])
+  }, [
+    handleViewCompileLogEntryEventNewEditor,
+    handleViewCompileLogEntryEventOldEditor,
+    newEditor,
+  ])
 }
diff --git a/services/web/frontend/js/shared/context/local-compile-context.tsx b/services/web/frontend/js/shared/context/local-compile-context.tsx
index 3e4dd7a91f..52aa0eee6d 100644
--- a/services/web/frontend/js/shared/context/local-compile-context.tsx
+++ b/services/web/frontend/js/shared/context/local-compile-context.tsx
@@ -50,8 +50,6 @@ import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 import { captureException } from '@/infrastructure/error-reporter'
 import OError from '@overleaf/o-error'
 import getMeta from '@/utils/meta'
-import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
-import { useRailContext } from '@/features/ide-redesign/contexts/rail-context'
 
 type PdfFile = Record<string, any>
 
@@ -132,8 +130,6 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   const { openDocWithId, openDocs, currentDocument } = useEditorManagerContext()
   const { role } = useDetachContext()
 
-  const newEditor = useIsNewEditorEnabled()
-
   const {
     _id: projectId,
     rootDocId,
@@ -144,8 +140,6 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
 
   const { pdfPreviewOpen } = useLayoutContext()
 
-  const { openTab: openRailTab } = useRailContext()
-
   const { features, alphaProgram, labsProgram } = useUserContext()
 
   const { fileTreeData } = useFileTreeData()
@@ -752,22 +746,6 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   // used for that compile.
   const lastCompileOptions = useMemo(() => data?.options || {}, [data])
 
-  useEffect(() => {
-    const listener = () => {
-      if (newEditor) {
-        openRailTab('errors')
-      } else {
-        setShowLogs(true)
-      }
-    }
-
-    window.addEventListener('editor:show-logs', listener)
-
-    return () => {
-      window.removeEventListener('editor:show-logs', listener)
-    }
-  }, [newEditor, openRailTab])
-
   const value = useMemo(
     () => ({
       animateCompileDropdownArrow,

From 77d5c8fa64671520c52e7e4366532f1130f9b5ff Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Wed, 25 Jun 2025 10:55:34 +0100
Subject: [PATCH 048/274] Merge pull request #26555 from
 overleaf/dp-error-logs-header-tweaks

Small fixes to new error log entry headers

GitOrigin-RevId: 1ed2fcc7ce1210b3bf4e330c079ba6d5166580d6
---
 .../ide-redesign/components/error-logs/log-entry-header.tsx     | 1 -
 .../web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
index c3a81f737e..3b4c9f6347 100644
--- a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry-header.tsx
@@ -111,7 +111,6 @@ function LogEntryHeader({
           aria-label={collapsed ? t('expand') : t('collapse')}
         >
           <MaterialIcon
-            onClick={onToggleCollapsed}
             type={
               openCollapseIconOverride ??
               (collapsed ? 'chevron_right' : 'expand_more')
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
index 912a8b86e5..c830fa7eef 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
@@ -78,6 +78,7 @@
       display: flex;
       align-items: center;
       border: none;
+      gap: var(--spacing-03);
     }
 
     .log-entry-header-button {
@@ -88,6 +89,7 @@
       flex: 1;
       border-radius: var(--border-radius-base);
       padding: var(--spacing-02) var(--spacing-03) var(--spacing-02) 0;
+      overflow: hidden;
 
       &:hover {
         cursor: pointer;

From 169e37cf311bcdfb49e0bb97a3f6b0b166b4508f Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Wed, 25 Jun 2025 10:56:36 +0100
Subject: [PATCH 049/274] Merge pull request #26567 from
 overleaf/ae-modal-onconfirm

Remove onConfirm from modal props

GitOrigin-RevId: 96c6456a0e893aeb544f346c0de3cb2c207f40d4
---
 .../ide-react/components/modals/generic-confirm-modal.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/ide-react/components/modals/generic-confirm-modal.tsx b/services/web/frontend/js/features/ide-react/components/modals/generic-confirm-modal.tsx
index de35bee52f..fd27985ba6 100644
--- a/services/web/frontend/js/features/ide-react/components/modals/generic-confirm-modal.tsx
+++ b/services/web/frontend/js/features/ide-react/components/modals/generic-confirm-modal.tsx
@@ -25,10 +25,10 @@ function GenericConfirmModal({
   message,
   confirmLabel,
   primaryVariant = 'primary',
+  onConfirm,
   ...modalProps
 }: GenericConfirmModalProps) {
   const { t } = useTranslation()
-  const handleConfirmClick = modalProps.onConfirm
 
   return (
     <OLModal {...modalProps}>
@@ -42,7 +42,7 @@ function GenericConfirmModal({
         <OLButton variant="secondary" onClick={() => modalProps.onHide()}>
           {t('cancel')}
         </OLButton>
-        <OLButton variant={primaryVariant} onClick={handleConfirmClick}>
+        <OLButton variant={primaryVariant} onClick={onConfirm}>
           {confirmLabel || t('ok')}
         </OLButton>
       </OLModalFooter>

From 13d3d0c552644482a6089760b8b02e641d4cfb76 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Wed, 25 Jun 2025 10:56:58 +0100
Subject: [PATCH 050/274] Merge pull request #26269 from
 overleaf/ae-use-debounce-types

Remove JSDoc types from useDebounce

GitOrigin-RevId: d0504076aab4af94cd03c5f2a98853535979012a
---
 services/web/frontend/js/shared/hooks/use-debounce.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/services/web/frontend/js/shared/hooks/use-debounce.ts b/services/web/frontend/js/shared/hooks/use-debounce.ts
index 5fee07b0c1..926a08af64 100644
--- a/services/web/frontend/js/shared/hooks/use-debounce.ts
+++ b/services/web/frontend/js/shared/hooks/use-debounce.ts
@@ -1,12 +1,6 @@
 import { useEffect, useState } from 'react'
 
-/**
- * @template T
- * @param {T} value
- * @param {number} delay
- * @returns {T}
- */
-export default function useDebounce<T>(value: T, delay = 0) {
+export default function useDebounce<T>(value: T, delay = 0): T {
   const [debouncedValue, setDebouncedValue] = useState(value)
 
   useEffect(() => {

From 3b65a674d0e63b29280e3ab2e5201f320167810e Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Wed, 25 Jun 2025 12:47:22 +0200
Subject: [PATCH 051/274] Allow switching reviewing mode for anonymous editors
 (#26426)

* Revert "Remove reference to track changes ofForGuests"

This reverts commit 675f3864e4bf0a07d24848223814768ab50bfd9b.

* handle track changes for guests

* only send on_for_guests

* update test

GitOrigin-RevId: 15308f0904b26d2ea6a2e57b3852cd2a9b3c886d
---
 .../components/review-mode-switcher.tsx        | 18 ++++++++++++++----
 .../context/track-changes-state-context.tsx    | 14 +++++++++-----
 .../shared/context/types/project-context.tsx   |  2 --
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
index f2bb2763bd..fab717c15d 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
@@ -30,7 +30,8 @@ const useCurrentMode = (): Mode => {
   const user = useUserContext()
   const trackChangesForCurrentUser =
     trackChanges?.onForEveryone ||
-    (user && user.id && trackChanges?.onForMembers[user.id])
+    (user?.id && trackChanges?.onForMembers[user.id]) ||
+    (!user?.id && trackChanges?.onForGuests)
   const { permissionsLevel } = useEditorContext()
 
   if (permissionsLevel === 'readOnly') {
@@ -46,7 +47,8 @@ const useCurrentMode = (): Mode => {
 
 function ReviewModeSwitcher() {
   const { t } = useTranslation()
-  const { saveTrackChangesForCurrentUser } =
+  const user = useUserContext()
+  const { saveTrackChangesForCurrentUser, saveTrackChanges } =
     useTrackChangesStateActionsContext()
   const mode = useCurrentMode()
   const { permissionsLevel } = useEditorContext()
@@ -74,7 +76,11 @@ function ReviewModeSwitcher() {
                 previousMode: mode,
                 newMode: 'edit',
               })
-              saveTrackChangesForCurrentUser(false)
+              if (user?.id) {
+                saveTrackChangesForCurrentUser(false)
+              } else {
+                saveTrackChanges({ on_for_guests: false })
+              }
             }}
             description={t('edit_content_directly')}
             leadingIcon="edit"
@@ -96,7 +102,11 @@ function ReviewModeSwitcher() {
                   previousMode: mode,
                   newMode: 'review',
                 })
-                saveTrackChangesForCurrentUser(true)
+                if (user?.id) {
+                  saveTrackChangesForCurrentUser(true)
+                } else {
+                  saveTrackChanges({ on_for_guests: true })
+                }
               }
             }}
             description={
diff --git a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
index b621ac8ed8..73ffe78b5d 100644
--- a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
@@ -20,6 +20,7 @@ import { usePermissionsContext } from '@/features/ide-react/context/permissions-
 
 export type TrackChangesState = {
   onForEveryone: boolean
+  onForGuests: boolean
   onForMembers: Record<UserId, boolean | undefined>
 }
 
@@ -30,6 +31,7 @@ export const TrackChangesStateContext = createContext<
 type SaveTrackChangesRequestBody = {
   on?: boolean
   on_for?: Record<UserId, boolean | undefined>
+  on_for_guests?: boolean
 }
 
 type TrackChangesStateActions = {
@@ -60,20 +62,22 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
   useEffect(() => {
     setWantTrackChanges(
       trackChangesValue === true ||
-        (trackChangesValue !== false && !!user.id && trackChangesValue[user.id])
+        (trackChangesValue !== false &&
+          trackChangesValue[user.id ?? '__guests__'])
     )
   }, [setWantTrackChanges, trackChangesValue, user.id])
 
   const trackChangesIsObject =
     trackChangesValue !== true && trackChangesValue !== false
   const onForEveryone = trackChangesValue === true
+  const onForGuests =
+    onForEveryone ||
+    (trackChangesIsObject && trackChangesValue.__guests__ === true)
 
   const onForMembers = useMemo(() => {
     const onForMembers: Record<UserId, boolean | undefined> = {}
     if (trackChangesIsObject) {
       for (const key of Object.keys(trackChangesValue)) {
-        // TODO: Remove this check when we have converted
-        // all projects to the current format.
         if (key !== '__guests__') {
           onForMembers[key as UserId] = trackChangesValue[key as UserId]
         }
@@ -141,8 +145,8 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
   )
 
   const value = useMemo(
-    () => ({ onForEveryone, onForMembers }),
-    [onForEveryone, onForMembers]
+    () => ({ onForEveryone, onForGuests, onForMembers }),
+    [onForEveryone, onForGuests, onForMembers]
   )
 
   return (
diff --git a/services/web/frontend/js/shared/context/types/project-context.tsx b/services/web/frontend/js/shared/context/types/project-context.tsx
index 9f68f5e7a3..4e1abdc420 100644
--- a/services/web/frontend/js/shared/context/types/project-context.tsx
+++ b/services/web/frontend/js/shared/context/types/project-context.tsx
@@ -45,8 +45,6 @@ export type ProjectContextValue = {
     signUpDate: string
   }
   tags: Tag[]
-  // TODO: Remove __guests__ and boolean options when we have converted
-  // all projects to the current format.
   trackChangesState: boolean | Record<UserId | '__guests__', boolean>
   projectSnapshot: ProjectSnapshot
   joinedOnce: boolean

From 6965618c3407709f8d5cdbcf6d44e4a0c8d7e426 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Thu, 26 Jun 2025 09:13:00 -0700
Subject: [PATCH 052/274] Merge pull request #26605 from
 overleaf/mf-remove-for-teaching-and-overleaf-advisor-program

[web] Remove both "For teaching" and "Overleaf advisor programme" from our website navigation and pages

GitOrigin-RevId: 3189398e3f2fa9b19e828daeb890d89a336058b0
---
 services/web/app/views/_mixins/links.pug      | 27 -------------------
 .../layout/fat-footer-website-redesign.pug    |  2 --
 services/web/app/views/layout/fat-footer.pug  |  2 --
 .../web/frontend/extracted-translations.json  |  1 -
 .../bootstrap-5/footer/fat-footer.tsx         |  1 -
 services/web/locales/en.json                  |  2 --
 6 files changed, 35 deletions(-)

diff --git a/services/web/app/views/_mixins/links.pug b/services/web/app/views/_mixins/links.pug
index a919cdd74e..16257ecb0f 100644
--- a/services/web/app/views/_mixins/links.pug
+++ b/services/web/app/views/_mixins/links.pug
@@ -1,25 +1,5 @@
 include ./material_symbol
 
-mixin linkAdvisors(linkText, linkClass, track)
-	//- To Do: verify path
-	- var gaCategory = track && track.category ? track.category : 'All'
-	- var gaAction = track && track.action ? track.action : null
-	- var gaLabel = track && track.label ? track.label : null
-	- var mb = track && track.mb ? 'true' : null
-	- var mbSegmentation = track && track.segmentation ? track.segmentation : null
-	- var trigger = track && track.trigger ? track.trigger : null
-	a(
-		href='/advisors'
-		class=linkClass ? linkClass : ''
-		event-tracking-ga=gaCategory
-		event-tracking=gaAction
-		event-tracking-label=gaLabel
-		event-tracking-trigger=trigger
-		event-tracking-mb=mb
-		event-segmentation=mbSegmentation
-	)
-		span #{linkText ? linkText : 'advisor programme'}
-
 mixin linkBenefits(linkText, linkClass)
 	a(
 		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/authors'
@@ -46,13 +26,6 @@ mixin linkDash(linkText, linkClass)
 	a(href='/project' class=linkClass ? linkClass : '')
 		| #{linkText ? linkText : 'project dashboard'}
 
-mixin linkEducation(linkText, linkClass)
-	a(
-		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/edu'
-		class=linkClass ? linkClass : ''
-	)
-		| #{linkText ? linkText : 'teaching toolkit'}
-
 mixin linkInvite(linkText, linkClass, track)
 	- var gaCategory = track && track.category ? track.category : 'All'
 	- var gaAction = track && track.action ? track.action : null
diff --git a/services/web/app/views/layout/fat-footer-website-redesign.pug b/services/web/app/views/layout/fat-footer-website-redesign.pug
index ba6286a296..d20eb14a2c 100644
--- a/services/web/app/views/layout/fat-footer-website-redesign.pug
+++ b/services/web/app/views/layout/fat-footer-website-redesign.pug
@@ -63,8 +63,6 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 				h2.footer-section-heading #{translate('get_involved')}
 
 				ul.list-unstyled
-					li
-						a(href='/for/community/advisors') #{translate('become_an_advisor')}
 					li
 						a(href='https://forms.gle/67PSpN1bLnjGCmPQ9') #{translate('let_us_know_what_you_think')}
 					if user
diff --git a/services/web/app/views/layout/fat-footer.pug b/services/web/app/views/layout/fat-footer.pug
index c7c19bd4a3..e5637a986f 100644
--- a/services/web/app/views/layout/fat-footer.pug
+++ b/services/web/app/views/layout/fat-footer.pug
@@ -63,8 +63,6 @@ footer.fat-footer.hidden-print
 				h2.footer-section-heading #{translate('get_involved')}
 
 				ul.list-unstyled
-					li
-						a(href='/for/community/advisors') #{translate('become_an_advisor')}
 					li
 						a(href='https://forms.gle/67PSpN1bLnjGCmPQ9') #{translate('let_us_know_what_you_think')}
 					if user
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index b404e428a5..123ff8e190 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -176,7 +176,6 @@
   "back_to_subscription": "",
   "back_to_your_projects": "",
   "basic_compile_time": "",
-  "become_an_advisor": "",
   "before_you_use_error_assistant": "",
   "beta_program_already_participating": "",
   "beta_program_benefits": "",
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx
index c290c1128c..790d6fe790 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx
@@ -67,7 +67,6 @@ function FatFooter() {
     {
       title: t('Get Involved'),
       links: [
-        { href: '/for/community/advisors', label: t('become_an_advisor') },
         {
           href: 'https://forms.gle/67PSpN1bLnjGCmPQ9',
           label: t('let_us_know_what_you_think'),
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index f48929be4b..2483ce14e5 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -226,7 +226,6 @@
   "basic": "Basic",
   "basic_compile_time": "Basic compile time",
   "basic_compile_timeout_on_fast_servers": "Basic compile timeout on fast servers",
-  "become_an_advisor": "Become an __appName__ advisor",
   "before_you_use_error_assistant": "Before you use Error Assist",
   "beta": "Beta",
   "beta_feature_badge": "Beta feature badge",
@@ -800,7 +799,6 @@
   "for_publishers": "For publishers",
   "for_small_teams_and_departments_who_want_to_write_collaborate": "For small teams and departments who want to write and collaborate easily in LaTeX.",
   "for_students": "For students",
-  "for_teaching": "For teaching",
   "for_teams_and_organizations_who_want_a_streamlined_sso_and_security": "For teams and organizations who want a streamlined sign-on process and our strongest cloud security.",
   "for_universities": "For universities",
   "forever": "forever",

From 99e580047ceee2868508a329be297f3e8a7af8c6 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:06:57 +0200
Subject: [PATCH 053/274] Improve green link colour contrast on the marketing
 pages (#26461)

* Fix visited link colour

* Udpdate green link colors for the marketing pages

* Use the semantic color variables

GitOrigin-RevId: c53240cbd6f3608031d6e98db8203fe7bb414a9b
---
 .../frontend/stylesheets/bootstrap-5/base/links.scss   |  4 ++--
 .../stylesheets/bootstrap-5/foundations/colors.scss    | 10 +++++-----
 .../stylesheets/bootstrap-5/pages/templates-v2.scss    |  4 ++--
 .../bootstrap-5/pages/website-redesign.scss            |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/base/links.scss b/services/web/frontend/stylesheets/bootstrap-5/base/links.scss
index dc20dea1d3..f4bcbc6408 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/base/links.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/base/links.scss
@@ -30,10 +30,10 @@ a {
   @include font-mono;
 
   font-weight: 500;
-  color: var(--green-50);
+  color: var(--link-web);
 
   &:hover {
-    color: var(--green-60);
+    color: var(--link-web-hover);
   }
 }
 
diff --git a/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss b/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss
index ac196b900e..8e5e9e8a78 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/foundations/colors.scss
@@ -90,8 +90,8 @@ $border-disabled: $neutral-20;
 $border-active: $blue-50;
 $border-danger: $red-50;
 $border-divider: $neutral-20;
-$link-web: $green-50;
-$link-web-hover: $green-60;
+$link-web: $green-60;
+$link-web-hover: $green-70;
 $link-web-visited: $green-60;
 $link-ui: $blue-50;
 $link-ui-hover: $blue-60;
@@ -203,9 +203,9 @@ $link-ui-visited-dark: $blue-40;
   --border-danger: var(--red-50);
   --border-divider: var(--neutral-20);
   --border-dark-divider: var(--neutral-70);
-  --link-web: var(--green-50);
-  --link-web-hover: var(--green-60);
-  --link-web-visited: var(--green-50);
+  --link-web: var(--green-60);
+  --link-web-hover: var(--green-70);
+  --link-web-visited: var(--green-60);
   --link-ui: var(--blue-50);
   --link-ui-hover: var(--blue-60);
   --link-ui-visited: var(--blue-60);
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
index a829bb80d5..15d885400c 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/templates-v2.scss
@@ -47,11 +47,11 @@
       text-decoration: none;
 
       &:visited {
-        color: var(--green-50);
+        color: var(--link-web-visited);
       }
 
       &:hover {
-        color: var(--green-60);
+        color: var(--link-web-hover);
       }
 
       &.active {
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
index 8164f1eedd..649e5d80a4 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
@@ -386,7 +386,7 @@
   }
 
   .inline-green-link {
-    color: var(--green-50);
+    color: var(--link-web);
     padding: 0;
     text-decoration: underline;
 
@@ -395,7 +395,7 @@
     text-decoration-skip-ink: none;
 
     &:hover {
-      color: var(--green-60);
+      color: var(--link-web-hover);
     }
 
     // TODO: this is copied directly from the `.less` file, migrate this to scss

From 1950585514efbe8e0f1d3923948a7dba5dfe62c1 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:07:41 +0200
Subject: [PATCH 054/274] Improve selectors to reduce flaky E2E tests (#26413)

* Use the leadingIcon prop instead of spacing

* Remove duplicated ID

* Make the alt text to be empty since image is decorative

* Make switcher input visually hidden

The switcher's input previously used 'pointer-events: none', which prevented proper interaction in the test. It replaces that hack.

* Add accessibilityLabel to the info icon that is actually a clickable link

* Use more specific selectors

* It should display

* Use more specific selectors

* Use more specific selectors

GitOrigin-RevId: a555d96cf972d06dd5432f44a23b02355cedcd94
---
 services/web/frontend/extracted-translations.json          | 1 +
 .../editor-left-menu/components/editor-left-menu.tsx       | 1 +
 .../file-tree-create/file-tree-modal-create-file-mode.tsx  | 4 +---
 .../history/components/change-list/change-list.tsx         | 4 +++-
 .../js/features/pdf-preview/components/pdf-js-viewer.tsx   | 7 ++++++-
 .../js/features/pdf-preview/components/pdf-logs-viewer.tsx | 1 +
 .../features/pdf-preview/components/pdf-preview-pane.tsx   | 2 +-
 .../project-list/components/modals/create-tag-modal.tsx    | 2 +-
 .../project-list/components/sidebar/sidebar-ds-nav.tsx     | 6 +++++-
 .../welcome-message-new/welcome-message-link.tsx           | 7 +------
 .../settings/components/emails/confirm-email-form.tsx      | 1 +
 .../stylesheets/bootstrap-5/pages/editor/toolbar.scss      | 4 +---
 services/web/locales/en.json                               | 1 +
 13 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 123ff8e190..cb1da29d7a 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1301,6 +1301,7 @@
   "project_files": "",
   "project_flagged_too_many_compiles": "",
   "project_has_too_many_files": "",
+  "project_history_list": "",
   "project_last_published_at": "",
   "project_layout_sharing_submission": "",
   "project_linked_to": "",
diff --git a/services/web/frontend/js/features/editor-left-menu/components/editor-left-menu.tsx b/services/web/frontend/js/features/editor-left-menu/components/editor-left-menu.tsx
index 40eed9e77e..183e4d1836 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/editor-left-menu.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/editor-left-menu.tsx
@@ -43,6 +43,7 @@ function EditorLeftMenu() {
             shown: leftMenuShown,
           })}
           id="left-menu"
+          data-testid="left-menu"
         >
           <LazyEditorLeftMenuWithErrorBoundary />
         </Offcanvas.Body>
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-mode.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-mode.tsx
index 40a3d7ba9e..eb7e0466f4 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-mode.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-mode.tsx
@@ -2,7 +2,6 @@ import classnames from 'classnames'
 import { useFileTreeActionable } from '../../contexts/file-tree-actionable'
 import * as eventTracking from '../../../../infrastructure/event-tracking'
 import OLButton from '@/features/ui/components/ol/ol-button'
-import MaterialIcon from '@/shared/components/material-icon'
 
 export default function FileTreeModalCreateFileMode({
   mode,
@@ -26,9 +25,8 @@ export default function FileTreeModalCreateFileMode({
         variant="link"
         onClick={handleClick}
         className="modal-new-file-mode"
+        leadingIcon={icon}
       >
-        <MaterialIcon type={icon} />
-        &nbsp;
         {label}
       </OLButton>
     </li>
diff --git a/services/web/frontend/js/features/history/components/change-list/change-list.tsx b/services/web/frontend/js/features/history/components/change-list/change-list.tsx
index f072d24a57..0078cc2916 100644
--- a/services/web/frontend/js/features/history/components/change-list/change-list.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/change-list.tsx
@@ -2,12 +2,14 @@ import ToggleSwitch from './toggle-switch'
 import AllHistoryList from './all-history-list'
 import LabelsList from './labels-list'
 import { useHistoryContext } from '../../context/history-context'
+import { useTranslation } from 'react-i18next'
 
 function ChangeList() {
   const { labelsOnly, setLabelsOnly } = useHistoryContext()
+  const { t } = useTranslation()
 
   return (
-    <aside className="change-list">
+    <aside className="change-list" aria-label={t('project_history_list')}>
       <div className="history-header history-toggle-switch-container">
         <ToggleSwitch labelsOnly={labelsOnly} setLabelsOnly={setLabelsOnly} />
       </div>
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx
index 9d0cfca638..4a098e67da 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx
@@ -497,7 +497,12 @@ function PdfJsViewer({ url, pdfFile }: PdfJsViewerProps) {
       onKeyDown={handleKeyDown}
       tabIndex={-1}
     >
-      <div className="pdfjs-viewer-inner" tabIndex={0} role="tabpanel">
+      <div
+        className="pdfjs-viewer-inner"
+        tabIndex={0}
+        role="tabpanel"
+        data-testid="pdfjs-viewer-inner"
+      >
         <div className="pdfViewer" />
       </div>
       {toolbarInfoLoaded && (
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
index f9fbcae42a..afd4401cbe 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
@@ -51,6 +51,7 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
       className={classnames('logs-pane', {
         hidden: !showLogs && !alwaysVisible && !loadingError,
       })}
+      data-testid="logs-pane"
     >
       <div className="logs-pane-content">
         {codeCheckFailed && <PdfCodeCheckFailedNotice />}
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx
index e063c20c76..82f2946d63 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-pane.tsx
@@ -40,7 +40,7 @@ function PdfPreviewPane() {
           {compileTimeout < 60 && <CompileTimeWarningUpgradePrompt />}
         </PdfPreviewMessages>
         <Suspense fallback={<FullSizeLoadingSpinner delay={500} />}>
-          <div className="pdf-viewer">
+          <div className="pdf-viewer" data-testid="pdf-viewer">
             <PdfViewer />
           </div>
         </Suspense>
diff --git a/services/web/frontend/js/features/project-list/components/modals/create-tag-modal.tsx b/services/web/frontend/js/features/project-list/components/modals/create-tag-modal.tsx
index 4133d8e07f..51d44865a9 100644
--- a/services/web/frontend/js/features/project-list/components/modals/create-tag-modal.tsx
+++ b/services/web/frontend/js/features/project-list/components/modals/create-tag-modal.tsx
@@ -85,7 +85,7 @@ export default function CreateTagModal({
       </OLModalHeader>
 
       <OLModalBody>
-        <OLForm id="create-tag-modal-form" onSubmit={handleSubmit}>
+        <OLForm onSubmit={handleSubmit}>
           <OLFormGroup controlId="create-tag-modal-form">
             <OLFormLabel>{t('new_tag_name')}</OLFormLabel>
             <OLFormControl
diff --git a/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx b/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
index eba033ea76..289fb5bbb0 100644
--- a/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
+++ b/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
@@ -49,7 +49,11 @@ function SidebarDsNav() {
         id="new-project-button-sidebar"
         className={scrolledDown ? 'show-shadow' : undefined}
       />
-      <div className="project-list-sidebar-scroll" ref={containerRef}>
+      <div
+        className="project-list-sidebar-scroll"
+        ref={containerRef}
+        data-testid="project-list-sidebar-scroll"
+      >
         <SidebarFilters />
         {showAddAffiliationWidget && <hr />}
         <AddAffiliation />
diff --git a/services/web/frontend/js/features/project-list/components/welcome-message-new/welcome-message-link.tsx b/services/web/frontend/js/features/project-list/components/welcome-message-new/welcome-message-link.tsx
index b5ec5c6cd2..179fb70b83 100644
--- a/services/web/frontend/js/features/project-list/components/welcome-message-new/welcome-message-link.tsx
+++ b/services/web/frontend/js/features/project-list/components/welcome-message-new/welcome-message-link.tsx
@@ -23,12 +23,7 @@ export default function WelcomeMessageLink({
         rel="noopener"
       >
         <p>{title}</p>
-        <img
-          className="welcome-message-card-img"
-          src={imgSrc}
-          alt={title}
-          aria-hidden="true"
-        />
+        <img className="welcome-message-card-img" src={imgSrc} alt="" />
       </a>
     </div>
   )
diff --git a/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx b/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx
index bf08b5dcfd..49b114d9c2 100644
--- a/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/confirm-email-form.tsx
@@ -182,6 +182,7 @@ export function ConfirmEmailForm({
       onSubmit={submitHandler}
       onInvalid={invalidFormHandler}
       className="confirm-email-form"
+      data-testid="confirm-email-form"
     >
       <div className="confirm-email-form-inner">
         {(feedback?.type === 'alert' || outerErrorDisplay) && (
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar.scss
index 7b3decc101..367d1b443c 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/toolbar.scss
@@ -435,9 +435,7 @@
 }
 
 .toggle-switch-input {
-  position: absolute;
-  opacity: 0;
-  pointer-events: none;
+  @include visually-hidden;
 }
 
 .toggle-switch-input:disabled + .toggle-switch-label {
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 2483ce14e5..8aa1abd506 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1720,6 +1720,7 @@
   "project_files": "Project files",
   "project_flagged_too_many_compiles": "This project has been flagged for compiling too often. The limit will be lifted shortly.",
   "project_has_too_many_files": "This project has reached the 2000 file limit",
+  "project_history_list": "Project history list",
   "project_last_published_at": "Your project was last published at",
   "project_layout_sharing_submission": "Project Layout, Sharing, and Submission",
   "project_linked_to": "This project is linked to",

From 6d7b13ac188750a6b0623d30334e1e0728b58f29 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Fri, 27 Jun 2025 09:16:38 +0100
Subject: [PATCH 055/274] Merge pull request #26349 from
 overleaf/rh-cio-dashboard-assignment

Assign customer.io split test on projects dashboard

GitOrigin-RevId: 78a21bce31262db15f9701abc0599b44b9023ad2
---
 .../Project/ProjectListController.mjs         | 47 +++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectListController.mjs b/services/web/app/src/Features/Project/ProjectListController.mjs
index 24e0ae44e8..2e1ca6a01a 100644
--- a/services/web/app/src/Features/Project/ProjectListController.mjs
+++ b/services/web/app/src/Features/Project/ProjectListController.mjs
@@ -29,6 +29,7 @@ import TutorialHandler from '../Tutorial/TutorialHandler.js'
 import SubscriptionHelper from '../Subscription/SubscriptionHelper.js'
 import PermissionsManager from '../Authorization/PermissionsManager.js'
 import SubscriptionLocator from '../Subscription/SubscriptionLocator.js'
+import AnalyticsManager from '../Analytics/AnalyticsManager.js'
 
 /**
  * @import { GetProjectsRequest, GetProjectsResponse, AllUsersProjects, MongoProject } from "./types"
@@ -423,14 +424,44 @@ async function projectListPage(req, res, next) {
     showAiAssistNotification = await _showAiAssistNotification(user)
   }
 
-  const customerIoEnabled =
-    await SplitTestHandler.promises.hasUserBeenAssignedToVariant(
-      req,
-      userId,
-      'customer-io-trial-conversion',
-      'enabled',
-      true
-    )
+  const affiliations = userAffiliations || []
+  const inEnterpriseCommons = affiliations.some(
+    affiliation => affiliation.institution?.enterpriseCommons
+  )
+
+  // customer.io: Premium nudge experiment
+  // Only do customer-io-trial-conversion assignment for users not in India/China and not in group/commons
+  let customerIoEnabled = false
+  if (!userIsMemberOfGroupSubscription && !inEnterpriseCommons) {
+    try {
+      const ip = req.ip
+      const { countryCode } = await GeoIpLookup.promises.getCurrencyCode(ip)
+      const excludedCountries = ['IN', 'CN']
+
+      if (!excludedCountries.includes(countryCode)) {
+        const cioAssignment =
+          await SplitTestHandler.promises.getAssignmentForUser(
+            userId,
+            'customer-io-trial-conversion'
+          )
+        if (cioAssignment.variant === 'enabled') {
+          customerIoEnabled = true
+          AnalyticsManager.setUserPropertyForUserInBackground(
+            userId,
+            'customer-io-integration',
+            true
+          )
+        }
+      }
+    } catch (err) {
+      logger.error(
+        { err },
+        'Error checking geo location for customer-io-trial-conversion'
+      )
+      // Fallback to not enabled if geoip fails
+      customerIoEnabled = false
+    }
+  }
 
   res.render('project/list-react', {
     title: 'your_projects',

From 04e026904f788ffacb908ee40107f6cbf6a0deb4 Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Fri, 27 Jun 2025 10:40:25 +0200
Subject: [PATCH 056/274] Hide reviewer options for community edition (#25944)

GitOrigin-RevId: 7eba3d193e3a0ab37006cb42dd945ba40703136f
---
 .../features/ide-redesign/components/rail.tsx |  5 +++-
 .../context/review-panel-providers.tsx        |  6 ++++
 .../components/add-collaborators.tsx          | 28 +++++++++++++------
 .../components/edit-member.tsx                | 24 ++++++++++------
 .../components/codemirror-editor.tsx          |  6 ++--
 .../components/toolbar/toolbar-items.tsx      | 18 +++++++-----
 .../review-panel/review-panel.spec.tsx        |  3 +-
 .../components/share-project-modal.test.jsx   |  2 ++
 8 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index f3c741155c..a32734c90f 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -52,6 +52,7 @@ import OldErrorPane from './error-logs/old-error-pane'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
 import { useSurveyUrl } from '../hooks/use-survey-url'
 import NewErrorLogsPromo from './error-logs/new-error-logs-promo'
+import { useProjectContext } from '@/shared/context/project-context'
 
 type RailElement = {
   icon: AvailableUnfilledIcon
@@ -111,6 +112,7 @@ export const RailLayout = () => {
     setResizing,
   } = useRailContext()
   const { logEntries } = useCompileContext()
+  const { features } = useProjectContext()
   const errorLogsDisabled = !logEntries
 
   const errorsTabRef = useRef<HTMLAnchorElement>(null)
@@ -149,6 +151,7 @@ export const RailLayout = () => {
         icon: 'rate_review',
         title: t('review_panel'),
         component: null,
+        hide: !features.trackChangesVisible,
       },
       {
         key: 'chat',
@@ -167,7 +170,7 @@ export const RailLayout = () => {
         disabled: errorLogsDisabled,
       },
     ],
-    [t, errorLogsDisabled, newErrorlogs]
+    [t, features.trackChangesVisible, newErrorlogs, errorLogsDisabled]
   )
 
   const railActions: RailAction[] = useMemo(
diff --git a/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx b/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx
index 20e157dfee..ad943772d0 100644
--- a/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx
@@ -4,10 +4,16 @@ import { ChangesUsersProvider } from './changes-users-context'
 import { TrackChangesStateProvider } from './track-changes-state-context'
 import { ThreadsProvider } from './threads-context'
 import { ReviewPanelViewProvider } from './review-panel-view-context'
+import { useProjectContext } from '@/shared/context/project-context'
 
 export const ReviewPanelProviders: FC<React.PropsWithChildren> = ({
   children,
 }) => {
+  const { features } = useProjectContext()
+  if (!features.trackChangesVisible) {
+    return children
+  }
+
   return (
     <ReviewPanelViewProvider>
       <ChangesUsersProvider>
diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
index 8606fb11fa..e80fb03711 100644
--- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
@@ -176,24 +176,34 @@ export default function AddCollaborators({ readOnly }: { readOnly?: boolean }) {
   ])
 
   const privilegeOptions = useMemo(() => {
-    return [
+    const options: {
+      key: string
+      label: string
+      description?: string | null
+    }[] = [
       {
         key: 'readAndWrite',
         label: t('editor'),
       },
-      {
+    ]
+
+    if (features.trackChangesVisible) {
+      options.push({
         key: 'review',
         label: t('reviewer'),
         description: !features.trackChanges
           ? t('comment_only_upgrade_for_track_changes')
           : null,
-      },
-      {
-        key: 'readOnly',
-        label: t('viewer'),
-      },
-    ]
-  }, [features.trackChanges, t])
+      })
+    }
+
+    options.push({
+      key: 'readOnly',
+      label: t('viewer'),
+    })
+
+    return options
+  }, [features.trackChanges, features.trackChangesVisible, t])
 
   return (
     <OLForm className="add-collabs">
diff --git a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
index 6d806968b1..9f24cddc4a 100644
--- a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
@@ -244,14 +244,22 @@ function SelectPrivilege({
   const { features } = useProjectContext()
 
   const privileges = useMemo(
-    (): Privilege[] => [
-      { key: 'owner', label: t('make_owner') },
-      { key: 'readAndWrite', label: t('editor') },
-      { key: 'review', label: t('reviewer') },
-      { key: 'readOnly', label: t('viewer') },
-      { key: 'removeAccess', label: t('remove_access') },
-    ],
-    [t]
+    (): Privilege[] =>
+      features.trackChangesVisible
+        ? [
+            { key: 'owner', label: t('make_owner') },
+            { key: 'readAndWrite', label: t('editor') },
+            { key: 'review', label: t('reviewer') },
+            { key: 'readOnly', label: t('viewer') },
+            { key: 'removeAccess', label: t('remove_access') },
+          ]
+        : [
+            { key: 'owner', label: t('make_owner') },
+            { key: 'readAndWrite', label: t('editor') },
+            { key: 'readOnly', label: t('viewer') },
+            { key: 'removeAccess', label: t('remove_access') },
+          ],
+    [features.trackChangesVisible, t]
   )
 
   const downgradedPseudoPrivilege: Privilege = {
diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
index c1808cbb30..4bdfe2682c 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
@@ -18,6 +18,7 @@ import {
 } from './codemirror-context'
 import MathPreviewTooltip from './math-preview-tooltip'
 import { useToolbarMenuBarEditorCommands } from '@/features/ide-redesign/hooks/use-toolbar-menu-editor-commands'
+import { useProjectContext } from '@/shared/context/project-context'
 
 // TODO: remove this when definitely no longer used
 export * from './codemirror-context'
@@ -67,6 +68,7 @@ function CodeMirrorEditor() {
 
 function CodeMirrorEditorComponents() {
   useToolbarMenuBarEditorCommands()
+  const { features } = useProjectContext()
 
   return (
     <ReviewPanelProviders>
@@ -83,8 +85,8 @@ function CodeMirrorEditorComponents() {
       <CodeMirrorCommandTooltip />
 
       <MathPreviewTooltip />
-      <ReviewTooltipMenu />
-      <ReviewPanelNew />
+      {features.trackChangesVisible && <ReviewTooltipMenu />}
+      {features.trackChangesVisible && <ReviewPanelNew />}
 
       {sourceEditorComponents.map(
         ({ import: { default: Component }, path }) => (
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
index e70663683f..c5d9f3d3e4 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
@@ -14,6 +14,7 @@ import { LegacyTableDropdown } from './table-inserter-dropdown-legacy'
 import { withinFormattingCommand } from '@/features/source-editor/utils/tree-operations/formatting'
 import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 import { isMac } from '@/shared/utils/os'
+import { useProjectContext } from '@/shared/context/project-context'
 
 export const ToolbarItems: FC<{
   state: EditorState
@@ -31,6 +32,7 @@ export const ToolbarItems: FC<{
   const { t } = useTranslation()
   const { toggleSymbolPalette, showSymbolPalette, writefullInstance } =
     useEditorContext()
+  const { features } = useProjectContext()
   const isActive = withinFormattingCommand(state)
 
   const symbolPaletteAvailable = getMeta('ol-symbolPaletteAvailable')
@@ -127,13 +129,15 @@ export const ToolbarItems: FC<{
                 command={commands.wrapInHref}
                 icon="add_link"
               />
-              <ToolbarButton
-                id="toolbar-add-comment"
-                label={t('add_comment')}
-                disabled={state.selection.main.empty}
-                command={commands.addComment}
-                icon="add_comment"
-              />
+              {features.trackChangesVisible && (
+                <ToolbarButton
+                  id="toolbar-add-comment"
+                  label={t('add_comment')}
+                  disabled={state.selection.main.empty}
+                  command={commands.addComment}
+                  icon="add_comment"
+                />
+              )}
               <ToolbarButton
                 id="toolbar-ref"
                 label={t('toolbar_insert_cross_reference')}
diff --git a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
index d667787810..58ac3e443d 100644
--- a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
+++ b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
@@ -181,6 +181,7 @@ describe('<ReviewPanel />', function () {
           removeChangeIds,
         },
       },
+      projectFeatures: { trackChangesVisible: true },
     })
 
     cy.wrap(scope).as('scope')
@@ -626,7 +627,7 @@ describe('<ReviewPanel /> for free users', function () {
   function mountEditor(ownerId = USER_ID) {
     const scope = mockScope(undefined, {
       permissions: { write: true, trackedWrite: false, comment: true },
-      projectFeatures: { trackChanges: false },
+      projectFeatures: { trackChanges: false, trackChangesVisible: true },
       projectOwner: {
         _id: ownerId,
       },
diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
index b86207fb0f..dfce8134d1 100644
--- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
+++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
@@ -694,6 +694,7 @@ describe('<ShareProjectModal/>', function () {
           features: {
             collaborators: 0,
             compileGroup: 'standard',
+            trackChangesVisible: true,
           },
         },
       },
@@ -723,6 +724,7 @@ describe('<ShareProjectModal/>', function () {
           ...project,
           features: {
             collaborators: 1,
+            trackChangesVisible: true,
           },
           members: [
             {

From a38eefd2ab21ba35e339e6ec809f119e2e56b77a Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Fri, 27 Jun 2025 07:57:56 -0400
Subject: [PATCH 057/274] Merge pull request #26559 from
 overleaf/em-redis-buffer-delete

Delete project from redis buffer when expiring

GitOrigin-RevId: 66c48adc388a4a4e0b1b54b581dc945a38a41356
---
 .../history-v1/api/controllers/projects.js    | 15 +++++
 services/history-v1/storage/index.js          |  1 +
 .../test/acceptance/js/api/projects.test.js   | 62 ++++++++++++++++++-
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/services/history-v1/api/controllers/projects.js b/services/history-v1/api/controllers/projects.js
index 031833688c..a314e9a5ce 100644
--- a/services/history-v1/api/controllers/projects.js
+++ b/services/history-v1/api/controllers/projects.js
@@ -18,6 +18,8 @@ const {
   HashCheckBlobStore,
   ProjectArchive,
   zipStore,
+  persistBuffer,
+  redisBuffer,
 } = require('../../storage')
 
 const render = require('./render')
@@ -226,6 +228,19 @@ async function createZip(req, res, next) {
 async function deleteProject(req, res, next) {
   const projectId = req.swagger.params.project_id.value
   const blobStore = new BlobStore(projectId)
+
+  const farFuture = new Date()
+  farFuture.setTime(farFuture.getTime() + 7 * 24 * 3600 * 1000)
+  const limits = {
+    maxChanges: 0,
+    minChangeTimestamp: farFuture,
+    maxChangeTimestamp: farFuture,
+    autoResync: false,
+  }
+
+  await persistBuffer(projectId, limits)
+  await redisBuffer.expireProject(projectId)
+
   await Promise.all([
     chunkStore.deleteProjectChunks(projectId),
     blobStore.deleteBlobs(),
diff --git a/services/history-v1/storage/index.js b/services/history-v1/storage/index.js
index 82a51583be..6bc81f60e8 100644
--- a/services/history-v1/storage/index.js
+++ b/services/history-v1/storage/index.js
@@ -2,6 +2,7 @@ exports.BatchBlobStore = require('./lib/batch_blob_store')
 exports.blobHash = require('./lib/blob_hash')
 exports.HashCheckBlobStore = require('./lib/hash_check_blob_store')
 exports.chunkStore = require('./lib/chunk_store')
+exports.redisBuffer = require('./lib/chunk_store/redis')
 exports.historyStore = require('./lib/history_store').historyStore
 exports.knex = require('./lib/knex')
 exports.mongodb = require('./lib/mongodb')
diff --git a/services/history-v1/test/acceptance/js/api/projects.test.js b/services/history-v1/test/acceptance/js/api/projects.test.js
index 7654829516..22220ae8bd 100644
--- a/services/history-v1/test/acceptance/js/api/projects.test.js
+++ b/services/history-v1/test/acceptance/js/api/projects.test.js
@@ -10,7 +10,12 @@ const cleanup = require('../storage/support/cleanup')
 const fixtures = require('../storage/support/fixtures')
 const testFiles = require('../storage/support/test_files')
 
-const { zipStore, BlobStore, persistChanges } = require('../../../../storage')
+const {
+  zipStore,
+  BlobStore,
+  persistChanges,
+  redisBuffer,
+} = require('../../../../storage')
 
 const { expectHttpError } = require('./support/expect_response')
 const testServer = require('./support/test_server')
@@ -347,5 +352,60 @@ describe('project controller', function () {
       const response3 = await fetch(blobUrl, { headers: authHeaders })
       expect(response3.status).to.equal(HTTPStatus.NOT_FOUND)
     })
+
+    it('deletes the project from the redis buffer', async function () {
+      const projectId = await createEmptyProject()
+      const blobStore = new BlobStore(projectId)
+      const blob = await blobStore.putString('this is a test')
+      const snapshot = new Snapshot()
+      const change = new Change(
+        [new AddFileOperation('test.tex', File.createLazyFromBlobs(blob))],
+        new Date(),
+        []
+      )
+
+      await redisBuffer.queueChanges(projectId, snapshot, 0, [change])
+      const changesBefore = await redisBuffer.getNonPersistedChanges(
+        projectId,
+        0
+      )
+      expect(changesBefore.length).to.equal(1)
+
+      const deleteResponse =
+        await testServer.basicAuthClient.apis.Project.deleteProject({
+          project_id: projectId,
+        })
+      expect(deleteResponse.status).to.equal(HTTPStatus.NO_CONTENT)
+
+      const changesAfter = await redisBuffer.getNonPersistedChanges(
+        projectId,
+        0
+      )
+      expect(changesAfter.length).to.equal(0)
+
+      const finalState = await redisBuffer.getState(projectId)
+      expect(finalState).to.deep.equal({
+        changes: [],
+        expireTime: null,
+        headSnapshot: null,
+        headVersion: null,
+        persistTime: null,
+        persistedVersion: null,
+      })
+    })
+
+    it('deletes an empty project from the redis buffer', async function () {
+      const projectId = await createEmptyProject()
+      const deleteResponse =
+        await testServer.basicAuthClient.apis.Project.deleteProject({
+          project_id: projectId,
+        })
+      expect(deleteResponse.status).to.equal(HTTPStatus.NO_CONTENT)
+      const changesAfter = await redisBuffer.getNonPersistedChanges(
+        projectId,
+        0
+      )
+      expect(changesAfter.length).to.equal(0)
+    })
   })
 })

From 735cc2272fac9356001748226fc8a74b6fe20575 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Fri, 27 Jun 2025 07:58:05 -0400
Subject: [PATCH 058/274] Merge pull request #26505 from
 overleaf/em-persist-buffer-batch

Persist Redis buffer in batches

GitOrigin-RevId: 1de22807dae3554b3274ec103783b0868b1439d9
---
 .../storage/lib/chunk_store/redis.js          |  24 +-
 .../history-v1/storage/lib/persist_buffer.js  | 287 ++++++++++--------
 .../storage/chunk_store_redis_backend.test.js |  20 +-
 .../js/storage/persist_buffer.test.mjs        |  71 +++++
 4 files changed, 269 insertions(+), 133 deletions(-)

diff --git a/services/history-v1/storage/lib/chunk_store/redis.js b/services/history-v1/storage/lib/chunk_store/redis.js
index 59bfd81e39..a2317dd859 100644
--- a/services/history-v1/storage/lib/chunk_store/redis.js
+++ b/services/history-v1/storage/lib/chunk_store/redis.js
@@ -395,6 +395,7 @@ rclient.defineCommand('get_non_persisted_changes', {
     local persistedVersionKey = KEYS[2]
     local changesKey = KEYS[3]
     local baseVersion = tonumber(ARGV[1])
+    local maxChanges = tonumber(ARGV[2])
 
     -- Check if head version exists
     local headVersion = tonumber(redis.call('GET', headVersionKey))
@@ -415,9 +416,20 @@ rclient.defineCommand('get_non_persisted_changes', {
       return {'ok', {}}
     else
       local numChanges = headVersion - baseVersion
-      local changes = redis.call('LRANGE', changesKey, -numChanges, -1)
 
-      if #changes < numChanges then
+      local endIndex, expectedChanges
+      if maxChanges > 0 and maxChanges < numChanges then
+        -- return only the first maxChanges changes; the end index is inclusive
+        endIndex = -numChanges + maxChanges - 1
+        expectedChanges = maxChanges
+      else
+        endIndex = -1
+        expectedChanges = numChanges
+      end
+
+      local changes = redis.call('LRANGE', changesKey, -numChanges, endIndex)
+
+      if #changes < expectedChanges then
         -- We didn't get as many changes as we expected
         return {'out_of_bounds'}
       end
@@ -433,6 +445,9 @@ rclient.defineCommand('get_non_persisted_changes', {
  * @param {string} projectId - The unique identifier of the project.
  * @param {number} baseVersion - The version on top of which the changes should
  *        be applied.
+ * @param {object} [opts]
+ * @param {number} [opts.maxChanges] - The maximum number of changes to return.
+ *        Defaults to 0, meaning no limit.
  * @returns {Promise<Change[]>} Changes that can be applied on top of
  *          baseVersion. An empty array means that the project doesn't have
  *          changes to persist. A null value means that the non-persisted
@@ -440,14 +455,15 @@ rclient.defineCommand('get_non_persisted_changes', {
  *
  * @throws {Error} If Redis operations fail.
  */
-async function getNonPersistedChanges(projectId, baseVersion) {
+async function getNonPersistedChanges(projectId, baseVersion, opts = {}) {
   let result
   try {
     result = await rclient.get_non_persisted_changes(
       keySchema.headVersion({ projectId }),
       keySchema.persistedVersion({ projectId }),
       keySchema.changes({ projectId }),
-      baseVersion.toString()
+      baseVersion.toString(),
+      opts.maxChanges ?? 0
     )
   } catch (err) {
     metrics.inc('chunk_store.redis.get_non_persisted_changes', 1, {
diff --git a/services/history-v1/storage/lib/persist_buffer.js b/services/history-v1/storage/lib/persist_buffer.js
index d562388f87..68b71e148f 100644
--- a/services/history-v1/storage/lib/persist_buffer.js
+++ b/services/history-v1/storage/lib/persist_buffer.js
@@ -12,6 +12,8 @@ const persistChanges = require('./persist_changes')
 const resyncProject = require('./resync_project')
 const redisBackend = require('./chunk_store/redis')
 
+const PERSIST_BATCH_SIZE = 50
+
 /**
  * Persist the changes from Redis buffer to the main storage
  *
@@ -42,16 +44,147 @@ async function persistBuffer(projectId, limits) {
     endVersion = 0 // No chunks found, start from version 0
     logger.debug({ projectId }, 'no existing chunks found in main storage')
   }
+  const originalEndVersion = endVersion
 
   logger.debug({ projectId, endVersion }, 'got latest persisted chunk')
 
-  // 2. Get non-persisted changes from Redis
-  const changesToPersist = await redisBackend.getNonPersistedChanges(
-    projectId,
-    endVersion
-  )
+  // Process changes in batches
+  let numberOfChangesPersisted = 0
+  let currentChunk = null
+  let resyncNeeded = false
+  let resyncChangesWerePersisted = false
+  while (true) {
+    // 2. Get non-persisted changes from Redis
+    const changesToPersist = await redisBackend.getNonPersistedChanges(
+      projectId,
+      endVersion,
+      { maxChanges: PERSIST_BATCH_SIZE }
+    )
 
-  if (changesToPersist.length === 0) {
+    if (changesToPersist.length === 0) {
+      break
+    }
+
+    logger.debug(
+      {
+        projectId,
+        endVersion,
+        count: changesToPersist.length,
+      },
+      'found changes in Redis to persist'
+    )
+
+    // 4. Load file blobs for these Redis changes. Errors will propagate.
+    const blobStore = new BlobStore(projectId)
+    const batchBlobStore = new BatchBlobStore(blobStore)
+
+    const blobHashes = new Set()
+    for (const change of changesToPersist) {
+      change.findBlobHashes(blobHashes)
+    }
+    if (blobHashes.size > 0) {
+      await batchBlobStore.preload(Array.from(blobHashes))
+    }
+    for (const change of changesToPersist) {
+      await change.loadFiles('lazy', blobStore)
+    }
+
+    // 5. Run the persistChanges() algorithm. Errors will propagate.
+    logger.debug(
+      {
+        projectId,
+        endVersion,
+        changeCount: changesToPersist.length,
+      },
+      'calling persistChanges'
+    )
+
+    const persistResult = await persistChanges(
+      projectId,
+      changesToPersist,
+      limits,
+      endVersion
+    )
+
+    if (!persistResult || !persistResult.currentChunk) {
+      metrics.inc('persist_buffer', 1, { status: 'no-chunk-error' })
+      throw new OError(
+        'persistChanges did not produce a new chunk for non-empty changes',
+        {
+          projectId,
+          endVersion,
+          changeCount: changesToPersist.length,
+        }
+      )
+    }
+
+    currentChunk = persistResult.currentChunk
+    const newEndVersion = currentChunk.getEndVersion()
+
+    if (newEndVersion <= endVersion) {
+      metrics.inc('persist_buffer', 1, { status: 'chunk-version-mismatch' })
+      throw new OError(
+        'persisted chunk endVersion must be greater than current persisted chunk end version for non-empty changes',
+        {
+          projectId,
+          newEndVersion,
+          endVersion,
+          changeCount: changesToPersist.length,
+        }
+      )
+    }
+
+    logger.debug(
+      {
+        projectId,
+        oldVersion: endVersion,
+        newVersion: newEndVersion,
+      },
+      'successfully persisted changes from Redis to main storage'
+    )
+
+    // 6. Set the persisted version in Redis. Errors will propagate.
+    const status = await redisBackend.setPersistedVersion(
+      projectId,
+      newEndVersion
+    )
+
+    if (status !== 'ok') {
+      metrics.inc('persist_buffer', 1, { status: 'error-on-persisted-version' })
+      throw new OError('failed to update persisted version in Redis', {
+        projectId,
+        newEndVersion,
+        status,
+      })
+    }
+
+    logger.debug(
+      { projectId, newEndVersion },
+      'updated persisted version in Redis'
+    )
+    numberOfChangesPersisted += persistResult.numberOfChangesPersisted
+    endVersion = newEndVersion
+
+    // Check if a resync might be needed
+    if (persistResult.resyncNeeded) {
+      resyncNeeded = true
+    }
+
+    if (
+      changesToPersist.some(
+        change => change.getOrigin()?.getKind() === 'history-resync'
+      )
+    ) {
+      resyncChangesWerePersisted = true
+    }
+
+    if (persistResult.numberOfChangesPersisted < PERSIST_BATCH_SIZE) {
+      // We reached the end of available changes
+      break
+    }
+  }
+
+  if (numberOfChangesPersisted === 0) {
     logger.debug(
       { projectId, endVersion },
       'no new changes in Redis buffer to persist'
@@ -61,124 +194,16 @@ async function persistBuffer(projectId, limits) {
     // to match the current endVersion.  This shouldn't be needed
     // unless a worker failed to update the persisted version.
     await redisBackend.setPersistedVersion(projectId, endVersion)
-    const { chunk } = await chunkStore.loadByChunkRecord(
-      projectId,
-      latestChunkMetadata
+  } else {
+    logger.debug(
+      { projectId, finalPersistedVersion: endVersion },
+      'persistBuffer operation completed successfully'
     )
-    // Return the result in the same format as persistChanges
-    // so that the caller can handle it uniformly.
-    return {
-      numberOfChangesPersisted: changesToPersist.length,
-      originalEndVersion: endVersion,
-      currentChunk: chunk,
-    }
+    metrics.inc('persist_buffer', 1, { status: 'persisted' })
   }
 
-  logger.debug(
-    {
-      projectId,
-      endVersion,
-      count: changesToPersist.length,
-    },
-    'found changes in Redis to persist'
-  )
-
-  // 4. Load file blobs for these Redis changes. Errors will propagate.
-  const blobStore = new BlobStore(projectId)
-  const batchBlobStore = new BatchBlobStore(blobStore)
-
-  const blobHashes = new Set()
-  for (const change of changesToPersist) {
-    change.findBlobHashes(blobHashes)
-  }
-  if (blobHashes.size > 0) {
-    await batchBlobStore.preload(Array.from(blobHashes))
-  }
-  for (const change of changesToPersist) {
-    await change.loadFiles('lazy', blobStore)
-  }
-
-  // 5. Run the persistChanges() algorithm. Errors will propagate.
-  logger.debug(
-    {
-      projectId,
-      endVersion,
-      changeCount: changesToPersist.length,
-    },
-    'calling persistChanges'
-  )
-
-  const persistResult = await persistChanges(
-    projectId,
-    changesToPersist,
-    limits,
-    endVersion
-  )
-
-  if (!persistResult || !persistResult.currentChunk) {
-    metrics.inc('persist_buffer', 1, { status: 'no-chunk-error' })
-    throw new OError(
-      'persistChanges did not produce a new chunk for non-empty changes',
-      {
-        projectId,
-        endVersion,
-        changeCount: changesToPersist.length,
-      }
-    )
-  }
-
-  const newPersistedChunk = persistResult.currentChunk
-  const newEndVersion = newPersistedChunk.getEndVersion()
-
-  if (newEndVersion <= endVersion) {
-    metrics.inc('persist_buffer', 1, { status: 'chunk-version-mismatch' })
-    throw new OError(
-      'persisted chunk endVersion must be greater than current persisted chunk end version for non-empty changes',
-      {
-        projectId,
-        newEndVersion,
-        endVersion,
-        changeCount: changesToPersist.length,
-      }
-    )
-  }
-
-  logger.debug(
-    {
-      projectId,
-      oldVersion: endVersion,
-      newVersion: newEndVersion,
-    },
-    'successfully persisted changes from Redis to main storage'
-  )
-
-  // 6. Set the persisted version in Redis. Errors will propagate.
-  const status = await redisBackend.setPersistedVersion(
-    projectId,
-    newEndVersion
-  )
-
-  if (status !== 'ok') {
-    metrics.inc('persist_buffer', 1, { status: 'error-on-persisted-version' })
-    throw new OError('failed to update persisted version in Redis', {
-      projectId,
-      newEndVersion,
-      status,
-    })
-  }
-
-  logger.debug(
-    { projectId, newEndVersion },
-    'updated persisted version in Redis'
-  )
-
-  // 7. Resync the project if content hash validation failed
-  if (limits.autoResync && persistResult.resyncNeeded) {
-    if (
-      changesToPersist.some(
-        change => change.getOrigin()?.getKind() === 'history-resync'
-      )
-    ) {
+  if (limits.autoResync && resyncNeeded) {
+    if (resyncChangesWerePersisted) {
       // To avoid an infinite loop, do not resync if the current batch of
       // changes contains a history resync.
       logger.warn(
@@ -193,14 +218,20 @@ async function persistBuffer(projectId, limits) {
     }
   }
 
-  logger.debug(
-    { projectId, finalPersistedVersion: newEndVersion },
-    'persistBuffer operation completed successfully'
-  )
+  if (currentChunk == null) {
+    const { chunk } = await chunkStore.loadByChunkRecord(
+      projectId,
+      latestChunkMetadata
+    )
+    currentChunk = chunk
+  }
 
-  metrics.inc('persist_buffer', 1, { status: 'persisted' })
-
-  return persistResult
+  return {
+    numberOfChangesPersisted,
+    originalEndVersion,
+    currentChunk,
+    resyncNeeded,
+  }
 }
 
 module.exports = persistBuffer
diff --git a/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js b/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
index d34cd701d0..8abe7299a0 100644
--- a/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
+++ b/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
@@ -541,7 +541,7 @@ describe('chunk buffer Redis backend', function () {
         expect(nonPersistedChanges).to.deep.equal(changes)
       })
 
-      it('should return part of the changes if requested', async function () {
+      it('should return part of the changes following a given base version if requested', async function () {
         const nonPersistedChanges = await redisBackend.getNonPersistedChanges(
           projectId,
           3
@@ -549,6 +549,24 @@ describe('chunk buffer Redis backend', function () {
         expect(nonPersistedChanges).to.deep.equal(changes.slice(1))
       })
 
+      it('should limit the number of changes returned if requested', async function () {
+        const nonPersistedChanges = await redisBackend.getNonPersistedChanges(
+          projectId,
+          2,
+          { maxChanges: 2 }
+        )
+        expect(nonPersistedChanges).to.deep.equal(changes.slice(0, 2))
+      })
+
+      it('should return all changes if limit is not reached', async function () {
+        const nonPersistedChanges = await redisBackend.getNonPersistedChanges(
+          projectId,
+          3,
+          { maxChanges: 10 }
+        )
+        expect(nonPersistedChanges).to.deep.equal(changes.slice(1))
+      })
+
       it('should error if the base version requested is too low', async function () {
         await expect(
           redisBackend.getNonPersistedChanges(projectId, 0)
diff --git a/services/history-v1/test/acceptance/js/storage/persist_buffer.test.mjs b/services/history-v1/test/acceptance/js/storage/persist_buffer.test.mjs
index 138a70e626..64eb4efcb1 100644
--- a/services/history-v1/test/acceptance/js/storage/persist_buffer.test.mjs
+++ b/services/history-v1/test/acceptance/js/storage/persist_buffer.test.mjs
@@ -12,6 +12,7 @@ import {
 } from 'overleaf-editor-core'
 import persistBuffer from '../../../../storage/lib/persist_buffer.js'
 import chunkStore from '../../../../storage/lib/chunk_store/index.js'
+import { BlobStore } from '../../../../storage/lib/blob_store/index.js'
 import redisBackend from '../../../../storage/lib/chunk_store/redis.js'
 import persistChanges from '../../../../storage/lib/persist_changes.js'
 import cleanup from './support/cleanup.js'
@@ -22,6 +23,7 @@ describe('persistBuffer', function () {
   let projectId
   const initialVersion = 0
   let limitsToPersistImmediately
+  let blobStore
 
   before(function () {
     const farFuture = new Date()
@@ -39,6 +41,7 @@ describe('persistBuffer', function () {
   beforeEach(async function () {
     projectId = fixtures.docs.uninitializedProject.id
     await chunkStore.initializeProject(projectId)
+    blobStore = new BlobStore(projectId)
   })
 
   describe('with an empty initial chunk (new project)', function () {
@@ -340,6 +343,7 @@ describe('persistBuffer', function () {
         numberOfChangesPersisted: 0,
         originalEndVersion: persistedChunkEndVersion,
         currentChunk,
+        resyncNeeded: false,
       })
 
       const chunksAfter = await chunkStore.getProjectChunks(projectId)
@@ -389,6 +393,7 @@ describe('persistBuffer', function () {
         numberOfChangesPersisted: 0,
         originalEndVersion: persistedChunkEndVersion,
         currentChunk,
+        resyncNeeded: false,
       })
 
       const chunksAfter = await chunkStore.getProjectChunks(projectId)
@@ -516,4 +521,70 @@ describe('persistBuffer', function () {
       expect(nonPersisted).to.deep.equal([change3])
     })
   })
+
+  describe('with lots of changes to persist', function () {
+    it('should persist all changes', async function () {
+      const changes = []
+      // Create an initial file with some content
+      const blob = await blobStore.putString('')
+      changes.push(
+        new Change(
+          [new AddFileOperation('main.tex', File.createLazyFromBlobs(blob))],
+          new Date(),
+          []
+        )
+      )
+
+      for (let i = 0; i < 500; i++) {
+        const op = new TextOperation().retain(i).insert('x')
+        changes.push(
+          new Change([new EditFileOperation('main.tex', op)], new Date())
+        )
+      }
+
+      const now = Date.now()
+      await redisBackend.queueChanges(
+        projectId,
+        new Snapshot(), // dummy snapshot
+        0, // startVersion for queued changes
+        changes,
+        {
+          persistTime: now + redisBackend.MAX_PERSIST_DELAY_MS,
+          expireTime: now + redisBackend.PROJECT_TTL_MS,
+        }
+      )
+
+      const expectedEndVersion = 501
+      const persistResult = await persistBuffer(
+        projectId,
+        limitsToPersistImmediately
+      )
+      expect(persistResult.numberOfChangesPersisted).to.equal(
+        expectedEndVersion
+      )
+      expect(persistResult.originalEndVersion).to.equal(0)
+      expect(persistResult.resyncNeeded).to.be.false
+
+      // Check the latest persisted chunk
+      const latestChunk = await chunkStore.loadLatest(projectId, {
+        persistedOnly: true,
+      })
+      expect(latestChunk).to.exist
+      expect(latestChunk.getEndVersion()).to.equal(expectedEndVersion)
+
+      // Check that chunk returned by persistBuffer matches the latest chunk
+      expect(persistResult.currentChunk).to.deep.equal(latestChunk)
+
+      // Check persisted version in Redis
+      const state = await redisBackend.getState(projectId)
+      expect(state.persistedVersion).to.equal(expectedEndVersion)
+
+      // Check non-persisted changes in Redis
+      const nonPersisted = await redisBackend.getNonPersistedChanges(
+        projectId,
+        expectedEndVersion
+      )
+      expect(nonPersisted).to.deep.equal([])
+    })
+  })
 })

From 00d5d879c59b31f5baf3b2636296ed7a978cd6ea Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Mon, 30 Jun 2025 09:58:08 +0200
Subject: [PATCH 059/274] [web] Add third-party tracking Propensity (#26638)

* Rename `suppressGoogleAnalytics` to `suppressAnalytics`

* Add Propensity script

* Add LinkedIn Insight Tag script

* Version the cookie to prevent adding unconsented tracking

* Move tracking loaders to Typescript, insert them in foot_scripts.pug

* Show the cookie-banner when tracking other than GA is set

* Revert `oa` cookie versioning

* Remove `async` from propensity script

* Use shared tracking loader for Hotjar, LinkedIn, and Propensity

* Reusable `insertScript`

* Remove tracking-linkedin

* Test the scripts by adding fake ids

* Revert "Test the scripts by adding fake ids"

This reverts commit 50759bb6b40fd2684d1b967d83dd71e8517c3de9.

GitOrigin-RevId: 2a7b36bfc70ac1fc983f837dd4693a19a385cbc6
---
 .../app/src/infrastructure/ExpressLocals.js   |  1 +
 .../web/app/views/_mixins/foot_scripts.pug    | 10 ++++
 services/web/app/views/layout-base.pug        |  2 +-
 .../project/editor/socket_diagnostics.pug     |  2 +-
 .../app/views/user/compromised_password.pug   |  2 +-
 .../js/features/cookie-banner/index.js        |  3 +-
 .../web/frontend/js/infrastructure/hotjar.ts  | 39 +++----------
 .../js/infrastructure/tracking-loader.ts      | 55 +++++++++++++++++++
 .../js/infrastructure/tracking-propensity.ts  | 23 ++++++++
 .../frontend/js/infrastructure/tracking.ts    |  1 +
 services/web/types/exposed-settings.ts        |  1 +
 services/web/types/window.ts                  |  2 +
 services/web/webpack.config.js                |  1 +
 13 files changed, 106 insertions(+), 36 deletions(-)
 create mode 100644 services/web/frontend/js/infrastructure/tracking-loader.ts
 create mode 100644 services/web/frontend/js/infrastructure/tracking-propensity.ts
 create mode 100644 services/web/frontend/js/infrastructure/tracking.ts

diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index 34eda0ba2d..51c2c2186b 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -420,6 +420,7 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
         Settings.analytics &&
         Settings.analytics.ga &&
         Settings.analytics.ga.tokenV4,
+      propensityId: Settings?.analytics?.propensity?.id,
       cookieDomain: Settings.cookieDomain,
       templateLinks: Settings.templateLinks,
       labsEnabled: Settings.labs && Settings.labs.enable,
diff --git a/services/web/app/views/_mixins/foot_scripts.pug b/services/web/app/views/_mixins/foot_scripts.pug
index 717c46cdd9..07e154663e 100644
--- a/services/web/app/views/_mixins/foot_scripts.pug
+++ b/services/web/app/views/_mixins/foot_scripts.pug
@@ -1,6 +1,7 @@
 mixin foot-scripts
 	each file in entrypointScripts(entrypoint)
 		script(type='text/javascript' nonce=scriptNonce src=file defer=deferScripts)
+
 	if settings.devToolbar.enabled
 		each file in entrypointScripts('devToolbar')
 			script(
@@ -9,3 +10,12 @@ mixin foot-scripts
 				src=file
 				defer=deferScripts
 			)
+
+	if typeof suppressAnalytics == 'undefined'
+		each file in entrypointScripts('tracking')
+			script(
+				type='text/javascript'
+				nonce=scriptNonce
+				src=file
+				defer=deferScripts
+			)
diff --git a/services/web/app/views/layout-base.pug b/services/web/app/views/layout-base.pug
index b590618387..99fd4244f5 100644
--- a/services/web/app/views/layout-base.pug
+++ b/services/web/app/views/layout-base.pug
@@ -54,7 +54,7 @@ html(
 			)
 
 		//- Scripts
-		if typeof suppressGoogleAnalytics == 'undefined'
+		if typeof suppressAnalytics == 'undefined'
 			include _google_analytics
 
 		block meta
diff --git a/services/web/app/views/project/editor/socket_diagnostics.pug b/services/web/app/views/project/editor/socket_diagnostics.pug
index b288361e33..31bf763b65 100644
--- a/services/web/app/views/project/editor/socket_diagnostics.pug
+++ b/services/web/app/views/project/editor/socket_diagnostics.pug
@@ -3,7 +3,7 @@ extends ../../layout-react
 block vars
 	- var suppressNavbar = true
 	- var suppressFooter = true
-	- var suppressGoogleAnalytics = true
+	- var suppressAnalytics = true
 	- isWebsiteRedesign = 'true'
 		
 block entrypointVar
diff --git a/services/web/app/views/user/compromised_password.pug b/services/web/app/views/user/compromised_password.pug
index 48017b0ea7..ccf32fc757 100644
--- a/services/web/app/views/user/compromised_password.pug
+++ b/services/web/app/views/user/compromised_password.pug
@@ -3,7 +3,7 @@ extends ../layout-react
 block vars
 	- var suppressNavbar = true
 	- var suppressFooter = true
-	- var suppressGoogleAnalytics = true
+	- var suppressAnalytics = true
 
 block entrypointVar
 	- entrypoint = 'pages/compromised-password'
diff --git a/services/web/frontend/js/features/cookie-banner/index.js b/services/web/frontend/js/features/cookie-banner/index.js
index 20f62db8a5..4acb2a6a6c 100644
--- a/services/web/frontend/js/features/cookie-banner/index.js
+++ b/services/web/frontend/js/features/cookie-banner/index.js
@@ -29,7 +29,8 @@ function setConsent(value) {
 
 if (
   getMeta('ol-ExposedSettings').gaToken ||
-  getMeta('ol-ExposedSettings').gaTokenV4
+  getMeta('ol-ExposedSettings').gaTokenV4 ||
+  getMeta('ol-ExposedSettings').propensityId
 ) {
   document
     .querySelectorAll('[data-ol-cookie-banner-set-consent]')
diff --git a/services/web/frontend/js/infrastructure/hotjar.ts b/services/web/frontend/js/infrastructure/hotjar.ts
index 67051d088f..ea660e7faf 100644
--- a/services/web/frontend/js/infrastructure/hotjar.ts
+++ b/services/web/frontend/js/infrastructure/hotjar.ts
@@ -1,43 +1,18 @@
 import getMeta from '@/utils/meta'
 import { debugConsole } from '@/utils/debugging'
 import { initializeHotjar } from '@/infrastructure/hotjar-snippet'
+import { createTrackingLoader } from '@/infrastructure/tracking-loader'
 
 const { hotjarId, hotjarVersion } = getMeta('ol-ExposedSettings')
 const shouldLoadHotjar = getMeta('ol-shouldLoadHotjar')
 
-let hotjarInitialized = false
-
 if (hotjarId && hotjarVersion && shouldLoadHotjar) {
-  const loadHotjar = () => {
-    // consent needed
-    if (!document.cookie.split('; ').some(item => item === 'oa=1')) {
-      return
-    }
-
-    if (!/^\d+$/.test(hotjarId) || !/^\d+$/.test(hotjarVersion)) {
-      debugConsole.error('Invalid Hotjar id or version')
-      return
-    }
-
-    // avoid inserting twice
-    if (!hotjarInitialized) {
-      debugConsole.log('Loading Hotjar')
-      hotjarInitialized = true
-      initializeHotjar(hotjarId, hotjarVersion)
-    }
-  }
-
-  // load when idle, if supported
-  if (typeof window.requestIdleCallback === 'function') {
-    window.requestIdleCallback(loadHotjar)
+  if (!/^\d+$/.test(hotjarId) || !/^\d+$/.test(hotjarVersion)) {
+    debugConsole.error('Invalid Hotjar id or version')
   } else {
-    loadHotjar()
+    createTrackingLoader(
+      () => initializeHotjar(hotjarId, hotjarVersion),
+      'Hotjar'
+    )
   }
-
-  // listen for consent
-  window.addEventListener('cookie-consent', event => {
-    if ((event as CustomEvent<boolean>).detail) {
-      loadHotjar()
-    }
-  })
 }
diff --git a/services/web/frontend/js/infrastructure/tracking-loader.ts b/services/web/frontend/js/infrastructure/tracking-loader.ts
new file mode 100644
index 0000000000..c179fc2f86
--- /dev/null
+++ b/services/web/frontend/js/infrastructure/tracking-loader.ts
@@ -0,0 +1,55 @@
+import { debugConsole } from '@/utils/debugging'
+
+export const createTrackingLoader = (cb: () => void, name: string) => {
+  // avoid inserting twice
+  let initialized = false
+
+  const loadTracking = () => {
+    // consent needed
+    const consent = document.cookie.split('; ').some(item => item === 'oa=1')
+    if (initialized || !consent) {
+      return
+    }
+    debugConsole.log('Loading Analytics', name)
+    initialized = true
+    cb()
+  }
+
+  // load when idle, if supported
+  if (typeof window.requestIdleCallback === 'function') {
+    window.requestIdleCallback(loadTracking)
+  } else {
+    loadTracking()
+  }
+
+  // listen for consent
+  window.addEventListener('cookie-consent', event => {
+    if ((event as CustomEvent<boolean>).detail) {
+      loadTracking()
+    }
+  })
+}
+
+export const insertScript = (attr: {
+  src: string
+  crossorigin?: string
+  async?: boolean
+  onload?: () => void
+}) => {
+  const script = document.createElement('script')
+  script.setAttribute('src', attr.src)
+
+  if (attr.crossorigin) {
+    script.setAttribute('crossorigin', attr.crossorigin)
+  }
+
+  if (attr.async) {
+    script.setAttribute('async', 'async')
+  }
+
+  if (attr.onload) {
+    script.onload = attr.onload
+  }
+
+  document.querySelector('head')?.append(script)
+}
diff --git a/services/web/frontend/js/infrastructure/tracking-propensity.ts b/services/web/frontend/js/infrastructure/tracking-propensity.ts
new file mode 100644
index 0000000000..0392995140
--- /dev/null
+++ b/services/web/frontend/js/infrastructure/tracking-propensity.ts
@@ -0,0 +1,23 @@
+import getMeta from '@/utils/meta'
+import {
+  createTrackingLoader,
+  insertScript,
+} from '@/infrastructure/tracking-loader'
+
+const { propensityId } = getMeta('ol-ExposedSettings')
+
+if (propensityId) {
+  createTrackingLoader(() => loadPropensityScript(propensityId), 'Propensity')
+}
+
+const loadPropensityScript = (id: string) => {
+  insertScript({
+    src: 'https://cdn.propensity.com/propensity/propensity_analytics.js',
+    crossorigin: 'anonymous',
+    onload: () => {
+      if (typeof window.propensity !== 'undefined') {
+        window.propensity(id)
+      }
+    },
+  })
+}
diff --git a/services/web/frontend/js/infrastructure/tracking.ts b/services/web/frontend/js/infrastructure/tracking.ts
new file mode 100644
index 0000000000..ce26bd51a1
--- /dev/null
+++ b/services/web/frontend/js/infrastructure/tracking.ts
@@ -0,0 +1 @@
+import './tracking-propensity'
diff --git a/services/web/types/exposed-settings.ts b/services/web/types/exposed-settings.ts
index 9656441fa9..f9d929d13a 100644
--- a/services/web/types/exposed-settings.ts
+++ b/services/web/types/exposed-settings.ts
@@ -25,6 +25,7 @@ export type ExposedSettings = {
   isOverleaf: boolean
   maxEntitiesPerProject: number
   projectUploadTimeout: number
+  propensityId?: string
   maxUploadSize: number
   recaptchaDisabled: {
     invite: boolean
diff --git a/services/web/types/window.ts b/services/web/types/window.ts
index d2856e7179..5688faa9a4 100644
--- a/services/web/types/window.ts
+++ b/services/web/types/window.ts
@@ -25,5 +25,7 @@ declare global {
     }
     ga?: (...args: any) => void
     gtag?: (...args: any) => void
+
+    propensity?: (propensityId?: string) => void
   }
 }
diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js
index 4b8ec18113..94144eeea2 100644
--- a/services/web/webpack.config.js
+++ b/services/web/webpack.config.js
@@ -26,6 +26,7 @@ const entryPoints = {
   'main-light-style': './frontend/stylesheets/main-light-style.less',
   'main-style-bootstrap-5':
     './frontend/stylesheets/bootstrap-5/main-style.scss',
+  tracking: './frontend/js/infrastructure/tracking.ts',
 }
 
 // Add entrypoints for each "page"

From 3bdc8316e9421d97e0c781d5b70ab13ed9b4542d Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:58:33 +0200
Subject: [PATCH 060/274] Merge pull request #26639 from
 overleaf/kh-support-stripe-us

[web] support regional Stripe accounts

GitOrigin-RevId: d414d310d8db495635d8e0d3b057e3f56b2f044e
---
 .../Features/Subscription/PaymentProviderEntities.js   | 10 ++++++----
 .../web/app/src/Features/Subscription/RecurlyClient.js |  3 ++-
 services/web/types/stripe/region.ts                    |  1 +
 .../web/types/subscription/dashboard/subscription.ts   |  7 ++++++-
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 services/web/types/stripe/region.ts

diff --git a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
index 21bd504caf..4efecba0f5 100644
--- a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
+++ b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
@@ -2,6 +2,7 @@
 
 /**
  * @import { PaymentProvider } from '../../../../types/subscription/dashboard/subscription'
+ * @import { CurrencyCode, StripeCurrencyCode } from '../../../../types/subscription/currency'
  * @import { AddOn } from '../../../../types/subscription/plan'
  */
 
@@ -28,7 +29,8 @@ class PaymentProviderSubscription {
    * @param {number} props.subtotal
    * @param {number} [props.taxRate]
    * @param {number} [props.taxAmount]
-   * @param {string} props.currency
+   * // Recurly uses uppercase currency codes, but Stripe uses lowercase
+   * @param {CurrencyCode | StripeCurrencyCode} props.currency
    * @param {number} props.total
    * @param {Date} props.periodStart
    * @param {Date} props.periodEnd
@@ -54,7 +56,7 @@ class PaymentProviderSubscription {
     this.subtotal = props.subtotal
     this.taxRate = props.taxRate ?? 0
     this.taxAmount = props.taxAmount ?? 0
-    this.currency = props.currency
+    this.currency = props.currency.toUpperCase() // ensure that currency codes are always uppercase
     this.total = props.total
     this.periodStart = props.periodStart
     this.periodEnd = props.periodEnd
@@ -439,7 +441,7 @@ class PaymentProviderSubscriptionAddOnUpdate {
    */
   constructor(props) {
     this.code = props.code
-    this.quantity = props.quantity ?? null
+    this.quantity = props.quantity
     this.unitPrice = props.unitPrice ?? null
   }
 }
@@ -560,7 +562,7 @@ class PaymentProviderCoupon {
    * @param {object} props
    * @param {string} props.code
    * @param {string} props.name
-   * @param {string} props.description
+   * @param {string} [props.description]
    */
   constructor(props) {
     this.code = props.code
diff --git a/services/web/app/src/Features/Subscription/RecurlyClient.js b/services/web/app/src/Features/Subscription/RecurlyClient.js
index 25332a9c34..2031f50392 100644
--- a/services/web/app/src/Features/Subscription/RecurlyClient.js
+++ b/services/web/app/src/Features/Subscription/RecurlyClient.js
@@ -28,6 +28,7 @@ const RecurlyMetrics = require('./RecurlyMetrics')
  * @import { PaymentProviderSubscriptionChangeRequest } from './PaymentProviderEntities'
  * @import { PaymentProviderSubscriptionUpdateRequest } from './PaymentProviderEntities'
  * @import { PaymentMethod } from './types'
+ * @import { CurrencyCode } from '../../../../types/subscription/currency'
  */
 
 class RecurlyClientWithErrorHandling extends recurly.Client {
@@ -488,7 +489,7 @@ function subscriptionFromApi(apiSubscription) {
     taxRate: apiSubscription.taxInfo?.rate ?? 0,
     taxAmount: apiSubscription.tax ?? 0,
     total: apiSubscription.total,
-    currency: apiSubscription.currency,
+    currency: /** @type {CurrencyCode} */ (apiSubscription.currency),
     periodStart: apiSubscription.currentPeriodStartedAt,
     periodEnd: apiSubscription.currentPeriodEndsAt,
     collectionMethod: apiSubscription.collectionMethod,
diff --git a/services/web/types/stripe/region.ts b/services/web/types/stripe/region.ts
new file mode 100644
index 0000000000..b450afa761
--- /dev/null
+++ b/services/web/types/stripe/region.ts
@@ -0,0 +1 @@
+export type StripeRegion = 'us' | 'uk'
diff --git a/services/web/types/subscription/dashboard/subscription.ts b/services/web/types/subscription/dashboard/subscription.ts
index db17b25684..120ba16461 100644
--- a/services/web/types/subscription/dashboard/subscription.ts
+++ b/services/web/types/subscription/dashboard/subscription.ts
@@ -8,7 +8,12 @@ import {
 } from '../plan'
 import { User } from '../../user'
 
-export type SubscriptionState = 'active' | 'canceled' | 'expired' | 'paused'
+export type SubscriptionState =
+  | 'active'
+  | 'canceled'
+  | 'expired'
+  | 'paused'
+  | 'past_due'
 
 // when puchasing a new add-on in recurly, we only need to provide the code
 export type PurchasingAddOnCode = {

From f7a68cb50380c0733dc588314f6483451e36f7cf Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:59:00 +0200
Subject: [PATCH 061/274] Merge pull request #26641 from
 overleaf/kh-use-stripe-us-client

[web] use Stripe US client

GitOrigin-RevId: 9b99ba8c7ac900c528526cf7e18fec48761e0091
---
 services/web/types/subscription/dashboard/subscription.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/web/types/subscription/dashboard/subscription.ts b/services/web/types/subscription/dashboard/subscription.ts
index 120ba16461..694e5b948c 100644
--- a/services/web/types/subscription/dashboard/subscription.ts
+++ b/services/web/types/subscription/dashboard/subscription.ts
@@ -108,6 +108,10 @@ export type MemberGroupSubscription = Omit<GroupSubscription, 'admin_id'> & {
 }
 
 type PaymentProviderService = 'stripe-us' | 'stripe-uk' | 'recurly'
+export type StripePaymentProviderService = Exclude<
+  PaymentProviderService,
+  'recurly'
+>
 
 export type PaymentProvider = {
   service: PaymentProviderService

From ffb7f23dfdd02c0e8f92d4413aca1a3a3d371d4b Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:59:13 +0200
Subject: [PATCH 062/274] Merge pull request #26661 from
 overleaf/kh-support-3ds-for-stripe-us

[web] support 3DS for Stripe US

GitOrigin-RevId: b798b59601f3fb0df54afbcfb19434fbb0b38cdf
---
 services/web/app/views/subscriptions/dashboard-react.pug  | 1 -
 .../subscription/util/handle-stripe-payment-action.ts     | 8 +++-----
 services/web/frontend/js/utils/meta.ts                    | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/services/web/app/views/subscriptions/dashboard-react.pug b/services/web/app/views/subscriptions/dashboard-react.pug
index b253097d25..854f788b79 100644
--- a/services/web/app/views/subscriptions/dashboard-react.pug
+++ b/services/web/app/views/subscriptions/dashboard-react.pug
@@ -79,7 +79,6 @@ block append meta
 	meta(name='ol-user' data-type='json' content=user)
 	if personalSubscription && personalSubscription.payment
 		meta(name='ol-recurlyApiKey' content=settings.apis.recurly.publicKey)
-		meta(name='ol-stripeUKApiKey' content=settings.apis.stripeUK.publishableKey)
 		meta(
 			name='ol-recommendedCurrency'
 			content=personalSubscription.payment.currency
diff --git a/services/web/frontend/js/features/subscription/util/handle-stripe-payment-action.ts b/services/web/frontend/js/features/subscription/util/handle-stripe-payment-action.ts
index f533cba730..9912c39f89 100644
--- a/services/web/frontend/js/features/subscription/util/handle-stripe-payment-action.ts
+++ b/services/web/frontend/js/features/subscription/util/handle-stripe-payment-action.ts
@@ -1,16 +1,14 @@
 import { FetchError, postJSON } from '@/infrastructure/fetch-json'
-import getMeta from '../../../utils/meta'
 import { loadStripe } from '@stripe/stripe-js/pure'
 
 export default async function handleStripePaymentAction(
   error: FetchError
 ): Promise<{ handled: boolean }> {
   const clientSecret = error?.data?.clientSecret
+  const publicKey = error?.data?.publicKey
 
-  if (clientSecret) {
-    // TODO: support both US and UK Stripe accounts
-    const stripeUKPublicKey = getMeta('ol-stripeUKApiKey')
-    const stripe = await loadStripe(stripeUKPublicKey)
+  if (clientSecret && publicKey) {
+    const stripe = await loadStripe(publicKey)
     if (stripe) {
       const manualConfirmationFlow =
         await stripe.confirmCardPayment(clientSecret)
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 8c620d234e..69552f9b1a 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -248,7 +248,6 @@ export interface Meta {
   'ol-ssoDisabled': boolean
   'ol-ssoErrorMessage': string
   'ol-stripeCustomerId': string
-  'ol-stripeUKApiKey': string
   'ol-subscription': any // TODO: mixed types, split into two fields
   'ol-subscriptionChangePreview': SubscriptionChangePreview
   'ol-subscriptionId': string

From 8c8f4177d9edea93dd5bd70f2c7f3b73286db82c Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 20 Jun 2025 11:04:55 +0100
Subject: [PATCH 063/274] Remove unneeded overrides and pin remaining ones

GitOrigin-RevId: fff3a067728e313d0b3e7755c926e1eeba6562f6
---
 package.json | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index a51bbcd743..c51c35c9b8 100644
--- a/package.json
+++ b/package.json
@@ -26,20 +26,13 @@
     "typescript": "^5.5.4"
   },
   "overrides": {
-    "cross-env": {
+    "cross-env@4.0.0": {
       "cross-spawn": "^7.0.6"
     },
-    "fetch-mock": {
-      "path-to-regexp": "3.3.0"
-    },
-    "google-gax": {
-      "protobufjs": "^7.2.5"
-    },
-    "swagger-tools": {
-      "body-parser": "1.20.3",
-      "multer": "2.0.1",
+    "swagger-tools@0.10.4": {
       "path-to-regexp": "3.3.0",
-      "qs": "6.13.0"
+      "body-parser": "1.20.3",
+      "multer": "2.0.1"
     }
   },
   "scripts": {

From fe5d6ddf5cbceda9f628baef8b387f724b151bb9 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 20 Jun 2025 15:58:28 +0100
Subject: [PATCH 064/274] Upgrade cross-env

The breaking changes here are just for node version for the most part.
The one other breaking change has a workaround and shouldn't affect us
anyway.

GitOrigin-RevId: beb192a38cfc04f6b321e5ab44770a9a64110c30
---
 package-lock.json | 37 ++++++++++++++++++++-----------------
 package.json      |  3 ---
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c38221dd63..515c8b7d70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18541,22 +18541,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/cross-env": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-4.0.0.tgz",
-      "integrity": "sha512-dofkcyPqOy/AR14nbYSpk+TZ4IJZqg2as+/mQNkzh+7Xba2I1I1eyg/1G2dtSpD2LHjcEWwnGquiH2OP5LoeOw==",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^5.1.0",
-        "is-windows": "^1.0.0"
-      },
-      "bin": {
-        "cross-env": "dist/bin/cross-env.js"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/cross-fetch": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
@@ -26894,6 +26878,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -43514,7 +43499,7 @@
         "bootstrap": "^5.3.3",
         "compression": "^1.7.1",
         "cookie-parser": "^1.4.6",
-        "cross-env": "^4.0.0",
+        "cross-env": "^7.0.3",
         "es6-promise": "^4.2.8",
         "express": "^4.21.2",
         "express-basic-auth": "^1.2.0",
@@ -43903,6 +43888,24 @@
         "node": ">= 16"
       }
     },
+    "services/latexqc/node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
     "services/latexqc/node_modules/debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
diff --git a/package.json b/package.json
index c51c35c9b8..f637e464a0 100644
--- a/package.json
+++ b/package.json
@@ -26,9 +26,6 @@
     "typescript": "^5.5.4"
   },
   "overrides": {
-    "cross-env@4.0.0": {
-      "cross-spawn": "^7.0.6"
-    },
     "swagger-tools@0.10.4": {
       "path-to-regexp": "3.3.0",
       "body-parser": "1.20.3",

From 28c227157ec2c136defcff72da8ebd725b504074 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 30 Jun 2025 10:48:36 +0100
Subject: [PATCH 065/274] Merge pull request #26616 from
 overleaf/mj-tooltip-labs-disabled-nudge

[web] Add nudge tooltip to try redesigned editor again

GitOrigin-RevId: 1db104adeee2225f24dd76df141daf145b6ec582
---
 .../src/Features/Project/ProjectController.js |  1 +
 .../Features/Tutorial/TutorialController.mjs  |  1 +
 .../web/frontend/extracted-translations.json  |  2 +
 .../try-new-editor-button.tsx                 | 24 ++++++-
 .../error-logs/new-error-logs-promo.tsx       | 48 +++-----------
 .../ide-redesign/components/tooltip-promo.tsx | 66 +++++++++++++++++++
 services/web/locales/en.json                  |  2 +
 7 files changed, 103 insertions(+), 41 deletions(-)
 create mode 100644 services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 6744fb8d78..8104681b36 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -354,6 +354,7 @@ const _ProjectController = {
       'word-count-client',
       'editor-popup-ux-survey',
       'new-editor-error-logs-redesign',
+      'ide-redesign-experiment-nudge',
     ].filter(Boolean)
 
     const getUserValues = async userId =>
diff --git a/services/web/app/src/Features/Tutorial/TutorialController.mjs b/services/web/app/src/Features/Tutorial/TutorialController.mjs
index b4ab3f6727..4606f662bf 100644
--- a/services/web/app/src/Features/Tutorial/TutorialController.mjs
+++ b/services/web/app/src/Features/Tutorial/TutorialController.mjs
@@ -16,6 +16,7 @@ const VALID_KEYS = [
   'wf-features-moved',
   'review-mode',
   'new-error-logs-promo',
+  'try-redesign-again-nudge-promo',
 ]
 
 async function completeTutorial(req, res, next) {
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index cb1da29d7a..309ce4021b 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -442,6 +442,7 @@
   "doing_this_will_verify_affiliation_and_allow_log_in_2": "",
   "done": "",
   "dont_forget_you_currently_have": "",
+  "dont_miss_out_on_the_updated_editor": "",
   "dont_reload_or_close_this_tab": "",
   "double_clicking_on_the_pdf_shows": "",
   "download": "",
@@ -2081,6 +2082,7 @@
   "were_performing_maintenance": "",
   "were_redesigning_our_editor_to_make_it_easier_to_use": "",
   "were_reducing_compile_timeout": "",
+  "weve_been_making_changes_and_improvements_why_not_give_it_a_try": "",
   "what_did_you_find_most_helpful": "",
   "what_do_you_need_help_with": "",
   "what_does_this_mean": "",
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
index 6fc3bc80a3..8afe6104e1 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
@@ -1,12 +1,21 @@
-import { useCallback } from 'react'
+import { useCallback, useRef } from 'react'
 import OLButton from '../ui/components/ol/ol-button'
 import { useIdeRedesignSwitcherContext } from '../ide-react/context/ide-redesign-switcher-context'
 import MaterialIcon from '@/shared/components/material-icon'
 import { useTranslation } from 'react-i18next'
+import TooltipPromotion from '../ide-redesign/components/tooltip-promo'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
+
+const TUTORIAL_KEY = 'try-redesign-again-nudge-promo'
+const EVENT_DATA = { name: 'try-redesign-again-nudge-promotion' }
 
 const TryNewEditorButton = () => {
   const { t } = useTranslation()
   const { setShowSwitcherModal } = useIdeRedesignSwitcherContext()
+  const showNudge = useFeatureFlag('ide-redesign-experiment-nudge')
+
+  const switcherButtonRef = useRef(null)
+
   const onClick = useCallback(() => {
     setShowSwitcherModal(true)
   }, [setShowSwitcherModal])
@@ -18,9 +27,22 @@ const TryNewEditorButton = () => {
         size="sm"
         leadingIcon={<MaterialIcon type="experiment" unfilled />}
         variant="secondary"
+        ref={switcherButtonRef}
       >
         {t('try_the_new_editor')}
       </OLButton>
+      {showNudge && (
+        <TooltipPromotion
+          target={switcherButtonRef.current}
+          tutorialKey={TUTORIAL_KEY}
+          eventData={EVENT_DATA}
+          className="toolbar-experiment-tooltip"
+          header={t('dont_miss_out_on_the_updated_editor')}
+          content={t(
+            'weve_been_making_changes_and_improvements_why_not_give_it_a_try'
+          )}
+        />
+      )}
     </div>
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx
index 1589fa819d..144a1acdb9 100644
--- a/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx
@@ -1,9 +1,5 @@
-import Close from '@/shared/components/close'
-import { useEditorContext } from '@/shared/context/editor-context'
-import useTutorial from '@/shared/hooks/promotions/use-tutorial'
-import { useCallback, useEffect } from 'react'
-import { Overlay, Popover } from 'react-bootstrap'
 import { useTranslation } from 'react-i18next'
+import TooltipPromotion from '../tooltip-promo'
 
 const TUTORIAL_KEY = 'new-error-logs-promo'
 const EVENT_DATA = { name: 'new-error-logs-promotion' }
@@ -14,46 +10,18 @@ export default function NewErrorLogsPromo({
   target: HTMLElement | null
 }) {
   const { t } = useTranslation()
-
-  const { inactiveTutorials } = useEditorContext()
-  const { showPopup, tryShowingPopup, hideUntilReload, completeTutorial } =
-    useTutorial(TUTORIAL_KEY, EVENT_DATA)
-
-  useEffect(() => {
-    if (!inactiveTutorials.includes(TUTORIAL_KEY)) {
-      tryShowingPopup()
-    }
-  }, [tryShowingPopup, inactiveTutorials])
-
-  const onHide = useCallback(() => {
-    hideUntilReload()
-  }, [hideUntilReload])
-
-  const onClose = useCallback(() => {
-    completeTutorial({
-      action: 'complete',
-      event: 'promo-dismiss',
-    })
-  }, [completeTutorial])
-
   if (!target) {
     return null
   }
 
   return (
-    <Overlay
-      placement="right"
-      show={showPopup}
+    <TooltipPromotion
       target={target}
-      rootClose
-      onHide={onHide}
-    >
-      <Popover>
-        <Popover.Body className="new-error-logs-promo">
-          {t('error_logs_have_had_an_update')}
-          <Close variant="dark" onDismiss={onClose} />
-        </Popover.Body>
-      </Popover>
-    </Overlay>
+      tutorialKey={TUTORIAL_KEY}
+      eventData={EVENT_DATA}
+      className="new-error-logs-promo"
+      content={t('error_logs_have_had_an_update')}
+      placement="right"
+    />
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx b/services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx
new file mode 100644
index 0000000000..4359f42dd3
--- /dev/null
+++ b/services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx
@@ -0,0 +1,66 @@
+import Close from '@/shared/components/close'
+import { useEditorContext } from '@/shared/context/editor-context'
+import useTutorial from '@/shared/hooks/promotions/use-tutorial'
+import classNames from 'classnames'
+import { useCallback, useEffect } from 'react'
+import { Overlay, OverlayProps, Popover } from 'react-bootstrap'
+
+export default function TooltipPromotion({
+  target,
+  tutorialKey,
+  eventData,
+  className,
+  content,
+  header,
+  placement = 'bottom',
+}: {
+  target: HTMLElement | null
+  tutorialKey: string
+  eventData: Record<string, any>
+  className?: string
+  content: string
+  header?: string
+  placement?: OverlayProps['placement']
+}) {
+  const { inactiveTutorials } = useEditorContext()
+  const { showPopup, tryShowingPopup, hideUntilReload, dismissTutorial } =
+    useTutorial(tutorialKey, eventData)
+
+  useEffect(() => {
+    if (!inactiveTutorials.includes(tutorialKey)) {
+      tryShowingPopup()
+    }
+  }, [tryShowingPopup, inactiveTutorials, tutorialKey])
+
+  const onHide = useCallback(() => {
+    hideUntilReload()
+  }, [hideUntilReload])
+
+  if (!target) {
+    return null
+  }
+
+  return (
+    <Overlay
+      placement={placement}
+      show={showPopup}
+      target={target}
+      rootClose
+      onHide={onHide}
+    >
+      <Popover>
+        {header && (
+          <Popover.Header>
+            {header}
+            <Close variant="dark" onDismiss={dismissTutorial} />
+          </Popover.Header>
+        )}
+
+        <Popover.Body className={classNames(className)}>
+          {content}
+          {!header && <Close variant="dark" onDismiss={dismissTutorial} />}
+        </Popover.Body>
+      </Popover>
+    </Overlay>
+  )
+}
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 8aa1abd506..7e7d42c184 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -576,6 +576,7 @@
   "done": "Done",
   "dont_forget_you_currently_have": "Don’t forget, you currently have:",
   "dont_have_account": "Don’t have an account?",
+  "dont_miss_out_on_the_updated_editor": "Don’t miss out on the updated editor",
   "dont_reload_or_close_this_tab": "Don’t reload or close this tab.",
   "double_clicking_on_the_pdf_shows": "Double clicking on the PDF shows the corresponding location in code. Added word count (7 May 2025)",
   "download": "Download",
@@ -2633,6 +2634,7 @@
   "were_performing_maintenance": "We’re performing maintenance on Overleaf and you need to wait a moment. Sorry for any inconvenience. The editor will refresh automatically in __seconds__ seconds.",
   "were_redesigning_our_editor_to_make_it_easier_to_use": "We’re redesigning our editor to make it easier to use and ensure it’s future ready. Try it out and give us your feedback to help us get this right. (Some features are still in the works, so you can switch back at any time.)",
   "were_reducing_compile_timeout": "We’re in the process of <0>reducing the compile timeout limit</0> on our free plan, which may affect your project in future.",
+  "weve_been_making_changes_and_improvements_why_not_give_it_a_try": "We’ve been making changes and improvements. Why not give it a try?",
   "what_did_you_find_most_helpful": "What did you find most helpful?",
   "what_do_you_need": "What do you need?",
   "what_do_you_need_help_with": "What do you need help with?",

From 2a9d3bb168ac551153f3de8f09b8fe174a620139 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Mon, 30 Jun 2025 12:11:36 +0100
Subject: [PATCH 066/274] Merge pull request #26566 from
 overleaf/rh-cio-event-segmentation

Include customer.io segmentation in recurly/stripe subscription events

GitOrigin-RevId: 54483e17eec5251ac7871d43a3aa1e074dcfe98d
---
 .../Features/SplitTests/SplitTestHandler.js   |   8 +-
 .../Subscription/RecurlyEventHandler.js       |  18 +++
 .../Subscription/RecurlyEventHandlerTests.js  | 128 +++++++++++++++---
 3 files changed, 130 insertions(+), 24 deletions(-)

diff --git a/services/web/app/src/Features/SplitTests/SplitTestHandler.js b/services/web/app/src/Features/SplitTests/SplitTestHandler.js
index 5dcf00967b..4bd904fdd4 100644
--- a/services/web/app/src/Features/SplitTests/SplitTestHandler.js
+++ b/services/web/app/src/Features/SplitTests/SplitTestHandler.js
@@ -145,16 +145,12 @@ async function hasUserBeenAssignedToVariant(
   ignoreVersion = false
 ) {
   try {
-    const { session, query = {} } = req
+    const { session = {}, query = {} } = req
 
     const splitTest = await _getSplitTest(splitTestName)
     const currentVersion = SplitTestUtils.getCurrentVersion(splitTest)
 
-    if (
-      !userId ||
-      !SessionManager.isUserLoggedIn(session) ||
-      !currentVersion?.active
-    ) {
+    if (!userId || !currentVersion?.active) {
       return false
     }
 
diff --git a/services/web/app/src/Features/Subscription/RecurlyEventHandler.js b/services/web/app/src/Features/Subscription/RecurlyEventHandler.js
index e0d2531239..51314b4b31 100644
--- a/services/web/app/src/Features/Subscription/RecurlyEventHandler.js
+++ b/services/web/app/src/Features/Subscription/RecurlyEventHandler.js
@@ -12,6 +12,16 @@ async function sendRecurlyAnalyticsEvent(event, eventData) {
     return
   }
 
+  const customerIoEnabled =
+    await SplitTestHandler.promises.hasUserBeenAssignedToVariant(
+      {},
+      userId,
+      'customer-io-trial-conversion',
+      'enabled',
+      true
+    )
+  eventData['customerio-integration'] = customerIoEnabled || false
+
   switch (event) {
     case 'new_subscription_notification':
       await _sendSubscriptionStartedEvent(userId, eventData)
@@ -67,6 +77,7 @@ async function _sendSubscriptionResumedEvent(userId, eventData) {
       plan_code: planCode,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
@@ -89,6 +100,7 @@ async function _sendSubscriptionPausedEvent(userId, eventData) {
       plan_code: planCode,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
@@ -111,6 +123,7 @@ async function _sendSubscriptionStartedEvent(userId, eventData) {
       has_ai_add_on: hasAiAddOn,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
@@ -158,6 +171,7 @@ async function _sendSubscriptionUpdatedEvent(userId, eventData) {
       has_ai_add_on: hasAiAddOn,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
@@ -190,6 +204,7 @@ async function _sendSubscriptionCancelledEvent(userId, eventData) {
       has_ai_add_on: hasAiAddOn,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
@@ -217,6 +232,7 @@ async function _sendSubscriptionExpiredEvent(userId, eventData) {
       has_ai_add_on: hasAiAddOn,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
@@ -249,6 +265,7 @@ async function _sendSubscriptionRenewedEvent(userId, eventData) {
       has_ai_add_on: hasAiAddOn,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
@@ -280,6 +297,7 @@ async function _sendSubscriptionReactivatedEvent(userId, eventData) {
       has_ai_add_on: hasAiAddOn,
       subscriptionId,
       payment_provider: 'recurly',
+      'customerio-integration': eventData['customerio-integration'],
     }
   )
   AnalyticsManager.setUserPropertyForUserInBackground(
diff --git a/services/web/test/unit/src/Subscription/RecurlyEventHandlerTests.js b/services/web/test/unit/src/Subscription/RecurlyEventHandlerTests.js
index 2528f0a451..5620d0f106 100644
--- a/services/web/test/unit/src/Subscription/RecurlyEventHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/RecurlyEventHandlerTests.js
@@ -41,14 +41,15 @@ describe('RecurlyEventHandler', function () {
             getAssignmentForUser: sinon.stub().resolves({
               variant: 'default',
             }),
+            hasUserBeenAssignedToVariant: sinon.stub().resolves(false),
           },
         }),
       },
     })
   })
 
-  it('with new_subscription_notification - free trial', function () {
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+  it('with new_subscription_notification - free trial', async function () {
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'new_subscription_notification',
       this.eventData
     )
@@ -63,6 +64,48 @@ describe('RecurlyEventHandler', function () {
         has_ai_add_on: false,
         subscriptionId: this.eventData.subscription.uuid,
         payment_provider: 'recurly',
+        'customerio-integration': false,
+      }
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.setUserPropertyForUserInBackground,
+      this.userId,
+      'subscription-plan-code',
+      this.planCode
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.setUserPropertyForUserInBackground,
+      this.userId,
+      'subscription-state',
+      'active'
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.setUserPropertyForUserInBackground,
+      this.userId,
+      'subscription-is-trial',
+      true
+    )
+  })
+
+  it('with new_subscription_notification - free trial with customerio integration enabled', async function () {
+    this.SplitTestHandler.promises.hasUserBeenAssignedToVariant.resolves(true)
+
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+      'new_subscription_notification',
+      this.eventData
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.recordEventForUserInBackground,
+      this.userId,
+      'subscription-started',
+      {
+        plan_code: this.planCode,
+        quantity: 1,
+        is_trial: true,
+        has_ai_add_on: false,
+        subscriptionId: this.eventData.subscription.uuid,
+        payment_provider: 'recurly',
+        'customerio-integration': true,
       }
     )
     sinon.assert.calledWith(
@@ -94,7 +137,7 @@ describe('RecurlyEventHandler', function () {
     sinon.assert.called(this.SubscriptionEmailHandler.sendTrialOnboardingEmail)
   })
 
-  it('with new_subscription_notification - no free trial', function () {
+  it('with new_subscription_notification - no free trial', async function () {
     this.eventData.subscription.current_period_started_at = new Date(
       '2021-02-10 12:34:56'
     )
@@ -103,7 +146,7 @@ describe('RecurlyEventHandler', function () {
     )
     this.eventData.subscription.quantity = 3
 
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'new_subscription_notification',
       this.eventData
     )
@@ -118,6 +161,7 @@ describe('RecurlyEventHandler', function () {
         has_ai_add_on: false,
         subscriptionId: this.eventData.subscription.uuid,
         payment_provider: 'recurly',
+        'customerio-integration': false,
       }
     )
     sinon.assert.calledWith(
@@ -134,10 +178,10 @@ describe('RecurlyEventHandler', function () {
     )
   })
 
-  it('with updated_subscription_notification', function () {
+  it('with updated_subscription_notification', async function () {
     this.planCode = 'new-plan-code'
     this.eventData.subscription.plan.plan_code = this.planCode
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'updated_subscription_notification',
       this.eventData
     )
@@ -152,6 +196,50 @@ describe('RecurlyEventHandler', function () {
         has_ai_add_on: false,
         subscriptionId: this.eventData.subscription.uuid,
         payment_provider: 'recurly',
+        'customerio-integration': false,
+      }
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.setUserPropertyForUserInBackground,
+      this.userId,
+      'subscription-plan-code',
+      this.planCode
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.setUserPropertyForUserInBackground,
+      this.userId,
+      'subscription-state',
+      'active'
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.setUserPropertyForUserInBackground,
+      this.userId,
+      'subscription-is-trial',
+      true
+    )
+  })
+
+  it('with updated_subscription_notification with customerio integration enabled', async function () {
+    this.SplitTestHandler.promises.hasUserBeenAssignedToVariant.resolves(true)
+    this.planCode = 'new-plan-code'
+    this.eventData.subscription.plan.plan_code = this.planCode
+
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+      'updated_subscription_notification',
+      this.eventData
+    )
+    sinon.assert.calledWith(
+      this.AnalyticsManager.recordEventForUserInBackground,
+      this.userId,
+      'subscription-updated',
+      {
+        plan_code: this.planCode,
+        quantity: 1,
+        is_trial: true,
+        has_ai_add_on: false,
+        subscriptionId: this.eventData.subscription.uuid,
+        payment_provider: 'recurly',
+        'customerio-integration': true,
       }
     )
     sinon.assert.calledWith(
@@ -191,6 +279,7 @@ describe('RecurlyEventHandler', function () {
         has_ai_add_on: false,
         subscriptionId: this.eventData.subscription.uuid,
         payment_provider: 'recurly',
+        'customerio-integration': false,
       }
     )
     sinon.assert.calledWith(
@@ -207,9 +296,9 @@ describe('RecurlyEventHandler', function () {
     )
   })
 
-  it('with expired_subscription_notification', function () {
+  it('with expired_subscription_notification', async function () {
     this.eventData.subscription.state = 'expired'
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'expired_subscription_notification',
       this.eventData
     )
@@ -224,6 +313,7 @@ describe('RecurlyEventHandler', function () {
         has_ai_add_on: false,
         subscriptionId: this.eventData.subscription.uuid,
         payment_provider: 'recurly',
+        'customerio-integration': false,
       }
     )
     sinon.assert.calledWith(
@@ -246,8 +336,8 @@ describe('RecurlyEventHandler', function () {
     )
   })
 
-  it('with renewed_subscription_notification', function () {
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+  it('with renewed_subscription_notification', async function () {
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'renewed_subscription_notification',
       this.eventData
     )
@@ -262,12 +352,13 @@ describe('RecurlyEventHandler', function () {
         has_ai_add_on: false,
         subscriptionId: this.eventData.subscription.uuid,
         payment_provider: 'recurly',
+        'customerio-integration': false,
       }
     )
   })
 
-  it('with reactivated_account_notification', function () {
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+  it('with reactivated_account_notification', async function () {
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'reactivated_account_notification',
       this.eventData
     )
@@ -281,11 +372,12 @@ describe('RecurlyEventHandler', function () {
         has_ai_add_on: false,
         subscriptionId: this.eventData.subscription.uuid,
         payment_provider: 'recurly',
+        'customerio-integration': false,
       }
     )
   })
 
-  it('with paid_charge_invoice_notification', function () {
+  it('with paid_charge_invoice_notification', async function () {
     const invoice = {
       invoice_number: 1234,
       currency: 'USD',
@@ -298,7 +390,7 @@ describe('RecurlyEventHandler', function () {
       collection_method: 'automatic',
       subscription_ids: ['abcd1234', 'defa3214'],
     }
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'paid_charge_invoice_notification',
       {
         account: {
@@ -325,8 +417,8 @@ describe('RecurlyEventHandler', function () {
     )
   })
 
-  it('with paid_charge_invoice_notification and total_in_cents 0', function () {
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+  it('with paid_charge_invoice_notification and total_in_cents 0', async function () {
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'paid_charge_invoice_notification',
       {
         account: {
@@ -341,8 +433,8 @@ describe('RecurlyEventHandler', function () {
     sinon.assert.notCalled(this.AnalyticsManager.recordEventForUserInBackground)
   })
 
-  it('with closed_invoice_notification', function () {
-    this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
+  it('with closed_invoice_notification', async function () {
+    await this.RecurlyEventHandler.sendRecurlyAnalyticsEvent(
       'closed_invoice_notification',
       {
         account: {

From 79e5a884f5738f1ee79053bcc9c2cd38913c31fc Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Tue, 1 Jul 2025 13:48:20 +0200
Subject: [PATCH 067/274] Use meta tags for user info and refactor syntax for
 conditional classes (#26617)

* Use meta tags for user info data

* Remove Back button

* Refactor syntax for conditional classes

* Inline meta tags

* Keep "Please go back and try again" text

* Shorthand classname

GitOrigin-RevId: 3b78bff04b4fb8dc7fdecf5b663d2a4f64c3218b
---
 .../web/app/views/_mixins/begin_now_card.pug  |  4 +--
 .../app/views/_mixins/bookmarkable_tabset.pug |  2 +-
 services/web/app/views/_mixins/links.pug      | 32 ++++++-------------
 services/web/app/views/general/400.pug        |  3 +-
 .../layout/fat-footer-website-redesign.pug    |  2 +-
 services/web/app/views/layout/fat-footer.pug  |  2 +-
 .../layout/language-picker-bootstrap-5.pug    |  2 +-
 7 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/services/web/app/views/_mixins/begin_now_card.pug b/services/web/app/views/_mixins/begin_now_card.pug
index 641703d606..6dbf1137ec 100644
--- a/services/web/app/views/_mixins/begin_now_card.pug
+++ b/services/web/app/views/_mixins/begin_now_card.pug
@@ -17,7 +17,7 @@ mixin begin_now_card
 				p.card-links
 					if !isUserLoggedIn
 						a.btn.btn-primary.card-link(href=registerURL) #{translate("sign_up_for_free")}
-					a.btn.card-link(
-						class=isUserLoggedIn ? 'btn-primary' : 'btn-secondary'
+					a.card-link(
 						href=plansURL
+						class={'btn-primary': isUserLoggedIn, 'btn-secondary': !isUserLoggedIn}
 					) #{translate("explore_all_plans")}
diff --git a/services/web/app/views/_mixins/bookmarkable_tabset.pug b/services/web/app/views/_mixins/bookmarkable_tabset.pug
index 72579c7725..facf67755e 100644
--- a/services/web/app/views/_mixins/bookmarkable_tabset.pug
+++ b/services/web/app/views/_mixins/bookmarkable_tabset.pug
@@ -2,7 +2,7 @@ mixin bookmarkable-tabset-header(id, title, active)
 	li(role='presentation')
 		a.nav-link(
 			href='#' + id
-			class=active ? 'active' : ''
+			class={active}
 			aria-controls=id
 			role='tab'
 			data-toggle='tab'
diff --git a/services/web/app/views/_mixins/links.pug b/services/web/app/views/_mixins/links.pug
index 16257ecb0f..aaab08aefa 100644
--- a/services/web/app/views/_mixins/links.pug
+++ b/services/web/app/views/_mixins/links.pug
@@ -1,29 +1,23 @@
 include ./material_symbol
 
 mixin linkBenefits(linkText, linkClass)
-	a(
-		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/authors'
-		class=linkClass ? linkClass : ''
-	)
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + '/for/authors' class=linkClass)
 		| #{linkText ? linkText : 'benefits'}
 
 mixin linkBlog(linkText, linkClass, slug)
 	if slug
 		a(
 			href=(settings.siteUrl ? settings.siteUrl : '') + '/blog/' + slug
-			class=linkClass ? linkClass : ''
+			class=linkClass
 		)
 			| #{linkText ? linkText : 'blog'}
 
 mixin linkContact(linkText, linkClass)
-	a(
-		href=(settings.siteUrl ? settings.siteUrl : '') + '/contact'
-		class=linkClass ? linkClass : ''
-	)
+	a(href=(settings.siteUrl ? settings.siteUrl : '') + '/contact' class=linkClass)
 		| #{linkText ? linkText : 'contact'}
 
 mixin linkDash(linkText, linkClass)
-	a(href='/project' class=linkClass ? linkClass : '')
+	a(href='/project' class=linkClass)
 		| #{linkText ? linkText : 'project dashboard'}
 
 mixin linkInvite(linkText, linkClass, track)
@@ -36,7 +30,7 @@ mixin linkInvite(linkText, linkClass, track)
 
 	a(
 		href='/user/bonus'
-		class=linkClass ? linkClass : ''
+		class=linkClass
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
 		event-tracking-label=gaLabel
@@ -47,7 +41,7 @@ mixin linkInvite(linkText, linkClass, track)
 		span #{linkText ? linkText : 'invite your friends'}
 
 mixin linkPlansAndPricing(linkText, linkClass)
-	a(href='/user/subscription/plans' class=linkClass ? linkClass : '')
+	a(href='/user/subscription/plans' class=linkClass)
 		| #{linkText ? linkText : 'plans and pricing'}
 
 mixin linkPrintNewTab(linkText, linkClass, icon, track)
@@ -60,7 +54,7 @@ mixin linkPrintNewTab(linkText, linkClass, icon, track)
 
 	a(
 		href='?media=print'
-		class=linkClass ? linkClass : ''
+		class=linkClass
 		event-tracking-ga=gaCategory
 		event-tracking=gaAction
 		event-tracking-label=gaLabel
@@ -76,17 +70,11 @@ mixin linkPrintNewTab(linkText, linkClass, icon, track)
 		span #{linkText ? linkText : 'print'}
 
 mixin linkSignIn(linkText, linkClass, redirect)
-	a(
-		href=`/login${redirect ? '?redir=' + redirect : ''}`
-		class=linkClass ? linkClass : ''
-	)
+	a(href=`/login${redirect ? '?redir=' + redirect : ''}` class=linkClass)
 		| #{linkText ? linkText : 'sign in'}
 
 mixin linkSignUp(linkText, linkClass, redirect)
-	a(
-		href=`/register${redirect ? '?redir=' + redirect : ''}`
-		class=linkClass ? linkClass : ''
-	)
+	a(href=`/register${redirect ? '?redir=' + redirect : ''}` class=linkClass)
 		| #{linkText ? linkText : 'sign up'}
 
 mixin linkTweet(linkText, linkClass, tweetText, track)
@@ -113,7 +101,7 @@ mixin linkTweet(linkText, linkClass, tweetText, track)
 mixin linkUniversities(linkText, linkClass)
 	a(
 		href=(settings.siteUrl ? settings.siteUrl : '') + '/for/universities'
-		class=linkClass ? linkClass : ''
+		class=linkClass
 	)
 		| #{linkText ? linkText : 'universities'}
 
diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug
index 48d1fff5eb..749611b629 100644
--- a/services/web/app/views/general/400.pug
+++ b/services/web/app/views/general/400.pug
@@ -25,5 +25,4 @@ block body
 							a(href='mailto:' + settings.adminEmail target='_blank') #{settings.adminEmail}
 							| .
 						p.error-actions
-							a.error-btn(href='javascript:history.back()') Back
-							a.btn.btn-secondary(href='/') Home
+							a.btn.btn-primary(href='/') Home
diff --git a/services/web/app/views/layout/fat-footer-website-redesign.pug b/services/web/app/views/layout/fat-footer-website-redesign.pug
index d20eb14a2c..26e003ad56 100644
--- a/services/web/app/views/layout/fat-footer-website-redesign.pug
+++ b/services/web/app/views/layout/fat-footer-website-redesign.pug
@@ -3,7 +3,7 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 		role='navigation'
 		aria-label=translate('footer_navigation')
 	)
-		.fat-footer-sections(class=hideFatFooter ? 'hidden' : undefined)
+		.fat-footer-sections(class={hidden: hideFatFooter})
 			#footer-brand.footer-section
 				a.footer-brand(href='/' aria-label=settings.appName)
 
diff --git a/services/web/app/views/layout/fat-footer.pug b/services/web/app/views/layout/fat-footer.pug
index e5637a986f..d672d5ec29 100644
--- a/services/web/app/views/layout/fat-footer.pug
+++ b/services/web/app/views/layout/fat-footer.pug
@@ -3,7 +3,7 @@ footer.fat-footer.hidden-print
 		role='navigation'
 		aria-label=translate('footer_navigation')
 	)
-		.fat-footer-sections(class=hideFatFooter ? 'hidden' : undefined)
+		.fat-footer-sections(class={hidden: hideFatFooter})
 			#footer-brand.footer-section
 				a.footer-brand(href='/' aria-label=settings.appName)
 
diff --git a/services/web/app/views/layout/language-picker-bootstrap-5.pug b/services/web/app/views/layout/language-picker-bootstrap-5.pug
index 09f8f58c7d..312b13ea18 100644
--- a/services/web/app/views/layout/language-picker-bootstrap-5.pug
+++ b/services/web/app/views/layout/language-picker-bootstrap-5.pug
@@ -27,7 +27,7 @@ li.dropdown.dropup.subdued.language-picker(dropdown)
 					a.menu-indent(
 						href=subdomainDetails.url + currentUrlWithQueryParams
 						role='menuitem'
-						class=isActive ? 'dropdown-item active' : 'dropdown-item'
+						class=['dropdown-item', {active: isActive}]
 						aria-selected=isActive ? 'true' : 'false'
 					)
 						| #{settings.translatedLanguages[subdomainDetails.lngCode]}

From 6a56c64d9ab8d3e45fba3a0f59f00dafd2ea8bf3 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Tue, 1 Jul 2025 13:48:29 +0200
Subject: [PATCH 068/274] Use long month date format (#26666)

GitOrigin-RevId: 8a52bca6e13087f43d14ed1caffb7709ccee4e02
---
 .../components/notifications/groups/confirm-email.tsx  | 10 ++++++++--
 .../project-list/components/notifications.test.tsx     |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx b/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx
index 364e60fd3a..93386ff9a3 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx
@@ -73,6 +73,12 @@ const EMAIL_DELETION_SCHEDULE = {
   '2025-09-03': '2025-03-03',
 }
 
+const dateOptions: Intl.DateTimeFormatOptions = {
+  month: 'long',
+  day: 'numeric',
+  year: 'numeric',
+}
+
 // Emails that remain unconfirmed after 90 days will be removed from the account
 function getEmailDeletionDate(emailData: UserEmailData, signUpDate: string) {
   if (emailData.default) return false
@@ -95,9 +101,9 @@ function getEmailDeletionDate(emailData: UserEmailData, signUpDate: string) {
       )
       if (currentDate >= notificationStartDate) {
         if (currentDate > emailDeletionDate) {
-          return new Date().toLocaleDateString()
+          return new Date().toLocaleDateString(undefined, dateOptions)
         }
-        return emailDeletionDate.toLocaleDateString()
+        return emailDeletionDate.toLocaleDateString(undefined, dateOptions)
       }
     }
   }
diff --git a/services/web/test/frontend/features/project-list/components/notifications.test.tsx b/services/web/test/frontend/features/project-list/components/notifications.test.tsx
index 9a845283d7..8813566a2e 100644
--- a/services/web/test/frontend/features/project-list/components/notifications.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/notifications.test.tsx
@@ -614,8 +614,13 @@ describe('<UserNotifications />', function () {
         unconfirmedUserData,
         signUpDate
       )
+      const dateOptions: Intl.DateTimeFormatOptions = {
+        month: 'long',
+        day: 'numeric',
+        year: 'numeric',
+      }
       expect(emailDeletionDate).to.equal(
-        new Date('2025-09-03').toLocaleDateString()
+        new Date('2025-09-03').toLocaleDateString(undefined, dateOptions)
       )
     })
 

From dc97da127658a1562b2b74e0ca501f7585985529 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Tue, 1 Jul 2025 13:48:37 +0200
Subject: [PATCH 069/274] Add accessible names to the editor editing field
 (#26678)

GitOrigin-RevId: 2ebed9db517c288450230675ae038d0cc3260a61
---
 .../frontend/js/features/source-editor/extensions/index.ts  | 6 +++++-
 .../js/features/source-editor/extensions/visual/visual.ts   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/source-editor/extensions/index.ts b/services/web/frontend/js/features/source-editor/extensions/index.ts
index 0e19d42fc1..9cf6906b51 100644
--- a/services/web/frontend/js/features/source-editor/extensions/index.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/index.ts
@@ -35,7 +35,7 @@ import importOverleafModules from '../../../../macros/import-overleaf-module.mac
 import { emptyLineFiller } from './empty-line-filler'
 import { goToLinePanel } from './go-to-line'
 import { drawSelection } from './draw-selection'
-import { visual } from './visual/visual'
+import { sourceOnly, visual } from './visual/visual'
 import { inlineBackground } from './inline-background'
 import { indentationMarkers } from './indentation-markers'
 import { codemirrorDevTools } from '../languages/latex/codemirror-dev-tools'
@@ -78,6 +78,10 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
   EditorState.allowMultipleSelections.of(true),
   // A built-in extension that enables soft line wrapping.
   EditorView.lineWrapping,
+  sourceOnly(
+    options.visual,
+    EditorView.contentAttributes.of({ 'aria-label': 'Source Editor editing' })
+  ),
   // A built-in extension that re-indents input if the language defines an indentOnInput field in its language data.
   indentOnInput(),
   lineWrappingIndentation(options.visual.visual),
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
index e644910c59..af6d2e559a 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
@@ -178,4 +178,5 @@ const extension = (options: Options) => [
   showContentWhenParsed,
   pasteHtml,
   tableGeneratorTheme,
+  EditorView.contentAttributes.of({ 'aria-label': 'Visual Editor editing' }),
 ]

From 904fac958d6b80792552301e4fd0d047e0a17e97 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Wed, 2 Jul 2025 08:53:15 +0100
Subject: [PATCH 070/274] Merge pull request #26326 from
 overleaf/td-clean-up-scope-store

Create separate window.overleaf.unstable.store based on React context values

GitOrigin-RevId: 68f070a6fc5e2965a82720024d91b16fa622b28b
---
 .../components/editor/editor-pane.tsx         |   4 +-
 .../context/editor-manager-context.tsx        |  28 +-
 .../context/editor-open-doc-context.tsx       |  63 ++++
 .../ide-react/context/editor-view-context.tsx |  49 +++
 .../context/file-tree-open-context.tsx        |   5 +-
 .../ide-react/context/ide-react-context.tsx   |   8 +
 .../ide-react/context/metadata-context.tsx    |   4 +-
 .../context/online-users-context.tsx          |   4 +-
 .../ide-react/context/outline-context.tsx     |   4 +-
 .../ide-react/context/react-context-root.tsx  |  90 +++---
 .../editor-manager-context-adapter.ts         |   4 -
 .../ide-redesign/components/editor.tsx        |   8 +-
 .../components/pdf-preview-provider.tsx       |   2 +-
 .../features/pdf-preview/hooks/use-synctex.ts |   5 +-
 .../context/ranges-context.tsx                |   4 +-
 .../context/threads-context.tsx               |   4 +-
 .../components/codemirror-view.tsx            |   7 +-
 .../components/editor-switch.tsx              |   4 +-
 .../hooks/use-codemirror-scope.ts             |   5 +-
 .../components/word-count-client.tsx          |   4 +-
 .../shared/context/file-tree-data-context.tsx |   5 +-
 .../js/shared/context/ide-context.tsx         |  14 +-
 .../shared/context/local-compile-context.tsx  |   4 +-
 .../shared/context/user-settings-context.tsx  |  19 +-
 .../js/shared/hooks/use-exposed-state.ts      |  25 ++
 .../web/frontend/stories/decorators/scope.tsx |   7 +-
 .../stories/pdf-log-entry.stories.tsx         |  24 +-
 .../source-editor/source-editor.stories.tsx   | 290 ++++++++++++------
 .../pdf-preview/pdf-logs-entries.spec.tsx     |  41 ++-
 .../pdf-preview/pdf-synctex-controls.spec.tsx |  48 ++-
 .../frontend/components/pdf-preview/scope.tsx |   1 -
 .../components/share-project-modal.test.jsx   |  29 +-
 .../source-editor/helpers/mock-scope.ts       |   4 +-
 .../frontend/helpers/editor-providers.jsx     |  55 +++-
 34 files changed, 621 insertions(+), 251 deletions(-)
 create mode 100644 services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx
 create mode 100644 services/web/frontend/js/features/ide-react/context/editor-view-context.tsx
 create mode 100644 services/web/frontend/js/shared/hooks/use-exposed-state.ts

diff --git a/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx b/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx
index 77ffcd6cd4..72dd27262d 100644
--- a/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx
+++ b/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx
@@ -3,6 +3,7 @@ import React, { FC, lazy, Suspense } from 'react'
 import useScopeValue from '@/shared/hooks/use-scope-value'
 import SourceEditor from '@/features/source-editor/components/source-editor'
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { EditorScopeValue } from '@/features/ide-react/scope-adapters/editor-manager-context-adapter'
 import classNames from 'classnames'
 import { LoadingPane } from '@/features/ide-react/components/editor/loading-pane'
@@ -17,7 +18,8 @@ const SymbolPalettePane = lazy(
 export const EditorPane: FC = () => {
   const [editor] = useScopeValue<EditorScopeValue>('editor')
   const { selectedEntityCount, openEntity } = useFileTreeOpenContext()
-  const { currentDocumentId, isLoading } = useEditorManagerContext()
+  const { isLoading } = useEditorManagerContext()
+  const { currentDocumentId } = useEditorOpenDocContext()
 
   if (!currentDocumentId) {
     return null
diff --git a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
index 3a96bfc48d..dd06a6af86 100644
--- a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
@@ -37,6 +37,7 @@ import { Update } from '@/features/history/services/types/update'
 import { useDebugDiffTracker } from '../hooks/use-debug-diff-tracker'
 import { useEditorContext } from '@/shared/context/editor-context'
 import { convertFileRefToBinaryFile } from '@/features/ide-react/util/file-view'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 
 export interface GotoOffsetOptions {
   gotoOffset: number
@@ -53,8 +54,6 @@ interface OpenDocOptions
 export type EditorManager = {
   getEditorType: () => EditorType | null
   showSymbolPalette: boolean
-  currentDocument: DocumentContainer | null
-  currentDocumentId: DocId | null
   getCurrentDocValue: () => string | null
   getCurrentDocumentId: () => DocId | null
   setIgnoringExternalUpdates: (value: boolean) => void
@@ -63,8 +62,6 @@ export type EditorManager = {
   openDocs: OpenDocuments
   openFileWithId: (fileId: string) => void
   openInitialDoc: (docId: string) => void
-  openDocName: string | null
-  setOpenDocName: (openDocName: string) => void
   isLoading: boolean
   trackChanges: boolean
   jumpToLine: (options: GotoLineOptions) => void
@@ -104,14 +101,13 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
     'editor.showSymbolPalette'
   )
   const [showVisual] = useScopeValue<boolean>('editor.showVisual')
-  const [currentDocument, setCurrentDocument] =
-    useScopeValue<DocumentContainer | null>('editor.sharejs_doc')
-  const [currentDocumentId, setCurrentDocumentId] = useScopeValue<DocId | null>(
-    'editor.open_doc_id'
-  )
-  const [openDocName, setOpenDocName] = useScopeValue<string | null>(
-    'editor.open_doc_name'
-  )
+  const {
+    currentDocumentId,
+    setCurrentDocumentId,
+    setOpenDocName,
+    currentDocument,
+    setCurrentDocument,
+  } = useEditorOpenDocContext()
   const [opening, setOpening] = useScopeValue<boolean>('editor.opening')
   const [errorState, setIsInErrorState] =
     useScopeValue<boolean>('editor.error_state')
@@ -667,16 +663,12 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
     () => ({
       getEditorType,
       showSymbolPalette,
-      currentDocument,
-      currentDocumentId,
       getCurrentDocValue,
       getCurrentDocumentId,
       setIgnoringExternalUpdates,
       openDocWithId,
       openDoc,
       openDocs,
-      openDocName,
-      setOpenDocName,
       trackChanges,
       isLoading,
       openFileWithId,
@@ -689,8 +681,6 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
     [
       getEditorType,
       showSymbolPalette,
-      currentDocument,
-      currentDocumentId,
       getCurrentDocValue,
       getCurrentDocumentId,
       setIgnoringExternalUpdates,
@@ -699,8 +689,6 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
       openDocs,
       openFileWithId,
       openInitialDoc,
-      openDocName,
-      setOpenDocName,
       trackChanges,
       isLoading,
       jumpToLine,
diff --git a/services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx
new file mode 100644
index 0000000000..dd4a470578
--- /dev/null
+++ b/services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx
@@ -0,0 +1,63 @@
+import {
+  createContext,
+  Dispatch,
+  FC,
+  PropsWithChildren,
+  SetStateAction,
+  useContext,
+  useState,
+} from 'react'
+import { DocId } from '../../../../../types/project-settings'
+import useExposedState from '@/shared/hooks/use-exposed-state'
+import { DocumentContainer } from '@/features/ide-react/editor/document-container'
+
+type EditorOpenDocContextValue = {
+  currentDocumentId: DocId | null
+  setCurrentDocumentId: Dispatch<SetStateAction<DocId | null>>
+  openDocName: string | null
+  setOpenDocName: Dispatch<SetStateAction<string | null>>
+  currentDocument: DocumentContainer | null
+  setCurrentDocument: Dispatch<SetStateAction<DocumentContainer | null>>
+}
+
+export const EditorOpenDocContext = createContext<
+  EditorOpenDocContextValue | undefined
+>(undefined)
+
+export const EditorOpenDocProvider: FC<PropsWithChildren> = ({ children }) => {
+  const [currentDocumentId, setCurrentDocumentId] =
+    useExposedState<DocId | null>(null, 'editor.open_doc_id')
+  const [openDocName, setOpenDocName] = useExposedState<string | null>(
+    null,
+    'editor.open_doc_name'
+  )
+  const [currentDocument, setCurrentDocument] =
+    useState<DocumentContainer | null>(null)
+
+  const value = {
+    currentDocumentId,
+    setCurrentDocumentId,
+    openDocName,
+    setOpenDocName,
+    currentDocument,
+    setCurrentDocument,
+  }
+
+  return (
+    <EditorOpenDocContext.Provider value={value}>
+      {children}
+    </EditorOpenDocContext.Provider>
+  )
+}
+
+export const useEditorOpenDocContext = (): EditorOpenDocContextValue => {
+  const context = useContext(EditorOpenDocContext)
+
+  if (!context) {
+    throw new Error(
+      'useEditorOpenDocContext is only available inside EditorOpenDocContext.Provider'
+    )
+  }
+
+  return context
+}
diff --git a/services/web/frontend/js/features/ide-react/context/editor-view-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-view-context.tsx
new file mode 100644
index 0000000000..e6bc055afc
--- /dev/null
+++ b/services/web/frontend/js/features/ide-react/context/editor-view-context.tsx
@@ -0,0 +1,49 @@
+import {
+  createContext,
+  Dispatch,
+  FC,
+  PropsWithChildren,
+  SetStateAction,
+  useContext,
+} from 'react'
+import { EditorView } from '@codemirror/view'
+import useExposedState from '@/shared/hooks/use-exposed-state'
+
+export type EditorContextValue = {
+  view: EditorView | null
+  setView: Dispatch<SetStateAction<EditorView | null>>
+}
+
+// This provides access to the CodeMirror EditorView instance outside the editor
+// component itself, including external extensions (in particular, Writefull)
+export const EditorViewContext = createContext<EditorContextValue | undefined>(
+  undefined
+)
+
+export const EditorViewProvider: FC<PropsWithChildren> = ({ children }) => {
+  const [view, setView] = useExposedState<EditorView | null>(
+    null,
+    'editor.view'
+  )
+
+  const value = {
+    view,
+    setView,
+  }
+
+  return (
+    <EditorViewContext.Provider value={value}>
+      {children}
+    </EditorViewContext.Provider>
+  )
+}
+
+export const useEditorViewContext = (): EditorContextValue => {
+  const context = useContext(EditorViewContext)
+  if (!context) {
+    throw new Error(
+      'useEditorViewContext is only available inside EditorViewProvider'
+    )
+  }
+  return context
+}
diff --git a/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx b/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
index b4afd446da..d24187abd0 100644
--- a/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
@@ -11,6 +11,7 @@ import {
 import { useProjectContext } from '@/shared/context/project-context'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import {
   FileTreeDocumentFindResult,
   FileTreeFileRefFindResult,
@@ -40,8 +41,8 @@ export const FileTreeOpenProvider: FC<React.PropsWithChildren> = ({
 }) => {
   const { rootDocId, owner } = useProjectContext()
   const { eventEmitter, projectJoined } = useIdeReactContext()
-  const { openDocWithId, currentDocumentId, openInitialDoc } =
-    useEditorManagerContext()
+  const { openDocWithId, openInitialDoc } = useEditorManagerContext()
+  const { currentDocumentId } = useEditorOpenDocContext()
   const { setOpenFile } = useLayoutContext()
   const [openEntity, setOpenEntity] = useState<
     FileTreeDocumentFindResult | FileTreeFileRefFindResult | null
diff --git a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
index 63734d91aa..33413a52e7 100644
--- a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
@@ -81,6 +81,13 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const [scopeEventEmitter] = useState(
     () => new ReactScopeEventEmitter(eventEmitter)
   )
+  const [unstableStore] = useState(() => {
+    const store = new ReactScopeValueStore()
+    // Add dummy editor.ready key for Writefull, that relies on this calling
+    // back once after watching it
+    store.set('editor.ready', undefined)
+    return store
+  })
   const [startedFreeTrial, setStartedFreeTrial] = useState(false)
   const release = getMeta('ol-ExposedSettings')?.sentryRelease ?? null
 
@@ -179,6 +186,7 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
         ide={ide}
         scopeStore={scopeStore}
         scopeEventEmitter={scopeEventEmitter}
+        unstableStore={unstableStore}
       >
         {children}
       </IdeProvider>
diff --git a/services/web/frontend/js/features/ide-react/context/metadata-context.tsx b/services/web/frontend/js/features/ide-react/context/metadata-context.tsx
index 4d5ab28050..7fa6332a16 100644
--- a/services/web/frontend/js/features/ide-react/context/metadata-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/metadata-context.tsx
@@ -10,7 +10,7 @@ import {
 } from 'react'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { getJSON, postJSON } from '@/infrastructure/fetch-json'
 import { useOnlineUsersContext } from '@/features/ide-react/context/online-users-context'
 import { useEditorContext } from '@/shared/context/editor-context'
@@ -54,7 +54,7 @@ export const MetadataProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const { onlineUsersCount } = useOnlineUsersContext()
   const { permissionsLevel } = useEditorContext()
   const permissions = usePermissionsContext()
-  const { currentDocument } = useEditorManagerContext()
+  const { currentDocument } = useEditorOpenDocContext()
   const { showGenericMessageModal } = useModalsContext()
 
   const [documents, setDocuments] = useState<DocumentsMetadata>({})
diff --git a/services/web/frontend/js/features/ide-react/context/online-users-context.tsx b/services/web/frontend/js/features/ide-react/context/online-users-context.tsx
index 1195f9ae7c..84a1b7d71f 100644
--- a/services/web/frontend/js/features/ide-react/context/online-users-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/online-users-context.tsx
@@ -18,7 +18,7 @@ import useSocketListener from '@/features/ide-react/hooks/use-socket-listener'
 import { debugConsole } from '@/utils/debugging'
 import { IdeEvents } from '@/features/ide-react/create-ide-event-emitter'
 import { getHueForUserId } from '@/shared/utils/colors'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 
 export type OnlineUser = {
   id: string
@@ -70,7 +70,7 @@ export const OnlineUsersProvider: FC<React.PropsWithChildren> = ({
 }) => {
   const { eventEmitter } = useIdeReactContext()
   const { socket } = useConnectionContext()
-  const { currentDocumentId } = useEditorManagerContext()
+  const { currentDocumentId } = useEditorOpenDocContext()
   const { fileTreeData } = useFileTreeData()
 
   const [onlineUsers, setOnlineUsers] = useState<Record<string, OnlineUser>>({})
diff --git a/services/web/frontend/js/features/ide-react/context/outline-context.tsx b/services/web/frontend/js/features/ide-react/context/outline-context.tsx
index 8e582e607d..ea3c38d105 100644
--- a/services/web/frontend/js/features/ide-react/context/outline-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/outline-context.tsx
@@ -14,7 +14,7 @@ import * as eventTracking from '@/infrastructure/event-tracking'
 import { isValidTeXFile } from '@/main/is-valid-tex-file'
 import localStorage from '@/infrastructure/local-storage'
 import { useProjectContext } from '@/shared/context/project-context'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 
 export type PartialFlatOutline = {
   level: number
@@ -118,7 +118,7 @@ export const OutlineProvider: FC<React.PropsWithChildren> = ({ children }) => {
     [flatOutline, currentlyHighlightedLine]
   )
 
-  const { openDocName } = useEditorManagerContext()
+  const { openDocName } = useEditorOpenDocContext()
   const isTexFile = useMemo(
     () => (openDocName ? isValidTeXFile(openDocName) : false),
     [openDocName]
diff --git a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
index 0eeb870a2b..fdac20dc0f 100644
--- a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
+++ b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
@@ -4,7 +4,9 @@ import { ConnectionProvider } from './connection-context'
 import { DetachCompileProvider } from '@/shared/context/detach-compile-context'
 import { DetachProvider } from '@/shared/context/detach-context'
 import { EditorManagerProvider } from '@/features/ide-react/context/editor-manager-context'
+import { EditorOpenDocProvider } from '@/features/ide-react/context/editor-open-doc-context'
 import { EditorProvider } from '@/shared/context/editor-context'
+import { EditorViewProvider } from '@/features/ide-react/context/editor-view-context'
 import { FileTreeDataProvider } from '@/shared/context/file-tree-data-context'
 import { FileTreeOpenProvider } from '@/features/ide-react/context/file-tree-open-context'
 import { FileTreePathProvider } from '@/features/file-tree/contexts/file-tree-path'
@@ -39,7 +41,9 @@ export const ReactContextRoot: FC<
     DetachCompileProvider,
     DetachProvider,
     EditorManagerProvider,
+    EditorOpenDocProvider,
     EditorProvider,
+    EditorViewProvider,
     FileTreeDataProvider,
     FileTreeOpenProvider,
     FileTreePathProvider,
@@ -74,47 +78,51 @@ export const ReactContextRoot: FC<
               <Providers.UserSettingsProvider>
                 <Providers.ProjectProvider>
                   <Providers.SnapshotProvider>
-                    <Providers.FileTreeDataProvider>
-                      <Providers.FileTreePathProvider>
-                        <Providers.ReferencesProvider>
-                          <Providers.DetachProvider>
-                            <Providers.EditorProvider>
-                              <Providers.UserFeaturesProvider>
-                                <Providers.PermissionsProvider>
-                                  <Providers.RailProvider>
-                                    <Providers.LayoutProvider>
-                                      <Providers.ProjectSettingsProvider>
-                                        <Providers.EditorManagerProvider>
-                                          <Providers.LocalCompileProvider>
-                                            <Providers.DetachCompileProvider>
-                                              <Providers.ChatProvider>
-                                                <Providers.FileTreeOpenProvider>
-                                                  <Providers.OnlineUsersProvider>
-                                                    <Providers.MetadataProvider>
-                                                      <Providers.OutlineProvider>
-                                                        <Providers.IdeRedesignSwitcherProvider>
-                                                          <Providers.CommandRegistryProvider>
-                                                            {children}
-                                                          </Providers.CommandRegistryProvider>
-                                                        </Providers.IdeRedesignSwitcherProvider>
-                                                      </Providers.OutlineProvider>
-                                                    </Providers.MetadataProvider>
-                                                  </Providers.OnlineUsersProvider>
-                                                </Providers.FileTreeOpenProvider>
-                                              </Providers.ChatProvider>
-                                            </Providers.DetachCompileProvider>
-                                          </Providers.LocalCompileProvider>
-                                        </Providers.EditorManagerProvider>
-                                      </Providers.ProjectSettingsProvider>
-                                    </Providers.LayoutProvider>
-                                  </Providers.RailProvider>
-                                </Providers.PermissionsProvider>
-                              </Providers.UserFeaturesProvider>
-                            </Providers.EditorProvider>
-                          </Providers.DetachProvider>
-                        </Providers.ReferencesProvider>
-                      </Providers.FileTreePathProvider>
-                    </Providers.FileTreeDataProvider>
+                    <Providers.DetachProvider>
+                      <Providers.EditorViewProvider>
+                        <Providers.EditorOpenDocProvider>
+                          <Providers.EditorProvider>
+                            <Providers.FileTreeDataProvider>
+                              <Providers.FileTreePathProvider>
+                                <Providers.ReferencesProvider>
+                                  <Providers.UserFeaturesProvider>
+                                    <Providers.PermissionsProvider>
+                                      <Providers.RailProvider>
+                                        <Providers.LayoutProvider>
+                                          <Providers.ProjectSettingsProvider>
+                                            <Providers.EditorManagerProvider>
+                                              <Providers.LocalCompileProvider>
+                                                <Providers.DetachCompileProvider>
+                                                  <Providers.ChatProvider>
+                                                    <Providers.FileTreeOpenProvider>
+                                                      <Providers.OnlineUsersProvider>
+                                                        <Providers.MetadataProvider>
+                                                          <Providers.OutlineProvider>
+                                                            <Providers.IdeRedesignSwitcherProvider>
+                                                              <Providers.CommandRegistryProvider>
+                                                                {children}
+                                                              </Providers.CommandRegistryProvider>
+                                                            </Providers.IdeRedesignSwitcherProvider>
+                                                          </Providers.OutlineProvider>
+                                                        </Providers.MetadataProvider>
+                                                      </Providers.OnlineUsersProvider>
+                                                    </Providers.FileTreeOpenProvider>
+                                                  </Providers.ChatProvider>
+                                                </Providers.DetachCompileProvider>
+                                              </Providers.LocalCompileProvider>
+                                            </Providers.EditorManagerProvider>
+                                          </Providers.ProjectSettingsProvider>
+                                        </Providers.LayoutProvider>
+                                      </Providers.RailProvider>
+                                    </Providers.PermissionsProvider>
+                                  </Providers.UserFeaturesProvider>
+                                </Providers.ReferencesProvider>
+                              </Providers.FileTreePathProvider>
+                            </Providers.FileTreeDataProvider>
+                          </Providers.EditorProvider>
+                        </Providers.EditorOpenDocProvider>
+                      </Providers.EditorViewProvider>
+                    </Providers.DetachProvider>
                   </Providers.SnapshotProvider>
                 </Providers.ProjectProvider>
               </Providers.UserSettingsProvider>
diff --git a/services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts b/services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts
index 42e03ff8f6..e4f0e5aa01 100644
--- a/services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts
+++ b/services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts
@@ -6,8 +6,6 @@ export type EditorScopeValue = {
   showSymbolPalette: false
   toggleSymbolPalette: () => void
   sharejs_doc: DocumentContainer | null
-  open_doc_id: string | null
-  open_doc_name: string | null
   opening: boolean
   trackChanges: boolean
   wantTrackChanges: boolean
@@ -25,8 +23,6 @@ export function populateEditorScope(
     showSymbolPalette: false,
     toggleSymbolPalette: () => {},
     sharejs_doc: null,
-    open_doc_id: null,
-    open_doc_name: null,
     opening: true,
     trackChanges: false,
     wantTrackChanges: false,
diff --git a/services/web/frontend/js/features/ide-redesign/components/editor.tsx b/services/web/frontend/js/features/ide-redesign/components/editor.tsx
index 6c5e0b40db..ae861f9b6f 100644
--- a/services/web/frontend/js/features/ide-redesign/components/editor.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/editor.tsx
@@ -1,5 +1,5 @@
 import { LoadingPane } from '@/features/ide-react/components/editor/loading-pane'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { EditorScopeValue } from '@/features/ide-react/scope-adapters/editor-manager-context-adapter'
 import { useFileTreeOpenContext } from '@/features/ide-react/context/file-tree-open-context'
 import useScopeValue from '@/shared/hooks/use-scope-value'
@@ -14,16 +14,16 @@ import SymbolPalettePane from '@/features/ide-react/components/editor/symbol-pal
 export const Editor = () => {
   const [editor] = useScopeValue<EditorScopeValue>('editor')
   const { selectedEntityCount, openEntity } = useFileTreeOpenContext()
-  const { currentDocumentId } = useEditorManagerContext()
+  const { currentDocumentId, currentDocument } = useEditorOpenDocContext()
 
   if (!currentDocumentId) {
     return null
   }
 
   const isLoading = Boolean(
-    (!editor.sharejs_doc || editor.opening) &&
+    (!currentDocument || editor.opening) &&
       !editor.error_state &&
-      editor.open_doc_id
+      currentDocumentId
   )
 
   return (
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-provider.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-provider.tsx
index 0b625bc79b..46c20b24d6 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-provider.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-provider.tsx
@@ -12,7 +12,7 @@ export const usePdfPreviewContext = () => {
   const context = useContext(PdfPreviewContext)
   if (!context) {
     throw new Error(
-      'usePdfPreviewContext is only avalable inside PdfPreviewProvider'
+      'usePdfPreviewContext is only available inside PdfPreviewProvider'
     )
   }
   return context
diff --git a/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts b/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts
index 77986bfeac..667374bb66 100644
--- a/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts
+++ b/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts
@@ -13,6 +13,7 @@ import * as eventTracking from '../../../infrastructure/event-tracking'
 import { debugConsole } from '@/utils/debugging'
 import { useFileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import { CursorPosition } from '@/features/ide-react/types/cursor-position'
 import { isValidTeXFile } from '@/main/is-valid-tex-file'
@@ -34,8 +35,8 @@ export default function useSynctex(): {
 
   const { selectedEntities } = useFileTreeData()
   const { findEntityByPath, dirname, pathInFolder } = useFileTreePathContext()
-  const { getCurrentDocumentId, openDocWithId, openDocName } =
-    useEditorManagerContext()
+  const { openDocName } = useEditorOpenDocContext()
+  const { getCurrentDocumentId, openDocWithId } = useEditorManagerContext()
 
   const [cursorPosition, setCursorPosition] = useState<CursorPosition | null>(
     () => {
diff --git a/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx b/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx
index 7066a78bb3..f5e9c94c09 100644
--- a/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/ranges-context.tsx
@@ -21,7 +21,7 @@ import { useIdeReactContext } from '@/features/ide-react/context/ide-react-conte
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
 import useSocketListener from '@/features/ide-react/hooks/use-socket-listener'
 import { throttle } from 'lodash'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 
 export type Ranges = {
   docId: string
@@ -81,7 +81,7 @@ const RangesActionsContext = createContext<RangesActions | undefined>(undefined)
 export const RangesProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const view = useCodeMirrorViewContext()
   const { projectId } = useIdeReactContext()
-  const { currentDocument } = useEditorManagerContext()
+  const { currentDocument } = useEditorOpenDocContext()
   const { socket } = useConnectionContext()
   const [ranges, setRanges] = useState<Ranges | undefined>(() =>
     buildRanges(currentDocument)
diff --git a/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx b/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
index 0a5c737585..5ad69245c7 100644
--- a/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
@@ -20,7 +20,7 @@ import { UserId } from '../../../../../types/user'
 import { deleteJSON, getJSON, postJSON } from '@/infrastructure/fetch-json'
 import RangesTracker from '@overleaf/ranges-tracker'
 import { CommentOperation } from '../../../../../types/change'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { useEditorContext } from '@/shared/context/editor-context'
 import { debugConsole } from '@/utils/debugging'
 import { captureException } from '@/infrastructure/error-reporter'
@@ -50,7 +50,7 @@ const ThreadsActionsContext = createContext<ThreadsActions | undefined>(
 
 export const ThreadsProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const { _id: projectId } = useProjectContext()
-  const { currentDocument } = useEditorManagerContext()
+  const { currentDocument } = useEditorOpenDocContext()
   const { isRestrictedTokenMember } = useEditorContext()
 
   // const [error, setError] = useState<Error>()
diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-view.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-view.tsx
index 06484db1b6..4968e10367 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-view.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-view.tsx
@@ -1,12 +1,12 @@
 import { memo, useCallback, useEffect } from 'react'
 import { useCodeMirrorViewContext } from './codemirror-context'
 import useCodeMirrorScope from '../hooks/use-codemirror-scope'
-import useScopeValueSetterOnly from '@/shared/hooks/use-scope-value-setter-only'
+import { useEditorViewContext } from '@/features/ide-react/context/editor-view-context'
 
 function CodeMirrorView() {
   const view = useCodeMirrorViewContext()
 
-  const [, setView] = useScopeValueSetterOnly('editor.view')
+  const { setView } = useEditorViewContext()
 
   // append the editor view dom to the container node when mounted
   const containerRef = useCallback(
@@ -25,7 +25,8 @@ function CodeMirrorView() {
     }
   }, [view])
 
-  // add the editor view to the scope value store, so it can be accessed by external extensions
+  // Add the CodeMirror view to the editor view context so that it can be
+  // accessed outside the editor component
   useEffect(() => {
     setView(view)
   }, [setView, view])
diff --git a/services/web/frontend/js/features/source-editor/components/editor-switch.tsx b/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
index c042c1bc94..7e8c950db0 100644
--- a/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
+++ b/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
@@ -4,12 +4,12 @@ import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import { sendMB } from '../../../infrastructure/event-tracking'
 import { isValidTeXFile } from '../../../main/is-valid-tex-file'
 import { useTranslation } from 'react-i18next'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 
 function EditorSwitch() {
   const { t } = useTranslation()
   const [visual, setVisual] = useScopeValue('editor.showVisual')
-  const { openDocName } = useEditorManagerContext()
+  const { openDocName } = useEditorOpenDocContext()
 
   const richTextAvailable = openDocName ? isValidTeXFile(openDocName) : false
 
diff --git a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
index 2504afdd0c..6c20a44702 100644
--- a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
+++ b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
@@ -57,6 +57,7 @@ import {
 } from '@/features/ide-react/context/editor-manager-context'
 import { GotoLineOptions } from '@/features/ide-react/types/goto-line-options'
 import { useOnlineUsersContext } from '@/features/ide-react/context/online-users-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 
 function useCodeMirrorScope(view: EditorView) {
   const { fileTreeData } = useFileTreeData()
@@ -68,8 +69,8 @@ function useCodeMirrorScope(view: EditorView) {
   const { logEntryAnnotations, editedSinceCompileStarted, compiling } =
     useCompileContext()
 
-  const { currentDocument, openDocName, trackChanges } =
-    useEditorManagerContext()
+  const { openDocName, currentDocument } = useEditorOpenDocContext()
+  const { trackChanges } = useEditorManagerContext()
   const metadata = useMetadataContext()
 
   const { id: userId } = useUserContext()
diff --git a/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx b/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx
index 899d8de2f5..4dd58958ac 100644
--- a/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx
+++ b/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx
@@ -6,6 +6,7 @@ import { useProjectContext } from '@/shared/context/project-context'
 import useAbortController from '@/shared/hooks/use-abort-controller'
 import { useProjectSettingsContext } from '@/features/editor-left-menu/context/project-settings-context'
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { useFileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
 import { debugConsole } from '@/utils/debugging'
 import { signalWithTimeout } from '@/utils/abort-signal'
@@ -20,7 +21,8 @@ export const WordCountClient: FC = () => {
   const [data, setData] = useState<WordCountData | null>(null)
   const { projectSnapshot, rootDocId } = useProjectContext()
   const { spellCheckLanguage } = useProjectSettingsContext()
-  const { openDocs, currentDocument } = useEditorManagerContext()
+  const { openDocs } = useEditorManagerContext()
+  const { currentDocument } = useEditorOpenDocContext()
   const { pathInFolder } = useFileTreePathContext()
 
   const { signal } = useAbortController()
diff --git a/services/web/frontend/js/shared/context/file-tree-data-context.tsx b/services/web/frontend/js/shared/context/file-tree-data-context.tsx
index 37de214301..7e426b9e54 100644
--- a/services/web/frontend/js/shared/context/file-tree-data-context.tsx
+++ b/services/web/frontend/js/shared/context/file-tree-data-context.tsx
@@ -18,7 +18,7 @@ import {
 import { countFiles } from '../../features/file-tree/util/count-in-tree'
 import useDeepCompareEffect from '../../shared/hooks/use-deep-compare-effect'
 import { docsInFolder } from '@/features/file-tree/util/docs-in-folder'
-import useScopeValueSetterOnly from '@/shared/hooks/use-scope-value-setter-only'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { Folder } from '../../../../types/folder'
 import { Project } from '../../../../types/project'
 import { MainDocument } from '../../../../types/project-settings'
@@ -180,8 +180,7 @@ export const FileTreeDataProvider: FC<React.PropsWithChildren> = ({
   children,
 }) => {
   const [project] = useScopeValue<Project>('project')
-  const [currentDocumentId] = useScopeValue('editor.open_doc_id')
-  const [, setOpenDocName] = useScopeValueSetterOnly('editor.open_doc_name')
+  const { currentDocumentId, setOpenDocName } = useEditorOpenDocContext()
   const [permissionsLevel] = useScopeValue('permissionsLevel')
   const { fileTreeFromHistory, snapshot, snapshotVersion } =
     useSnapshotContext()
diff --git a/services/web/frontend/js/shared/context/ide-context.tsx b/services/web/frontend/js/shared/context/ide-context.tsx
index 1b4d83d56c..899dcbce5b 100644
--- a/services/web/frontend/js/shared/context/ide-context.tsx
+++ b/services/web/frontend/js/shared/context/ide-context.tsx
@@ -10,6 +10,7 @@ export type Ide = {
 type IdeContextValue = Ide & {
   scopeStore: ScopeValueStore
   scopeEventEmitter: ScopeEventEmitter
+  unstableStore: ScopeValueStore
 }
 
 export const IdeContext = createContext<IdeContextValue | undefined>(undefined)
@@ -19,14 +20,14 @@ export const IdeProvider: FC<
     ide: Ide
     scopeStore: ScopeValueStore
     scopeEventEmitter: ScopeEventEmitter
+    unstableStore: ScopeValueStore
   }>
-> = ({ ide, scopeStore, scopeEventEmitter, children }) => {
+> = ({ ide, scopeStore, scopeEventEmitter, unstableStore, children }) => {
   /**
-   * Expose scopeStore via `window.overleaf.unstable.store`, so it can be accessed by external extensions.
+   * Expose unstableStore via `window.overleaf.unstable.store`, so it can be accessed by external extensions.
    *
    * These properties are expected to be available:
    *   - `editor.view`
-   *   - `project.spellcheckLanguage`
    *   - `editor.open_doc_name`,
    *   - `editor.open_doc_id`,
    *   - `settings.theme`
@@ -40,18 +41,19 @@ export const IdeProvider: FC<
       ...window.overleaf,
       unstable: {
         ...window.overleaf?.unstable,
-        store: scopeStore,
+        store: unstableStore,
       },
     }
-  }, [scopeStore])
+  }, [unstableStore])
 
   const value = useMemo<IdeContextValue>(() => {
     return {
       ...ide,
       scopeStore,
       scopeEventEmitter,
+      unstableStore,
     }
-  }, [ide, scopeStore, scopeEventEmitter])
+  }, [ide, scopeStore, scopeEventEmitter, unstableStore])
 
   return <IdeContext.Provider value={value}>{children}</IdeContext.Provider>
 }
diff --git a/services/web/frontend/js/shared/context/local-compile-context.tsx b/services/web/frontend/js/shared/context/local-compile-context.tsx
index 52aa0eee6d..8c8a7b4885 100644
--- a/services/web/frontend/js/shared/context/local-compile-context.tsx
+++ b/services/web/frontend/js/shared/context/local-compile-context.tsx
@@ -39,6 +39,7 @@ import { useFileTreePathContext } from '@/features/file-tree/contexts/file-tree-
 import { useUserSettingsContext } from '@/shared/context/user-settings-context'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { getJSON } from '@/infrastructure/fetch-json'
 import { CompileResponseData } from '../../../../types/compile'
 import {
@@ -127,7 +128,8 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   children,
 }) => {
   const { hasPremiumCompile, isProjectOwner } = useEditorContext()
-  const { openDocWithId, openDocs, currentDocument } = useEditorManagerContext()
+  const { openDocWithId, openDocs } = useEditorManagerContext()
+  const { currentDocument } = useEditorOpenDocContext()
   const { role } = useDetachContext()
 
   const {
diff --git a/services/web/frontend/js/shared/context/user-settings-context.tsx b/services/web/frontend/js/shared/context/user-settings-context.tsx
index b368371013..cc18c896fa 100644
--- a/services/web/frontend/js/shared/context/user-settings-context.tsx
+++ b/services/web/frontend/js/shared/context/user-settings-context.tsx
@@ -9,11 +9,11 @@ import {
   useEffect,
 } from 'react'
 
-import { UserSettings, Keybindings } from '../../../../types/user-settings'
+import { UserSettings } from '../../../../types/user-settings'
 import getMeta from '@/utils/meta'
-import useScopeValue from '@/shared/hooks/use-scope-value'
 import { userStyles } from '../utils/styles'
 import { canUseNewEditor } from '@/features/ide-redesign/utils/new-editor-utils'
+import { useIdeContext } from '@/shared/context/ide-context'
 
 const defaultSettings: UserSettings = {
   pdfViewer: 'pdfjs',
@@ -39,15 +39,6 @@ type UserSettingsContextValue = {
   >
 }
 
-type ScopeSettings = {
-  overallTheme: 'light' | 'dark'
-  keybindings: Keybindings
-  fontSize: number
-  fontFamily: string
-  lineHeight: number
-  isNewEditor: boolean
-}
-
 export const UserSettingsContext = createContext<
   UserSettingsContextValue | undefined
 >(undefined)
@@ -60,10 +51,10 @@ export const UserSettingsProvider: FC<React.PropsWithChildren> = ({
   )
 
   // update the global scope 'settings' value, for extensions
-  const [, setScopeSettings] = useScopeValue<ScopeSettings>('settings')
+  const { unstableStore } = useIdeContext()
   useEffect(() => {
     const { fontFamily, lineHeight } = userStyles(userSettings)
-    setScopeSettings({
+    unstableStore.set('settings', {
       overallTheme: userSettings.overallTheme === 'light-' ? 'light' : 'dark',
       keybindings: userSettings.mode === 'none' ? 'default' : userSettings.mode,
       fontFamily,
@@ -71,7 +62,7 @@ export const UserSettingsProvider: FC<React.PropsWithChildren> = ({
       fontSize: userSettings.fontSize,
       isNewEditor: canUseNewEditor() && userSettings.enableNewEditor,
     })
-  }, [setScopeSettings, userSettings])
+  }, [unstableStore, userSettings])
 
   const value = useMemo<UserSettingsContextValue>(
     () => ({
diff --git a/services/web/frontend/js/shared/hooks/use-exposed-state.ts b/services/web/frontend/js/shared/hooks/use-exposed-state.ts
new file mode 100644
index 0000000000..520ed4356c
--- /dev/null
+++ b/services/web/frontend/js/shared/hooks/use-exposed-state.ts
@@ -0,0 +1,25 @@
+import { type Dispatch, type SetStateAction, useEffect, useState } from 'react'
+import { useIdeContext } from '../context/ide-context'
+
+/**
+ * Creates a state variable that is exposed via window.overleaf.unstable.store,
+ * which is used by Writefull (and only Writefull). Once Writefull is integrated
+ * into our codebase, it should be able to hook directly into our React
+ * contexts and we would then be able to remove this hook, replacing it with
+ * useState.
+ */
+export default function useExposedState<T = any>(
+  initialState: T | (() => T),
+  path: string
+): [T, Dispatch<SetStateAction<T>>] {
+  const [value, setValue] = useState<T>(initialState)
+
+  const { unstableStore } = useIdeContext()
+
+  // Update the unstable store whenever the value changes
+  useEffect(() => {
+    unstableStore.set(path, value)
+  }, [unstableStore, path, value])
+
+  return [value, setValue]
+}
diff --git a/services/web/frontend/stories/decorators/scope.tsx b/services/web/frontend/stories/decorators/scope.tsx
index 00ad7f7daa..c81b9b6103 100644
--- a/services/web/frontend/stories/decorators/scope.tsx
+++ b/services/web/frontend/stories/decorators/scope.tsx
@@ -15,6 +15,7 @@ import {
   createReactScopeValueStore,
 } from '@/features/ide-react/context/ide-react-context'
 import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
+import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/react-scope-value-store'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
 import { ConnectionContext } from '@/features/ide-react/context/connection-context'
 import { Socket } from '@/features/ide-react/connection/types/socket'
@@ -65,6 +66,8 @@ const initialScope = {
   },
   editor: {
     richText: false,
+
+    // FIXME: This is pretty useless because the editor relies on a much more fleshed-out document, so we rely on overriding it in individual stories
     sharejs_doc: {
       doc_id: 'test-doc',
       getSnapshot: () => 'some doc content',
@@ -195,12 +198,13 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
       scopeStore.set(key, value)
     }
     const scopeEventEmitter = new ReactScopeEventEmitter(new IdeEventEmitter())
+    const unstableStore = new ReactScopeValueStore()
 
     window.overleaf = {
       ...window.overleaf,
       unstable: {
         ...window.overleaf?.unstable,
-        store: scopeStore,
+        store: unstableStore,
       },
     }
 
@@ -208,6 +212,7 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
       socket,
       scopeStore,
       scopeEventEmitter,
+      unstableStore,
     }
   })
 
diff --git a/services/web/frontend/stories/pdf-log-entry.stories.tsx b/services/web/frontend/stories/pdf-log-entry.stories.tsx
index 6b60bdff03..12f7594621 100644
--- a/services/web/frontend/stories/pdf-log-entry.stories.tsx
+++ b/services/web/frontend/stories/pdf-log-entry.stories.tsx
@@ -4,7 +4,7 @@ import { ruleIds } from '@/ide/human-readable-logs/HumanReadableLogsHints'
 import { ScopeDecorator } from './decorators/scope'
 import { useMeta } from './hooks/use-meta'
 import { FC, ReactNode } from 'react'
-import { useScope } from './hooks/use-scope'
+import { EditorViewContext } from '@/features/ide-react/context/editor-view-context'
 import { EditorView } from '@codemirror/view'
 import { LogEntry } from '@/features/pdf-preview/util/types'
 
@@ -58,12 +58,30 @@ export default meta
 
 type Story = StoryObj<typeof PdfLogEntry>
 
+const MockEditorViewProvider: FC<React.PropsWithChildren> = ({ children }) => {
+  const value = {
+    view: new EditorView({
+      doc: '\\begin{document',
+    }),
+    setView: () => {},
+  }
+
+  return (
+    <EditorViewContext.Provider value={value}>
+      {children}
+    </EditorViewContext.Provider>
+  )
+}
+
 const Provider: FC<React.PropsWithChildren<{ children: ReactNode }>> = ({
   children,
 }) => {
   useMeta({ 'ol-showAiErrorAssistant': true })
-  useScope({ 'editor.view': new EditorView({ doc: '\\begin{document' }) })
-  return <div className="logs-pane p-2">{children}</div>
+  return (
+    <MockEditorViewProvider>
+      <div className="logs-pane p-2">{children}</div>
+    </MockEditorViewProvider>
+  )
 }
 
 export const PdfLogEntryWithControls: Story = {
diff --git a/services/web/frontend/stories/source-editor/source-editor.stories.tsx b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
index 184c4faa46..7194adcef7 100644
--- a/services/web/frontend/stories/source-editor/source-editor.stories.tsx
+++ b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
@@ -2,9 +2,86 @@ import SourceEditor from '../../js/features/source-editor/components/source-edit
 import { ScopeDecorator } from '../decorators/scope'
 import { useScope } from '../hooks/use-scope'
 import { useMeta } from '../hooks/use-meta'
-import { FC } from 'react'
+import React, { FC, useState } from 'react'
 import { FileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
 import RangesTracker from '@overleaf/ranges-tracker'
+import useExposedState from '@/shared/hooks/use-exposed-state'
+import { EditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import { DocId } from '../../../types/project-settings'
+import { StoryObj } from '@storybook/react'
+import { DocumentContainer } from '@/features/ide-react/editor/document-container'
+
+type Story = StoryObj<typeof SourceEditor>
+
+const EditorOpenDocProvider: FC<
+  React.PropsWithChildren<{
+    initialOpenDocName: string | null
+    initialDocument: DocumentContainer
+  }>
+> = ({ children, initialOpenDocName, initialDocument }) => {
+  const [currentDocumentId, setCurrentDocumentId] =
+    useExposedState<DocId | null>(null, 'editor.open_doc_id')
+  const [openDocName, setOpenDocName] = useExposedState<string | null>(
+    initialOpenDocName,
+    'editor.open_doc_name'
+  )
+  const [currentDocument, setCurrentDocument] =
+    useState<DocumentContainer | null>(initialDocument)
+
+  const value = {
+    currentDocumentId,
+    setCurrentDocumentId,
+    openDocName,
+    setOpenDocName,
+    currentDocument,
+    setCurrentDocument,
+  }
+
+  return (
+    <EditorOpenDocContext.Provider value={value}>
+      {children}
+    </EditorOpenDocContext.Provider>
+  )
+}
+
+const LatexEditorOpenDocProvider: FC<React.PropsWithChildren> = ({
+  children,
+}) => (
+  <EditorOpenDocProvider
+    initialOpenDocName="example.tex"
+    initialDocument={
+      mockDoc(content.tex, changes.tex) as unknown as DocumentContainer
+    }
+  >
+    {children}
+  </EditorOpenDocProvider>
+)
+
+const MarkdownEditorOpenDocProvider: FC<React.PropsWithChildren> = ({
+  children,
+}) => (
+  <EditorOpenDocProvider
+    initialOpenDocName="example.md"
+    initialDocument={
+      mockDoc(content.md, changes.md) as unknown as DocumentContainer
+    }
+  >
+    {children}
+  </EditorOpenDocProvider>
+)
+
+const BibtexEditorOpenDocProvider: FC<React.PropsWithChildren> = ({
+  children,
+}) => (
+  <EditorOpenDocProvider
+    initialOpenDocName="example.bib"
+    initialDocument={
+      mockDoc(content.bib, changes.bib) as unknown as DocumentContainer
+    }
+  >
+    {children}
+  </EditorOpenDocProvider>
+)
 
 const FileTreePathProvider: FC<React.PropsWithChildren> = ({ children }) => (
   <FileTreePathContext.Provider
@@ -29,11 +106,6 @@ export default {
   title: 'Editor / Source Editor',
   component: SourceEditor,
   decorators: [
-    (Story: any) =>
-      ScopeDecorator(Story, {
-        mockCompileOnLoad: true,
-        providers: { FileTreePathProvider },
-      }),
     (Story: any) => (
       <div style={{ height: '90vh' }}>
         <Story />
@@ -59,102 +131,144 @@ const permissions = {
   write: true,
 }
 
-export const Latex = (args: any, { globals: { theme } }: any) => {
-  // FIXME: useScope has no effect
-  useScope({
-    editor: {
-      sharejs_doc: mockDoc(content.tex, changes.tex),
-      open_doc_name: 'example.tex',
-    },
-    rootFolder: {
-      name: 'rootFolder',
-      id: 'root-folder-id',
-      type: 'folder',
-      children: [
-        {
-          name: 'example.tex.tex',
-          id: 'example-doc-id',
-          type: 'doc',
+export const Latex: Story = {
+  decorators: [
+    Story =>
+      ScopeDecorator(Story, {
+        mockCompileOnLoad: true,
+        providers: {
+          FileTreePathProvider,
+          EditorOpenDocProvider: LatexEditorOpenDocProvider,
+        },
+      }),
+
+    (Story, { globals }) => {
+      // FIXME: useScope has no effect
+      useScope({
+        rootFolder: {
+          name: 'rootFolder',
+          id: 'root-folder-id',
+          type: 'folder',
+          children: [
+            {
+              name: 'example.tex.tex',
+              id: 'example-doc-id',
+              type: 'doc',
+              selected: false,
+              $$hashKey: 'object:89',
+            },
+            {
+              name: 'frog.jpg',
+              id: 'frog-image-id',
+              type: 'file',
+              linkedFileData: null,
+              created: '2023-05-04T16:11:04.352Z',
+              $$hashKey: 'object:108',
+            },
+          ],
           selected: false,
-          $$hashKey: 'object:89',
         },
-        {
-          name: 'frog.jpg',
-          id: 'frog-image-id',
-          type: 'file',
-          linkedFileData: null,
-          created: '2023-05-04T16:11:04.352Z',
-          $$hashKey: 'object:108',
+        settings: {
+          ...settings,
+          overallTheme: globals.theme === 'default-' ? '' : globals.theme,
         },
-      ],
-      selected: false,
-    },
-    settings: {
-      ...settings,
-      overallTheme: theme === 'default-' ? '' : theme,
-    },
-    permissions,
-  })
+        permissions,
+      })
 
-  useMeta({
-    'ol-showSymbolPalette': true,
-  })
+      useMeta({
+        'ol-showSymbolPalette': true,
+      })
 
-  return <SourceEditor />
+      return <Story />
+    },
+  ],
 }
 
-export const Markdown = (args: any, { globals: { theme } }: any) => {
-  useScope({
-    editor: {
-      sharejs_doc: mockDoc(content.md, changes.md),
-      open_doc_name: 'example.md',
-    },
-    settings: {
-      ...settings,
-      overallTheme: theme === 'default-' ? '' : theme,
-    },
-    permissions,
-  })
+export const Markdown: Story = {
+  decorators: [
+    Story =>
+      ScopeDecorator(Story, {
+        mockCompileOnLoad: true,
+        providers: {
+          FileTreePathProvider,
+          EditorOpenDocProvider: MarkdownEditorOpenDocProvider,
+        },
+      }),
 
-  return <SourceEditor />
+    (Story, { globals }) => {
+      // FIXME: useScope has no effect
+      useScope({
+        settings: {
+          ...settings,
+          overallTheme: globals.theme === 'default-' ? '' : globals.theme,
+        },
+        permissions,
+      })
+
+      return <Story />
+    },
+  ],
 }
 
-export const Visual = (args: any, { globals: { theme } }: any) => {
-  useScope({
-    editor: {
-      sharejs_doc: mockDoc(content.tex, changes.tex),
-      open_doc_name: 'example.tex',
-      showVisual: true,
-    },
-    settings: {
-      ...settings,
-      overallTheme: theme === 'default-' ? '' : theme,
-    },
-    permissions,
-  })
-  useMeta({
-    'ol-showSymbolPalette': true,
-    'ol-mathJaxPath': 'https://unpkg.com/mathjax@3.2.2/es5/tex-svg-full.js',
-    'ol-project_id': '63e21c07946dd8c76505f85a',
-  })
+export const Visual: Story = {
+  decorators: [
+    Story =>
+      ScopeDecorator(Story, {
+        mockCompileOnLoad: true,
+        providers: {
+          FileTreePathProvider,
+          EditorOpenDocProvider: LatexEditorOpenDocProvider,
+        },
+      }),
 
-  return <SourceEditor />
+    (Story, { globals }) => {
+      // FIXME: useScope has no effect, so this does not default to the visual editor
+      useScope({
+        editor: {
+          showVisual: true,
+        },
+        settings: {
+          ...settings,
+          overallTheme: globals.theme === 'default-' ? '' : globals.theme,
+        },
+        permissions,
+      })
+
+      useMeta({
+        'ol-showSymbolPalette': true,
+        'ol-mathJaxPath': 'https://unpkg.com/mathjax@3.2.2/es5/tex-svg-full.js',
+        'ol-project_id': '63e21c07946dd8c76505f85a',
+      })
+
+      return <Story />
+    },
+  ],
 }
 
-export const Bibtex = (args: any, { globals: { theme } }: any) => {
-  useScope({
-    editor: {
-      sharejs_doc: mockDoc(content.bib, changes.bib),
-      open_doc_name: 'example.bib',
-    },
-    settings: {
-      ...settings,
-      overallTheme: theme === 'default-' ? '' : theme,
-    },
-    permissions,
-  })
+export const Bibtex: Story = {
+  decorators: [
+    Story =>
+      ScopeDecorator(Story, {
+        mockCompileOnLoad: true,
+        providers: {
+          FileTreePathProvider,
+          EditorOpenDocProvider: BibtexEditorOpenDocProvider,
+        },
+      }),
 
-  return <SourceEditor />
+    (Story, { globals }) => {
+      // FIXME: useScope has no effect
+      useScope({
+        settings: {
+          ...settings,
+          overallTheme: globals.theme === 'default-' ? '' : globals.theme,
+        },
+        permissions,
+      })
+
+      return <Story />
+    },
+  ],
 }
 
 const MAX_DOC_LENGTH = 2 * 1024 * 1024 // ol-maxDocLength
diff --git a/services/web/test/frontend/components/pdf-preview/pdf-logs-entries.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-logs-entries.spec.tsx
index 60326d8d3f..a3067b566e 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-logs-entries.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-logs-entries.spec.tsx
@@ -11,6 +11,7 @@ import {
 import { EditorView } from '@codemirror/view'
 import { OpenDocuments } from '@/features/ide-react/editor/open-documents'
 import { LogEntry } from '@/features/pdf-preview/util/types'
+import { EditorViewContext } from '@/features/ide-react/context/editor-view-context'
 
 describe('<PdfLogsEntries/>', function () {
   const fakeFindEntityResult: FindResult = {
@@ -48,6 +49,19 @@ describe('<PdfLogsEntries/>', function () {
     )
   }
 
+  const EditorViewProvider: FC<React.PropsWithChildren> = ({ children }) => {
+    const value = {
+      view: new EditorView({ doc: '\\documentclass{article}' }),
+      setView: cy.stub(),
+    }
+
+    return (
+      <EditorViewContext.Provider value={value}>
+        {children}
+      </EditorViewContext.Provider>
+    )
+  }
+
   const logEntries: LogEntry[] = [
     {
       file: 'main.tex',
@@ -62,10 +76,6 @@ describe('<PdfLogsEntries/>', function () {
     },
   ]
 
-  const scope = {
-    'editor.view': new EditorView({ doc: '\\documentclass{article}' }),
-  }
-
   beforeEach(function () {
     cy.interceptCompile()
     cy.interceptEvents()
@@ -73,7 +83,7 @@ describe('<PdfLogsEntries/>', function () {
 
   it('displays human readable hint', function () {
     cy.mount(
-      <EditorProviders scope={scope}>
+      <EditorProviders providers={{ EditorViewProvider }}>
         <PdfLogsEntries entries={logEntries} />
       </EditorProviders>
     )
@@ -84,8 +94,11 @@ describe('<PdfLogsEntries/>', function () {
   it('opens doc on click', function () {
     cy.mount(
       <EditorProviders
-        scope={scope}
-        providers={{ EditorManagerProvider, FileTreePathProvider }}
+        providers={{
+          EditorManagerProvider,
+          FileTreePathProvider,
+          EditorViewProvider,
+        }}
       >
         <PdfLogsEntries entries={logEntries} />
       </EditorProviders>
@@ -114,8 +127,11 @@ describe('<PdfLogsEntries/>', function () {
 
     cy.mount(
       <EditorProviders
-        scope={scope}
-        providers={{ EditorManagerProvider, FileTreePathProvider }}
+        providers={{
+          EditorManagerProvider,
+          FileTreePathProvider,
+          EditorViewProvider,
+        }}
       >
         <PdfLogsEntries entries={logEntries} />
       </EditorProviders>
@@ -154,8 +170,11 @@ describe('<PdfLogsEntries/>', function () {
 
     cy.mount(
       <EditorProviders
-        scope={scope}
-        providers={{ EditorManagerProvider, FileTreePathProvider }}
+        providers={{
+          EditorManagerProvider,
+          FileTreePathProvider,
+          EditorViewProvider,
+        }}
       >
         <PdfLogsEntries entries={logEntries} />
       </EditorProviders>
diff --git a/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx
index b2a64b89a4..f8c379c51e 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx
@@ -3,7 +3,10 @@ import { cloneDeep } from 'lodash'
 import { useDetachCompileContext as useCompileContext } from '../../../../frontend/js/shared/context/detach-compile-context'
 import { useFileTreeData } from '../../../../frontend/js/shared/context/file-tree-data-context'
 import { useEffect } from 'react'
-import { EditorProviders } from '../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorOpenDocProvider,
+} from '../../helpers/editor-providers'
 import { mockScope } from './scope'
 import { detachChannel, testDetachChannel } from '../../helpers/detach-channel'
 import { FindResult } from '@/features/file-tree/util/path'
@@ -73,6 +76,22 @@ const WithSelectedEntities = ({
   return null
 }
 
+function mockProviders() {
+  return {
+    EditorOpenDocProvider: makeEditorOpenDocProvider({
+      openDocName: 'main.tex',
+      currentDocument: {
+        doc_id: 'test-doc',
+        getSnapshot: () => 'some doc content',
+        hasBufferedOps: () => false,
+        on: () => {},
+        off: () => {},
+        leaveAndCleanUpPromise: () => Promise.resolve(),
+      },
+    }),
+  }
+}
+
 describe('<PdfSynctexControls/>', function () {
   beforeEach(function () {
     window.metaAttributesCache.set('ol-project_id', 'test-project')
@@ -84,9 +103,10 @@ describe('<PdfSynctexControls/>', function () {
     cy.interceptCompile()
 
     const scope = mockScope()
+    const providers = mockProviders()
 
     cy.mount(
-      <EditorProviders scope={scope}>
+      <EditorProviders scope={scope} providers={providers}>
         <WithPosition mockPosition={mockPosition} />
         <WithSelectedEntities mockSelectedEntities={mockSelectedEntities} />
         <PdfSynctexControls />
@@ -145,9 +165,10 @@ describe('<PdfSynctexControls/>', function () {
     cy.interceptCompile()
 
     const scope = mockScope()
+    const providers = mockProviders()
 
     cy.mount(
-      <EditorProviders scope={scope}>
+      <EditorProviders scope={scope} providers={providers}>
         <WithPosition mockPosition={mockPosition} />
         <WithSelectedEntities
           mockSelectedEntities={
@@ -169,9 +190,10 @@ describe('<PdfSynctexControls/>', function () {
     cy.interceptCompile()
 
     const scope = mockScope()
+    const providers = mockProviders()
 
     cy.mount(
-      <EditorProviders scope={scope}>
+      <EditorProviders scope={scope} providers={providers}>
         <WithPosition mockPosition={mockPosition} />
         <WithSelectedEntities
           mockSelectedEntities={[{ type: 'fileRef' }] as FindResult[]}
@@ -196,9 +218,10 @@ describe('<PdfSynctexControls/>', function () {
       cy.interceptCompile()
 
       const scope = mockScope()
+      const providers = mockProviders()
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} providers={providers}>
           <WithPosition mockPosition={mockPosition} />
           <WithSelectedEntities mockSelectedEntities={mockSelectedEntities} />
           <PdfSynctexControls />
@@ -218,9 +241,10 @@ describe('<PdfSynctexControls/>', function () {
       cy.interceptCompile()
 
       const scope = mockScope()
+      const providers = mockProviders()
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} providers={providers}>
           <WithPosition mockPosition={mockPosition} />
           <WithSelectedEntities mockSelectedEntities={mockSelectedEntities} />
           <PdfSynctexControls />
@@ -279,9 +303,10 @@ describe('<PdfSynctexControls/>', function () {
       cy.interceptCompile()
 
       const scope = mockScope()
+      const providers = mockProviders()
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} providers={providers}>
           <WithPosition mockPosition={mockPosition} />
           <WithSelectedEntities mockSelectedEntities={mockSelectedEntities} />
           <PdfSynctexControls />
@@ -317,9 +342,10 @@ describe('<PdfSynctexControls/>', function () {
       cy.interceptCompile()
 
       const scope = mockScope()
+      const providers = mockProviders()
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} providers={providers}>
           <WithPosition mockPosition={mockPosition} />
           <PdfSynctexControls />
         </EditorProviders>
@@ -338,9 +364,10 @@ describe('<PdfSynctexControls/>', function () {
       cy.interceptCompile()
 
       const scope = mockScope()
+      const providers = mockProviders()
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} providers={providers}>
           <PdfSynctexControls />
         </EditorProviders>
       )
@@ -385,9 +412,10 @@ describe('<PdfSynctexControls/>', function () {
       cy.interceptCompile()
 
       const scope = mockScope()
+      const providers = mockProviders()
 
       cy.mount(
-        <EditorProviders scope={scope}>
+        <EditorProviders scope={scope} providers={providers}>
           <WithPosition mockPosition={mockPosition} />
           <PdfSynctexControls />
         </EditorProviders>
diff --git a/services/web/test/frontend/components/pdf-preview/scope.tsx b/services/web/test/frontend/components/pdf-preview/scope.tsx
index e174efbf73..397813faa2 100644
--- a/services/web/test/frontend/components/pdf-preview/scope.tsx
+++ b/services/web/test/frontend/components/pdf-preview/scope.tsx
@@ -6,7 +6,6 @@ export const mockScope = () => ({
     pdfViewer: 'pdfjs',
   },
   editor: {
-    open_doc_name: 'main.tex',
     sharejs_doc: {
       doc_id: 'test-doc',
       getSnapshot: () => 'some doc content',
diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
index dfce8134d1..793ff7b16d 100644
--- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
+++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
@@ -12,6 +12,7 @@ import {
   USER_ID,
 } from '../../../helpers/editor-providers'
 import { location } from '@/shared/components/location'
+import useScopeValue from '@/shared/hooks/use-scope-value'
 
 async function changePrivilegeLevel(screen, { current, next }) {
   const select = screen.getByDisplayValue(current)
@@ -820,7 +821,14 @@ describe('<ShareProjectModal/>', function () {
     fetchMock.get(`/project/${project._id}/tokens`, {})
     fetchMock.post('express:/project/:projectId/settings/admin', 204)
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
+    let setPublicAccessLevel = function () {}
+
+    function WrappedModal() {
+      setPublicAccessLevel = useScopeValue('project.publicAccesLevel')[1]
+      return <ShareProjectModal {...modalProps} />
+    }
+
+    renderWithEditorContext(<WrappedModal />, {
       scope: {
         project: { ...project, publicAccesLevel: 'private' },
       },
@@ -839,13 +847,10 @@ describe('<ShareProjectModal/>', function () {
       publicAccessLevel: 'tokenBased',
     })
 
-    // NOTE: updating the scoped project data manually,
-    // as the project data is usually updated via the websocket connection
-    window.overleaf.unstable.store.set('project', {
-      ...project,
-      publicAccesLevel: 'tokenBased',
-    })
-    // watchCallbacks.project({ ...project, publicAccesLevel: 'tokenBased' })
+    // NOTE: the project data is usually updated via the websocket connection
+    // but we can't do that so we're doing it via the scope value store (this
+    // will be via the project context when this value has been migrated)
+    setPublicAccessLevel('tokenBased')
 
     await screen.findByText('Link sharing is on')
     const disableButton = await screen.findByRole('button', {
@@ -859,13 +864,7 @@ describe('<ShareProjectModal/>', function () {
       publicAccessLevel: 'private',
     })
 
-    // NOTE: updating the scoped project data manually,
-    // as the project data is usually updated via the websocket connection
-    window.overleaf.unstable.store.set('project', {
-      ...project,
-      publicAccesLevel: 'private',
-    })
-    // watchCallbacks.project({ ...project, publicAccesLevel: 'private' })
+    setPublicAccessLevel('private')
 
     await screen.findByText('Link sharing is off')
   })
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
index 1f78dcf93a..701e3bc4b3 100644
--- a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
@@ -17,8 +17,8 @@ export const mockScope = (
   return {
     editor: {
       sharejs_doc: mockDoc(content, docOptions),
-      open_doc_name: 'test.tex',
-      open_doc_id: docId,
+      openDocName: 'test.tex',
+      currentDocumentId: docId,
       showVisual: false,
       wantTrackChanges: false,
     },
diff --git a/services/web/test/frontend/helpers/editor-providers.jsx b/services/web/test/frontend/helpers/editor-providers.jsx
index 4f722525c7..f2ed404f66 100644
--- a/services/web/test/frontend/helpers/editor-providers.jsx
+++ b/services/web/test/frontend/helpers/editor-providers.jsx
@@ -9,12 +9,15 @@ import {
   IdeReactContext,
 } from '@/features/ide-react/context/ide-react-context'
 import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
+import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/react-scope-value-store'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
 import { ConnectionContext } from '@/features/ide-react/context/connection-context'
+import { EditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { ReactContextRoot } from '@/features/ide-react/context/react-context-root'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import useDetachLayout from '@/shared/hooks/use-detach-layout'
 import { LayoutContext } from '@/shared/context/layout-context'
+import useExposedState from '@/shared/hooks/use-exposed-state'
 
 // these constants can be imported in tests instead of
 // using magic strings
@@ -119,6 +122,8 @@ export function EditorProviders({
           off: () => {},
           leaveAndCleanUpPromise: async () => {},
         },
+        openDocName: null,
+        currentDocumentId: null,
       },
       project: {
         _id: projectId,
@@ -144,6 +149,11 @@ export function EditorProviders({
       providers={{
         ConnectionProvider: makeConnectionProvider(socket),
         IdeReactProvider: makeIdeReactProvider(scope, socket),
+        EditorOpenDocProvider: makeEditorOpenDocProvider({
+          openDocId: scope.editor.currentDocumentId,
+          openDocName: scope.editor.openDocName,
+          currentDocument: scope.editor.sharejs_doc,
+        }),
         LayoutProvider: makeLayoutProvider(layoutContext),
         ...providers,
       }}
@@ -202,15 +212,16 @@ const makeIdeReactProvider = (scope, socket) => {
         // TODO: path for nested entries
         scopeStore.set(key, value)
       }
-      scopeStore.set('editor.sharejs_doc', scope.editor.sharejs_doc)
       const scopeEventEmitter = new ReactScopeEventEmitter(
         new IdeEventEmitter()
       )
+      const unstableStore = new ReactScopeValueStore()
 
       return {
         socket,
         scopeStore,
         scopeEventEmitter,
+        unstableStore,
       }
     })
 
@@ -219,10 +230,10 @@ const makeIdeReactProvider = (scope, socket) => {
         ...window.overleaf,
         unstable: {
           ...window.overleaf?.unstable,
-          store: ideContextValue.scopeStore,
+          store: ideContextValue.unstableStore,
         },
       }
-    }, [ideContextValue.scopeStore])
+    }, [ideContextValue.unstableStore])
 
     return (
       <IdeReactContext.Provider value={ideReactContextValue}>
@@ -235,6 +246,44 @@ const makeIdeReactProvider = (scope, socket) => {
   return IdeReactProvider
 }
 
+export function makeEditorOpenDocProvider(initialValues) {
+  const {
+    currentDocumentId: initialCurrentDocumentId,
+    openDocName: initialOpenDocName,
+    currentDocument: initialCurrentDocument,
+  } = initialValues
+  const EditorOpenDocProvider = ({ children }) => {
+    const [currentDocumentId, setCurrentDocumentId] = useExposedState(
+      initialCurrentDocumentId,
+      'editor.open_doc_id'
+    )
+    const [openDocName, setOpenDocName] = useExposedState(
+      initialOpenDocName,
+      'editor.open_doc_name'
+    )
+    const [currentDocument, setCurrentDocument] = useState(
+      initialCurrentDocument
+    )
+
+    const value = {
+      currentDocumentId,
+      setCurrentDocumentId,
+      openDocName,
+      setOpenDocName,
+      currentDocument,
+      setCurrentDocument,
+    }
+
+    return (
+      <EditorOpenDocContext.Provider value={value}>
+        {children}
+      </EditorOpenDocContext.Provider>
+    )
+  }
+
+  return EditorOpenDocProvider
+}
+
 const makeLayoutProvider = layoutContextOverrides => {
   const layout = {
     ...layoutContextDefault,

From affd1bea497db5a7f53ed949adc0670211d25892 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Wed, 2 Jul 2025 08:53:42 +0100
Subject: [PATCH 071/274] Merge pull request #26586 from
 overleaf/td-file-view-error-reset

Reset file view loading and error state when switching between files

GitOrigin-RevId: 44be9bf71fe9541ed78db3421bf356997850e6ec
---
 .../js/features/ide-react/components/editor-and-pdf.tsx      | 5 ++++-
 .../js/features/ide-redesign/components/editor-panel.tsx     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/ide-react/components/editor-and-pdf.tsx b/services/web/frontend/js/features/ide-react/components/editor-and-pdf.tsx
index 6a9e4cd441..a7ae12515e 100644
--- a/services/web/frontend/js/features/ide-react/components/editor-and-pdf.tsx
+++ b/services/web/frontend/js/features/ide-react/components/editor-and-pdf.tsx
@@ -58,7 +58,10 @@ export const EditorAndPdf: FC = () => {
       >
         {selectedEntityCount === 0 && <NoSelectionPane />}
         {selectedEntityCount === 1 && openEntity?.type === 'fileRef' && (
-          <FileView file={fileViewFile(openEntity.entity)} />
+          <FileView
+            file={fileViewFile(openEntity.entity)}
+            key={openEntity.entity._id}
+          />
         )}
         {selectedEntityCount > 1 && (
           <MultipleSelectionPane selectedEntityCount={selectedEntityCount} />
diff --git a/services/web/frontend/js/features/ide-redesign/components/editor-panel.tsx b/services/web/frontend/js/features/ide-redesign/components/editor-panel.tsx
index 18fcad1395..d8204da5da 100644
--- a/services/web/frontend/js/features/ide-redesign/components/editor-panel.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/editor-panel.tsx
@@ -12,7 +12,10 @@ export default function EditorPanel() {
     <div className="ide-redesign-editor-container">
       {selectedEntityCount === 0 && <NoSelectionPane />}
       {selectedEntityCount === 1 && openEntity?.type === 'fileRef' && (
-        <FileView file={fileViewFile(openEntity.entity)} />
+        <FileView
+          file={fileViewFile(openEntity.entity)}
+          key={openEntity.entity._id}
+        />
       )}
       {selectedEntityCount > 1 && (
         <MultipleSelectionPane selectedEntityCount={selectedEntityCount} />

From ebb2cff2afd5fecdfca452d975f131a6623d879e Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Wed, 2 Jul 2025 08:54:46 +0100
Subject: [PATCH 072/274] Merge pull request #26697 from
 overleaf/td-custom-logo-sp

Restore custom logo feature on SP project dashboard

GitOrigin-RevId: c3ceafa8756968bfbb92f3fca22889e11a39dc40
---
 .../components/project-list-ds-nav.tsx        |  6 ++++-
 .../bootstrap-5/navbar/default-navbar.tsx     | 22 ++++++++++++++++---
 .../navbar/header-logo-or-title.tsx           | 15 ++++++++++---
 .../js/shared/svgs/overleaf-black.svg         |  9 ++++++++
 .../js/shared/svgs/overleaf-white.svg         |  1 +
 .../bootstrap-5/components/nav.scss           |  5 ++++-
 .../bootstrap-5/components/navbar.scss        |  5 ++++-
 .../types/css-properties-with-variables.tsx   |  4 ++++
 8 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 services/web/frontend/js/shared/svgs/overleaf-black.svg
 create mode 100644 services/web/frontend/js/shared/svgs/overleaf-white.svg
 create mode 100644 services/web/types/css-properties-with-variables.tsx

diff --git a/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx b/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
index 8f3b3a8e5d..f8c8014e1c 100644
--- a/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
+++ b/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
@@ -55,7 +55,11 @@ export function ProjectListDsNav() {
 
   return (
     <div className="project-ds-nav-page website-redesign">
-      <DefaultNavbar {...navbarProps} customLogo={overleafLogo} showCloseIcon />
+      <DefaultNavbar
+        {...navbarProps}
+        overleafLogo={overleafLogo}
+        showCloseIcon
+      />
       <main className="project-list-wrapper">
         <SidebarDsNav />
         <div className="project-ds-nav-content-and-messages">
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx
index 2480b7f061..8e5429dbde 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import React, { useState } from 'react'
 import { sendMB } from '@/infrastructure/event-tracking'
 import { useTranslation } from 'react-i18next'
 import { Button, Container, Nav, Navbar } from 'react-bootstrap'
@@ -13,9 +13,15 @@ import MaterialIcon from '@/shared/components/material-icon'
 import { useContactUsModal } from '@/shared/hooks/use-contact-us-modal'
 import { UserProvider } from '@/shared/context/user-context'
 import { X } from '@phosphor-icons/react'
+import overleafWhiteLogo from '@/shared/svgs/overleaf-white.svg'
+import overleafBlackLogo from '@/shared/svgs/overleaf-black.svg'
+import type { CSSPropertiesWithVariables } from '../../../../../../../types/css-properties-with-variables'
 
-function DefaultNavbar(props: DefaultNavbarMetadata) {
+function DefaultNavbar(
+  props: DefaultNavbarMetadata & { overleafLogo?: string }
+) {
   const {
+    overleafLogo,
     customLogo,
     title,
     canDisplayAdminMenu,
@@ -49,10 +55,20 @@ function DefaultNavbar(props: DefaultNavbarMetadata) {
         className="navbar-default navbar-main"
         expand="lg"
         onToggle={expanded => setExpanded(expanded)}
+        style={
+          {
+            '--navbar-brand-image-default-url': `url("${overleafWhiteLogo}")`,
+            '--navbar-brand-image-redesign-url': `url("${overleafBlackLogo}")`,
+          } as CSSPropertiesWithVariables
+        }
       >
         <Container className="navbar-container" fluid>
           <div className="navbar-header">
-            <HeaderLogoOrTitle title={title} customLogo={customLogo} />
+            <HeaderLogoOrTitle
+              title={title}
+              overleafLogo={overleafLogo}
+              customLogo={customLogo}
+            />
             {enableUpgradeButton ? (
               <Button
                 as="a"
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx
index 44500f1b82..3eefc8e2d1 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx
@@ -2,11 +2,13 @@ import type { DefaultNavbarMetadata } from '@/features/ui/components/types/defau
 import getMeta from '@/utils/meta'
 
 export default function HeaderLogoOrTitle({
+  overleafLogo,
   customLogo,
   title,
-}: Pick<DefaultNavbarMetadata, 'customLogo' | 'title'>) {
+}: Pick<DefaultNavbarMetadata, 'customLogo' | 'title'> & {
+  overleafLogo?: string
+}) {
   const { appName } = getMeta('ol-ExposedSettings')
-
   if (customLogo) {
     return (
       // eslint-disable-next-line jsx-a11y/anchor-has-content
@@ -24,9 +26,16 @@ export default function HeaderLogoOrTitle({
       </a>
     )
   } else {
+    const style = overleafLogo
+      ? {
+          style: {
+            backgroundImage: `url("${overleafLogo}")`,
+          },
+        }
+      : null
     return (
       // eslint-disable-next-line jsx-a11y/anchor-has-content
-      <a href="/" aria-label={appName} className="navbar-brand" />
+      <a href="/" aria-label={appName} className="navbar-brand" {...style} />
     )
   }
 }
diff --git a/services/web/frontend/js/shared/svgs/overleaf-black.svg b/services/web/frontend/js/shared/svgs/overleaf-black.svg
new file mode 100644
index 0000000000..ea0678438b
--- /dev/null
+++ b/services/web/frontend/js/shared/svgs/overleaf-black.svg
@@ -0,0 +1,9 @@
+<svg width="129" height="38" viewBox="0 0 129 38" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_2579_355" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="72" height="38">
+<path d="M71.7643 37.6327H0.0244141V0.0717773H71.7643V37.6327Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2579_355)">
+<path d="M47.2509 26.4555C47.3948 27.7507 47.8985 28.7821 48.81 29.5257C49.6974 30.2692 50.8487 30.653 52.2638 30.653C53.1993 30.653 54.0387 30.4611 54.7823 30.0773C55.5258 29.6696 56.1255 29.1419 56.5572 28.4223H61.0664C60.2989 30.3891 59.1716 31.9002 57.6365 33.0035C56.1255 34.0829 54.3506 34.6345 52.3598 34.6345C51.0166 34.6345 49.7934 34.3947 48.666 33.915C47.5387 33.4352 46.5314 32.7397 45.6199 31.8043C44.7804 30.9168 44.1089 29.9094 43.6531 28.7341C43.1974 27.5589 42.9576 26.3836 42.9576 25.1603C42.9576 23.9131 43.1734 22.7138 43.6052 21.6105C44.0369 20.5072 44.6605 19.4998 45.5 18.6124C46.4114 17.629 47.4668 16.8854 48.6181 16.3817C49.7694 15.8541 50.9686 15.5902 52.1919 15.5902C53.7509 15.5902 55.214 15.95 56.5572 16.6456C57.9004 17.3651 59.0517 18.3485 60.0111 19.6437C60.5867 20.4113 61.0185 21.2747 61.3063 22.2581C61.5941 23.2175 61.714 24.3209 61.714 25.5681C61.714 25.664 61.714 25.8079 61.69 26.0238C61.69 26.2397 61.6661 26.3836 61.6661 26.4795H47.2509V26.4555ZM57.2048 23.1216C56.845 21.9223 56.2454 21.0109 55.4059 20.3873C54.5664 19.7637 53.4871 19.4519 52.2159 19.4519C51.0886 19.4519 50.1052 19.7876 49.2177 20.4592C48.3303 21.1308 47.7306 22.0183 47.4188 23.1216H57.2048ZM71.7638 19.7637C70.1328 19.8836 69.0055 20.3153 68.3579 21.0349C67.7103 21.7544 67.3985 23.0496 67.3985 24.9205V34.1068H63.2011V16.1179H67.1347V18.2046C67.7583 17.3891 68.4539 16.8135 69.2214 16.4297C69.9649 16.0459 70.8284 15.8541 71.7638 15.8541V19.7637ZM32.428 1.24705C27.3432 -0.743722 8.9465 -1.46328 8.92251 9.52196C3.54982 12.9519 0 18.5404 0 24.5367C0 31.7803 5.87638 37.6567 13.1199 37.6567C20.3635 37.6567 26.2399 31.7803 26.2399 24.5367C26.2399 18.9482 22.738 14.1511 17.797 12.2803C16.8376 11.9205 14.7749 11.2729 13.1439 11.4168C10.7934 12.9039 7.91513 15.974 6.57196 19.0441C8.58672 16.6216 11.7288 15.5662 14.5351 16.022C18.6365 16.6936 21.7786 20.2434 21.7786 24.5607C21.7786 29.3338 17.917 33.1954 13.1439 33.1954C10.5055 33.1954 8.15498 32.0201 6.57196 30.1733C4.19742 27.415 3.59779 24.4408 4.07749 21.5386C5.73247 11.3688 17.797 5.58838 26.7675 3.35775C23.8413 4.9168 18.5646 7.45923 14.8708 10.2175C25.6402 14.391 27.3911 5.30056 32.428 1.24705ZM36.7934 34.1308H33.5074L26.6716 16.1179H31.1328L35.3303 28.0865L39.6476 16.1179H43.9889L36.7934 34.1308Z" fill="#1B222C"/>
+</g>
+<path d="M83.6127 26.4556C83.7567 27.7508 84.2843 28.7822 85.1718 29.5257C86.0592 30.2692 87.2105 30.653 88.6257 30.653C89.5611 30.653 90.4006 30.4611 91.1441 30.0774C91.8877 29.6696 92.4873 29.1419 92.919 28.4224H97.4282C96.6607 30.3892 95.5334 31.9002 93.9984 33.0036C92.4873 34.0829 90.7124 34.6346 88.7216 34.6346C87.3784 34.6346 86.1552 34.3947 85.0279 33.915C83.9006 33.4353 82.8932 32.7397 81.9817 31.8043C81.1423 30.9168 80.4707 29.9095 80.015 28.7342C79.5353 27.5829 79.3194 26.3836 79.3194 25.1604C79.3194 23.9131 79.5353 22.7139 79.967 21.6106C80.3987 20.5072 81.0223 19.4999 81.8618 18.6124C82.7733 17.629 83.8286 16.8855 84.9799 16.3818C86.1312 15.8541 87.3305 15.5903 88.5537 15.5903C90.1128 15.5903 91.5758 15.95 92.919 16.6456C94.2622 17.3652 95.4135 18.3486 96.3729 19.6438C96.9485 20.4113 97.3803 21.2748 97.6681 22.2582C97.9559 23.2176 98.0758 24.3209 98.0758 25.5681C98.0758 25.6641 98.0758 25.808 98.0519 26.0238C98.0519 26.2397 98.0279 26.3836 98.0279 26.4796H83.6127V26.4556ZM93.5426 23.1216C93.1829 21.9224 92.5832 21.0109 91.7437 20.3873C90.9043 19.7637 89.8249 19.4519 88.5537 19.4519C87.4264 19.4519 86.443 19.7877 85.5556 20.4593C84.6681 21.1309 84.0685 22.0183 83.7567 23.1216H93.5426ZM114.698 34.1309V31.9242C114.194 32.8117 113.498 33.4833 112.587 33.915C111.675 34.3467 110.5 34.5626 109.085 34.5626C106.423 34.5626 104.192 33.6512 102.417 31.8283C100.642 30.0054 99.7308 27.7508 99.7308 25.0644C99.7308 23.7932 99.9467 22.594 100.402 21.4667C100.858 20.3393 101.482 19.332 102.321 18.4685C103.209 17.5091 104.216 16.8135 105.295 16.3578C106.375 15.9021 107.622 15.6862 108.989 15.6862C110.308 15.6862 111.436 15.9021 112.371 16.3338C113.306 16.7655 114.074 17.4371 114.65 18.3246V16.1419H118.727V34.1548H114.698V34.1309ZM104.024 24.9685C104.024 26.4796 104.528 27.7508 105.535 28.7822C106.543 29.8135 107.766 30.3172 109.229 30.3172C110.548 30.3172 111.699 29.8135 112.707 28.7822C113.714 27.7508 114.218 26.5515 114.218 25.1844C114.218 23.7213 113.714 22.474 112.707 21.4187C111.699 20.3633 110.524 19.8357 109.157 19.8357C107.742 19.8357 106.543 20.3393 105.535 21.3227C104.528 22.3301 104.024 23.5294 104.024 24.9685ZM129.904 16.1179V19.8596H126.882V34.1309H122.829V19.8596H120.694V16.1179H122.709V15.6382C122.709 13.7434 123.236 12.3283 124.268 11.3929C125.323 10.4574 126.906 10.0017 129.041 10.0017C129.113 10.0017 129.257 10.0017 129.449 10.0257C129.64 10.0257 129.784 10.0497 129.904 10.0497V13.8154H129.616C128.657 13.8154 127.985 13.9833 127.578 14.2711C127.17 14.5829 126.954 15.0866 126.954 15.8301V16.1659H129.904V16.1179ZM73.5869 34.1309H77.6884V10.2895H73.5869V34.1309Z" fill="#1B222C"/>
+</svg>
diff --git a/services/web/frontend/js/shared/svgs/overleaf-white.svg b/services/web/frontend/js/shared/svgs/overleaf-white.svg
new file mode 100644
index 0000000000..2ced81aa46
--- /dev/null
+++ b/services/web/frontend/js/shared/svgs/overleaf-white.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 542 157" enable-background="new 0 0 542 157"><style>.st0{filter:url(#Adobe_OpacityMaskFilter);} .st1{fill:#FFFFFF;} .st2{mask:url(#mask-2);fill:#FFFFFF;}</style><g id="Page-1"><g id="Overleaf"><g id="Group-3"><defs><filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0" y=".3" width="299.2" height="156.7"><feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/></filter></defs><mask maskUnits="userSpaceOnUse" x="0" y=".3" width="299.2" height="156.7" id="mask-2"><g class="st0"><path id="path-1" class="st1" d="M299.2 156.9H.1V.3h299.1z"/></g></mask><path id="Fill-1" class="st2" d="M197 110.3c.6 5.4 2.7 9.7 6.5 12.8 3.7 3.1 8.5 4.7 14.4 4.7 3.9 0 7.4-.8 10.5-2.4 3.1-1.7 5.6-3.9 7.4-6.9h18.8c-3.2 8.2-7.9 14.5-14.3 19.1-6.3 4.5-13.7 6.8-22 6.8-5.6 0-10.7-1-15.4-3-4.7-2-8.9-4.9-12.7-8.8-3.5-3.7-6.3-7.9-8.2-12.8s-2.9-9.8-2.9-14.9c0-5.2.9-10.2 2.7-14.8 1.8-4.6 4.4-8.8 7.9-12.5 3.8-4.1 8.2-7.2 13-9.3 4.8-2.2 9.8-3.3 14.9-3.3 6.5 0 12.6 1.5 18.2 4.4 5.6 3 10.4 7.1 14.4 12.5 2.4 3.2 4.2 6.8 5.4 10.9 1.2 4 1.7 8.6 1.7 13.8 0 .4 0 1-.1 1.9 0 .9-.1 1.5-.1 1.9H197v-.1zm41.5-13.9c-1.5-5-4-8.8-7.5-11.4-3.5-2.6-8-3.9-13.3-3.9-4.7 0-8.8 1.4-12.5 4.2-3.7 2.8-6.2 6.5-7.5 11.1h40.8zm60.7-14c-6.8.5-11.5 2.3-14.2 5.3-2.7 3-4 8.4-4 16.2v38.3h-17.5v-75h16.4v8.7c2.6-3.4 5.5-5.8 8.7-7.4 3.1-1.6 6.7-2.4 10.6-2.4v16.3zm-164-77.2C114-3.1 37.3-6.1 37.2 39.7 14.8 54 0 77.3 0 102.3 0 132.5 24.5 157 54.7 157c30.2 0 54.7-24.5 54.7-54.7 0-23.3-14.6-43.3-35.2-51.1-4-1.5-12.6-4.2-19.4-3.6-9.8 6.2-21.8 19-27.4 31.8 8.4-10.1 21.5-14.5 33.2-12.6 17.1 2.8 30.2 17.6 30.2 35.6 0 19.9-16.1 36-36 36-11 0-20.8-4.9-27.4-12.6-9.9-11.5-12.4-23.9-10.4-36 6.9-42.4 57.2-66.5 94.6-75.8C99.4 20.5 77.4 31.1 62 42.6c44.9 17.4 52.2-20.5 73.2-37.4zm18.2 137.1h-13.7l-28.5-75.1h18.6l17.5 49.9 18-49.9h18.1l-30 75.1z"/></g><path id="Fill-4" class="st1" d="M348.6 110.3c.6 5.4 2.8 9.7 6.5 12.8 3.7 3.1 8.5 4.7 14.4 4.7 3.9 0 7.4-.8 10.5-2.4 3.1-1.7 5.6-3.9 7.4-6.9h18.8c-3.2 8.2-7.9 14.5-14.3 19.1-6.3 4.5-13.7 6.8-22 6.8-5.6 0-10.7-1-15.4-3-4.7-2-8.9-4.9-12.7-8.8-3.5-3.7-6.3-7.9-8.2-12.8-2-4.8-2.9-9.8-2.9-14.9 0-5.2.9-10.2 2.7-14.8 1.8-4.6 4.4-8.8 7.9-12.5 3.8-4.1 8.2-7.2 13-9.3 4.8-2.2 9.8-3.3 14.9-3.3 6.5 0 12.6 1.5 18.2 4.4 5.6 3 10.4 7.1 14.4 12.5 2.4 3.2 4.2 6.8 5.4 10.9 1.2 4 1.7 8.6 1.7 13.8 0 .4 0 1-.1 1.9 0 .9-.1 1.5-.1 1.9h-60.1v-.1zM390 96.4c-1.5-5-4-8.8-7.5-11.4-3.5-2.6-8-3.9-13.3-3.9-4.7 0-8.8 1.4-12.5 4.2-3.7 2.8-6.2 6.5-7.5 11.1H390zm88.2 45.9v-9.2c-2.1 3.7-5 6.5-8.8 8.3-3.8 1.8-8.7 2.7-14.6 2.7-11.1 0-20.4-3.8-27.8-11.4-7.4-7.6-11.2-17-11.2-28.2 0-5.3.9-10.3 2.8-15 1.9-4.7 4.5-8.9 8-12.5 3.7-4 7.9-6.9 12.4-8.8s9.7-2.8 15.4-2.8c5.5 0 10.2.9 14.1 2.7 3.9 1.8 7.1 4.6 9.5 8.3v-9.1h17v75.1h-16.8v-.1zm-44.5-38.2c0 6.3 2.1 11.6 6.3 15.9 4.2 4.3 9.3 6.4 15.4 6.4 5.5 0 10.3-2.1 14.5-6.4 4.2-4.3 6.3-9.3 6.3-15 0-6.1-2.1-11.3-6.3-15.7-4.2-4.4-9.1-6.6-14.8-6.6-5.9 0-10.9 2.1-15.1 6.2-4.2 4.2-6.3 9.2-6.3 15.2zm107.9-36.9v15.6H529v59.5h-16.9V82.8h-8.9V67.2h8.4v-2c0-7.9 2.2-13.8 6.5-17.7 4.4-3.9 11-5.8 19.9-5.8.3 0 .9 0 1.7.1.8 0 1.4.1 1.9.1v15.7h-1.2c-4 0-6.8.7-8.5 1.9-1.7 1.3-2.6 3.4-2.6 6.5v1.4h12.3v-.2zm-234.8 75.1h17.1V42.9h-17.1v99.4z"/></g></g></svg>
\ No newline at end of file
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss b/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss
index 5d28341cf5..dd0600ed15 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss
@@ -8,7 +8,10 @@
   --navbar-padding-h: var(--spacing-05);
   --navbar-padding: 0 var(--navbar-padding-h);
   --navbar-brand-width: 130px;
-  --navbar-brand-image-url: url('../../../../public/img/ol-brand/overleaf-white.svg');
+  --navbar-brand-image-url: var(
+    --navbar-brand-image-default-url,
+    url('../../../../public/img/ol-brand/overleaf-white.svg')
+  );
 
   // Title, when used instead of a logo
   --navbar-title-font-size: var(--font-size-05);
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss b/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
index 3b984bb6f3..a8855ea1ca 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
@@ -216,7 +216,10 @@
 .website-redesign .navbar-default {
   --navbar-title-color: var(--content-primary);
   --navbar-title-color-hover: var(--content-secondary);
-  --navbar-brand-image-url: url('../../../../public/img/ol-brand/overleaf-black.svg');
+  --navbar-brand-image-url: var(
+    --navbar-brand-image-redesign-url,
+    url('../../../../public/img/ol-brand/overleaf-black.svg')
+  );
   --navbar-subdued-color: var(--content-primary);
   --navbar-subdued-hover-bg: var(--bg-dark-primary);
   --navbar-subdued-hover-color: var(--content-primary-dark);
diff --git a/services/web/types/css-properties-with-variables.tsx b/services/web/types/css-properties-with-variables.tsx
new file mode 100644
index 0000000000..fe0e85902a
--- /dev/null
+++ b/services/web/types/css-properties-with-variables.tsx
@@ -0,0 +1,4 @@
+import { CSSProperties } from 'react'
+
+export type CSSPropertiesWithVariables = CSSProperties &
+  Record<`--${string}`, number | string>

From 67342e9c3322722157b196dc97a2b2006b70fa42 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 2 Jul 2025 10:41:44 +0200
Subject: [PATCH 073/274] [terraform] clsi: add pre-emp C2D capacity in zone b
 (#26755)

GitOrigin-RevId: aa52dec1f7135f53f8c887199c1d1e4e31ef70ff
---
 .../components/full-project-match-counts.tsx  |  33 ++
 .../components/full-project-search-button.tsx |  57 +++
 .../full-project-search-modifiers.tsx         |  78 ++++
 .../full-project-search-results.tsx           | 174 +++++++++
 .../js/components/full-project-search-ui.tsx  | 250 ++++++++++++
 .../js/components/full-project-search.tsx     |  22 ++
 .../js/components/matched-hit-highlight.tsx   |  49 +++
 .../frontend/js/components/matched-hit.tsx    |  45 +++
 .../frontend/js/util/regexp.ts                |   7 +
 .../frontend/js/util/search-snapshot.ts       |  92 +++++
 .../frontend/js/util/search.ts                |  50 +++
 .../stylesheets/full-project-search.scss      | 367 ++++++++++++++++++
 .../stories/full-project-search.stories.tsx   | 113 ++++++
 13 files changed, 1337 insertions(+)
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/full-project-search-button.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/full-project-search-modifiers.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/full-project-search-results.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/full-project-search.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/matched-hit-highlight.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/components/matched-hit.tsx
 create mode 100644 services/web/modules/full-project-search/frontend/js/util/regexp.ts
 create mode 100644 services/web/modules/full-project-search/frontend/js/util/search-snapshot.ts
 create mode 100644 services/web/modules/full-project-search/frontend/js/util/search.ts
 create mode 100644 services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss
 create mode 100644 services/web/modules/full-project-search/stories/full-project-search.stories.tsx

diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
new file mode 100644
index 0000000000..7483488b0c
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
@@ -0,0 +1,33 @@
+import React, { FC } from 'react'
+import LoadingSpinner from '@/shared/components/loading-spinner'
+import { MatchedFile } from '../util/search-snapshot'
+import { useTranslation } from 'react-i18next'
+
+export const FullProjectMatchCounts: FC<{
+  loading: boolean
+  totalResults?: number
+  matchedFiles?: MatchedFile[]
+}> = ({ loading, matchedFiles }) => {
+  const { t } = useTranslation()
+
+  if (loading) {
+    return <LoadingSpinner delay={500} />
+  }
+
+  if (matchedFiles === undefined) {
+    return null
+  }
+
+  const totalResults = matchedFiles.flatMap(file => file.hits).length
+
+  if (totalResults === 0) {
+    return <>{t('project_search_result_count', { count: totalResults })}</>
+  }
+
+  return (
+    <>
+      {t('project_search_result_count', { count: totalResults })}{' '}
+      {t('project_search_file_count', { count: matchedFiles.length })}
+    </>
+  )
+}
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-search-button.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-search-button.tsx
new file mode 100644
index 0000000000..83031ba595
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-search-button.tsx
@@ -0,0 +1,57 @@
+import React, { FC, useMemo } from 'react'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import classnames from 'classnames'
+import MaterialIcon from '@/shared/components/material-icon'
+import { useLayoutContext } from '@/shared/context/layout-context'
+import { useTranslation } from 'react-i18next'
+import { TooltipProps } from '@/features/ui/components/bootstrap-5/tooltip'
+import { isMac } from '@/shared/utils/os'
+import { sendSearchEvent } from '@/features/event-tracking/search-events'
+
+const FullProjectSearchButton: FC = () => {
+  const { projectSearchIsOpen, setProjectSearchIsOpen } = useLayoutContext()
+  const { t } = useTranslation()
+
+  const tooltipProps: Pick<
+    TooltipProps,
+    'id' | 'description' | 'overlayProps'
+  > = useMemo(
+    () => ({
+      id: 'search',
+      description: (
+        <>
+          <div>{t('search_project')}</div>
+          <div>{isMac ? '⇧⌘F' : 'Ctrl+Shift+F'}</div>
+        </>
+      ),
+      overlayProps: { placement: 'bottom' },
+    }),
+    [t]
+  )
+
+  return (
+    <OLTooltip {...tooltipProps}>
+      <button
+        className={classnames('btn', {
+          active: projectSearchIsOpen,
+        })}
+        onClick={() => {
+          if (!projectSearchIsOpen) {
+            sendSearchEvent('search-open', {
+              searchType: 'full-project',
+              method: 'button',
+              location: 'toolbar',
+            })
+          }
+          setProjectSearchIsOpen(value => !value)
+        }}
+        tabIndex={-1}
+        data-active={projectSearchIsOpen}
+      >
+        <MaterialIcon type="search" accessibilityLabel={t('search')} />
+      </button>
+    </OLTooltip>
+  )
+}
+
+export default FullProjectSearchButton
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-search-modifiers.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-search-modifiers.tsx
new file mode 100644
index 0000000000..465bf1363a
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-search-modifiers.tsx
@@ -0,0 +1,78 @@
+import React, { useRef, forwardRef, useImperativeHandle } from 'react'
+import { SearchQuery } from '@codemirror/search'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import { Form } from 'react-bootstrap'
+import { useTranslation } from 'react-i18next'
+
+export const FullProjectSearchModifiers = forwardRef(
+  function FullProjectSearchModifiers(props, ref) {
+    const { t } = useTranslation()
+
+    const caseSensitiveRef = useRef<HTMLInputElement>(null)
+    const regexpRef = useRef<HTMLInputElement>(null)
+    const wholeWordRef = useRef<HTMLInputElement>(null)
+
+    useImperativeHandle(ref, () => {
+      return {
+        setQuery(query: SearchQuery) {
+          caseSensitiveRef.current!.checked = query.caseSensitive
+          regexpRef.current!.checked = query.regexp
+          wholeWordRef.current!.checked = query.wholeWord
+        },
+      }
+    }, [])
+
+    return (
+      <div className="full-project-search-modifiers" role="group">
+        <OLTooltip
+          id="project-search-caseSensitive"
+          description={t('search_match_case')}
+          overlayProps={{ placement: 'bottom' }}
+        >
+          <span>
+            <Form.Check
+              inline
+              label="Aa"
+              name="caseSensitive"
+              type="checkbox"
+              id="project-search-caseSensitive"
+              ref={caseSensitiveRef}
+            />
+          </span>
+        </OLTooltip>
+        <OLTooltip
+          id="project-search-regexp"
+          description={t('search_regexp')}
+          overlayProps={{ placement: 'bottom' }}
+        >
+          <span>
+            <Form.Check
+              inline
+              label="[.*]"
+              name="regexp"
+              type="checkbox"
+              id="project-search-regexp"
+              ref={regexpRef}
+            />
+          </span>
+        </OLTooltip>
+        <OLTooltip
+          id="project-search-wholeWord"
+          description={t('search_whole_word')}
+          overlayProps={{ placement: 'bottom' }}
+        >
+          <span>
+            <Form.Check
+              inline
+              label="W"
+              name="wholeWord"
+              type="checkbox"
+              id="project-search-wholeWord"
+              ref={wholeWordRef}
+            />
+          </span>
+        </OLTooltip>
+      </div>
+    )
+  }
+)
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-search-results.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-search-results.tsx
new file mode 100644
index 0000000000..33ae590254
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-search-results.tsx
@@ -0,0 +1,174 @@
+import React, { FC, useCallback, useEffect, useRef, useState } from 'react'
+import { Hit, MatchedFile } from '../util/search-snapshot'
+import classnames from 'classnames'
+import { CollapsibleFileHeader } from '@/shared/components/collapsible-file-header'
+import { MatchedHit } from './matched-hit'
+import { useFileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
+import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { sendSearchEvent } from '@/features/event-tracking/search-events'
+
+export const FullProjectSearchResults: FC<{
+  matchedFiles: MatchedFile[]
+  currentDocPath: string | null
+}> = ({ matchedFiles, currentDocPath }) => {
+  const [collapsedFiles, setCollapsedFiles] = useState<Set<string>>(new Set())
+  const [selectedHit, setSelectedHit] = useState<Hit>()
+
+  const toggleCollapse = useCallback((path: string) => {
+    setCollapsedFiles(value => {
+      const newValue = new Set(value)
+      if (newValue.has(path)) {
+        newValue.delete(path)
+      } else {
+        newValue.add(path)
+      }
+      return newValue
+    })
+  }, [])
+
+  const resultsContainerRef = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    const container = resultsContainerRef.current
+    if (container) {
+      const hits = matchedFiles.flatMap(file => file.hits)
+
+      const findSelectedHitIndex = () =>
+        hits.findIndex(hit => hit === selectedHit)
+
+      const listener = (event: KeyboardEvent) => {
+        if (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey) {
+          return
+        }
+
+        if (!matchedFiles) {
+          return
+        }
+
+        switch (event.key) {
+          case 'Enter':
+          case ' ': // Space
+            window.setTimeout(() => {
+              window.dispatchEvent(new Event('editor:focus'))
+            })
+            break
+
+          case 'ArrowUp':
+            {
+              event.preventDefault()
+              let index = findSelectedHitIndex()
+              if (index === 0) {
+                index = hits.length
+              }
+              index--
+              if (index < 0) {
+                index = 0
+              }
+              setSelectedHit(hits[index])
+            }
+            break
+
+          case 'ArrowDown':
+            {
+              event.preventDefault()
+              let index = findSelectedHitIndex()
+              index++
+              if (index >= hits.length) {
+                index = 0
+              }
+              setSelectedHit(hits[index])
+            }
+            break
+        }
+      }
+
+      container.addEventListener('keydown', listener)
+
+      return () => {
+        container.removeEventListener('keydown', listener)
+      }
+    }
+  }, [matchedFiles, selectedHit, setSelectedHit])
+
+  const { findEntityByPath } = useFileTreePathContext()
+  const { openDocWithId, openFileWithId } = useEditorManagerContext()
+
+  const selectedHitRef = useRef<Hit>()
+
+  useEffect(() => {
+    // only open the doc if selectedHit has actually changed
+    if (selectedHit && selectedHit !== selectedHitRef.current) {
+      selectedHitRef.current = selectedHit
+      const selectedFile = matchedFiles.find(file =>
+        file.hits.includes(selectedHit)
+      )
+      if (selectedFile) {
+        const result = findEntityByPath(selectedFile.path)
+        if (result) {
+          sendSearchEvent('search-result-click', {
+            searchType: 'full-project',
+          })
+          const line = selectedHit.lineIndex
+          const column = selectedHit.matchIndex
+          const text = selectedFile.lines[line].substring(
+            column,
+            column + selectedHit.length
+          )
+          if (result.type === 'doc') {
+            openDocWithId(result.entity._id, {
+              gotoLine: line + 1,
+              gotoColumn: column,
+              selectText: text,
+            })
+          } else if (result.type === 'fileRef') {
+            openFileWithId(result.entity._id)
+          }
+        }
+      }
+    }
+  }, [
+    findEntityByPath,
+    matchedFiles,
+    openDocWithId,
+    openFileWithId,
+    selectedHit,
+  ])
+
+  const tabbableHit = selectedHit ?? matchedFiles?.[0]?.hits[0]
+
+  return (
+    <div className="matched-files" ref={resultsContainerRef}>
+      {matchedFiles.map(matchedFile => (
+        <div
+          key={matchedFile.path}
+          className={classnames('matched-file', {
+            'matched-file-open': currentDocPath === matchedFile.path,
+          })}
+        >
+          <CollapsibleFileHeader
+            name={matchedFile.path}
+            count={matchedFile.hits.length}
+            collapsed={collapsedFiles.has(matchedFile.path)}
+            toggleCollapsed={() => toggleCollapse(matchedFile.path)}
+          />
+          {!collapsedFiles.has(matchedFile.path) && (
+            <div className="list-group matched-file-hits" role="listbox">
+              {matchedFile.hits.map(hit => {
+                return (
+                  <MatchedHit
+                    key={`${hit.lineIndex}:${hit.matchIndex}`}
+                    matchedFile={matchedFile}
+                    hit={hit}
+                    selected={hit === selectedHit}
+                    setSelectedHit={setSelectedHit}
+                    tabIndex={tabbableHit === hit ? 0 : -1}
+                  />
+                )
+              })}
+            </div>
+          )}
+        </div>
+      ))}
+    </div>
+  )
+}
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx
new file mode 100644
index 0000000000..db42a927a4
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx
@@ -0,0 +1,250 @@
+import React, {
+  FC,
+  FormEventHandler,
+  memo,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
+import { useTranslation } from 'react-i18next'
+import { useLayoutContext } from '@/shared/context/layout-context'
+import { useProjectContext } from '@/shared/context/project-context'
+import {
+  MatchedFile as MatchedFileType,
+  searchSnapshot,
+} from '../util/search-snapshot'
+import { SearchQuery } from '@codemirror/search'
+import { debugConsole } from '@/utils/debugging'
+import useEventListener from '@/shared/hooks/use-event-listener'
+import { Col, Form, Row } from 'react-bootstrap'
+import OLFormControl from '@/features/ui/components/ol/ol-form-control'
+import Button from '@/features/ui/components/bootstrap-5/button'
+import Notification from '@/shared/components/notification'
+import '../../stylesheets/full-project-search.scss'
+import { userStyles } from '@/shared/utils/styles'
+import { useUserSettingsContext } from '@/shared/context/user-settings-context'
+import { FullProjectMatchCounts } from './full-project-match-counts'
+import { FullProjectSearchModifiers } from './full-project-search-modifiers'
+import { isMac } from '@/shared/utils/os'
+import { PanelHeading } from '@/shared/components/panel-heading'
+import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { createRegExp } from '../util/regexp'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import { useFileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
+import { FullProjectSearchResults } from './full-project-search-results'
+import { signalWithTimeout } from '@/utils/abort-signal'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
+import RailPanelHeader from '@/features/ide-redesign/components/rail-panel-header'
+
+const FullProjectSearchUI: FC = () => {
+  const { t } = useTranslation()
+  const { setProjectSearchIsOpen } = useLayoutContext()
+  const { projectSnapshot } = useProjectContext()
+  const { openDocs } = useEditorManagerContext()
+  const { pathInFolder } = useFileTreePathContext()
+  const newEditor = useIsNewEditorEnabled()
+
+  const { currentDocument: currentDoc } = useEditorOpenDocContext()
+
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState<string>()
+  const [matchedFiles, setMatchedFiles] = useState<MatchedFileType[]>()
+
+  const { userSettings } = useUserSettingsContext()
+  const { fontFamily, fontSize } = useMemo(
+    () => userStyles(userSettings),
+    [userSettings]
+  )
+
+  const abortControllerRef = useRef<AbortController | null>(null)
+
+  // start fetching the snapshot when the project search UI opens
+  useEffect(() => {
+    projectSnapshot.refresh().catch(error => {
+      debugConsole.error(error)
+    })
+  }, [projectSnapshot])
+
+  const currentDocPath = useMemo(() => {
+    return currentDoc && pathInFolder(currentDoc.doc_id)
+  }, [currentDoc, pathInFolder])
+
+  const handleSubmit: React.FormEventHandler<HTMLFormElement> = useCallback(
+    async event => {
+      event.preventDefault()
+
+      setMatchedFiles(undefined)
+
+      abortControllerRef.current?.abort()
+      abortControllerRef.current = new AbortController()
+
+      const data = new FormData(event.target as HTMLFormElement)
+
+      const searchQuery = new SearchQuery({
+        search: data.get('search') as string,
+        // replace: data.get('replace') as string,
+        caseSensitive: data.get('caseSensitive') === 'on',
+        regexp: data.get('regexp') === 'on',
+        wholeWord: data.get('wholeWord') === 'on',
+        literal: data.get('regexp') !== 'on',
+      })
+
+      if (searchQuery.regexp) {
+        try {
+          createRegExp(searchQuery)
+        } catch (error) {
+          setError(t('invalid_regular_expression'))
+          return
+        }
+      }
+
+      setLoading(true)
+      setError(undefined)
+      try {
+        await openDocs.awaitBufferedOps(
+          signalWithTimeout(abortControllerRef.current.signal, 5000)
+        )
+
+        await projectSnapshot.refresh()
+        if (!abortControllerRef.current.signal.aborted) {
+          const results = await searchSnapshot(projectSnapshot, searchQuery)
+          setMatchedFiles(results)
+        }
+      } catch (error) {
+        debugConsole.error(error)
+        setError(t('generic_something_went_wrong'))
+      } finally {
+        setLoading(false)
+      }
+    },
+    [openDocs, projectSnapshot, t]
+  )
+
+  const searchInputRef = useRef<HTMLInputElement>(null)
+
+  const handleKeyDown: React.KeyboardEventHandler<HTMLElement> = useCallback(
+    event => {
+      if (event.key === 'Escape') {
+        setProjectSearchIsOpen(false)
+      }
+    },
+    [setProjectSearchIsOpen]
+  )
+
+  useEventListener(
+    'keydown',
+    useCallback((event: KeyboardEvent) => {
+      if (
+        (isMac ? event.metaKey : event.ctrlKey) &&
+        event.shiftKey &&
+        event.code === 'KeyF'
+      ) {
+        searchInputRef.current?.focus()
+      }
+    }, [])
+  )
+
+  const modifiersRef = useRef<{ setQuery(query: SearchQuery): void }>(null)
+
+  useEventListener(
+    'editor:full-project-search',
+    useCallback((event: CustomEvent<SearchQuery>) => {
+      if (modifiersRef.current != null) {
+        modifiersRef.current.setQuery(event.detail)
+      }
+      if (searchInputRef.current != null) {
+        searchInputRef.current.value = event.detail.search
+        searchInputRef.current.form?.dispatchEvent(
+          new Event('submit', { cancelable: true, bubbles: true })
+        )
+      }
+    }, [])
+  )
+
+  // clear the results when the form is cleared
+  const handleInput: FormEventHandler<HTMLInputElement> = useCallback(event => {
+    if (
+      event instanceof InputEvent &&
+      event.inputType === undefined &&
+      (event.target as HTMLInputElement).value.length === 0
+    ) {
+      setMatchedFiles(undefined)
+    }
+  }, [])
+
+  const variableStyle = {
+    '--font-family': fontFamily,
+    '--font-size': fontSize,
+  } as React.CSSProperties
+
+  return (
+    <div
+      className="full-project-search"
+      style={variableStyle}
+      data-bs-theme={userSettings.overallTheme === 'light-' ? 'light' : 'dark'}
+    >
+      {newEditor ? (
+        <RailPanelHeader title={t('search')} />
+      ) : (
+        <PanelHeading
+          title={t('search')}
+          handleClose={() => setProjectSearchIsOpen(false)}
+          splitTestName="full-project-search"
+        />
+      )}
+
+      <div // eslint-disable-line jsx-a11y/no-static-element-interactions
+        className="full-project-search-form"
+        onKeyDown={handleKeyDown}
+      >
+        <Form
+          onSubmit={handleSubmit}
+          role="search"
+          id="full-project-search"
+          aria-label={t('search_all_project_files')}
+        >
+          <Row className="g-1">
+            <Col>
+              <OLFormControl
+                type="search"
+                name="search"
+                size="sm"
+                aria-label={t('search')}
+                autoFocus // eslint-disable-line jsx-a11y/no-autofocus
+                spellCheck={false}
+                autoComplete="off"
+                ref={searchInputRef}
+                onInput={handleInput}
+                placeholder={`${t('search_all_project_files')}…`}
+              />
+            </Col>
+            <Col className="col-auto">
+              <Button type="submit" className="btn btn-primary" size="sm">
+                {t('search')}
+              </Button>
+            </Col>
+          </Row>
+
+          <FullProjectSearchModifiers ref={modifiersRef} />
+        </Form>
+      </div>
+
+      {error && <Notification type="error" content={error} />}
+
+      <div className="match-counts">
+        <FullProjectMatchCounts loading={loading} matchedFiles={matchedFiles} />
+      </div>
+
+      {matchedFiles && (
+        <FullProjectSearchResults
+          matchedFiles={matchedFiles}
+          currentDocPath={currentDocPath}
+        />
+      )}
+    </div>
+  )
+}
+
+export default memo(FullProjectSearchUI)
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-search.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-search.tsx
new file mode 100644
index 0000000000..7720b21589
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-search.tsx
@@ -0,0 +1,22 @@
+import React, { FC, lazy, Suspense } from 'react'
+import { useLayoutContext } from '@/shared/context/layout-context'
+import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
+
+const FullProjectSearchUI = lazy(() => import('./full-project-search-ui'))
+
+const FullProjectSearch: FC = () => {
+  const { projectSearchIsOpen } = useLayoutContext()
+  const newEditor = useIsNewEditorEnabled()
+
+  if (!projectSearchIsOpen && !newEditor) {
+    return null
+  }
+
+  return (
+    <Suspense fallback={null}>
+      <FullProjectSearchUI />
+    </Suspense>
+  )
+}
+
+export default FullProjectSearch
diff --git a/services/web/modules/full-project-search/frontend/js/components/matched-hit-highlight.tsx b/services/web/modules/full-project-search/frontend/js/components/matched-hit-highlight.tsx
new file mode 100644
index 0000000000..8f7122cb22
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/matched-hit-highlight.tsx
@@ -0,0 +1,49 @@
+import React, { FC, useMemo } from 'react'
+import { Hit } from '../util/search-snapshot'
+
+export const MatchedHitHighlight: FC<{ text: string; hit: Hit }> = ({
+  text,
+  hit,
+}) => {
+  const parts = useMemo(() => {
+    let before = text.substring(0, hit.matchIndex).trimStart()
+    const match = text.substring(hit.matchIndex, hit.matchIndex + hit.length)
+    let after = text.substring(hit.matchIndex + hit.length).trimEnd()
+
+    // reduce the prefix to a sensible size before trimming
+    if (before.length > 250) {
+      before = before.substring(before.length - 250)
+    }
+
+    while (before.length > 10) {
+      const replacement = before.replace(/^\S+\s+/, '')
+      if (before.length === replacement.length) {
+        break
+      }
+      before = replacement
+    }
+
+    // reduce the suffix to a sensible size before trimming
+    if (after.length > 250) {
+      after = after.substring(0, 250)
+    }
+
+    while (after.length > 100) {
+      const replacement = after.replace(/\s+\S+$/, '')
+      if (after.length === replacement.length) {
+        break
+      }
+      after = replacement
+    }
+
+    return { before, match, after }
+  }, [hit, text])
+
+  return (
+    <span className="matched-hit-snippet">
+      {parts.before}
+      <b className="matched-hit-highlight">{parts.match}</b>
+      {parts.after}
+    </span>
+  )
+}
diff --git a/services/web/modules/full-project-search/frontend/js/components/matched-hit.tsx b/services/web/modules/full-project-search/frontend/js/components/matched-hit.tsx
new file mode 100644
index 0000000000..2652e589b4
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/components/matched-hit.tsx
@@ -0,0 +1,45 @@
+import { FC, useCallback, useLayoutEffect, useRef } from 'react'
+import { Hit, MatchedFile } from '../util/search-snapshot'
+import { MatchedHitHighlight } from './matched-hit-highlight'
+import classnames from 'classnames'
+
+export const MatchedHit: FC<{
+  matchedFile: MatchedFile
+  hit: Hit
+  selected?: boolean
+  setSelectedHit(hit?: Hit): void
+  tabIndex: 0 | -1
+}> = ({ matchedFile, hit, selected = false, setSelectedHit, tabIndex }) => {
+  const containerRef = useRef<HTMLButtonElement>(null)
+
+  useLayoutEffect(() => {
+    if (selected) {
+      containerRef.current?.focus()
+    }
+  }, [selected])
+
+  const handleSelect: React.MouseEventHandler = useCallback(
+    event => {
+      event.preventDefault()
+      setSelectedHit(hit)
+    },
+    [hit, setSelectedHit]
+  )
+
+  return (
+    <button
+      className={classnames('list-group-item matched-file-hit', {
+        'matched-file-hit-selected': selected,
+      })}
+      ref={containerRef}
+      tabIndex={tabIndex}
+      onMouseDown={handleSelect}
+      aria-selected={selected}
+      role="option"
+    >
+      <span className="matched-line-number">{hit.lineIndex + 1}</span>
+
+      <MatchedHitHighlight text={matchedFile.lines[hit.lineIndex]} hit={hit} />
+    </button>
+  )
+}
diff --git a/services/web/modules/full-project-search/frontend/js/util/regexp.ts b/services/web/modules/full-project-search/frontend/js/util/regexp.ts
new file mode 100644
index 0000000000..7795d05911
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/util/regexp.ts
@@ -0,0 +1,7 @@
+import { SearchQuery } from '@codemirror/search'
+
+export const createRegExp = (searchQuery: SearchQuery) => {
+  const flags = 'gmu' + (searchQuery.caseSensitive ? '' : 'i')
+
+  return new RegExp(searchQuery.search, flags)
+}
diff --git a/services/web/modules/full-project-search/frontend/js/util/search-snapshot.ts b/services/web/modules/full-project-search/frontend/js/util/search-snapshot.ts
new file mode 100644
index 0000000000..2abb5626b9
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/util/search-snapshot.ts
@@ -0,0 +1,92 @@
+import { Text } from '@codemirror/state'
+import { RegExpCursor, SearchCursor, SearchQuery } from '@codemirror/search'
+import { ProjectSnapshot } from '@/infrastructure/project-snapshot'
+import { categorizer, regexpWordTest, stringWordTest } from './search'
+import { sendSearchEvent } from '@/features/event-tracking/search-events'
+
+export type Hit = {
+  lineIndex: number
+  matchIndex: number
+  length: number
+}
+
+export type MatchedFile = {
+  path: string
+  lines: string[]
+  hits: Hit[]
+}
+
+const toLowerCase = (string: string) => string.toLowerCase()
+
+export const searchSnapshot = async (
+  projectSnapshot: ProjectSnapshot,
+  searchQuery: SearchQuery
+) => {
+  if (!searchQuery.search.trim().length) {
+    return
+  }
+
+  const matchedFiles = new Map<string, MatchedFile>()
+
+  const createCursor = (text: Text) => {
+    if (searchQuery.regexp) {
+      return new RegExpCursor(text, searchQuery.search, {
+        ignoreCase: !searchQuery.caseSensitive,
+        test: searchQuery.wholeWord ? regexpWordTest(categorizer) : undefined,
+      })
+    }
+
+    return new SearchCursor(
+      text,
+      searchQuery.search,
+      undefined,
+      undefined,
+      searchQuery.caseSensitive ? undefined : toLowerCase,
+      searchQuery.wholeWord ? stringWordTest(text, categorizer) : undefined
+    )
+  }
+
+  const docPaths = projectSnapshot.getDocPaths()
+
+  for (const path of docPaths) {
+    const content = projectSnapshot.getDocContents(path)
+    if (content) {
+      const lines = content.split('\n')
+      const text = Text.of(lines)
+
+      const cursor = createCursor(text)
+
+      while (!cursor.next().done) {
+        const { from, to } = cursor.value
+
+        const matchedFile: MatchedFile = matchedFiles.get(path) ?? {
+          path,
+          lines,
+          hits: [],
+        }
+
+        const line = text.lineAt(from)
+
+        matchedFile.hits.push({
+          lineIndex: line.number - 1,
+          matchIndex: from - line.from,
+          length: to - from,
+        })
+
+        matchedFiles.set(path, matchedFile)
+      }
+    }
+  }
+
+  const results = [...matchedFiles.values()].sort((a, b) =>
+    a.path.localeCompare(b.path)
+  )
+
+  sendSearchEvent('search-execute', {
+    searchType: 'full-project',
+    totalDocs: docPaths.length,
+    totalResults: results.flatMap(file => file.hits).length,
+  })
+
+  return results
+}
diff --git a/services/web/modules/full-project-search/frontend/js/util/search.ts b/services/web/modules/full-project-search/frontend/js/util/search.ts
new file mode 100644
index 0000000000..69078f6323
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/js/util/search.ts
@@ -0,0 +1,50 @@
+/**
+ * The functions in this module are from @codemirror/search (MIT license)
+ * https://github.com/codemirror/search/blob/c1ee7d4b0babd0de0d1198a7c1ece2a387c97c0d/src/search.ts
+ */
+
+import { CharCategory, findClusterBreak, Text } from '@codemirror/state'
+
+const charBefore = (str: string, index: number) =>
+  str.slice(findClusterBreak(str, index, false), index)
+
+const charAfter = (str: string, index: number) =>
+  str.slice(index, findClusterBreak(str, index))
+
+export const categorizer = (char: string) => {
+  if (/\s/.test(char)) {
+    return CharCategory.Space
+  }
+
+  if (/\w/.test(char)) {
+    return CharCategory.Word
+  }
+
+  return CharCategory.Other
+}
+
+export const stringWordTest =
+  (doc: Text, categorizer: (ch: string) => CharCategory) =>
+  (from: number, to: number, buf: string, bufPos: number) => {
+    if (bufPos > from || bufPos + buf.length < to) {
+      bufPos = Math.max(0, from - 2)
+      buf = doc.sliceString(bufPos, Math.min(doc.length, to + 2))
+    }
+    return (
+      (categorizer(charBefore(buf, from - bufPos)) !== CharCategory.Word ||
+        categorizer(charAfter(buf, from - bufPos)) !== CharCategory.Word) &&
+      (categorizer(charAfter(buf, to - bufPos)) !== CharCategory.Word ||
+        categorizer(charBefore(buf, to - bufPos)) !== CharCategory.Word)
+    )
+  }
+
+export const regexpWordTest =
+  (categorizer: (ch: string) => CharCategory) =>
+  (_from: number, _to: number, match: RegExpExecArray) =>
+    !match[0].length ||
+    ((categorizer(charBefore(match.input, match.index)) !== CharCategory.Word ||
+      categorizer(charAfter(match.input, match.index)) !== CharCategory.Word) &&
+      (categorizer(charAfter(match.input, match.index + match[0].length)) !==
+        CharCategory.Word ||
+        categorizer(charBefore(match.input, match.index + match[0].length)) !==
+          CharCategory.Word))
diff --git a/services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss b/services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss
new file mode 100644
index 0000000000..4b19b7e894
--- /dev/null
+++ b/services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss
@@ -0,0 +1,367 @@
+@use 'sass:color';
+
+.ide-redesign-main {
+  .full-project-search {
+    --full-project-search-bg-color: var(--white);
+    --full-project-search-color: var(--content-primary);
+    --full-project-search-results-bg-color: var(--bg-light-primary);
+    --full-project-search-selected-hit-bg-color: var(--bg-accent-03);
+    --full-project-search-selected-hit-color: var(--green-70);
+    --matched-hit-highlight-color: var(--yellow-10);
+    --matched-hit-selected-highlight-color: var(--bg-accent-02);
+    --matched-hit-selected-unfocused-highlight-color: var(--bg-accent-02);
+    --collapsible-file-header-count-color: var(--content-primary);
+    --collapsible-file-header-count-bg-color: var(--bg-light-tertiary);
+
+    // Redesign additions
+    --full-project-search-border-color: var(--border-divider);
+    --collapsible-file-header-hover-bg: var(--bg-light-secondary);
+    --matched-hit-highlight-text-color: var(--content-primary);
+    --matched-file-hit-hover-bg: var(--bg-light-secondary);
+    --search-modifier-checked-bg: var(--bg-accent-03);
+    --search-modifier-checked-color: var(--green-70);
+    --search-modifier-hover-color: var(--bg-light-secondary);
+    --search-modifier-color: var(--content-primary);
+
+    &[data-bs-theme='dark'] {
+      --full-project-search-bg-color: var(--bg-dark-primary);
+      --full-project-search-color: var(--content-secondary-dark);
+      --full-project-search-results-bg-color: var(--bg-dark-primary);
+      --full-project-search-selected-hit-bg-color: var(--green-70);
+      --full-project-search-selected-hit-color: var(--green-10);
+      --matched-hit-highlight-color: var(--yellow-70);
+      --matched-hit-selected-highlight-color: var(--green-70);
+      --matched-hit-selected-unfocused-highlight-color: var(--content-primary);
+      --collapsible-file-header-count-color: var(--content-primary);
+      --collapsible-file-header-count-bg-color: var(--bg-light-tertiary);
+      --panel-heading-color: var(--content-primary-dark);
+
+      // Redesign additions
+      --full-project-search-border-color: var(--border-divider-dark);
+      --collapsible-file-header-hover-bg: var(--bg-dark-secondary);
+      --matched-hit-highlight-text-color: var(--green-10);
+      --matched-file-hit-hover-bg: var(--bg-dark-secondary);
+      --search-modifier-checked-bg: var(--green-70);
+      --search-modifier-checked-color: var(--green-10);
+      --search-modifier-hover-color: var(--bg-dark-secondary);
+      --search-modifier-color: var(--content-primary-dark);
+
+      input[type='search']::selection {
+        background-color: #b4d1ff;
+      }
+    }
+
+    .full-project-search-modifiers {
+      input:checked ~ .form-check-label {
+        background-color: var(--search-modifier-checked-bg);
+        color: var(--search-modifier-checked-color);
+      }
+
+      .form-check-label {
+        color: var(--search-modifier-color);
+
+        &:hover,
+        &:focus {
+          background-color: var(--search-modifier-hover-color);
+        }
+      }
+    }
+
+    .full-project-search-form {
+      border-bottom: 1px solid var(--full-project-search-border-color);
+    }
+
+    .match-counts {
+      padding: var(--spacing-03) var(--spacing-04);
+      font-size: var(--font-size-01);
+    }
+
+    .matched-files {
+      padding: 0 var(--spacing-02);
+    }
+
+    .matched-hit-highlight {
+      color: var(--matched-hit-highlight-text-color);
+    }
+
+    .matched-file-hits {
+      width: unset;
+      overflow: unset;
+      margin-left: var(--spacing-08);
+      position: relative;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: calc(var(--spacing-04) * -1);
+        top: 0;
+        width: 1px;
+        height: 100%;
+        background-color: var(--full-project-search-border-color);
+        border-radius: 0;
+      }
+    }
+
+    .matched-file-hit {
+      border-radius: var(--border-radius-base);
+
+      &:hover {
+        background-color: var(--matched-file-hit-hover-bg);
+      }
+
+      &.matched-file-hit-selected:hover {
+        background-color: var(--full-project-search-selected-hit-bg-color);
+        color: var(--full-project-search-selected-hit-color);
+      }
+    }
+
+    .collapsible-file-header {
+      border-radius: var(--border-radius-base);
+
+      &:hover {
+        background-color: var(--collapsible-file-header-hover-bg);
+      }
+    }
+  }
+}
+
+.full-project-search {
+  --full-project-search-bg-color: var(--bg-light-secondary);
+  --full-project-search-color: var(--content-secondary);
+  --full-project-search-results-bg-color: var(--bg-light-primary);
+  --full-project-search-selected-hit-bg-color: var(--bg-light-tertiary);
+  --full-project-search-selected-hit-color: var(--content-primary-light);
+  --matched-hit-highlight-color: var(--bg-light-tertiary);
+  --matched-hit-selected-highlight-color: var(--bg-accent-02);
+  --matched-hit-selected-unfocused-highlight-color: var(--bg-accent-02);
+  --collapsible-file-header-count-color: var(--bs-body-color);
+  --collapsible-file-header-count-bg-color: var(--bg-light-secondary);
+
+  &[data-bs-theme='dark'] {
+    --full-project-search-bg-color: var(--bg-dark-secondary);
+    --full-project-search-color: var(--content-secondary-dark);
+    --full-project-search-results-bg-color: var(--bg-dark-tertiary);
+    --full-project-search-selected-hit-bg-color: var(--bg-dark-secondary);
+    --full-project-search-selected-hit-color: var(--content-primary-dark);
+    --matched-hit-highlight-color: var(--bg-dark-secondary);
+    --matched-hit-selected-highlight-color: var(--bg-accent-02);
+    --matched-hit-selected-unfocused-highlight-color: var(--bg-dark-primary);
+    --collapsible-file-header-count-color: var(--bs-body-color);
+    --collapsible-file-header-count-bg-color: var(--bg-dark-secondary);
+    --panel-heading-color: var(--content-primary-dark);
+
+    input[type='search']::selection {
+      background-color: #b4d1ff;
+    }
+
+    .full-project-search-modifiers {
+      input:checked ~ .form-check-label {
+        background-color: var(--neutral-90);
+      }
+
+      .form-check-label {
+        color: inherit;
+
+        &:hover,
+        &:focus {
+          background-color: var(--neutral-70);
+        }
+      }
+    }
+
+    .panel-heading-close-button {
+      color: var(--content-primary-dark);
+
+      &:hover,
+      &:focus {
+        color: var(--content-primary);
+      }
+    }
+  }
+
+  position: absolute;
+  inset: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  z-index: 2;
+  background-color: var(--full-project-search-bg-color);
+  color: var(--full-project-search-color);
+
+  .full-project-search-heading {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: var(--spacing-02);
+    font-weight: bold;
+  }
+
+  .panel-heading-label {
+    margin-left: var(--spacing-02);
+  }
+
+  .full-project-search-form {
+    padding: 8px;
+    flex-shrink: 0;
+  }
+
+  .form-check {
+    padding-left: 0;
+  }
+
+  .form-check-inline {
+    display: inline-flex;
+    gap: var(--spacing-02);
+    margin-right: 0;
+  }
+
+  .full-project-search-modifiers {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-03);
+    margin-top: var(--spacing-02);
+
+    input[type='checkbox'] {
+      position: relative;
+      left: -999px;
+    }
+
+    .form-check-label {
+      border-radius: 50%;
+      cursor: pointer;
+      display: inline-flex;
+      width: 2em;
+      height: 2em;
+      align-items: center;
+      justify-content: center;
+      font-size: 90%;
+
+      &:hover,
+      &:focus {
+        background-color: var(--neutral-20);
+      }
+    }
+
+    input:focus-visible ~ .form-check-label {
+      box-shadow: 0 0 0 2px var(--border-active-dark);
+    }
+
+    input:checked ~ .form-check-label {
+      background-color: var(--neutral-30);
+    }
+  }
+
+  .match-counts {
+    font-size: 80%;
+    padding: 0 var(--spacing-04) var(--spacing-04);
+  }
+
+  .matched-files {
+    flex: 1;
+    overflow: auto;
+    font-size: 14px;
+    background-color: var(--full-project-search-results-bg-color);
+  }
+
+  .matched-file {
+    margin-bottom: 8px;
+
+    .collapsible-file-header:focus-visible {
+      box-shadow: 0 0 0 2px var(--border-active-dark);
+    }
+  }
+
+  .collapsible-file-header {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+    background-color: var(--full-project-search-results-bg-color);
+    color: inherit;
+  }
+
+  .collapsible-file-header-count {
+    background-color: var(--collapsible-file-header-count-bg-color);
+    color: var(--collapsible-file-header-count-color);
+  }
+
+  .matched-file-hits {
+    width: 100%;
+    overflow: hidden;
+    border-radius: 0;
+  }
+
+  .matched-line-number {
+    white-space: nowrap;
+    margin-right: 8px;
+    color: #aaa;
+  }
+
+  .matched-file-hit {
+    border: none;
+    cursor: pointer;
+    align-items: flex-start;
+    padding: var(--spacing-02) var(--spacing-05);
+    word-break: break-all;
+    white-space: nowrap;
+    text-align: left;
+    font-family: var(--font-family);
+    font-size: var(--font-size);
+    min-height: fit-content;
+    border-radius: 0;
+    background-color: var(--full-project-search-results-bg-color);
+
+    &:hover {
+      background-color: var(--full-project-search-bg-color);
+    }
+
+    &.matched-file-hit-highlighted {
+      background-color: var(--full-project-search-bg-color);
+    }
+  }
+
+  .matched-hit-snippet {
+    overflow-wrap: break-word;
+    overflow: hidden;
+  }
+
+  .notification {
+    margin: var(--spacing-02) var(--spacing-04) var(--spacing-06);
+    width: auto;
+    align-items: center;
+    padding: 0 var(--spacing-04);
+
+    .notification-content {
+      padding: var(--spacing-02) 0;
+    }
+
+    .notification-icon {
+      padding: var(--spacing-02) var(--spacing-04) 0 0;
+    }
+  }
+
+  .matched-hit-highlight {
+    background-color: var(--matched-hit-highlight-color);
+    border-radius: 4px;
+    overflow-wrap: normal;
+  }
+
+  .matched-file-hit-selected {
+    background-color: var(--full-project-search-selected-hit-bg-color);
+    color: var(--full-project-search-selected-hit-color);
+
+    .matched-hit-highlight {
+      background-color: var(--matched-hit-unfocused-highlight-color);
+    }
+  }
+
+  /* &:focus-within {
+    .matched-file-hit-selected {
+      background-color: var(--bg-accent-01);
+      color: var(--bg-light-primary);
+
+      .matched-hit-highlight {
+        background-color: var(--matched-hit-selected-highlight-color);
+      }
+    }
+  } */
+}
diff --git a/services/web/modules/full-project-search/stories/full-project-search.stories.tsx b/services/web/modules/full-project-search/stories/full-project-search.stories.tsx
new file mode 100644
index 0000000000..e599fabecd
--- /dev/null
+++ b/services/web/modules/full-project-search/stories/full-project-search.stories.tsx
@@ -0,0 +1,113 @@
+import { Meta, StoryObj } from '@storybook/react'
+import { ScopeDecorator } from '../../../frontend/stories/decorators/scope'
+import useFetchMock from '../../../frontend/stories/hooks/use-fetch-mock'
+import FullProjectSearchUI from '../frontend/js/components/full-project-search-ui'
+
+const meta = {
+  title: 'Editor / Full Project Search',
+  component: FullProjectSearchUI,
+  decorators: [
+    Story => ScopeDecorator(Story, { mockCompileOnLoad: true }),
+    Story => {
+      useFetchMock(fetchMock => {
+        fetchMock.post('express:/project/:projectId/flush', { status: 204 })
+
+        fetchMock.get('express:/project/:projectId/latest/history', {
+          status: 200,
+          body: {
+            chunk: {
+              history: {
+                snapshot: {
+                  files: {},
+                },
+                changes: [
+                  {
+                    operations: [
+                      {
+                        pathname: 'main.tex',
+                        file: {
+                          hash: '5199b66d9d1226551be436c66bad9d962cc05537',
+                          stringLength: 7066,
+                        },
+                      },
+                    ],
+                    timestamp: '2025-01-03T10:10:40.840Z',
+                    authors: [],
+                    v2Authors: ['66e040e0da7136ec75ffe8a3'],
+                    projectVersion: '1.0',
+                  },
+                  {
+                    operations: [
+                      {
+                        pathname: 'sample.bib',
+                        file: {
+                          hash: 'a0e21c740cf81e868f158e30e88985b5ea1d6c19',
+                          stringLength: 244,
+                        },
+                      },
+                    ],
+                    timestamp: '2025-01-03T10:10:40.856Z',
+                    authors: [],
+                    v2Authors: ['66e040e0da7136ec75ffe8a3'],
+                    projectVersion: '2.0',
+                  },
+                  {
+                    operations: [
+                      {
+                        pathname: 'frog.jpg',
+                        file: {
+                          hash: '5b889ef3cf71c83a4c027c4e4dc3d1a106b27809',
+                          byteLength: 97080,
+                        },
+                      },
+                    ],
+                    timestamp: '2025-01-03T10:10:40.890Z',
+                    authors: [],
+                    v2Authors: ['66e040e0da7136ec75ffe8a3'],
+                    projectVersion: '3.0',
+                  },
+                ],
+              },
+              startVersion: 0,
+            },
+          },
+        })
+
+        fetchMock.get('express:/project/:projectId/changes', {
+          status: 200,
+          body: [],
+        })
+
+        fetchMock.get(
+          'express:/project/:projectId/blob/5199b66d9d1226551be436c66bad9d962cc05537',
+          {
+            status: 200,
+            body: `Simply use the section and subsection commands, as in this example document! With Overleaf, all the formatting and numbering is handled automatically according to the template you've chosen. If you're using the Visual Editor, you can also create new section and subsections via the buttons in the editor toolbar.`,
+          }
+        )
+
+        fetchMock.get(
+          'express:/project/:projectId/blob/a0e21c740cf81e868f158e30e88985b5ea1d6c19',
+          {
+            status: 200,
+            body: `@article{greenwade93,
+    author  = "George D. Greenwade",
+    title   = "The {C}omprehensive {T}ex {A}rchive {N}etwork ({CTAN})",
+    year    = "1993",
+    journal = "TUGBoat",
+    volume  = "14",
+    number  = "3",
+    pages   = "342--351"
+}`,
+          }
+        )
+      })
+      return <Story />
+    },
+  ],
+} satisfies Meta<typeof FullProjectSearchUI>
+
+export default meta
+type Story = StoryObj<typeof FullProjectSearchUI>
+
+export const UI = {} satisfies Story

From 40136785ddbe4bf4462847ec7434feec8fe0980f Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Wed, 2 Jul 2025 10:58:38 +0200
Subject: [PATCH 074/274] [web] Move `pdf.*` scopes to react states (#26599)

* Move `pdf.logEntryAnnotations` to react state

* Remove unused scope `pdf.downloadUrl`

* Remove unused scope `pdf.url`

* Move `pdf.uncompiled` to react state

* Move `pdf.logEntries` to react state

* Remove `pdf` from `mockScope`

* Fix test: "renders annotations in the gutter"

GitOrigin-RevId: bf1d0ec30cc0ffcc1177871651483c296ed08baf
---
 .../features/pdf-preview/util/output-files.js |  4 +++
 .../shared/context/local-compile-context.tsx  | 34 ++++++-------------
 .../components/codemirror-editor.spec.tsx     | 30 ++++++++++++++--
 .../source-editor/helpers/mock-scope.ts       |  3 --
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/services/web/frontend/js/features/pdf-preview/util/output-files.js b/services/web/frontend/js/features/pdf-preview/util/output-files.js
index 3ee0dc1180..0903ec10e3 100644
--- a/services/web/frontend/js/features/pdf-preview/util/output-files.js
+++ b/services/web/frontend/js/features/pdf-preview/util/output-files.js
@@ -143,6 +143,10 @@ export const handleLogFiles = async (outputFiles, data, signal) => {
   return result
 }
 
+/**
+ * @typedef {import('../../../../../types/annotation').Annotation} Annotation
+ * @returns {Record<string, Annotation[]>}
+ */
 export function buildLogEntryAnnotations(entries, fileTreeData, rootDocId) {
   const rootDocDirname = dirname(fileTreeData, rootDocId)
 
diff --git a/services/web/frontend/js/shared/context/local-compile-context.tsx b/services/web/frontend/js/shared/context/local-compile-context.tsx
index 8c8a7b4885..af1430ac05 100644
--- a/services/web/frontend/js/shared/context/local-compile-context.tsx
+++ b/services/web/frontend/js/shared/context/local-compile-context.tsx
@@ -11,7 +11,6 @@ import {
   SetStateAction,
 } from 'react'
 import useScopeValue from '../hooks/use-scope-value'
-import useScopeValueSetterOnly from '../hooks/use-scope-value-setter-only'
 import usePersistedState from '../hooks/use-persisted-state'
 import useAbortController from '../hooks/use-abort-controller'
 import DocumentCompiler from '../../features/pdf-preview/util/compiler'
@@ -51,6 +50,7 @@ import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 import { captureException } from '@/infrastructure/error-reporter'
 import OError from '@overleaf/o-error'
 import getMeta from '@/utils/meta'
+import type { Annotation } from '../../../../types/annotation'
 
 type PdfFile = Record<string, any>
 
@@ -74,7 +74,7 @@ export type CompileContext = {
     warnings: LogEntry[]
     typesetting: LogEntry[]
   }
-  logEntryAnnotations?: Record<string, any>
+  logEntryAnnotations?: Record<string, Annotation[]>
   outputFilesArchive?: string
   pdfDownloadUrl?: string
   pdfFile?: PdfFile
@@ -98,7 +98,7 @@ export type CompileContext = {
   stopOnFirstError: boolean
   stopOnValidationError: boolean
   stoppedOnFirstError: boolean
-  uncompiled?: boolean
+  uncompiled: boolean
   validationIssues?: Record<string, any>
   firstRenderDone: (metrics: {
     latencyFetch: number
@@ -156,34 +156,22 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   const [hasShortCompileTimeout, setHasShortCompileTimeout] = useState(false)
 
   // the log entries parsed from the compile output log
-  const [logEntries, setLogEntries] = useScopeValueSetterOnly('pdf.logEntries')
+  const [logEntries, setLogEntries] = useState<CompileContext['logEntries']>()
 
   // annotations for display in the editor, built from the log entries
-  const [logEntryAnnotations, setLogEntryAnnotations] = useScopeValue(
-    'pdf.logEntryAnnotations'
-  )
+  const [logEntryAnnotations, setLogEntryAnnotations] = useState<
+    undefined | Record<string, Annotation[]>
+  >()
 
   // the PDF viewer and whether syntax validation is enabled globally
   const { userSettings } = useUserSettingsContext()
   const { pdfViewer, syntaxValidation } = userSettings
 
-  // the URL for downloading the PDF
-  const [, setPdfDownloadUrl] =
-    useScopeValueSetterOnly<string>('pdf.downloadUrl')
-
-  // the URL for loading the PDF in the preview pane
-  const [, setPdfUrl] = useScopeValueSetterOnly<string>('pdf.url')
-
   // low level details for metrics
   const [pdfFile, setPdfFile] = useState<PdfFile | undefined>()
 
-  useEffect(() => {
-    setPdfDownloadUrl(pdfFile?.pdfDownloadUrl)
-    setPdfUrl(pdfFile?.pdfUrl)
-  }, [pdfFile, setPdfDownloadUrl, setPdfUrl])
-
   // the project is considered to be "uncompiled" if a doc has changed, or finished saving, since the last compile started.
-  const [uncompiled, setUncompiled] = useScopeValue('pdf.uncompiled')
+  const [uncompiled, setUncompiled] = useState(false)
 
   // whether a doc has been edited since the last compile started
   const [editedSinceCompileStarted, setEditedSinceCompileStarted] =
@@ -294,7 +282,7 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
 
   const cleanupCompileResult = useCallback(() => {
     setPdfFile(undefined)
-    setLogEntries(null)
+    setLogEntries(undefined)
     setLogEntryAnnotations({})
   }, [setPdfFile, setLogEntries, setLogEntryAnnotations])
 
@@ -513,8 +501,8 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
 
         // handle log files
         // asynchronous (TODO: cancel on new compile?)
-        setLogEntryAnnotations(null)
-        setLogEntries(null)
+        setLogEntryAnnotations(undefined)
+        setLogEntries(undefined)
         setRawLog(undefined)
 
         handleLogFiles(outputFiles, data, abortController.signal).then(
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx
index 40693c2ec1..257cc96661 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx
@@ -7,7 +7,9 @@ import { activeEditorLine } from '../helpers/active-editor-line'
 import { TestContainer } from '../helpers/test-container'
 import customLocalStorage from '@/infrastructure/local-storage'
 import { OnlineUsersContext } from '@/features/ide-react/context/online-users-context'
-import { FC } from 'react'
+import { LocalCompileContext } from '@/shared/context/local-compile-context'
+import type { FC, PropsWithChildren } from 'react'
+import type { Annotation } from '../../../../../types/annotation'
 
 describe('<CodeMirrorEditor/>', { scrollBehavior: false }, function () {
   beforeEach(function () {
@@ -64,27 +66,39 @@ describe('<CodeMirrorEditor/>', { scrollBehavior: false }, function () {
   it('renders annotations in the gutter', function () {
     const scope = mockScope()
 
-    scope.pdf.logEntryAnnotations = {
+    const logEntryAnnotations: Record<string, Annotation[]> = {
       [docId]: [
         {
+          id: '1',
+          entryIndex: 1,
           row: 20,
           type: 'error',
           text: 'Another error',
+          firstOnLine: true,
         },
         {
+          id: '2',
+          entryIndex: 2,
           row: 19,
           type: 'error',
           text: 'An error',
+          firstOnLine: true,
         },
         {
+          id: '3',
+          entryIndex: 3,
           row: 20,
           type: 'warning',
           text: 'A warning on the same line',
+          firstOnLine: false,
         },
         {
+          id: '4',
+          entryIndex: 4,
           row: 25,
           type: 'warning',
           text: 'Another warning',
+          firstOnLine: true,
         },
       ],
     }
@@ -93,9 +107,19 @@ describe('<CodeMirrorEditor/>', { scrollBehavior: false }, function () {
 
     cy.clock()
 
+    const LocalCompileProvider: FC<PropsWithChildren> = ({ children }) => (
+      // @ts-expect-error: not entering all the values for LocalCompileContext
+      <LocalCompileContext.Provider value={{ logEntryAnnotations }}>
+        {children}
+      </LocalCompileContext.Provider>
+    )
     cy.mount(
       <TestContainer>
-        <EditorProviders scope={scope} userSettings={userSettings}>
+        <EditorProviders
+          scope={scope}
+          userSettings={userSettings}
+          providers={{ LocalCompileProvider }}
+        >
           <CodeMirrorEditor />
         </EditorProviders>
       </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
index 701e3bc4b3..4b7d0fb4a1 100644
--- a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
@@ -22,9 +22,6 @@ export const mockScope = (
       showVisual: false,
       wantTrackChanges: false,
     },
-    pdf: {
-      logEntryAnnotations: {},
-    },
     project: {
       _id: 'test-project',
       name: 'Test Project',

From 7c92e0719cd705918cb76b109b5777b180355ba0 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 2 Jul 2025 11:28:48 +0200
Subject: [PATCH 075/274] [web] small tweaks for display of deleted projects in
 admin panel (#26747)

* [web] display project expiry date and badge

Co-authored-by: Alex Bourdin <alex.bourdin@overleaf.com>

* [web] redirect admins to deleted project page

* Expiration badge tweaks

* [web] fix frontend tests

---------

Co-authored-by: Alex Bourdin <alex.bourdin@overleaf.com>
GitOrigin-RevId: 42dafb5e4e3e781c87fa26092ea9b3400f471bb8
---
 .../frontend/stylesheets/bootstrap-5/pages/admin/admin.scss   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss
index a4bfa532e3..9e5b330d3e 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/admin/admin.scss
@@ -96,3 +96,7 @@
   // firefox does not show markers for block items
   display: list-item;
 }
+
+.expiration-label {
+  vertical-align: super;
+}

From af0c0e5bcd0cb2e00052c2a98ce49f49e509e967 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Mon, 23 Jun 2025 15:05:11 +0100
Subject: [PATCH 076/274] Convert server-ce-scripts index file to ES modules

GitOrigin-RevId: 5edfa16b4a77471f340c8bbc784a3833cfcaf490
---
 services/web/modules/server-ce-scripts/{index.js => index.mjs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename services/web/modules/server-ce-scripts/{index.js => index.mjs} (75%)

diff --git a/services/web/modules/server-ce-scripts/index.js b/services/web/modules/server-ce-scripts/index.mjs
similarity index 75%
rename from services/web/modules/server-ce-scripts/index.js
rename to services/web/modules/server-ce-scripts/index.mjs
index 28c3d81419..e6df0f30af 100644
--- a/services/web/modules/server-ce-scripts/index.js
+++ b/services/web/modules/server-ce-scripts/index.mjs
@@ -3,4 +3,4 @@
 /** @type {WebModule} */
 const ServerCeScriptsModule = {}
 
-module.exports = ServerCeScriptsModule
+export default ServerCeScriptsModule

From 747224ac10e608016b77aa160a793fa354dfbe6e Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Mon, 23 Jun 2025 15:05:31 +0100
Subject: [PATCH 077/274] Remove code that checks for index.js (now that we
 don't have any of these)

GitOrigin-RevId: c7ece8f01d1e8318ffe461e9ebe2cf0ed1b040ac
---
 .../web/app/src/infrastructure/Modules.js     | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/services/web/app/src/infrastructure/Modules.js b/services/web/app/src/infrastructure/Modules.js
index f746519612..b1c134f1d6 100644
--- a/services/web/app/src/infrastructure/Modules.js
+++ b/services/web/app/src/infrastructure/Modules.js
@@ -26,29 +26,18 @@ async function modules() {
 }
 
 async function loadModulesImpl() {
-  const settingsCheckModuleCjs = Path.join(
-    MODULE_BASE_PATH,
-    'settings-check',
-    'index.js'
-  )
-  const settingsCheckModuleEsm = Path.join(
+  const settingsCheckModule = Path.join(
     MODULE_BASE_PATH,
     'settings-check',
     'index.mjs'
   )
-  if (fs.existsSync(settingsCheckModuleCjs)) {
-    await import(settingsCheckModuleCjs)
-  } else if (fs.existsSync(settingsCheckModuleEsm)) {
-    await import(settingsCheckModuleEsm)
+  if (fs.existsSync(settingsCheckModule)) {
+    await import(settingsCheckModule)
   }
   for (const moduleName of Settings.moduleImportSequence || []) {
-    let path
-    if (fs.existsSync(Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs'))) {
-      path = Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs')
-    } else {
-      path = Path.join(MODULE_BASE_PATH, moduleName, 'index.js')
-    }
-    const module = await import(path)
+    const module = await import(
+      Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs')
+    )
     const loadedModule = module.default || module
 
     loadedModule.name = moduleName

From c538091fa810c3824c16fedf3cc80edf6179dfd1 Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Wed, 2 Jul 2025 11:32:48 +0200
Subject: [PATCH 078/274] Add script to check and fix duplicate collaborators
 in projects (#26572)

* [web] Add script to check and fix duplicate collaborators in projects

* use batchedUpdate

* project-id param and BATCH_RANGE_START,

GitOrigin-RevId: 451549eaff255dfae3e55515786d7a68184d557f
---
 .../scripts/check_duplicate_collaborators.mjs | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 services/web/scripts/check_duplicate_collaborators.mjs

diff --git a/services/web/scripts/check_duplicate_collaborators.mjs b/services/web/scripts/check_duplicate_collaborators.mjs
new file mode 100644
index 0000000000..cf4ba7eafd
--- /dev/null
+++ b/services/web/scripts/check_duplicate_collaborators.mjs
@@ -0,0 +1,157 @@
+#!/usr/bin/env node
+
+/**
+ * Script to check for and optionally fix duplicate collaborators in projects
+ *
+ * A duplicate collaborator is when the same user id appears in multiple collaborator
+ * arrays for the same project (collaberator_refs, readOnly_refs, reviewer_refs, etc.)
+ *
+ * If "--fix" is used, this script will remove users from higher privilege roles and keeps them in lower privilege roles
+ *
+ * Usage:
+ *   node scripts/check_duplicate_collaborators.mjs [--fix] [--project-id=<id>]
+ */
+
+import {
+  batchedUpdate,
+  READ_PREFERENCE_SECONDARY,
+} from '@overleaf/mongo-utils/batchedUpdate.js'
+import { db, ObjectId } from '../app/src/infrastructure/mongodb.js'
+import minimist from 'minimist'
+import { scriptRunner } from './lib/ScriptRunner.mjs'
+
+const args = minimist(process.argv.slice(2), {
+  boolean: ['fix'],
+  string: ['project-id', 'start-date', 'end-date'],
+  default: {
+    fix: false,
+  },
+})
+
+async function fixDuplicateCollaborators(project, trackProgress) {
+  const dryRun = !args.fix
+  const removeCollaboratorRefs = []
+  const removeReviewerRefs = []
+
+  for (const reviewerRef of project.reviewer_refs || []) {
+    if (includesId(project.readOnly_refs, reviewerRef)) {
+      removeReviewerRefs.push(reviewerRef) // remove from reviewer_refs (keep read-only)
+    }
+    if (includesId(project.collaberator_refs, reviewerRef)) {
+      removeCollaboratorRefs.push(reviewerRef) // remove from collaberator_refs (keep reviewer)
+    }
+  }
+
+  if (
+    !dryRun &&
+    (removeCollaboratorRefs.length > 0 || removeReviewerRefs.length > 0)
+  ) {
+    await db.projects.updateOne(
+      { _id: project._id },
+      {
+        $pull: {
+          collaberator_refs: { $in: removeCollaboratorRefs },
+          reviewer_refs: { $in: removeReviewerRefs },
+        },
+      }
+    )
+  }
+
+  const action = args.fix ? 'Removed' : 'Found duplicates in'
+
+  if (removeCollaboratorRefs.length > 0) {
+    trackProgress(
+      `${action} collaborators from project ${project._id}:`,
+      removeCollaboratorRefs
+    )
+  }
+  if (removeReviewerRefs.length > 0) {
+    trackProgress(
+      `${action} reviewers from project ${project._id}:`,
+      removeReviewerRefs
+    )
+  }
+}
+
+async function main(trackProgress) {
+  if (!args['start-date'] && !args['project-id']) {
+    console.error(
+      'Please provide either --start-date or --project-id argument.'
+    )
+    process.exit(1)
+  }
+
+  if (args['project-id']) {
+    const projectId = new ObjectId(args['project-id'])
+    const project = await db.projects.findOne(
+      { _id: projectId },
+      {
+        readPreference: READ_PREFERENCE_SECONDARY,
+        projection: {
+          _id: 1,
+          collaberator_refs: 1,
+          readOnly_refs: 1,
+          reviewer_refs: 1,
+        },
+      }
+    )
+
+    if (!project) {
+      console.error(`Project with id ${projectId} not found`)
+      process.exit(1)
+    }
+
+    await fixDuplicateCollaborators(project, trackProgress)
+
+    return
+  }
+
+  let projectsProcessed = 0
+  await batchedUpdate(
+    db.projects,
+    {
+      reviewer_refs: { $ne: [] },
+      $or: [{ readOnly_refs: { $ne: [] } }, { collaberator_refs: { $ne: [] } }],
+    },
+    /**
+     * @param {Array<Project>} projects
+     * @return {Promise<void>}
+     */
+    async function projects(projects) {
+      for (const project of projects) {
+        projectsProcessed += 1
+        if (projectsProcessed % 10000 === 0) {
+          console.log(projectsProcessed, 'projects processed')
+        }
+
+        await fixDuplicateCollaborators(project, trackProgress)
+      }
+    },
+    {
+      _id: 1,
+      collaberator_refs: 1,
+      readOnly_refs: 1,
+      reviewer_refs: 1,
+    },
+    undefined,
+    {
+      trackProgress,
+      BATCH_RANGE_START: new Date(args['start-date']).toISOString(),
+      BATCH_RANGE_END: args['end-date']
+        ? new Date(args['end-date']).toISOString()
+        : new Date().toISOString(),
+    }
+  )
+}
+
+function includesId(array, id) {
+  return array?.some(item => item.toString() === id.toString())
+}
+
+try {
+  await scriptRunner(main)
+  process.exit()
+} catch (error) {
+  console.error(error)
+  process.exit(1)
+}

From 75d443934fcf784d690a25a169992ec658ca7c6e Mon Sep 17 00:00:00 2001
From: Alexandre Bourdin <abourdin@users.noreply.github.com>
Date: Wed, 2 Jul 2025 11:32:55 +0200
Subject: [PATCH 079/274] Merge pull request #26674 from
 overleaf/ab-fix-stacking-tooltips

Lower default delayHide for tooltips to prevent stacking

GitOrigin-RevId: e13fa28f495e1b79aa552a236e1c9d161ab2ee0c
---
 .../js/features/ui/components/bootstrap-5/tooltip.tsx  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
index 39a45e96e0..ac7dcb3858 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
@@ -13,6 +13,10 @@ import {
 } from 'react-bootstrap'
 import { callFnsInSequence } from '@/utils/functions'
 
+const DEFAULT_DELAY_SHOW = 300
+// Slightly lower value avoids flickering when an adjacent tooltip is shown before the previous one hides
+const DEFAULT_DELAY_HIDE = 290
+
 type OverlayProps = Omit<OverlayTriggerProps, 'overlay' | 'children'>
 
 const UpdatingTooltip = forwardRef<HTMLDivElement, BSTooltipProps>(
@@ -72,11 +76,11 @@ function Tooltip({
   }
 
   const delay = overlayProps?.delay
-  let delayShow = 300
-  let delayHide = 300
+  let delayShow = DEFAULT_DELAY_SHOW
+  let delayHide = DEFAULT_DELAY_HIDE
   if (delay) {
     delayShow = typeof delay === 'number' ? delay : delay.show
-    delayHide = typeof delay === 'number' ? delay : delay.hide
+    delayHide = typeof delay === 'number' ? Math.max(delay - 10, 0) : delay.hide
   }
 
   return (

From 36c4c656098603e48b2e9caa4839356487dff63b Mon Sep 17 00:00:00 2001
From: Alexandre Bourdin <abourdin@users.noreply.github.com>
Date: Wed, 2 Jul 2025 11:33:01 +0200
Subject: [PATCH 080/274] Merge pull request #26683 from
 overleaf/ab-update-survey-form

Update survey form and preview + support custom button CTA

GitOrigin-RevId: 2b519ab1da1c8e7897b3135956f80619f4e901b4
---
 .../app/src/Features/Survey/SurveyHandler.mjs |  6 +-
 .../app/src/Features/Survey/SurveyManager.js  |  7 ++-
 services/web/app/src/models/Survey.js         |  8 ++-
 .../components/sidebar/sidebar.tsx            | 49 ----------------
 .../components/survey-widget-ds-nav.tsx       |  6 +-
 .../project-list/components/survey-widget.tsx | 43 --------------
 ...s.tsx => survey-widget-ds-nav.stories.tsx} | 15 ++---
 .../components/survey-widget.test.tsx         | 56 +++++++++++++++----
 .../web/types/project/dashboard/survey.d.ts   |  5 +-
 9 files changed, 71 insertions(+), 124 deletions(-)
 delete mode 100644 services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx
 delete mode 100644 services/web/frontend/js/features/project-list/components/survey-widget.tsx
 rename services/web/frontend/stories/project-list/{survey-widget.stories.tsx => survey-widget-ds-nav.stories.tsx} (55%)

diff --git a/services/web/app/src/Features/Survey/SurveyHandler.mjs b/services/web/app/src/Features/Survey/SurveyHandler.mjs
index 7ce89594c6..db857d9fd3 100644
--- a/services/web/app/src/Features/Survey/SurveyHandler.mjs
+++ b/services/web/app/src/Features/Survey/SurveyHandler.mjs
@@ -14,7 +14,7 @@ import UserGetter from '../User/UserGetter.js'
  * determines if there is a survey to show, given current surveys and rollout percentages
  * uses userId in computation, to ensure that rollout groups always contain same users
  * @param {string} userId
- * @returns {Promise<Survey | undefined>}
+ * @returns {Promise<Pick<Survey, 'name' | 'title' | 'text' | 'cta' | 'url'> | undefined>}
  */
 async function getSurvey(userId) {
   const survey = await SurveyCache.get(true)
@@ -27,7 +27,7 @@ async function getSurvey(userId) {
       }
     }
 
-    const { name, preText, linkText, url, options } = survey?.toObject() || {}
+    const { name, title, text, cta, url, options } = survey?.toObject() || {}
     // default to full rollout for backwards compatibility
     const rolloutPercentage = options?.rolloutPercentage || 100
     if (!_userInRolloutPercentile(userId, name, rolloutPercentage)) {
@@ -53,7 +53,7 @@ async function getSurvey(userId) {
       }
     }
 
-    return { name, preText, linkText, url }
+    return { name, title, text, cta, url }
   }
 }
 
diff --git a/services/web/app/src/Features/Survey/SurveyManager.js b/services/web/app/src/Features/Survey/SurveyManager.js
index 3d6f225e10..7eac05f5d3 100644
--- a/services/web/app/src/Features/Survey/SurveyManager.js
+++ b/services/web/app/src/Features/Survey/SurveyManager.js
@@ -9,15 +9,16 @@ async function getSurvey() {
   }
 }
 
-async function updateSurvey({ name, preText, linkText, url, options }) {
+async function updateSurvey({ name, title, text, cta, url, options }) {
   validateOptions(options)
   let survey = await getSurvey()
   if (!survey) {
     survey = new Survey()
   }
   survey.name = name
-  survey.preText = preText
-  survey.linkText = linkText
+  survey.title = title
+  survey.text = text
+  survey.cta = cta
   survey.url = url
   survey.options = options
   await survey.save()
diff --git a/services/web/app/src/models/Survey.js b/services/web/app/src/models/Survey.js
index deb5d60454..bd1582a08b 100644
--- a/services/web/app/src/models/Survey.js
+++ b/services/web/app/src/models/Survey.js
@@ -19,14 +19,18 @@ const SurveySchema = new Schema(
         message: `invalid, must match: ${NAME_REGEX}`,
       },
     },
-    preText: {
+    title: {
       type: String,
       required: true,
     },
-    linkText: {
+    text: {
       type: String,
       required: true,
     },
+    cta: {
+      type: String,
+      required: false,
+    },
     url: {
       type: String,
       required: true,
diff --git a/services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx b/services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx
deleted file mode 100644
index 55bab83261..0000000000
--- a/services/web/frontend/js/features/project-list/components/sidebar/sidebar.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import NewProjectButton from '../new-project-button'
-import SidebarFilters from './sidebar-filters'
-import AddAffiliation, { useAddAffiliation } from '../add-affiliation'
-import SurveyWidget from '../survey-widget'
-import { usePersistedResize } from '../../../../shared/hooks/use-resize'
-
-function Sidebar() {
-  const { show: showAddAffiliationWidget } = useAddAffiliation()
-  const { mousePos, getHandleProps, getTargetProps } = usePersistedResize({
-    name: 'project-sidebar',
-  })
-
-  return (
-    <div
-      className="project-list-sidebar-wrapper-react d-none d-md-block"
-      {...getTargetProps({
-        style: {
-          ...(mousePos?.x && { flexBasis: `${mousePos.x}px` }),
-        },
-      })}
-    >
-      <div className="project-list-sidebar-subwrapper">
-        <aside className="project-list-sidebar-react">
-          <NewProjectButton id="new-project-button-sidebar" />
-          <SidebarFilters />
-          {showAddAffiliationWidget && <hr />}
-          <AddAffiliation />
-        </aside>
-        <div className="project-list-sidebar-survey-wrapper">
-          <SurveyWidget />
-        </div>
-      </div>
-      <div
-        {...getHandleProps({
-          style: {
-            position: 'absolute',
-            zIndex: 1,
-            top: 0,
-            right: '-2px',
-            height: '100%',
-            width: '4px',
-          },
-        })}
-      />
-    </div>
-  )
-}
-
-export default Sidebar
diff --git a/services/web/frontend/js/features/project-list/components/survey-widget-ds-nav.tsx b/services/web/frontend/js/features/project-list/components/survey-widget-ds-nav.tsx
index 5fcc0f7e3d..9264b3288d 100644
--- a/services/web/frontend/js/features/project-list/components/survey-widget-ds-nav.tsx
+++ b/services/web/frontend/js/features/project-list/components/survey-widget-ds-nav.tsx
@@ -26,8 +26,8 @@ export function SurveyWidgetDsNav() {
       <div className="notification-entry">
         <div role="alert" className="survey-notification">
           <div className="notification-body">
-            <p className="fw-bold fs-6 pe-4">{survey.preText}</p>
-            <p>{survey.linkText}</p>
+            <p className="fw-bold fs-6 pe-4">{survey.title}</p>
+            <p>{survey.text}</p>
             <OLButton
               variant="secondary"
               size="sm"
@@ -35,7 +35,7 @@ export function SurveyWidgetDsNav() {
               target="_blank"
               rel="noreferrer noopener"
             >
-              {t('take_survey')}
+              {survey.cta || t('take_survey')}
             </OLButton>
           </div>
           <OLButton
diff --git a/services/web/frontend/js/features/project-list/components/survey-widget.tsx b/services/web/frontend/js/features/project-list/components/survey-widget.tsx
deleted file mode 100644
index ae0847ef92..0000000000
--- a/services/web/frontend/js/features/project-list/components/survey-widget.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import usePersistedState from '../../../shared/hooks/use-persisted-state'
-import getMeta from '../../../utils/meta'
-import { useCallback } from 'react'
-import Close from '@/shared/components/close'
-
-export default function SurveyWidget() {
-  const survey = getMeta('ol-survey')
-  const [dismissedSurvey, setDismissedSurvey] = usePersistedState(
-    `dismissed-${survey?.name}`,
-    false
-  )
-
-  const dismissSurvey = useCallback(() => {
-    setDismissedSurvey(true)
-  }, [setDismissedSurvey])
-
-  if (!survey?.name || dismissedSurvey) {
-    return null
-  }
-
-  return (
-    <div className="user-notifications">
-      <div className="notification-entry">
-        <div role="alert" className="survey-notification">
-          <div className="notification-body">
-            {survey.preText}&nbsp;
-            <a
-              className="project-list-sidebar-survey-link"
-              href={survey.url}
-              target="_blank"
-              rel="noreferrer noopener"
-            >
-              {survey.linkText}
-            </a>
-          </div>
-          <div className="notification-close notification-close-button-style">
-            <Close variant="dark" onDismiss={() => dismissSurvey()} />
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/services/web/frontend/stories/project-list/survey-widget.stories.tsx b/services/web/frontend/stories/project-list/survey-widget-ds-nav.stories.tsx
similarity index 55%
rename from services/web/frontend/stories/project-list/survey-widget.stories.tsx
rename to services/web/frontend/stories/project-list/survey-widget-ds-nav.stories.tsx
index c1437a789e..8e9e0d1a40 100644
--- a/services/web/frontend/stories/project-list/survey-widget.stories.tsx
+++ b/services/web/frontend/stories/project-list/survey-widget-ds-nav.stories.tsx
@@ -1,31 +1,32 @@
-import SurveyWidget from '../../js/features/project-list/components/survey-widget'
+import { SurveyWidgetDsNav } from '@/features/project-list/components/survey-widget-ds-nav'
 
 export const Survey = (args: any) => {
   localStorage.clear()
   window.metaAttributesCache.set('ol-survey', {
     name: 'my-survey',
-    preText: 'To help shape the future of Overleaf',
-    linkText: 'Click here!',
+    title: 'To help shape the future of Overleaf',
+    text: 'Click here!',
+    cta: 'Let’s go!',
     url: 'https://example.com/my-survey',
   })
 
-  return <SurveyWidget {...args} />
+  return <SurveyWidgetDsNav {...args} />
 }
 
 export const UndefinedSurvey = (args: any) => {
   localStorage.clear()
 
-  return <SurveyWidget {...args} />
+  return <SurveyWidgetDsNav {...args} />
 }
 
 export const EmptySurvey = (args: any) => {
   localStorage.clear()
   window.metaAttributesCache.set('ol-survey', {})
 
-  return <SurveyWidget {...args} />
+  return <SurveyWidgetDsNav {...args} />
 }
 
 export default {
   title: 'Project List / Survey Widget',
-  component: SurveyWidget,
+  component: SurveyWidgetDsNav,
 }
diff --git a/services/web/test/frontend/features/project-list/components/survey-widget.test.tsx b/services/web/test/frontend/features/project-list/components/survey-widget.test.tsx
index 59f6bb9680..0c0d4f01a2 100644
--- a/services/web/test/frontend/features/project-list/components/survey-widget.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/survey-widget.test.tsx
@@ -1,13 +1,14 @@
 import { expect } from 'chai'
 import { fireEvent, render, screen } from '@testing-library/react'
-import { SurveyWidgetDsNav } from '../../../../../frontend/js/features/project-list/components/survey-widget-ds-nav'
+import { SurveyWidgetDsNav } from '@/features/project-list/components/survey-widget-ds-nav'
 import { SplitTestProvider } from '@/shared/context/split-test-context'
 
 describe('<SurveyWidgetDsNav />', function () {
   beforeEach(function () {
     this.name = 'my-survey'
-    this.preText = 'To help shape the future of Overleaf'
-    this.linkText = 'Click here!'
+    this.title = 'To help shape the future of Overleaf'
+    this.text = 'Click here!'
+    this.cta = 'Let’s go!'
     this.url = 'https://example.com/my-survey'
 
     localStorage.clear()
@@ -17,8 +18,8 @@ describe('<SurveyWidgetDsNav />', function () {
     beforeEach(function () {
       window.metaAttributesCache.set('ol-survey', {
         name: this.name,
-        preText: this.preText,
-        linkText: this.linkText,
+        title: this.title,
+        text: this.text,
         url: this.url,
       })
 
@@ -33,8 +34,8 @@ describe('<SurveyWidgetDsNav />', function () {
       const dismissed = localStorage.getItem('dismissed-my-survey')
       expect(dismissed).to.equal(null)
 
-      screen.getByText(this.preText)
-      screen.getByText(this.linkText)
+      screen.getByText(this.title)
+      screen.getByText(this.text)
 
       const link = screen.getByRole('link', {
         name: 'Take survey',
@@ -48,7 +49,7 @@ describe('<SurveyWidgetDsNav />', function () {
       })
       fireEvent.click(dismissButton)
 
-      const text = screen.queryByText(this.preText)
+      const text = screen.queryByText(this.title)
       expect(text).to.be.null
 
       const link = screen.queryByRole('button')
@@ -59,12 +60,43 @@ describe('<SurveyWidgetDsNav />', function () {
     })
   })
 
+  describe('survey widget is visible with custom CTA', function () {
+    beforeEach(function () {
+      window.metaAttributesCache.set('ol-survey', {
+        name: this.name,
+        title: this.title,
+        text: this.text,
+        cta: this.cta,
+        url: this.url,
+      })
+
+      render(
+        <SplitTestProvider>
+          <SurveyWidgetDsNav />
+        </SplitTestProvider>
+      )
+    })
+
+    it('shows text and link with custom CTA', function () {
+      const dismissed = localStorage.getItem('dismissed-my-survey')
+      expect(dismissed).to.equal(null)
+
+      screen.getByText(this.title)
+      screen.getByText(this.text)
+
+      const link = screen.getByRole('link', {
+        name: this.cta,
+      }) as HTMLAnchorElement
+      expect(link.href).to.equal(this.url)
+    })
+  })
+
   describe('survey widget is not shown when already dismissed', function () {
     beforeEach(function () {
       window.metaAttributesCache.set('ol-survey', {
         name: this.name,
-        preText: this.preText,
-        linkText: this.linkText,
+        title: this.title,
+        text: this.text,
         url: this.url,
       })
       localStorage.setItem('dismissed-my-survey', 'true')
@@ -77,7 +109,7 @@ describe('<SurveyWidgetDsNav />', function () {
     })
 
     it('nothing is displayed', function () {
-      const text = screen.queryByText(this.preText)
+      const text = screen.queryByText(this.title)
       expect(text).to.be.null
 
       const link = screen.queryByRole('button')
@@ -95,7 +127,7 @@ describe('<SurveyWidgetDsNav />', function () {
     })
 
     it('nothing is displayed', function () {
-      const text = screen.queryByText(this.preText)
+      const text = screen.queryByText(this.title)
       expect(text).to.be.null
 
       const link = screen.queryByRole('button')
diff --git a/services/web/types/project/dashboard/survey.d.ts b/services/web/types/project/dashboard/survey.d.ts
index f43b454196..2dc3d9b7ec 100644
--- a/services/web/types/project/dashboard/survey.d.ts
+++ b/services/web/types/project/dashboard/survey.d.ts
@@ -1,6 +1,7 @@
 export type Survey = {
   name: string
-  preText: string
-  linkText: string
+  title: string
+  text: string
+  cta?: string
   url: string
 }

From d55cb6af5e30fd390b157c087392974497f8ca51 Mon Sep 17 00:00:00 2001
From: Alexandre Bourdin <abourdin@users.noreply.github.com>
Date: Wed, 2 Jul 2025 11:33:12 +0200
Subject: [PATCH 081/274] Merge pull request #26699 from
 overleaf/ab-survey-exclude-labs-users-option

Add an option to hide a survey from Labs users

GitOrigin-RevId: d6f87bb31221d8db38f8506afa7cc3313ad235ce
---
 .../app/src/Features/Survey/SurveyHandler.mjs | 13 ++++++--
 services/web/app/src/models/Survey.js         |  4 +++
 .../web/test/acceptance/src/helpers/User.mjs  | 31 ++++++++++++++-----
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/services/web/app/src/Features/Survey/SurveyHandler.mjs b/services/web/app/src/Features/Survey/SurveyHandler.mjs
index db857d9fd3..bcb9c4bee0 100644
--- a/services/web/app/src/Features/Survey/SurveyHandler.mjs
+++ b/services/web/app/src/Features/Survey/SurveyHandler.mjs
@@ -34,9 +34,13 @@ async function getSurvey(userId) {
       return
     }
 
-    const { earliestSignupDate, latestSignupDate } = survey.options || {}
-    if (earliestSignupDate || latestSignupDate) {
-      const user = await UserGetter.promises.getUser(userId, { signUpDate: 1 })
+    const { earliestSignupDate, latestSignupDate, excludeLabsUsers } =
+      survey.options || {}
+    if (earliestSignupDate || latestSignupDate || excludeLabsUsers) {
+      const user = await UserGetter.promises.getUser(userId, {
+        signUpDate: 1,
+        labsProgram: 1,
+      })
       if (!user) {
         return
       }
@@ -51,6 +55,9 @@ async function getSurvey(userId) {
       if (earliestSignupDate && signUpDate < earliestSignupDate) {
         return
       }
+      if (excludeLabsUsers && user.labsProgram) {
+        return
+      }
     }
 
     return { name, title, text, cta, url }
diff --git a/services/web/app/src/models/Survey.js b/services/web/app/src/models/Survey.js
index bd1582a08b..01068ef49a 100644
--- a/services/web/app/src/models/Survey.js
+++ b/services/web/app/src/models/Survey.js
@@ -50,6 +50,10 @@ const SurveySchema = new Schema(
         type: Number,
         default: 100,
       },
+      excludeLabsUsers: {
+        type: Boolean,
+        default: false,
+      },
     },
   },
   {
diff --git a/services/web/test/acceptance/src/helpers/User.mjs b/services/web/test/acceptance/src/helpers/User.mjs
index 361466e259..4371ecbe49 100644
--- a/services/web/test/acceptance/src/helpers/User.mjs
+++ b/services/web/test/acceptance/src/helpers/User.mjs
@@ -10,6 +10,7 @@ import fs from 'node:fs'
 import Path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { Cookie } from 'tough-cookie'
+
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
 const COOKIE_DOMAIN = settings.cookieDomain
 // The cookie domain has a leading '.' but the cookie jar stores it without.
@@ -37,6 +38,7 @@ class User {
       jar: this.jar,
     })
     this.signUpDate = options.signUpDate ?? new Date()
+    this.labsProgram = options.labsProgram || false
   }
 
   getSession(options, callback) {
@@ -257,13 +259,19 @@ class User {
 
   getAuditLog(callback) {
     this.get((error, user) => {
-      if (error) return callback(error)
-      if (!user) return callback(new Error('User not found'))
+      if (error) {
+        return callback(error)
+      }
+      if (!user) {
+        return callback(new Error('User not found'))
+      }
 
       db.userAuditLogEntries
         .find({ userId: new ObjectId(this._id) })
         .toArray((error, auditLog) => {
-          if (error) return callback(error)
+          if (error) {
+            return callback(error)
+          }
           callback(null, auditLog || [])
         })
     })
@@ -271,7 +279,9 @@ class User {
 
   getAuditLogWithoutNoise(callback) {
     this.getAuditLog((error, auditLog) => {
-      if (error) return callback(error)
+      if (error) {
+        return callback(error)
+      }
       callback(
         null,
         auditLog.filter(entry => {
@@ -413,7 +423,9 @@ class User {
   }
 
   ensureUserExists(callback) {
-    if (this._id) return callback() // already exists
+    if (this._id) {
+      return callback()
+    } // already exists
     const filter = { email: this.email }
     const options = { upsert: true, new: true, setDefaultsOnInsert: true }
 
@@ -431,6 +443,7 @@ class User {
               hashedPassword,
               emails: this.emails,
               signUpDate: this.signUpDate,
+              labsProgram: this.labsProgram,
             },
           },
           options
@@ -447,7 +460,9 @@ class User {
   // Update and persist feature upgrade. Downgrades will be flaky!
   upgradeFeatures(features, callback) {
     this.setFeatures(features, err => {
-      if (err) return callback(err)
+      if (err) {
+        return callback(err)
+      }
       // Persist the feature update, otherwise the next feature refresh will reset them.
       this.setFeaturesOverride(
         {
@@ -1195,7 +1210,9 @@ class User {
           json: newSettings,
         },
         (err, response, body) => {
-          if (err) return callback(err)
+          if (err) {
+            return callback(err)
+          }
           if (response.statusCode !== 200) {
             return callback(
               new Error(

From d8d53f76ca15fc0919fea373e6c399a3bc2d6c6a Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 2 Jul 2025 11:24:52 +0100
Subject: [PATCH 082/274] Avoid highlighting the focused tracked change
 (#26681)

GitOrigin-RevId: fcc47f9d23ae870e781bb0f772e2604e630cf292
---
 .../js/features/source-editor/extensions/ranges.ts    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/services/web/frontend/js/features/source-editor/extensions/ranges.ts b/services/web/frontend/js/features/source-editor/extensions/ranges.ts
index 7bde7a4adb..81d6fdbd86 100644
--- a/services/web/frontend/js/features/source-editor/extensions/ranges.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/ranges.ts
@@ -397,6 +397,9 @@ const trackChangesTheme = EditorView.baseTheme({
     {
       backgroundColor: 'rgba(194, 93, 11, 0.15)',
     },
+  '.ol-cm-change-focus .ol-cm-change': {
+    backgroundColor: 'transparent',
+  },
   '.ol-cm-change': {
     padding: 'var(--half-leading, 0) 0',
   },
@@ -422,12 +425,4 @@ const trackChangesTheme = EditorView.baseTheme({
     borderLeft: '3px solid #c5060b',
     marginLeft: '-2px',
   },
-  '&light .ol-cm-change-d-focus': {
-    borderLeft: '3px solid #B83A33',
-    marginLeft: '-2px',
-  },
-  '&dark .ol-cm-change-d-focus': {
-    borderLeft: '3px solid #B83A33',
-    marginLeft: '-2px',
-  },
 })

From 06153de0aa2220b1a289d07a85498b38bee08e57 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 2 Jul 2025 11:25:06 +0100
Subject: [PATCH 083/274] Fix Add Comment observer disconnect (#26565)

GitOrigin-RevId: bb84aa25d744a9b035a70c877c934156c2675cbd
---
 .../components/review-panel-add-comment.tsx          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-add-comment.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-add-comment.tsx
index 87f9934395..f3e8b88a47 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-add-comment.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-add-comment.tsx
@@ -102,19 +102,25 @@ export const ReviewPanelAddComment = memo<{
     }
   }, [])
 
+  const observerRef = useRef<MutationObserver | null>(null)
+
   const handleElement = useCallback(
     (element: HTMLElement | null) => {
       if (element) {
         element.dispatchEvent(new Event('review-panel:position'))
 
-        const observer = new MutationObserver(observerCallback)
+        observerRef.current = new MutationObserver(observerCallback)
         const entryWrapper = element.closest('.review-panel-entry')
         if (entryWrapper) {
-          observer.observe(entryWrapper, {
+          observerRef.current.observe(entryWrapper, {
             attributes: true,
             attributeFilter: ['style'],
           })
-          return () => observer.disconnect()
+        }
+      } else {
+        // [TODO React 19] return a cleanup function instead of using null element
+        if (observerRef.current) {
+          observerRef.current.disconnect()
         }
       }
     },

From 58303de9f4102e93a4fcdf27b840c6182d6e1773 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 2 Jul 2025 11:27:02 +0100
Subject: [PATCH 084/274] Enable full project search in Community Edition and
 Server Pro (#25753)

GitOrigin-RevId: 1def9c3e190c907d41b7f822831e12c8609e9c7c
---
 develop/README.md                             |  2 +-
 develop/dev.env                               |  3 +++
 develop/docker-compose.dev.yml                |  2 +-
 .../src/Features/Compile/CompileController.js | 14 ++++++++++---
 services/web/config/settings.defaults.js      | 21 ++++++++++++++++---
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/develop/README.md b/develop/README.md
index 568259c4e3..8d45383c23 100644
--- a/develop/README.md
+++ b/develop/README.md
@@ -42,7 +42,7 @@ To do this, use the included `bin/dev` script:
 bin/dev
 ```
 
-This will start all services using `nodemon`, which will automatically monitor the code and restart the services as necessary.
+This will start all services using `node --watch`, which will automatically monitor the code and restart the services as necessary.
 
 To improve performance, you can start only a subset of the services in development mode by providing a space-separated list to the `bin/dev` script:
 
diff --git a/develop/dev.env b/develop/dev.env
index aae91497db..6ebbbb1ffd 100644
--- a/develop/dev.env
+++ b/develop/dev.env
@@ -6,14 +6,17 @@ DOCUMENT_UPDATER_HOST=document-updater
 FILESTORE_HOST=filestore
 GRACEFUL_SHUTDOWN_DELAY_SECONDS=0
 HISTORY_V1_HOST=history-v1
+HISTORY_REDIS_HOST=redis
 LISTEN_ADDRESS=0.0.0.0
 MONGO_HOST=mongo
 MONGO_URL=mongodb://mongo/sharelatex?directConnection=true
 NOTIFICATIONS_HOST=notifications
 PROJECT_HISTORY_HOST=project-history
+QUEUES_REDIS_HOST=redis
 REALTIME_HOST=real-time
 REDIS_HOST=redis
 SESSION_SECRET=foo
+V1_HISTORY_HOST=history-v1
 WEBPACK_HOST=webpack
 WEB_API_PASSWORD=overleaf
 WEB_API_USER=overleaf
diff --git a/develop/docker-compose.dev.yml b/develop/docker-compose.dev.yml
index 4432a24162..3d2fca7e0b 100644
--- a/develop/docker-compose.dev.yml
+++ b/develop/docker-compose.dev.yml
@@ -113,7 +113,7 @@ services:
       - ../services/real-time/config:/overleaf/services/real-time/config
 
   web:
-    command: ["node", "--watch", "app.js", "--watch-locales"]
+    command: ["node", "--watch", "app.mjs", "--watch-locales"]
     environment:
       - NODE_OPTIONS=--inspect=0.0.0.0:9229
     ports:
diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js
index 9d5cbf63b9..8f2e289680 100644
--- a/services/web/app/src/Features/Compile/CompileController.js
+++ b/services/web/app/src/Features/Compile/CompileController.js
@@ -1,4 +1,4 @@
-const { URL, URLSearchParams } = require('url')
+const { URL } = require('url')
 const { pipeline } = require('stream/promises')
 const { Cookie } = require('tough-cookie')
 const OError = require('@overleaf/o-error')
@@ -580,10 +580,18 @@ const _CompileController = {
     })
 
     url = new URL(`${Settings.apis.clsi.url}${url}`)
-    url.search = new URLSearchParams({
+
+    const searchParams = {
       ...persistenceOptions.qs,
       ...qs,
-    }).toString()
+    }
+    for (const [key, value] of Object.entries(searchParams)) {
+      if (value !== undefined) {
+        // avoid sending "undefined" as a string value
+        url.searchParams.set(key, value)
+      }
+    }
+
     const timer = new Metrics.Timer(
       'proxy_to_clsi',
       1,
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index 07558a0420..6edb19e6df 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -996,9 +996,24 @@ module.exports = {
     settingsEntries: [],
     autoCompleteExtensions: [],
     sectionTitleGenerators: [],
-    toastGenerators: [],
-    editorSidebarComponents: [],
-    fileTreeToolbarComponents: [],
+    toastGenerators: [
+      Path.resolve(
+        __dirname,
+        '../frontend/js/features/pdf-preview/components/synctex-toasts'
+      ),
+    ],
+    editorSidebarComponents: [
+      Path.resolve(
+        __dirname,
+        '../modules/full-project-search/frontend/js/components/full-project-search.tsx'
+      ),
+    ],
+    fileTreeToolbarComponents: [
+      Path.resolve(
+        __dirname,
+        '../modules/full-project-search/frontend/js/components/full-project-search-button.tsx'
+      ),
+    ],
     fullProjectSearchPanel: [],
     integrationPanelComponents: [],
     referenceSearchSetting: [],

From 97863f62ca9d60e599cb89021ab35c6fe32ba443 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 2 Jul 2025 11:35:35 +0100
Subject: [PATCH 085/274] Upgrade TypeScript to 5.8.3 (#24900)

GitOrigin-RevId: 80937de3dde14e21e02af2ecb93350b1fedafc82
---
 package-lock.json                             | 640 +++++++-----------
 package.json                                  |   6 +-
 .../features/history/services/types/file.ts   |   8 +-
 .../js/features/history/utils/file-diff.ts    |  18 +-
 .../js/features/history/utils/file-tree.ts    |  39 +-
 .../settings/context/user-email-context.tsx   |   8 +-
 services/web/package.json                     |   2 +-
 services/web/tsconfig.json                    |   3 +-
 8 files changed, 273 insertions(+), 451 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 515c8b7d70..bf2aca88c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,8 +41,8 @@
         "@types/chai": "^4.3.0",
         "@types/chai-as-promised": "^7.1.8",
         "@types/mocha": "^10.0.6",
-        "@typescript-eslint/eslint-plugin": "^8.0.0",
-        "@typescript-eslint/parser": "^8.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.30.1",
+        "@typescript-eslint/parser": "^8.30.1",
         "eslint": "^8.15.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-config-standard": "^17.0.0",
@@ -56,7 +56,7 @@
         "eslint-plugin-promise": "^6.0.0",
         "eslint-plugin-unicorn": "^56.0.0",
         "prettier": "3.3.3",
-        "typescript": "^5.5.4"
+        "typescript": "^5.8.3"
       }
     },
     "jobs/mirror-documentation": {
@@ -12914,20 +12914,21 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.1.tgz",
-      "integrity": "sha512-5g3Y7GDFsJAnY4Yhvk8sZtFfV6YNF2caLzjrRPUBzewjPCaj0yokePB4LJSobyCzGMzjZZYFbwuzbfDHlimXbQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.30.1.tgz",
+      "integrity": "sha512-v+VWphxMjn+1t48/jO4t950D6KR8JaJuNXzi33Ve6P8sEmPr5k6CEXjdGwT6+LodVnEa91EQCtwjWNUCPweo+Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/type-utils": "8.0.1",
-        "@typescript-eslint/utils": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/scope-manager": "8.30.1",
+        "@typescript-eslint/type-utils": "8.30.1",
+        "@typescript-eslint/utils": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -12938,22 +12939,19 @@
       },
       "peerDependencies": {
         "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz",
-      "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.30.1.tgz",
+      "integrity": "sha512-+C0B6ChFXZkuaNDl73FJxRYT0G7ufVPOSQkqkpM/U198wUwUFOtgo1k/QzFh1KjpBitaK7R1tgjVz6o9HmsRPg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1"
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -12964,10 +12962,11 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz",
-      "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
+      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -12977,13 +12976,14 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz",
-      "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
+      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.30.1",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -12994,27 +12994,42 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.0.1.tgz",
-      "integrity": "sha512-5IgYJ9EO/12pOUwiBKFkpU7rS3IU21mtXzB81TNwq2xEybcmAZrE9qwDtsb5uQd9aVO9o0fdabFyAmKveXyujg==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.30.1.tgz",
+      "integrity": "sha512-H+vqmWwT5xoNrXqWs/fesmssOW70gxFlgcMlYcBaWNPIEWDgLa4W9nkSPmhuOgLnXq9QYgkZ31fhDyLhleCsAg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/typescript-estree": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/scope-manager": "8.30.1",
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/typescript-estree": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -13025,22 +13040,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz",
-      "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.30.1.tgz",
+      "integrity": "sha512-+C0B6ChFXZkuaNDl73FJxRYT0G7ufVPOSQkqkpM/U198wUwUFOtgo1k/QzFh1KjpBitaK7R1tgjVz6o9HmsRPg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1"
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13051,10 +13063,11 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz",
-      "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
+      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -13064,19 +13077,20 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz",
-      "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.30.1.tgz",
+      "integrity": "sha512-kQQnxymiUy9tTb1F2uep9W6aBiYODgq5EMSk6Nxh4Z+BDUoYUSa029ISs5zTzKBFnexQEh71KqwjKnRz58lusQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13085,20 +13099,19 @@
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz",
-      "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
+      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.30.1",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13108,31 +13121,24 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -13144,42 +13150,24 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -13190,17 +13178,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/parser/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -13208,13 +13191,17 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/@typescript-eslint/parser/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
@@ -13235,15 +13222,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.0.1.tgz",
-      "integrity": "sha512-+/UT25MWvXeDX9YaHv1IS6KI1fiuTto43WprE7pgSMswHbn1Jm9GEM4Txp+X74ifOWV8emu2AWcbLhpJAvD5Ng==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.30.1.tgz",
+      "integrity": "sha512-64uBF76bfQiJyHgZISC7vcNz3adqQKIccVoKubyQcOnNcdJBvYOILV1v22Qhsw3tw3VQu5ll8ND6hycgAR5fEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.0.1",
-        "@typescript-eslint/utils": "8.0.1",
+        "@typescript-eslint/typescript-estree": "8.30.1",
+        "@typescript-eslint/utils": "8.30.1",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13252,17 +13240,17 @@
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz",
-      "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
+      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -13272,19 +13260,20 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz",
-      "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.30.1.tgz",
+      "integrity": "sha512-kQQnxymiUy9tTb1F2uep9W6aBiYODgq5EMSk6Nxh4Z+BDUoYUSa029ISs5zTzKBFnexQEh71KqwjKnRz58lusQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13293,20 +13282,19 @@
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz",
-      "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
+      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.30.1",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13316,31 +13304,24 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -13352,42 +13333,24 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -13398,17 +13361,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/type-utils/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -13416,13 +13374,17 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/@typescript-eslint/types": {
@@ -13564,15 +13526,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.0.1.tgz",
-      "integrity": "sha512-CBFR0G0sCt0+fzfnKaciu9IBsKvEKYwN9UZ+eeogK1fYHg4Qxk1yf/wLQkLXlq8wbU2dFlgAesxt8Gi76E8RTA==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.30.1.tgz",
+      "integrity": "sha512-T/8q4R9En2tcEsWPQgB5BQ0XJVOtfARcUvOa8yJP3fh9M/mXraLxZrkCfGb6ChrO/V3W+Xbd04RacUEqk1CFEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.0.1",
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/typescript-estree": "8.0.1"
+        "@typescript-eslint/scope-manager": "8.30.1",
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/typescript-estree": "8.30.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13582,17 +13545,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.0.1.tgz",
-      "integrity": "sha512-NpixInP5dm7uukMiRyiHjRKkom5RIFA4dfiHvalanD2cF0CLUuQqxfg8PtEUo9yqJI2bBhF+pcSafqnG3UBnRQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.30.1.tgz",
+      "integrity": "sha512-+C0B6ChFXZkuaNDl73FJxRYT0G7ufVPOSQkqkpM/U198wUwUFOtgo1k/QzFh1KjpBitaK7R1tgjVz6o9HmsRPg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1"
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13603,10 +13568,11 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.0.1.tgz",
-      "integrity": "sha512-PpqTVT3yCA/bIgJ12czBuE3iBlM3g4inRSC5J0QOdQFAn07TYrYEQBBKgXH1lQpglup+Zy6c1fxuwTk4MTNKIw==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
+      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -13616,19 +13582,20 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.1.tgz",
-      "integrity": "sha512-8V9hriRvZQXPWU3bbiUV4Epo7EvgM6RTs+sUmxp5G//dBGy402S7Fx0W0QkB2fb4obCF8SInoUzvTYtc3bkb5w==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.30.1.tgz",
+      "integrity": "sha512-kQQnxymiUy9tTb1F2uep9W6aBiYODgq5EMSk6Nxh4Z+BDUoYUSa029ISs5zTzKBFnexQEh71KqwjKnRz58lusQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "@typescript-eslint/visitor-keys": "8.0.1",
+        "@typescript-eslint/types": "8.30.1",
+        "@typescript-eslint/visitor-keys": "8.30.1",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13637,20 +13604,19 @@
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.1.tgz",
-      "integrity": "sha512-W5E+o0UfUcK5EgchLZsyVWqARmsM7v54/qEq6PY3YI5arkgmCzHiuk0zKSJJbm71V0xdRna4BGomkCTXz2/LkQ==",
+      "version": "8.30.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
+      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.0.1",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.30.1",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13660,31 +13626,24 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@typescript-eslint/utils/node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -13696,42 +13655,24 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@typescript-eslint/utils/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -13742,17 +13683,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -13760,13 +13696,17 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/@typescript-eslint/utils/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
@@ -21677,57 +21617,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz",
-      "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.8.0"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/utils": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz",
-      "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.21.0",
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/typescript-estree": "8.21.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.8.0"
-      }
-    },
     "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/visitor-keys": {
       "version": "8.21.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz",
@@ -21746,34 +21635,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/eslint-plugin-testing-library/node_modules/eslint-visitor-keys": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
@@ -21787,48 +21648,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/ts-api-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
-      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4"
-      }
-    },
     "node_modules/eslint-plugin-unicorn": {
       "version": "56.0.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-56.0.0.tgz",
@@ -40189,10 +40008,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -45460,7 +45280,7 @@
         "timekeeper": "^2.2.0",
         "to-string-loader": "^1.2.0",
         "tty-browserify": "^0.0.1",
-        "typescript": "^5.0.4",
+        "typescript": "^5.8.3",
         "uuid": "^9.0.1",
         "vitest": "^3.1.2",
         "w3c-keyname": "^2.2.8",
diff --git a/package.json b/package.json
index f637e464a0..553aa41bce 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "@types/chai": "^4.3.0",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.6",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.30.1",
+    "@typescript-eslint/parser": "^8.30.1",
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^17.0.0",
@@ -23,7 +23,7 @@
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-unicorn": "^56.0.0",
     "prettier": "3.3.3",
-    "typescript": "^5.5.4"
+    "typescript": "^5.8.3"
   },
   "overrides": {
     "swagger-tools@0.10.4": {
diff --git a/services/web/frontend/js/features/history/services/types/file.ts b/services/web/frontend/js/features/history/services/types/file.ts
index 4fb1330087..e517fdb518 100644
--- a/services/web/frontend/js/features/history/services/types/file.ts
+++ b/services/web/frontend/js/features/history/services/types/file.ts
@@ -30,9 +30,5 @@ export interface FileRenamed extends FileWithEditable {
   operation: Extract<FileOperation, 'renamed'>
 }
 
-export type FileDiff =
-  | FileAdded
-  | FileRemoved
-  | FileEdited
-  | FileRenamed
-  | FileUnchanged
+export type FileChanged = FileAdded | FileRemoved | FileEdited | FileRenamed
+export type FileDiff = FileChanged | FileUnchanged
diff --git a/services/web/frontend/js/features/history/utils/file-diff.ts b/services/web/frontend/js/features/history/utils/file-diff.ts
index 3d5febbb10..c78fd3275c 100644
--- a/services/web/frontend/js/features/history/utils/file-diff.ts
+++ b/services/web/frontend/js/features/history/utils/file-diff.ts
@@ -1,24 +1,24 @@
-import type {
+import {
+  FileChanged,
   FileDiff,
   FileRemoved,
   FileRenamed,
-  FileWithEditable,
 } from '../services/types/file'
 
+export function isFileChanged(fileDiff: FileDiff): fileDiff is FileChanged {
+  return 'operation' in fileDiff
+}
+
 export function isFileRenamed(fileDiff: FileDiff): fileDiff is FileRenamed {
-  return (fileDiff as FileRenamed).operation === 'renamed'
+  return isFileChanged(fileDiff) && fileDiff.operation === 'renamed'
 }
 
 export function isFileRemoved(fileDiff: FileDiff): fileDiff is FileRemoved {
-  return (fileDiff as FileRemoved).operation === 'removed'
-}
-
-function isFileWithEditable(fileDiff: FileDiff): fileDiff is FileWithEditable {
-  return 'editable' in (fileDiff as FileWithEditable)
+  return isFileChanged(fileDiff) && fileDiff.operation === 'removed'
 }
 
 export function isFileEditable(fileDiff: FileDiff) {
-  return isFileWithEditable(fileDiff)
+  return 'editable' in fileDiff
     ? fileDiff.editable
     : fileDiff.operation === 'edited'
 }
diff --git a/services/web/frontend/js/features/history/utils/file-tree.ts b/services/web/frontend/js/features/history/utils/file-tree.ts
index 423621902c..e997457e8d 100644
--- a/services/web/frontend/js/features/history/utils/file-tree.ts
+++ b/services/web/frontend/js/features/history/utils/file-tree.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import type { FileDiff, FileRenamed } from '../services/types/file'
-import { isFileEditable, isFileRemoved } from './file-diff'
+import { isFileChanged, isFileEditable, isFileRemoved } from './file-diff'
 
 export type FileTreeEntity = {
   name?: string
@@ -65,22 +65,29 @@ export function fileTreeDiffToFileTreeData(
   const folders: HistoryFileTree[] = []
   const docs: HistoryDoc[] = []
 
-  for (const file of fileTreeDiff) {
-    if (file.type === 'file') {
-      const deletedAtV = isFileRemoved(file) ? file.deletedAtV : undefined
-
-      const newDoc: HistoryDoc = {
-        pathname: file.pathname ?? '',
-        name: file.name ?? '',
-        deletedAtV,
-        editable: isFileEditable(file),
-        operation: 'operation' in file ? file.operation : undefined,
+  for (const fileDiff of fileTreeDiff) {
+    if (fileDiff.type === 'file') {
+      if (isFileChanged(fileDiff)) {
+        docs.push({
+          pathname: fileDiff.pathname ?? '',
+          name: fileDiff.name ?? '',
+          editable: isFileEditable(fileDiff),
+          operation: fileDiff.operation,
+          deletedAtV: isFileRemoved(fileDiff) ? fileDiff.deletedAtV : undefined,
+        })
+      } else {
+        docs.push({
+          pathname: fileDiff.pathname ?? '',
+          name: fileDiff.name ?? '',
+          editable: isFileEditable(fileDiff),
+        })
       }
-
-      docs.push(newDoc)
-    } else if (file.type === 'folder') {
-      if (file.children) {
-        const folder = fileTreeDiffToFileTreeData(file.children, file.name)
+    } else if (fileDiff.type === 'folder') {
+      if (fileDiff.children) {
+        const folder = fileTreeDiffToFileTreeData(
+          fileDiff.children,
+          fileDiff.name
+        )
         folders.push(folder)
       }
     }
diff --git a/services/web/frontend/js/features/settings/context/user-email-context.tsx b/services/web/frontend/js/features/settings/context/user-email-context.tsx
index 6d470d271e..b43c1956e8 100644
--- a/services/web/frontend/js/features/settings/context/user-email-context.tsx
+++ b/services/web/frontend/js/features/settings/context/user-email-context.tsx
@@ -312,13 +312,13 @@ type UserEmailsProviderProps = {
   children: React.ReactNode
 } & Record<string, unknown>
 
-function UserEmailsProvider(props: UserEmailsProviderProps) {
+export function UserEmailsProvider(props: UserEmailsProviderProps) {
   const value = useUserEmails()
 
   return <UserEmailsContext.Provider value={value} {...props} />
 }
 
-const useUserEmailsContext = () => {
+export const useUserEmailsContext = () => {
   const context = useContext(UserEmailsContext)
 
   if (context === undefined) {
@@ -328,6 +328,4 @@ const useUserEmailsContext = () => {
   return context
 }
 
-type EmailContextType = ReturnType<typeof useUserEmailsContext>
-
-export { UserEmailsProvider, useUserEmailsContext, EmailContextType }
+export type EmailContextType = ReturnType<typeof useUserEmailsContext>
diff --git a/services/web/package.json b/services/web/package.json
index d946c62151..dc72066a87 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -362,7 +362,7 @@
     "timekeeper": "^2.2.0",
     "to-string-loader": "^1.2.0",
     "tty-browserify": "^0.0.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.8.3",
     "uuid": "^9.0.1",
     "vitest": "^3.1.2",
     "w3c-keyname": "^2.2.8",
diff --git a/services/web/tsconfig.json b/services/web/tsconfig.json
index 049642f997..63922ae9a7 100644
--- a/services/web/tsconfig.json
+++ b/services/web/tsconfig.json
@@ -1,13 +1,14 @@
 {
   "compilerOptions": {
     "target": "esnext" /* Specify ECMAScript target version */,
-    "module": "es2020" /* Specify module code generation */,
+    "module": "esnext" /* Specify module code generation */,
     "allowJs": true /* Allow JavaScript files to be compiled. */,
     //    "checkJs": true /* Report errors in .js files. */,
     "jsx": "preserve" /* Specify JSX code generation */,
     "noEmit": true /* Do not emit outputs. */,
     "strict": true /* Enable all strict type-checking options. */,
     "moduleResolution": "node" /* Specify module resolution strategy */,
+    "isolatedModules": true,
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
     "skipLibCheck": true /* Skip type checking of declaration files. */,
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,

From 3f1a93004600c0710ccd55b650e33facd2583153 Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Wed, 2 Jul 2025 14:42:17 +0200
Subject: [PATCH 086/274] [web] make SubscriptionController.cancelSubscription
 return a status (#26734)

* [web] make SubscriptionController.cancelSubscription return a status
* [web] update acceptance test to match cancel subscription behavior

GitOrigin-RevId: 507809dcb7fa645c2a69e38cdf4a9e3f736622e1
---
 .../Subscription/SubscriptionController.js    | 22 ++++-----
 .../SubscriptionControllerTests.js            | 47 ++++++++++++-------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js
index 5856682166..4e3ad8be27 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionController.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionController.js
@@ -304,20 +304,18 @@ async function resumeSubscription(req, res, next) {
   }
 }
 
-function cancelSubscription(req, res, next) {
+async function cancelSubscription(req, res, next) {
   const user = SessionManager.getSessionUser(req.session)
   logger.debug({ userId: user._id }, 'canceling subscription')
-  SubscriptionHandler.cancelSubscription(user, function (err) {
-    if (err) {
-      OError.tag(err, 'something went wrong canceling subscription', {
-        user_id: user._id,
-      })
-      return next(err)
-    }
-    // Note: this redirect isn't used in the main flow as the redirection is
-    // handled by Angular
-    res.redirect('/user/subscription/canceled')
-  })
+  try {
+    await SubscriptionHandler.promises.cancelSubscription(user)
+    return res.sendStatus(200)
+  } catch (err) {
+    OError.tag(err, 'something went wrong canceling subscription', {
+      user_id: user._id,
+    })
+    return next(err)
+  }
 }
 
 /**
diff --git a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
index 087df52815..e0b61417f1 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
@@ -487,28 +487,39 @@ describe('SubscriptionController', function () {
   })
 
   describe('cancelSubscription', function () {
-    beforeEach(function (done) {
-      this.res = {
-        redirect() {
-          done()
-        },
-      }
-      sinon.spy(this.res, 'redirect')
-      this.SubscriptionController.cancelSubscription(this.req, this.res)
-    })
-
-    it('should tell the handler to cancel this user', function (done) {
-      this.SubscriptionHandler.cancelSubscription
+    it('should tell the handler to cancel this user', async function () {
+      this.next = sinon.stub()
+      await this.SubscriptionController.cancelSubscription(
+        this.req,
+        this.res,
+        this.next
+      )
+      this.SubscriptionHandler.promises.cancelSubscription
         .calledWith(this.user)
         .should.equal(true)
-      done()
     })
 
-    it('should redurect to the subscription page', function (done) {
-      this.res.redirect
-        .calledWith('/user/subscription/canceled')
-        .should.equal(true)
-      done()
+    it('should return a 200 on success', async function () {
+      this.next = sinon.stub()
+      await this.SubscriptionController.cancelSubscription(
+        this.req,
+        this.res,
+        this.next
+      )
+      expect(this.res.statusCode).to.equal(200)
+    })
+
+    it('should call next with error', async function () {
+      this.SubscriptionHandler.promises.cancelSubscription.rejects(
+        new Error('cancel error')
+      )
+      this.next = sinon.stub()
+      await this.SubscriptionController.cancelSubscription(
+        this.req,
+        this.res,
+        this.next
+      )
+      this.next.calledWith(sinon.match.instanceOf(Error)).should.equal(true)
     })
   })
 

From 4eee7cd6ef909e2bfa0d4a8885d8e9f4e4cb2a6d Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Wed, 2 Jul 2025 14:42:42 +0200
Subject: [PATCH 087/274] [web] rm annual-prices-monthly-rates split test
 (#26727)

* [web] rm annual-prices-monthly-rates split test

- rm monthly rates treatment
- rm unused translations
- rm unused supporting functions
- rm unused styles

GitOrigin-RevId: 5901853245cd9b01ee9e4774154d29ae8f5fcae5
---
 .../Subscription/SubscriptionHelper.js        | 22 -------------------
 .../web/frontend/stylesheets/app/plans.less   |  4 ----
 .../stylesheets/bootstrap-5/pages/plans.scss  |  4 ----
 services/web/locales/en.json                  |  2 --
 services/web/scripts/plan-prices/plans.mjs    |  5 -----
 .../Subscription/SubscriptionHelperTests.js   | 20 -----------------
 6 files changed, 57 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionHelper.js b/services/web/app/src/Features/Subscription/SubscriptionHelper.js
index 429432349d..0a93fa3479 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionHelper.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionHelper.js
@@ -23,17 +23,6 @@ function shouldPlanChangeAtTermEnd(oldPlan, newPlan, isInTrial) {
   return oldPlan.price_in_cents > newPlan.price_in_cents
 }
 
-/**
- * This is duplicated in:
- *   - services/web/scripts/plan-prices/plans.mjs
- *   - services/web/modules/subscriptions/frontend/js/pages/plans/group-member-picker/group-plan-pricing.js
- * @param {number} number
- * @returns {number}
- */
-function roundUpToNearest5Cents(number) {
-  return Math.ceil(number * 20) / 20
-}
-
 /**
  * @import { CurrencyCode } from '../../../../types/subscription/currency'
  */
@@ -48,7 +37,6 @@ function roundUpToNearest5Cents(number) {
  * @typedef {Object} LocalizedGroupPrice
  * @property {PlanToPrice} price
  * @property {PlanToPrice} pricePerUser
- * @property {PlanToPrice} pricePerUserPerMonth
  */
 
 /**
@@ -65,17 +53,11 @@ function generateInitialLocalizedGroupPrice(recommendedCurrency, locale) {
       INITIAL_LICENSE_SIZE
     ].price_in_cents / 100
   const collaboratorPricePerUser = collaboratorPrice / INITIAL_LICENSE_SIZE
-  const collaboratorPricePerUserPerMonth = roundUpToNearest5Cents(
-    collaboratorPrice / INITIAL_LICENSE_SIZE / 12
-  )
   const professionalPrice =
     GroupPlansData.enterprise.professional[recommendedCurrency][
       INITIAL_LICENSE_SIZE
     ].price_in_cents / 100
   const professionalPricePerUser = professionalPrice / INITIAL_LICENSE_SIZE
-  const professionalPricePerUserPerMonth = roundUpToNearest5Cents(
-    professionalPrice / INITIAL_LICENSE_SIZE / 12
-  )
 
   /**
    * @param {number} price
@@ -93,10 +75,6 @@ function generateInitialLocalizedGroupPrice(recommendedCurrency, locale) {
       collaborator: formatPrice(collaboratorPricePerUser),
       professional: formatPrice(professionalPricePerUser),
     },
-    pricePerUserPerMonth: {
-      collaborator: formatPrice(collaboratorPricePerUserPerMonth),
-      professional: formatPrice(professionalPricePerUserPerMonth),
-    },
   }
 }
 
diff --git a/services/web/frontend/stylesheets/app/plans.less b/services/web/frontend/stylesheets/app/plans.less
index 127f102b6e..47bd2603c3 100644
--- a/services/web/frontend/stylesheets/app/plans.less
+++ b/services/web/frontend/stylesheets/app/plans.less
@@ -1049,10 +1049,6 @@
       .plans-card-price-container-mobile {
         display: flex;
         align-items: baseline;
-
-        .light-gray-text:has(.billed-annually-disclaimer) {
-          align-self: center;
-        }
       }
 
       .group-plans-card-price-container-mobile {
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
index 65b1e8b12c..b24ae34b71 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
@@ -1081,10 +1081,6 @@ $z-index-group-member-picker-list: 1;
       .plans-card-price-container-mobile {
         display: flex;
         align-items: baseline;
-
-        .light-gray-text:has(.billed-annually-disclaimer) {
-          align-self: center;
-        }
       }
 
       .group-plans-card-price-container-mobile {
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 7e7d42c184..85833c3e18 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -236,7 +236,6 @@
   "beta_program_opt_in_action": "Opt-In to Beta Program",
   "beta_program_opt_out_action": "Opt-Out of Beta Program",
   "bibliographies": "Bibliographies",
-  "billed_annually": "billed annually",
   "billed_annually_at": "Billed annually at <0>__price__</0> <1>(includes plan and any add-ons)</1>",
   "billed_monthly_at": "Billed monthly at <0>__price__</0> <1>(includes plan and any add-ons)</1>",
   "billed_yearly": "billed yearly",
@@ -1626,7 +1625,6 @@
   "per_month": "per month",
   "per_month_billed_annually": "per month, billed annually",
   "per_month_x_annually": "per month, __price__ annually",
-  "per_user_month": "per user / month",
   "per_user_year": "per user / year",
   "per_year": "per year",
   "percent_is_the_percentage_of_the_line_width": "% is the percentage of the line width",
diff --git a/services/web/scripts/plan-prices/plans.mjs b/services/web/scripts/plan-prices/plans.mjs
index 122b2c5683..6d67214d11 100644
--- a/services/web/scripts/plan-prices/plans.mjs
+++ b/services/web/scripts/plan-prices/plans.mjs
@@ -64,11 +64,6 @@ const currencies = [
   'USD',
 ]
 
-/**
- * This is duplicated in:
- *   - services/web/app/src/Features/Subscription/SubscriptionHelper.js
- *   - services/web/modules/subscriptions/frontend/js/pages/plans-new-design/group-member-picker/group-plan-pricing.js
- */
 function roundUpToNearest5Cents(number) {
   return Math.ceil(number * 20) / 20
 }
diff --git a/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js b/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js
index fb667ca451..4c618221ca 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionHelperTests.js
@@ -184,10 +184,6 @@ describe('SubscriptionHelper', function () {
             collaborator: '5 CHF',
             professional: '50 CHF',
           },
-          pricePerUserPerMonth: {
-            collaborator: '0,45 CHF',
-            professional: '4,20 CHF',
-          },
         })
       })
     })
@@ -209,10 +205,6 @@ describe('SubscriptionHelper', function () {
             collaborator: '10 kr.',
             professional: '100 kr.',
           },
-          pricePerUserPerMonth: {
-            collaborator: '0,85 kr.',
-            professional: '8,35 kr.',
-          },
         })
       })
     })
@@ -234,10 +226,6 @@ describe('SubscriptionHelper', function () {
             collaborator: '15 kr',
             professional: '150 kr',
           },
-          pricePerUserPerMonth: {
-            collaborator: '1,25 kr',
-            professional: '12,50 kr',
-          },
         })
       })
     })
@@ -261,10 +249,6 @@ describe('SubscriptionHelper', function () {
             collaborator: 'kr 20',
             professional: 'kr 200',
           },
-          pricePerUserPerMonth: {
-            collaborator: 'kr 1.70',
-            professional: 'kr 16.70',
-          },
         })
       })
     })
@@ -286,10 +270,6 @@ describe('SubscriptionHelper', function () {
             collaborator: '$25',
             professional: '$250',
           },
-          pricePerUserPerMonth: {
-            collaborator: '$2.10',
-            professional: '$20.85',
-          },
         })
       })
     })

From a74c0abdf547a59055f7fb5c6e6a055511298f72 Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:21:42 +0200
Subject: [PATCH 088/274] Merge pull request #26793 from
 overleaf/mf-add-missing-public-key-on-purchase-addon

[web] Add missing publicKey to purchase add-on flow when user need to authenticate their payment via 3ds secure flow

GitOrigin-RevId: cc330cb8dad501479bbb3c5c5b4fc32ef9d36921
---
 .../Subscription/SubscriptionController.js    |   1 +
 .../SubscriptionControllerTests.js            | 109 ++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js
index 4e3ad8be27..0cf1dd959c 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionController.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionController.js
@@ -453,6 +453,7 @@ async function purchaseAddon(req, res, next) {
       return res.status(402).json({
         message: 'Payment action required',
         clientSecret: err.info.clientSecret,
+        publicKey: err.info.publicKey,
       })
     } else {
       if (err instanceof Error) {
diff --git a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
index e0b61417f1..61f9debc8d 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
@@ -7,6 +7,9 @@ const modulePath =
   '../../../../app/src/Features/Subscription/SubscriptionController'
 const SubscriptionErrors = require('../../../../app/src/Features/Subscription/Errors')
 const SubscriptionHelper = require('../../../../app/src/Features/Subscription/SubscriptionHelper')
+const {
+  AI_ADD_ON_CODE,
+} = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
 
 const mockSubscriptions = {
   'subscription-123-active': {
@@ -59,6 +62,7 @@ describe('SubscriptionController', function () {
         syncSubscription: sinon.stub().resolves(),
         attemptPaypalInvoiceCollection: sinon.stub().resolves(),
         startFreeTrial: sinon.stub().resolves(),
+        purchaseAddon: sinon.stub().resolves(),
       },
     }
 
@@ -635,4 +639,109 @@ describe('SubscriptionController', function () {
       })
     })
   })
+
+  describe('purchaseAddon', function () {
+    beforeEach(function () {
+      this.SessionManager.getSessionUser.returns(this.user) // Make sure getSessionUser returns the user
+      this.next = sinon.stub()
+      this.req.params = { addOnCode: AI_ADD_ON_CODE } // Mock add-on code
+    })
+
+    it('should return 200 on successful purchase of AI add-on', async function () {
+      await this.SubscriptionController.purchaseAddon(
+        this.req,
+        this.res,
+        this.next
+      )
+      this.res.sendStatus = sinon.spy()
+
+      await this.SubscriptionController.purchaseAddon(
+        this.req,
+        this.res,
+        this.next
+      )
+
+      expect(this.SubscriptionHandler.promises.purchaseAddon).to.have.been
+        .called
+      expect(
+        this.SubscriptionHandler.promises.purchaseAddon
+      ).to.have.been.calledWith(this.user._id, AI_ADD_ON_CODE, 1)
+      expect(
+        this.FeaturesUpdater.promises.refreshFeatures
+      ).to.have.been.calledWith(this.user._id, 'add-on-purchase')
+      expect(this.res.sendStatus).to.have.been.calledWith(200)
+      expect(this.logger.debug).to.have.been.calledWith(
+        { userId: this.user._id, addOnCode: AI_ADD_ON_CODE },
+        'purchasing add-ons'
+      )
+    })
+
+    it('should return 404 if the add-on code is not AI_ADD_ON_CODE', async function () {
+      this.req.params = { addOnCode: 'some-other-addon' }
+      this.res.sendStatus = sinon.spy()
+
+      await this.SubscriptionController.purchaseAddon(
+        this.req,
+        this.res,
+        this.next
+      )
+
+      expect(this.SubscriptionHandler.promises.purchaseAddon).to.not.have.been
+        .called
+      expect(this.FeaturesUpdater.promises.refreshFeatures).to.not.have.been
+        .called
+      expect(this.res.sendStatus).to.have.been.calledWith(404)
+    })
+
+    it('should handle DuplicateAddOnError and send badRequest while sending 200', async function () {
+      this.req.params.addOnCode = AI_ADD_ON_CODE
+      this.SubscriptionHandler.promises.purchaseAddon.rejects(
+        new SubscriptionErrors.DuplicateAddOnError()
+      )
+
+      await this.SubscriptionController.purchaseAddon(
+        this.req,
+        this.res,
+        this.next
+      )
+
+      expect(this.HttpErrorHandler.badRequest).to.have.been.calledWith(
+        this.req,
+        this.res,
+        'Your subscription already includes this add-on',
+        { addon: AI_ADD_ON_CODE }
+      )
+      expect(
+        this.FeaturesUpdater.promises.refreshFeatures
+      ).to.have.been.calledWith(this.user._id, 'add-on-purchase')
+      expect(this.res.sendStatus).to.have.been.calledWith(200)
+    })
+
+    it('should handle PaymentActionRequiredError and return 402 with details', async function () {
+      this.req.params.addOnCode = AI_ADD_ON_CODE
+      const paymentError = new SubscriptionErrors.PaymentActionRequiredError({
+        clientSecret: 'secret123',
+        publicKey: 'pubkey456',
+      })
+      this.SubscriptionHandler.promises.purchaseAddon.rejects(paymentError)
+
+      await this.SubscriptionController.purchaseAddon(
+        this.req,
+        this.res,
+        this.next
+      )
+
+      this.res.status.calledWith(402).should.equal(true)
+      this.res.json
+        .calledWith({
+          message: 'Payment action required',
+          clientSecret: 'secret123',
+          publicKey: 'pubkey456',
+        })
+        .should.equal(true)
+
+      expect(this.FeaturesUpdater.promises.refreshFeatures).to.not.have.been
+        .called
+    })
+  })
 })

From 90226043c7ecc849b2249f4ab5cfbad11f710a4b Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Tue, 1 Jul 2025 17:20:58 +0100
Subject: [PATCH 089/274] Remove @types/react-bootstrap

GitOrigin-RevId: 0a410b82540b2b11bc4930753dbd650937ebba1e
---
 package-lock.json         | 11 -----------
 services/web/package.json |  1 -
 2 files changed, 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf2aca88c1..5e8e78d411 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12552,16 +12552,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/react-bootstrap": {
-      "version": "0.32.37",
-      "resolved": "https://registry.npmjs.org/@types/react-bootstrap/-/react-bootstrap-0.32.37.tgz",
-      "integrity": "sha512-CVHj++uxsj1pRnM3RQ/NAXcWj+JwJZ3MqQ28sS1OQUD1sI2gRlbeAjRT+ak2nuwL+CY+gtnIsMaIDq0RNfN0PA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@types/react-color": {
       "version": "3.0.13",
       "resolved": "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.13.tgz",
@@ -45158,7 +45148,6 @@
         "@types/mocha": "^9.1.0",
         "@types/mocha-each": "^2.0.0",
         "@types/react": "^18.3.20",
-        "@types/react-bootstrap": "^0.32.37",
         "@types/react-color": "^3.0.13",
         "@types/react-dom": "^18.3.6",
         "@types/react-google-recaptcha": "^2.1.9",
diff --git a/services/web/package.json b/services/web/package.json
index dc72066a87..45f8453242 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -240,7 +240,6 @@
     "@types/mocha": "^9.1.0",
     "@types/mocha-each": "^2.0.0",
     "@types/react": "^18.3.20",
-    "@types/react-bootstrap": "^0.32.37",
     "@types/react-color": "^3.0.13",
     "@types/react-dom": "^18.3.6",
     "@types/react-google-recaptcha": "^2.1.9",

From 381a106b46819547080dc889b21add32e271d8c1 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Tue, 1 Jul 2025 17:34:07 +0100
Subject: [PATCH 090/274] Remove @types/workerpool

This is a stub

GitOrigin-RevId: de776c11044c42bb191424f1d614442da22c3197
---
 package-lock.json          | 10 ----------
 services/clsi/package.json |  1 -
 2 files changed, 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5e8e78d411..0e416c5988 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12826,15 +12826,6 @@
         "@types/webidl-conversions": "*"
       }
     },
-    "node_modules/@types/workerpool": {
-      "version": "6.4.7",
-      "resolved": "https://registry.npmjs.org/@types/workerpool/-/workerpool-6.4.7.tgz",
-      "integrity": "sha512-DI2U4obcMzFViyNjLw0xXspim++qkAJ4BWRdYPVMMFtOpTvMr6PAk3UTZEoSqnZnvgUkJ3ck97Ybk+iIfuJHMg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/ws": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
@@ -42530,7 +42521,6 @@
         "workerpool": "^6.1.5"
       },
       "devDependencies": {
-        "@types/workerpool": "^6.1.0",
         "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
         "mocha": "^11.1.0",
diff --git a/services/clsi/package.json b/services/clsi/package.json
index b07430391a..f6fa7aff01 100644
--- a/services/clsi/package.json
+++ b/services/clsi/package.json
@@ -37,7 +37,6 @@
     "workerpool": "^6.1.5"
   },
   "devDependencies": {
-    "@types/workerpool": "^6.1.0",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "mocha": "^11.1.0",

From f5038b5de3cde012441ecc1fa2736ee78f7c053b Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Wed, 2 Jul 2025 11:58:07 +0100
Subject: [PATCH 091/274] Switch eslint-plugin-n for eslint-plugin-node

GitOrigin-RevId: eec3cf3836556a5c035b1339548c724ab3cd0c43
---
 package-lock.json | 76 ++++++++++++++++++++---------------------------
 package.json      |  2 +-
 2 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e416c5988..5ac9cfd62d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,7 +51,7 @@
         "eslint-plugin-cypress": "^2.15.1",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-mocha": "^10.1.0",
-        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-n": "^15.7.0",
         "eslint-plugin-prettier": "^4.0.0",
         "eslint-plugin-promise": "^6.0.0",
         "eslint-plugin-unicorn": "^56.0.0",
@@ -16651,37 +16651,21 @@
       }
     },
     "node_modules/builtins": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-4.1.0.tgz",
-      "integrity": "sha512-1bPRZQtmKaO6h7qV1YHXNtr6nCK28k0Zo95KM4dXfILcZZwoHJBN1m3lfLv9LPkcOZlrSr+J1bzMaZFO98Yq0w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
+      "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
       "dev": true,
-      "peer": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.0.0"
       }
     },
-    "node_modules/builtins/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/builtins/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -16689,13 +16673,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/builtins/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/bull": {
       "version": "3.29.3",
       "resolved": "https://registry.npmjs.org/bull/-/bull-3.29.3.tgz",
@@ -21222,7 +21199,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
       "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "eslint-utils": "^2.0.0",
         "regexpp": "^3.0.0"
@@ -21362,20 +21338,20 @@
       }
     },
     "node_modules/eslint-plugin-n": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.2.0.tgz",
-      "integrity": "sha512-lWLg++jGwC88GDGGBX3CMkk0GIWq0y41aH51lavWApOKcMQcYoL3Ayd0lEdtD3SnQtR+3qBvWQS3qGbR2BxRWg==",
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
+      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
       "dev": true,
-      "peer": true,
+      "license": "MIT",
       "dependencies": {
-        "builtins": "^4.0.0",
+        "builtins": "^5.0.1",
         "eslint-plugin-es": "^4.1.0",
         "eslint-utils": "^3.0.0",
         "ignore": "^5.1.1",
-        "is-core-module": "^2.3.0",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.3.0"
+        "is-core-module": "^2.11.0",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.1",
+        "semver": "^7.3.8"
       },
       "engines": {
         "node": ">=12.22.0"
@@ -21392,7 +21368,6 @@
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
       "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "eslint-visitor-keys": "^2.0.0"
       },
@@ -21406,11 +21381,25 @@
         "eslint": ">=5"
       }
     },
+    "node_modules/eslint-plugin-n/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/eslint-plugin-node": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
       "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "eslint-plugin-es": "^3.0.0",
         "eslint-utils": "^2.0.0",
@@ -21431,6 +21420,7 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
       "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "eslint-utils": "^2.0.0",
         "regexpp": "^3.0.0"
diff --git a/package.json b/package.json
index 553aa41bce..9d8b3ed8d2 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "eslint-plugin-cypress": "^2.15.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-unicorn": "^56.0.0",

From d701b8ff9bfb83a5e49242717c7b698ea7c79cf8 Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Thu, 3 Jul 2025 10:20:13 +0100
Subject: [PATCH 092/274] Merge pull request #26783 from
 overleaf/bg-server-ce-ignore-mongo-check-failures

allow skipping checks requiring mongo admin privileges in check-mongodb script

GitOrigin-RevId: 0c7157a153457a97c92ea3eb5e8c2a4de7971bf6
---
 .../scripts/check-mongodb.mjs                 | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
index 29f5e7ffd2..46be91a1d9 100644
--- a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
+++ b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
@@ -9,6 +9,34 @@ const { ObjectId } = mongodb
 const MIN_MONGO_VERSION = [6, 0]
 const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [6, 0]
 
+// Allow ignoring admin check failures via an environment variable
+const OVERRIDE_ENV_VAR_NAME = 'ALLOW_MONGO_ADMIN_CHECK_FAILURES'
+
+function shouldSkipAdminChecks() {
+  return process.env[OVERRIDE_ENV_VAR_NAME] === 'true'
+}
+
+function handleUnauthorizedError(err, feature) {
+  if (
+    err instanceof mongodb.MongoServerError &&
+    err.codeName === 'Unauthorized'
+  ) {
+    console.warn(`Warning: failed to check ${feature} (not authorised)`)
+    if (!shouldSkipAdminChecks()) {
+      console.error(
+        `Please ensure the MongoDB user has the required admin permissions, or\n` +
+          `set the environment variable ${OVERRIDE_ENV_VAR_NAME}=true to ignore this check.`
+      )
+      process.exit(1)
+    }
+    console.warn(
+      `Ignoring ${feature} check failure (${OVERRIDE_ENV_VAR_NAME}=${process.env[OVERRIDE_ENV_VAR_NAME]})`
+    )
+  } else {
+    throw err
+  }
+}
+
 async function main() {
   let mongoClient
   try {
@@ -18,8 +46,16 @@ async function main() {
     throw err
   }
 
-  await checkMongoVersion(mongoClient)
-  await checkFeatureCompatibilityVersion(mongoClient)
+  try {
+    await checkMongoVersion(mongoClient)
+  } catch (err) {
+    handleUnauthorizedError(err, 'MongoDB version')
+  }
+  try {
+    await checkFeatureCompatibilityVersion(mongoClient)
+  } catch (err) {
+    handleUnauthorizedError(err, 'MongoDB feature compatibility version')
+  }
 
   try {
     await testTransactions(mongoClient)

From e660718c6372cf85b41f0c03de9b26bf631abb19 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 3 Jul 2025 11:11:20 +0100
Subject: [PATCH 093/274] Merge pull request #26769 from
 overleaf/mj-review-mode-switch-focus

[web] Focus editor after changing reviewer mode

GitOrigin-RevId: d19ef178221579894620c5fd204f45c893c126ae
---
 .../review-panel-new/components/review-mode-switcher.tsx    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
index fab717c15d..2405c2ed60 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
@@ -22,6 +22,7 @@ import UpgradeTrackChangesModal from './upgrade-track-changes-modal'
 import { ReviewModePromo } from '@/features/review-panel-new/components/review-mode-promo'
 import useTutorial from '@/shared/hooks/promotions/use-tutorial'
 import { useLayoutContext } from '@/shared/context/layout-context'
+import { useCodeMirrorViewContext } from '@/features/source-editor/components/codemirror-context'
 
 type Mode = 'view' | 'review' | 'edit'
 
@@ -56,6 +57,7 @@ function ReviewModeSwitcher() {
   const project = useProjectContext()
   const [showUpgradeModal, setShowUpgradeModal] = useState(false)
   const showViewOption = permissionsLevel === 'readOnly'
+  const view = useCodeMirrorViewContext()
 
   return (
     <div className="review-mode-switcher-container">
@@ -69,6 +71,7 @@ function ReviewModeSwitcher() {
             disabled={!write}
             onClick={() => {
               if (mode === 'edit') {
+                view.focus()
                 return
               }
               sendMB('editing-mode-change', {
@@ -81,6 +84,7 @@ function ReviewModeSwitcher() {
               } else {
                 saveTrackChanges({ on_for_guests: false })
               }
+              view.focus()
             }}
             description={t('edit_content_directly')}
             leadingIcon="edit"
@@ -92,6 +96,7 @@ function ReviewModeSwitcher() {
             disabled={permissionsLevel === 'readOnly'}
             onClick={() => {
               if (mode === 'review') {
+                view.focus()
                 return
               }
               if (!project.features.trackChanges) {
@@ -107,6 +112,7 @@ function ReviewModeSwitcher() {
                 } else {
                   saveTrackChanges({ on_for_guests: true })
                 }
+                view.focus()
               }
             }}
             description={

From 9de32e1570fc8939de7aece024de99f9d9eee642 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 3 Jul 2025 11:12:10 +0100
Subject: [PATCH 094/274] Merge pull request #26761 from
 overleaf/mj-mendeley-unselect-group

[web] Unify group selection for reference managers

GitOrigin-RevId: 606032624f60ed1c1aa14da237531d1277e94eab
---
 services/web/frontend/extracted-translations.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 309ce4021b..7a673ed3e8 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -718,6 +718,7 @@
   "group_sso_configure_service_provider_in_idp": "",
   "group_sso_documentation_links": "",
   "group_subscription": "",
+  "groups": "",
   "have_an_extra_backup": "",
   "have_more_days_to_try": "",
   "headers": "",

From b7032e925f90d2898f8de51d1b1c7f175c67d0aa Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Thu, 3 Jul 2025 13:19:15 +0200
Subject: [PATCH 095/274] Storybook for the Modal component (#26798)

GitOrigin-RevId: 679935722a8b8a96c55f60be16c0ac34f6e6fbcc
---
 .../frontend/stories/modals/modal.stories.tsx | 152 ++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 services/web/frontend/stories/modals/modal.stories.tsx

diff --git a/services/web/frontend/stories/modals/modal.stories.tsx b/services/web/frontend/stories/modals/modal.stories.tsx
new file mode 100644
index 0000000000..2bdd9bdad8
--- /dev/null
+++ b/services/web/frontend/stories/modals/modal.stories.tsx
@@ -0,0 +1,152 @@
+import Button from '@/features/ui/components/bootstrap-5/button'
+import type { Meta, StoryObj } from '@storybook/react'
+import OLModal, {
+  OLModalHeader,
+  OLModalBody,
+  OLModalFooter,
+  OLModalTitle,
+} from '@/features/ui/components/ol/ol-modal'
+
+type Story = StoryObj<typeof OLModal>
+
+export const Default: Story = {
+  render: args => {
+    return (
+      <OLModal show {...args}>
+        <OLModalHeader closeButton>
+          <OLModalTitle>Heading</OLModalTitle>
+        </OLModalHeader>
+        <OLModalBody>
+          <p>
+            Lorem ipsum dolor sit lorem a amet, consectetur adipiscing elit, sed
+            do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+            enim ad minim veniam.
+          </p>
+        </OLModalBody>
+        <OLModalFooter>
+          <Button variant="secondary">Cancel</Button>
+          <Button variant="primary">Primary</Button>
+        </OLModalFooter>
+      </OLModal>
+    )
+  },
+}
+
+export const ModalWithAcknowledgment: Story = {
+  render: args => {
+    return (
+      <OLModal show {...args}>
+        <OLModalHeader closeButton>
+          <OLModalTitle>Acknowledgment</OLModalTitle>
+        </OLModalHeader>
+        <OLModalBody>
+          <p>
+            System requires an acknowledgment from the user. Usually contains
+            only one primary button.
+          </p>
+        </OLModalBody>
+        <OLModalFooter>
+          <Button variant="primary">Accept</Button>
+        </OLModalFooter>
+      </OLModal>
+    )
+  },
+}
+
+export const ModalWithSecondary: Story = {
+  render: args => {
+    return (
+      <OLModal show {...args}>
+        <OLModalHeader closeButton>
+          <OLModalTitle>Heading</OLModalTitle>
+        </OLModalHeader>
+        <OLModalBody>
+          <p>
+            Lorem ipsum dolor sit lorem a amet, consectetur adipiscing elit, sed
+            do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+            enim ad minim veniam.
+          </p>
+        </OLModalBody>
+        <OLModalFooter>
+          <Button variant="secondary">Cancel</Button>
+        </OLModalFooter>
+      </OLModal>
+    )
+  },
+}
+
+export const ModalWithTertiary: Story = {
+  render: args => {
+    return (
+      <OLModal show {...args}>
+        <OLModalHeader closeButton>
+          <OLModalTitle>Heading</OLModalTitle>
+        </OLModalHeader>
+        <OLModalBody>
+          <p>Used for destructive or irreversible actions.</p>
+        </OLModalBody>
+        <OLModalFooter>
+          <Button variant="secondary">Third</Button>
+          <Button variant="secondary" className="ms-auto">
+            Cancel
+          </Button>
+          <Button variant="primary">Primary</Button>
+        </OLModalFooter>
+      </OLModal>
+    )
+  },
+}
+
+export const ModalInformative: Story = {
+  render: args => {
+    return (
+      <OLModal show {...args}>
+        <OLModalHeader closeButton>
+          <OLModalTitle>Informative</OLModalTitle>
+        </OLModalHeader>
+        <OLModalBody>
+          <p>
+            Presents information for the user to be aware of and doesn’t require
+            any action.
+          </p>
+        </OLModalBody>
+      </OLModal>
+    )
+  },
+}
+
+export const ModalDanger: Story = {
+  render: args => {
+    return (
+      <OLModal show {...args}>
+        <OLModalHeader closeButton>
+          <OLModalTitle>Danger</OLModalTitle>
+        </OLModalHeader>
+        <OLModalBody>
+          <p>
+            Lorem ipsum dolor sit lorem a amet, consectetur adipiscing elit, sed
+            do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+            enim ad minim veniam.
+          </p>
+        </OLModalBody>
+        <OLModalFooter>
+          <Button variant="secondary">Cancel</Button>
+          <Button variant="danger">Delete</Button>
+        </OLModalFooter>
+      </OLModal>
+    )
+  },
+}
+
+const meta: Meta<typeof OLModal> = {
+  title: 'Shared / Components / Modal',
+  component: OLModal,
+  argTypes: {
+    size: {
+      control: 'radio',
+      options: ['lg', 'md', 'sm'],
+    },
+  },
+}
+
+export default meta

From 10b6f82677bc1f96a71d419d5bbeeabbcf9af598 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Thu, 3 Jul 2025 13:08:54 +0100
Subject: [PATCH 096/274] Merge pull request #26764 from
 overleaf/rh-department-autocomplete

Use department institutions when adding email

GitOrigin-RevId: d82df795428f8545f22a64b55986d2bf5fff0037
---
 .../settings/components/emails/add-email/input.tsx       | 1 +
 .../components/emails/add-email/institution-fields.tsx   | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx b/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx
index e79d652f6b..c5884dbd9c 100644
--- a/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx
@@ -32,6 +32,7 @@ export type DomainInfo = {
     name: string
     ssoEnabled?: boolean
     ssoBeta?: boolean
+    departments?: string[]
   }
 }
 
diff --git a/services/web/frontend/js/features/settings/components/emails/add-email/institution-fields.tsx b/services/web/frontend/js/features/settings/components/emails/add-email/institution-fields.tsx
index 49b7de61e7..bb491f4713 100644
--- a/services/web/frontend/js/features/settings/components/emails/add-email/institution-fields.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/add-email/institution-fields.tsx
@@ -75,16 +75,21 @@ function InstitutionFields({
   }, [newEmailMatchedDomain, setRole, setDepartment])
 
   useEffect(() => {
+    if (newEmailMatchedDomain?.university?.departments?.length) {
+      setDepartments(newEmailMatchedDomain.university.departments)
+      return
+    }
+
+    // fallback if not matched on domain
     const selectedKnownUniversity = countryCode
       ? universities[countryCode]?.find(({ name }) => name === universityName)
       : undefined
-
     if (selectedKnownUniversity && selectedKnownUniversity.departments.length) {
       setDepartments(selectedKnownUniversity.departments)
     } else {
       setDepartments([...defaultDepartments])
     }
-  }, [countryCode, universities, universityName])
+  }, [countryCode, universities, universityName, newEmailMatchedDomain])
 
   // Fetch country institution
   useEffect(() => {

From 8cd8d8239b8e32230bbaef6cfd84cf1fad50369d Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Thu, 3 Jul 2025 13:09:06 +0100
Subject: [PATCH 097/274] Merge pull request #26779 from
 overleaf/rh-email-confirmation-logo

Use green OL logo in Interstitial and ODC components

GitOrigin-RevId: 8fee3f0758e22c4ebaea7d0cd01a408c16380a98
---
 services/web/frontend/js/shared/components/interstitial.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/shared/components/interstitial.tsx b/services/web/frontend/js/shared/components/interstitial.tsx
index da3386ba2e..523bcf4609 100644
--- a/services/web/frontend/js/shared/components/interstitial.tsx
+++ b/services/web/frontend/js/shared/components/interstitial.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import overleafLogo from '@/shared/svgs/overleaf.svg'
+import overleafLogo from '@/shared/svgs/overleaf-green.svg'
 
 type InterstitialProps = {
   className?: string

From 1b02a26d1f016267ab638bcca008e0c3914a73a8 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Thu, 3 Jul 2025 13:09:19 +0100
Subject: [PATCH 098/274] Merge pull request #26799 from
 overleaf/rh-resolve-deleted-email

Clear loading state after deleting email address

GitOrigin-RevId: 7422a7e223ba430459afa862f10c2b2fd9038306
---
 .../settings/components/emails/actions/remove.tsx         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx b/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx
index 136efc04e4..36123cdd1e 100644
--- a/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx
@@ -37,7 +37,7 @@ type RemoveProps = {
 
 function Remove({ userEmailData, deleteEmailAsync }: RemoveProps) {
   const { t } = useTranslation()
-  const { state, deleteEmail, resetLeaversSurveyExpiration } =
+  const { state, deleteEmail, resetLeaversSurveyExpiration, setLoading } =
     useUserEmailsContext()
   const isManaged = getMeta('ol-isManagedAccount')
 
@@ -62,8 +62,12 @@ function Remove({ userEmailData, deleteEmailAsync }: RemoveProps) {
       .then(() => {
         deleteEmail(userEmailData.email)
         resetLeaversSurveyExpiration(userEmailData)
+        // Reset the global loading state before this row is unmounted
+        setLoading(false)
+      })
+      .catch(() => {
+        setLoading(false)
       })
-      .catch(() => {})
   }
 
   if (deleteEmailAsync.isLoading) {

From 4e40f24a9e944f742dc0a5343e05c475f5e7ab7e Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 3 Jul 2025 14:44:58 +0100
Subject: [PATCH 099/274] Merge pull request #26631 from
 overleaf/mj-tooltip-labs-new-survey

[web] Editor redesign: Add tooltip for filling out new survey

GitOrigin-RevId: 432201b6fbff085fcc8ccdeb70c3056043b50422
---
 .../src/Features/Project/ProjectController.js |  1 +
 .../Features/Tutorial/TutorialController.mjs  |  1 +
 .../web/frontend/extracted-translations.json  |  3 ++-
 .../try-new-editor-button.tsx                 | 25 ++++++++---------
 .../error-logs/new-error-logs-promo.tsx       | 27 -------------------
 .../features/ide-redesign/components/rail.tsx | 14 +---------
 .../components/toolbar/labs-actions.tsx       | 18 ++++++++++++-
 .../ide-redesign/components/tooltip-promo.tsx |  9 ++++++-
 services/web/locales/en.json                  |  3 ++-
 9 files changed, 43 insertions(+), 58 deletions(-)
 delete mode 100644 services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 8104681b36..64454f4eda 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -355,6 +355,7 @@ const _ProjectController = {
       'editor-popup-ux-survey',
       'new-editor-error-logs-redesign',
       'ide-redesign-experiment-nudge',
+      'ide-redesign-new-survey-prompt',
     ].filter(Boolean)
 
     const getUserValues = async userId =>
diff --git a/services/web/app/src/Features/Tutorial/TutorialController.mjs b/services/web/app/src/Features/Tutorial/TutorialController.mjs
index 4606f662bf..dd1f9e2828 100644
--- a/services/web/app/src/Features/Tutorial/TutorialController.mjs
+++ b/services/web/app/src/Features/Tutorial/TutorialController.mjs
@@ -17,6 +17,7 @@ const VALID_KEYS = [
   'review-mode',
   'new-error-logs-promo',
   'try-redesign-again-nudge-promo',
+  'ide-redesign-new-survey-promo',
 ]
 
 async function completeTutorial(req, res, next) {
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 7a673ed3e8..0ab9ce236b 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -541,7 +541,6 @@
   "error": "",
   "error_assist": "",
   "error_log": "",
-  "error_logs_have_had_an_update": "",
   "error_opening_document": "",
   "error_opening_document_detail": "",
   "error_performing_request": "",
@@ -779,6 +778,7 @@
   "hotkey_toggle_track_changes": "",
   "hotkey_undo": "",
   "hotkeys": "",
+  "how_are_you_finding_the_updates_to_the_new_editor": "",
   "how_it_works": "",
   "how_many_licenses_do_you_want_to_buy": "",
   "how_to_create_tables": "",
@@ -1736,6 +1736,7 @@
   "take_short_survey": "",
   "take_survey": "",
   "tell_the_project_owner_and_ask_them_to_upgrade": "",
+  "tell_us_what_you_think": "",
   "template": "",
   "template_description": "",
   "template_title_taken_from_project_title": "",
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
index 8afe6104e1..775c985a1f 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
@@ -4,7 +4,6 @@ import { useIdeRedesignSwitcherContext } from '../ide-react/context/ide-redesign
 import MaterialIcon from '@/shared/components/material-icon'
 import { useTranslation } from 'react-i18next'
 import TooltipPromotion from '../ide-redesign/components/tooltip-promo'
-import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 const TUTORIAL_KEY = 'try-redesign-again-nudge-promo'
 const EVENT_DATA = { name: 'try-redesign-again-nudge-promotion' }
@@ -12,7 +11,6 @@ const EVENT_DATA = { name: 'try-redesign-again-nudge-promotion' }
 const TryNewEditorButton = () => {
   const { t } = useTranslation()
   const { setShowSwitcherModal } = useIdeRedesignSwitcherContext()
-  const showNudge = useFeatureFlag('ide-redesign-experiment-nudge')
 
   const switcherButtonRef = useRef(null)
 
@@ -31,18 +29,17 @@ const TryNewEditorButton = () => {
       >
         {t('try_the_new_editor')}
       </OLButton>
-      {showNudge && (
-        <TooltipPromotion
-          target={switcherButtonRef.current}
-          tutorialKey={TUTORIAL_KEY}
-          eventData={EVENT_DATA}
-          className="toolbar-experiment-tooltip"
-          header={t('dont_miss_out_on_the_updated_editor')}
-          content={t(
-            'weve_been_making_changes_and_improvements_why_not_give_it_a_try'
-          )}
-        />
-      )}
+      <TooltipPromotion
+        target={switcherButtonRef.current}
+        splitTestName="ide-redesign-experiment-nudge"
+        tutorialKey={TUTORIAL_KEY}
+        eventData={EVENT_DATA}
+        className="toolbar-experiment-tooltip"
+        header={t('dont_miss_out_on_the_updated_editor')}
+        content={t(
+          'weve_been_making_changes_and_improvements_why_not_give_it_a_try'
+        )}
+      />
     </div>
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx
deleted file mode 100644
index 144a1acdb9..0000000000
--- a/services/web/frontend/js/features/ide-redesign/components/error-logs/new-error-logs-promo.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import TooltipPromotion from '../tooltip-promo'
-
-const TUTORIAL_KEY = 'new-error-logs-promo'
-const EVENT_DATA = { name: 'new-error-logs-promotion' }
-
-export default function NewErrorLogsPromo({
-  target,
-}: {
-  target: HTMLElement | null
-}) {
-  const { t } = useTranslation()
-  if (!target) {
-    return null
-  }
-
-  return (
-    <TooltipPromotion
-      target={target}
-      tutorialKey={TUTORIAL_KEY}
-      eventData={EVENT_DATA}
-      className="new-error-logs-promo"
-      content={t('error_logs_have_had_an_update')}
-      placement="right"
-    />
-  )
-}
diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index a32734c90f..470d3c8ccd 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -1,11 +1,4 @@
-import {
-  FC,
-  forwardRef,
-  ReactElement,
-  useCallback,
-  useMemo,
-  useRef,
-} from 'react'
+import { FC, forwardRef, ReactElement, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Nav, NavLink, Tab, TabContainer } from 'react-bootstrap'
 import MaterialIcon, {
@@ -51,7 +44,6 @@ import { useDetachCompileContext as useCompileContext } from '@/shared/context/d
 import OldErrorPane from './error-logs/old-error-pane'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
 import { useSurveyUrl } from '../hooks/use-survey-url'
-import NewErrorLogsPromo from './error-logs/new-error-logs-promo'
 import { useProjectContext } from '@/shared/context/project-context'
 
 type RailElement = {
@@ -115,8 +107,6 @@ export const RailLayout = () => {
   const { features } = useProjectContext()
   const errorLogsDisabled = !logEntries
 
-  const errorsTabRef = useRef<HTMLAnchorElement>(null)
-
   const { view, setLeftMenuShown } = useLayoutContext()
 
   const { markMessagesAsRead } = useChatContext()
@@ -243,7 +233,6 @@ export const RailLayout = () => {
             .filter(({ hide }) => !hide)
             .map(({ icon, key, indicator, title, disabled }) => (
               <RailTab
-                ref={key === 'errors' ? errorsTabRef : null}
                 open={isOpen && selectedTab === key}
                 key={key}
                 eventKey={key}
@@ -257,7 +246,6 @@ export const RailLayout = () => {
           {railActions?.map(action => (
             <RailActionElement key={action.key} action={action} />
           ))}
-          {newErrorlogs && <NewErrorLogsPromo target={errorsTabRef.current} />}
         </Nav>
       </div>
       <Panel
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
index 27630ca598..56b4323b61 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
@@ -2,9 +2,13 @@ import { useIdeRedesignSwitcherContext } from '@/features/ide-react/context/ide-
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import MaterialIcon from '@/shared/components/material-icon'
-import { useCallback } from 'react'
+import { useCallback, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSurveyUrl } from '../../hooks/use-survey-url'
+import TooltipPromotion from '../tooltip-promo'
+
+const TUTORIAL_KEY = 'ide-redesign-new-survey-promo'
+const EVENT_DATA = { name: 'ide-redesign-new-survey-promotion' }
 
 export const LabsActions = () => {
   const { t } = useTranslation()
@@ -13,6 +17,8 @@ export const LabsActions = () => {
     setShowSwitcherModal(true)
   }, [setShowSwitcherModal])
   const surveyURL = useSurveyUrl()
+  const feedbackLinkRef = useRef<HTMLAnchorElement>(null)
+
   return (
     <>
       <div className="ide-redesign-toolbar-button-container">
@@ -36,6 +42,7 @@ export const LabsActions = () => {
       </div>
       <div className="ide-redesign-toolbar-button-container">
         <a
+          ref={feedbackLinkRef}
           href={surveyURL}
           rel="noopener noreferrer"
           target="_blank"
@@ -43,6 +50,15 @@ export const LabsActions = () => {
         >
           {t('give_feedback')}
         </a>
+        <TooltipPromotion
+          target={feedbackLinkRef.current}
+          splitTestName="ide-redesign-new-survey-prompt"
+          content={t('tell_us_what_you_think')}
+          header={t('how_are_you_finding_the_updates_to_the_new_editor')}
+          eventData={EVENT_DATA}
+          tutorialKey={TUTORIAL_KEY}
+          placement="bottom"
+        />
       </div>
     </>
   )
diff --git a/services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx b/services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx
index 4359f42dd3..f5d21376b1 100644
--- a/services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/tooltip-promo.tsx
@@ -1,6 +1,7 @@
 import Close from '@/shared/components/close'
 import { useEditorContext } from '@/shared/context/editor-context'
 import useTutorial from '@/shared/hooks/promotions/use-tutorial'
+import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 import classNames from 'classnames'
 import { useCallback, useEffect } from 'react'
 import { Overlay, OverlayProps, Popover } from 'react-bootstrap'
@@ -13,6 +14,7 @@ export default function TooltipPromotion({
   content,
   header,
   placement = 'bottom',
+  splitTestName,
 }: {
   target: HTMLElement | null
   tutorialKey: string
@@ -21,6 +23,7 @@ export default function TooltipPromotion({
   content: string
   header?: string
   placement?: OverlayProps['placement']
+  splitTestName?: string
 }) {
   const { inactiveTutorials } = useEditorContext()
   const { showPopup, tryShowingPopup, hideUntilReload, dismissTutorial } =
@@ -32,11 +35,15 @@ export default function TooltipPromotion({
     }
   }, [tryShowingPopup, inactiveTutorials, tutorialKey])
 
+  const isInSplitTestIfNeeded = splitTestName
+    ? isSplitTestEnabled(splitTestName)
+    : true
+
   const onHide = useCallback(() => {
     hideUntilReload()
   }, [hideUntilReload])
 
-  if (!target) {
+  if (!target || !isInSplitTestIfNeeded) {
     return null
   }
 
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 85833c3e18..12eea7d0da 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -698,7 +698,6 @@
   "error": "Error",
   "error_assist": "Error Assist",
   "error_log": "Error log",
-  "error_logs_have_had_an_update": "Error logs have had an update",
   "error_opening_document": "Error opening document",
   "error_opening_document_detail": "Sorry, something went wrong opening this document. Please try again.",
   "error_performing_request": "An error has occurred while performing your request.",
@@ -1003,6 +1002,7 @@
   "hotkey_toggle_track_changes": "Toggle track changes",
   "hotkey_undo": "Undo",
   "hotkeys": "Hotkeys",
+  "how_are_you_finding_the_updates_to_the_new_editor": "How are you finding the updates to the new editor?",
   "how_it_works": "How it works",
   "how_many_licenses_do_you_want_to_buy": "How many licenses do you want to buy?",
   "how_many_users_do_you_need": "How many users do you need?",
@@ -2238,6 +2238,7 @@
   "take_short_survey": "Take a short survey",
   "take_survey": "Take survey",
   "tell_the_project_owner_and_ask_them_to_upgrade": "<0>Tell the project owner</0> and ask them to upgrade their Overleaf plan if you need more compile time.",
+  "tell_us_what_you_think": "Tell us what you think",
   "template": "Template",
   "template_approved_by_publisher": "This template has been approved by the publisher",
   "template_description": "Template Description",

From cbe96f21cb77d549fb2b18a9afbe5367f54e50ab Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:47:55 -0400
Subject: [PATCH 100/274] Merge pull request #26794 from
 overleaf/em-subscription-index

Add an index on recurlySubscription_id

GitOrigin-RevId: 06c20df8e94e4aebeb0f49acec5babad0f1c4031
---
 ...02203054_recurly_subscription_id_index.mjs | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 services/web/migrations/20250702203054_recurly_subscription_id_index.mjs

diff --git a/services/web/migrations/20250702203054_recurly_subscription_id_index.mjs b/services/web/migrations/20250702203054_recurly_subscription_id_index.mjs
new file mode 100644
index 0000000000..49d7413e11
--- /dev/null
+++ b/services/web/migrations/20250702203054_recurly_subscription_id_index.mjs
@@ -0,0 +1,23 @@
+import Helpers from './lib/helpers.mjs'
+
+const tags = ['saas']
+
+const indexes = [
+  { key: { recurlySubscription_id: 1 }, name: 'recurlySubscription_id_1' },
+]
+
+const migrate = async client => {
+  const { db } = client
+  await Helpers.addIndexesToCollection(db.subscriptions, indexes)
+}
+
+const rollback = async client => {
+  const { db } = client
+  await Helpers.dropIndexesFromCollection(db.subscriptions, indexes)
+}
+
+export default {
+  tags,
+  migrate,
+  rollback,
+}

From 425344b40b663dc3d552277c3d76408dc6689b42 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Fri, 4 Jul 2025 10:38:30 +0100
Subject: [PATCH 101/274] Merge pull request #26806 from
 overleaf/rh-friendly-group-name-dash

Use friendly group plan name in project dash tooltip

GitOrigin-RevId: bb4e763c2fe0b8cb5d2f8ac0adf2a8cd956ddd0c
---
 .../current-plan-widget/group-plan.tsx          | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
index 16596c5929..ff0fc1420a 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
@@ -8,6 +8,18 @@ type GroupPlanProps = Pick<
   'subscription' | 'plan' | 'remainingTrialDays' | 'featuresPageURL'
 >
 
+function getFriendlyPlanName(planName: string): string {
+  if (planName.toLowerCase().includes('professional')) {
+    return 'Professional'
+  } else if (planName.toLowerCase().includes('collaborator')) {
+    return 'Standard'
+  }
+  // fallback on plan name
+  else {
+    return planName
+  }
+}
+
 function GroupPlan({
   featuresPageURL,
   subscription,
@@ -16,6 +28,7 @@ function GroupPlan({
 }: GroupPlanProps) {
   const { t } = useTranslation()
   const planNameComponent = <strong translate="no" />
+  const friendlyPlanName = getFriendlyPlanName(plan.name)
   const currentPlanLabel =
     remainingTrialDays >= 0 ? (
       remainingTrialDays === 1 ? (
@@ -43,10 +56,10 @@ function GroupPlan({
         description={
           subscription.teamName != null
             ? t('group_plan_with_name_tooltip', {
-                plan: plan.name,
+                plan: friendlyPlanName,
                 groupName: subscription.teamName,
               })
-            : t('group_plan_tooltip', { plan: plan.name })
+            : t('group_plan_tooltip', { plan: friendlyPlanName })
         }
         id="group-plan"
         overlayProps={{ placement: 'bottom' }}

From a7e3ce67eaa50596d629c3199250e67baef90393 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Fri, 4 Jul 2025 10:38:39 +0100
Subject: [PATCH 102/274] Merge pull request #26809 from
 overleaf/rh-email-already-registered

Update 'email already registered' text

GitOrigin-RevId: aa8b7d0f83549f22a721f6e41a4a6cd51e287251
---
 services/web/locales/en.json                               | 2 +-
 .../web/test/acceptance/src/AddSecondaryEmailTests.mjs     | 4 +++-
 .../settings/components/account-info-section.test.tsx      | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 12eea7d0da..c77180d440 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -654,7 +654,7 @@
   "email_address": "Email address",
   "email_address_is_invalid": "Email address is invalid",
   "email_already_associated_with": "The <b>__email1__</b> email is already associated with the <b>__email2__</b> <b>__appName__</b> account.",
-  "email_already_registered": "This email is already registered",
+  "email_already_registered": "This email address is already associated with a different Overleaf account.",
   "email_already_registered_secondary": "This email is already registered as a secondary email",
   "email_already_registered_sso": "This email is already registered. Please log in to your account another way and link your account to the new provider via your account settings.",
   "email_confirmed_onboarding": "Great! Let’s get you set up",
diff --git a/services/web/test/acceptance/src/AddSecondaryEmailTests.mjs b/services/web/test/acceptance/src/AddSecondaryEmailTests.mjs
index 2fdc7705fe..c153416fe6 100644
--- a/services/web/test/acceptance/src/AddSecondaryEmailTests.mjs
+++ b/services/web/test/acceptance/src/AddSecondaryEmailTests.mjs
@@ -125,7 +125,9 @@ describe('Add secondary email address confirmation code email', function () {
       })
 
       expect(res.response.statusCode).to.equal(409)
-      expect(res.body.message.text).to.equal('This email is already registered')
+      expect(res.body.message.text).to.equal(
+        'This email address is already associated with a different Overleaf account.'
+      )
     })
   })
 
diff --git a/services/web/test/frontend/features/settings/components/account-info-section.test.tsx b/services/web/test/frontend/features/settings/components/account-info-section.test.tsx
index e41cfe643f..fc6adebcda 100644
--- a/services/web/test/frontend/features/settings/components/account-info-section.test.tsx
+++ b/services/web/test/frontend/features/settings/components/account-info-section.test.tsx
@@ -129,7 +129,8 @@ describe('<AccountInfoSection />', function () {
     fetchMock.post('/user/settings', {
       status: 409,
       body: {
-        message: 'This email is already registered',
+        message:
+          'This email address is already associated with a different Overleaf account.',
       },
     })
     renderSectionWithUserProvider()
@@ -139,7 +140,9 @@ describe('<AccountInfoSection />', function () {
         name: /update/i,
       })
     )
-    await screen.findByText('This email is already registered')
+    await screen.findByText(
+      'This email address is already associated with a different Overleaf account.'
+    )
   })
 
   it('hides email input', async function () {

From 2b8a14c4d2bae7c6173b2bcb16bec66b9bed900e Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Fri, 4 Jul 2025 10:38:48 +0100
Subject: [PATCH 103/274] Merge pull request #26822 from
 overleaf/rh-current-plan-free-personal

Treat 'free - personal' plan as free in current plan widget

GitOrigin-RevId: 271aca9b1c97389357b7b7d107ed838ebbcada40
---
 .../current-plan-widget.tsx                   |  8 ++++--
 .../components/current-plan-widget.test.tsx   | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx
index 1d17fe75a3..b07a4e164a 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/current-plan-widget.tsx
@@ -14,8 +14,12 @@ function CurrentPlanWidget() {
   }
 
   const { type } = usersBestSubscription
-  const isFreePlan = type === 'free' || type === 'standalone-ai-add-on'
-  const isIndividualPlan = type === 'individual'
+  const isFreePlan =
+    type === 'free' ||
+    type === 'standalone-ai-add-on' ||
+    (type === 'individual' && usersBestSubscription.plan?.name === 'Free')
+  const isIndividualPlan =
+    type === 'individual' && !(usersBestSubscription.plan?.name === 'Free')
   const isGroupPlan = type === 'group'
   const isCommonsPlan = type === 'commons'
   const isPaused =
diff --git a/services/web/test/frontend/features/project-list/components/current-plan-widget.test.tsx b/services/web/test/frontend/features/project-list/components/current-plan-widget.test.tsx
index 84836c204b..00a8593169 100644
--- a/services/web/test/frontend/features/project-list/components/current-plan-widget.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/current-plan-widget.test.tsx
@@ -83,6 +83,33 @@ describe('<CurrentPlanWidget />', function () {
     })
   })
 
+  describe('free plan with Personal plan name', function () {
+    beforeEach(function () {
+      window.metaAttributesCache.set('ol-usersBestSubscription', {
+        type: 'individual',
+        plan: {
+          name: 'Free',
+        },
+        subscription: {
+          planCode: 'personal',
+          name: 'Free',
+        },
+        featuresPageURL: '/features',
+      })
+
+      render(<CurrentPlanWidget />)
+    })
+
+    it('shows text and tooltip on mouseover', async function () {
+      const link = screen.getByRole('link', {
+        name: /you’re on the free plan/i,
+      })
+      fireEvent.mouseOver(link)
+
+      await screen.findByRole('tooltip', { name: freePlanTooltipMessage })
+    })
+  })
+
   describe('paid plan', function () {
     describe('trial', function () {
       const subscription = {

From 3681be7a71e223b9fea432f214f2e75ee675619b Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Fri, 4 Jul 2025 12:31:33 +0200
Subject: [PATCH 104/274] [web] Ignore Propensity Network errors (#26840)

* Test the scripts by adding fake ids

* Test Propensity errors

* Don't send Sentry event if `isPropensityNetworkError`

* Revert "Test Propensity errors"

This reverts commit 7052ca20d0bee3bb32b39fb90c473458a4375d7b.

* Revert "Test the scripts by adding fake ids"

This reverts commit 2ac797aadf24359917a10119155c5e41935a7482.

GitOrigin-RevId: 03c1e63e359d41ad83ce1ae5cc1063f1c59d0b4e
---
 .../js/infrastructure/error-reporter.ts       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/services/web/frontend/js/infrastructure/error-reporter.ts b/services/web/frontend/js/infrastructure/error-reporter.ts
index e70833860c..c7ca6604fb 100644
--- a/services/web/frontend/js/infrastructure/error-reporter.ts
+++ b/services/web/frontend/js/infrastructure/error-reporter.ts
@@ -2,6 +2,7 @@
 import getMeta from '../utils/meta'
 import OError from '@overleaf/o-error'
 import { debugConsole } from '@/utils/debugging'
+import type { ErrorEvent } from '@sentry/types/types/event'
 
 const {
   sentryAllowedOriginRegex,
@@ -12,6 +13,21 @@ const {
 
 const reporterPromise = sentryDsn ? sentryReporter() : nullReporter()
 
+const isPropensityNetworkError = (err: ErrorEvent) => {
+  const errorBreadcrumbs = err.breadcrumbs?.filter(b => b.level === 'error')
+
+  if (!errorBreadcrumbs || errorBreadcrumbs.length !== 1) {
+    // don't ignore Propensity if there are more errors to report
+    return false
+  }
+
+  return Boolean(
+    errorBreadcrumbs[0].data?.url.startsWith(
+      'https://analytics.propensity.com/'
+    )
+  )
+}
+
 function sentryReporter() {
   return (
     import(/* webpackMode: "eager" */ '@sentry/browser')
@@ -86,6 +102,10 @@ function sentryReporter() {
               }
             }
 
+            if (isPropensityNetworkError(event)) {
+              return null
+            }
+
             return event
           },
         })

From bb5b9afd0ef4e9ce5b2fec2af51f02bc8d6745da Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Fri, 4 Jul 2025 12:31:46 +0200
Subject: [PATCH 105/274] [web] Define `loadPropensityScript` before use
 (#26813)

This prevents the bug "ReferenceError: Cannot access uninitialized variable" for users who don't have `window.requestIdleCallback`.

Fixes https://overleaf.sentry.io/issues/6724866295

GitOrigin-RevId: 129dcb72f24dc901ad600253bab7c58673e44321
---
 .../web/frontend/js/infrastructure/tracking-propensity.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/web/frontend/js/infrastructure/tracking-propensity.ts b/services/web/frontend/js/infrastructure/tracking-propensity.ts
index 0392995140..586f00b1bd 100644
--- a/services/web/frontend/js/infrastructure/tracking-propensity.ts
+++ b/services/web/frontend/js/infrastructure/tracking-propensity.ts
@@ -6,10 +6,6 @@ import {
 
 const { propensityId } = getMeta('ol-ExposedSettings')
 
-if (propensityId) {
-  createTrackingLoader(() => loadPropensityScript(propensityId), 'Propensity')
-}
-
 const loadPropensityScript = (id: string) => {
   insertScript({
     src: 'https://cdn.propensity.com/propensity/propensity_analytics.js',
@@ -21,3 +17,7 @@ const loadPropensityScript = (id: string) => {
     },
   })
 }
+
+if (propensityId) {
+  createTrackingLoader(() => loadPropensityScript(propensityId), 'Propensity')
+}

From 09a534f48b1251d179a4b798318abc968cae4305 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Fri, 4 Jul 2025 12:31:58 +0200
Subject: [PATCH 106/274] [web] Move scopes `permissionsLevel`, `permissions`
 and `hasLintingError` to React context (#26607)

* Move `hasLintingError` from scope to react state

* Move `permissionsLevel` to IdeReactContext states

* Get `permissionsLevel` from `useIdeReactContext()`

* Set `permissionsLevel` in mocked `IdeReactProvider`

* Replace `permissions` scope by React state

* Fixup `permission` changes

* Remove redundant type

GitOrigin-RevId: 6203c61f9ac429789624196bf67e508310f4577f
---
 .../settings-spell-check-language.tsx         |  4 +--
 .../hooks/use-root-doc-id.tsx                 |  4 +--
 .../editor-navigation-toolbar-root.tsx        | 11 ++++---
 .../components/unsaved-docs/unsaved-docs.tsx  |  4 +--
 .../context/editor-manager-context.tsx        |  5 ++--
 .../ide-react/context/ide-react-context.tsx   | 29 +++++++++++++------
 .../ide-react/context/metadata-context.tsx    |  4 +--
 .../ide-react/context/permissions-context.tsx | 22 +++++++++-----
 .../ide-react/hooks/use-socket-listeners.ts   |  4 +--
 .../components/toolbar/project-title.tsx      |  4 ++-
 .../components/toolbar/toolbar.tsx            |  4 ++-
 .../components/review-mode-switcher.tsx       |  5 ++--
 .../components/editor-over-limit-modal.tsx    |  4 ++-
 .../components/view-only-access-modal.tsx     |  5 ++--
 .../hooks/use-codemirror-scope.ts             |  3 +-
 .../js/shared/context/editor-context.tsx      | 15 +---------
 .../shared/context/file-tree-data-context.tsx |  5 +++-
 .../shared/context/local-compile-context.tsx  |  5 ++--
 .../js/shared/hooks/use-viewer-permissions.ts |  4 +--
 .../web/frontend/stories/decorators/scope.tsx |  4 ++-
 .../components/editor-left-menu/scope.tsx     |  2 --
 .../pdf-preview/pdf-preview.spec.tsx          | 19 ++++++++----
 .../frontend/components/pdf-preview/scope.tsx |  1 -
 .../frontend/helpers/editor-providers.jsx     |  1 +
 24 files changed, 93 insertions(+), 75 deletions(-)

diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-spell-check-language.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-spell-check-language.tsx
index ecd0ced624..5529ecd871 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-spell-check-language.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-spell-check-language.tsx
@@ -4,7 +4,7 @@ import getMeta from '../../../../utils/meta'
 import { useProjectSettingsContext } from '../../context/project-settings-context'
 import SettingsMenuSelect from './settings-menu-select'
 import type { Optgroup } from './settings-menu-select'
-import { useEditorContext } from '@/shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { supportsWebAssembly } from '@/utils/wasm'
 
 export default function SettingsSpellCheckLanguage() {
@@ -12,7 +12,7 @@ export default function SettingsSpellCheckLanguage() {
 
   const { spellCheckLanguage, setSpellCheckLanguage } =
     useProjectSettingsContext()
-  const { permissionsLevel } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
 
   const optgroup: Optgroup = useMemo(() => {
     const options = (getMeta('ol-languages') ?? [])
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
index 8a704f87ac..2d62431b77 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
@@ -1,5 +1,5 @@
 import { useCallback } from 'react'
-import { useEditorContext } from '../../../shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import useScopeValue from '../../../shared/hooks/use-scope-value'
 import type { ProjectSettings } from '../utils/api'
 import useSaveProjectSettings from './use-save-project-settings'
@@ -7,7 +7,7 @@ import useSaveProjectSettings from './use-save-project-settings'
 export default function useRootDocId() {
   const [rootDocId] =
     useScopeValue<ProjectSettings['rootDocId']>('project.rootDocId')
-  const { permissionsLevel } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
   const saveProjectSettings = useSaveProjectSettings()
 
   const setRootDocIdFunc = useCallback(
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.tsx
index 820f21c3a4..cb4ac6f194 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useCallback } from 'react'
 import ToolbarHeader from './toolbar-header'
 import { useEditorContext } from '../../../shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { useChatContext } from '../../chat/context/chat-context'
 import { useLayoutContext } from '../../../shared/context/layout-context'
 import { useProjectContext } from '../../../shared/context/project-context'
@@ -27,12 +28,10 @@ const EditorNavigationToolbarRoot = React.memo(
       features: { trackChangesVisible },
     } = useProjectContext()
 
-    const {
-      cobranding,
-      isRestrictedTokenMember,
-      renameProject,
-      permissionsLevel,
-    } = useEditorContext()
+    const { cobranding, isRestrictedTokenMember, renameProject } =
+      useEditorContext()
+
+    const { permissionsLevel } = useIdeReactContext()
 
     const {
       chatIsOpen,
diff --git a/services/web/frontend/js/features/ide-react/components/unsaved-docs/unsaved-docs.tsx b/services/web/frontend/js/features/ide-react/components/unsaved-docs/unsaved-docs.tsx
index 8224bb6e62..7f19737c90 100644
--- a/services/web/frontend/js/features/ide-react/components/unsaved-docs/unsaved-docs.tsx
+++ b/services/web/frontend/js/features/ide-react/components/unsaved-docs/unsaved-docs.tsx
@@ -1,5 +1,5 @@
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
-import { useEditorContext } from '@/shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { FC, useCallback, useEffect, useRef, useState } from 'react'
 import { PermissionsLevel } from '@/features/ide-react/types/permissions'
 import { UnsavedDocsLockedAlert } from '@/features/ide-react/components/unsaved-docs/unsaved-docs-locked-alert'
@@ -12,7 +12,7 @@ const MAX_UNSAVED_SECONDS = 30 // lock the editor after this time if unsaved
 
 export const UnsavedDocs: FC = () => {
   const { openDocs, debugTimers } = useEditorManagerContext()
-  const { permissionsLevel, setPermissionsLevel } = useEditorContext()
+  const { permissionsLevel, setPermissionsLevel } = useIdeReactContext()
   const [isLocked, setIsLocked] = useState(false)
   const [unsavedDocs, setUnsavedDocs] = useState(new Map<string, number>())
   const globalAlertsContainer = useGlobalAlertsContainer()
diff --git a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
index dd06a6af86..71e827168e 100644
--- a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
@@ -35,7 +35,6 @@ import { EditorType } from '@/features/ide-react/editor/types/editor-type'
 import { DocId } from '../../../../../types/project-settings'
 import { Update } from '@/features/history/services/types/update'
 import { useDebugDiffTracker } from '../hooks/use-debug-diff-tracker'
-import { useEditorContext } from '@/shared/context/editor-context'
 import { convertFileRefToBinaryFile } from '@/features/ide-react/util/file-view'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 
@@ -89,8 +88,8 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
 }) => {
   const { t } = useTranslation()
   const { scopeStore } = useIdeContext()
-  const { reportError, eventEmitter, projectId } = useIdeReactContext()
-  const { setOutOfSync } = useEditorContext()
+  const { reportError, eventEmitter, projectId, setOutOfSync } =
+    useIdeReactContext()
   const { socket, closeConnection, connectionState } = useConnectionContext()
   const { view, setView, setOpenFile } = useLayoutContext()
   const { showGenericMessageModal, genericModalVisible, showOutOfSyncModal } =
diff --git a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
index 33413a52e7..27095adf00 100644
--- a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
@@ -19,6 +19,7 @@ import { populateEditorScope } from '@/features/ide-react/scope-adapters/editor-
 import { postJSON } from '@/infrastructure/fetch-json'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
 import getMeta from '@/utils/meta'
+import { type PermissionsLevel } from '@/features/ide-react/types/permissions'
 
 const LOADED_AT = new Date()
 
@@ -31,6 +32,9 @@ type IdeReactContextValue = {
   >
   reportError: (error: any, meta?: Record<string, any>) => void
   projectJoined: boolean
+  permissionsLevel: PermissionsLevel
+  setPermissionsLevel: (permissionsLevel: PermissionsLevel) => void
+  setOutOfSync: (value: boolean) => void
 }
 
 export const IdeReactContext = createContext<IdeReactContextValue | undefined>(
@@ -43,13 +47,6 @@ function populateIdeReactScope(store: ReactScopeValueStore) {
 
 function populateProjectScope(store: ReactScopeValueStore) {
   store.allowNonExistentPath('project', true)
-  store.set('permissionsLevel', 'readOnly')
-  store.set('permissions', {
-    read: true,
-    write: false,
-    admin: false,
-    comment: true,
-  })
 }
 
 function populatePdfScope(store: ReactScopeValueStore) {
@@ -78,6 +75,9 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const projectId = getMeta('ol-project_id')
   const [scopeStore] = useState(() => createReactScopeValueStore(projectId))
   const [eventEmitter] = useState(createIdeEventEmitter)
+  const [permissionsLevel, setPermissionsLevel] =
+    useState<PermissionsLevel>('readOnly')
+  const [outOfSync, setOutOfSync] = useState(false)
   const [scopeEventEmitter] = useState(
     () => new ReactScopeEventEmitter(eventEmitter)
   )
@@ -137,7 +137,7 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
     }: JoinProjectPayload) {
       const project = { ..._project, rootDocId }
       scopeStore.set('project', project)
-      scopeStore.set('permissionsLevel', permissionsLevel)
+      setPermissionsLevel(permissionsLevel)
       // Make watchers update immediately
       scopeStore.flushUpdates()
       eventEmitter.emit('project:joined', { project, permissionsLevel })
@@ -173,11 +173,22 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
       eventEmitter,
       startedFreeTrial,
       setStartedFreeTrial,
+      permissionsLevel: outOfSync ? 'readOnly' : permissionsLevel,
+      setPermissionsLevel,
+      setOutOfSync,
       projectId,
       reportError,
       projectJoined,
     }),
-    [eventEmitter, projectId, projectJoined, reportError, startedFreeTrial]
+    [
+      eventEmitter,
+      outOfSync,
+      permissionsLevel,
+      projectId,
+      projectJoined,
+      reportError,
+      startedFreeTrial,
+    ]
   )
 
   return (
diff --git a/services/web/frontend/js/features/ide-react/context/metadata-context.tsx b/services/web/frontend/js/features/ide-react/context/metadata-context.tsx
index 7fa6332a16..f8aeec6ca9 100644
--- a/services/web/frontend/js/features/ide-react/context/metadata-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/metadata-context.tsx
@@ -13,7 +13,6 @@ import { useConnectionContext } from '@/features/ide-react/context/connection-co
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { getJSON, postJSON } from '@/infrastructure/fetch-json'
 import { useOnlineUsersContext } from '@/features/ide-react/context/online-users-context'
-import { useEditorContext } from '@/shared/context/editor-context'
 import useSocketListener from '@/features/ide-react/hooks/use-socket-listener'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import { useModalsContext } from '@/features/ide-react/context/modals-context'
@@ -49,10 +48,9 @@ export const MetadataContext = createContext<
 
 export const MetadataProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const { t } = useTranslation()
-  const { eventEmitter, projectId } = useIdeReactContext()
+  const { eventEmitter, permissionsLevel, projectId } = useIdeReactContext()
   const { socket } = useConnectionContext()
   const { onlineUsersCount } = useOnlineUsersContext()
-  const { permissionsLevel } = useEditorContext()
   const permissions = usePermissionsContext()
   const { currentDocument } = useEditorOpenDocContext()
   const { showGenericMessageModal } = useModalsContext()
diff --git a/services/web/frontend/js/features/ide-react/context/permissions-context.tsx b/services/web/frontend/js/features/ide-react/context/permissions-context.tsx
index 1e10a2cd11..bdb101d3f5 100644
--- a/services/web/frontend/js/features/ide-react/context/permissions-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/permissions-context.tsx
@@ -1,12 +1,11 @@
-import { createContext, useContext, useEffect } from 'react'
+import { createContext, useContext, useEffect, useState } from 'react'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
-import { useEditorContext } from '@/shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import getMeta from '@/utils/meta'
 import {
   Permissions,
   PermissionsLevel,
 } from '@/features/ide-react/types/permissions'
-import useScopeValue from '@/shared/hooks/use-scope-value'
 import { DeepReadonly } from '../../../../../types/utils'
 import useViewerPermissions from '@/shared/hooks/use-viewer-permissions'
 import { useProjectContext } from '@/shared/context/project-context'
@@ -79,15 +78,24 @@ const noTrackChangesPermissionsMap: typeof permissionsMap = {
   owner: permissionsMap.owner,
 }
 
+const defaultPermissions: Permissions = {
+  read: true,
+  write: true,
+  admin: false,
+  comment: true,
+  resolveOwnComments: false,
+  resolveAllComments: false,
+  trackedWrite: true,
+  labelVersion: false,
+}
+
 export const PermissionsProvider: React.FC<React.PropsWithChildren> = ({
   children,
 }) => {
   const [permissions, setPermissions] =
-    useScopeValue<Readonly<Permissions>>('permissions')
+    useState<Permissions>(defaultPermissions)
   const { connectionState } = useConnectionContext()
-  const { permissionsLevel } = useEditorContext() as {
-    permissionsLevel: PermissionsLevel
-  }
+  const { permissionsLevel } = useIdeReactContext()
   const hasViewerPermissions = useViewerPermissions()
   const anonymous = getMeta('ol-anonymous')
   const project = useProjectContext()
diff --git a/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts b/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts
index 6b2f305593..388fa0299b 100644
--- a/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts
+++ b/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts
@@ -12,14 +12,12 @@ import { debugConsole } from '@/utils/debugging'
 import { useCallback } from 'react'
 import { PublicAccessLevel } from '../../../../../types/public-access-level'
 import { useLocation } from '@/shared/hooks/use-location'
-import { useEditorContext } from '@/shared/context/editor-context'
 
 function useSocketListeners() {
   const { t } = useTranslation()
   const { socket } = useConnectionContext()
-  const { projectId } = useIdeReactContext()
+  const { permissionsLevel, projectId } = useIdeReactContext()
   const { showGenericMessageModal } = useModalsContext()
-  const { permissionsLevel } = useEditorContext()
   const [, setPublicAccessLevel] = useScopeValue('project.publicAccesLevel')
   const [, setProjectMembers] = useScopeValue('project.members')
   const [, setProjectInvites] = useScopeValue('project.invites')
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
index bf3320d8b9..b975909f6e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/project-title.tsx
@@ -9,6 +9,7 @@ import { useProjectContext } from '@/shared/context/project-context'
 import { useTranslation } from 'react-i18next'
 import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
 import { useEditorContext } from '@/shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { DownloadProjectPDF, DownloadProjectZip } from './download-project'
 import { useCallback, useState } from 'react'
 import OLDropdownMenuItem from '@/features/ui/components/ol/ol-dropdown-menu-item'
@@ -21,7 +22,8 @@ const SubmitProjectButton = publishModalModules?.import.NewPublishDropdownButton
 export const ToolbarProjectTitle = () => {
   const { cobranding } = useEditorContext()
   const { t } = useTranslation()
-  const { permissionsLevel, renameProject } = useEditorContext()
+  const { renameProject } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
   const { name } = useProjectContext()
   const shouldDisplaySubmitButton =
     (permissionsLevel === 'owner' || permissionsLevel === 'readAndWrite') &&
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
index 2af70eb9ce..6da6e2cef9 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
@@ -14,13 +14,15 @@ import { useEditorContext } from '@/shared/context/editor-context'
 import importOverleafModules from '../../../../../macros/import-overleaf-module.macro'
 import UpgradeButton from './upgrade-button'
 import getMeta from '@/utils/meta'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 
 const [publishModalModules] = importOverleafModules('publishModal')
 const SubmitProjectButton = publishModalModules?.import.NewPublishToolbarButton
 
 export const Toolbar = () => {
   const { view, setView } = useLayoutContext()
-  const { cobranding, permissionsLevel } = useEditorContext()
+  const { cobranding } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
   const shouldDisplaySubmitButton =
     (permissionsLevel === 'owner' || permissionsLevel === 'readAndWrite') &&
     SubmitProjectButton
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
index 2405c2ed60..74c865632c 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
@@ -17,6 +17,7 @@ import { usePermissionsContext } from '@/features/ide-react/context/permissions-
 import usePersistedState from '@/shared/hooks/use-persisted-state'
 import { sendMB } from '@/infrastructure/event-tracking'
 import { useEditorContext } from '@/shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { useProjectContext } from '@/shared/context/project-context'
 import UpgradeTrackChangesModal from './upgrade-track-changes-modal'
 import { ReviewModePromo } from '@/features/review-panel-new/components/review-mode-promo'
@@ -33,7 +34,7 @@ const useCurrentMode = (): Mode => {
     trackChanges?.onForEveryone ||
     (user?.id && trackChanges?.onForMembers[user.id]) ||
     (!user?.id && trackChanges?.onForGuests)
-  const { permissionsLevel } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
 
   if (permissionsLevel === 'readOnly') {
     return 'view'
@@ -52,7 +53,7 @@ function ReviewModeSwitcher() {
   const { saveTrackChangesForCurrentUser, saveTrackChanges } =
     useTrackChangesStateActionsContext()
   const mode = useCurrentMode()
-  const { permissionsLevel } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
   const { write, trackedWrite } = usePermissionsContext()
   const project = useProjectContext()
   const [showUpgradeModal, setShowUpgradeModal] = useState(false)
diff --git a/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx b/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx
index 2764a57d8e..8914d8ba3b 100644
--- a/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx
@@ -3,13 +3,15 @@ import EditorOverLimitModalContent from './editor-over-limit-modal-content'
 import customLocalStorage from '@/infrastructure/local-storage'
 import { useProjectContext } from '@/shared/context/project-context'
 import { useEditorContext } from '@/shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { sendMB } from '@/infrastructure/event-tracking'
 import OLModal from '@/features/ui/components/ol/ol-modal'
 
 const EditorOverLimitModal = () => {
   const [show, setShow] = useState(false)
 
-  const { isProjectOwner, permissionsLevel } = useEditorContext()
+  const { isProjectOwner } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
   const { members, features, _id: projectId } = useProjectContext()
 
   const handleHide = () => {
diff --git a/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx b/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx
index ab2ea023bb..d474e681c1 100644
--- a/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx
@@ -3,14 +3,15 @@ import ViewOnlyAccessModalContent from './view-only-access-modal-content'
 import customLocalStorage from '@/infrastructure/local-storage'
 import { useProjectContext } from '@/shared/context/project-context'
 import { useEditorContext } from '@/shared/context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { sendMB } from '@/infrastructure/event-tracking'
 import OLModal from '@/features/ui/components/ol/ol-modal'
 
 const ViewOnlyAccessModal = () => {
   const [show, setShow] = useState(false)
 
-  const { isProjectOwner, isPendingEditor, permissionsLevel } =
-    useEditorContext()
+  const { isProjectOwner, isPendingEditor } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
   const { members, features, _id: projectId } = useProjectContext()
 
   const handleHide = () => {
diff --git a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
index 6c20a44702..c0d27c354a 100644
--- a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
+++ b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
@@ -58,11 +58,12 @@ import {
 import { GotoLineOptions } from '@/features/ide-react/types/goto-line-options'
 import { useOnlineUsersContext } from '@/features/ide-react/context/online-users-context'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
 
 function useCodeMirrorScope(view: EditorView) {
   const { fileTreeData } = useFileTreeData()
 
-  const [permissions] = useScopeValue<Permissions>('permissions')
+  const permissions: Permissions = usePermissionsContext()
 
   // set up scope listeners
 
diff --git a/services/web/frontend/js/shared/context/editor-context.tsx b/services/web/frontend/js/shared/context/editor-context.tsx
index 12763aab58..5685951ad2 100644
--- a/services/web/frontend/js/shared/context/editor-context.tsx
+++ b/services/web/frontend/js/shared/context/editor-context.tsx
@@ -17,7 +17,6 @@ import { useDetachContext } from './detach-context'
 import getMeta from '../../utils/meta'
 import { useUserContext } from './user-context'
 import { saveProjectSettings } from '@/features/editor-left-menu/utils/api'
-import { PermissionsLevel } from '@/features/ide-react/types/permissions'
 import { useModalsContext } from '@/features/ide-react/context/modals-context'
 import { WritefullAPI } from './types/writefull-instance'
 import { Cobranding } from '../../../../types/cobranding'
@@ -28,19 +27,16 @@ export const EditorContext = createContext<
       cobranding?: Cobranding
       hasPremiumCompile?: boolean
       renameProject: (newName: string) => void
-      setPermissionsLevel: (permissionsLevel: PermissionsLevel) => void
       showSymbolPalette?: boolean
       toggleSymbolPalette?: () => void
       insertSymbol?: (symbol: SymbolWithCharacter) => void
       isProjectOwner: boolean
       isRestrictedTokenMember?: boolean
       isPendingEditor: boolean
-      permissionsLevel: PermissionsLevel
       deactivateTutorial: (tutorial: string) => void
       inactiveTutorials: string[]
       currentPopup: string | null
       setCurrentPopup: Dispatch<SetStateAction<string | null>>
-      setOutOfSync: (value: boolean) => void
       hasPremiumSuggestion: boolean
       setHasPremiumSuggestion: (value: boolean) => void
       setPremiumSuggestionResetDate: (date: Date) => void
@@ -78,9 +74,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
   }, [])
 
   const [projectName, setProjectName] = useScopeValue('project.name')
-  const [permissionsLevel, setPermissionsLevel] =
-    useScopeValue('permissionsLevel')
-  const [outOfSync, setOutOfSync] = useState(false)
   const [showSymbolPalette] = useScopeValue('editor.showSymbolPalette')
   const [toggleSymbolPalette] = useScopeValue('editor.toggleSymbolPalette')
 
@@ -187,8 +180,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
       cobranding,
       hasPremiumCompile: features?.compileGroup === 'priority',
       renameProject,
-      permissionsLevel: outOfSync ? 'readOnly' : permissionsLevel,
-      setPermissionsLevel,
       isProjectOwner: owner?._id === userId,
       isRestrictedTokenMember: getMeta('ol-isRestrictedTokenMember'),
       isPendingEditor,
@@ -199,7 +190,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
       deactivateTutorial,
       currentPopup,
       setCurrentPopup,
-      setOutOfSync,
       hasPremiumSuggestion,
       setHasPremiumSuggestion,
       premiumSuggestionResetDate,
@@ -213,8 +203,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
       owner,
       userId,
       renameProject,
-      permissionsLevel,
-      setPermissionsLevel,
       isPendingEditor,
       showSymbolPalette,
       toggleSymbolPalette,
@@ -223,8 +211,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
       deactivateTutorial,
       currentPopup,
       setCurrentPopup,
-      outOfSync,
-      setOutOfSync,
       hasPremiumSuggestion,
       setHasPremiumSuggestion,
       premiumSuggestionResetDate,
@@ -238,6 +224,7 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
     <EditorContext.Provider value={value}>{children}</EditorContext.Provider>
   )
 }
+
 export function useEditorContext() {
   const context = useContext(EditorContext)
 
diff --git a/services/web/frontend/js/shared/context/file-tree-data-context.tsx b/services/web/frontend/js/shared/context/file-tree-data-context.tsx
index 7e426b9e54..889c865e91 100644
--- a/services/web/frontend/js/shared/context/file-tree-data-context.tsx
+++ b/services/web/frontend/js/shared/context/file-tree-data-context.tsx
@@ -28,6 +28,8 @@ import {
   useSnapshotContext,
 } from '@/features/ide-react/context/snapshot-context'
 import importOverleafModules from '../../../macros/import-overleaf-module.macro'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
+
 const { buildFileTree, createFolder } =
   (importOverleafModules('snapshotUtils')[0]
     ?.import as typeof StubSnapshotUtils) || StubSnapshotUtils
@@ -61,6 +63,7 @@ enum ACTION_TYPES {
   MOVE = 'MOVE',
   CREATE = 'CREATE',
 }
+
 /* eslint-enable no-unused-vars */
 
 type Action =
@@ -181,7 +184,7 @@ export const FileTreeDataProvider: FC<React.PropsWithChildren> = ({
 }) => {
   const [project] = useScopeValue<Project>('project')
   const { currentDocumentId, setOpenDocName } = useEditorOpenDocContext()
-  const [permissionsLevel] = useScopeValue('permissionsLevel')
+  const { permissionsLevel } = useIdeReactContext()
   const { fileTreeFromHistory, snapshot, snapshotVersion } =
     useSnapshotContext()
   const fileTreeReadOnly =
diff --git a/services/web/frontend/js/shared/context/local-compile-context.tsx b/services/web/frontend/js/shared/context/local-compile-context.tsx
index af1430ac05..ccc2c1453c 100644
--- a/services/web/frontend/js/shared/context/local-compile-context.tsx
+++ b/services/web/frontend/js/shared/context/local-compile-context.tsx
@@ -10,7 +10,6 @@ import {
   Dispatch,
   SetStateAction,
 } from 'react'
-import useScopeValue from '../hooks/use-scope-value'
 import usePersistedState from '../hooks/use-persisted-state'
 import useAbortController from '../hooks/use-abort-controller'
 import DocumentCompiler from '../../features/pdf-preview/util/compiler'
@@ -85,7 +84,7 @@ export type CompileContext = {
   setAutoCompile: (value: boolean) => void
   setDraft: (value: any) => void
   setError: (value: any) => void
-  setHasLintingError: (value: any) => void // only for storybook
+  setHasLintingError: (value: boolean) => void // only for storybook
   setHighlights: (value: any) => void
   setPosition: Dispatch<SetStateAction<PdfScrollPosition>>
   setShowCompileTimeWarning: (value: any) => void
@@ -273,7 +272,7 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   )
 
   // whether the editor linter found errors
-  const [hasLintingError, setHasLintingError] = useScopeValue('hasLintingError')
+  const [hasLintingError, setHasLintingError] = useState(false)
 
   // the timestamp that a doc was last changed
   const [changedAt, setChangedAt] = useState(0)
diff --git a/services/web/frontend/js/shared/hooks/use-viewer-permissions.ts b/services/web/frontend/js/shared/hooks/use-viewer-permissions.ts
index 5f6e7f1f72..269d094b27 100644
--- a/services/web/frontend/js/shared/hooks/use-viewer-permissions.ts
+++ b/services/web/frontend/js/shared/hooks/use-viewer-permissions.ts
@@ -1,7 +1,7 @@
-import { useEditorContext } from '../context/editor-context'
+import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 
 function useViewerPermissions() {
-  const { permissionsLevel } = useEditorContext()
+  const { permissionsLevel } = useIdeReactContext()
   return permissionsLevel === 'readOnly'
 }
 
diff --git a/services/web/frontend/stories/decorators/scope.tsx b/services/web/frontend/stories/decorators/scope.tsx
index c81b9b6103..cc89a31685 100644
--- a/services/web/frontend/stories/decorators/scope.tsx
+++ b/services/web/frontend/stories/decorators/scope.tsx
@@ -75,7 +75,6 @@ const initialScope = {
     },
     open_doc_name: 'testfile.tex',
   },
-  hasLintingError: false,
   permissionsLevel: 'owner',
 }
 
@@ -190,6 +189,9 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
     setStartedFreeTrial,
     reportError: () => {},
     projectJoined: true,
+    permissionsLevel: 'owner' as const,
+    setPermissionsLevel: () => {},
+    setOutOfSync: () => {},
   }))
 
   const [ideContextValue] = useState(() => {
diff --git a/services/web/test/frontend/components/editor-left-menu/scope.tsx b/services/web/test/frontend/components/editor-left-menu/scope.tsx
index 4c58c01f53..8281fe1f72 100644
--- a/services/web/test/frontend/components/editor-left-menu/scope.tsx
+++ b/services/web/test/frontend/components/editor-left-menu/scope.tsx
@@ -12,7 +12,6 @@ type Scope = {
       getSnapshot?: () => string
     }
   }
-  hasLintingError?: boolean
   ui?: {
     view?: 'editor' | 'history' | 'file' | 'pdf'
     pdfLayout?: 'flat' | 'sideBySide' | 'split'
@@ -46,6 +45,5 @@ export const mockScope = (scope?: Scope) => ({
       getSnapshot: () => 'some doc content',
     },
   },
-  hasLintingError: false,
   ...scope,
 })
diff --git a/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
index ed0ab2ffc1..47f7e1024d 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
@@ -7,7 +7,8 @@ import {
   IdeView,
   useLayoutContext,
 } from '../../../../frontend/js/shared/context/layout-context'
-import { FC, useEffect } from 'react'
+import { FC, PropsWithChildren, useEffect } from 'react'
+import { useLocalCompileContext } from '@/shared/context/local-compile-context'
 
 const storeAndFireEvent = (win: typeof window, key: string, value: unknown) => {
   localStorage.setItem(key, value)
@@ -462,14 +463,20 @@ describe('<PdfPreview/>', function () {
     const scope = mockScope()
     // enable linting in the editor
     const userSettings = { syntaxValidation: true }
-    // mock a linting error
-    scope.hasLintingError = true
+
+    const WithLintingErrors: FC<PropsWithChildren> = ({ children }) => {
+      const { setHasLintingError } = useLocalCompileContext()
+      useEffect(() => setHasLintingError(true), [setHasLintingError])
+      return children
+    }
 
     cy.mount(
       <EditorProviders scope={scope} userSettings={userSettings}>
-        <div className="pdf-viewer">
-          <PdfPreview />
-        </div>
+        <WithLintingErrors>
+          <div className="pdf-viewer">
+            <PdfPreview />
+          </div>
+        </WithLintingErrors>
       </EditorProviders>
     )
 
diff --git a/services/web/test/frontend/components/pdf-preview/scope.tsx b/services/web/test/frontend/components/pdf-preview/scope.tsx
index 397813faa2..08dbebbd3c 100644
--- a/services/web/test/frontend/components/pdf-preview/scope.tsx
+++ b/services/web/test/frontend/components/pdf-preview/scope.tsx
@@ -15,5 +15,4 @@ export const mockScope = () => ({
       doc: '\\documentclass{article}',
     }),
   },
-  hasLintingError: false,
 })
diff --git a/services/web/test/frontend/helpers/editor-providers.jsx b/services/web/test/frontend/helpers/editor-providers.jsx
index f2ed404f66..5a0088120a 100644
--- a/services/web/test/frontend/helpers/editor-providers.jsx
+++ b/services/web/test/frontend/helpers/editor-providers.jsx
@@ -204,6 +204,7 @@ const makeIdeReactProvider = (scope, socket) => {
       setStartedFreeTrial,
       reportError: () => {},
       projectJoined: true,
+      permissionsLevel: scope.permissionsLevel,
     }))
 
     const [ideContextValue] = useState(() => {

From 07b1701b721c40c0fd2e93d4b9127bac5273bc13 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Fri, 4 Jul 2025 12:50:45 +0200
Subject: [PATCH 107/274] [web] Convert EditorProviders and some test files to
 Typescript (#26512)

* Rename files to tsx

* Update types

* Remove props that aren't typed

* Add `LayoutContextOwnStates`

* Use `LayoutContextOwnStates`

* Ignore ts errors about `SocketIOMock`

* Address comments: remove `satisfies`, update `BroadcastChannel` fixture

* Add types to `makeEditorOpenDocProvider`. Update `openDocId`->`currentDocumentId`

* misc.

* Type sockets as `SocketIOMock & Socket`

* Fix remaining typing errors

* Fix type of `ideReactContextValue`

GitOrigin-RevId: 2734ac707517d56c452b0bf06ea3438f947a64be
---
 .../components/toolbar-header.tsx             | 44 +++++----
 .../context/editor-open-doc-context.tsx       |  9 +-
 .../ide-react/context/react-context-root.tsx  |  4 +-
 .../js/shared/context/layout-context.tsx      | 23 +++--
 .../pdf-preview/pdf-synctex-controls.spec.tsx |  3 +-
 ...n.test.jsx => chat-toggle-button.test.tsx} |  0
 ...st.jsx => layout-dropdown-button.test.tsx} | 12 ++-
 ....test.jsx => online-users-widget.test.tsx} | 16 +++-
 ...x => project-name-editable-label.test.tsx} |  0
 ...eader.test.jsx => toolbar-header.test.tsx} | 19 ++--
 .../components/file-tree-root.spec.tsx        |  5 +-
 .../file-tree/flows/create-folder.spec.tsx    |  5 +-
 .../file-tree/flows/delete-entity.spec.tsx    | 13 +--
 .../file-tree/flows/rename-entity.spec.tsx    |  5 +-
 ...tor-providers.jsx => editor-providers.tsx} | 95 ++++++++++++++-----
 .../frontend/helpers/render-with-context.jsx  | 20 ----
 .../frontend/helpers/render-with-context.tsx  | 20 ++++
 17 files changed, 186 insertions(+), 107 deletions(-)
 rename services/web/test/frontend/features/editor-navigation-toolbar/components/{chat-toggle-button.test.jsx => chat-toggle-button.test.tsx} (100%)
 rename services/web/test/frontend/features/editor-navigation-toolbar/components/{layout-dropdown-button.test.jsx => layout-dropdown-button.test.tsx} (94%)
 rename services/web/test/frontend/features/editor-navigation-toolbar/components/{online-users-widget.test.jsx => online-users-widget.test.tsx} (89%)
 rename services/web/test/frontend/features/editor-navigation-toolbar/components/{project-name-editable-label.test.jsx => project-name-editable-label.test.tsx} (100%)
 rename services/web/test/frontend/features/editor-navigation-toolbar/components/{toolbar-header.test.jsx => toolbar-header.test.tsx} (89%)
 rename services/web/test/frontend/helpers/{editor-providers.jsx => editor-providers.tsx} (79%)
 delete mode 100644 services/web/test/frontend/helpers/render-with-context.jsx
 create mode 100644 services/web/test/frontend/helpers/render-with-context.tsx

diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx
index 87bcbc0aac..d116c9b881 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/toolbar-header.tsx
@@ -39,6 +39,28 @@ const enableROMirrorOnClient =
   new URLSearchParams(window.location.search).get('ro-mirror-on-client') ===
     'enabled'
 
+export type ToolbarHeaderProps = {
+  cobranding: Cobranding | undefined
+  onShowLeftMenuClick: () => void
+  chatIsOpen: boolean
+  toggleChatOpen: () => void
+  reviewPanelOpen: boolean
+  toggleReviewPanelOpen: (e: React.MouseEvent) => void
+  historyIsOpen: boolean
+  toggleHistoryOpen: () => void
+  unreadMessageCount: number
+  onlineUsers: OnlineUser[]
+  goToUser: (user: OnlineUser) => void
+  isRestrictedTokenMember: boolean | undefined
+  hasPublishPermissions: boolean
+  chatVisible: boolean
+  projectName: string
+  renameProject: (name: string) => void
+  hasRenamePermissions: boolean
+  openShareModal: () => void
+  trackChangesVisible: boolean | undefined
+}
+
 const ToolbarHeader = React.memo(function ToolbarHeader({
   cobranding,
   onShowLeftMenuClick,
@@ -59,27 +81,7 @@ const ToolbarHeader = React.memo(function ToolbarHeader({
   hasRenamePermissions,
   openShareModal,
   trackChangesVisible,
-}: {
-  cobranding: Cobranding | undefined
-  onShowLeftMenuClick: () => void
-  chatIsOpen: boolean
-  toggleChatOpen: () => void
-  reviewPanelOpen: boolean
-  toggleReviewPanelOpen: (e: React.MouseEvent) => void
-  historyIsOpen: boolean
-  toggleHistoryOpen: () => void
-  unreadMessageCount: number
-  onlineUsers: OnlineUser[]
-  goToUser: (user: OnlineUser) => void
-  isRestrictedTokenMember: boolean | undefined
-  hasPublishPermissions: boolean
-  chatVisible: boolean
-  projectName: string
-  renameProject: (name: string) => void
-  hasRenamePermissions: boolean
-  openShareModal: () => void
-  trackChangesVisible: boolean | undefined
-}) {
+}: ToolbarHeaderProps) {
   const chatEnabled = getMeta('ol-capabilities')?.includes('chat')
 
   const { t } = useTranslation()
diff --git a/services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx
index dd4a470578..61de80dfde 100644
--- a/services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/editor-open-doc-context.tsx
@@ -11,12 +11,15 @@ import { DocId } from '../../../../../types/project-settings'
 import useExposedState from '@/shared/hooks/use-exposed-state'
 import { DocumentContainer } from '@/features/ide-react/editor/document-container'
 
-type EditorOpenDocContextValue = {
+export interface EditorOpenDocContextState {
   currentDocumentId: DocId | null
-  setCurrentDocumentId: Dispatch<SetStateAction<DocId | null>>
   openDocName: string | null
-  setOpenDocName: Dispatch<SetStateAction<string | null>>
   currentDocument: DocumentContainer | null
+}
+
+interface EditorOpenDocContextValue extends EditorOpenDocContextState {
+  setCurrentDocumentId: Dispatch<SetStateAction<DocId | null>>
+  setOpenDocName: Dispatch<SetStateAction<string | null>>
   setCurrentDocument: Dispatch<SetStateAction<DocumentContainer | null>>
 }
 
diff --git a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
index fdac20dc0f..99442eba5e 100644
--- a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
+++ b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import React, { FC, PropsWithChildren } from 'react'
 import { ChatProvider } from '@/features/chat/context/chat-context'
 import { ConnectionProvider } from './connection-context'
 import { DetachCompileProvider } from '@/shared/context/detach-compile-context'
@@ -32,7 +32,7 @@ import { CommandRegistryProvider } from './command-registry-context'
 
 export const ReactContextRoot: FC<
   React.PropsWithChildren<{
-    providers?: Record<string, FC>
+    providers?: Record<string, FC<PropsWithChildren>>
   }>
 > = ({ children, providers = {} }) => {
   const Providers = {
diff --git a/services/web/frontend/js/shared/context/layout-context.tsx b/services/web/frontend/js/shared/context/layout-context.tsx
index c59efae270..8dcc1fd8ff 100644
--- a/services/web/frontend/js/shared/context/layout-context.tsx
+++ b/services/web/frontend/js/shared/context/layout-context.tsx
@@ -25,37 +25,40 @@ import usePersistedState from '@/shared/hooks/use-persisted-state'
 export type IdeLayout = 'sideBySide' | 'flat'
 export type IdeView = 'editor' | 'file' | 'pdf' | 'history'
 
-export type LayoutContextValue = {
+export type LayoutContextOwnStates = {
+  view: IdeView | null
+  chatIsOpen: boolean
+  reviewPanelOpen: boolean
+  miniReviewPanelVisible: boolean
+  leftMenuShown: boolean
+  loadingStyleSheet: boolean
+  pdfLayout: IdeLayout
+  projectSearchIsOpen: boolean
+  openFile: BinaryFile | null
+}
+
+export type LayoutContextValue = LayoutContextOwnStates & {
   reattach: () => void
   detach: () => void
   detachIsLinked: boolean
   detachRole: DetachRole
   changeLayout: (newLayout: IdeLayout, newView?: IdeView) => void
-  view: IdeView | null
   setView: (view: IdeView | null) => void
-  chatIsOpen: boolean
   setChatIsOpen: Dispatch<SetStateAction<LayoutContextValue['chatIsOpen']>>
-  reviewPanelOpen: boolean
   setReviewPanelOpen: Dispatch<
     SetStateAction<LayoutContextValue['reviewPanelOpen']>
   >
-  miniReviewPanelVisible: boolean
   setMiniReviewPanelVisible: Dispatch<
     SetStateAction<LayoutContextValue['miniReviewPanelVisible']>
   >
-  leftMenuShown: boolean
   setLeftMenuShown: Dispatch<
     SetStateAction<LayoutContextValue['leftMenuShown']>
   >
-  loadingStyleSheet: boolean
   setLoadingStyleSheet: Dispatch<
     SetStateAction<LayoutContextValue['loadingStyleSheet']>
   >
-  pdfLayout: IdeLayout
   pdfPreviewOpen: boolean
-  projectSearchIsOpen: boolean
   setProjectSearchIsOpen: Dispatch<SetStateAction<boolean>>
-  openFile: BinaryFile | null
   setOpenFile: Dispatch<SetStateAction<BinaryFile | null>>
 }
 
diff --git a/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx
index f8c379c51e..3cba86d03d 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-synctex-controls.spec.tsx
@@ -80,6 +80,7 @@ function mockProviders() {
   return {
     EditorOpenDocProvider: makeEditorOpenDocProvider({
       openDocName: 'main.tex',
+      currentDocumentId: null,
       currentDocument: {
         doc_id: 'test-doc',
         getSnapshot: () => 'some doc content',
@@ -87,7 +88,7 @@ function mockProviders() {
         on: () => {},
         off: () => {},
         leaveAndCleanUpPromise: () => Promise.resolve(),
-      },
+      } as any,
     }),
   }
 }
diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/chat-toggle-button.test.jsx b/services/web/test/frontend/features/editor-navigation-toolbar/components/chat-toggle-button.test.tsx
similarity index 100%
rename from services/web/test/frontend/features/editor-navigation-toolbar/components/chat-toggle-button.test.jsx
rename to services/web/test/frontend/features/editor-navigation-toolbar/components/chat-toggle-button.test.tsx
diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.jsx b/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.tsx
similarity index 94%
rename from services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.jsx
rename to services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.tsx
index f8ac817c36..c3bd08ed89 100644
--- a/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.jsx
+++ b/services/web/test/frontend/features/editor-navigation-toolbar/components/layout-dropdown-button.test.tsx
@@ -5,12 +5,13 @@ import { screen, waitFor } from '@testing-library/react'
 import LayoutDropdownButton from '../../../../../frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button'
 import { renderWithEditorContext } from '../../../helpers/render-with-context'
 import * as eventTracking from '@/infrastructure/event-tracking'
+import type { LayoutContextOwnStates } from '@/shared/context/layout-context'
 
 describe('<LayoutDropdownButton />', function () {
-  let openStub
-  let sendMBSpy
+  let openStub: sinon.SinonStub
+  let sendMBSpy: sinon.SinonSpy
 
-  const defaultLayout = {
+  const defaultLayout: Partial<LayoutContextOwnStates> = {
     pdfLayout: 'flat',
     view: 'pdf',
     chatIsOpen: false,
@@ -161,9 +162,10 @@ describe('<LayoutDropdownButton />', function () {
   })
 
   describe('on detach', async function () {
-    let originalBroadcastChannel
+    const originalBroadcastChannel = window.BroadcastChannel
     beforeEach(async function () {
-      window.BroadcastChannel = originalBroadcastChannel || true // ensure that window.BroadcastChannel is truthy
+      // @ts-expect-error
+      window.BroadcastChannel = true // ensure that window.BroadcastChannel is truthy
 
       renderWithEditorContext(<LayoutDropdownButton />, {
         layoutContext: { ...defaultLayout, view: 'editor' },
diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/online-users-widget.test.jsx b/services/web/test/frontend/features/editor-navigation-toolbar/components/online-users-widget.test.tsx
similarity index 89%
rename from services/web/test/frontend/features/editor-navigation-toolbar/components/online-users-widget.test.jsx
rename to services/web/test/frontend/features/editor-navigation-toolbar/components/online-users-widget.test.tsx
index 96a8abe0aa..42c7a04502 100644
--- a/services/web/test/frontend/features/editor-navigation-toolbar/components/online-users-widget.test.jsx
+++ b/services/web/test/frontend/features/editor-navigation-toolbar/components/online-users-widget.test.tsx
@@ -8,12 +8,16 @@ describe('<OnlineUsersWidget />', function () {
   const defaultProps = {
     onlineUsers: [
       {
+        id: 'test_user',
         user_id: 'test_user',
         name: 'test_user',
+        email: 'test_email',
       },
       {
+        id: 'another_test_user',
         user_id: 'another_test_user',
         name: 'another_test_user',
+        email: 'another_test_email',
       },
     ],
     goToUser: () => {},
@@ -44,8 +48,10 @@ describe('<OnlineUsersWidget />', function () {
       fireEvent.click(icon)
 
       expect(props.goToUser).to.be.calledWith({
-        name: 'test_user',
+        id: 'test_user',
         user_id: 'test_user',
+        name: 'test_user',
+        email: 'test_email',
       })
     })
   })
@@ -55,12 +61,16 @@ describe('<OnlineUsersWidget />', function () {
       ...defaultProps,
       onlineUsers: defaultProps.onlineUsers.concat([
         {
+          id: 'user_3',
           user_id: 'user_3',
           name: 'user_3',
+          email: 'user_3',
         },
         {
+          id: 'user_4',
           user_id: 'user_4',
           name: 'user_4',
+          email: 'user_4',
         },
       ]),
     }
@@ -96,8 +106,10 @@ describe('<OnlineUsersWidget />', function () {
       fireEvent.click(icon)
 
       expect(testProps.goToUser).to.be.calledWith({
-        name: 'user_3',
+        id: 'user_3',
         user_id: 'user_3',
+        name: 'user_3',
+        email: 'user_3',
       })
     })
   })
diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/project-name-editable-label.test.jsx b/services/web/test/frontend/features/editor-navigation-toolbar/components/project-name-editable-label.test.tsx
similarity index 100%
rename from services/web/test/frontend/features/editor-navigation-toolbar/components/project-name-editable-label.test.jsx
rename to services/web/test/frontend/features/editor-navigation-toolbar/components/project-name-editable-label.test.tsx
diff --git a/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.jsx b/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.tsx
similarity index 89%
rename from services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.jsx
rename to services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.tsx
index be7894fc73..9b2217744e 100644
--- a/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.jsx
+++ b/services/web/test/frontend/features/editor-navigation-toolbar/components/toolbar-header.test.tsx
@@ -1,11 +1,13 @@
 import { expect } from 'chai'
 import { screen } from '@testing-library/react'
 
-import ToolbarHeader from '../../../../../frontend/js/features/editor-navigation-toolbar/components/toolbar-header'
+import ToolbarHeader, {
+  type ToolbarHeaderProps,
+} from '../../../../../frontend/js/features/editor-navigation-toolbar/components/toolbar-header'
 import { renderWithEditorContext } from '../../../helpers/render-with-context'
 
 describe('<ToolbarHeader />', function () {
-  const defaultProps = {
+  const defaultProps: ToolbarHeaderProps = {
     onShowLeftMenuClick: () => {},
     toggleChatOpen: () => {},
     toggleReviewPanelOpen: () => {},
@@ -19,11 +21,12 @@ describe('<ToolbarHeader />', function () {
     hasPublishPermissions: true,
     chatVisible: true,
     trackChangesVisible: true,
-    handleChangeLayout: () => {},
-    pdfLayout: 'sideBySide',
-    view: 'editor',
-    reattach: () => {},
-    detach: () => {},
+    cobranding: undefined,
+    isRestrictedTokenMember: false,
+    hasRenamePermissions: true,
+    historyIsOpen: false,
+    chatIsOpen: false,
+    reviewPanelOpen: false,
   }
 
   beforeEach(function () {
@@ -40,6 +43,8 @@ describe('<ToolbarHeader />', function () {
       const props = {
         ...defaultProps,
         cobranding: {
+          brandId: 12,
+          brandVariationId: 12,
           brandVariationHomeUrl: 'http://cobranding',
           brandVariationName: 'variation',
           logoImgUrl: 'http://cobranding/logo',
diff --git a/services/web/test/frontend/features/file-tree/components/file-tree-root.spec.tsx b/services/web/test/frontend/features/file-tree/components/file-tree-root.spec.tsx
index 6e56b1b6bb..0739f5a3d5 100644
--- a/services/web/test/frontend/features/file-tree/components/file-tree-root.spec.tsx
+++ b/services/web/test/frontend/features/file-tree/components/file-tree-root.spec.tsx
@@ -1,6 +1,7 @@
 import FileTreeRoot from '../../../../../frontend/js/features/file-tree/components/file-tree-root'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
+import type { Socket } from '@/features/ide-react/connection/types/socket'
 
 describe('<FileTreeRoot/>', function () {
   beforeEach(function () {
@@ -245,9 +246,9 @@ describe('<FileTreeRoot/>', function () {
   })
 
   describe('when deselecting files', function () {
-    let socket: SocketIOMock
+    let socket: SocketIOMock & Socket
     beforeEach(function () {
-      socket = new SocketIOMock()
+      socket = new SocketIOMock() as any
       const rootFolder = [
         {
           _id: 'root-folder-id',
diff --git a/services/web/test/frontend/features/file-tree/flows/create-folder.spec.tsx b/services/web/test/frontend/features/file-tree/flows/create-folder.spec.tsx
index a7ccca400b..553757a1f1 100644
--- a/services/web/test/frontend/features/file-tree/flows/create-folder.spec.tsx
+++ b/services/web/test/frontend/features/file-tree/flows/create-folder.spec.tsx
@@ -1,11 +1,12 @@
 import FileTreeRoot from '../../../../../frontend/js/features/file-tree/components/file-tree-root'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
+import type { Socket } from '@/features/ide-react/connection/types/socket'
 
 describe('FileTree Create Folder Flow', function () {
-  let socket: SocketIOMock
+  let socket: SocketIOMock & Socket
   beforeEach(function () {
-    socket = new SocketIOMock()
+    socket = new SocketIOMock() as any
     cy.window().then(win => {
       win.metaAttributesCache.set('ol-user', { id: 'user1' })
     })
diff --git a/services/web/test/frontend/features/file-tree/flows/delete-entity.spec.tsx b/services/web/test/frontend/features/file-tree/flows/delete-entity.spec.tsx
index af85aa2f46..22de945454 100644
--- a/services/web/test/frontend/features/file-tree/flows/delete-entity.spec.tsx
+++ b/services/web/test/frontend/features/file-tree/flows/delete-entity.spec.tsx
@@ -1,6 +1,7 @@
 import FileTreeRoot from '../../../../../frontend/js/features/file-tree/components/file-tree-root'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
+import type { Socket } from '@/features/ide-react/connection/types/socket'
 
 describe('FileTree Delete Entity Flow', function () {
   beforeEach(function () {
@@ -10,9 +11,9 @@ describe('FileTree Delete Entity Flow', function () {
   })
 
   describe('single entity', function () {
-    let socket: SocketIOMock
+    let socket: SocketIOMock & Socket
     beforeEach(function () {
-      socket = new SocketIOMock()
+      socket = new SocketIOMock() as any
       const rootFolder = [
         {
           _id: 'root-folder-id',
@@ -136,9 +137,9 @@ describe('FileTree Delete Entity Flow', function () {
   })
 
   describe('folders', function () {
-    let socket: SocketIOMock
+    let socket: SocketIOMock & Socket
     beforeEach(function () {
-      socket = new SocketIOMock()
+      socket = new SocketIOMock() as any
       const rootFolder = [
         {
           _id: 'root-folder-id',
@@ -207,9 +208,9 @@ describe('FileTree Delete Entity Flow', function () {
   })
 
   describe('multiple entities', function () {
-    let socket: SocketIOMock
+    let socket: SocketIOMock & Socket
     beforeEach(function () {
-      socket = new SocketIOMock()
+      socket = new SocketIOMock() as any
       const rootFolder = [
         {
           _id: 'root-folder-id',
diff --git a/services/web/test/frontend/features/file-tree/flows/rename-entity.spec.tsx b/services/web/test/frontend/features/file-tree/flows/rename-entity.spec.tsx
index afa849c265..dbff951dfc 100644
--- a/services/web/test/frontend/features/file-tree/flows/rename-entity.spec.tsx
+++ b/services/web/test/frontend/features/file-tree/flows/rename-entity.spec.tsx
@@ -1,6 +1,7 @@
 import FileTreeRoot from '../../../../../frontend/js/features/file-tree/components/file-tree-root'
 import { EditorProviders } from '../../../helpers/editor-providers'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
+import type { Socket } from '@/features/ide-react/connection/types/socket'
 
 describe('FileTree Rename Entity Flow', function () {
   beforeEach(function () {
@@ -9,9 +10,9 @@ describe('FileTree Rename Entity Flow', function () {
     })
   })
 
-  let socket: SocketIOMock
+  let socket: SocketIOMock & Socket
   beforeEach(function () {
-    socket = new SocketIOMock()
+    socket = new SocketIOMock() as any
     const rootFolder = [
       {
         _id: 'root-folder-id',
diff --git a/services/web/test/frontend/helpers/editor-providers.jsx b/services/web/test/frontend/helpers/editor-providers.tsx
similarity index 79%
rename from services/web/test/frontend/helpers/editor-providers.jsx
rename to services/web/test/frontend/helpers/editor-providers.tsx
index 5a0088120a..bad92019a2 100644
--- a/services/web/test/frontend/helpers/editor-providers.jsx
+++ b/services/web/test/frontend/helpers/editor-providers.tsx
@@ -3,7 +3,14 @@
 import { merge } from 'lodash'
 import { SocketIOMock } from '@/ide/connection/SocketIoShim'
 import { IdeContext } from '@/shared/context/ide-context'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import React, {
+  useCallback,
+  useEffect,
+  useState,
+  useMemo,
+  type FC,
+  type PropsWithChildren,
+} from 'react'
 import {
   createReactScopeValueStore,
   IdeReactContext,
@@ -12,12 +19,25 @@ import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
 import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/react-scope-value-store'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
 import { ConnectionContext } from '@/features/ide-react/context/connection-context'
-import { EditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import {
+  EditorOpenDocContext,
+  type EditorOpenDocContextState,
+} from '@/features/ide-react/context/editor-open-doc-context'
 import { ReactContextRoot } from '@/features/ide-react/context/react-context-root'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import useDetachLayout from '@/shared/hooks/use-detach-layout'
-import { LayoutContext } from '@/shared/context/layout-context'
 import useExposedState from '@/shared/hooks/use-exposed-state'
+import {
+  type IdeLayout,
+  type IdeView,
+  LayoutContext,
+  type LayoutContextValue,
+} from '@/shared/context/layout-context'
+import type { Socket } from '@/features/ide-react/connection/types/socket'
+import type { PermissionsLevel } from '@/features/ide-react/types/permissions'
+import type { Folder } from '../../../types/folder'
+import type { SocketDebuggingInfo } from '@/features/ide-react/connection/types/connection-state'
+import type { DocumentContainer } from '@/features/ide-react/editor/document-container'
 
 // these constants can be imported in tests instead of
 // using magic strings
@@ -41,10 +61,26 @@ const defaultUserSettings = {
   mathPreview: true,
 }
 
-/**
- * @typedef {import('@/shared/context/layout-context').LayoutContextValue} LayoutContextValue
- * @type Partial<LayoutContextValue>
- */
+export type EditorProvidersProps = {
+  user?: { id: string; email: string }
+  projectId?: string
+  projectOwner?: { _id: string; email: string }
+  rootDocId?: string
+  imageName?: string
+  compiler?: string
+  socket?: Socket
+  isRestrictedTokenMember?: boolean
+  scope?: Record<string, any>
+  features?: Record<string, boolean>
+  projectFeatures?: Record<string, boolean>
+  permissionsLevel?: PermissionsLevel
+  children?: React.ReactNode
+  rootFolder?: Folder[]
+  layoutContext?: Partial<LayoutContextValue>
+  userSettings?: Record<string, any>
+  providers?: Record<string, React.FC<React.PropsWithChildren<any>>>
+}
+
 const layoutContextDefault = {
   view: 'editor',
   openFile: null,
@@ -55,7 +91,7 @@ const layoutContextDefault = {
   projectSearchIsOpen: false,
   pdfLayout: 'sideBySide',
   loadingStyleSheet: false,
-}
+} satisfies Partial<LayoutContextValue>
 
 export function EditorProviders({
   user = { id: USER_ID, email: USER_EMAIL },
@@ -67,7 +103,7 @@ export function EditorProviders({
   rootDocId = '_root_doc_id',
   imageName = 'texlive-full:2024.1',
   compiler = 'pdflatex',
-  socket = new SocketIOMock(),
+  socket = new SocketIOMock() as any as Socket,
   isRestrictedTokenMember = false,
   scope: defaultScope = {},
   features = {
@@ -94,7 +130,7 @@ export function EditorProviders({
   layoutContext = layoutContextDefault,
   userSettings = {},
   providers = {},
-}) {
+}: EditorProvidersProps) {
   window.metaAttributesCache.set(
     'ol-gitBridgePublicBaseUrl',
     'https://git.overleaf.test'
@@ -121,7 +157,7 @@ export function EditorProviders({
           on: () => {},
           off: () => {},
           leaveAndCleanUpPromise: async () => {},
-        },
+        } as any as DocumentContainer,
         openDocName: null,
         currentDocumentId: null,
       },
@@ -150,7 +186,7 @@ export function EditorProviders({
         ConnectionProvider: makeConnectionProvider(socket),
         IdeReactProvider: makeIdeReactProvider(scope, socket),
         EditorOpenDocProvider: makeEditorOpenDocProvider({
-          openDocId: scope.editor.currentDocumentId,
+          currentDocumentId: scope.editor.currentDocumentId,
           openDocName: scope.editor.openDocName,
           currentDocument: scope.editor.sharejs_doc,
         }),
@@ -163,8 +199,8 @@ export function EditorProviders({
   )
 }
 
-const makeConnectionProvider = socket => {
-  const ConnectionProvider = ({ children }) => {
+const makeConnectionProvider = (socket: Socket) => {
+  const ConnectionProvider: FC<PropsWithChildren> = ({ children }) => {
     const [value] = useState(() => ({
       socket,
       connectionState: {
@@ -174,7 +210,7 @@ const makeConnectionProvider = socket => {
         reconnectAt: null,
         forcedDisconnectDelay: 0,
         lastConnectionAttempt: 0,
-        error: '',
+        error: '' as const,
       },
       isConnected: true,
       isStillReconnecting: false,
@@ -182,6 +218,8 @@ const makeConnectionProvider = socket => {
       tryReconnectNow: () => {},
       registerUserActivity: () => {},
       disconnect: () => {},
+      closeConnection: () => {},
+      getSocketDebuggingInfo: () => ({}) as SocketDebuggingInfo,
     }))
 
     return (
@@ -193,8 +231,11 @@ const makeConnectionProvider = socket => {
   return ConnectionProvider
 }
 
-const makeIdeReactProvider = (scope, socket) => {
-  const IdeReactProvider = ({ children }) => {
+const makeIdeReactProvider = (
+  scope: Record<string, unknown>,
+  socket: Socket
+) => {
+  const IdeReactProvider: FC<PropsWithChildren> = ({ children }) => {
     const [startedFreeTrial, setStartedFreeTrial] = useState(false)
 
     const [ideReactContextValue] = useState(() => ({
@@ -204,7 +245,9 @@ const makeIdeReactProvider = (scope, socket) => {
       setStartedFreeTrial,
       reportError: () => {},
       projectJoined: true,
-      permissionsLevel: scope.permissionsLevel,
+      permissionsLevel: scope.permissionsLevel as PermissionsLevel,
+      setPermissionsLevel: () => {},
+      setOutOfSync: () => {},
     }))
 
     const [ideContextValue] = useState(() => {
@@ -247,13 +290,15 @@ const makeIdeReactProvider = (scope, socket) => {
   return IdeReactProvider
 }
 
-export function makeEditorOpenDocProvider(initialValues) {
+export function makeEditorOpenDocProvider(
+  initialValues: EditorOpenDocContextState
+) {
   const {
     currentDocumentId: initialCurrentDocumentId,
     openDocName: initialOpenDocName,
     currentDocument: initialCurrentDocument,
   } = initialValues
-  const EditorOpenDocProvider = ({ children }) => {
+  const EditorOpenDocProvider: FC<PropsWithChildren> = ({ children }) => {
     const [currentDocumentId, setCurrentDocumentId] = useExposedState(
       initialCurrentDocumentId,
       'editor.open_doc_id'
@@ -285,13 +330,15 @@ export function makeEditorOpenDocProvider(initialValues) {
   return EditorOpenDocProvider
 }
 
-const makeLayoutProvider = layoutContextOverrides => {
+const makeLayoutProvider = (
+  layoutContextOverrides?: Partial<LayoutContextValue>
+) => {
   const layout = {
     ...layoutContextDefault,
     ...layoutContextOverrides,
   }
-  const LayoutProvider = ({ children }) => {
-    const [view, setView] = useState(layout.view)
+  const LayoutProvider: FC<PropsWithChildren> = ({ children }) => {
+    const [view, setView] = useState<IdeView | null>(layout.view)
     const [openFile, setOpenFile] = useState(layout.openFile)
     const [chatIsOpen, setChatIsOpen] = useState(layout.chatIsOpen)
     const [reviewPanelOpen, setReviewPanelOpen] = useState(
@@ -316,7 +363,7 @@ const makeLayoutProvider = layoutContextOverrides => {
       }, [setReviewPanelOpen])
     )
     const changeLayout = useCallback(
-      (newLayout, newView = 'editor') => {
+      (newLayout: IdeLayout, newView: IdeView = 'editor') => {
         setPdfLayout(newLayout)
         setView(newLayout === 'sideBySide' ? 'editor' : newView)
       },
diff --git a/services/web/test/frontend/helpers/render-with-context.jsx b/services/web/test/frontend/helpers/render-with-context.jsx
deleted file mode 100644
index 31ee64d5be..0000000000
--- a/services/web/test/frontend/helpers/render-with-context.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// Disable prop type checks for test harnesses
-/* eslint-disable react/prop-types */
-
-import { render } from '@testing-library/react'
-import { EditorProviders } from './editor-providers'
-
-export function renderWithEditorContext(
-  component,
-  contextProps,
-  renderOptions = {}
-) {
-  const EditorProvidersWrapper = ({ children }) => (
-    <EditorProviders {...contextProps}>{children}</EditorProviders>
-  )
-
-  return render(component, {
-    wrapper: EditorProvidersWrapper,
-    ...renderOptions,
-  })
-}
diff --git a/services/web/test/frontend/helpers/render-with-context.tsx b/services/web/test/frontend/helpers/render-with-context.tsx
new file mode 100644
index 0000000000..cf7aa0b575
--- /dev/null
+++ b/services/web/test/frontend/helpers/render-with-context.tsx
@@ -0,0 +1,20 @@
+import React from 'react'
+import { render, type RenderOptions } from '@testing-library/react'
+import { EditorProviders, type EditorProvidersProps } from './editor-providers'
+
+export function renderWithEditorContext(
+  component: React.ReactElement,
+  contextProps: EditorProvidersProps = {},
+  renderOptions: RenderOptions = {}
+) {
+  const EditorProvidersWrapper = ({
+    children,
+  }: {
+    children: React.ReactNode
+  }) => <EditorProviders {...contextProps}>{children}</EditorProviders>
+
+  return render(component, {
+    wrapper: EditorProvidersWrapper,
+    ...renderOptions,
+  })
+}

From 0c462d45d1e857d479ac652746704676c6f44fc3 Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Fri, 4 Jul 2025 12:26:38 +0100
Subject: [PATCH 108/274] Merge pull request #26815 from
 overleaf/bg-sp-hotfix-5-5-2

[CE/SP] Hotfix 5.5.2

GitOrigin-RevId: bcd409968ef0321dd1d8050553e7c9a02d3efdc4
---
 server-ce/hotfix/5.5.2/Dockerfile     |  22 +++
 server-ce/hotfix/5.5.2/pr_25944.patch | 219 ++++++++++++++++++++++++++
 server-ce/hotfix/5.5.2/pr_26637.patch |  86 ++++++++++
 server-ce/hotfix/5.5.2/pr_26697.patch | 172 ++++++++++++++++++++
 server-ce/hotfix/5.5.2/pr_26783.patch |  58 +++++++
 5 files changed, 557 insertions(+)
 create mode 100644 server-ce/hotfix/5.5.2/Dockerfile
 create mode 100644 server-ce/hotfix/5.5.2/pr_25944.patch
 create mode 100644 server-ce/hotfix/5.5.2/pr_26637.patch
 create mode 100644 server-ce/hotfix/5.5.2/pr_26697.patch
 create mode 100644 server-ce/hotfix/5.5.2/pr_26783.patch

diff --git a/server-ce/hotfix/5.5.2/Dockerfile b/server-ce/hotfix/5.5.2/Dockerfile
new file mode 100644
index 0000000000..db9d8f27ee
--- /dev/null
+++ b/server-ce/hotfix/5.5.2/Dockerfile
@@ -0,0 +1,22 @@
+FROM sharelatex/sharelatex:5.5.1
+
+# https://github.com/overleaf/internal/pull/25944
+# Removed changes to services/web/frontend/js/features/ide-redesign/components/rail.tsx due to incompatibility with 5.5.1
+COPY pr_25944.patch .
+RUN patch -p1 < pr_25944.patch && rm pr_25944.patch
+
+# https://github.com/overleaf/internal/pull/26637
+# Removed changes to server-ce/test/create-and-compile-project.spec.ts and server-ce/test/helpers/compile.ts due to incompatibility with 5.5.1
+COPY pr_26637.patch .
+RUN patch -p1 < pr_26637.patch && rm pr_26637.patch
+
+# https://github.com/overleaf/internal/pull/26783
+COPY pr_26783.patch .
+RUN patch -p1 < pr_26783.patch && rm pr_26783.patch
+
+# https://github.com/overleaf/internal/pull/26697
+COPY pr_26697.patch .
+RUN patch -p1 < pr_26697.patch && rm pr_26697.patch
+
+# Recompile frontend assets
+RUN node genScript compile | bash
diff --git a/server-ce/hotfix/5.5.2/pr_25944.patch b/server-ce/hotfix/5.5.2/pr_25944.patch
new file mode 100644
index 0000000000..e3b9f54246
--- /dev/null
+++ b/server-ce/hotfix/5.5.2/pr_25944.patch
@@ -0,0 +1,219 @@
+diff --git a/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx b/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx
+index 20e157dfee9..ad943772d0d 100644
+--- a/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx
++++ b/services/web/frontend/js/features/review-panel-new/context/review-panel-providers.tsx
+@@ -4,10 +4,16 @@ import { ChangesUsersProvider } from './changes-users-context'
+ import { TrackChangesStateProvider } from './track-changes-state-context'
+ import { ThreadsProvider } from './threads-context'
+ import { ReviewPanelViewProvider } from './review-panel-view-context'
++import { useProjectContext } from '@/shared/context/project-context'
+ 
+ export const ReviewPanelProviders: FC<React.PropsWithChildren> = ({
+   children,
+ }) => {
++  const { features } = useProjectContext()
++  if (!features.trackChangesVisible) {
++    return children
++  }
++
+   return (
+     <ReviewPanelViewProvider>
+       <ChangesUsersProvider>
+diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
+index 8606fb11fad..e80fb037116 100644
+--- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
++++ b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
+@@ -176,24 +176,34 @@ export default function AddCollaborators({ readOnly }: { readOnly?: boolean }) {
+   ])
+ 
+   const privilegeOptions = useMemo(() => {
+-    return [
++    const options: {
++      key: string
++      label: string
++      description?: string | null
++    }[] = [
+       {
+         key: 'readAndWrite',
+         label: t('editor'),
+       },
+-      {
++    ]
++
++    if (features.trackChangesVisible) {
++      options.push({
+         key: 'review',
+         label: t('reviewer'),
+         description: !features.trackChanges
+           ? t('comment_only_upgrade_for_track_changes')
+           : null,
+-      },
+-      {
+-        key: 'readOnly',
+-        label: t('viewer'),
+-      },
+-    ]
+-  }, [features.trackChanges, t])
++      })
++    }
++
++    options.push({
++      key: 'readOnly',
++      label: t('viewer'),
++    })
++
++    return options
++  }, [features.trackChanges, features.trackChangesVisible, t])
+ 
+   return (
+     <OLForm className="add-collabs">
+diff --git a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
+index 6d806968b12..9f24cddc4ad 100644
+--- a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
++++ b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
+@@ -244,14 +244,22 @@ function SelectPrivilege({
+   const { features } = useProjectContext()
+ 
+   const privileges = useMemo(
+-    (): Privilege[] => [
+-      { key: 'owner', label: t('make_owner') },
+-      { key: 'readAndWrite', label: t('editor') },
+-      { key: 'review', label: t('reviewer') },
+-      { key: 'readOnly', label: t('viewer') },
+-      { key: 'removeAccess', label: t('remove_access') },
+-    ],
+-    [t]
++    (): Privilege[] =>
++      features.trackChangesVisible
++        ? [
++            { key: 'owner', label: t('make_owner') },
++            { key: 'readAndWrite', label: t('editor') },
++            { key: 'review', label: t('reviewer') },
++            { key: 'readOnly', label: t('viewer') },
++            { key: 'removeAccess', label: t('remove_access') },
++          ]
++        : [
++            { key: 'owner', label: t('make_owner') },
++            { key: 'readAndWrite', label: t('editor') },
++            { key: 'readOnly', label: t('viewer') },
++            { key: 'removeAccess', label: t('remove_access') },
++          ],
++    [features.trackChangesVisible, t]
+   )
+ 
+   const downgradedPseudoPrivilege: Privilege = {
+diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
+index c1808cbb301..4bdfe2682c8 100644
+--- a/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
++++ b/services/web/frontend/js/features/source-editor/components/codemirror-editor.tsx
+@@ -18,6 +18,7 @@ import {
+ } from './codemirror-context'
+ import MathPreviewTooltip from './math-preview-tooltip'
+ import { useToolbarMenuBarEditorCommands } from '@/features/ide-redesign/hooks/use-toolbar-menu-editor-commands'
++import { useProjectContext } from '@/shared/context/project-context'
+ 
+ // TODO: remove this when definitely no longer used
+ export * from './codemirror-context'
+@@ -67,6 +68,7 @@ function CodeMirrorEditor() {
+ 
+ function CodeMirrorEditorComponents() {
+   useToolbarMenuBarEditorCommands()
++  const { features } = useProjectContext()
+ 
+   return (
+     <ReviewPanelProviders>
+@@ -83,8 +85,8 @@ function CodeMirrorEditorComponents() {
+       <CodeMirrorCommandTooltip />
+ 
+       <MathPreviewTooltip />
+-      <ReviewTooltipMenu />
+-      <ReviewPanelNew />
++      {features.trackChangesVisible && <ReviewTooltipMenu />}
++      {features.trackChangesVisible && <ReviewPanelNew />}
+ 
+       {sourceEditorComponents.map(
+         ({ import: { default: Component }, path }) => (
+diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
+index e70663683fc..c5d9f3d3e47 100644
+--- a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
++++ b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
+@@ -14,6 +14,7 @@ import { LegacyTableDropdown } from './table-inserter-dropdown-legacy'
+ import { withinFormattingCommand } from '@/features/source-editor/utils/tree-operations/formatting'
+ import { isSplitTestEnabled } from '@/utils/splitTestUtils'
+ import { isMac } from '@/shared/utils/os'
++import { useProjectContext } from '@/shared/context/project-context'
+ 
+ export const ToolbarItems: FC<{
+   state: EditorState
+@@ -31,6 +32,7 @@ export const ToolbarItems: FC<{
+   const { t } = useTranslation()
+   const { toggleSymbolPalette, showSymbolPalette, writefullInstance } =
+     useEditorContext()
++  const { features } = useProjectContext()
+   const isActive = withinFormattingCommand(state)
+ 
+   const symbolPaletteAvailable = getMeta('ol-symbolPaletteAvailable')
+@@ -127,13 +129,15 @@ export const ToolbarItems: FC<{
+                 command={commands.wrapInHref}
+                 icon="add_link"
+               />
+-              <ToolbarButton
+-                id="toolbar-add-comment"
+-                label={t('add_comment')}
+-                disabled={state.selection.main.empty}
+-                command={commands.addComment}
+-                icon="add_comment"
+-              />
++              {features.trackChangesVisible && (
++                <ToolbarButton
++                  id="toolbar-add-comment"
++                  label={t('add_comment')}
++                  disabled={state.selection.main.empty}
++                  command={commands.addComment}
++                  icon="add_comment"
++                />
++              )}
+               <ToolbarButton
+                 id="toolbar-ref"
+                 label={t('toolbar_insert_cross_reference')}
+diff --git a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
+index d6677878108..58ac3e443da 100644
+--- a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
++++ b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
+@@ -181,6 +181,7 @@ describe('<ReviewPanel />', function () {
+           removeChangeIds,
+         },
+       },
++      projectFeatures: { trackChangesVisible: true },
+     })
+ 
+     cy.wrap(scope).as('scope')
+@@ -626,7 +627,7 @@ describe('<ReviewPanel /> for free users', function () {
+   function mountEditor(ownerId = USER_ID) {
+     const scope = mockScope(undefined, {
+       permissions: { write: true, trackedWrite: false, comment: true },
+-      projectFeatures: { trackChanges: false },
++      projectFeatures: { trackChanges: false, trackChangesVisible: true },
+       projectOwner: {
+         _id: ownerId,
+       },
+diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
+index b86207fb0f7..dfce8134d1c 100644
+--- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
++++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
+@@ -694,6 +694,7 @@ describe('<ShareProjectModal/>', function () {
+           features: {
+             collaborators: 0,
+             compileGroup: 'standard',
++            trackChangesVisible: true,
+           },
+         },
+       },
+@@ -723,6 +724,7 @@ describe('<ShareProjectModal/>', function () {
+           ...project,
+           features: {
+             collaborators: 1,
++            trackChangesVisible: true,
+           },
+           members: [
+             {
diff --git a/server-ce/hotfix/5.5.2/pr_26637.patch b/server-ce/hotfix/5.5.2/pr_26637.patch
new file mode 100644
index 0000000000..f2183723bf
--- /dev/null
+++ b/server-ce/hotfix/5.5.2/pr_26637.patch
@@ -0,0 +1,86 @@
+diff --git a/services/clsi/app/js/LocalCommandRunner.js b/services/clsi/app/js/LocalCommandRunner.js
+index ce274733585..aa62825443c 100644
+--- a/services/clsi/app/js/LocalCommandRunner.js
++++ b/services/clsi/app/js/LocalCommandRunner.js
+@@ -54,6 +54,7 @@ module.exports = CommandRunner = {
+       cwd: directory,
+       env,
+       stdio: ['pipe', 'pipe', 'ignore'],
++      detached: true,
+     })
+ 
+     let stdout = ''
+diff --git a/services/clsi/test/acceptance/js/StopCompile.js b/services/clsi/test/acceptance/js/StopCompile.js
+new file mode 100644
+index 00000000000..103a70f37d7
+--- /dev/null
++++ b/services/clsi/test/acceptance/js/StopCompile.js
+@@ -0,0 +1,47 @@
++const Client = require('./helpers/Client')
++const ClsiApp = require('./helpers/ClsiApp')
++const { expect } = require('chai')
++
++describe('Stop compile', function () {
++  before(function (done) {
++    this.request = {
++      options: {
++        timeout: 100,
++      }, // seconds
++      resources: [
++        {
++          path: 'main.tex',
++          content: `\
++\\documentclass{article}
++\\begin{document}
++\\def\\x{Hello!\\par\\x}
++\\x
++\\end{document}\
++`,
++        },
++      ],
++    }
++    this.project_id = Client.randomId()
++    ClsiApp.ensureRunning(() => {
++      // start the compile in the background
++      Client.compile(this.project_id, this.request, (error, res, body) => {
++        this.compileResult = { error, res, body }
++      })
++      // wait for 1 second before stopping the compile
++      setTimeout(() => {
++        Client.stopCompile(this.project_id, (error, res, body) => {
++          this.stopResult = { error, res, body }
++          setTimeout(done, 1000) // allow time for the compile request to terminate
++        })
++      }, 1000)
++    })
++  })
++
++  it('should force a compile response with an error status', function () {
++    expect(this.stopResult.error).to.be.null
++    expect(this.stopResult.res.statusCode).to.equal(204)
++    expect(this.compileResult.res.statusCode).to.equal(200)
++    expect(this.compileResult.body.compile.status).to.equal('terminated')
++    expect(this.compileResult.body.compile.error).to.equal('terminated')
++  })
++})
+diff --git a/services/clsi/test/acceptance/js/helpers/Client.js b/services/clsi/test/acceptance/js/helpers/Client.js
+index a0bdce734f3..49bf7390c6f 100644
+--- a/services/clsi/test/acceptance/js/helpers/Client.js
++++ b/services/clsi/test/acceptance/js/helpers/Client.js
+@@ -42,6 +42,16 @@ module.exports = Client = {
+     )
+   },
+ 
++  stopCompile(projectId, callback) {
++    if (callback == null) {
++      callback = function () {}
++    }
++    return request.post(
++      { url: `${this.host}/project/${projectId}/compile/stop` },
++      callback
++    )
++  },
++
+   clearCache(projectId, callback) {
+     if (callback == null) {
+       callback = function () {}
diff --git a/server-ce/hotfix/5.5.2/pr_26697.patch b/server-ce/hotfix/5.5.2/pr_26697.patch
new file mode 100644
index 0000000000..a6dd006d0a
--- /dev/null
+++ b/server-ce/hotfix/5.5.2/pr_26697.patch
@@ -0,0 +1,172 @@
+diff --git a/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx b/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
+index 8f3b3a8e5d0..f8c8014e1c0 100644
+--- a/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
++++ b/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
+@@ -55,7 +55,11 @@ export function ProjectListDsNav() {
+
+   return (
+     <div className="project-ds-nav-page website-redesign">
+-      <DefaultNavbar {...navbarProps} customLogo={overleafLogo} showCloseIcon />
++      <DefaultNavbar
++        {...navbarProps}
++        overleafLogo={overleafLogo}
++        showCloseIcon
++      />
+       <main className="project-list-wrapper">
+         <SidebarDsNav />
+         <div className="project-ds-nav-content-and-messages">
+diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx
+index 2480b7f061f..8e5429dbde6 100644
+--- a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx
++++ b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/default-navbar.tsx
+@@ -1,4 +1,4 @@
+-import { useState } from 'react'
++import React, { useState } from 'react'
+ import { sendMB } from '@/infrastructure/event-tracking'
+ import { useTranslation } from 'react-i18next'
+ import { Button, Container, Nav, Navbar } from 'react-bootstrap'
+@@ -13,9 +13,15 @@ import MaterialIcon from '@/shared/components/material-icon'
+ import { useContactUsModal } from '@/shared/hooks/use-contact-us-modal'
+ import { UserProvider } from '@/shared/context/user-context'
+ import { X } from '@phosphor-icons/react'
++import overleafWhiteLogo from '@/shared/svgs/overleaf-white.svg'
++import overleafBlackLogo from '@/shared/svgs/overleaf-black.svg'
++import type { CSSPropertiesWithVariables } from '../../../../../../../types/css-properties-with-variables'
+
+-function DefaultNavbar(props: DefaultNavbarMetadata) {
++function DefaultNavbar(
++  props: DefaultNavbarMetadata & { overleafLogo?: string }
++) {
+   const {
++    overleafLogo,
+     customLogo,
+     title,
+     canDisplayAdminMenu,
+@@ -49,10 +55,20 @@ function DefaultNavbar(props: DefaultNavbarMetadata) {
+         className="navbar-default navbar-main"
+         expand="lg"
+         onToggle={expanded => setExpanded(expanded)}
++        style={
++          {
++            '--navbar-brand-image-default-url': `url("${overleafWhiteLogo}")`,
++            '--navbar-brand-image-redesign-url': `url("${overleafBlackLogo}")`,
++          } as CSSPropertiesWithVariables
++        }
+       >
+         <Container className="navbar-container" fluid>
+           <div className="navbar-header">
+-            <HeaderLogoOrTitle title={title} customLogo={customLogo} />
++            <HeaderLogoOrTitle
++              title={title}
++              overleafLogo={overleafLogo}
++              customLogo={customLogo}
++            />
+             {enableUpgradeButton ? (
+               <Button
+                 as="a"
+diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx
+index 44500f1b826..3eefc8e2d1c 100644
+--- a/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx
++++ b/services/web/frontend/js/features/ui/components/bootstrap-5/navbar/header-logo-or-title.tsx
+@@ -2,11 +2,13 @@ import type { DefaultNavbarMetadata } from '@/features/ui/components/types/defau
+ import getMeta from '@/utils/meta'
+
+ export default function HeaderLogoOrTitle({
++  overleafLogo,
+   customLogo,
+   title,
+-}: Pick<DefaultNavbarMetadata, 'customLogo' | 'title'>) {
++}: Pick<DefaultNavbarMetadata, 'customLogo' | 'title'> & {
++  overleafLogo?: string
++}) {
+   const { appName } = getMeta('ol-ExposedSettings')
+-
+   if (customLogo) {
+     return (
+       // eslint-disable-next-line jsx-a11y/anchor-has-content
+@@ -24,9 +26,16 @@ export default function HeaderLogoOrTitle({
+       </a>
+     )
+   } else {
++    const style = overleafLogo
++      ? {
++          style: {
++            backgroundImage: `url("${overleafLogo}")`,
++          },
++        }
++      : null
+     return (
+       // eslint-disable-next-line jsx-a11y/anchor-has-content
+-      <a href="/" aria-label={appName} className="navbar-brand" />
++      <a href="/" aria-label={appName} className="navbar-brand" {...style} />
+     )
+   }
+ }
+diff --git a/services/web/frontend/js/shared/svgs/overleaf-black.svg b/services/web/frontend/js/shared/svgs/overleaf-black.svg
+new file mode 100644
+index 00000000000..ea0678438ba
+--- /dev/null
++++ b/services/web/frontend/js/shared/svgs/overleaf-black.svg
+@@ -0,0 +1,9 @@
++<svg width="129" height="38" viewBox="0 0 129 38" fill="none" xmlns="http://www.w3.org/2000/svg">
++<mask id="mask0_2579_355" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="72" height="38">
++<path d="M71.7643 37.6327H0.0244141V0.0717773H71.7643V37.6327Z" fill="white"/>
++</mask>
++<g mask="url(#mask0_2579_355)">
++<path d="M47.2509 26.4555C47.3948 27.7507 47.8985 28.7821 48.81 29.5257C49.6974 30.2692 50.8487 30.653 52.2638 30.653C53.1993 30.653 54.0387 30.4611 54.7823 30.0773C55.5258 29.6696 56.1255 29.1419 56.5572 28.4223H61.0664C60.2989 30.3891 59.1716 31.9002 57.6365 33.0035C56.1255 34.0829 54.3506 34.6345 52.3598 34.6345C51.0166 34.6345 49.7934 34.3947 48.666 33.915C47.5387 33.4352 46.5314 32.7397 45.6199 31.8043C44.7804 30.9168 44.1089 29.9094 43.6531 28.7341C43.1974 27.5589 42.9576 26.3836 42.9576 25.1603C42.9576 23.9131 43.1734 22.7138 43.6052 21.6105C44.0369 20.5072 44.6605 19.4998 45.5 18.6124C46.4114 17.629 47.4668 16.8854 48.6181 16.3817C49.7694 15.8541 50.9686 15.5902 52.1919 15.5902C53.7509 15.5902 55.214 15.95 56.5572 16.6456C57.9004 17.3651 59.0517 18.3485 60.0111 19.6437C60.5867 20.4113 61.0185 21.2747 61.3063 22.2581C61.5941 23.2175 61.714 24.3209 61.714 25.5681C61.714 25.664 61.714 25.8079 61.69 26.0238C61.69 26.2397 61.6661 26.3836 61.6661 26.4795H47.2509V26.4555ZM57.2048 23.1216C56.845 21.9223 56.2454 21.0109 55.4059 20.3873C54.5664 19.7637 53.4871 19.4519 52.2159 19.4519C51.0886 19.4519 50.1052 19.7876 49.2177 20.4592C48.3303 21.1308 47.7306 22.0183 47.4188 23.1216H57.2048ZM71.7638 19.7637C70.1328 19.8836 69.0055 20.3153 68.3579 21.0349C67.7103 21.7544 67.3985 23.0496 67.3985 24.9205V34.1068H63.2011V16.1179H67.1347V18.2046C67.7583 17.3891 68.4539 16.8135 69.2214 16.4297C69.9649 16.0459 70.8284 15.8541 71.7638 15.8541V19.7637ZM32.428 1.24705C27.3432 -0.743722 8.9465 -1.46328 8.92251 9.52196C3.54982 12.9519 0 18.5404 0 24.5367C0 31.7803 5.87638 37.6567 13.1199 37.6567C20.3635 37.6567 26.2399 31.7803 26.2399 24.5367C26.2399 18.9482 22.738 14.1511 17.797 12.2803C16.8376 11.9205 14.7749 11.2729 13.1439 11.4168C10.7934 12.9039 7.91513 15.974 6.57196 19.0441C8.58672 16.6216 11.7288 15.5662 14.5351 16.022C18.6365 16.6936 21.7786 20.2434 21.7786 24.5607C21.7786 29.3338 17.917 33.1954 13.1439 33.1954C10.5055 33.1954 8.15498 32.0201 6.57196 30.1733C4.19742 27.415 3.59779 24.4408 4.07749 21.5386C5.73247 11.3688 17.797 5.58838 26.7675 3.35775C23.8413 4.9168 18.5646 7.45923 14.8708 10.2175C25.6402 14.391 27.3911 5.30056 32.428 1.24705ZM36.7934 34.1308H33.5074L26.6716 16.1179H31.1328L35.3303 28.0865L39.6476 16.1179H43.9889L36.7934 34.1308Z" fill="#1B222C"/>
++</g>
++<path d="M83.6127 26.4556C83.7567 27.7508 84.2843 28.7822 85.1718 29.5257C86.0592 30.2692 87.2105 30.653 88.6257 30.653C89.5611 30.653 90.4006 30.4611 91.1441 30.0774C91.8877 29.6696 92.4873 29.1419 92.919 28.4224H97.4282C96.6607 30.3892 95.5334 31.9002 93.9984 33.0036C92.4873 34.0829 90.7124 34.6346 88.7216 34.6346C87.3784 34.6346 86.1552 34.3947 85.0279 33.915C83.9006 33.4353 82.8932 32.7397 81.9817 31.8043C81.1423 30.9168 80.4707 29.9095 80.015 28.7342C79.5353 27.5829 79.3194 26.3836 79.3194 25.1604C79.3194 23.9131 79.5353 22.7139 79.967 21.6106C80.3987 20.5072 81.0223 19.4999 81.8618 18.6124C82.7733 17.629 83.8286 16.8855 84.9799 16.3818C86.1312 15.8541 87.3305 15.5903 88.5537 15.5903C90.1128 15.5903 91.5758 15.95 92.919 16.6456C94.2622 17.3652 95.4135 18.3486 96.3729 19.6438C96.9485 20.4113 97.3803 21.2748 97.6681 22.2582C97.9559 23.2176 98.0758 24.3209 98.0758 25.5681C98.0758 25.6641 98.0758 25.808 98.0519 26.0238C98.0519 26.2397 98.0279 26.3836 98.0279 26.4796H83.6127V26.4556ZM93.5426 23.1216C93.1829 21.9224 92.5832 21.0109 91.7437 20.3873C90.9043 19.7637 89.8249 19.4519 88.5537 19.4519C87.4264 19.4519 86.443 19.7877 85.5556 20.4593C84.6681 21.1309 84.0685 22.0183 83.7567 23.1216H93.5426ZM114.698 34.1309V31.9242C114.194 32.8117 113.498 33.4833 112.587 33.915C111.675 34.3467 110.5 34.5626 109.085 34.5626C106.423 34.5626 104.192 33.6512 102.417 31.8283C100.642 30.0054 99.7308 27.7508 99.7308 25.0644C99.7308 23.7932 99.9467 22.594 100.402 21.4667C100.858 20.3393 101.482 19.332 102.321 18.4685C103.209 17.5091 104.216 16.8135 105.295 16.3578C106.375 15.9021 107.622 15.6862 108.989 15.6862C110.308 15.6862 111.436 15.9021 112.371 16.3338C113.306 16.7655 114.074 17.4371 114.65 18.3246V16.1419H118.727V34.1548H114.698V34.1309ZM104.024 24.9685C104.024 26.4796 104.528 27.7508 105.535 28.7822C106.543 29.8135 107.766 30.3172 109.229 30.3172C110.548 30.3172 111.699 29.8135 112.707 28.7822C113.714 27.7508 114.218 26.5515 114.218 25.1844C114.218 23.7213 113.714 22.474 112.707 21.4187C111.699 20.3633 110.524 19.8357 109.157 19.8357C107.742 19.8357 106.543 20.3393 105.535 21.3227C104.528 22.3301 104.024 23.5294 104.024 24.9685ZM129.904 16.1179V19.8596H126.882V34.1309H122.829V19.8596H120.694V16.1179H122.709V15.6382C122.709 13.7434 123.236 12.3283 124.268 11.3929C125.323 10.4574 126.906 10.0017 129.041 10.0017C129.113 10.0017 129.257 10.0017 129.449 10.0257C129.64 10.0257 129.784 10.0497 129.904 10.0497V13.8154H129.616C128.657 13.8154 127.985 13.9833 127.578 14.2711C127.17 14.5829 126.954 15.0866 126.954 15.8301V16.1659H129.904V16.1179ZM73.5869 34.1309H77.6884V10.2895H73.5869V34.1309Z" fill="#1B222C"/>
++</svg>
+diff --git a/services/web/frontend/js/shared/svgs/overleaf-white.svg b/services/web/frontend/js/shared/svgs/overleaf-white.svg
+new file mode 100644
+index 00000000000..2ced81aa46d
+--- /dev/null
++++ b/services/web/frontend/js/shared/svgs/overleaf-white.svg
+@@ -0,0 +1 @@
++<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 542 157" enable-background="new 0 0 542 157"><style>.st0{filter:url(#Adobe_OpacityMaskFilter);} .st1{fill:#FFFFFF;} .st2{mask:url(#mask-2);fill:#FFFFFF;}</style><g id="Page-1"><g id="Overleaf"><g id="Group-3"><defs><filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="0" y=".3" width="299.2" height="156.7"><feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/></filter></defs><mask maskUnits="userSpaceOnUse" x="0" y=".3" width="299.2" height="156.7" id="mask-2"><g class="st0"><path id="path-1" class="st1" d="M299.2 156.9H.1V.3h299.1z"/></g></mask><path id="Fill-1" class="st2" d="M197 110.3c.6 5.4 2.7 9.7 6.5 12.8 3.7 3.1 8.5 4.7 14.4 4.7 3.9 0 7.4-.8 10.5-2.4 3.1-1.7 5.6-3.9 7.4-6.9h18.8c-3.2 8.2-7.9 14.5-14.3 19.1-6.3 4.5-13.7 6.8-22 6.8-5.6 0-10.7-1-15.4-3-4.7-2-8.9-4.9-12.7-8.8-3.5-3.7-6.3-7.9-8.2-12.8s-2.9-9.8-2.9-14.9c0-5.2.9-10.2 2.7-14.8 1.8-4.6 4.4-8.8 7.9-12.5 3.8-4.1 8.2-7.2 13-9.3 4.8-2.2 9.8-3.3 14.9-3.3 6.5 0 12.6 1.5 18.2 4.4 5.6 3 10.4 7.1 14.4 12.5 2.4 3.2 4.2 6.8 5.4 10.9 1.2 4 1.7 8.6 1.7 13.8 0 .4 0 1-.1 1.9 0 .9-.1 1.5-.1 1.9H197v-.1zm41.5-13.9c-1.5-5-4-8.8-7.5-11.4-3.5-2.6-8-3.9-13.3-3.9-4.7 0-8.8 1.4-12.5 4.2-3.7 2.8-6.2 6.5-7.5 11.1h40.8zm60.7-14c-6.8.5-11.5 2.3-14.2 5.3-2.7 3-4 8.4-4 16.2v38.3h-17.5v-75h16.4v8.7c2.6-3.4 5.5-5.8 8.7-7.4 3.1-1.6 6.7-2.4 10.6-2.4v16.3zm-164-77.2C114-3.1 37.3-6.1 37.2 39.7 14.8 54 0 77.3 0 102.3 0 132.5 24.5 157 54.7 157c30.2 0 54.7-24.5 54.7-54.7 0-23.3-14.6-43.3-35.2-51.1-4-1.5-12.6-4.2-19.4-3.6-9.8 6.2-21.8 19-27.4 31.8 8.4-10.1 21.5-14.5 33.2-12.6 17.1 2.8 30.2 17.6 30.2 35.6 0 19.9-16.1 36-36 36-11 0-20.8-4.9-27.4-12.6-9.9-11.5-12.4-23.9-10.4-36 6.9-42.4 57.2-66.5 94.6-75.8C99.4 20.5 77.4 31.1 62 42.6c44.9 17.4 52.2-20.5 73.2-37.4zm18.2 137.1h-13.7l-28.5-75.1h18.6l17.5 49.9 18-49.9h18.1l-30 75.1z"/></g><path id="Fill-4" class="st1" d="M348.6 110.3c.6 5.4 2.8 9.7 6.5 12.8 3.7 3.1 8.5 4.7 14.4 4.7 3.9 0 7.4-.8 10.5-2.4 3.1-1.7 5.6-3.9 7.4-6.9h18.8c-3.2 8.2-7.9 14.5-14.3 19.1-6.3 4.5-13.7 6.8-22 6.8-5.6 0-10.7-1-15.4-3-4.7-2-8.9-4.9-12.7-8.8-3.5-3.7-6.3-7.9-8.2-12.8-2-4.8-2.9-9.8-2.9-14.9 0-5.2.9-10.2 2.7-14.8 1.8-4.6 4.4-8.8 7.9-12.5 3.8-4.1 8.2-7.2 13-9.3 4.8-2.2 9.8-3.3 14.9-3.3 6.5 0 12.6 1.5 18.2 4.4 5.6 3 10.4 7.1 14.4 12.5 2.4 3.2 4.2 6.8 5.4 10.9 1.2 4 1.7 8.6 1.7 13.8 0 .4 0 1-.1 1.9 0 .9-.1 1.5-.1 1.9h-60.1v-.1zM390 96.4c-1.5-5-4-8.8-7.5-11.4-3.5-2.6-8-3.9-13.3-3.9-4.7 0-8.8 1.4-12.5 4.2-3.7 2.8-6.2 6.5-7.5 11.1H390zm88.2 45.9v-9.2c-2.1 3.7-5 6.5-8.8 8.3-3.8 1.8-8.7 2.7-14.6 2.7-11.1 0-20.4-3.8-27.8-11.4-7.4-7.6-11.2-17-11.2-28.2 0-5.3.9-10.3 2.8-15 1.9-4.7 4.5-8.9 8-12.5 3.7-4 7.9-6.9 12.4-8.8s9.7-2.8 15.4-2.8c5.5 0 10.2.9 14.1 2.7 3.9 1.8 7.1 4.6 9.5 8.3v-9.1h17v75.1h-16.8v-.1zm-44.5-38.2c0 6.3 2.1 11.6 6.3 15.9 4.2 4.3 9.3 6.4 15.4 6.4 5.5 0 10.3-2.1 14.5-6.4 4.2-4.3 6.3-9.3 6.3-15 0-6.1-2.1-11.3-6.3-15.7-4.2-4.4-9.1-6.6-14.8-6.6-5.9 0-10.9 2.1-15.1 6.2-4.2 4.2-6.3 9.2-6.3 15.2zm107.9-36.9v15.6H529v59.5h-16.9V82.8h-8.9V67.2h8.4v-2c0-7.9 2.2-13.8 6.5-17.7 4.4-3.9 11-5.8 19.9-5.8.3 0 .9 0 1.7.1.8 0 1.4.1 1.9.1v15.7h-1.2c-4 0-6.8.7-8.5 1.9-1.7 1.3-2.6 3.4-2.6 6.5v1.4h12.3v-.2zm-234.8 75.1h17.1V42.9h-17.1v99.4z"/></g></g></svg>
+\ No newline at end of file
+diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss b/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss
+index 5d28341cf53..dd0600ed15d 100644
+--- a/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss
++++ b/services/web/frontend/stylesheets/bootstrap-5/components/nav.scss
+@@ -8,7 +8,10 @@
+   --navbar-padding-h: var(--spacing-05);
+   --navbar-padding: 0 var(--navbar-padding-h);
+   --navbar-brand-width: 130px;
+-  --navbar-brand-image-url: url('../../../../public/img/ol-brand/overleaf-white.svg');
++  --navbar-brand-image-url: var(
++    --navbar-brand-image-default-url,
++    url('../../../../public/img/ol-brand/overleaf-white.svg')
++  );
+
+   // Title, when used instead of a logo
+   --navbar-title-font-size: var(--font-size-05);
+diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss b/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
+index 3b984bb6f36..a8855ea1ca3 100644
+--- a/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
++++ b/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
+@@ -216,7 +216,10 @@
+ .website-redesign .navbar-default {
+   --navbar-title-color: var(--content-primary);
+   --navbar-title-color-hover: var(--content-secondary);
+-  --navbar-brand-image-url: url('../../../../public/img/ol-brand/overleaf-black.svg');
++  --navbar-brand-image-url: var(
++    --navbar-brand-image-redesign-url,
++    url('../../../../public/img/ol-brand/overleaf-black.svg')
++  );
+   --navbar-subdued-color: var(--content-primary);
+   --navbar-subdued-hover-bg: var(--bg-dark-primary);
+   --navbar-subdued-hover-color: var(--content-primary-dark);
+diff --git a/services/web/types/css-properties-with-variables.tsx b/services/web/types/css-properties-with-variables.tsx
+new file mode 100644
+index 00000000000..fe0e85902a6
+--- /dev/null
++++ b/services/web/types/css-properties-with-variables.tsx
+@@ -0,0 +1,4 @@
++import { CSSProperties } from 'react'
++
++export type CSSPropertiesWithVariables = CSSProperties &
++  Record<`--${string}`, number | string>
+--
+2.43.0
+
diff --git a/server-ce/hotfix/5.5.2/pr_26783.patch b/server-ce/hotfix/5.5.2/pr_26783.patch
new file mode 100644
index 0000000000..74db897a5f
--- /dev/null
+++ b/server-ce/hotfix/5.5.2/pr_26783.patch
@@ -0,0 +1,58 @@
+diff --git a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
+index 29f5e7ffd26..46be91a1d9c 100644
+--- a/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
++++ b/services/web/modules/server-ce-scripts/scripts/check-mongodb.mjs
+@@ -9,6 +9,34 @@ const { ObjectId } = mongodb
+ const MIN_MONGO_VERSION = [6, 0]
+ const MIN_MONGO_FEATURE_COMPATIBILITY_VERSION = [6, 0]
+ 
++// Allow ignoring admin check failures via an environment variable
++const OVERRIDE_ENV_VAR_NAME = 'ALLOW_MONGO_ADMIN_CHECK_FAILURES'
++
++function shouldSkipAdminChecks() {
++  return process.env[OVERRIDE_ENV_VAR_NAME] === 'true'
++}
++
++function handleUnauthorizedError(err, feature) {
++  if (
++    err instanceof mongodb.MongoServerError &&
++    err.codeName === 'Unauthorized'
++  ) {
++    console.warn(`Warning: failed to check ${feature} (not authorised)`)
++    if (!shouldSkipAdminChecks()) {
++      console.error(
++        `Please ensure the MongoDB user has the required admin permissions, or\n` +
++          `set the environment variable ${OVERRIDE_ENV_VAR_NAME}=true to ignore this check.`
++      )
++      process.exit(1)
++    }
++    console.warn(
++      `Ignoring ${feature} check failure (${OVERRIDE_ENV_VAR_NAME}=${process.env[OVERRIDE_ENV_VAR_NAME]})`
++    )
++  } else {
++    throw err
++  }
++}
++
+ async function main() {
+   let mongoClient
+   try {
+@@ -18,8 +46,16 @@ async function main() {
+     throw err
+   }
+ 
+-  await checkMongoVersion(mongoClient)
+-  await checkFeatureCompatibilityVersion(mongoClient)
++  try {
++    await checkMongoVersion(mongoClient)
++  } catch (err) {
++    handleUnauthorizedError(err, 'MongoDB version')
++  }
++  try {
++    await checkFeatureCompatibilityVersion(mongoClient)
++  } catch (err) {
++    handleUnauthorizedError(err, 'MongoDB feature compatibility version')
++  }
+ 
+   try {
+     await testTransactions(mongoClient)

From 7d5bf2c0ddb1d459d78ce3a00d35542059c63283 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Fri, 4 Jul 2025 14:03:47 +0200
Subject: [PATCH 109/274] [web] Fix error: `Cannot read properties of undefined
 (reading 'startsWith')` (#26844)

https://overleaf.sentry.io/issues/6726737555/

GitOrigin-RevId: 488b64c5cb4a75ac4e77c7cdfb47cd3381a9c8eb
---
 services/web/frontend/js/infrastructure/error-reporter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/infrastructure/error-reporter.ts b/services/web/frontend/js/infrastructure/error-reporter.ts
index c7ca6604fb..8a07e4c85b 100644
--- a/services/web/frontend/js/infrastructure/error-reporter.ts
+++ b/services/web/frontend/js/infrastructure/error-reporter.ts
@@ -22,7 +22,7 @@ const isPropensityNetworkError = (err: ErrorEvent) => {
   }
 
   return Boolean(
-    errorBreadcrumbs[0].data?.url.startsWith(
+    errorBreadcrumbs[0]?.data?.url?.startsWith(
       'https://analytics.propensity.com/'
     )
   )

From d57d0ca73830489e9ef22d17518fc3dcb9b1ae07 Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Mon, 7 Jul 2025 10:18:34 +0200
Subject: [PATCH 110/274] Unselect files before deleting (#26810)

GitOrigin-RevId: 6bf22bc4983c96b7e2b45067aa0970c7fea293e2
---
 .../file-tree/components/modals/file-tree-modal-delete.jsx    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/web/frontend/js/features/file-tree/components/modals/file-tree-modal-delete.jsx b/services/web/frontend/js/features/file-tree/components/modals/file-tree-modal-delete.jsx
index ba80a9ffee..1d99d47c6a 100644
--- a/services/web/frontend/js/features/file-tree/components/modals/file-tree-modal-delete.jsx
+++ b/services/web/frontend/js/features/file-tree/components/modals/file-tree-modal-delete.jsx
@@ -9,6 +9,7 @@ import OLModal, {
 } from '@/features/ui/components/ol/ol-modal'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
+import { useFileTreeSelectable } from '../../contexts/file-tree-selectable'
 
 function FileTreeModalDelete() {
   const { t } = useTranslation()
@@ -22,6 +23,8 @@ function FileTreeModalDelete() {
     error,
   } = useFileTreeActionable()
 
+  const { select } = useFileTreeSelectable()
+
   if (!isDeleting) return null // the modal will not be rendered; return early
 
   function handleHide() {
@@ -29,6 +32,7 @@ function FileTreeModalDelete() {
   }
 
   function handleDelete() {
+    select([])
     finishDeleting()
   }
 

From cf472f54d045c5d33ff00afdaf464a7dbe22a4cd Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Mon, 7 Jul 2025 10:29:19 +0200
Subject: [PATCH 111/274] [history-v1] use POST requests for expiring redis
 buffer from cron (#26568)

* [history-v1] use POST requests for expiring redis buffer from cron

(cherry picked from commit 15780ac54e36b96e1aed9fd9eb6dfe9d4fbf842f)

* [history-v1] remove double claim of expire job

GitOrigin-RevId: 8b2eab07006a5819a47eed3f646b2a4d75f86e5b
---
 .../api/controllers/project_import.js         |  8 ++
 .../history-v1/api/swagger/project_import.js  | 36 ++++++++
 .../storage/scripts/expire_redis_chunks.js    | 29 ++++++-
 .../scripts/persist_and_expire_queues.sh      |  2 +-
 .../acceptance/js/api/project_expiry.test.js  | 82 +++++++++++++++++++
 5 files changed, 154 insertions(+), 3 deletions(-)
 create mode 100644 services/history-v1/test/acceptance/js/api/project_expiry.test.js

diff --git a/services/history-v1/api/controllers/project_import.js b/services/history-v1/api/controllers/project_import.js
index 638873d105..02fb793c87 100644
--- a/services/history-v1/api/controllers/project_import.js
+++ b/services/history-v1/api/controllers/project_import.js
@@ -28,6 +28,7 @@ const InvalidChangeError = storage.InvalidChangeError
 
 const render = require('./render')
 const Rollout = require('../app/rollout')
+const redisBackend = require('../../storage/lib/chunk_store/redis')
 
 const rollout = new Rollout(config)
 rollout.report(logger) // display the rollout configuration in the logs
@@ -177,6 +178,13 @@ async function flushChanges(req, res, next) {
   }
 }
 
+async function expireProject(req, res, next) {
+  const projectId = req.swagger.params.project_id.value
+  await redisBackend.expireProject(projectId)
+  res.status(HTTPStatus.OK).end()
+}
+
 exports.importSnapshot = expressify(importSnapshot)
 exports.importChanges = expressify(importChanges)
 exports.flushChanges = expressify(flushChanges)
+exports.expireProject = expressify(expireProject)
diff --git a/services/history-v1/api/swagger/project_import.js b/services/history-v1/api/swagger/project_import.js
index 6103eed74b..043dc70667 100644
--- a/services/history-v1/api/swagger/project_import.js
+++ b/services/history-v1/api/swagger/project_import.js
@@ -174,10 +174,46 @@ const flushChanges = {
   ],
 }
 
+const expireProject = {
+  'x-swagger-router-controller': 'project_import',
+  operationId: 'expireProject',
+  tags: ['ProjectImport'],
+  description: 'Expire project changes from buffer.',
+  parameters: [
+    {
+      name: 'project_id',
+      in: 'path',
+      description: 'project id',
+      required: true,
+      type: 'string',
+    },
+  ],
+  responses: {
+    200: {
+      description: 'Success',
+      schema: {
+        $ref: '#/definitions/Project',
+      },
+    },
+    404: {
+      description: 'Not Found',
+      schema: {
+        $ref: '#/definitions/Error',
+      },
+    },
+  },
+  security: [
+    {
+      basic: [],
+    },
+  ],
+}
+
 exports.paths = {
   '/projects/{project_id}/import': { post: importSnapshot },
   '/projects/{project_id}/legacy_import': { post: importSnapshot },
   '/projects/{project_id}/changes': { get: getChanges, post: importChanges },
   '/projects/{project_id}/legacy_changes': { post: importChanges },
   '/projects/{project_id}/flush': { post: flushChanges },
+  '/projects/{project_id}/expire': { post: expireProject },
 }
diff --git a/services/history-v1/storage/scripts/expire_redis_chunks.js b/services/history-v1/storage/scripts/expire_redis_chunks.js
index 60ce4c66f6..cb6d689e2c 100644
--- a/services/history-v1/storage/scripts/expire_redis_chunks.js
+++ b/services/history-v1/storage/scripts/expire_redis_chunks.js
@@ -3,23 +3,48 @@ const commandLineArgs = require('command-line-args')
 const redis = require('../lib/redis')
 const { scanAndProcessDueItems } = require('../lib/scan')
 const { expireProject, claimExpireJob } = require('../lib/chunk_store/redis')
+const config = require('config')
+const { fetchNothing } = require('@overleaf/fetch-utils')
 
 const rclient = redis.rclientHistory
 
-const optionDefinitions = [{ name: 'dry-run', alias: 'd', type: Boolean }]
+const optionDefinitions = [
+  { name: 'dry-run', alias: 'd', type: Boolean },
+  { name: 'post-request', type: Boolean },
+]
 const options = commandLineArgs(optionDefinitions)
 const DRY_RUN = options['dry-run'] || false
+const POST_REQUEST = options['post-request'] || false
+const HISTORY_V1_URL = `http://${process.env.HISTORY_V1_HOST || 'localhost'}:${process.env.PORT || 3100}`
 
 logger.initialize('expire-redis-chunks')
 
 async function expireProjectAction(projectId) {
   const job = await claimExpireJob(projectId)
-  await expireProject(projectId)
+  if (POST_REQUEST) {
+    await requestProjectExpiry(projectId)
+  } else {
+    await expireProject(projectId)
+  }
   if (job && job.close) {
     await job.close()
   }
 }
 
+async function requestProjectExpiry(projectId) {
+  logger.debug({ projectId }, 'sending project expire request')
+  const url = `${HISTORY_V1_URL}/api/projects/${projectId}/expire`
+  const credentials = Buffer.from(
+    `staging:${config.get('basicHttpAuth.password')}`
+  ).toString('base64')
+  await fetchNothing(url, {
+    method: 'POST',
+    headers: {
+      Authorization: `Basic ${credentials}`,
+    },
+  })
+}
+
 async function runExpireChunks() {
   await scanAndProcessDueItems(
     rclient,
diff --git a/services/history-v1/storage/scripts/persist_and_expire_queues.sh b/services/history-v1/storage/scripts/persist_and_expire_queues.sh
index d5789541da..35b057f52c 100644
--- a/services/history-v1/storage/scripts/persist_and_expire_queues.sh
+++ b/services/history-v1/storage/scripts/persist_and_expire_queues.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 node storage/scripts/persist_redis_chunks.mjs --queue --max-time 270
-node storage/scripts/expire_redis_chunks.js
+node storage/scripts/expire_redis_chunks.js --post-request
diff --git a/services/history-v1/test/acceptance/js/api/project_expiry.test.js b/services/history-v1/test/acceptance/js/api/project_expiry.test.js
new file mode 100644
index 0000000000..efa589ec71
--- /dev/null
+++ b/services/history-v1/test/acceptance/js/api/project_expiry.test.js
@@ -0,0 +1,82 @@
+'use strict'
+
+const BPromise = require('bluebird')
+const { expect } = require('chai')
+const HTTPStatus = require('http-status')
+const fetch = require('node-fetch')
+const fs = BPromise.promisifyAll(require('node:fs'))
+
+const cleanup = require('../storage/support/cleanup')
+const fixtures = require('../storage/support/fixtures')
+const testFiles = require('../storage/support/test_files')
+const testProjects = require('./support/test_projects')
+const testServer = require('./support/test_server')
+
+const { Change, File, Operation } = require('overleaf-editor-core')
+const queueChanges = require('../../../../storage/lib/queue_changes')
+const { getState } = require('../../../../storage/lib/chunk_store/redis')
+
+describe('project expiry', function () {
+  beforeEach(cleanup.everything)
+  beforeEach(fixtures.create)
+
+  it('expire redis buffer', async function () {
+    const basicAuthClient = testServer.basicAuthClient
+    const projectId = await testProjects.createEmptyProject()
+
+    // upload an empty file
+    const response = await fetch(
+      testServer.url(
+        `/api/projects/${projectId}/blobs/${File.EMPTY_FILE_HASH}`,
+        { qs: { pathname: 'main.tex' } }
+      ),
+      {
+        method: 'PUT',
+        body: fs.createReadStream(testFiles.path('empty.tex')),
+        headers: {
+          Authorization: testServer.basicAuthHeader,
+        },
+      }
+    )
+    expect(response.ok).to.be.true
+
+    const testFile = File.fromHash(File.EMPTY_FILE_HASH)
+    const testChange = new Change(
+      [Operation.addFile('main.tex', testFile)],
+      new Date()
+    )
+    await queueChanges(projectId, [testChange], 0)
+
+    // Verify that the changes are queued and not yet persisted
+    const initialState = await getState(projectId)
+    expect(initialState.persistedVersion).to.be.null
+    expect(initialState.changes).to.have.lengthOf(1)
+
+    const importResponse =
+      await basicAuthClient.apis.ProjectImport.flushChanges({
+        project_id: projectId,
+      })
+
+    expect(importResponse.status).to.equal(HTTPStatus.OK)
+
+    // Verify that the changes were persisted to the chunk store
+    const flushedState = await getState(projectId)
+    expect(flushedState.persistedVersion).to.equal(1)
+
+    const expireResponse =
+      await basicAuthClient.apis.ProjectImport.expireProject({
+        project_id: projectId,
+      })
+    expect(expireResponse.status).to.equal(HTTPStatus.OK)
+
+    const finalState = await getState(projectId)
+    expect(finalState).to.deep.equal({
+      changes: [],
+      expireTime: null,
+      headSnapshot: null,
+      headVersion: null,
+      persistTime: null,
+      persistedVersion: null,
+    })
+  })
+})

From d7a0cbefea3b94bebce74dbffa3240b9f6c19240 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Mon, 7 Jul 2025 10:57:54 +0200
Subject: [PATCH 112/274] [history-v1] fix typo in metrics name in redis chunk
 store (#26865)

GitOrigin-RevId: 5b37e3b22a3250fcfbd7411e635cc11ed38dcb27
---
 services/history-v1/storage/lib/chunk_store/redis.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/history-v1/storage/lib/chunk_store/redis.js b/services/history-v1/storage/lib/chunk_store/redis.js
index a2317dd859..0a17429018 100644
--- a/services/history-v1/storage/lib/chunk_store/redis.js
+++ b/services/history-v1/storage/lib/chunk_store/redis.js
@@ -663,12 +663,12 @@ async function expireProject(projectId) {
       keySchema.persistTime({ projectId }),
       keySchema.expireTime({ projectId })
     )
-    metrics.inc('chunk_store.redis.set_persisted_version', 1, {
+    metrics.inc('chunk_store.redis.expire_project', 1, {
       status,
     })
     return status
   } catch (err) {
-    metrics.inc('chunk_store.redis.set_persisted_version', 1, {
+    metrics.inc('chunk_store.redis.expire_project', 1, {
       status: 'error',
     })
     throw err

From c6b576b25a2f1aba96c27a7719124b77390ce423 Mon Sep 17 00:00:00 2001
From: Liangjun Song <146005915+adai26@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:35:06 +0100
Subject: [PATCH 113/274] Merge pull request #26574 from
 overleaf/ls-group-plan-seats-adding-in-stripe

Support group plan seats adding in Stripe

GitOrigin-RevId: 9c46c167388c5578a1513f908e409ab5d940c1df
---
 .../SubscriptionGroupController.mjs           |  20 +--
 .../Subscription/SubscriptionGroupHandler.js  | 114 ++++++++++--------
 .../Subscription/SubscriptionHandler.js       |   2 +-
 .../SubscriptionGroupController.test.mjs      |   2 +-
 .../SubscriptionGroupHandlerTests.js          |  96 +++++++++------
 5 files changed, 136 insertions(+), 98 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 90ecd51091..792850a1c1 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -20,7 +20,6 @@ import {
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
 } from './Errors.js'
-import RecurlyClient from './RecurlyClient.js'
 
 /**
  * @import { Subscription } from "../../../../types/subscription/dashboard/subscription.js"
@@ -138,13 +137,13 @@ async function _removeUserFromGroup(
 async function addSeatsToGroupSubscription(req, res) {
   try {
     const userId = SessionManager.getLoggedInUserId(req.session)
-    const { subscription, recurlySubscription, plan } =
+    const { subscription, paymentProviderSubscription, plan } =
       await SubscriptionGroupHandler.promises.getUsersGroupSubscriptionDetails(
         userId
       )
     await SubscriptionGroupHandler.promises.ensureFlexibleLicensingEnabled(plan)
     await SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPendingChanges(
-      recurlySubscription
+      paymentProviderSubscription
     )
     await SubscriptionGroupHandler.promises.ensureSubscriptionIsActive(
       subscription
@@ -162,15 +161,15 @@ async function addSeatsToGroupSubscription(req, res) {
 
     if (flexibleLicensingForManuallyBilledSubscriptionsVariant === 'enabled') {
       await SubscriptionGroupHandler.promises.checkBillingInfoExistence(
-        recurlySubscription,
+        paymentProviderSubscription,
         userId
       )
     } else {
       await SubscriptionGroupHandler.promises.ensureSubscriptionCollectionMethodIsNotManual(
-        recurlySubscription
+        paymentProviderSubscription
       )
       // Check if the user has missing billing details
-      await RecurlyClient.promises.getPaymentMethod(userId)
+      await Modules.promises.hooks.fire('getPaymentMethod', userId)
     }
 
     res.render('subscriptions/add-seats', {
@@ -178,7 +177,8 @@ async function addSeatsToGroupSubscription(req, res) {
       groupName: subscription.teamName,
       totalLicenses: subscription.membersLimit,
       isProfessional: isProfessionalGroupPlan(subscription),
-      isCollectionMethodManual: recurlySubscription.isCollectionMethodManual,
+      isCollectionMethodManual:
+        paymentProviderSubscription.isCollectionMethodManual,
     })
   } catch (error) {
     if (error instanceof MissingBillingInfoError) {
@@ -300,15 +300,15 @@ async function submitForm(req, res) {
   const userEmail = await UserGetter.promises.getUserEmail(userId)
   const { adding, poNumber } = req.body
 
-  const { recurlySubscription } =
+  const { paymentProviderSubscription } =
     await SubscriptionGroupHandler.promises.getUsersGroupSubscriptionDetails(
       userId
     )
 
-  if (recurlySubscription.isCollectionMethodManual) {
+  if (paymentProviderSubscription.isCollectionMethodManual) {
     await SubscriptionGroupHandler.promises.updateSubscriptionPaymentTerms(
       userId,
-      recurlySubscription,
+      paymentProviderSubscription,
       poNumber
     )
   }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
index d3cce35b32..bc179f8d23 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
@@ -9,7 +9,6 @@ const { Subscription } = require('../../models/Subscription')
 const { User } = require('../../models/User')
 const RecurlyClient = require('./RecurlyClient')
 const PlansLocator = require('./PlansLocator')
-const SubscriptionHandler = require('./SubscriptionHandler')
 const TeamInvitesHandler = require('./TeamInvitesHandler')
 const GroupPlansData = require('./GroupPlansData')
 const Modules = require('../../infrastructure/Modules')
@@ -86,22 +85,24 @@ async function ensureSubscriptionIsActive(subscription) {
 }
 
 async function ensureSubscriptionCollectionMethodIsNotManual(
-  recurlySubscription
+  paymentProviderSubscription
 ) {
-  if (recurlySubscription.isCollectionMethodManual) {
+  if (paymentProviderSubscription.isCollectionMethodManual) {
     throw new ManuallyCollectedError(
       'This subscription is being collected manually',
       {
-        recurlySubscription_id: recurlySubscription.id,
+        subscription_id: paymentProviderSubscription.id,
       }
     )
   }
 }
 
-async function ensureSubscriptionHasNoPendingChanges(recurlySubscription) {
-  if (recurlySubscription.pendingChange) {
+async function ensureSubscriptionHasNoPendingChanges(
+  paymentProviderSubscription
+) {
+  if (paymentProviderSubscription.pendingChange) {
     throw new PendingChangeError('This subscription has a pending change', {
-      recurlySubscription_id: recurlySubscription.id,
+      subscription_id: paymentProviderSubscription.id,
     })
   }
 }
@@ -136,47 +137,50 @@ async function getUsersGroupSubscriptionDetails(userId) {
 
   const plan = PlansLocator.findLocalPlanInSettings(subscription.planCode)
 
-  const recurlySubscription = await RecurlyClient.promises.getSubscription(
-    subscription.recurlySubscription_id
+  const response = await Modules.promises.hooks.fire(
+    'getPaymentFromRecord',
+    subscription
   )
 
+  const { subscription: paymentProviderSubscription } = response[0]
+
   return {
     userId,
     subscription,
-    recurlySubscription,
+    paymentProviderSubscription,
     plan,
   }
 }
 
-async function checkBillingInfoExistence(recurlySubscription, userId) {
+async function checkBillingInfoExistence(paymentProviderSubscription, userId) {
   // Verify the billing info only if the collection method is not manual (e.g. automatic)
-  if (!recurlySubscription.isCollectionMethodManual) {
+  if (!paymentProviderSubscription.isCollectionMethodManual) {
     // Check if the user has missing billing details
-    await RecurlyClient.promises.getPaymentMethod(userId)
+    await Modules.promises.hooks.fire('getPaymentMethod', userId)
   }
 }
 
 async function _addSeatsSubscriptionChange(userId, adding) {
-  const { subscription, recurlySubscription, plan } =
+  const { subscription, paymentProviderSubscription, plan } =
     await getUsersGroupSubscriptionDetails(userId)
   await ensureFlexibleLicensingEnabled(plan)
   await ensureSubscriptionIsActive(subscription)
-  await ensureSubscriptionHasNoPendingChanges(recurlySubscription)
-  await checkBillingInfoExistence(recurlySubscription, userId)
+  await ensureSubscriptionHasNoPendingChanges(paymentProviderSubscription)
+  await checkBillingInfoExistence(paymentProviderSubscription, userId)
   await ensureSubscriptionHasNoPastDueInvoice(subscription)
 
   const currentAddonQuantity =
-    recurlySubscription.addOns.find(
+    paymentProviderSubscription.addOns.find(
       addOn => addOn.code === MEMBERS_LIMIT_ADD_ON_CODE
     )?.quantity ?? 0
   // Keeps only the new total quantity of addon
   const nextAddonQuantity = currentAddonQuantity + adding
 
   let changeRequest
-  if (recurlySubscription.hasAddOn(MEMBERS_LIMIT_ADD_ON_CODE)) {
+  if (paymentProviderSubscription.hasAddOn(MEMBERS_LIMIT_ADD_ON_CODE)) {
     // Not providing a custom price as once the subscription is locked
     // to an add-on at a given price, it will use it for subsequent payments
-    changeRequest = recurlySubscription.getRequestForAddOnUpdate(
+    changeRequest = paymentProviderSubscription.getRequestForAddOnUpdate(
       MEMBERS_LIMIT_ADD_ON_CODE,
       nextAddonQuantity
     )
@@ -185,7 +189,7 @@ async function _addSeatsSubscriptionChange(userId, adding) {
     const pattern =
       /^group_(collaborator|professional)_(2|3|4|5|10|20|50)_(educational|enterprise)$/
     const [, planCode, size, usage] = plan.planCode.match(pattern)
-    const currency = recurlySubscription.currency
+    const currency = paymentProviderSubscription.currency
     const planPriceInCents =
       GroupPlansData[usage][planCode][currency][size].price_in_cents
     const legacyUnitPriceInCents =
@@ -194,7 +198,7 @@ async function _addSeatsSubscriptionChange(userId, adding) {
 
     if (
       _shouldUseLegacyPricing(
-        recurlySubscription.planPrice,
+        paymentProviderSubscription.planPrice,
         planPriceInCents / 100,
         usage,
         size
@@ -203,7 +207,7 @@ async function _addSeatsSubscriptionChange(userId, adding) {
       unitPrice = legacyUnitPriceInCents / 100
     }
 
-    changeRequest = recurlySubscription.getRequestForAddOnPurchase(
+    changeRequest = paymentProviderSubscription.getRequestForAddOnPurchase(
       MEMBERS_LIMIT_ADD_ON_CODE,
       nextAddonQuantity,
       unitPrice
@@ -213,7 +217,7 @@ async function _addSeatsSubscriptionChange(userId, adding) {
   return {
     changeRequest,
     currentAddonQuantity,
-    recurlySubscription,
+    paymentProviderSubscription,
   }
 }
 
@@ -237,37 +241,38 @@ function _shouldUseLegacyPricing(
 async function previewAddSeatsSubscriptionChange(userId, adding) {
   const { changeRequest, currentAddonQuantity } =
     await _addSeatsSubscriptionChange(userId, adding)
-  const subscriptionChange =
-    await RecurlyClient.promises.previewSubscriptionChange(changeRequest)
-  const subscriptionChangePreview =
-    await SubscriptionController.makeChangePreview(
-      {
-        type: 'add-on-update',
-        addOn: {
-          code: MEMBERS_LIMIT_ADD_ON_CODE,
-          quantity: subscriptionChange.nextAddOns.find(
-            addon => addon.code === MEMBERS_LIMIT_ADD_ON_CODE
-          ).quantity,
-          prevQuantity: currentAddonQuantity,
-        },
+  const response = await Modules.promises.hooks.fire(
+    'previewSubscriptionChangeRequest',
+    changeRequest
+  )
+  const subscriptionChange = response[0]
+  const subscriptionChangePreview = SubscriptionController.makeChangePreview(
+    {
+      type: 'add-on-update',
+      addOn: {
+        code: MEMBERS_LIMIT_ADD_ON_CODE,
+        quantity: subscriptionChange.nextAddOns.find(
+          addon => addon.code === MEMBERS_LIMIT_ADD_ON_CODE
+        ).quantity,
+        prevQuantity: currentAddonQuantity,
       },
-      subscriptionChange
-    )
+    },
+    subscriptionChange
+  )
 
   return subscriptionChangePreview
 }
 
 async function createAddSeatsSubscriptionChange(userId, adding, poNumber) {
-  const { changeRequest, recurlySubscription } =
+  const { changeRequest, paymentProviderSubscription } =
     await _addSeatsSubscriptionChange(userId, adding)
 
-  if (recurlySubscription.isCollectionMethodManual) {
-    await updateSubscriptionPaymentTerms(userId, recurlySubscription, poNumber)
+  if (paymentProviderSubscription.isCollectionMethodManual) {
+    await updateSubscriptionPaymentTerms(paymentProviderSubscription, poNumber)
   }
-
-  await RecurlyClient.promises.applySubscriptionChangeRequest(changeRequest)
-  await SubscriptionHandler.promises.syncSubscription(
-    { uuid: recurlySubscription.id },
+  await Modules.promises.hooks.fire(
+    'applySubscriptionChangeRequestAndSync',
+    changeRequest,
     userId
   )
 
@@ -275,21 +280,30 @@ async function createAddSeatsSubscriptionChange(userId, adding, poNumber) {
 }
 
 async function updateSubscriptionPaymentTerms(
-  userId,
-  recurlySubscription,
+  paymentProviderSubscription,
   poNumber
 ) {
+  if (paymentProviderSubscription.service?.includes('stripe')) {
+    // TODO: Implement Stripe payment terms update
+    throw new OError(
+      'Updating payment terms is not supported for Stripe subscriptions',
+      {
+        subscriptionId: paymentProviderSubscription.id,
+      }
+    )
+  }
+
   const [termsAndConditions] = await Modules.promises.hooks.fire(
     'generateTermsAndConditions',
-    { currency: recurlySubscription.currency, poNumber }
+    { currency: paymentProviderSubscription.currency, poNumber }
   )
 
   const updateRequest = poNumber
-    ? recurlySubscription.getRequestForPoNumberAndTermsAndConditionsUpdate(
+    ? paymentProviderSubscription.getRequestForPoNumberAndTermsAndConditionsUpdate(
         poNumber,
         termsAndConditions
       )
-    : recurlySubscription.getRequestForTermsAndConditionsUpdate(
+    : paymentProviderSubscription.getRequestForTermsAndConditionsUpdate(
         termsAndConditions
       )
 
diff --git a/services/web/app/src/Features/Subscription/SubscriptionHandler.js b/services/web/app/src/Features/Subscription/SubscriptionHandler.js
index 104acd8783..656b57aa01 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionHandler.js
@@ -74,7 +74,7 @@ async function createSubscription(user, subscriptionDetails, recurlyTokenIds) {
  */
 async function previewSubscriptionChange(userId, planCode) {
   const change = await Modules.promises.hooks.fire(
-    'previewSubscriptionChange',
+    'previewPlanChange',
     userId,
     planCode
   )
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index 74aea91b89..2b52f2be37 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -55,7 +55,7 @@ describe('SubscriptionGroupController', function () {
         getUsersGroupSubscriptionDetails: sinon.stub().resolves({
           subscription: ctx.subscription,
           plan: ctx.plan,
-          recurlySubscription: ctx.recurlySubscription,
+          paymentProviderSubscription: ctx.recurlySubscription,
         }),
         previewAddSeatsSubscriptionChange: sinon
           .stub()
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
index c29ab4a1c0..63a6e25fde 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
@@ -193,21 +193,26 @@ describe('SubscriptionGroupHandler', function () {
     this.Modules = {
       promises: {
         hooks: {
-          fire: sinon.stub().callsFake(hookName => {
-            if (hookName === 'generateTermsAndConditions') {
-              return Promise.resolve(['T&Cs'])
-            }
-            if (hookName === 'getPaymentFromRecord') {
-              return Promise.resolve([
-                { account: { hasPastDueInvoice: false } },
-              ])
-            }
-            return Promise.resolve()
-          }),
+          fire: sinon.stub(),
         },
       },
     }
 
+    this.Modules.promises.hooks.fire
+      .withArgs('generateTermsAndConditions')
+      .resolves(['T&Cs'])
+      .withArgs('getPaymentFromRecord')
+      .resolves([
+        {
+          subscription: this.recurlySubscription,
+          account: { hasPastDueInvoice: false },
+        },
+      ])
+      .withArgs('previewSubscriptionChangeRequest')
+      .resolves([this.previewSubscriptionChange])
+      .withArgs('previewGroupPlanUpgrade')
+      .resolves([{ subscriptionChange: this.previewSubscriptionChange }])
+
     this.Handler = SandboxedModule.require(modulePath, {
       requires: {
         './SubscriptionUpdater': this.SubscriptionUpdater,
@@ -389,7 +394,7 @@ describe('SubscriptionGroupHandler', function () {
             this.PaymentProviderEntities.MEMBERS_LIMIT_ADD_ON_CODE,
           canUseFlexibleLicensing: true,
         },
-        recurlySubscription: this.recurlySubscription,
+        paymentProviderSubscription: this.recurlySubscription,
       })
     })
   })
@@ -441,11 +446,16 @@ describe('SubscriptionGroupHandler', function () {
               this.adminUser_id,
               this.adding
             )
-          this.RecurlyClient.promises.getPaymentMethod
-            .calledWith(this.adminUser_id)
+          this.Modules.promises.hooks.fire
+            .calledWith('getPaymentFromRecord', {
+              groupPlan: true,
+              recurlyStatus: {
+                state: 'active',
+              },
+            })
             .should.equal(true)
-          this.RecurlyClient.promises.previewSubscriptionChange
-            .calledWith(this.changeRequest)
+          this.Modules.promises.hooks.fire
+            .calledWith('previewSubscriptionChangeRequest', this.changeRequest)
             .should.equal(true)
           this.SubscriptionController.makeChangePreview
             .calledWith(
@@ -473,9 +483,14 @@ describe('SubscriptionGroupHandler', function () {
               return true
             },
           }
-          this.RecurlyClient.promises.getSubscription = sinon
-            .stub()
-            .resolves(this.recurlySubscription)
+          this.Modules.promises.hooks.fire
+            .withArgs('getPaymentFromRecord')
+            .resolves([
+              {
+                subscription: this.recurlySubscription,
+                account: { hasPastDueInvoice: false },
+              },
+            ])
 
           const result =
             await this.Handler.promises.createAddSeatsSubscriptionChange(
@@ -491,13 +506,10 @@ describe('SubscriptionGroupHandler', function () {
                 .and(sinon.match.has('termsAndConditions'))
             )
             .should.equal(true)
-          this.RecurlyClient.promises.applySubscriptionChangeRequest
-            .calledWith(this.changeRequest)
-            .should.equal(true)
-          this.SubscriptionHandler.promises.syncSubscription
+          this.Modules.promises.hooks.fire
             .calledWith(
-              { uuid: this.recurlySubscription.id },
-              this.adminUser_id
+              'applySubscriptionChangeRequestAndSync',
+              this.changeRequest
             )
             .should.equal(true)
           expect(result).to.deep.equal({
@@ -511,7 +523,6 @@ describe('SubscriptionGroupHandler', function () {
       describe('accounts with PO number', function () {
         it('should update the subscription PO number and T&C', async function () {
           await this.Handler.promises.updateSubscriptionPaymentTerms(
-            this.adminUser_id,
             this.recurlySubscription,
             this.poNumberAndTermsAndConditionsUpdate.poNumber
           )
@@ -525,12 +536,23 @@ describe('SubscriptionGroupHandler', function () {
             .calledWith(this.poNumberAndTermsAndConditionsUpdate)
             .should.equal(true)
         })
+
+        it('should fail for stripe', async function () {
+          this.recurlySubscription.service = 'stripe'
+          await expect(
+            this.Handler.promises.updateSubscriptionPaymentTerms(
+              this.recurlySubscription,
+              this.poNumberAndTermsAndConditionsUpdate.poNumber
+            )
+          ).to.be.rejectedWith(
+            'Updating payment terms is not supported for Stripe subscriptions'
+          )
+        })
       })
 
       describe('accounts with no PO number', function () {
         it('should update the subscription T&C only', async function () {
           await this.Handler.promises.updateSubscriptionPaymentTerms(
-            this.adminUser_id,
             this.recurlySubscription
           )
           this.recurlySubscription.getRequestForTermsAndConditionsUpdate
@@ -570,11 +592,16 @@ describe('SubscriptionGroupHandler', function () {
         let preview
 
         afterEach(function () {
-          this.RecurlyClient.promises.getPaymentMethod
-            .calledWith(this.adminUser_id)
+          this.Modules.promises.hooks.fire
+            .calledWith('getPaymentFromRecord', {
+              groupPlan: true,
+              recurlyStatus: {
+                state: 'active',
+              },
+            })
             .should.equal(true)
-          this.RecurlyClient.promises.previewSubscriptionChange
-            .calledWith(this.changeRequest)
+          this.Modules.promises.hooks.fire
+            .calledWith('previewSubscriptionChangeRequest', this.changeRequest)
             .should.equal(true)
           this.SubscriptionController.makeChangePreview
             .calledWith(
@@ -781,9 +808,6 @@ describe('SubscriptionGroupHandler', function () {
 
   describe('getGroupPlanUpgradePreview', function () {
     it('should generate preview for subscription upgrade', async function () {
-      this.Modules.promises.hooks.fire.resolves([
-        { subscriptionChange: this.previewSubscriptionChange },
-      ])
       const result = await this.Handler.promises.getGroupPlanUpgradePreview(
         this.user_id
       )
@@ -797,8 +821,8 @@ describe('SubscriptionGroupHandler', function () {
         this.recurlySubscription,
         this.adminUser_id
       )
-      this.RecurlyClient.promises.getPaymentMethod
-        .calledWith(this.adminUser_id)
+      this.Modules.promises.hooks.fire
+        .calledWith('getPaymentMethod', this.adminUser_id)
         .should.equal(true)
     })
 

From 913caca3796bdd6bf76086c98099068333b47e00 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 7 Jul 2025 12:11:54 +0100
Subject: [PATCH 114/274] Merge pull request #26850 from
 overleaf/mj-chat-deleted-user

[web] Handle deleted users in chat threads

GitOrigin-RevId: 6593bf37e4f2339b40069b7cf4198166660852fb
---
 .../web/frontend/js/features/chat/components/message.tsx  | 8 +++++++-
 .../frontend/js/features/chat/context/chat-context.tsx    | 2 +-
 .../js/features/chat/utils/message-list-appender.js       | 2 ++
 .../js/features/ide-redesign/components/chat/message.tsx  | 6 ++----
 .../components/review-panel-entry-user.tsx                | 4 +++-
 .../review-panel-new/components/review-panel-message.tsx  | 2 +-
 .../js/features/review-panel-new/utils/build-name.ts      | 8 +++++---
 services/web/types/review-panel/review-panel.ts           | 2 +-
 8 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/services/web/frontend/js/features/chat/components/message.tsx b/services/web/frontend/js/features/chat/components/message.tsx
index 8a410c0d9d..dd5aeccb24 100644
--- a/services/web/frontend/js/features/chat/components/message.tsx
+++ b/services/web/frontend/js/features/chat/components/message.tsx
@@ -2,6 +2,7 @@ import { getHueForUserId } from '@/shared/utils/colors'
 import MessageContent from './message-content'
 import type { Message as MessageType } from '@/features/chat/context/chat-context'
 import { User } from '../../../../../types/user'
+import { useTranslation } from 'react-i18next'
 
 export interface MessageProps {
   message: MessageType
@@ -26,11 +27,16 @@ function getArrowStyle(user?: User) {
 }
 
 function Message({ message, fromSelf }: MessageProps) {
+  const { t } = useTranslation()
   return (
     <div className="message-wrapper">
       {!fromSelf && (
         <div className="name" translate="no">
-          <span>{message.user.first_name || message.user.email}</span>
+          <span>
+            {message.user
+              ? message.user.first_name || message.user.email
+              : t('deleted_user')}
+          </span>
         </div>
       )}
       <div className="message" style={getMessageStyle(message.user)}>
diff --git a/services/web/frontend/js/features/chat/context/chat-context.tsx b/services/web/frontend/js/features/chat/context/chat-context.tsx
index 2ba0ff5f5d..b7a8a2c80d 100644
--- a/services/web/frontend/js/features/chat/context/chat-context.tsx
+++ b/services/web/frontend/js/features/chat/context/chat-context.tsx
@@ -29,7 +29,7 @@ export type Message = {
   id: string
   timestamp: number
   contents: string[]
-  user: User
+  user?: User
 }
 
 type State = {
diff --git a/services/web/frontend/js/features/chat/utils/message-list-appender.js b/services/web/frontend/js/features/chat/utils/message-list-appender.js
index 3362bf6fa0..be7ed0cb37 100644
--- a/services/web/frontend/js/features/chat/utils/message-list-appender.js
+++ b/services/web/frontend/js/features/chat/utils/message-list-appender.js
@@ -15,6 +15,7 @@ export function appendMessage(messageList, message, uniqueMessageIds) {
     lastMessage &&
     message &&
     message.user &&
+    lastMessage.user &&
     message.user.id &&
     message.user.id === lastMessage.user.id &&
     message.timestamp - lastMessage.timestamp < TIMESTAMP_GROUP_SIZE
@@ -57,6 +58,7 @@ export function prependMessages(messageList, messages, uniqueMessageIds) {
       const shouldGroup =
         firstMessage &&
         message &&
+        firstMessage.user &&
         message.user &&
         message.user.id === firstMessage.user.id &&
         firstMessage.timestamp - message.timestamp < TIMESTAMP_GROUP_SIZE
diff --git a/services/web/frontend/js/features/ide-redesign/components/chat/message.tsx b/services/web/frontend/js/features/ide-redesign/components/chat/message.tsx
index 057ea69266..9a4ffe3a1b 100644
--- a/services/web/frontend/js/features/ide-redesign/components/chat/message.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/chat/message.tsx
@@ -27,8 +27,6 @@ function getAvatarStyle(user?: User) {
 }
 
 function Message({ message, fromSelf }: MessageProps) {
-  const userAvailable = message.user?.id && message.user.email
-
   return (
     <div className="chat-message-redesign">
       <div className="message-row">
@@ -36,7 +34,7 @@ function Message({ message, fromSelf }: MessageProps) {
         {!fromSelf && (
           <div className="message-author">
             <span>
-              {userAvailable
+              {message.user?.id && message.user.email
                 ? message.user.first_name || message.user.email
                 : t('deleted_user')}
             </span>
@@ -49,7 +47,7 @@ function Message({ message, fromSelf }: MessageProps) {
             {!fromSelf && index === message.contents.length - 1 ? (
               <div className="message-avatar">
                 <div className="avatar" style={getAvatarStyle(message.user)}>
-                  {userAvailable ? (
+                  {message.user?.id && message.user.email ? (
                     message.user.first_name?.charAt(0) ||
                     message.user.email.charAt(0)
                   ) : (
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx
index ae53fbc8c8..221e297c4b 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-entry-user.tsx
@@ -3,13 +3,15 @@ import { buildName } from '../utils/build-name'
 import { ReviewPanelUser } from '../../../../../types/review-panel/review-panel'
 import { ChangesUser } from '../context/changes-users-context'
 import { getBackgroundColorForUserId } from '@/shared/utils/colors'
+import { useTranslation } from 'react-i18next'
 
 const ReviewPanelEntryUser = ({
   user,
 }: {
   user?: ReviewPanelUser | ChangesUser
 }) => {
-  const userName = buildName(user)
+  const { t } = useTranslation()
+  const userName = user ? buildName(user) : t('deleted_user')
 
   return (
     <div className="review-panel-entry-user" translate="no">
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx b/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
index d6017208d8..41c8a8d5a2 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-panel-message.tsx
@@ -40,7 +40,7 @@ export const ReviewPanelMessage: FC<{
   const user = useUserContext()
   const permissions = usePermissionsContext()
 
-  const isCommentAuthor = user.id === message.user.id
+  const isCommentAuthor = Boolean(message.user && user.id === message.user.id)
   const canEdit = isCommentAuthor && permissions.comment
   const canResolve =
     permissions.resolveAllComments ||
diff --git a/services/web/frontend/js/features/review-panel-new/utils/build-name.ts b/services/web/frontend/js/features/review-panel-new/utils/build-name.ts
index 9bfb6902c4..bd1fbf1a12 100644
--- a/services/web/frontend/js/features/review-panel-new/utils/build-name.ts
+++ b/services/web/frontend/js/features/review-panel-new/utils/build-name.ts
@@ -1,15 +1,17 @@
-export const buildName = (user?: {
+export const buildName = (user: {
   first_name?: string
   last_name?: string
   email?: string
 }) => {
-  const name = [user?.first_name, user?.last_name].filter(Boolean).join(' ')
+  const name = [user.first_name, user.last_name].filter(Boolean).join(' ')
 
   if (name) {
     return name
   }
-  if (user?.email) {
+
+  if (user.email) {
     return user.email.split('@')[0]
   }
+
   return 'Unknown'
 }
diff --git a/services/web/types/review-panel/review-panel.ts b/services/web/types/review-panel/review-panel.ts
index 200f904430..cba5490ab0 100644
--- a/services/web/types/review-panel/review-panel.ts
+++ b/services/web/types/review-panel/review-panel.ts
@@ -20,6 +20,6 @@ export interface ReviewPanelCommentThreadMessage {
   content: string
   id: CommentId
   timestamp: Date
-  user: ReviewPanelUser
+  user?: ReviewPanelUser
   user_id: UserId
 }

From bd3ef799f3e9940644c6c18e91540a5f9ed195fe Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 7 Jul 2025 12:12:04 +0100
Subject: [PATCH 115/274] Merge pull request #26832 from
 overleaf/mj-system-messages

[web] Move system messages back to top of page

GitOrigin-RevId: 627a0e33e0cc49d75912621afc706da82aee7080
---
 .../features/project-list/components/project-list-ds-nav.tsx  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx b/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
index f8c8014e1c..3d24f9845c 100644
--- a/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
+++ b/services/web/frontend/js/features/project-list/components/project-list-ds-nav.tsx
@@ -55,6 +55,7 @@ export function ProjectListDsNav() {
 
   return (
     <div className="project-ds-nav-page website-redesign">
+      <SystemMessages />
       <DefaultNavbar
         {...navbarProps}
         overleafLogo={overleafLogo}
@@ -124,9 +125,6 @@ export function ProjectListDsNav() {
             </div>
             <Footer {...footerProps} />
           </div>
-          <div>
-            <SystemMessages />
-          </div>
         </div>
       </main>
     </div>

From 56232b48a7cd217568bbc68aa27b33307a0da52e Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 7 Jul 2025 12:12:20 +0100
Subject: [PATCH 116/274] Merge pull request #26827 from
 overleaf/mj-zip-download-name

[web] Sanitise project name in zip download

GitOrigin-RevId: 3b22da84002f57e3965c529c673344af04db9128
---
 services/web/app/src/Features/Compile/CompileController.js | 1 +
 .../src/Features/Downloads/ProjectDownloadsController.mjs  | 7 ++++++-
 .../unit/src/Downloads/ProjectDownloadsController.test.mjs | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js
index 8f2e289680..69ad20e398 100644
--- a/services/web/app/src/Features/Compile/CompileController.js
+++ b/services/web/app/src/Features/Compile/CompileController.js
@@ -347,6 +347,7 @@ const _CompileController = {
     }
   },
 
+  // Keep in sync with the logic for zip files in ProjectDownloadsController
   _getSafeProjectName(project) {
     return project.name.replace(/[^\p{L}\p{Nd}]/gu, '_')
   },
diff --git a/services/web/app/src/Features/Downloads/ProjectDownloadsController.mjs b/services/web/app/src/Features/Downloads/ProjectDownloadsController.mjs
index 6bd239b273..36aafda8c9 100644
--- a/services/web/app/src/Features/Downloads/ProjectDownloadsController.mjs
+++ b/services/web/app/src/Features/Downloads/ProjectDownloadsController.mjs
@@ -18,6 +18,11 @@ import { prepareZipAttachment } from '../../infrastructure/Response.js'
 
 let ProjectDownloadsController
 
+// Keep in sync with the logic for PDF files in CompileController
+function getSafeProjectName(project) {
+  return project.name.replace(/[^\p{L}\p{Nd}]/gu, '_')
+}
+
 export default ProjectDownloadsController = {
   downloadProject(req, res, next) {
     const projectId = req.params.Project_id
@@ -41,7 +46,7 @@ export default ProjectDownloadsController = {
                 if (error != null) {
                   return next(error)
                 }
-                prepareZipAttachment(res, `${project.name}.zip`)
+                prepareZipAttachment(res, `${getSafeProjectName(project)}.zip`)
                 return stream.pipe(res)
               }
             )
diff --git a/services/web/test/unit/src/Downloads/ProjectDownloadsController.test.mjs b/services/web/test/unit/src/Downloads/ProjectDownloadsController.test.mjs
index 1e339097fa..f3737df0ab 100644
--- a/services/web/test/unit/src/Downloads/ProjectDownloadsController.test.mjs
+++ b/services/web/test/unit/src/Downloads/ProjectDownloadsController.test.mjs
@@ -52,7 +52,7 @@ describe('ProjectDownloadsController', function () {
         .stub()
         .callsArgWith(1, null, ctx.stream)
       ctx.req.params = { Project_id: ctx.project_id }
-      ctx.project_name = 'project name with accênts'
+      ctx.project_name = 'project name with accênts and % special characters'
       ctx.ProjectGetter.getProject = sinon
         .stub()
         .callsArgWith(2, null, { name: ctx.project_name })
@@ -95,9 +95,9 @@ describe('ProjectDownloadsController', function () {
         .should.equal(true)
     })
 
-    it('should name the downloaded file after the project', function (ctx) {
+    it('should name the downloaded file after the project but sanitise special characters', function (ctx) {
       ctx.res.headers.should.deep.equal({
-        'Content-Disposition': `attachment; filename="${ctx.project_name}.zip"`,
+        'Content-Disposition': `attachment; filename="project_name_with_accênts_and___special_characters.zip"`,
         'Content-Type': 'application/zip',
         'X-Content-Type-Options': 'nosniff',
       })

From b89951cf5dcd6f76ec003671dddd2c65efe0d2bf Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 7 Jul 2025 12:12:35 +0100
Subject: [PATCH 117/274] Merge pull request #26814 from
 overleaf/mj-review-panel-comment-collapse

[web] Fix review panel check for comments in active document

GitOrigin-RevId: fc0c35bc1d2f253c133dec5dcea7f81f68d723a9
---
 .../utils/has-active-range.ts                 |   5 +-
 .../review-panel/review-panel.spec.tsx        | 195 ++++++++++++++++--
 2 files changed, 185 insertions(+), 15 deletions(-)

diff --git a/services/web/frontend/js/features/review-panel-new/utils/has-active-range.ts b/services/web/frontend/js/features/review-panel-new/utils/has-active-range.ts
index 0934aef59f..7b636c69a3 100644
--- a/services/web/frontend/js/features/review-panel-new/utils/has-active-range.ts
+++ b/services/web/frontend/js/features/review-panel-new/utils/has-active-range.ts
@@ -15,8 +15,9 @@ export const hasActiveRange = (
     return true
   }
 
-  for (const thread of Object.values(threads)) {
-    if (!thread.resolved) {
+  for (const comment of ranges.comments) {
+    const thread = threads[comment.op.t]
+    if (thread && !thread.resolved) {
       return true
     }
   }
diff --git a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
index 58ac3e443d..9cccd5093b 100644
--- a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
+++ b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
@@ -8,6 +8,19 @@ import { mockScope } from '../source-editor/helpers/mock-scope'
 import { TestContainer } from '../source-editor/helpers/test-container'
 import { docId } from '../source-editor/helpers/mock-doc'
 
+const userData = {
+  avatar_text: 'User',
+  email: USER_EMAIL,
+  hue: 180,
+  id: USER_ID,
+  isSelf: true,
+  first_name: 'Test',
+  last_name: 'User',
+}
+
+const resolvedThreadId = 'resolved-thread-id'
+const unresolvedThreadId = 'unresolved-thread-id'
+
 describe('<ReviewPanel />', function () {
   beforeEach(function () {
     window.metaAttributesCache.set('ol-preventCompileOnLoad', true)
@@ -23,19 +36,6 @@ describe('<ReviewPanel />', function () {
       },
     ])
 
-    const userData = {
-      avatar_text: 'User',
-      email: USER_EMAIL,
-      hue: 180,
-      id: USER_ID,
-      isSelf: true,
-      first_name: 'Test',
-      last_name: 'User',
-    }
-
-    const resolvedThreadId = 'resolved-thread-id'
-    const unresolvedThreadId = 'unresolved-thread-id'
-
     cy.intercept('GET', '/project/*/threads', {
       // Resolved comment thread
       [resolvedThreadId]: {
@@ -623,6 +623,175 @@ describe('<ReviewPanel />', function () {
   })
 })
 
+describe('<ReviewPanel /> in mini mode', function () {
+  function render({ comments = [], changes = [], threads = {} }: any) {
+    window.metaAttributesCache.set('ol-preventCompileOnLoad', true)
+
+    cy.interceptEvents()
+
+    cy.intercept('GET', '/project/*/changes/users', [
+      {
+        id: USER_ID,
+        email: USER_EMAIL,
+        first_name: 'Test',
+        last_name: 'User',
+      },
+    ])
+
+    const getChanges = cy.stub().as('getChanges').returns([])
+    const removeChangeIds = cy.stub().as('removeChangeIds')
+
+    const scope = mockScope(undefined, {
+      docOptions: {
+        rangesOptions: {
+          comments,
+          changes,
+          getChanges,
+          removeChangeIds,
+        },
+      },
+      projectFeatures: { trackChangesVisible: true },
+    })
+
+    cy.intercept('GET', '/project/*/ranges', [
+      {
+        id: docId,
+        ranges: {
+          changes,
+          comments,
+          docId,
+        },
+      },
+    ])
+
+    cy.intercept('GET', '/project/*/threads', threads)
+
+    cy.intercept('POST', `/project/*/doc/${docId}/metadata`, {})
+
+    cy.wrap(scope).as('scope')
+
+    cy.mount(
+      <TestContainer>
+        <EditorProviders scope={scope}>
+          <CodeMirrorEditor />
+        </EditorProviders>
+      </TestContainer>
+    )
+    // Wait for editor
+    cy.get('.cm-content').should('have.css', 'opacity', '1')
+
+    // Toggle the review panel twice to ensure data is loaded
+    cy.findByText('contentLine 0').type('{command}jj', {
+      scrollBehavior: false,
+    })
+    cy.findByText('contentLine 1').type('{ctrl}jj', { scrollBehavior: false })
+  }
+
+  it("doesn't render mini when no comments or changes are present in project", function () {
+    render({
+      comments: [],
+      changes: [],
+      threads: {},
+    })
+    cy.get('.review-panel-mini').should('not.exist')
+  })
+
+  it("doesn't render mini when no comments or changes are present in document", function () {
+    render({
+      comments: [],
+      changes: [],
+      threads: {
+        'random-unrelated-thread': {
+          messages: [
+            {
+              content: 'a comment',
+              id: 'random-unrelated-thread-1',
+              timestamp: new Date('2025-01-01T01:00:00.000Z'),
+              user: userData,
+              user_id: USER_ID,
+            },
+          ],
+        },
+      },
+    })
+    cy.get('.review-panel-mini').should('not.exist')
+  })
+
+  it("doesn't render mini when a resolved comments is present in document", function () {
+    render({
+      comments: [
+        {
+          id: resolvedThreadId,
+          op: { p: 161, c: 'Your introduction', t: resolvedThreadId },
+        },
+      ],
+      changes: [],
+      threads: {
+        [resolvedThreadId]: {
+          resolved: true,
+          resolved_at: new Date('2025-01-02T00:00:00.000Z').toISOString(),
+          resolved_by_user_id: USER_ID,
+          resolved_by_user: userData,
+          messages: [
+            {
+              content: 'a comment',
+              id: `${resolvedThreadId}-1`,
+              timestamp: new Date('2025-01-01T01:00:00.000Z'),
+              user: userData,
+              user_id: USER_ID,
+            },
+          ],
+        },
+      },
+    })
+    cy.get('.review-panel-mini').should('not.exist')
+  })
+
+  it('renders mini when a unresolved comments is present in document', function () {
+    render({
+      comments: [
+        {
+          id: unresolvedThreadId,
+          op: { p: 161, c: 'Your introduction', t: unresolvedThreadId },
+        },
+      ],
+      changes: [],
+      threads: {
+        [unresolvedThreadId]: {
+          messages: [
+            {
+              content: 'a comment',
+              id: `${unresolvedThreadId}-1`,
+              timestamp: new Date('2025-01-01T01:00:00.000Z'),
+              user: userData,
+              user_id: USER_ID,
+            },
+          ],
+        },
+      },
+    })
+    cy.get('.review-panel-mini').should('exist')
+  })
+
+  it('renders mini when a tracked change is present in document', function () {
+    render({
+      comments: [],
+      changes: [
+        {
+          metadata: {
+            user_id: USER_ID,
+            ts: new Date('2025-01-01T00:00:00.000Z'),
+          },
+          id: 'inserted-op-id',
+          op: { p: 166, t: 'inserted-op-id', i: 'introduction' },
+        },
+      ],
+      threads: {},
+    })
+    cy.get('.review-panel-mini').should('exist')
+  })
+})
+
 describe('<ReviewPanel /> for free users', function () {
   function mountEditor(ownerId = USER_ID) {
     const scope = mockScope(undefined, {

From c10b95ae067eaad1dfbaef032be81ade286ef349 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 7 Jul 2025 12:13:04 +0100
Subject: [PATCH 118/274] Merge pull request #26757 from
 overleaf/mj-papers-notification-teardown

[web] Tear down papers-notification-banner

GitOrigin-RevId: c6cb0affe85147f34f3dc6c36041fe190faf7ff2
---
 .../Project/ProjectListController.mjs         |  9 --
 .../web/frontend/extracted-translations.json  |  3 -
 .../hooks/use-papers-notification.ts          | 16 ----
 .../papers-notification-banner.tsx            | 86 -------------------
 .../notifications/user-notifications.tsx      |  5 --
 services/web/locales/en.json                  |  3 -
 6 files changed, 122 deletions(-)
 delete mode 100644 services/web/frontend/js/features/project-list/components/notifications/hooks/use-papers-notification.ts
 delete mode 100644 services/web/frontend/js/features/project-list/components/notifications/papers-notification-banner.tsx

diff --git a/services/web/app/src/Features/Project/ProjectListController.mjs b/services/web/app/src/Features/Project/ProjectListController.mjs
index 2e1ca6a01a..60d964e532 100644
--- a/services/web/app/src/Features/Project/ProjectListController.mjs
+++ b/services/web/app/src/Features/Project/ProjectListController.mjs
@@ -403,15 +403,6 @@ async function projectListPage(req, res, next) {
     logger.error({ err: error }, 'Failed to get individual subscription')
   }
 
-  // Get the user's assignment for the papers notification banner split test,
-  // which populates splitTestVariants with a value for the split test name and
-  // allows Pug to send it to the browser
-  await SplitTestHandler.promises.getAssignment(
-    req,
-    res,
-    'papers-notification-banner'
-  )
-
   const aiAssistNotificationAssignment =
     await SplitTestHandler.promises.getAssignment(
       req,
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 0ab9ce236b..7a1655fcea 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -130,7 +130,6 @@
   "all_projects_will_be_transferred_immediately": "",
   "all_these_experiments_are_available_exclusively": "",
   "allows_to_search_by_author_title_etc_possible_to_pull_results_directly_from_your_reference_manager_if_connected": "",
-  "already_have_a_papers_account": "",
   "an_email_has_already_been_sent_to": "",
   "an_error_occured_while_restoring_project": "",
   "an_error_occurred_when_verifying_the_coupon_code": "",
@@ -1924,7 +1923,6 @@
   "try_for_free": "",
   "try_it_for_free": "",
   "try_now": "",
-  "try_papers_for_free": "",
   "try_premium_for_free": "",
   "try_recompile_project_or_troubleshoot": "",
   "try_relinking_provider": "",
@@ -2142,7 +2140,6 @@
   "you_can_manage_your_reference_manager_integrations_from_your_account_settings_page": "",
   "you_can_now_enable_sso": "",
   "you_can_now_log_in_sso": "",
-  "you_can_now_sync_your_papers_library_directly_with_your_overleaf_projects": "",
   "you_can_request_a_maximum_of_limit_fixes_per_day": "",
   "you_can_select_or_invite_collaborator": "",
   "you_can_select_or_invite_collaborator_plural": "",
diff --git a/services/web/frontend/js/features/project-list/components/notifications/hooks/use-papers-notification.ts b/services/web/frontend/js/features/project-list/components/notifications/hooks/use-papers-notification.ts
deleted file mode 100644
index 42eafe25c0..0000000000
--- a/services/web/frontend/js/features/project-list/components/notifications/hooks/use-papers-notification.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useFeatureFlag } from '@/shared/context/split-test-context'
-import getMeta from '@/utils/meta'
-
-export const usePapersNotification = () => {
-  const user = getMeta('ol-user')
-  const inRollout = useFeatureFlag('papers-notification-banner')
-  const shouldShow =
-    inRollout &&
-    user &&
-    (user.features?.references || user.features?.papers) &&
-    !user.refProviders?.mendeley &&
-    !user.refProviders?.zotero &&
-    !user.refProviders?.papers
-
-  return { shouldShow }
-}
diff --git a/services/web/frontend/js/features/project-list/components/notifications/papers-notification-banner.tsx b/services/web/frontend/js/features/project-list/components/notifications/papers-notification-banner.tsx
deleted file mode 100644
index 5cb0c0e024..0000000000
--- a/services/web/frontend/js/features/project-list/components/notifications/papers-notification-banner.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { memo, useCallback, useEffect } from 'react'
-import Notification from './notification'
-import { Trans, useTranslation } from 'react-i18next'
-import OLButton from '@/features/ui/components/ol/ol-button'
-import usePersistedState from '@/shared/hooks/use-persisted-state'
-import { sendMB } from '@/infrastructure/event-tracking'
-
-function PapersNotificationBanner() {
-  const { t } = useTranslation()
-  const [dismissed, setDismissed] = usePersistedState(
-    'papers-notification-banner-dismissed',
-    false
-  )
-
-  useEffect(() => {
-    if (!dismissed) {
-      sendMB('promo-prompt', {
-        location: 'dashboard-banner',
-        name: 'papers-integration',
-      })
-    }
-  }, [dismissed])
-
-  const handleClose = useCallback(() => {
-    sendMB('promo-dismiss', {
-      location: 'dashboard-banner',
-      name: 'papers-integration',
-    })
-    setDismissed(true)
-  }, [setDismissed])
-
-  const handlePapersButtonClick = useCallback(() => {
-    sendMB('promo-click', {
-      location: 'dashboard-banner',
-      name: 'papers-integration',
-      type: 'click-try-for-free',
-    })
-  }, [])
-
-  const handleSettingsLinkClick = useCallback(() => {
-    sendMB('promo-click', {
-      location: 'dashboard-banner',
-      name: 'papers-integration',
-      type: 'click-link-account',
-    })
-  }, [])
-
-  if (dismissed) return null
-
-  return (
-    <Notification
-      type="info"
-      title={t(
-        'you_can_now_sync_your_papers_library_directly_with_your_overleaf_projects'
-      )}
-      onDismiss={handleClose}
-      content={
-        <p>
-          <Trans
-            i18nKey="already_have_a_papers_account"
-            components={[
-              // eslint-disable-next-line react/jsx-key, jsx-a11y/anchor-has-content
-              <a
-                onClick={handleSettingsLinkClick}
-                href="/user/settings#references"
-              />,
-            ]}
-          />
-        </p>
-      }
-      action={
-        <OLButton
-          variant="secondary"
-          onClick={handlePapersButtonClick}
-          href="https://www.papersapp.com/30-day-trial/?utm_source=overleaf_inproduct&utm_medium=referral&utm_campaign=overleaf_integration"
-          target="_blank"
-          rel="noreferrer"
-        >
-          {t('try_papers_for_free')}
-        </OLButton>
-      }
-    />
-  )
-}
-
-export default memo(PapersNotificationBanner)
diff --git a/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx b/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx
index b21cfd28ea..89570b9240 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/user-notifications.tsx
@@ -13,9 +13,7 @@ import {
   DeprecatedBrowser,
   isDeprecatedBrowser,
 } from '@/shared/components/deprecated-browser'
-import PapersNotificationBanner from './papers-notification-banner'
 import AiAssistBanner from './ai-assist-banner'
-import { usePapersNotification } from './hooks/use-papers-notification'
 
 const [enrollmentNotificationModule] = importOverleafModules(
   'managedGroupSubscriptionEnrollmentNotification'
@@ -35,8 +33,6 @@ function UserNotifications() {
   const groupSubscriptionsPendingEnrollment =
     getMeta('ol-groupSubscriptionsPendingEnrollment') || []
 
-  const { shouldShow: showPapersNotificationBanner } = usePapersNotification()
-
   return (
     <div className="user-notifications notification-list">
       <ul className="list-unstyled">
@@ -57,7 +53,6 @@ function UserNotifications() {
         <GroupsAndEnterpriseBanner />
         {USGovBanner && <USGovBanner />}
 
-        {showPapersNotificationBanner && <PapersNotificationBanner />}
         <AiAssistBanner />
         <AccessibilitySurveyBanner />
 
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index c77180d440..4aeb809ae9 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -159,7 +159,6 @@
   "all_the_pros_of_our_standard_plan_plus_unlimited_collab": "All the pros of our standard plan, plus unlimited collaborators per project.",
   "all_these_experiments_are_available_exclusively": "All these experiments are available exclusively to members of the Labs program. If you sign up, you can choose which experiments you want to try.",
   "allows_to_search_by_author_title_etc_possible_to_pull_results_directly_from_your_reference_manager_if_connected": "Allows to search by author, title, etc. Possible to pull results directly from your reference manager (if connected).",
-  "already_have_a_papers_account": "Managing your citations and bibliographies in Overleaf just got way easier! Already have a Papers account? <0>Link your account here</0>.",
   "already_have_an_account": "Already have an account?",
   "already_have_sl_account": "Already have an __appName__ account?",
   "also": "Also",
@@ -2454,7 +2453,6 @@
   "try_for_free": "Try for free",
   "try_it_for_free": "Try it for free",
   "try_now": "Try Now",
-  "try_papers_for_free": "Try Papers for free",
   "try_premium_for_free": "Try Premium for free",
   "try_recompile_project_or_troubleshoot": "Please try recompiling the project from scratch, and if that doesn’t help, follow our <0>troubleshooting guide</0>.",
   "try_relinking_provider": "It looks like you need to re-link your __provider__ account.",
@@ -2698,7 +2696,6 @@
   "you_can_manage_your_reference_manager_integrations_from_your_account_settings_page": "You can manage your reference manager integrations from your <0>account settings page</0>.",
   "you_can_now_enable_sso": "You can now enable SSO on your group settings page.",
   "you_can_now_log_in_sso": "You can now log in through your institution and if eligible you will receive <0>__appName__ Professional features</0>.",
-  "you_can_now_sync_your_papers_library_directly_with_your_overleaf_projects": "You can now sync your Papers library directly with your Overleaf projects",
   "you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page": "You can <0>opt in and out</0> of the program at any time on this page",
   "you_can_request_a_maximum_of_limit_fixes_per_day": "You can request a maximum of __limit__ fixes per day. Please try again tomorrow.",
   "you_can_select_or_invite_collaborator": "You can select or invite __count__ collaborator on your current plan. Upgrade to add more editors or reviewers.",

From 23403a7ef2935bcd6d4d9de2a5b1f45c279a97ad Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 7 Jul 2025 12:17:45 +0100
Subject: [PATCH 119/274] Merge pull request #26771 from
 overleaf/td-tooltip-click-trigger

Make OLTooltip with click trigger work

GitOrigin-RevId: e4b976255dd514af0cfa199b9bd6815b3a8a09ef
---
 .../js/features/ui/components/bootstrap-5/tooltip.tsx     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
index ac7dcb3858..5582a00ca7 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/tooltip.tsx
@@ -100,9 +100,11 @@ function Tooltip({
       show={show}
       onToggle={setShow}
     >
-      {cloneElement(children, {
-        onClick: callFnsInSequence(children.props.onClick, hideTooltip),
-      })}
+      {overlayProps?.trigger === 'click'
+        ? children
+        : cloneElement(children, {
+            onClick: callFnsInSequence(children.props.onClick, hideTooltip),
+          })}
     </OverlayTrigger>
   )
 }

From 16135bde642a38fe4b364f691a8d66eb4e60b00d Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Mon, 7 Jul 2025 12:21:22 +0100
Subject: [PATCH 120/274] Merge pull request #26874 from
 overleaf/bg-sp-hotfix-5-5-2-cve-2024-22088

add security update for CVE-2025-22088 in CE/SP 5.5.2 hotfix

GitOrigin-RevId: 6c61e0a120b82d5f5edb29b3a5f96c4dac6f1a68
---
 server-ce/hotfix/5.5.2/Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server-ce/hotfix/5.5.2/Dockerfile b/server-ce/hotfix/5.5.2/Dockerfile
index db9d8f27ee..13f82e81a4 100644
--- a/server-ce/hotfix/5.5.2/Dockerfile
+++ b/server-ce/hotfix/5.5.2/Dockerfile
@@ -18,5 +18,10 @@ RUN patch -p1 < pr_26783.patch && rm pr_26783.patch
 COPY pr_26697.patch .
 RUN patch -p1 < pr_26697.patch && rm pr_26697.patch
 
+# Apply security updates to base image
+RUN apt update && apt install -y linux-libc-dev \
+  && unattended-upgrade --verbose --no-minimal-upgrade-steps \
+  && rm -rf /var/lib/apt/lists/*
+
 # Recompile frontend assets
 RUN node genScript compile | bash

From 2cacf8f645353e13106bd21efda57cb7b385d7a7 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Mon, 7 Jul 2025 13:22:49 +0100
Subject: [PATCH 121/274] [web] Fix zip name in e2e tests (#26888)

GitOrigin-RevId: d0efd0f09af04ea5039d0f5335f8d1a776dcf3a3
---
 server-ce/test/editor.spec.ts       | 3 ++-
 server-ce/test/project-list.spec.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server-ce/test/editor.spec.ts b/server-ce/test/editor.spec.ts
index 7a34f26573..f8f7f0f53c 100644
--- a/server-ce/test/editor.spec.ts
+++ b/server-ce/test/editor.spec.ts
@@ -147,8 +147,9 @@ describe('editor', () => {
 
     it('can download project sources', () => {
       cy.get('a').contains('Source').click()
+      const zipName = projectName.replaceAll('-', '_')
       cy.task('readFileInZip', {
-        pathToZip: `cypress/downloads/${projectName}.zip`,
+        pathToZip: `cypress/downloads/${zipName}.zip`,
         fileToRead: 'main.tex',
       }).should('contain', 'Your introduction goes here')
     })
diff --git a/server-ce/test/project-list.spec.ts b/server-ce/test/project-list.spec.ts
index 6b038f320c..998fcf9ffb 100644
--- a/server-ce/test/project-list.spec.ts
+++ b/server-ce/test/project-list.spec.ts
@@ -44,8 +44,9 @@ describe('Project List', () => {
         cy.findByRole('button', { name: 'Download .zip file' }).click()
       )
 
+      const zipName = projectName.replaceAll('-', '_')
       cy.task('readFileInZip', {
-        pathToZip: `cypress/downloads/${projectName}.zip`,
+        pathToZip: `cypress/downloads/${zipName}.zip`,
         fileToRead: 'main.tex',
       }).should('contain', 'Your introduction goes here')
     })

From 5973c90e398a8b42c2185ed279a43553d11d6de4 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Mon, 7 Jul 2025 13:45:24 +0100
Subject: [PATCH 122/274] Merge pull request #26726 from
 overleaf/dp-capitalize-pdf

Capitalize PDF in pdf error state

GitOrigin-RevId: 8a2f42cbadcc355759d836d68bfbb712dfae46ab
---
 services/web/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 4aeb809ae9..dae652d4b1 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -2608,7 +2608,7 @@
   "visual_editor_is_only_available_for_tex_files": "Visual Editor is only available for TeX files",
   "want_access_to_overleaf_premium_features_through_your_university": "Want access to __appName__ premium features through your university?",
   "want_change_to_apply_before_plan_end": "If you wish this change to apply before the end of your current billing period, please contact us.",
-  "we_are_unable_to_generate_the_pdf_at_this_time": "We are unable to generate the pdf at this time.",
+  "we_are_unable_to_generate_the_pdf_at_this_time": "We are unable to generate the PDF at this time.",
   "we_are_unable_to_opt_you_into_this_experiment": "We are unable to opt you into this experiment at this time, please ensure your organization has allowed this feature, or try again later.",
   "we_cant_confirm_this_email": "We can’t confirm this email",
   "we_cant_find_any_sections_or_subsections_in_this_file": "We can’t find any sections or subsections in this file",

From d4ab715a9bbbe82d0a039d705776b72f244bb573 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Mon, 7 Jul 2025 13:45:35 +0100
Subject: [PATCH 123/274] Merge pull request #26738 from
 overleaf/dp-search-filter-select-color

Fix selected state color for search modifiers in dark mode

GitOrigin-RevId: 9f488bdb57591d3f92c52283778ce38ee9e315b5
---
 .../stylesheets/full-project-search.scss      | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss b/services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss
index 4b19b7e894..b434205a63 100644
--- a/services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss
+++ b/services/web/modules/full-project-search/frontend/stylesheets/full-project-search.scss
@@ -12,15 +12,15 @@
     --matched-hit-selected-unfocused-highlight-color: var(--bg-accent-02);
     --collapsible-file-header-count-color: var(--content-primary);
     --collapsible-file-header-count-bg-color: var(--bg-light-tertiary);
+    --search-modifier-checked-bg: var(--bg-accent-03);
+    --search-modifier-hover-color: var(--bg-light-secondary);
 
     // Redesign additions
     --full-project-search-border-color: var(--border-divider);
     --collapsible-file-header-hover-bg: var(--bg-light-secondary);
     --matched-hit-highlight-text-color: var(--content-primary);
     --matched-file-hit-hover-bg: var(--bg-light-secondary);
-    --search-modifier-checked-bg: var(--bg-accent-03);
     --search-modifier-checked-color: var(--green-70);
-    --search-modifier-hover-color: var(--bg-light-secondary);
     --search-modifier-color: var(--content-primary);
 
     &[data-bs-theme='dark'] {
@@ -35,15 +35,15 @@
       --collapsible-file-header-count-color: var(--content-primary);
       --collapsible-file-header-count-bg-color: var(--bg-light-tertiary);
       --panel-heading-color: var(--content-primary-dark);
+      --search-modifier-checked-bg: var(--green-70);
+      --search-modifier-hover-color: var(--bg-dark-secondary);
 
       // Redesign additions
       --full-project-search-border-color: var(--border-divider-dark);
       --collapsible-file-header-hover-bg: var(--bg-dark-secondary);
       --matched-hit-highlight-text-color: var(--green-10);
       --matched-file-hit-hover-bg: var(--bg-dark-secondary);
-      --search-modifier-checked-bg: var(--green-70);
       --search-modifier-checked-color: var(--green-10);
-      --search-modifier-hover-color: var(--bg-dark-secondary);
       --search-modifier-color: var(--content-primary-dark);
 
       input[type='search']::selection {
@@ -53,17 +53,11 @@
 
     .full-project-search-modifiers {
       input:checked ~ .form-check-label {
-        background-color: var(--search-modifier-checked-bg);
         color: var(--search-modifier-checked-color);
       }
 
       .form-check-label {
         color: var(--search-modifier-color);
-
-        &:hover,
-        &:focus {
-          background-color: var(--search-modifier-hover-color);
-        }
       }
     }
 
@@ -136,6 +130,8 @@
   --matched-hit-selected-unfocused-highlight-color: var(--bg-accent-02);
   --collapsible-file-header-count-color: var(--bs-body-color);
   --collapsible-file-header-count-bg-color: var(--bg-light-secondary);
+  --search-modifier-checked-bg: var(--neutral-30);
+  --search-modifier-hover-color: var(--neutral-20);
 
   &[data-bs-theme='dark'] {
     --full-project-search-bg-color: var(--bg-dark-secondary);
@@ -149,23 +145,16 @@
     --collapsible-file-header-count-color: var(--bs-body-color);
     --collapsible-file-header-count-bg-color: var(--bg-dark-secondary);
     --panel-heading-color: var(--content-primary-dark);
+    --search-modifier-checked-bg: var(--neutral-90);
+    --search-modifier-hover-color: var(--neutral-70);
 
     input[type='search']::selection {
       background-color: #b4d1ff;
     }
 
     .full-project-search-modifiers {
-      input:checked ~ .form-check-label {
-        background-color: var(--neutral-90);
-      }
-
       .form-check-label {
         color: inherit;
-
-        &:hover,
-        &:focus {
-          background-color: var(--neutral-70);
-        }
       }
     }
 
@@ -238,7 +227,7 @@
 
       &:hover,
       &:focus {
-        background-color: var(--neutral-20);
+        background-color: var(--search-modifier-hover-color);
       }
     }
 
@@ -247,7 +236,7 @@
     }
 
     input:checked ~ .form-check-label {
-      background-color: var(--neutral-30);
+      background-color: var(--search-modifier-checked-bg);
     }
   }
 

From b3c339464eed19e9ce4e7fd1319fa2971425a6d2 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Mon, 7 Jul 2025 07:02:05 -0700
Subject: [PATCH 124/274] Merge pull request #25911 from
 overleaf/mf-stripe-payment-page-form-submit-event

[web] Simulate `payment-page-form-submit` event for Stripe subscription

GitOrigin-RevId: 8cfa1a2d91aaea4314a4a40f3256bade50507084
---
 services/web/types/stripe/metadata.ts         | 14 +++++++++
 services/web/types/stripe/webhook-event.ts    | 10 +++++++
 .../web/types/subscription/analytics-event.ts | 30 +++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 services/web/types/stripe/metadata.ts
 create mode 100644 services/web/types/subscription/analytics-event.ts

diff --git a/services/web/types/stripe/metadata.ts b/services/web/types/stripe/metadata.ts
new file mode 100644
index 0000000000..17861d3d16
--- /dev/null
+++ b/services/web/types/stripe/metadata.ts
@@ -0,0 +1,14 @@
+import Stripe from 'stripe'
+import { RecurlyPlanCode } from '../subscription/plan'
+
+type MetadataPlanCode = Exclude<
+  RecurlyPlanCode,
+  | 'professional_free_trial_7_days'
+  | 'student_free_trial_7_days'
+  | 'collaborator_free_trial_7_days'
+>
+
+export type ProductMetadata = Stripe.Metadata & {
+  planCode: MetadataPlanCode
+  addOnCode?: Extract<RecurlyPlanCode, 'assistant'>
+}
diff --git a/services/web/types/stripe/webhook-event.ts b/services/web/types/stripe/webhook-event.ts
index f6e36b8b0a..c0c182e047 100644
--- a/services/web/types/stripe/webhook-event.ts
+++ b/services/web/types/stripe/webhook-event.ts
@@ -53,6 +53,15 @@ export type InvoicePaidWebhookEvent = {
   data: {
     object: Stripe.Invoice
   }
+  request: Stripe.Event.Request
+}
+
+export type PaymentIntentPaymentFailedWebhookEvent = {
+  type: 'payment_intent.payment_failed'
+  data: {
+    object: Stripe.PaymentIntent
+  }
+  request: Stripe.Event.Request
 }
 
 export type CustomerSubscriptionWebhookEvent =
@@ -63,3 +72,4 @@ export type CustomerSubscriptionWebhookEvent =
 export type WebhookEvent =
   | CustomerSubscriptionWebhookEvent
   | InvoicePaidWebhookEvent
+  | PaymentIntentPaymentFailedWebhookEvent
diff --git a/services/web/types/subscription/analytics-event.ts b/services/web/types/subscription/analytics-event.ts
new file mode 100644
index 0000000000..8633884a7d
--- /dev/null
+++ b/services/web/types/subscription/analytics-event.ts
@@ -0,0 +1,30 @@
+import { CurrencyCode } from './currency'
+import { PaymentProvider } from './dashboard/subscription'
+
+type PaymentPageFormSubmitEventBaseSegmentation = {
+  currencyCode: CurrencyCode
+  plan_code?: string
+  coupon_code: string
+  isPaypal: boolean
+  upgradeType: 'standalone'
+  referrer?: string
+}
+
+type PaymentPageFormSubmitEventStripeSegmentation =
+  PaymentPageFormSubmitEventBaseSegmentation & {
+    payment_provider: Exclude<PaymentProvider['service'], 'recurly'>
+    stripe_price_id: string
+    stripe_price_lookup_key: string
+  }
+
+type PaymentPageFormSubmitEventRecurlySegmentation =
+  PaymentPageFormSubmitEventBaseSegmentation & {
+    payment_provider: Exclude<
+      PaymentProvider['service'],
+      'stripe-us' | 'stripe-uk'
+    >
+  }
+
+export type PaymentPageFormSubmitEventSegmentation =
+  | PaymentPageFormSubmitEventStripeSegmentation
+  | PaymentPageFormSubmitEventRecurlySegmentation

From 16f3795c3ef2561ccf3caa0782f2f2699a102c97 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Mon, 7 Jul 2025 07:02:20 -0700
Subject: [PATCH 125/274] Merge pull request #25962 from
 overleaf/mf-stripe-payment-page-form-success-event

[web] Simulate sending `payment-page-form-success` event when user successfully subscribe using Stripe

GitOrigin-RevId: 82243fc16d3410670e4e6e9c0ccd487a5f2253a3
---
 .../web/types/subscription/analytics-event.ts | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/services/web/types/subscription/analytics-event.ts b/services/web/types/subscription/analytics-event.ts
index 8633884a7d..98ce12fdf1 100644
--- a/services/web/types/subscription/analytics-event.ts
+++ b/services/web/types/subscription/analytics-event.ts
@@ -1,5 +1,9 @@
 import { CurrencyCode } from './currency'
-import { PaymentProvider } from './dashboard/subscription'
+import {
+  PaymentProvider,
+  StripePaymentProviderService,
+} from './dashboard/subscription'
+import { RecurlyPlanCode } from './plan'
 
 type PaymentPageFormSubmitEventBaseSegmentation = {
   currencyCode: CurrencyCode
@@ -12,7 +16,7 @@ type PaymentPageFormSubmitEventBaseSegmentation = {
 
 type PaymentPageFormSubmitEventStripeSegmentation =
   PaymentPageFormSubmitEventBaseSegmentation & {
-    payment_provider: Exclude<PaymentProvider['service'], 'recurly'>
+    payment_provider: StripePaymentProviderService
     stripe_price_id: string
     stripe_price_lookup_key: string
   }
@@ -28,3 +32,25 @@ type PaymentPageFormSubmitEventRecurlySegmentation =
 export type PaymentPageFormSubmitEventSegmentation =
   | PaymentPageFormSubmitEventStripeSegmentation
   | PaymentPageFormSubmitEventRecurlySegmentation
+
+type PaymentPageFormSuccessEventBaseSegmentation = {
+  plan?: RecurlyPlanCode
+  upgradeType: 'standalone'
+  referrer?: string
+}
+
+type PaymentPageFormSuccessEventStripeSegmentation =
+  PaymentPageFormSuccessEventBaseSegmentation & {
+    payment_provider: StripePaymentProviderService
+    stripe_price_id: string
+    stripe_price_lookup_key: string
+  }
+
+type PaymentPageFormSuccessEventRecurlySegmentation =
+  PaymentPageFormSuccessEventBaseSegmentation & {
+    payment_provider: 'recurly'
+  }
+
+export type PaymentPageFormSuccessEventSegmentation =
+  | PaymentPageFormSuccessEventStripeSegmentation
+  | PaymentPageFormSuccessEventRecurlySegmentation

From 83a00e7546920ba4d4cb5093b4d3054ccc4426ee Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Mon, 7 Jul 2025 18:12:47 +0200
Subject: [PATCH 126/274] Remove info Badge from the left menu (#26856)

GitOrigin-RevId: 108571730106aea29db2454b646c88cc9fc3f39a
---
 .../web/frontend/extracted-translations.json  |  2 -
 .../settings/settings-font-family.tsx         | 57 +++++++------------
 .../bootstrap-5/pages/editor/left-menu.scss   | 14 -----
 services/web/locales/en.json                  |  2 -
 4 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 7a1655fcea..6e6dfdc5d4 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -259,7 +259,6 @@
   "clear_cached_files": "",
   "clear_search": "",
   "click_here_to_view_sl_in_lng": "",
-  "click_to_give_feedback": "",
   "click_to_unpause": "",
   "clicking_delete_will_remove_sso_config_and_clear_saml_data": "",
   "clone_with_git": "",
@@ -1082,7 +1081,6 @@
   "new_error_logs_panel": "",
   "new_file": "",
   "new_folder": "",
-  "new_font_open_dyslexic": "",
   "new_look_and_feel": "",
   "new_look_and_placement_of_the_settings": "",
   "new_name": "",
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
index a0c2ec49dc..61f85c1e70 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
@@ -1,7 +1,6 @@
 import { useTranslation } from 'react-i18next'
 import { useProjectSettingsContext } from '../../context/project-settings-context'
 import SettingsMenuSelect from './settings-menu-select'
-import BetaBadge from '@/shared/components/beta-badge'
 import { FontFamily } from '@/shared/utils/styles'
 
 export default function SettingsFontFamily() {
@@ -9,40 +8,26 @@ export default function SettingsFontFamily() {
   const { fontFamily, setFontFamily } = useProjectSettingsContext()
 
   return (
-    <div className="left-menu-setting-position">
-      <SettingsMenuSelect<FontFamily>
-        onChange={setFontFamily}
-        value={fontFamily}
-        options={[
-          {
-            value: 'monaco',
-            label: 'Monaco / Menlo / Consolas',
-          },
-          {
-            value: 'lucida',
-            label: 'Lucida / Source Code Pro',
-          },
-          {
-            value: 'opendyslexicmono',
-            label: 'OpenDyslexic Mono',
-          },
-        ]}
-        label={t('font_family')}
-        name="fontFamily"
-        translateOptions="no"
-      />
-      <BetaBadge
-        phase="release"
-        link={{
-          href: 'https://docs.google.com/forms/d/e/1FAIpQLScOt_IHTrcaM_uitP9dgCo_r4dl4cy9Ry6LhYYcwTN4qDTDUg/viewform',
-          className: 'left-menu-setting-icon',
-        }}
-        tooltip={{
-          id: 'font-family-tooltip',
-          text: `${t('new_font_open_dyslexic')} ${t('click_to_give_feedback')}`,
-          placement: 'right',
-        }}
-      />
-    </div>
+    <SettingsMenuSelect<FontFamily>
+      onChange={setFontFamily}
+      value={fontFamily}
+      options={[
+        {
+          value: 'monaco',
+          label: 'Monaco / Menlo / Consolas',
+        },
+        {
+          value: 'lucida',
+          label: 'Lucida / Source Code Pro',
+        },
+        {
+          value: 'opendyslexicmono',
+          label: 'OpenDyslexic Mono',
+        },
+      ]}
+      label={t('font_family')}
+      name="fontFamily"
+      translateOptions="no"
+    />
   )
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/left-menu.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/left-menu.scss
index e40c6159f6..044a4ecefd 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/left-menu.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/left-menu.scss
@@ -129,20 +129,6 @@
     }
   }
 
-  .left-menu-setting-position {
-    position: relative;
-
-    .left-menu-setting {
-      margin-top: 0 !important;
-    }
-
-    .left-menu-setting-icon {
-      position: absolute;
-      right: 65%;
-      top: 25%;
-    }
-  }
-
   .left-menu-setting {
     padding: 0 var(--spacing-02);
     display: flex;
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index dae652d4b1..3593bfab7b 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -338,7 +338,6 @@
   "clearing": "Clearing",
   "click_here_to_view_sl_in_lng": "Click here to use __appName__ in <0>__lngName__</0>",
   "click_link_to_proceed": "Click <b>__clickText__</b> below to proceed.",
-  "click_to_give_feedback": "Click to give feedback.",
   "click_to_unpause": "Click to unpause and reactivate your Overleaf premium features.",
   "clicking_delete_will_remove_sso_config_and_clear_saml_data": "Clicking <0>Delete</0> will remove your SSO configuration and unlink all users. You can only do this when SSO is disabled in your group settings.",
   "clone_with_git": "Clone with Git",
@@ -1411,7 +1410,6 @@
   "new_error_logs_panel": "New error logs panel. Added ‘Go to location in code’ and ‘Go to location in PDF’ buttons (17 June 2025)",
   "new_file": "New file",
   "new_folder": "New folder",
-  "new_font_open_dyslexic": "New font: OpenDyslexic Mono is designed to improve readability for those with dyslexia.",
   "new_look_and_feel": "New look and feel",
   "new_look_and_placement_of_the_settings": "New look and placement of the settings",
   "new_name": "New Name",

From 5ed1225162ddb1dd05be072782d5892aee55f72a Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Mon, 7 Jul 2025 18:12:57 +0200
Subject: [PATCH 127/274] Remove admin-panel LESS stylesheet (#26797)

GitOrigin-RevId: e289ed2c82623034785d08564e01340828f7b91c
---
 .../web/frontend/stylesheets/main-style.less  |  1 -
 .../stylesheets/modules/admin-panel.less      | 37 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 services/web/frontend/stylesheets/modules/admin-panel.less

diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less
index 85368ea36e..9911686ad5 100644
--- a/services/web/frontend/stylesheets/main-style.less
+++ b/services/web/frontend/stylesheets/main-style.less
@@ -138,7 +138,6 @@
 // module styles
 // TODO: find a way for modules to add styles dynamically
 @import 'modules/symbol-palette.less';
-@import 'modules/admin-panel.less';
 @import 'modules/git-bridge-modal.less';
 @import 'modules/group-settings.less';
 @import 'modules/onboarding.less';
diff --git a/services/web/frontend/stylesheets/modules/admin-panel.less b/services/web/frontend/stylesheets/modules/admin-panel.less
deleted file mode 100644
index e1f57a4738..0000000000
--- a/services/web/frontend/stylesheets/modules/admin-panel.less
+++ /dev/null
@@ -1,37 +0,0 @@
-.admin-panel-pagination {
-  display: flex;
-  justify-content: center;
-}
-
-.phase-badge {
-  display: inline-block;
-  font-size: @font-size-small;
-  white-space: nowrap;
-  text-align: center;
-  padding: 3px 7px;
-  &:extend(.label);
-  &:extend(.label-info);
-}
-
-.scrollable {
-  max-height: calc(100vh - 40vh);
-  overflow-y: auto;
-}
-
-.hr-sect {
-  display: flex;
-  flex-basis: 100%;
-  align-items: center;
-  color: rgba(0, 0, 0, 0.35);
-  margin: 8px 0;
-}
-.hr-sect:before,
-.hr-sect:after {
-  content: '';
-  flex-grow: 1;
-  background: rgba(0, 0, 0, 0.35);
-  height: 1px;
-  font-size: 0;
-  line-height: 0;
-  margin: 0 8px;
-}

From b2fb70c2b69dc278ab4f5a32f8f6b75d91a2e8ff Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Tue, 8 Jul 2025 09:44:45 +0200
Subject: [PATCH 128/274] Add support for --any-comments to check_docs script
 (#26903)

GitOrigin-RevId: 283e761a3f305286584164b12e9736deba0064d9
---
 services/web/scripts/check_docs.mjs | 32 ++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/services/web/scripts/check_docs.mjs b/services/web/scripts/check_docs.mjs
index 699738f75c..3b7e17128e 100644
--- a/services/web/scripts/check_docs.mjs
+++ b/services/web/scripts/check_docs.mjs
@@ -16,7 +16,7 @@ const OPTS = parseArgs()
 function parseArgs() {
   const args = minimist(process.argv.slice(2), {
     string: ['min-project-id', 'max-project-id', 'project-modified-since'],
-    boolean: ['help', 'dangling-comments', 'tracked-changes'],
+    boolean: ['help', 'dangling-comments', 'tracked-changes', 'any-comments'],
   })
 
   if (args.help) {
@@ -26,9 +26,10 @@ function parseArgs() {
 
   const danglingComments = Boolean(args['dangling-comments'])
   const trackedChanges = Boolean(args['tracked-changes'])
-  if (!danglingComments && !trackedChanges) {
+  const anyComments = Boolean(args['any-comments'])
+  if (!danglingComments && !trackedChanges && !anyComments) {
     console.log(
-      'At least one of --dangling-comments or --tracked-changes must be enabled'
+      'At least one of --dangling-comments, --tracked-changes, or --any-comments must be enabled'
     )
     process.exit(1)
   }
@@ -41,6 +42,7 @@ function parseArgs() {
       : null,
     danglingComments,
     trackedChanges,
+    anyComments,
     concurrency: parseInt(args.concurrency ?? '1', 10),
   }
 }
@@ -56,6 +58,7 @@ Options:
                               Example: 2020-01-01
     --dangling-comments       Report projects with dangling comments
     --tracked-changes         Report projects with tracked changes
+    --any-comments            Report projects with any comments
     --concurrency             How many projects can be processed in parallel
     `)
 }
@@ -65,6 +68,8 @@ async function main() {
   let projectsProcessed = 0
   let danglingCommentsFound = 0
   let trackedChangesFound = 0
+  let anyCommentsFound = 0
+
   for await (const projectId of getProjectIds()) {
     await queue.onEmpty()
     queue.add(async () => {
@@ -87,6 +92,13 @@ async function main() {
         }
       }
 
+      if (OPTS.anyComments) {
+        if (docsHaveAnyComments(docs)) {
+          console.log(`Project ${projectId} has comments`)
+          anyCommentsFound += 1
+        }
+      }
+
       projectsProcessed += 1
       if (projectsProcessed % 100000 === 0) {
         console.log(
@@ -106,6 +118,10 @@ async function main() {
   if (OPTS.trackedChanges) {
     console.log(`${trackedChangesFound} projects with tracked changes found`)
   }
+
+  if (OPTS.anyComments) {
+    console.log(`${anyCommentsFound} projects with any comments found`)
+  }
 }
 
 function getProjectIds() {
@@ -213,6 +229,16 @@ function docsHaveTrackedChanges(docs) {
   return false
 }
 
+function docsHaveAnyComments(docs) {
+  for (const doc of docs) {
+    const comments = doc.ranges?.comments ?? []
+    if (comments.length > 0) {
+      return true
+    }
+  }
+  return false
+}
+
 try {
   await scriptRunner(main)
   process.exit(0)

From 132ccbc4cc420a637c2333b8d0475fe2fec76007 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Tue, 8 Jul 2025 09:07:50 +0100
Subject: [PATCH 129/274] Merge pull request #26583 from
 overleaf/td-editor-scope-values-to-context

Move scope values starting with `editor.` to contexts

GitOrigin-RevId: 7ca349ceff002228cf4e931c644c8c386eb6c597
---
 .../components/editor/editor-pane.tsx         |   7 +-
 .../context/editor-manager-context.tsx        |  61 ++--------
 .../context/editor-properties-context.tsx     | 114 ++++++++++++++++++
 .../ide-react/context/ide-react-context.tsx   |   6 +-
 .../ide-react/context/react-context-root.tsx  |  90 +++++++-------
 .../editor-manager-context-adapter.ts         |  54 ---------
 .../ide-redesign/components/editor.tsx        |  12 +-
 .../use-toolbar-menu-editor-commands.tsx      |   4 +-
 .../components/review-tooltip-menu.tsx        |   4 +-
 .../context/track-changes-state-context.tsx   |   4 +-
 .../hooks/use-overview-file-collapsed.ts      |  33 ++++-
 .../components/leavers-survey-alert.tsx       |   2 +-
 .../settings/context/user-email-context.tsx   |   4 +-
 .../components/editor-switch.tsx              |   5 +-
 .../components/toolbar/toolbar-items.tsx      |   6 +-
 .../extensions/before-change-doc.ts           |   3 +
 .../source-editor/extensions/index.ts         |   2 +-
 .../source-editor/extensions/search.ts        |  34 ++++--
 .../hooks/use-codemirror-scope.ts             |  29 ++++-
 .../js/shared/context/editor-context.tsx      |   8 --
 .../shared/context/local-compile-context.tsx  |  10 +-
 .../js/shared/hooks/use-exposed-state.ts      |  12 +-
 .../js/shared/hooks/use-persisted-state.ts    |  68 +++++------
 .../shared/hooks/use-unstable-store-sync.ts   |  11 ++
 .../web/frontend/stories/decorators/scope.tsx |   2 +-
 .../source-editor/source-editor.stories.tsx   |  36 +++++-
 .../codemirror-editor-figure-modal.spec.tsx   |  17 ++-
 ...codemirror-editor-table-generator.spec.tsx |  16 ++-
 ...ror-editor-visual-command-tooltip.spec.tsx |  16 ++-
 .../codemirror-editor-visual-floats.spec.tsx  |  16 ++-
 .../codemirror-editor-visual-list.spec.tsx    |  16 ++-
 ...demirror-editor-visual-paste-html.spec.tsx |  16 ++-
 ...codemirror-editor-visual-readonly.spec.tsx |  15 ++-
 .../codemirror-editor-visual-toolbar.spec.tsx |  16 ++-
 ...codemirror-editor-visual-tooltips.spec.tsx |  16 ++-
 .../codemirror-editor-visual.spec.tsx         |  17 ++-
 .../components/codemirror-editor.spec.tsx     |   2 +-
 .../source-editor/helpers/mock-scope.ts       |   1 -
 .../frontend/helpers/editor-providers.tsx     |  67 +++++++++-
 .../shared/hooks/use-persisted-state.test.tsx |  33 ++++-
 40 files changed, 593 insertions(+), 292 deletions(-)
 create mode 100644 services/web/frontend/js/features/ide-react/context/editor-properties-context.tsx
 delete mode 100644 services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts
 create mode 100644 services/web/frontend/js/features/source-editor/extensions/before-change-doc.ts
 create mode 100644 services/web/frontend/js/shared/hooks/use-unstable-store-sync.ts

diff --git a/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx b/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx
index 72dd27262d..b93a18db9f 100644
--- a/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx
+++ b/services/web/frontend/js/features/ide-react/components/editor/editor-pane.tsx
@@ -1,22 +1,21 @@
 import { Panel, PanelGroup } from 'react-resizable-panels'
 import React, { FC, lazy, Suspense } from 'react'
-import useScopeValue from '@/shared/hooks/use-scope-value'
 import SourceEditor from '@/features/source-editor/components/source-editor'
 import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
-import { EditorScopeValue } from '@/features/ide-react/scope-adapters/editor-manager-context-adapter'
 import classNames from 'classnames'
 import { LoadingPane } from '@/features/ide-react/components/editor/loading-pane'
 import { FullSizeLoadingSpinner } from '@/shared/components/loading-spinner'
 import { VerticalResizeHandle } from '@/features/ide-react/components/resize/vertical-resize-handle'
 import { useFileTreeOpenContext } from '@/features/ide-react/context/file-tree-open-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 
 const SymbolPalettePane = lazy(
   () => import('@/features/ide-react/components/editor/symbol-palette-pane')
 )
 
 export const EditorPane: FC = () => {
-  const [editor] = useScopeValue<EditorScopeValue>('editor')
+  const { showSymbolPalette } = useEditorPropertiesContext()
   const { selectedEntityCount, openEntity } = useFileTreeOpenContext()
   const { isLoading } = useEditorManagerContext()
   const { currentDocumentId } = useEditorOpenDocContext()
@@ -41,7 +40,7 @@ export const EditorPane: FC = () => {
           {isLoading && <LoadingPane />}
         </Panel>
 
-        {editor.showSymbolPalette && (
+        {showSymbolPalette && (
           <>
             <VerticalResizeHandle id="editor-symbol-palette" />
             <Panel
diff --git a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
index 71e827168e..fcc430dcdb 100644
--- a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx
@@ -9,8 +9,6 @@ import {
   useState,
 } from 'react'
 import { sendMB } from '@/infrastructure/event-tracking'
-import useScopeValue from '@/shared/hooks/use-scope-value'
-import { useIdeContext } from '@/shared/context/ide-context'
 import { OpenDocuments } from '@/features/ide-react/editor/open-documents'
 import EditorWatchdogManager from '@/features/ide-react/connection/editor-watchdog-manager'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
@@ -37,6 +35,7 @@ import { Update } from '@/features/history/services/types/update'
 import { useDebugDiffTracker } from '../hooks/use-debug-diff-tracker'
 import { convertFileRefToBinaryFile } from '@/features/ide-react/util/file-view'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 
 export interface GotoOffsetOptions {
   gotoOffset: number
@@ -52,7 +51,6 @@ interface OpenDocOptions
 
 export type EditorManager = {
   getEditorType: () => EditorType | null
-  showSymbolPalette: boolean
   getCurrentDocValue: () => string | null
   getCurrentDocumentId: () => DocId | null
   setIgnoringExternalUpdates: (value: boolean) => void
@@ -62,12 +60,7 @@ export type EditorManager = {
   openFileWithId: (fileId: string) => void
   openInitialDoc: (docId: string) => void
   isLoading: boolean
-  trackChanges: boolean
   jumpToLine: (options: GotoLineOptions) => void
-  wantTrackChanges: boolean
-  setWantTrackChanges: React.Dispatch<
-    React.SetStateAction<EditorManager['wantTrackChanges']>
-  >
   debugTimers: React.MutableRefObject<Record<string, number>>
 }
 
@@ -87,7 +80,6 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
   children,
 }) => {
   const { t } = useTranslation()
-  const { scopeStore } = useIdeContext()
   const { reportError, eventEmitter, projectId, setOutOfSync } =
     useIdeReactContext()
   const { socket, closeConnection, connectionState } = useConnectionContext()
@@ -95,11 +87,15 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
   const { showGenericMessageModal, genericModalVisible, showOutOfSyncModal } =
     useModalsContext()
   const { id: userId } = useUserContext()
-
-  const [showSymbolPalette, setShowSymbolPalette] = useScopeValue<boolean>(
-    'editor.showSymbolPalette'
-  )
-  const [showVisual] = useScopeValue<boolean>('editor.showVisual')
+  const {
+    showVisual,
+    opening,
+    setOpening,
+    errorState,
+    setErrorState,
+    setTrackChanges,
+    wantTrackChanges,
+  } = useEditorPropertiesContext()
   const {
     currentDocumentId,
     setCurrentDocumentId,
@@ -107,15 +103,6 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
     currentDocument,
     setCurrentDocument,
   } = useEditorOpenDocContext()
-  const [opening, setOpening] = useScopeValue<boolean>('editor.opening')
-  const [errorState, setIsInErrorState] =
-    useScopeValue<boolean>('editor.error_state')
-  const [trackChanges, setTrackChanges] = useScopeValue<boolean>(
-    'editor.trackChanges'
-  )
-  const [wantTrackChanges, setWantTrackChanges] = useScopeValue<boolean>(
-    'editor.wantTrackChanges'
-  )
 
   const wantTrackChangesRef = useRef(wantTrackChanges)
   useEffect(() => {
@@ -191,22 +178,6 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
 
   const editorOpenDocEpochRef = useRef(0)
 
-  // TODO: This looks dodgy because it wraps a state setter and is itself
-  // stored in React state in the scope store. The problem is that it needs to
-  // be exposed via the scope store because some components access it that way;
-  // it would be better to simply access it from a context, but the current
-  // implementation in EditorManager interacts with Angular scope to update
-  // the layout. Once Angular is gone, this can become a context method.
-  useEffect(() => {
-    scopeStore.set('editor.toggleSymbolPalette', () => {
-      setShowSymbolPalette(show => {
-        const newValue = !show
-        sendMB(newValue ? 'symbol-palette-show' : 'symbol-palette-hide')
-        return newValue
-      })
-    })
-  }, [scopeStore, setShowSymbolPalette])
-
   const getEditorType = useCallback((): EditorType | null => {
     if (!currentDocument) {
       return null
@@ -587,7 +558,7 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
         reportError(error, meta)
 
         // Tell the user about the error state.
-        setIsInErrorState(true)
+        setErrorState(true)
         // Ensure that the editor is locked
         setOutOfSync(true)
         // Display the "out of sync" modal
@@ -614,7 +585,7 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
     eventEmitter,
     openDoc,
     reportError,
-    setIsInErrorState,
+    setErrorState,
     showGenericMessageModal,
     showOutOfSyncModal,
     setOutOfSync,
@@ -661,25 +632,20 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
   const value: EditorManager = useMemo(
     () => ({
       getEditorType,
-      showSymbolPalette,
       getCurrentDocValue,
       getCurrentDocumentId,
       setIgnoringExternalUpdates,
       openDocWithId,
       openDoc,
       openDocs,
-      trackChanges,
       isLoading,
       openFileWithId,
       openInitialDoc,
       jumpToLine,
-      wantTrackChanges,
-      setWantTrackChanges,
       debugTimers,
     }),
     [
       getEditorType,
-      showSymbolPalette,
       getCurrentDocValue,
       getCurrentDocumentId,
       setIgnoringExternalUpdates,
@@ -688,11 +654,8 @@ export const EditorManagerProvider: FC<React.PropsWithChildren> = ({
       openDocs,
       openFileWithId,
       openInitialDoc,
-      trackChanges,
       isLoading,
       jumpToLine,
-      wantTrackChanges,
-      setWantTrackChanges,
       debugTimers,
     ]
   )
diff --git a/services/web/frontend/js/features/ide-react/context/editor-properties-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-properties-context.tsx
new file mode 100644
index 0000000000..e8fb82efa1
--- /dev/null
+++ b/services/web/frontend/js/features/ide-react/context/editor-properties-context.tsx
@@ -0,0 +1,114 @@
+import {
+  createContext,
+  Dispatch,
+  FC,
+  PropsWithChildren,
+  SetStateAction,
+  useCallback,
+  useContext,
+  useState,
+} from 'react'
+import customLocalStorage from '@/infrastructure/local-storage'
+import usePersistedState from '@/shared/hooks/use-persisted-state'
+import getMeta from '@/utils/meta'
+import { useUnstableStoreSync } from '@/shared/hooks/use-unstable-store-sync'
+import { sendMB } from '@/infrastructure/event-tracking'
+
+// Context value type
+export type EditorPropertiesContextValue = {
+  showVisual: boolean
+  setShowVisual: Dispatch<SetStateAction<boolean>>
+  showSymbolPalette: boolean
+  setShowSymbolPalette: Dispatch<SetStateAction<boolean>>
+  toggleSymbolPalette: () => void
+  opening: boolean
+  setOpening: Dispatch<SetStateAction<boolean>>
+  trackChanges: boolean
+  setTrackChanges: Dispatch<SetStateAction<boolean>>
+  wantTrackChanges: boolean
+  setWantTrackChanges: Dispatch<SetStateAction<boolean>>
+  errorState: boolean
+  setErrorState: Dispatch<SetStateAction<boolean>>
+}
+
+export const EditorPropertiesContext = createContext<
+  EditorPropertiesContextValue | undefined
+>(undefined)
+
+function showVisualFallbackValue() {
+  const projectId = getMeta('ol-project_id')
+  const editorModeKey = `editor.mode.${projectId}`
+  const editorModeVal = customLocalStorage.getItem(editorModeKey)
+
+  if (editorModeVal) {
+    // clean up the old key
+    customLocalStorage.removeItem(editorModeKey)
+  }
+
+  return editorModeVal === 'rich-text'
+}
+
+export const EditorPropertiesProvider: FC<PropsWithChildren> = ({
+  children,
+}) => {
+  const [showVisual, setShowVisual] = usePersistedState(
+    `editor.lastUsedMode`,
+    showVisualFallbackValue(),
+    {
+      converter: {
+        toPersisted: showVisual => (showVisual ? 'visual' : 'code'),
+        fromPersisted: mode => mode === 'visual',
+      },
+    }
+  )
+
+  // Sync the showVisual state with the exposed store
+  useUnstableStoreSync('editor.showVisual', showVisual)
+
+  const [showSymbolPalette, setShowSymbolPalette] = useState(false)
+
+  const toggleSymbolPalette = useCallback(() => {
+    setShowSymbolPalette(show => {
+      const newValue = !show
+      sendMB(newValue ? 'symbol-palette-show' : 'symbol-palette-hide')
+      return newValue
+    })
+  }, [setShowSymbolPalette])
+
+  const [opening, setOpening] = useState(true)
+  const [trackChanges, setTrackChanges] = useState(false)
+  const [wantTrackChanges, setWantTrackChanges] = useState(false)
+  const [errorState, setErrorState] = useState(false)
+
+  const value = {
+    showVisual,
+    setShowVisual,
+    showSymbolPalette,
+    setShowSymbolPalette,
+    toggleSymbolPalette,
+    opening,
+    setOpening,
+    trackChanges,
+    setTrackChanges,
+    wantTrackChanges,
+    setWantTrackChanges,
+    errorState,
+    setErrorState,
+  }
+
+  return (
+    <EditorPropertiesContext.Provider value={value}>
+      {children}
+    </EditorPropertiesContext.Provider>
+  )
+}
+
+export const useEditorPropertiesContext = (): EditorPropertiesContextValue => {
+  const context = useContext(EditorPropertiesContext)
+  if (!context) {
+    throw new Error(
+      'useEditorPropertiesContext is only available inside EditorPropertiesContext.Provider'
+    )
+  }
+  return context
+}
diff --git a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
index 27095adf00..147f683174 100644
--- a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
@@ -15,7 +15,6 @@ import {
 } from '@/features/ide-react/create-ide-event-emitter'
 import { JoinProjectPayload } from '@/features/ide-react/connection/join-project-payload'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
-import { populateEditorScope } from '@/features/ide-react/scope-adapters/editor-manager-context-adapter'
 import { postJSON } from '@/infrastructure/fetch-json'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
 import getMeta from '@/utils/meta'
@@ -53,7 +52,7 @@ function populatePdfScope(store: ReactScopeValueStore) {
   store.allowNonExistentPath('pdf', true)
 }
 
-export function createReactScopeValueStore(projectId: string) {
+export function createReactScopeValueStore() {
   const scopeStore = new ReactScopeValueStore()
 
   // Populate the scope value store with default values that will be used by
@@ -62,7 +61,6 @@ export function createReactScopeValueStore(projectId: string) {
   // initialization code together with the context and would only populate
   // necessary values in the store, but this is simpler for now
   populateIdeReactScope(scopeStore)
-  populateEditorScope(scopeStore, projectId)
   populateProjectScope(scopeStore)
   populatePdfScope(scopeStore)
 
@@ -73,7 +71,7 @@ export function createReactScopeValueStore(projectId: string) {
 
 export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const projectId = getMeta('ol-project_id')
-  const [scopeStore] = useState(() => createReactScopeValueStore(projectId))
+  const [scopeStore] = useState(() => createReactScopeValueStore())
   const [eventEmitter] = useState(createIdeEventEmitter)
   const [permissionsLevel, setPermissionsLevel] =
     useState<PermissionsLevel>('readOnly')
diff --git a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
index 99442eba5e..f85e2c40fa 100644
--- a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
+++ b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
@@ -5,6 +5,7 @@ import { DetachCompileProvider } from '@/shared/context/detach-compile-context'
 import { DetachProvider } from '@/shared/context/detach-context'
 import { EditorManagerProvider } from '@/features/ide-react/context/editor-manager-context'
 import { EditorOpenDocProvider } from '@/features/ide-react/context/editor-open-doc-context'
+import { EditorPropertiesProvider } from '@/features/ide-react/context/editor-properties-context'
 import { EditorProvider } from '@/shared/context/editor-context'
 import { EditorViewProvider } from '@/features/ide-react/context/editor-view-context'
 import { FileTreeDataProvider } from '@/shared/context/file-tree-data-context'
@@ -42,6 +43,7 @@ export const ReactContextRoot: FC<
     DetachProvider,
     EditorManagerProvider,
     EditorOpenDocProvider,
+    EditorPropertiesProvider,
     EditorProvider,
     EditorViewProvider,
     FileTreeDataProvider,
@@ -79,49 +81,51 @@ export const ReactContextRoot: FC<
                 <Providers.ProjectProvider>
                   <Providers.SnapshotProvider>
                     <Providers.DetachProvider>
-                      <Providers.EditorViewProvider>
-                        <Providers.EditorOpenDocProvider>
-                          <Providers.EditorProvider>
-                            <Providers.FileTreeDataProvider>
-                              <Providers.FileTreePathProvider>
-                                <Providers.ReferencesProvider>
-                                  <Providers.UserFeaturesProvider>
-                                    <Providers.PermissionsProvider>
-                                      <Providers.RailProvider>
-                                        <Providers.LayoutProvider>
-                                          <Providers.ProjectSettingsProvider>
-                                            <Providers.EditorManagerProvider>
-                                              <Providers.LocalCompileProvider>
-                                                <Providers.DetachCompileProvider>
-                                                  <Providers.ChatProvider>
-                                                    <Providers.FileTreeOpenProvider>
-                                                      <Providers.OnlineUsersProvider>
-                                                        <Providers.MetadataProvider>
-                                                          <Providers.OutlineProvider>
-                                                            <Providers.IdeRedesignSwitcherProvider>
-                                                              <Providers.CommandRegistryProvider>
-                                                                {children}
-                                                              </Providers.CommandRegistryProvider>
-                                                            </Providers.IdeRedesignSwitcherProvider>
-                                                          </Providers.OutlineProvider>
-                                                        </Providers.MetadataProvider>
-                                                      </Providers.OnlineUsersProvider>
-                                                    </Providers.FileTreeOpenProvider>
-                                                  </Providers.ChatProvider>
-                                                </Providers.DetachCompileProvider>
-                                              </Providers.LocalCompileProvider>
-                                            </Providers.EditorManagerProvider>
-                                          </Providers.ProjectSettingsProvider>
-                                        </Providers.LayoutProvider>
-                                      </Providers.RailProvider>
-                                    </Providers.PermissionsProvider>
-                                  </Providers.UserFeaturesProvider>
-                                </Providers.ReferencesProvider>
-                              </Providers.FileTreePathProvider>
-                            </Providers.FileTreeDataProvider>
-                          </Providers.EditorProvider>
-                        </Providers.EditorOpenDocProvider>
-                      </Providers.EditorViewProvider>
+                      <Providers.EditorPropertiesProvider>
+                        <Providers.EditorViewProvider>
+                          <Providers.EditorOpenDocProvider>
+                            <Providers.EditorProvider>
+                              <Providers.FileTreeDataProvider>
+                                <Providers.FileTreePathProvider>
+                                  <Providers.ReferencesProvider>
+                                    <Providers.UserFeaturesProvider>
+                                      <Providers.PermissionsProvider>
+                                        <Providers.RailProvider>
+                                          <Providers.LayoutProvider>
+                                            <Providers.ProjectSettingsProvider>
+                                              <Providers.EditorManagerProvider>
+                                                <Providers.LocalCompileProvider>
+                                                  <Providers.DetachCompileProvider>
+                                                    <Providers.ChatProvider>
+                                                      <Providers.FileTreeOpenProvider>
+                                                        <Providers.OnlineUsersProvider>
+                                                          <Providers.MetadataProvider>
+                                                            <Providers.OutlineProvider>
+                                                              <Providers.IdeRedesignSwitcherProvider>
+                                                                <Providers.CommandRegistryProvider>
+                                                                  {children}
+                                                                </Providers.CommandRegistryProvider>
+                                                              </Providers.IdeRedesignSwitcherProvider>
+                                                            </Providers.OutlineProvider>
+                                                          </Providers.MetadataProvider>
+                                                        </Providers.OnlineUsersProvider>
+                                                      </Providers.FileTreeOpenProvider>
+                                                    </Providers.ChatProvider>
+                                                  </Providers.DetachCompileProvider>
+                                                </Providers.LocalCompileProvider>
+                                              </Providers.EditorManagerProvider>
+                                            </Providers.ProjectSettingsProvider>
+                                          </Providers.LayoutProvider>
+                                        </Providers.RailProvider>
+                                      </Providers.PermissionsProvider>
+                                    </Providers.UserFeaturesProvider>
+                                  </Providers.ReferencesProvider>
+                                </Providers.FileTreePathProvider>
+                              </Providers.FileTreeDataProvider>
+                            </Providers.EditorProvider>
+                          </Providers.EditorOpenDocProvider>
+                        </Providers.EditorViewProvider>
+                      </Providers.EditorPropertiesProvider>
                     </Providers.DetachProvider>
                   </Providers.SnapshotProvider>
                 </Providers.ProjectProvider>
diff --git a/services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts b/services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts
deleted file mode 100644
index e4f0e5aa01..0000000000
--- a/services/web/frontend/js/features/ide-react/scope-adapters/editor-manager-context-adapter.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/react-scope-value-store'
-import customLocalStorage from '@/infrastructure/local-storage'
-import { DocumentContainer } from '@/features/ide-react/editor/document-container'
-
-export type EditorScopeValue = {
-  showSymbolPalette: false
-  toggleSymbolPalette: () => void
-  sharejs_doc: DocumentContainer | null
-  opening: boolean
-  trackChanges: boolean
-  wantTrackChanges: boolean
-  showVisual: boolean
-  error_state: boolean
-}
-
-export function populateEditorScope(
-  store: ReactScopeValueStore,
-  projectId: string
-) {
-  store.set('project.name', null)
-
-  const editor: Omit<EditorScopeValue, 'showVisual'> = {
-    showSymbolPalette: false,
-    toggleSymbolPalette: () => {},
-    sharejs_doc: null,
-    opening: true,
-    trackChanges: false,
-    wantTrackChanges: false,
-    error_state: false,
-  }
-  store.set('editor', editor)
-
-  store.persisted(
-    'editor.showVisual',
-    showVisualFallbackValue(projectId),
-    `editor.lastUsedMode`,
-    {
-      toPersisted: showVisual => (showVisual ? 'visual' : 'code'),
-      fromPersisted: mode => mode === 'visual',
-    }
-  )
-}
-
-function showVisualFallbackValue(projectId: string) {
-  const editorModeKey = `editor.mode.${projectId}`
-  const editorModeVal = customLocalStorage.getItem(editorModeKey)
-
-  if (editorModeVal) {
-    // clean up the old key
-    customLocalStorage.removeItem(editorModeKey)
-  }
-
-  return editorModeVal === 'rich-text'
-}
diff --git a/services/web/frontend/js/features/ide-redesign/components/editor.tsx b/services/web/frontend/js/features/ide-redesign/components/editor.tsx
index ae861f9b6f..785ba1fb99 100644
--- a/services/web/frontend/js/features/ide-redesign/components/editor.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/editor.tsx
@@ -1,8 +1,6 @@
 import { LoadingPane } from '@/features/ide-react/components/editor/loading-pane'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
-import { EditorScopeValue } from '@/features/ide-react/scope-adapters/editor-manager-context-adapter'
 import { useFileTreeOpenContext } from '@/features/ide-react/context/file-tree-open-context'
-import useScopeValue from '@/shared/hooks/use-scope-value'
 import classNames from 'classnames'
 import SourceEditor from '@/features/source-editor/components/source-editor'
 import { Panel, PanelGroup } from 'react-resizable-panels'
@@ -10,9 +8,11 @@ import { VerticalResizeHandle } from '@/features/ide-react/components/resize/ver
 import { Suspense } from 'react'
 import { FullSizeLoadingSpinner } from '@/shared/components/loading-spinner'
 import SymbolPalettePane from '@/features/ide-react/components/editor/symbol-palette-pane'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 
 export const Editor = () => {
-  const [editor] = useScopeValue<EditorScopeValue>('editor')
+  const { opening, errorState, showSymbolPalette } =
+    useEditorPropertiesContext()
   const { selectedEntityCount, openEntity } = useFileTreeOpenContext()
   const { currentDocumentId, currentDocument } = useEditorOpenDocContext()
 
@@ -21,9 +21,7 @@ export const Editor = () => {
   }
 
   const isLoading = Boolean(
-    (!currentDocument || editor.opening) &&
-      !editor.error_state &&
-      currentDocumentId
+    (!currentDocument || opening) && !errorState && currentDocumentId
   )
 
   return (
@@ -44,7 +42,7 @@ export const Editor = () => {
           <SourceEditor />
           {isLoading && <LoadingPane />}
         </Panel>
-        {editor.showSymbolPalette && (
+        {showSymbolPalette && (
           <>
             <VerticalResizeHandle id="ide-redesign-editor-symbol-palette" />
             <Panel
diff --git a/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx b/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx
index 250a12c776..7f23b4f51c 100644
--- a/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx
+++ b/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx
@@ -6,7 +6,7 @@ import {
 import { FigureModalSource } from '@/features/source-editor/components/figure-modal/figure-modal-context'
 import * as commands from '@/features/source-editor/extensions/toolbar/commands'
 import { setSectionHeadingLevel } from '@/features/source-editor/extensions/toolbar/sections'
-import { useEditorContext } from '@/shared/context/editor-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 import { useLayoutContext } from '@/shared/context/layout-context'
 import getMeta from '@/utils/meta'
 import { redo, selectAll, undo } from '@codemirror/commands'
@@ -288,7 +288,7 @@ export const useToolbarMenuBarEditorCommands = () => {
     isTeXFile,
   ])
 
-  const { toggleSymbolPalette } = useEditorContext()
+  const { toggleSymbolPalette } = useEditorPropertiesContext()
   const symbolPaletteAvailable = getMeta('ol-symbolPaletteAvailable')
   useCommandProvider(() => {
     if (!newEditor || !editorIsVisible) {
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx b/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx
index 85fe5830f6..f26542ebe9 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-tooltip-menu.tsx
@@ -31,7 +31,7 @@ import { isCursorNearViewportEdge } from '@/features/source-editor/utils/is-curs
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import { useModalsContext } from '@/features/ide-react/context/modals-context'
 import { numberOfChangesInSelection } from '../utils/changes-in-selection'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 import classNames from 'classnames'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import useReviewPanelLayout from '../hooks/use-review-panel-layout'
@@ -104,7 +104,7 @@ const ReviewTooltipMenuContent: FC<{ onAddComment: () => void }> = ({
   const ranges = useRangesContext()
   const { acceptChanges, rejectChanges } = useRangesActionsContext()
   const { showGenericConfirmModal } = useModalsContext()
-  const { wantTrackChanges } = useEditorManagerContext()
+  const { wantTrackChanges } = useEditorPropertiesContext()
   const [tooltipStyle, setTooltipStyle] = useState<CSSProperties | undefined>()
   const [visible, setVisible] = useState(false)
 
diff --git a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
index 73ffe78b5d..453fec51b7 100644
--- a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
@@ -11,7 +11,7 @@ import {
 import useSocketListener from '@/features/ide-react/hooks/use-socket-listener'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
 import { useProjectContext } from '@/shared/context/project-context'
-import { useEditorManagerContext } from '@/features/ide-react/context/editor-manager-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 import { useUserContext } from '@/shared/context/user-context'
 import { postJSON } from '@/infrastructure/fetch-json'
 import useEventListener from '@/shared/hooks/use-event-listener'
@@ -50,7 +50,7 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
   const { socket } = useConnectionContext()
   const project = useProjectContext()
   const user = useUserContext()
-  const { setWantTrackChanges } = useEditorManagerContext()
+  const { setWantTrackChanges } = useEditorPropertiesContext()
 
   // TODO: update project.trackChangesState instead?
   const [trackChangesValue, setTrackChangesValue] = useState<
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts b/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts
index fcc3f9a053..47bce33e9f 100644
--- a/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts
+++ b/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts
@@ -2,12 +2,41 @@ import { useCallback } from 'react'
 import { DocId } from '../../../../../types/project-settings'
 import { useProjectContext } from '../../../shared/context/project-context'
 import usePersistedState from '../../../shared/hooks/use-persisted-state'
+import { debugConsole } from '@/utils/debugging'
+
+const safeStringify = (value: unknown) => {
+  try {
+    return JSON.stringify(value)
+  } catch (e) {
+    debugConsole.error('double stringify exception', e)
+    return ''
+  }
+}
+
+const safeParse = (value: string) => {
+  try {
+    return JSON.parse(value)
+  } catch (e) {
+    debugConsole.error('double parse exception', e)
+    return null
+  }
+}
 
 export default function useOverviewFileCollapsed(docId: DocId) {
   const { _id: projectId } = useProjectContext()
   const [collapsedDocs, setCollapsedDocs] = usePersistedState<
-    Record<DocId, boolean>
-  >(`docs_collapsed_state:${projectId}`, {}, false, true)
+    Record<DocId, boolean>,
+    string
+  >(
+    `docs_collapsed_state:${projectId}`,
+    {},
+    {
+      converter: {
+        fromPersisted: safeParse,
+        toPersisted: safeStringify,
+      },
+    }
+  )
 
   const toggleCollapsed = useCallback(() => {
     setCollapsedDocs((collapsedDocs: Record<DocId, boolean>) => {
diff --git a/services/web/frontend/js/features/settings/components/leavers-survey-alert.tsx b/services/web/frontend/js/features/settings/components/leavers-survey-alert.tsx
index 55ada55ff0..a7668a2fca 100644
--- a/services/web/frontend/js/features/settings/components/leavers-survey-alert.tsx
+++ b/services/web/frontend/js/features/settings/components/leavers-survey-alert.tsx
@@ -20,7 +20,7 @@ export function LeaversSurveyAlert() {
   const [hide, setHide] = usePersistedState(
     'hideInstitutionalLeaversSurvey',
     false,
-    true
+    { listen: true }
   )
 
   function handleDismiss() {
diff --git a/services/web/frontend/js/features/settings/context/user-email-context.tsx b/services/web/frontend/js/features/settings/context/user-email-context.tsx
index b43c1956e8..579c46143d 100644
--- a/services/web/frontend/js/features/settings/context/user-email-context.tsx
+++ b/services/web/frontend/js/features/settings/context/user-email-context.tsx
@@ -224,7 +224,9 @@ function useUserEmails() {
   const [
     showInstitutionalLeaversSurveyUntil,
     setShowInstitutionalLeaversSurveyUntil,
-  ] = usePersistedState('showInstitutionalLeaversSurveyUntil', 0, true)
+  ] = usePersistedState('showInstitutionalLeaversSurveyUntil', 0, {
+    listen: true,
+  })
   const [state, unsafeDispatch] = useReducer(reducer, initialState)
   const dispatch = useSafeDispatch(unsafeDispatch)
   const { data, isLoading, isError, isSuccess, runAsync } =
diff --git a/services/web/frontend/js/features/source-editor/components/editor-switch.tsx b/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
index 7e8c950db0..6b80f4f6f7 100644
--- a/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
+++ b/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
@@ -1,14 +1,15 @@
 import { ChangeEvent, FC, memo, useCallback } from 'react'
-import useScopeValue from '@/shared/hooks/use-scope-value'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import { sendMB } from '../../../infrastructure/event-tracking'
 import { isValidTeXFile } from '../../../main/is-valid-tex-file'
 import { useTranslation } from 'react-i18next'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 
 function EditorSwitch() {
   const { t } = useTranslation()
-  const [visual, setVisual] = useScopeValue('editor.showVisual')
+  const { showVisual: visual, setShowVisual: setVisual } =
+    useEditorPropertiesContext()
   const { openDocName } = useEditorOpenDocContext()
 
   const richTextAvailable = openDocName ? isValidTeXFile(openDocName) : false
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
index c5d9f3d3e4..3404976d44 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/toolbar-items.tsx
@@ -15,6 +15,7 @@ import { withinFormattingCommand } from '@/features/source-editor/utils/tree-ope
 import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 import { isMac } from '@/shared/utils/os'
 import { useProjectContext } from '@/shared/context/project-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 
 export const ToolbarItems: FC<{
   state: EditorState
@@ -30,8 +31,9 @@ export const ToolbarItems: FC<{
   listDepth,
 }) {
   const { t } = useTranslation()
-  const { toggleSymbolPalette, showSymbolPalette, writefullInstance } =
-    useEditorContext()
+  const { showSymbolPalette, toggleSymbolPalette } =
+    useEditorPropertiesContext()
+  const { writefullInstance } = useEditorContext()
   const { features } = useProjectContext()
   const isActive = withinFormattingCommand(state)
 
diff --git a/services/web/frontend/js/features/source-editor/extensions/before-change-doc.ts b/services/web/frontend/js/features/source-editor/extensions/before-change-doc.ts
new file mode 100644
index 0000000000..324e27600f
--- /dev/null
+++ b/services/web/frontend/js/features/source-editor/extensions/before-change-doc.ts
@@ -0,0 +1,3 @@
+import { StateEffect } from '@codemirror/state'
+
+export const beforeChangeDocEffect = StateEffect.define()
diff --git a/services/web/frontend/js/features/source-editor/extensions/index.ts b/services/web/frontend/js/features/source-editor/extensions/index.ts
index 9cf6906b51..e3c0a28ccb 100644
--- a/services/web/frontend/js/features/source-editor/extensions/index.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/index.ts
@@ -139,7 +139,7 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
   cursorHighlights(),
   autoPair(options.settings),
   editable(),
-  search(),
+  search(options.initialSearchQuery),
   phrases(options.phrases),
   spelling(options.spelling),
   shortcuts,
diff --git a/services/web/frontend/js/features/source-editor/extensions/search.ts b/services/web/frontend/js/features/source-editor/extensions/search.ts
index 48e58a4bca..17fc4b027d 100644
--- a/services/web/frontend/js/features/source-editor/extensions/search.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/search.ts
@@ -15,6 +15,7 @@ import {
   KeyBinding,
   keymap,
   ViewPlugin,
+  ViewUpdate,
 } from '@codemirror/view'
 import {
   Annotation,
@@ -29,6 +30,7 @@ import {
 } from '@codemirror/state'
 import { sendSearchEvent } from '@/features/event-tracking/search-events'
 import { isVisual } from '@/features/source-editor/extensions/visual/visual'
+import { beforeChangeDocEffect } from '@/features/source-editor/extensions/before-change-doc'
 
 const restoreSearchQueryAnnotation = Annotation.define<boolean>()
 
@@ -110,10 +112,6 @@ const highlightSelectionMatchesExtension = highlightSelectionMatches({
   wholeWords: true,
 })
 
-// store the search query for use when switching between files
-// TODO: move this into EditorContext?
-let searchQuery: SearchQuery | null
-
 const scrollToMatch = (range: SelectionRange, view: EditorView) => {
   const coords = {
     from: view.coordsAtPos(range.from),
@@ -153,7 +151,7 @@ const searchEventKeymap: KeyBinding[] = [
 /**
  * A collection of extensions related to the search feature.
  */
-export const search = () => {
+export const search = (initialSearchQuery: SearchQuery | null) => {
   let open = false
 
   return [
@@ -195,9 +193,7 @@ export const search = () => {
             }
           },
           destroy() {
-            window.setTimeout(() => {
-              open = false // in a timeout, so the view plugin below can run its destroy method first
-            }, 0)
+            open = false
           },
         }
       },
@@ -205,8 +201,8 @@ export const search = () => {
 
     // restore a stored search and re-open the search panel
     ViewPlugin.define(view => {
-      if (searchQuery) {
-        const _searchQuery = searchQuery
+      if (initialSearchQuery) {
+        const _searchQuery = initialSearchQuery
         window.setTimeout(() => {
           openSearchPanel(view)
           view.dispatch({
@@ -217,9 +213,21 @@ export const search = () => {
       }
 
       return {
-        destroy() {
-          // persist the current search query if the panel is open
-          searchQuery = open ? getSearchQuery(view.state) : null
+        // Fire an event containing the search query before a document change
+        // so that it can be persisted for the next document
+        update(update: ViewUpdate) {
+          for (const tr of update.transactions) {
+            for (const effect of tr.effects) {
+              if (effect.is(beforeChangeDocEffect)) {
+                const searchQuery = open ? getSearchQuery(view.state) : null
+                window.dispatchEvent(
+                  new CustomEvent('search-panel-before-doc-change', {
+                    detail: searchQuery,
+                  })
+                )
+              }
+            }
+          }
         },
       }
     }),
diff --git a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
index c0d27c354a..f894758de9 100644
--- a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
+++ b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
@@ -51,14 +51,14 @@ import { updateRanges } from '@/features/source-editor/extensions/ranges'
 import { useThreadsContext } from '@/features/review-panel-new/context/threads-context'
 import { useHunspell } from '@/features/source-editor/hooks/use-hunspell'
 import { Permissions } from '@/features/ide-react/types/permissions'
-import {
-  GotoOffsetOptions,
-  useEditorManagerContext,
-} from '@/features/ide-react/context/editor-manager-context'
+import { GotoOffsetOptions } from '@/features/ide-react/context/editor-manager-context'
 import { GotoLineOptions } from '@/features/ide-react/types/goto-line-options'
 import { useOnlineUsersContext } from '@/features/ide-react/context/online-users-context'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
+import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
+import { SearchQuery } from '@codemirror/search'
+import { beforeChangeDocEffect } from '@/features/source-editor/extensions/before-change-doc'
 
 function useCodeMirrorScope(view: EditorView) {
   const { fileTreeData } = useFileTreeData()
@@ -71,7 +71,6 @@ function useCodeMirrorScope(view: EditorView) {
     useCompileContext()
 
   const { openDocName, currentDocument } = useEditorOpenDocContext()
-  const { trackChanges } = useEditorManagerContext()
   const metadata = useMetadataContext()
 
   const { id: userId } = useUserContext()
@@ -106,7 +105,7 @@ function useCodeMirrorScope(view: EditorView) {
 
   const hunspellManager = useHunspell(spellCheckLanguage)
 
-  const [visual] = useScopeValue<boolean>('editor.showVisual')
+  const { showVisual: visual, trackChanges } = useEditorPropertiesContext()
 
   const { referenceKeys } = useReferencesContext()
 
@@ -271,6 +270,16 @@ function useCodeMirrorScope(view: EditorView) {
     visual: showVisual,
   })
 
+  // Persist the search query in this hook when the document changes by keeping
+  // a reference to the search query in sync with the editor state
+  const searchQueryRef = useRef<SearchQuery | null>(null)
+  useEventListener(
+    'search-panel-before-doc-change',
+    useCallback((event: CustomEvent) => {
+      searchQueryRef.current = event.detail
+    }, [])
+  )
+
   const { showBoundary } = useErrorBoundary()
 
   const handleException = useCallback((exception: any) => {
@@ -295,6 +304,13 @@ function useCodeMirrorScope(view: EditorView) {
     if (currentDocument) {
       debugConsole.log('creating new editor state')
 
+      // Warn any interested extension that the document is about to change,
+      // allowing it to perform any necessary actions before creating the new
+      // state. destroy() is too late because the new state is already created
+      view.dispatch({
+        effects: beforeChangeDocEffect.of(null),
+      })
+
       const state = EditorState.create({
         doc: currentDocument.getSnapshot(),
         extensions: createExtensions({
@@ -310,6 +326,7 @@ function useCodeMirrorScope(view: EditorView) {
           spelling: spellingRef.current,
           visual: visualRef.current,
           projectFeatures: projectFeaturesRef.current,
+          initialSearchQuery: searchQueryRef.current,
           showBoundary,
           handleException,
         }),
diff --git a/services/web/frontend/js/shared/context/editor-context.tsx b/services/web/frontend/js/shared/context/editor-context.tsx
index 5685951ad2..945c6b63af 100644
--- a/services/web/frontend/js/shared/context/editor-context.tsx
+++ b/services/web/frontend/js/shared/context/editor-context.tsx
@@ -27,8 +27,6 @@ export const EditorContext = createContext<
       cobranding?: Cobranding
       hasPremiumCompile?: boolean
       renameProject: (newName: string) => void
-      showSymbolPalette?: boolean
-      toggleSymbolPalette?: () => void
       insertSymbol?: (symbol: SymbolWithCharacter) => void
       isProjectOwner: boolean
       isRestrictedTokenMember?: boolean
@@ -74,8 +72,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
   }, [])
 
   const [projectName, setProjectName] = useScopeValue('project.name')
-  const [showSymbolPalette] = useScopeValue('editor.showSymbolPalette')
-  const [toggleSymbolPalette] = useScopeValue('editor.toggleSymbolPalette')
 
   const [inactiveTutorials, setInactiveTutorials] = useState(
     () => getMeta('ol-inactiveTutorials') || []
@@ -183,8 +179,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
       isProjectOwner: owner?._id === userId,
       isRestrictedTokenMember: getMeta('ol-isRestrictedTokenMember'),
       isPendingEditor,
-      showSymbolPalette,
-      toggleSymbolPalette,
       insertSymbol,
       inactiveTutorials,
       deactivateTutorial,
@@ -204,8 +198,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
       userId,
       renameProject,
       isPendingEditor,
-      showSymbolPalette,
-      toggleSymbolPalette,
       insertSymbol,
       inactiveTutorials,
       deactivateTutorial,
diff --git a/services/web/frontend/js/shared/context/local-compile-context.tsx b/services/web/frontend/js/shared/context/local-compile-context.tsx
index ccc2c1453c..827688c2b2 100644
--- a/services/web/frontend/js/shared/context/local-compile-context.tsx
+++ b/services/web/frontend/js/shared/context/local-compile-context.tsx
@@ -248,17 +248,19 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   const [autoCompile, setAutoCompile] = usePersistedState(
     `autocompile_enabled:${projectId}`,
     false,
-    true
+    { listen: true }
   )
 
   // whether the compile should run in draft mode
-  const [draft, setDraft] = usePersistedState(`draft:${projectId}`, false, true)
+  const [draft, setDraft] = usePersistedState(`draft:${projectId}`, false, {
+    listen: true,
+  })
 
   // whether compiling should stop on first error
   const [stopOnFirstError, setStopOnFirstError] = usePersistedState(
     `stop_on_first_error:${projectId}`,
     false,
-    true
+    { listen: true }
   )
 
   // whether the last compiles stopped on first error
@@ -268,7 +270,7 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   const [stopOnValidationError, setStopOnValidationError] = usePersistedState(
     `stop_on_validation_error:${projectId}`,
     true,
-    true
+    { listen: true }
   )
 
   // whether the editor linter found errors
diff --git a/services/web/frontend/js/shared/hooks/use-exposed-state.ts b/services/web/frontend/js/shared/hooks/use-exposed-state.ts
index 520ed4356c..781d23698a 100644
--- a/services/web/frontend/js/shared/hooks/use-exposed-state.ts
+++ b/services/web/frontend/js/shared/hooks/use-exposed-state.ts
@@ -1,5 +1,5 @@
-import { type Dispatch, type SetStateAction, useEffect, useState } from 'react'
-import { useIdeContext } from '../context/ide-context'
+import { type Dispatch, type SetStateAction, useState } from 'react'
+import { useUnstableStoreSync } from '@/shared/hooks/use-unstable-store-sync'
 
 /**
  * Creates a state variable that is exposed via window.overleaf.unstable.store,
@@ -13,13 +13,7 @@ export default function useExposedState<T = any>(
   path: string
 ): [T, Dispatch<SetStateAction<T>>] {
   const [value, setValue] = useState<T>(initialState)
-
-  const { unstableStore } = useIdeContext()
-
-  // Update the unstable store whenever the value changes
-  useEffect(() => {
-    unstableStore.set(path, value)
-  }, [unstableStore, path, value])
+  useUnstableStoreSync(path, value)
 
   return [value, setValue]
 }
diff --git a/services/web/frontend/js/shared/hooks/use-persisted-state.ts b/services/web/frontend/js/shared/hooks/use-persisted-state.ts
index 1ff452ce4a..cfd2546ada 100644
--- a/services/web/frontend/js/shared/hooks/use-persisted-state.ts
+++ b/services/web/frontend/js/shared/hooks/use-persisted-state.ts
@@ -7,61 +7,59 @@ import {
 } from 'react'
 import _ from 'lodash'
 import localStorage from '../../infrastructure/local-storage'
-import { debugConsole } from '@/utils/debugging'
 
-const safeStringify = (value: unknown) => {
-  try {
-    return JSON.stringify(value)
-  } catch (e) {
-    debugConsole.error('double stringify exception', e)
-    return null
+type UsePersistedStateOptions<Value, PersistedValue> = {
+  listen?: boolean
+  converter?: {
+    toPersisted: (value: Value) => PersistedValue
+    fromPersisted: (persisted: PersistedValue) => Value
   }
 }
 
-const safeParse = (value: string) => {
-  try {
-    return JSON.parse(value)
-  } catch (e) {
-    debugConsole.error('double parse exception', e)
-    return null
-  }
-}
-
-function usePersistedState<T = any>(
+function usePersistedState<Value, PersistedValue = Value>(
   key: string,
-  defaultValue?: T,
-  listen = false,
-  // The option below is for backward compatibility with Angular
-  // which sometimes stringifies the values twice
-  doubleStringifyAndParse = false
-): [T, Dispatch<SetStateAction<T>>] {
+  defaultValue?: Value,
+  options?: UsePersistedStateOptions<Value, PersistedValue>
+): [Value, Dispatch<SetStateAction<Value>>] {
+  // Store the default value and options on first render so that they're stable
+  // and use them on subsequent renders. This is important for, for example, a
+  // non-primitive default value that should not change on every render.
+  const [allOptions] = useState<{
+    defaultValue?: Value
+    options?: UsePersistedStateOptions<Value, PersistedValue>
+  }>(() => ({ defaultValue, options }))
+  const listen = allOptions.options?.listen || false
+  const { toPersisted, fromPersisted } = allOptions.options?.converter || {}
+  const storedDefaultValue = allOptions.defaultValue
+
   const getItem = useCallback(
     (key: string) => {
       const item = localStorage.getItem(key)
-      return doubleStringifyAndParse ? safeParse(item) : item
+      return fromPersisted ? fromPersisted(item) : item
     },
-    [doubleStringifyAndParse]
+    [fromPersisted]
   )
   const setItem = useCallback(
-    (key: string, value: unknown) => {
-      const val = doubleStringifyAndParse ? safeStringify(value) : value
+    (key: string, value: Value) => {
+      // Nested ternary is convenient for type inference
+      const val = toPersisted ? toPersisted(value) : value
       localStorage.setItem(key, val)
     },
-    [doubleStringifyAndParse]
+    [toPersisted]
   )
 
-  const [value, setValue] = useState<T>(() => {
-    return getItem(key) ?? defaultValue
+  const [value, setValue] = useState<Value>(() => {
+    return getItem(key) ?? storedDefaultValue
   })
 
   const updateFunction = useCallback(
-    (newValue: SetStateAction<T>) => {
+    (newValue: SetStateAction<Value>) => {
       setValue(value => {
         const actualNewValue = _.isFunction(newValue)
           ? newValue(value)
           : newValue
 
-        if (actualNewValue === defaultValue) {
+        if (actualNewValue === storedDefaultValue) {
           localStorage.removeItem(key)
         } else {
           setItem(key, actualNewValue)
@@ -70,7 +68,7 @@ function usePersistedState<T = any>(
         return actualNewValue
       })
     },
-    [key, defaultValue, setItem]
+    [key, storedDefaultValue, setItem]
   )
 
   useEffect(() => {
@@ -79,7 +77,7 @@ function usePersistedState<T = any>(
         if (event.key === key) {
           // note: this value is read via getItem rather than from event.newValue
           // because getItem handles deserializing the JSON that's stored in localStorage.
-          setValue(getItem(key) ?? defaultValue)
+          setValue(getItem(key) ?? storedDefaultValue)
         }
       }
 
@@ -89,7 +87,7 @@ function usePersistedState<T = any>(
         window.removeEventListener('storage', listener)
       }
     }
-  }, [defaultValue, key, listen, getItem])
+  }, [storedDefaultValue, key, listen, getItem])
 
   return [value, updateFunction]
 }
diff --git a/services/web/frontend/js/shared/hooks/use-unstable-store-sync.ts b/services/web/frontend/js/shared/hooks/use-unstable-store-sync.ts
new file mode 100644
index 0000000000..6285159c02
--- /dev/null
+++ b/services/web/frontend/js/shared/hooks/use-unstable-store-sync.ts
@@ -0,0 +1,11 @@
+import { useIdeContext } from '@/shared/context/ide-context'
+import { useEffect } from 'react'
+
+export function useUnstableStoreSync<T = any>(path: string, value: T) {
+  const { unstableStore } = useIdeContext()
+
+  // Update the unstable store whenever the value changes
+  useEffect(() => {
+    unstableStore.set(path, value)
+  }, [unstableStore, path, value])
+}
diff --git a/services/web/frontend/stories/decorators/scope.tsx b/services/web/frontend/stories/decorators/scope.tsx
index cc89a31685..8977f582ab 100644
--- a/services/web/frontend/stories/decorators/scope.tsx
+++ b/services/web/frontend/stories/decorators/scope.tsx
@@ -195,7 +195,7 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   }))
 
   const [ideContextValue] = useState(() => {
-    const scopeStore = createReactScopeValueStore(projectId)
+    const scopeStore = createReactScopeValueStore()
     for (const [key, value] of Object.entries(initialScope)) {
       scopeStore.set(key, value)
     }
diff --git a/services/web/frontend/stories/source-editor/source-editor.stories.tsx b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
index 7194adcef7..3f475944e4 100644
--- a/services/web/frontend/stories/source-editor/source-editor.stories.tsx
+++ b/services/web/frontend/stories/source-editor/source-editor.stories.tsx
@@ -10,6 +10,7 @@ import { EditorOpenDocContext } from '@/features/ide-react/context/editor-open-d
 import { DocId } from '../../../types/project-settings'
 import { StoryObj } from '@storybook/react'
 import { DocumentContainer } from '@/features/ide-react/editor/document-container'
+import { EditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 
 type Story = StoryObj<typeof SourceEditor>
 
@@ -83,6 +84,34 @@ const BibtexEditorOpenDocProvider: FC<React.PropsWithChildren> = ({
   </EditorOpenDocProvider>
 )
 
+const VisualEditorPropertiesProvider: FC<React.PropsWithChildren> = ({
+  children,
+}) => {
+  const [showVisual, setShowVisual] = useState(true)
+
+  const value = {
+    showVisual,
+    setShowVisual,
+    showSymbolPalette: true,
+    setShowSymbolPalette: () => undefined,
+    toggleSymbolPalette: () => undefined,
+    opening: true,
+    setOpening: () => undefined,
+    trackChanges: false,
+    setTrackChanges: () => undefined,
+    wantTrackChanges: false,
+    setWantTrackChanges: () => undefined,
+    errorState: false,
+    setErrorState: () => undefined,
+  }
+
+  return (
+    <EditorPropertiesContext.Provider value={value}>
+      {children}
+    </EditorPropertiesContext.Provider>
+  )
+}
+
 const FileTreePathProvider: FC<React.PropsWithChildren> = ({ children }) => (
   <FileTreePathContext.Provider
     value={{
@@ -218,15 +247,13 @@ export const Visual: Story = {
         providers: {
           FileTreePathProvider,
           EditorOpenDocProvider: LatexEditorOpenDocProvider,
+          EditorPropertiesProvider: VisualEditorPropertiesProvider,
         },
       }),
 
     (Story, { globals }) => {
-      // FIXME: useScope has no effect, so this does not default to the visual editor
+      // FIXME: useScope has no effect, so this does nothing
       useScope({
-        editor: {
-          showVisual: true,
-        },
         settings: {
           ...settings,
           overallTheme: globals.theme === 'default-' ? '' : globals.theme,
@@ -235,7 +262,6 @@ export const Visual: Story = {
       })
 
       useMeta({
-        'ol-showSymbolPalette': true,
         'ol-mathJaxPath': 'https://unpkg.com/mathjax@3.2.2/es5/tex-svg-full.js',
         'ol-project_id': '63e21c07946dd8c76505f85a',
       })
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
index 0d80f9bde8..bd8eebfb18 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
@@ -1,5 +1,8 @@
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import { mockScope, rootFolderId } from '../helpers/mock-scope'
 import { FC } from 'react'
 import { FileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
@@ -41,7 +44,6 @@ describe('<FigureModal />', function () {
   function mount() {
     const content = ''
     const scope = mockScope(content)
-    scope.editor.showVisual = true
 
     const FileTreePathProvider: FC<React.PropsWithChildren> = ({
       children,
@@ -63,7 +65,16 @@ describe('<FigureModal />', function () {
 
     cy.mount(
       <TestContainer>
-        <EditorProviders scope={scope} providers={{ FileTreePathProvider }}>
+        <EditorProviders
+          scope={scope}
+          providers={{
+            FileTreePathProvider,
+            EditorPropertiesProvider: makeEditorPropertiesProvider({
+              showVisual: true,
+              showSymbolPalette: false,
+            }),
+          }}
+        >
           <CodemirrorEditor />
         </EditorProviders>
       </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx
index 34f26f02cb..18422c1ff0 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-table-generator.spec.tsx
@@ -1,6 +1,9 @@
 // Needed since eslint gets confused by mocha-each
 /* eslint-disable mocha/prefer-arrow-callback */
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import forEach from 'mocha-each'
@@ -14,11 +17,18 @@ const mountEditor = (content: string | string[]) => {
     content = '\n' + content
   }
   const scope = mockScope(content)
-  scope.editor.showVisual = true
   cy.viewport(1000, 800)
   cy.mount(
     <TestContainer style={{ width: 1000, height: 800 }}>
-      <EditorProviders scope={scope}>
+      <EditorProviders
+        scope={scope}
+        providers={{
+          EditorPropertiesProvider: makeEditorPropertiesProvider({
+            showVisual: true,
+            showSymbolPalette: false,
+          }),
+        }}
+      >
         <CodemirrorEditor />
       </EditorProviders>
     </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx
index 28f1363829..720335c035 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx
@@ -1,15 +1,25 @@
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import { TestContainer } from '../helpers/test-container'
 
 const mountEditor = (content: string) => {
   const scope = mockScope(content)
-  scope.editor.showVisual = true
 
   cy.mount(
     <TestContainer>
-      <EditorProviders scope={scope}>
+      <EditorProviders
+        scope={scope}
+        providers={{
+          EditorPropertiesProvider: makeEditorPropertiesProvider({
+            showVisual: true,
+            showSymbolPalette: false,
+          }),
+        }}
+      >
         <CodemirrorEditor />
       </EditorProviders>
     </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-floats.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-floats.spec.tsx
index 0e406418fa..3433205a9f 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-floats.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-floats.spec.tsx
@@ -1,15 +1,25 @@
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import { TestContainer } from '../helpers/test-container'
 
 const mountEditor = (content: string) => {
   const scope = mockScope(content)
-  scope.editor.showVisual = true
 
   cy.mount(
     <TestContainer>
-      <EditorProviders scope={scope}>
+      <EditorProviders
+        scope={scope}
+        providers={{
+          EditorPropertiesProvider: makeEditorPropertiesProvider({
+            showVisual: true,
+            showSymbolPalette: false,
+          }),
+        }}
+      >
         <CodemirrorEditor />
       </EditorProviders>
     </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx
index f2ae1df68e..cc5bbdbe55 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx
@@ -1,4 +1,7 @@
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import { TestContainer } from '../helpers/test-container'
@@ -6,11 +9,18 @@ import { isMac } from '@/shared/utils/os'
 
 const mountEditor = (content: string) => {
   const scope = mockScope(content)
-  scope.editor.showVisual = true
 
   cy.mount(
     <TestContainer>
-      <EditorProviders scope={scope}>
+      <EditorProviders
+        scope={scope}
+        providers={{
+          EditorPropertiesProvider: makeEditorPropertiesProvider({
+            showVisual: true,
+            showSymbolPalette: false,
+          }),
+        }}
+      >
         <CodemirrorEditor />
       </EditorProviders>
     </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-paste-html.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-paste-html.spec.tsx
index 9220d6ccdf..8173cefb9d 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-paste-html.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-paste-html.spec.tsx
@@ -1,4 +1,7 @@
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import { TestContainer } from '../helpers/test-container'
@@ -7,11 +10,18 @@ const menuIconsText = 'content_copyexpand_more'
 
 const mountEditor = (content = '') => {
   const scope = mockScope(content)
-  scope.editor.showVisual = true
 
   cy.mount(
     <TestContainer>
-      <EditorProviders scope={scope}>
+      <EditorProviders
+        scope={scope}
+        providers={{
+          EditorPropertiesProvider: makeEditorPropertiesProvider({
+            showVisual: true,
+            showSymbolPalette: false,
+          }),
+        }}
+      >
         <CodemirrorEditor />
       </EditorProviders>
     </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-readonly.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-readonly.spec.tsx
index 7faa740a67..5e05429212 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-readonly.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-readonly.spec.tsx
@@ -1,5 +1,8 @@
 import { mockScope } from '../helpers/mock-scope'
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { FC } from 'react'
 import { FileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
@@ -43,13 +46,19 @@ const mountEditor = (content: string) => {
   const scope = mockScope(content)
   scope.permissions.write = false
   scope.permissions.trackedWrite = false
-  scope.editor.showVisual = true
 
   cy.mount(
     <TestContainer>
       <EditorProviders
         scope={scope}
-        providers={{ FileTreePathProvider, PermissionsProvider }}
+        providers={{
+          FileTreePathProvider,
+          PermissionsProvider,
+          EditorPropertiesProvider: makeEditorPropertiesProvider({
+            showVisual: true,
+            showSymbolPalette: false,
+          }),
+        }}
       >
         <CodemirrorEditor />
       </EditorProviders>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-toolbar.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-toolbar.spec.tsx
index 63dd3da5b1..542f1ce662 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-toolbar.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-toolbar.spec.tsx
@@ -1,4 +1,7 @@
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import { TestContainer } from '../helpers/test-container'
@@ -18,11 +21,18 @@ const clickToolbarButton = (name: string) => {
 
 const mountEditor = (content: string) => {
   const scope = mockScope(content)
-  scope.editor.showVisual = true
 
   cy.mount(
     <TestContainer>
-      <EditorProviders scope={scope}>
+      <EditorProviders
+        scope={scope}
+        providers={{
+          EditorPropertiesProvider: makeEditorPropertiesProvider({
+            showVisual: true,
+            showSymbolPalette: false,
+          }),
+        }}
+      >
         <CodemirrorEditor />
       </EditorProviders>
     </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-tooltips.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-tooltips.spec.tsx
index 7dcc10d72c..2afed2b813 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-tooltips.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-tooltips.spec.tsx
@@ -1,5 +1,8 @@
 import { mockScope } from '../helpers/mock-scope'
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { TestContainer } from '../helpers/test-container'
 
@@ -11,11 +14,18 @@ describe('<CodeMirrorEditor/> tooltips in Visual mode', function () {
     cy.interceptEvents()
 
     const scope = mockScope('\n\n\n')
-    scope.editor.showVisual = true
 
     cy.mount(
       <TestContainer>
-        <EditorProviders scope={scope}>
+        <EditorProviders
+          scope={scope}
+          providers={{
+            EditorPropertiesProvider: makeEditorPropertiesProvider({
+              showVisual: true,
+              showSymbolPalette: false,
+            }),
+          }}
+        >
           <CodemirrorEditor />
         </EditorProviders>
       </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual.spec.tsx
index 7a9acebf07..45f68f359b 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual.spec.tsx
@@ -1,7 +1,10 @@
 // Needed since eslint gets confused by mocha-each
 /* eslint-disable mocha/prefer-arrow-callback */
 import { FC } from 'react'
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeEditorPropertiesProvider,
+} from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import forEach from 'mocha-each'
@@ -19,7 +22,6 @@ describe('<CodeMirrorEditor/> in Visual mode', function () {
     const content = '\n'.repeat(3)
 
     const scope = mockScope(content)
-    scope.editor.showVisual = true
 
     const FileTreePathProvider: FC<React.PropsWithChildren> = ({
       children,
@@ -41,7 +43,16 @@ describe('<CodeMirrorEditor/> in Visual mode', function () {
 
     cy.mount(
       <TestContainer>
-        <EditorProviders scope={scope} providers={{ FileTreePathProvider }}>
+        <EditorProviders
+          scope={scope}
+          providers={{
+            FileTreePathProvider,
+            EditorPropertiesProvider: makeEditorPropertiesProvider({
+              showVisual: true,
+              showSymbolPalette: false,
+            }),
+          }}
+        >
           <CodemirrorEditor />
         </EditorProviders>
       </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx
index 257cc96661..b64e66734f 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor.spec.tsx
@@ -622,7 +622,7 @@ describe('<CodeMirrorEditor/>', { scrollBehavior: false }, function () {
 
         const rect = selection.getRangeAt(0).getBoundingClientRect()
         expect(Math.round(rect.top)).to.be.gte(100)
-        expect(Math.round(rect.left)).to.be.gte(90)
+        expect(Math.round(rect.left)).to.be.gte(80)
       })
   })
 })
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
index 4b7d0fb4a1..c01d20f164 100644
--- a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
@@ -19,7 +19,6 @@ export const mockScope = (
       sharejs_doc: mockDoc(content, docOptions),
       openDocName: 'test.tex',
       currentDocumentId: docId,
-      showVisual: false,
       wantTrackChanges: false,
     },
     project: {
diff --git a/services/web/test/frontend/helpers/editor-providers.tsx b/services/web/test/frontend/helpers/editor-providers.tsx
index bad92019a2..a20c7f015f 100644
--- a/services/web/test/frontend/helpers/editor-providers.tsx
+++ b/services/web/test/frontend/helpers/editor-providers.tsx
@@ -27,6 +27,10 @@ import { ReactContextRoot } from '@/features/ide-react/context/react-context-roo
 import useEventListener from '@/shared/hooks/use-event-listener'
 import useDetachLayout from '@/shared/hooks/use-detach-layout'
 import useExposedState from '@/shared/hooks/use-exposed-state'
+import {
+  EditorPropertiesContext,
+  EditorPropertiesContextValue,
+} from '@/features/ide-react/context/editor-properties-context'
 import {
   type IdeLayout,
   type IdeView,
@@ -160,6 +164,7 @@ export function EditorProviders({
         } as any as DocumentContainer,
         openDocName: null,
         currentDocumentId: null,
+        wantTrackChanges: false,
       },
       project: {
         _id: projectId,
@@ -190,6 +195,9 @@ export function EditorProviders({
           openDocName: scope.editor.openDocName,
           currentDocument: scope.editor.sharejs_doc,
         }),
+        EditorPropertiesProvider: makeEditorPropertiesProvider({
+          wantTrackChanges: scope.editor.wantTrackChanges,
+        }),
         LayoutProvider: makeLayoutProvider(layoutContext),
         ...providers,
       }}
@@ -251,7 +259,7 @@ const makeIdeReactProvider = (
     }))
 
     const [ideContextValue] = useState(() => {
-      const scopeStore = createReactScopeValueStore(PROJECT_ID)
+      const scopeStore = createReactScopeValueStore()
       for (const [key, value] of Object.entries(scope)) {
         // TODO: path for nested entries
         scopeStore.set(key, value)
@@ -438,3 +446,60 @@ const makeLayoutProvider = (
   }
   return LayoutProvider
 }
+
+export function makeEditorPropertiesProvider(
+  initialValues: Partial<
+    Pick<
+      EditorPropertiesContextValue,
+      'showVisual' | 'showSymbolPalette' | 'wantTrackChanges'
+    >
+  >
+) {
+  const EditorPropertiesProvider: FC<PropsWithChildren> = ({ children }) => {
+    const {
+      showVisual: initialShowVisual,
+      showSymbolPalette: initialShowSymbolPalette,
+      wantTrackChanges: initialWantTrackChanges,
+    } = initialValues
+
+    const [showVisual, setShowVisual] = useState(initialShowVisual || false)
+    const [showSymbolPalette, setShowSymbolPalette] = useState(
+      initialShowSymbolPalette || false
+    )
+
+    function toggleSymbolPalette() {
+      setShowSymbolPalette(show => !show)
+    }
+
+    const [opening, setOpening] = useState(true)
+    const [trackChanges, setTrackChanges] = useState(false)
+    const [wantTrackChanges, setWantTrackChanges] = useState(
+      initialWantTrackChanges || false
+    )
+    const [errorState, setErrorState] = useState(false)
+
+    const value = {
+      showVisual,
+      setShowVisual,
+      showSymbolPalette,
+      setShowSymbolPalette,
+      toggleSymbolPalette,
+      opening,
+      setOpening,
+      trackChanges,
+      setTrackChanges,
+      wantTrackChanges,
+      setWantTrackChanges,
+      errorState,
+      setErrorState,
+    }
+
+    return (
+      <EditorPropertiesContext.Provider value={value}>
+        {children}
+      </EditorPropertiesContext.Provider>
+    )
+  }
+
+  return EditorPropertiesProvider
+}
diff --git a/services/web/test/frontend/shared/hooks/use-persisted-state.test.tsx b/services/web/test/frontend/shared/hooks/use-persisted-state.test.tsx
index 5b670698e3..9664148ce7 100644
--- a/services/web/test/frontend/shared/hooks/use-persisted-state.test.tsx
+++ b/services/web/test/frontend/shared/hooks/use-persisted-state.test.tsx
@@ -22,7 +22,7 @@ describe('usePersistedState', function () {
     expect(window.Storage.prototype.setItem).to.have.callCount(1)
 
     const Test = () => {
-      const [value] = usePersistedState(key)
+      const [value] = usePersistedState<string>(key)
 
       return <div>{value}</div>
     }
@@ -139,6 +139,35 @@ describe('usePersistedState', function () {
     expect(localStorage.getItem(key)).to.equal('foobar')
   })
 
+  it('converts persisted value (string to boolean)', function () {
+    const key = 'test:convert'
+    localStorage.setItem(key, 'yep')
+
+    const Test = () => {
+      const [value, setValue] = usePersistedState(key, true, {
+        converter: {
+          toPersisted(value) {
+            return value ? 'yep' : 'nope'
+          },
+          fromPersisted(persistedValue) {
+            return persistedValue === 'yep'
+          },
+        },
+      })
+
+      useEffect(() => {
+        setValue(false)
+      }, [setValue])
+
+      return <div>{String(value)}</div>
+    }
+
+    render(<Test />)
+
+    screen.getByText('false')
+    expect(localStorage.getItem(key)).to.equal('nope')
+  })
+
   it('handles syncing values via storage event', async function () {
     const key = 'test:sync'
     localStorage.setItem(key, 'foo')
@@ -149,7 +178,7 @@ describe('usePersistedState', function () {
     window.addEventListener('storage', storageEventListener)
 
     const Test = () => {
-      const [value, setValue] = usePersistedState(key, 'bar', true)
+      const [value, setValue] = usePersistedState(key, 'bar', { listen: true })
 
       useEffect(() => {
         setValue('baz')

From 6176f4d07461bd3a703a041c323d13ce6ce38fca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 3 Jul 2025 08:39:06 +0000
Subject: [PATCH 130/274] Update linters

GitOrigin-RevId: e6ce5461881abe515f57b9b066bb81c194f80e53
---
 package-lock.json | 969 ----------------------------------------------
 package.json      |   2 +-
 2 files changed, 1 insertion(+), 970 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5ac9cfd62d..00708af9f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12894,297 +12894,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.30.1.tgz",
-      "integrity": "sha512-v+VWphxMjn+1t48/jO4t950D6KR8JaJuNXzi33Ve6P8sEmPr5k6CEXjdGwT6+LodVnEa91EQCtwjWNUCPweo+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.30.1",
-        "@typescript-eslint/type-utils": "8.30.1",
-        "@typescript-eslint/utils": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
-        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.0.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.30.1.tgz",
-      "integrity": "sha512-+C0B6ChFXZkuaNDl73FJxRYT0G7ufVPOSQkqkpM/U198wUwUFOtgo1k/QzFh1KjpBitaK7R1tgjVz6o9HmsRPg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
-      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
-      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "eslint-visitor-keys": "^4.2.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.30.1.tgz",
-      "integrity": "sha512-H+vqmWwT5xoNrXqWs/fesmssOW70gxFlgcMlYcBaWNPIEWDgLa4W9nkSPmhuOgLnXq9QYgkZ31fhDyLhleCsAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.30.1",
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/typescript-estree": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.30.1.tgz",
-      "integrity": "sha512-+C0B6ChFXZkuaNDl73FJxRYT0G7ufVPOSQkqkpM/U198wUwUFOtgo1k/QzFh1KjpBitaK7R1tgjVz6o9HmsRPg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
-      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.30.1.tgz",
-      "integrity": "sha512-kQQnxymiUy9tTb1F2uep9W6aBiYODgq5EMSk6Nxh4Z+BDUoYUSa029ISs5zTzKBFnexQEh71KqwjKnRz58lusQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.2",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
-      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "eslint-visitor-keys": "^4.2.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/ts-api-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
-      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4"
-      }
-    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
@@ -20919,98 +20628,6 @@
         "source-map": "~0.6.1"
       }
     },
-    "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-      "dev": true,
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint-config-standard": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
-      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^8.0.1",
-        "eslint-plugin-import": "^2.25.2",
-        "eslint-plugin-n": "^15.0.0",
-        "eslint-plugin-promise": "^6.0.0"
-      }
-    },
     "node_modules/eslint-config-standard-jsx": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
@@ -21143,57 +20760,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-chai-expect": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-3.0.0.tgz",
-      "integrity": "sha512-NS0YBcToJl+BRKBSMCwRs/oHJIX67fG5Gvb4tGked+9Wnd1/PzKijd82B2QVKcSSOwRe+pp4RAJ2AULeck4eQw==",
-      "dev": true,
-      "engines": {
-        "node": "10.* || 12.* || >= 14.*"
-      },
-      "peerDependencies": {
-        "eslint": ">=2.0.0 <= 8.x"
-      }
-    },
-    "node_modules/eslint-plugin-chai-friendly": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.7.2.tgz",
-      "integrity": "sha512-LOIfGx5sZZ5FwM1shr2GlYAWV9Omdi+1/3byuVagvQNoGUuU0iHhp7AfjA1uR+4dJ4Isfb4+FwBJgQajIw9iAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=3.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-cypress": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.1.tgz",
-      "integrity": "sha512-eLHLWP5Q+I4j2AWepYq0PgFEei9/s5LvjuSqWrxurkg1YZ8ltxdvMNmdSf0drnsNo57CTgYY/NIHHLRSWejR7w==",
-      "dev": true,
-      "dependencies": {
-        "globals": "^13.20.0"
-      },
-      "peerDependencies": {
-        "eslint": ">= 3.2.1"
-      }
-    },
-    "node_modules/eslint-plugin-cypress/node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint-plugin-es": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
@@ -21213,130 +20779,6 @@
         "eslint": ">=4.19.1"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
-      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.20.7",
-        "aria-query": "^5.1.3",
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.6.2",
-        "axobject-query": "^3.1.1",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.3",
-        "language-tags": "=1.0.5",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz",
-      "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^3.0.0",
-        "rambda": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-mocha/node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
     "node_modules/eslint-plugin-n": {
       "version": "15.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
@@ -21435,295 +20877,6 @@
         "eslint": ">=4.19.1"
       }
     },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
-      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
-      "dev": true,
-      "dependencies": {
-        "prettier-linter-helpers": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.28.0",
-        "prettier": ">=2.0.0"
-      },
-      "peerDependenciesMeta": {
-        "eslint-config-prettier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-promise": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.0.0.tgz",
-      "integrity": "sha512-7GPezalm5Bfi/E22PnQxDWH2iW9GTvAlUNTztemeHb6c1BniSyoeTrM87JkC0wYdi6aQrZX9p2qEiAno8aTcbw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.32.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
-      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.1.1.tgz",
-      "integrity": "sha512-nszC833aZPwB6tik1nMkbFqmtgIXTT0sfJEYs0zMBKMlkQ4to2079yUV96SvmLh00ovSBJI4pgcBC1TiIP8mXg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "^8.15.0",
-        "@typescript-eslint/utils": "^8.15.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0",
-        "pnpm": "^9.14.0"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz",
-      "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/types": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz",
-      "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz",
-      "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
-        "eslint-visitor-keys": "^4.2.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn": {
-      "version": "56.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-56.0.0.tgz",
-      "integrity": "sha512-aXpddVz/PQMmd69uxO98PA4iidiVNvA0xOtbpUoz1WhBd4RxOQQYqN618v68drY0hmy5uU2jy1bheKEVWBjlPw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "ci-info": "^4.0.0",
-        "clean-regexp": "^1.0.0",
-        "core-js-compat": "^3.38.1",
-        "esquery": "^1.6.0",
-        "globals": "^15.9.0",
-        "indent-string": "^4.0.0",
-        "is-builtin-module": "^3.2.1",
-        "jsesc": "^3.0.2",
-        "pluralize": "^8.0.0",
-        "read-pkg-up": "^7.0.1",
-        "regexp-tree": "^0.1.27",
-        "regjsparser": "^0.10.0",
-        "semver": "^7.6.3",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
-      },
-      "peerDependencies": {
-        "eslint": ">=8.56.0"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/ci-info": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.0.0.tgz",
-      "integrity": "sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/globals": {
-      "version": "15.11.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
-      "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/regjsparser": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz",
-      "integrity": "sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -21779,113 +20932,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/esm": {
       "version": "3.2.25",
       "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
@@ -33785,21 +32831,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prettier": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
-      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
     "node_modules/prettier-linter-helpers": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
diff --git a/package.json b/package.json
index 9d8b3ed8d2..7326023473 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-unicorn": "^56.0.0",
-    "prettier": "3.3.3",
+    "prettier": "3.6.2",
     "typescript": "^5.8.3"
   },
   "overrides": {

From 8a5e2b0ea3b183c6f050e789683828c3be359fe1 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Thu, 3 Jul 2025 10:17:58 +0100
Subject: [PATCH 131/274] Update package-lock file

This step is required as renovate is not able to generate a lockfile
itself

GitOrigin-RevId: d5fcdc4a98b24c6fb5662ef77dac6a1cf47589c2
---
 package-lock.json | 2239 ++++++++++++++++++++++++++++++---------------
 1 file changed, 1501 insertions(+), 738 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 00708af9f9..d615e38f9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55,7 +55,7 @@
         "eslint-plugin-prettier": "^4.0.0",
         "eslint-plugin-promise": "^6.0.0",
         "eslint-plugin-unicorn": "^56.0.0",
-        "prettier": "3.3.3",
+        "prettier": "3.6.2",
         "typescript": "^5.8.3"
       }
     },
@@ -108,7 +108,7 @@
         "lodash": "^4.17.21"
       },
       "devDependencies": {
-        "@typescript-eslint/parser": "^6.7.5"
+        "@typescript-eslint/parser": "^8.30.1"
       }
     },
     "libraries/eslint-plugin/node_modules/@typescript-eslint/parser": {
@@ -516,14 +516,6 @@
         "typescript": "^5.0.4"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@adobe/css-tools": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.2.tgz",
@@ -1672,21 +1664,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/parser": {
       "version": "7.27.0",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
@@ -4806,23 +4783,28 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -4875,9 +4857,10 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -6097,11 +6080,13 @@
       "integrity": "sha512-aKmlCO57XFZ26wso4rJsW4oTUnrgTFw2jh3io7CAtO9w4UltBNwRXvXIVzzyfkaaLRo3nluP/19msA8vDUUuKw=="
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
+      "deprecated": "Use @eslint/config-array instead",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -6126,12 +6111,6 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
     "node_modules/@icons/material": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
@@ -9413,6 +9392,13 @@
         "win32"
       ]
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@sentry-internal/tracing": {
       "version": "7.46.0",
       "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.46.0.tgz",
@@ -12894,6 +12880,363 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
+      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/type-utils": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
+        "graphemer": "^1.4.0",
+        "ignore": "^7.0.0",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.35.1",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
+      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
+      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.35.1",
+        "@typescript-eslint/types": "^8.35.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service/node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz",
@@ -12911,17 +13254,34 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
+      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.30.1.tgz",
-      "integrity": "sha512-64uBF76bfQiJyHgZISC7vcNz3adqQKIccVoKubyQcOnNcdJBvYOILV1v22Qhsw3tw3VQu5ll8ND6hycgAR5fEA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
+      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.30.1",
-        "@typescript-eslint/utils": "8.30.1",
+        "@typescript-eslint/typescript-estree": "8.35.1",
+        "@typescript-eslint/utils": "8.35.1",
         "debug": "^4.3.4",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -12936,9 +13296,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
-      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -12950,20 +13310,22 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.30.1.tgz",
-      "integrity": "sha512-kQQnxymiUy9tTb1F2uep9W6aBiYODgq5EMSk6Nxh4Z+BDUoYUSa029ISs5zTzKBFnexQEh71KqwjKnRz58lusQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -12977,14 +13339,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
-      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -12995,9 +13357,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13005,9 +13367,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13023,9 +13385,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -13052,9 +13414,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -13216,16 +13578,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.30.1.tgz",
-      "integrity": "sha512-T/8q4R9En2tcEsWPQgB5BQ0XJVOtfARcUvOa8yJP3fh9M/mXraLxZrkCfGb6ChrO/V3W+Xbd04RacUEqk1CFEQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
+      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.30.1",
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/typescript-estree": "8.30.1"
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/typescript-estree": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13240,14 +13602,14 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.30.1.tgz",
-      "integrity": "sha512-+C0B6ChFXZkuaNDl73FJxRYT0G7ufVPOSQkqkpM/U198wUwUFOtgo1k/QzFh1KjpBitaK7R1tgjVz6o9HmsRPg==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1"
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13258,9 +13620,9 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.30.1.tgz",
-      "integrity": "sha512-81KawPfkuulyWo5QdyG/LOKbspyyiW+p4vpn4bYO7DM/hZImlVnFwrpCTnmNMOt8CvLRr5ojI9nU1Ekpw4RcEw==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13272,20 +13634,22 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.30.1.tgz",
-      "integrity": "sha512-kQQnxymiUy9tTb1F2uep9W6aBiYODgq5EMSk6Nxh4Z+BDUoYUSa029ISs5zTzKBFnexQEh71KqwjKnRz58lusQ==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
+      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "@typescript-eslint/visitor-keys": "8.30.1",
+        "@typescript-eslint/project-service": "8.35.1",
+        "@typescript-eslint/tsconfig-utils": "8.35.1",
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13299,14 +13663,14 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.30.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.30.1.tgz",
-      "integrity": "sha512-aEhgas7aJ6vZnNFC7K4/vMGDGyOiqWcYZPpIWrTKuTAlsvDNKy2GFDqh9smL+iq069ZvR0YzEeq0B8NJlLzjFA==",
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.30.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -13317,9 +13681,9 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13327,9 +13691,9 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13345,9 +13709,9 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -13374,9 +13738,9 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -14711,33 +15075,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-styles/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/ansi-styles/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
@@ -14935,16 +15272,20 @@
       "dev": true
     },
     "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14981,15 +15322,60 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array.prototype.flat": {
+    "node_modules/array.prototype.findlast": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz",
-      "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
+      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "es-shim-unscopables": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14999,15 +15385,16 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15017,16 +15404,20 @@
       }
     },
     "node_modules/array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
@@ -15116,10 +15507,11 @@
       }
     },
     "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
+      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
@@ -15303,10 +15695,11 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
     },
     "node_modules/axe-core": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.1.tgz",
-      "integrity": "sha512-sCXXUhA+cljomZ3ZAwb8i1p3oOlkABzPy08ZDAoGcYuvtBPlQ1Ytde129ArXyHWDhfeewq7rlx9F+cUx2SSlkg==",
+      "version": "4.10.3",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.3.tgz",
+      "integrity": "sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==",
       "dev": true,
+      "license": "MPL-2.0",
       "engines": {
         "node": ">=4"
       }
@@ -15328,12 +15721,13 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/axobject-query": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
-      "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
       "dev": true,
-      "dependencies": {
-        "deep-equal": "^2.0.5"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/b4a": {
@@ -16933,50 +17327,6 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/chalk/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/character-entities": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
@@ -20388,6 +20738,34 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-iterator-helpers": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
+      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.6",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "iterator.prototype": "^1.1.4",
+        "safe-array-concat": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-module-lexer": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
@@ -20423,12 +20801,16 @@
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
@@ -20628,6 +21010,105 @@
         "source-map": "~0.6.1"
       }
     },
+    "node_modules/eslint": {
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
+      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-config-standard": {
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^8.0.1",
+        "eslint-plugin-import": "^2.25.2",
+        "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
+        "eslint-plugin-promise": "^6.0.0"
+      }
+    },
     "node_modules/eslint-config-standard-jsx": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz",
@@ -20653,13 +21134,15 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -20672,16 +21155,21 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
+        "debug": "^3.2.7"
       },
       "engines": {
         "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
@@ -20693,71 +21181,59 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+    "node_modules/eslint-plugin-chai-expect": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-3.1.0.tgz",
+      "integrity": "sha512-a9F8b38hhJsR7fgDEfyMxppZXCnCW6OOHj7cQfygsm9guXqdSzfpwrHX5FT93gSExDqD71HQglF1lLkGBwhJ+g==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "10.* || 12.* || || 14.* || 16.* || >= 18.*"
+      },
+      "peerDependencies": {
+        "eslint": ">=2.0.0 <= 9.x"
+      }
+    },
+    "node_modules/eslint-plugin-chai-friendly": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.7.4.tgz",
+      "integrity": "sha512-PGPjJ8diYgX1mjLxGJqRop2rrGwZRKImoEOwUOgoIhg0p80MkTaqvmFLe5TF7/iagZHggasvIfQlUyHIhK/PYg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=3.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-cypress": {
+      "version": "2.15.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.2.tgz",
+      "integrity": "sha512-CtcFEQTDKyftpI22FVGpx8bkpKyYXBlNge6zSo0pl5/qJvBAnzaD76Vu2AsP16d6mTj478Ldn2mhgrWV+Xr0vQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "locate-path": "^2.0.0"
+        "globals": "^13.20.0"
+      },
+      "peerDependencies": {
+        "eslint": ">= 3.2.1"
+      }
+    },
+    "node_modules/eslint-plugin-cypress/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "node": ">=8"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint-plugin-es": {
@@ -20779,6 +21255,163 @@
         "eslint": ">=4.19.1"
       }
     },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.32.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.9",
+        "array.prototype.findlastindex": "^1.2.6",
+        "array.prototype.flat": "^1.3.3",
+        "array.prototype.flatmap": "^1.3.3",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.1",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.16.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.1",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.9",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
+      "integrity": "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aria-query": "^5.3.2",
+        "array-includes": "^3.1.8",
+        "array.prototype.flatmap": "^1.3.2",
+        "ast-types-flow": "^0.0.8",
+        "axe-core": "^4.10.0",
+        "axobject-query": "^4.1.0",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^3.3.5",
+        "language-tags": "^1.0.9",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.includes": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eslint-plugin-mocha": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.5.0.tgz",
+      "integrity": "sha512-F2ALmQVPT1GoP27O1JTZGrV9Pqg8k79OeIuvw63UxMtQKREZtmkK1NFgkZQ2TW7L2JSSFKHFPTtHu5z8R9QNRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-utils": "^3.0.0",
+        "globals": "^13.24.0",
+        "rambda": "^7.4.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-mocha/node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-plugin-mocha/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint-plugin-n": {
       "version": "15.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
@@ -20836,45 +21469,311 @@
         "node": ">=10"
       }
     },
-    "node_modules/eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
+    "node_modules/eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
       "dev": true,
-      "peer": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
+        "prettier-linter-helpers": "^1.0.0"
       },
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">=12.0.0"
       },
       "peerDependencies": {
-        "eslint": ">=5.16.0"
+        "eslint": ">=7.28.0",
+        "prettier": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-config-prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint-plugin-node/node_modules/eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
+    "node_modules/eslint-plugin-promise": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
+      "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
+      "license": "ISC",
       "engines": {
-        "node": ">=8.10.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "url": "https://opencollective.com/eslint"
       },
       "peerDependencies": {
-        "eslint": ">=4.19.1"
+        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-react": {
+      "version": "7.37.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz",
+      "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.3",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.2.1",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.9",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.1",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.12",
+        "string.prototype.repeat": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
+      }
+    },
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+      "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library": {
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.5.3.tgz",
+      "integrity": "sha512-sZk5hIrx0p1ehvdS2qHefKwXHiEysiQN+FMGCzES6xRNUgwI3q4KdWMeAwpPDP9u0RDkNzJpebRUnNch1sJh+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "^8.15.0",
+        "@typescript-eslint/utils": "^8.15.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0",
+        "pnpm": "^9.14.0"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
+      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/visitor-keys": "8.35.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/types": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
+      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.35.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
+      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.35.1",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn": {
+      "version": "56.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-56.0.1.tgz",
+      "integrity": "sha512-FwVV0Uwf8XPfVnKSGpMg7NtlZh0G0gBarCaFcMUOoqPxXryxdYxTRRv4kH6B9TFCVIrjRXG+emcxIk2ayZilog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "ci-info": "^4.0.0",
+        "clean-regexp": "^1.0.0",
+        "core-js-compat": "^3.38.1",
+        "esquery": "^1.6.0",
+        "globals": "^15.9.0",
+        "indent-string": "^4.0.0",
+        "is-builtin-module": "^3.2.1",
+        "jsesc": "^3.0.2",
+        "pluralize": "^8.0.0",
+        "read-pkg-up": "^7.0.1",
+        "regexp-tree": "^0.1.27",
+        "regjsparser": "^0.10.0",
+        "semver": "^7.6.3",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
+      },
+      "peerDependencies": {
+        "eslint": ">=8.56.0"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/ci-info": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
+      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/globals": {
+      "version": "15.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
+      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/regjsparser": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz",
+      "integrity": "sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-unicorn/node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/eslint-scope": {
@@ -20932,6 +21831,104 @@
         "node": ">=10"
       }
     },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/esm": {
       "version": "3.2.25",
       "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
@@ -22686,12 +23683,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
-    },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -23256,17 +24247,6 @@
         }
       }
     },
-    "node_modules/google-gax/node_modules/duplexify": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
-      "dependencies": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
-      }
-    },
     "node_modules/google-gax/node_modules/gaxios": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.6.0.tgz",
@@ -23846,18 +24826,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -25164,11 +26132,15 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -25890,6 +26862,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/iterator.prototype": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
+      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "get-proto": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/jackspeak": {
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
@@ -26673,13 +27663,16 @@
       }
     },
     "node_modules/jsx-ast-utils": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
-      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.5",
-        "object.assign": "^4.1.3"
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
       },
       "engines": {
         "node": ">=4.0"
@@ -26862,12 +27855,16 @@
       "dev": true
     },
     "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
+      "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "language-subtag-registry": "~0.3.2"
+        "language-subtag-registry": "^0.3.20"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
     "node_modules/latexqc": {
@@ -27592,7 +28589,8 @@
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/lodash.union": {
       "version": "4.6.0",
@@ -30094,28 +31092,32 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz",
-      "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz",
+      "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -30140,17 +31142,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/object.pick": {
@@ -30166,14 +31170,16 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -30294,6 +31300,23 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "license": "MIT",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/options": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
@@ -32831,6 +33854,22 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/prettier-linter-helpers": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
@@ -32927,15 +33966,6 @@
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/prom-client": {
       "version": "14.1.1",
       "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-14.1.1.tgz",
@@ -36886,25 +37916,60 @@
         "node": ">=8"
       }
     },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+    "node_modules/string.prototype.includes": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz",
+      "integrity": "sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
+      "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "regexp.prototype.flags": "^1.5.3",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.10",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
@@ -37860,6 +38925,7 @@
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
       "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "ajv": "^8.0.1",
         "lodash.truncate": "^4.4.2",
@@ -37876,6 +38942,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
       "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -37891,7 +38958,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
+      "dev": true,
+      "peer": true
     },
     "node_modules/tapable": {
       "version": "2.2.1",
@@ -38801,13 +39869,14 @@
       }
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^1.0.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
@@ -39548,12 +40617,6 @@
         "uuid": "bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz",
-      "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==",
-      "dev": true
-    },
     "node_modules/v8-to-istanbul": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
@@ -40972,7 +42035,6 @@
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -42362,11 +43424,11 @@
         "combobo": "^2.0.4",
         "css-loader": "^6.8.1",
         "cssnano": "^6.0.0",
-        "eslint": "^7.21.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-config-standard": "^16.0.3",
+        "eslint": "^8.57.0",
+        "eslint-config-prettier": "^10.1.5",
+        "eslint-config-standard": "^17.0.0",
         "eslint-plugin-react": "^7.32.2",
-        "eslint-plugin-unicorn": "^56.0.0",
+        "eslint-plugin-unicorn": "^56.0.1",
         "file-loader": "^6.2.0",
         "mini-css-extract-plugin": "^2.7.6",
         "nodemon": "^3.0.1",
@@ -42391,50 +43453,6 @@
         "node": ">=18"
       }
     },
-    "services/latexqc/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
-      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "services/latexqc/node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
-      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "services/latexqc/node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
-      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "deprecated": "Use @eslint/config-array instead",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
     "services/latexqc/node_modules/@types/debug": {
       "version": "4.1.12",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
@@ -42605,30 +43623,6 @@
         "node": ">=0.4.0"
       }
     },
-    "services/latexqc/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "services/latexqc/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
     "services/latexqc/node_modules/assertion-error": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
@@ -42683,22 +43677,6 @@
         "node": ">=12"
       }
     },
-    "services/latexqc/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "services/latexqc/node_modules/check-error": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
@@ -42776,123 +43754,20 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "services/latexqc/node_modules/eslint": {
-      "version": "7.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
-      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+    "services/latexqc/node_modules/eslint-config-prettier": {
+      "version": "10.1.5",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz",
+      "integrity": "sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==",
       "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
+      "license": "MIT",
       "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "eslint-config-prettier": "bin/cli.js"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "services/latexqc/node_modules/eslint-config-standard": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz",
-      "integrity": "sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peerDependencies": {
-        "eslint": "^7.12.1",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^4.2.1 || ^5.0.0"
-      }
-    },
-    "services/latexqc/node_modules/eslint-plugin-promise": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz",
-      "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "url": "https://opencollective.com/eslint-config-prettier"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0"
-      }
-    },
-    "services/latexqc/node_modules/espree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
-      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "services/latexqc/node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+        "eslint": ">=7.0.0"
       }
     },
     "services/latexqc/node_modules/fdir": {
@@ -42910,21 +43785,6 @@
         }
       }
     },
-    "services/latexqc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "services/latexqc/node_modules/helmet": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/helmet/-/helmet-7.1.0.tgz",
@@ -42948,15 +43808,6 @@
         "node": ">= 6"
       }
     },
-    "services/latexqc/node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "services/latexqc/node_modules/jiti": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
@@ -42969,19 +43820,6 @@
         "jiti": "lib/jiti-cli.mjs"
       }
     },
-    "services/latexqc/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "services/latexqc/node_modules/jsdom": {
       "version": "20.0.3",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
@@ -43083,23 +43921,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "services/latexqc/node_modules/optionator": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.5"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "services/latexqc/node_modules/parse5": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
@@ -43252,30 +44073,6 @@
         "ajv": "^8.8.2"
       }
     },
-    "services/latexqc/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "services/latexqc/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "services/latexqc/node_modules/tinyrainbow": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
@@ -44292,26 +45089,6 @@
         "yup": "^0.32.11"
       }
     },
-    "services/web/node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
     "services/web/node_modules/@google-cloud/bigquery": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/@google-cloud/bigquery/-/bigquery-6.0.3.tgz",
@@ -45121,20 +45898,6 @@
         "stream-shift": "^1.0.0"
       }
     },
-    "services/web/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "peer": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "services/web/node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",

From 1b03bb6e5d03f3f8c53c75e8f62d8fbb1b8a0327 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Thu, 3 Jul 2025 10:46:21 +0100
Subject: [PATCH 132/274] Fix prettier

GitOrigin-RevId: a3bdc1bc6a8bfa05ed9f8d7bfcd91cbd4cd48375
---
 .../ui/components/bootstrap-5/footer/thin-footer.tsx      | 4 +++-
 services/web/frontend/stylesheets/app/editor/pdf.less     | 8 ++++----
 .../web/frontend/stylesheets/app/website-redesign.less    | 6 ++++--
 .../frontend/stylesheets/bootstrap-5/components/card.scss | 6 ++++--
 .../stylesheets/bootstrap-5/foundations/spacing.scss      | 7 ++++---
 .../bootstrap-5/pages/editor/online-users.scss            | 4 ++--
 .../bootstrap-5/pages/project-list-ds-nav.scss            | 5 ++---
 services/web/frontend/stylesheets/components/card.less    | 6 ++++--
 8 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/thin-footer.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/thin-footer.tsx
index ae95136547..f632bfbb5e 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/thin-footer.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/thin-footer.tsx
@@ -76,7 +76,9 @@ function ThinFooter({
                 {hasCustomLeftNav ? <Separator /> : null}
               </>
             ) : null}
-            {leftItems?.map(item => <FooterItemLi key={item.text} {...item} />)}
+            {leftItems?.map(item => (
+              <FooterItemLi key={item.text} {...item} />
+            ))}
           </ul>
           <ul className="site-footer-items col-lg-3 text-end">
             {rightItems?.map(item => (
diff --git a/services/web/frontend/stylesheets/app/editor/pdf.less b/services/web/frontend/stylesheets/app/editor/pdf.less
index 545cac0e9d..3531a8289e 100644
--- a/services/web/frontend/stylesheets/app/editor/pdf.less
+++ b/services/web/frontend/stylesheets/app/editor/pdf.less
@@ -539,8 +539,8 @@
 }
 
 @editor-and-logs-pane-toolbars-height: @toolbar-small-height + @toolbar-height;
-@btn-small-height: (@padding-small-vertical * 2)+ (@font-size-small *
-      @line-height-small); // 5px * 2 + 14px * 1.5 = 31px
+@btn-small-height: (@padding-small-vertical * 2)+
+  (@font-size-small * @line-height-small); // 5px * 2 + 14px * 1.5 = 31px
 
 #dropdown-files-logs-pane-list {
   overflow-y: auto;
@@ -548,7 +548,7 @@
     white-space: nowrap;
   }
   max-height: calc(
-    ~'100vh - ' @editor-and-logs-pane-toolbars-height ~' - ' @btn-small-height ~' - '
-      @margin-md
+    ~'100vh - ' @editor-and-logs-pane-toolbars-height ~' - ' @btn-small-height
+      ~' - ' @margin-md
   );
 }
diff --git a/services/web/frontend/stylesheets/app/website-redesign.less b/services/web/frontend/stylesheets/app/website-redesign.less
index 6c5bf9b582..c66e801f4c 100644
--- a/services/web/frontend/stylesheets/app/website-redesign.less
+++ b/services/web/frontend/stylesheets/app/website-redesign.less
@@ -653,7 +653,8 @@
     display: flex;
     justify-content: space-between;
     padding: 64px;
-    background-image: linear-gradient(
+    background-image:
+      linear-gradient(
         to right,
         rgba(0, 0, 0, 0.4) 0%,
         @cta-card-bg-color 20%,
@@ -694,7 +695,8 @@
     align-items: center;
     padding: 64px;
     color: var(--white);
-    background-image: linear-gradient(
+    background-image:
+      linear-gradient(
         to right,
         rgba(0, 0, 0, 0.4) 0%,
         @cta-card-bg-color 25%,
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/card.scss b/services/web/frontend/stylesheets/bootstrap-5/components/card.scss
index b99c107083..777ec46c79 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/card.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/card.scss
@@ -107,7 +107,8 @@
     color: var(--white);
     text-align: center;
     background-size: cover;
-    background-image: linear-gradient(
+    background-image:
+      linear-gradient(
         to right,
         rgba(0 0 0 / 40%) 0%,
         var(--dark-jungle-green) 25%,
@@ -142,7 +143,8 @@
     border-radius: var(--border-radius-medium);
     color: var(--white);
     background-size: cover;
-    background-image: linear-gradient(
+    background-image:
+      linear-gradient(
         to right,
         rgba(0 0 0 / 40%) 0%,
         var(--dark-jungle-green) 20%,
diff --git a/services/web/frontend/stylesheets/bootstrap-5/foundations/spacing.scss b/services/web/frontend/stylesheets/bootstrap-5/foundations/spacing.scss
index 2609c99b6d..6170be4cc9 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/foundations/spacing.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/foundations/spacing.scss
@@ -16,9 +16,10 @@ $spacing-13: 64px;
 $spacing-14: 72px;
 $spacing-15: 80px;
 $spacing-16: 96px;
-$all-spacings: spacing-00, spacing-01, spacing-02, spacing-03, spacing-04,
-  spacing-05, spacing-06, spacing-07, spacing-08, spacing-09, spacing-10,
-  spacing-11, spacing-12, spacing-13, spacing-14, spacing-15, spacing-16;
+$all-spacings:
+  spacing-00, spacing-01, spacing-02, spacing-03, spacing-04, spacing-05,
+  spacing-06, spacing-07, spacing-08, spacing-09, spacing-10, spacing-11,
+  spacing-12, spacing-13, spacing-14, spacing-15, spacing-16;
 
 :root {
   --spacing-00: #{$spacing-00};
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/online-users.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/online-users.scss
index 2a03c22c19..a37152854d 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/online-users.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/online-users.scss
@@ -114,8 +114,8 @@
     min-width: var(--online-users-circle-size);
     height: var(--online-users-circle-size);
     line-height: calc(
-      var(--online-users-circle-size) - 2 * var(--online-users-border-size) - 2 *
-        var(--online-users-circle-padding)
+      var(--online-users-circle-size) - 2 * var(--online-users-border-size) -
+        2 * var(--online-users-circle-padding)
     );
     font-size: var(--font-size-01);
     text-align: center;
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss
index e87c41f22f..d71de37470 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/project-list-ds-nav.scss
@@ -105,9 +105,8 @@
         > .dropdown-menu {
           // navbar + new-project spacing + new-project button height (36px) + extra padding
           max-height: calc(
-            100vh - #{$header-height} - var(--spacing-03) - var(--spacing-08) - 36px - var(
-                --spacing-05
-              )
+            100vh - #{$header-height} - var(--spacing-03) - var(--spacing-08) -
+              36px - var(--spacing-05)
           );
           overflow: auto;
         }
diff --git a/services/web/frontend/stylesheets/components/card.less b/services/web/frontend/stylesheets/components/card.less
index 67e7bfc512..78031e2c30 100644
--- a/services/web/frontend/stylesheets/components/card.less
+++ b/services/web/frontend/stylesheets/components/card.less
@@ -146,7 +146,8 @@
     padding: var(--spacing-13);
     text-align: center;
     background-size: cover;
-    background-image: linear-gradient(
+    background-image:
+      linear-gradient(
         to right,
         rgba(0, 0, 0, 0.4) 0%,
         var(--dark-jungle-green) 25%,
@@ -176,7 +177,8 @@
     color: var(--white);
     padding: var(--spacing-13);
     background-size: cover;
-    background-image: linear-gradient(
+    background-image:
+      linear-gradient(
         to right,
         rgba(0, 0, 0, 0.4) 0%,
         var(--dark-jungle-green) 20%,

From 519b18e4a1fa0be4a79770e1e7cd28c95f21c335 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Thu, 3 Jul 2025 14:17:53 +0100
Subject: [PATCH 133/274] Lint fixes

GitOrigin-RevId: 686f3fb718faf5830a34656d45f888c8e245f7f9
---
 .../frontend/js/shared/components/switch.tsx  |  1 +
 .../components/full-project-match-counts.tsx  |  1 -
 .../sidebar/add-affiliation.test.tsx          | 16 +++++++++++----
 .../components/sidebar/tags-list.test.tsx     | 20 ++++++++++++-------
 .../table/cells/inline-tags.test.tsx          | 19 +++++++++---------
 .../components/linking/sso-widget.test.tsx    |  4 ++--
 6 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/services/web/frontend/js/shared/components/switch.tsx b/services/web/frontend/js/shared/components/switch.tsx
index 1b21600dc8..44157b8143 100644
--- a/services/web/frontend/js/shared/components/switch.tsx
+++ b/services/web/frontend/js/shared/components/switch.tsx
@@ -8,6 +8,7 @@ type SwitchProps = {
 
 function Switch({ onChange, checked, disabled = false }: SwitchProps) {
   return (
+    // eslint-disable-next-line jsx-a11y/label-has-associated-control
     <label className={classNames('switch-input', { disabled })}>
       <input
         className="invisible-input"
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
index 7483488b0c..c20187ae7e 100644
--- a/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-match-counts.tsx
@@ -5,7 +5,6 @@ import { useTranslation } from 'react-i18next'
 
 export const FullProjectMatchCounts: FC<{
   loading: boolean
-  totalResults?: number
   matchedFiles?: MatchedFile[]
 }> = ({ loading, matchedFiles }) => {
   const { t } = useTranslation()
diff --git a/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx b/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx
index c49cd38f2c..0d2d39890b 100644
--- a/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/sidebar/add-affiliation.test.tsx
@@ -28,7 +28,9 @@ describe('Add affiliation widget', function () {
     renderWithProjectListContext(<AddAffiliation />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     await screen.findByText(/are you affiliated with an institution/i)
     const addAffiliationLink = screen.getByRole('link', {
@@ -44,7 +46,9 @@ describe('Add affiliation widget', function () {
     renderWithProjectListContext(<AddAffiliation />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     validateNonExistence()
   })
@@ -58,7 +62,9 @@ describe('Add affiliation widget', function () {
     })
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     validateNonExistence()
   })
@@ -70,7 +76,9 @@ describe('Add affiliation widget', function () {
     renderWithProjectListContext(<AddAffiliation />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
 
     validateNonExistence()
   })
diff --git a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
index b066d45244..2b721e373a 100644
--- a/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/sidebar/tags-list.test.tsx
@@ -34,7 +34,9 @@ describe('<TagsList />', function () {
     renderWithProjectListContext(<TagsList />)
 
     await fetchMock.callHistory.flush(true)
-    await waitFor(() => expect(fetchMock.callHistory.called('/api/project')))
+    await waitFor(
+      () => expect(fetchMock.callHistory.called('/api/project')).to.be.true
+    )
   })
 
   afterEach(function () {
@@ -241,8 +243,10 @@ describe('<TagsList />', function () {
 
       fireEvent.click(saveButton)
 
-      await waitFor(() =>
-        expect(fetchMock.callHistory.called(`/tag/abc123def456/rename`))
+      await waitFor(
+        () =>
+          expect(fetchMock.callHistory.called(`/tag/abc123def456/edit`)).to.be
+            .true
       )
 
       await waitFor(
@@ -286,8 +290,9 @@ describe('<TagsList />', function () {
       const deleteButton = within(modal).getByRole('button', { name: 'Delete' })
       fireEvent.click(deleteButton)
 
-      await waitFor(() =>
-        expect(fetchMock.callHistory.called(`/tag/bcd234efg567`))
+      await waitFor(
+        () =>
+          expect(fetchMock.callHistory.called(`/tag/abc123def456`)).to.be.true
       )
 
       await waitFor(
@@ -307,8 +312,9 @@ describe('<TagsList />', function () {
       const deleteButton = within(modal).getByRole('button', { name: 'Delete' })
       fireEvent.click(deleteButton)
 
-      await waitFor(() =>
-        expect(fetchMock.callHistory.called(`/tag/bcd234efg567`))
+      await waitFor(
+        () =>
+          expect(fetchMock.callHistory.called('/tag/abc123def456')).to.be.true
       )
 
       await within(modal).findByText('Sorry, something went wrong')
diff --git a/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx b/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx
index 971b2aaa48..ddacc6da5b 100644
--- a/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx
+++ b/services/web/test/frontend/features/project-list/components/table/cells/inline-tags.test.tsx
@@ -58,15 +58,16 @@ describe('<InlineTags />', function () {
       name: 'Remove tag My Test Tag',
     })
     fireEvent.click(removeButton)
-    await waitFor(() =>
-      expect(
-        fetchMock.callHistory.called(
-          `/tag/789fff789fff/project/${copyableProject.id}`,
-          {
-            method: 'DELETE',
-          }
-        )
-      )
+    await waitFor(
+      () =>
+        expect(
+          fetchMock.callHistory.called(
+            `/tag/789fff789fff/project/${copyableProject.id}`,
+            {
+              method: 'DELETE',
+            }
+          )
+        ).to.be.true
     )
     expect(screen.queryByText('My Test Tag')).to.not.exist
     screen.getByText('Tag 2')
diff --git a/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx b/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx
index 2f02b7709b..68c3f35c27 100644
--- a/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx
+++ b/services/web/test/frontend/features/settings/components/linking/sso-widget.test.tsx
@@ -100,8 +100,8 @@ describe('<SSOLinkingWidget />', function () {
         })
       )
       fireEvent.click(confirmBtn)
-      await waitFor(() =>
-        expect(screen.getByRole('button', { name: 'Unlinking' }))
+      await waitFor(
+        () => expect(screen.getByRole('button', { name: 'Unlinking' })).to.exist
       )
     })
   })

From f0827f0e675b776b7b40008fdfb87e14424f02d1 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Wed, 2 Jul 2025 16:44:02 +0100
Subject: [PATCH 134/274] consider trustedUsersRegex when choosing to show
 captcha at login

GitOrigin-RevId: 963fe1c40d05fe088a092eb45b12bcddf1f18e7b
---
 .../src/Features/Captcha/CaptchaMiddleware.js |  4 +-
 .../web/test/acceptance/src/CaptchaTests.mjs  | 53 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/services/web/app/src/Features/Captcha/CaptchaMiddleware.js b/services/web/app/src/Features/Captcha/CaptchaMiddleware.js
index 9c93b74cfa..645738c2c7 100644
--- a/services/web/app/src/Features/Captcha/CaptchaMiddleware.js
+++ b/services/web/app/src/Features/Captcha/CaptchaMiddleware.js
@@ -28,7 +28,9 @@ async function initializeDeviceHistory(req) {
 
 async function canSkipCaptcha(req, res) {
   const trustedUser =
-    req.body?.email && Settings.recaptcha.trustedUsers.includes(req.body.email)
+    req.body?.email &&
+    (Settings.recaptcha.trustedUsers.includes(req.body.email) ||
+      Settings.recaptcha.trustedUsersRegex?.test(req.body.email))
   if (trustedUser) {
     return res.json(true)
   }
diff --git a/services/web/test/acceptance/src/CaptchaTests.mjs b/services/web/test/acceptance/src/CaptchaTests.mjs
index 10fdcf1626..223fe02cb0 100644
--- a/services/web/test/acceptance/src/CaptchaTests.mjs
+++ b/services/web/test/acceptance/src/CaptchaTests.mjs
@@ -104,6 +104,59 @@ describe('Captcha', function () {
     })
   })
 
+  describe('trustedUsersRegex', function () {
+    let resetTrustedUsersRegex
+    beforeEach(function () {
+      resetTrustedUsersRegex = Settings.recaptcha.trustedUsersRegex
+      Settings.recaptcha.trustedUsersRegex = /\+trusted@example\.com$/
+    })
+
+    afterEach(function () {
+      Settings.recaptcha.trustedUsersRegex = resetTrustedUsersRegex
+    })
+
+    describe('when user is trusted, can login without captcha', function () {
+      let trustedUser
+      beforeEach(async function () {
+        trustedUser = new User({
+          email: 'acceptance-test+trusted@example.com',
+        })
+        await trustedUser.ensureUserExists()
+      })
+
+      it('should be able to skip captcha', async function () {
+        expect(await canSkipCaptcha(trustedUser.email)).to.equal(true)
+      })
+
+      it('should note that the user is trusted', async function () {
+        const { response, body } = await login(
+          trustedUser.email,
+          trustedUser.password,
+          ''
+        )
+        expectSuccessfulLogin(response, body)
+        const auditLog = await trustedUser.getAuditLog()
+        expect(auditLog[0].info).to.deep.equal({
+          captcha: 'trusted',
+          method: 'Password login',
+        })
+      })
+    })
+
+    describe('when user is not trusted', function () {
+      it('should not be able to skip captcha', async function () {
+        expect(await canSkipCaptcha(user.email)).to.equal(false)
+      })
+
+      it('should not add an audit log entry for trusted user', async function () {
+        const { response, body } = await login(user.email, user.password, '')
+        expectBadCaptchaResponse(response, body)
+        const auditLog = await user.getAuditLog()
+        expect(auditLog).to.have.lengthOf(0)
+      })
+    })
+  })
+
   describe('deviceHistory', function () {
     beforeEach('login', async function () {
       const { response, body } = await loginWithCaptcha('valid')

From 1a1f28324564c6e0db3a8fabba1d3a02238d1fd5 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Wed, 2 Jul 2025 11:39:10 +0100
Subject: [PATCH 135/274] Update node to 22.17.0

GitOrigin-RevId: 7a15f7a0e95e3331c589955aca1fbc5dfb13a568
---
 libraries/access-token-encryptor/.nvmrc          | 2 +-
 libraries/access-token-encryptor/buildscript.txt | 2 +-
 libraries/fetch-utils/.nvmrc                     | 2 +-
 libraries/fetch-utils/buildscript.txt            | 2 +-
 libraries/logger/.nvmrc                          | 2 +-
 libraries/logger/buildscript.txt                 | 2 +-
 libraries/metrics/.nvmrc                         | 2 +-
 libraries/metrics/buildscript.txt                | 2 +-
 libraries/mongo-utils/.nvmrc                     | 2 +-
 libraries/mongo-utils/buildscript.txt            | 2 +-
 libraries/o-error/.nvmrc                         | 2 +-
 libraries/o-error/buildscript.txt                | 2 +-
 libraries/object-persistor/.nvmrc                | 2 +-
 libraries/object-persistor/buildscript.txt       | 2 +-
 libraries/overleaf-editor-core/.nvmrc            | 2 +-
 libraries/overleaf-editor-core/buildscript.txt   | 2 +-
 libraries/promise-utils/.nvmrc                   | 2 +-
 libraries/promise-utils/buildscript.txt          | 2 +-
 libraries/ranges-tracker/.nvmrc                  | 2 +-
 libraries/ranges-tracker/buildscript.txt         | 2 +-
 libraries/redis-wrapper/.nvmrc                   | 2 +-
 libraries/redis-wrapper/buildscript.txt          | 2 +-
 libraries/settings/.nvmrc                        | 2 +-
 libraries/settings/buildscript.txt               | 2 +-
 libraries/stream-utils/.nvmrc                    | 2 +-
 libraries/stream-utils/buildscript.txt           | 2 +-
 server-ce/test/Dockerfile                        | 2 +-
 services/chat/.nvmrc                             | 2 +-
 services/chat/Dockerfile                         | 2 +-
 services/chat/Makefile                           | 4 ++--
 services/chat/buildscript.txt                    | 2 +-
 services/chat/docker-compose.yml                 | 4 ++--
 services/clsi/.nvmrc                             | 2 +-
 services/clsi/Dockerfile                         | 2 +-
 services/clsi/Makefile                           | 4 ++--
 services/clsi/buildscript.txt                    | 2 +-
 services/contacts/.nvmrc                         | 2 +-
 services/contacts/Dockerfile                     | 2 +-
 services/contacts/Makefile                       | 4 ++--
 services/contacts/buildscript.txt                | 2 +-
 services/contacts/docker-compose.yml             | 4 ++--
 services/docstore/.nvmrc                         | 2 +-
 services/docstore/Dockerfile                     | 2 +-
 services/docstore/Makefile                       | 4 ++--
 services/docstore/buildscript.txt                | 2 +-
 services/docstore/docker-compose.yml             | 4 ++--
 services/document-updater/.nvmrc                 | 2 +-
 services/document-updater/Dockerfile             | 2 +-
 services/document-updater/Makefile               | 4 ++--
 services/document-updater/buildscript.txt        | 2 +-
 services/document-updater/docker-compose.yml     | 4 ++--
 services/filestore/.nvmrc                        | 2 +-
 services/filestore/Dockerfile                    | 2 +-
 services/filestore/Makefile                      | 4 ++--
 services/filestore/buildscript.txt               | 2 +-
 services/filestore/docker-compose.ci.yml         | 2 +-
 services/filestore/docker-compose.yml            | 2 +-
 services/history-v1/.nvmrc                       | 2 +-
 services/history-v1/Dockerfile                   | 2 +-
 services/history-v1/Makefile                     | 4 ++--
 services/history-v1/buildscript.txt              | 2 +-
 services/history-v1/docker-compose.ci.yml        | 2 +-
 services/history-v1/docker-compose.yml           | 2 +-
 services/notifications/.nvmrc                    | 2 +-
 services/notifications/Dockerfile                | 2 +-
 services/notifications/Makefile                  | 4 ++--
 services/notifications/buildscript.txt           | 2 +-
 services/notifications/docker-compose.yml        | 4 ++--
 services/project-history/.nvmrc                  | 2 +-
 services/project-history/Dockerfile              | 2 +-
 services/project-history/Makefile                | 4 ++--
 services/project-history/buildscript.txt         | 2 +-
 services/project-history/docker-compose.yml      | 4 ++--
 services/real-time/.nvmrc                        | 2 +-
 services/real-time/Dockerfile                    | 2 +-
 services/real-time/Makefile                      | 4 ++--
 services/real-time/buildscript.txt               | 2 +-
 services/real-time/docker-compose.yml            | 4 ++--
 services/web/.nvmrc                              | 2 +-
 services/web/Dockerfile                          | 2 +-
 services/web/Dockerfile.frontend                 | 2 +-
 services/web/cloudbuild-storybook.yaml           | 6 +++---
 services/web/docker-compose.common.env           | 2 +-
 services/web/docker-compose.yml                  | 4 ++--
 services/web/scripts/translations/Dockerfile     | 2 +-
 85 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/libraries/access-token-encryptor/.nvmrc b/libraries/access-token-encryptor/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/access-token-encryptor/.nvmrc
+++ b/libraries/access-token-encryptor/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt
index 8ce12073ea..8f08720e7e 100644
--- a/libraries/access-token-encryptor/buildscript.txt
+++ b/libraries/access-token-encryptor/buildscript.txt
@@ -5,6 +5,6 @@ access-token-encryptor
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/fetch-utils/.nvmrc b/libraries/fetch-utils/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/fetch-utils/.nvmrc
+++ b/libraries/fetch-utils/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/fetch-utils/buildscript.txt b/libraries/fetch-utils/buildscript.txt
index 35e8eed85b..7008a533a6 100644
--- a/libraries/fetch-utils/buildscript.txt
+++ b/libraries/fetch-utils/buildscript.txt
@@ -5,6 +5,6 @@ fetch-utils
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/logger/.nvmrc b/libraries/logger/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/logger/.nvmrc
+++ b/libraries/logger/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt
index a3d1cc0646..e2520c4800 100644
--- a/libraries/logger/buildscript.txt
+++ b/libraries/logger/buildscript.txt
@@ -5,6 +5,6 @@ logger
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/metrics/.nvmrc b/libraries/metrics/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/metrics/.nvmrc
+++ b/libraries/metrics/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt
index 58ff195d95..d1e272c356 100644
--- a/libraries/metrics/buildscript.txt
+++ b/libraries/metrics/buildscript.txt
@@ -5,6 +5,6 @@ metrics
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/mongo-utils/.nvmrc b/libraries/mongo-utils/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/mongo-utils/.nvmrc
+++ b/libraries/mongo-utils/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/mongo-utils/buildscript.txt b/libraries/mongo-utils/buildscript.txt
index 35ca540bfb..ff07040970 100644
--- a/libraries/mongo-utils/buildscript.txt
+++ b/libraries/mongo-utils/buildscript.txt
@@ -5,6 +5,6 @@ mongo-utils
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/o-error/.nvmrc b/libraries/o-error/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/o-error/.nvmrc
+++ b/libraries/o-error/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt
index c61679157e..6a9334411a 100644
--- a/libraries/o-error/buildscript.txt
+++ b/libraries/o-error/buildscript.txt
@@ -5,6 +5,6 @@ o-error
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/object-persistor/.nvmrc b/libraries/object-persistor/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/object-persistor/.nvmrc
+++ b/libraries/object-persistor/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt
index d5113ce910..897e789700 100644
--- a/libraries/object-persistor/buildscript.txt
+++ b/libraries/object-persistor/buildscript.txt
@@ -5,6 +5,6 @@ object-persistor
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/overleaf-editor-core/.nvmrc b/libraries/overleaf-editor-core/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/overleaf-editor-core/.nvmrc
+++ b/libraries/overleaf-editor-core/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/overleaf-editor-core/buildscript.txt b/libraries/overleaf-editor-core/buildscript.txt
index 25a221232a..c0391ca30a 100644
--- a/libraries/overleaf-editor-core/buildscript.txt
+++ b/libraries/overleaf-editor-core/buildscript.txt
@@ -5,6 +5,6 @@ overleaf-editor-core
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/promise-utils/.nvmrc b/libraries/promise-utils/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/promise-utils/.nvmrc
+++ b/libraries/promise-utils/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/promise-utils/buildscript.txt b/libraries/promise-utils/buildscript.txt
index 32c9fc8793..a9f0fb0c76 100644
--- a/libraries/promise-utils/buildscript.txt
+++ b/libraries/promise-utils/buildscript.txt
@@ -5,6 +5,6 @@ promise-utils
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/ranges-tracker/.nvmrc b/libraries/ranges-tracker/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/ranges-tracker/.nvmrc
+++ b/libraries/ranges-tracker/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/ranges-tracker/buildscript.txt b/libraries/ranges-tracker/buildscript.txt
index be28fc1d80..013d56f3ba 100644
--- a/libraries/ranges-tracker/buildscript.txt
+++ b/libraries/ranges-tracker/buildscript.txt
@@ -5,6 +5,6 @@ ranges-tracker
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/redis-wrapper/.nvmrc b/libraries/redis-wrapper/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/redis-wrapper/.nvmrc
+++ b/libraries/redis-wrapper/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt
index 395bc706ac..54d43d5092 100644
--- a/libraries/redis-wrapper/buildscript.txt
+++ b/libraries/redis-wrapper/buildscript.txt
@@ -5,6 +5,6 @@ redis-wrapper
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/settings/.nvmrc b/libraries/settings/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/settings/.nvmrc
+++ b/libraries/settings/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt
index d4daff96d5..9c7632f23f 100644
--- a/libraries/settings/buildscript.txt
+++ b/libraries/settings/buildscript.txt
@@ -5,6 +5,6 @@ settings
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/libraries/stream-utils/.nvmrc b/libraries/stream-utils/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/libraries/stream-utils/.nvmrc
+++ b/libraries/stream-utils/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/libraries/stream-utils/buildscript.txt b/libraries/stream-utils/buildscript.txt
index 1da6bdade9..5af61cc683 100644
--- a/libraries/stream-utils/buildscript.txt
+++ b/libraries/stream-utils/buildscript.txt
@@ -5,6 +5,6 @@ stream-utils
 --env-pass-through=
 --esmock-loader=False
 --is-library=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/server-ce/test/Dockerfile b/server-ce/test/Dockerfile
index ad89208541..7cc86f7ff9 100644
--- a/server-ce/test/Dockerfile
+++ b/server-ce/test/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.15.1
+FROM node:22.17.0
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
 &&  echo \
       "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" \
diff --git a/services/chat/.nvmrc b/services/chat/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/chat/.nvmrc
+++ b/services/chat/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile
index 2fa7112407..66a8bc3ded 100644
--- a/services/chat/Dockerfile
+++ b/services/chat/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/chat
 
diff --git a/services/chat/Makefile b/services/chat/Makefile
index d3f6641f44..792f5d2cd6 100644
--- a/services/chat/Makefile
+++ b/services/chat/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt
index 287aa49cb7..35114bd2a4 100644
--- a/services/chat/buildscript.txt
+++ b/services/chat/buildscript.txt
@@ -4,6 +4,6 @@ chat
 --env-add=
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml
index 43a30e8cc7..ddc5f9e698 100644
--- a/services/chat/docker-compose.yml
+++ b/services/chat/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/chat
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/chat
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/clsi/.nvmrc b/services/clsi/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/clsi/.nvmrc
+++ b/services/clsi/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/clsi/Dockerfile b/services/clsi/Dockerfile
index 581e95b832..77c26fab23 100644
--- a/services/clsi/Dockerfile
+++ b/services/clsi/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/clsi
 COPY services/clsi/install_deps.sh /overleaf/services/clsi/
diff --git a/services/clsi/Makefile b/services/clsi/Makefile
index f18e7201c1..e02697f4e9 100644
--- a/services/clsi/Makefile
+++ b/services/clsi/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt
index 58975135d0..09c21888df 100644
--- a/services/clsi/buildscript.txt
+++ b/services/clsi/buildscript.txt
@@ -5,7 +5,7 @@ clsi
 --env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true",ALLOWED_IMAGES=quay.io/sharelatex/texlive-full:2017.1,TEXLIVE_IMAGE=quay.io/sharelatex/texlive-full:2017.1,TEX_LIVE_IMAGE_NAME_OVERRIDE=us-east1-docker.pkg.dev/overleaf-ops/ol-docker,TEXLIVE_IMAGE_USER="tex",SANDBOXED_COMPILES="true",SANDBOXED_COMPILES_HOST_DIR_COMPILES=$PWD/compiles,SANDBOXED_COMPILES_HOST_DIR_OUTPUT=$PWD/output
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=True
 --script-version=4.7.0
 --use-large-ci-runner=True
diff --git a/services/contacts/.nvmrc b/services/contacts/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/contacts/.nvmrc
+++ b/services/contacts/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile
index d3db63bb25..b59cada7b3 100644
--- a/services/contacts/Dockerfile
+++ b/services/contacts/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/contacts
 
diff --git a/services/contacts/Makefile b/services/contacts/Makefile
index 035a8ea5ac..3309e298e8 100644
--- a/services/contacts/Makefile
+++ b/services/contacts/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt
index f03bcebd64..b20764246c 100644
--- a/services/contacts/buildscript.txt
+++ b/services/contacts/buildscript.txt
@@ -4,6 +4,6 @@ contacts
 --env-add=
 --env-pass-through=
 --esmock-loader=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml
index 305232b55d..6c77ef5e31 100644
--- a/services/contacts/docker-compose.yml
+++ b/services/contacts/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/contacts
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/contacts
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/docstore/.nvmrc b/services/docstore/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/docstore/.nvmrc
+++ b/services/docstore/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/docstore/Dockerfile b/services/docstore/Dockerfile
index 811e7c2553..f24f9ddaf7 100644
--- a/services/docstore/Dockerfile
+++ b/services/docstore/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/docstore
 
diff --git a/services/docstore/Makefile b/services/docstore/Makefile
index 715d5cf351..2b3596b0b4 100644
--- a/services/docstore/Makefile
+++ b/services/docstore/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt
index fda91d775e..4526aa959c 100644
--- a/services/docstore/buildscript.txt
+++ b/services/docstore/buildscript.txt
@@ -4,6 +4,6 @@ docstore
 --env-add=
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=True
 --script-version=4.7.0
diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml
index a58b862b9a..8c11eb5a91 100644
--- a/services/docstore/docker-compose.yml
+++ b/services/docstore/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/docstore
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/docstore
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/document-updater/.nvmrc b/services/document-updater/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/document-updater/.nvmrc
+++ b/services/document-updater/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile
index 77f18e8f28..720b619c41 100644
--- a/services/document-updater/Dockerfile
+++ b/services/document-updater/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/document-updater
 
diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile
index 4f6bae1816..46dfced5c9 100644
--- a/services/document-updater/Makefile
+++ b/services/document-updater/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt
index 8252032dd4..98d10a8e55 100644
--- a/services/document-updater/buildscript.txt
+++ b/services/document-updater/buildscript.txt
@@ -4,6 +4,6 @@ document-updater
 --env-add=
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=True
 --script-version=4.7.0
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index 3688d21d0b..cf7c9a2eb6 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/document-updater
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/document-updater
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/filestore/.nvmrc b/services/filestore/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/filestore/.nvmrc
+++ b/services/filestore/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile
index 43477aa349..33de01c80f 100644
--- a/services/filestore/Dockerfile
+++ b/services/filestore/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/filestore
 COPY services/filestore/install_deps.sh /overleaf/services/filestore/
diff --git a/services/filestore/Makefile b/services/filestore/Makefile
index 9b32f44f1b..69d7f85bf4 100644
--- a/services/filestore/Makefile
+++ b/services/filestore/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt
index 8ffa1e058f..bd4d2116f6 100644
--- a/services/filestore/buildscript.txt
+++ b/services/filestore/buildscript.txt
@@ -5,7 +5,7 @@ filestore
 --env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_STORAGE_CLASS=REDUCED_REDUNDANCY,AWS_S3_USER_FILES_BUCKET_NAME=fake-user-files,AWS_S3_USER_FILES_DEK_BUCKET_NAME=fake-user-files-dek,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake-template-files,GCS_USER_FILES_BUCKET_NAME=fake-gcs-user-files,GCS_TEMPLATE_FILES_BUCKET_NAME=fake-gcs-template-files
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=True
 --script-version=4.7.0
 --test-acceptance-shards=SHARD_01_,SHARD_02_,SHARD_03_
diff --git a/services/filestore/docker-compose.ci.yml b/services/filestore/docker-compose.ci.yml
index 3656e1d6b1..fdf860b511 100644
--- a/services/filestore/docker-compose.ci.yml
+++ b/services/filestore/docker-compose.ci.yml
@@ -64,7 +64,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   certs:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - ./test/acceptance/certs:/certs
     working_dir: /certs
diff --git a/services/filestore/docker-compose.yml b/services/filestore/docker-compose.yml
index a15323c722..971d35b708 100644
--- a/services/filestore/docker-compose.yml
+++ b/services/filestore/docker-compose.yml
@@ -72,7 +72,7 @@ services:
     command: npm run --silent test:acceptance
 
   certs:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - ./test/acceptance/certs:/certs
     working_dir: /certs
diff --git a/services/history-v1/.nvmrc b/services/history-v1/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/history-v1/.nvmrc
+++ b/services/history-v1/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/history-v1/Dockerfile b/services/history-v1/Dockerfile
index 7eb6f00832..322ab67ff8 100644
--- a/services/history-v1/Dockerfile
+++ b/services/history-v1/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/history-v1
 COPY services/history-v1/install_deps.sh /overleaf/services/history-v1/
diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile
index 53fa3f17e3..7e62ba1812 100644
--- a/services/history-v1/Makefile
+++ b/services/history-v1/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt
index 7f6f209f1f..4ce8eb63c7 100644
--- a/services/history-v1/buildscript.txt
+++ b/services/history-v1/buildscript.txt
@@ -4,7 +4,7 @@ history-v1
 --env-add=
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
 --tsconfig-extra-includes=backup-deletion-app.mjs,backup-verifier-app.mjs,backup-worker-app.mjs,api/**/*,migrations/**/*,storage/**/*
diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml
index 9128451c4f..da664d6b30 100644
--- a/services/history-v1/docker-compose.ci.yml
+++ b/services/history-v1/docker-compose.ci.yml
@@ -100,7 +100,7 @@ services:
       retries: 20
 
   certs:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - ./test/acceptance/certs:/certs
     working_dir: /certs
diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml
index cda379fb14..22b739abf9 100644
--- a/services/history-v1/docker-compose.yml
+++ b/services/history-v1/docker-compose.yml
@@ -109,7 +109,7 @@ services:
       retries: 20
 
   certs:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - ./test/acceptance/certs:/certs
     working_dir: /certs
diff --git a/services/notifications/.nvmrc b/services/notifications/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/notifications/.nvmrc
+++ b/services/notifications/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile
index 3733d6df6a..0d0581f113 100644
--- a/services/notifications/Dockerfile
+++ b/services/notifications/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/notifications
 
diff --git a/services/notifications/Makefile b/services/notifications/Makefile
index 51d588bd86..f8440d97e2 100644
--- a/services/notifications/Makefile
+++ b/services/notifications/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt
index bb7e1ec953..1950c5c251 100644
--- a/services/notifications/buildscript.txt
+++ b/services/notifications/buildscript.txt
@@ -4,6 +4,6 @@ notifications
 --env-add=
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=True
 --script-version=4.7.0
diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml
index 167e45fdb1..081bbfa002 100644
--- a/services/notifications/docker-compose.yml
+++ b/services/notifications/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/notifications
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/notifications
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/project-history/.nvmrc b/services/project-history/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/project-history/.nvmrc
+++ b/services/project-history/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/project-history/Dockerfile b/services/project-history/Dockerfile
index 5216b7fcb9..0d719cbfc6 100644
--- a/services/project-history/Dockerfile
+++ b/services/project-history/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/project-history
 
diff --git a/services/project-history/Makefile b/services/project-history/Makefile
index 27b339a97a..a1d116253d 100644
--- a/services/project-history/Makefile
+++ b/services/project-history/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json --volume $(MONOREPO)/services/document-updater/app/js/types.ts:/overleaf/services/document-updater/app/js/types.ts ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/project-history/buildscript.txt b/services/project-history/buildscript.txt
index bcb29f215b..dc83e95fe4 100644
--- a/services/project-history/buildscript.txt
+++ b/services/project-history/buildscript.txt
@@ -4,6 +4,6 @@ project-history
 --env-add=
 --env-pass-through=
 --esmock-loader=True
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml
index 95a36b5fcb..eeca03de6e 100644
--- a/services/project-history/docker-compose.yml
+++ b/services/project-history/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/project-history
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/project-history
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/real-time/.nvmrc
+++ b/services/real-time/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile
index f178233af9..4fb5283c1e 100644
--- a/services/real-time/Dockerfile
+++ b/services/real-time/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/real-time
 
diff --git a/services/real-time/Makefile b/services/real-time/Makefile
index 5604e9f5cc..7d2bcacb77 100644
--- a/services/real-time/Makefile
+++ b/services/real-time/Makefile
@@ -32,12 +32,12 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.15.1 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:22.17.0 npm run --silent
 
 RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) npm run --silent
 
 # Same but from the top of the monorepo
-RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.15.1 npm run --silent
+RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:22.17.0 npm run --silent
 
 SHELLCHECK_OPTS = \
 	--shell=bash \
diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt
index fdfd32e135..1eb77d9f6b 100644
--- a/services/real-time/buildscript.txt
+++ b/services/real-time/buildscript.txt
@@ -4,6 +4,6 @@ real-time
 --env-add=
 --env-pass-through=
 --esmock-loader=False
---node-version=22.15.1
+--node-version=22.17.0
 --public-repo=False
 --script-version=4.7.0
diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml
index f1041164bc..a4f019f6be 100644
--- a/services/real-time/docker-compose.yml
+++ b/services/real-time/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/real-time
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/real-time
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/web/.nvmrc b/services/web/.nvmrc
index 8320a6d299..fc37597bcc 100644
--- a/services/web/.nvmrc
+++ b/services/web/.nvmrc
@@ -1 +1 @@
-22.15.1
+22.17.0
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
index 469a7af2d7..5e58ab7ec2 100644
--- a/services/web/Dockerfile
+++ b/services/web/Dockerfile
@@ -1,6 +1,6 @@
 # the base image is suitable for running web with /overleaf/services/web bind
 # mounted
-FROM node:22.15.1 AS base
+FROM node:22.17.0 AS base
 
 WORKDIR /overleaf/services/web
 
diff --git a/services/web/Dockerfile.frontend b/services/web/Dockerfile.frontend
index b22e376391..6922653908 100644
--- a/services/web/Dockerfile.frontend
+++ b/services/web/Dockerfile.frontend
@@ -1,4 +1,4 @@
-FROM node:22.15.1
+FROM node:22.17.0
 
 # Install Google Chrome
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
diff --git a/services/web/cloudbuild-storybook.yaml b/services/web/cloudbuild-storybook.yaml
index c50513ff7b..be39704062 100644
--- a/services/web/cloudbuild-storybook.yaml
+++ b/services/web/cloudbuild-storybook.yaml
@@ -1,13 +1,13 @@
 steps:
   - id: npm_ci
-    name: "node:22.15.1"
+    name: "node:22.17.0"
     entrypoint: /bin/bash
     args:
       - '-c'
       - 'bin/npm_install_subset . libraries/* services/web'
 
   - id: build-storybook
-    name: 'node:22.15.1'
+    name: 'node:22.17.0'
     env:
       - 'BRANCH_NAME=$BRANCH_NAME'
       - 'BUILD_ID=$BUILD_ID'
@@ -49,7 +49,7 @@ steps:
       - deploy-storybook
 
   - id: create-storybook-index
-    name: 'node:22.15.1'
+    name: 'node:22.17.0'
     dir: services/web
     env:
       - 'BRANCH_NAME=$BRANCH_NAME'
diff --git a/services/web/docker-compose.common.env b/services/web/docker-compose.common.env
index 0642e1ee98..8facd00c2c 100644
--- a/services/web/docker-compose.common.env
+++ b/services/web/docker-compose.common.env
@@ -41,6 +41,6 @@ OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN=true
 OVERLEAF_SAML_CERT=MIIDXTCCAkWgAwIBAgIJAOvOeQ4xFTzsMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMTE1MTQxMjU5WhcNMjYxMTE1MTQxMjU5WjBFMQswCQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCT6MBe5G9VoLU8MfztOEbUhnwLp17ak8eFUqxqeXkkqtWB0b/cmIBU3xoQoO3dIF8PBzfqehqfYVhrNt/TFgcmDfmJnPJRL1RJWMW3VmiP5odJ3LwlkKbZpkeT3wZ8HEJIR1+zbpxiBNkbd2GbdR1iumcsHzMYX1A2CBj+ZMV5VijC+K4P0e9c05VsDEUtLmfeAasJAiumQoVVgAe/BpiXjICGGewa6EPFI7mKkifIRKOGxdRESwZZjxP30bI31oDN0cgKqIgSJtJ9nfCn9jgBMBkQHu42WMuaWD4jrGd7+vYdX+oIfArs9aKgAH5kUGhGdew2R9SpBefrhbNxG8QIDAQABo1AwTjAdBgNVHQ4EFgQU+aSojSyyLChP/IpZcafvSdhj7KkwHwYDVR0jBBgwFoAU+aSojSyyLChP/IpZcafvSdhj7KkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABl3+OOVLBWMKs6PjA8lPuloWDNzSr3v76oUcHqAb+cfbucjXrOVsS9RJ0X9yxvCQyfM9FfY43DbspnN3izYhdvbJD8kKLNf0LA5st+ZxLfy0ACyL2iyAwICaqndqxAjQYplFAHmpUiu1DiHckyBPekokDJd+ze95urHMOsaGS5RWPoKJVE0bkaAeZCmEu0NNpXRSBiuxXSTeSAJfv6kyE/rkdhzUKyUl/cGQFrsVYfAFQVA+W6CKOh74ErSEzSHQQYndl7nD33snD/YqdU1ROxV6aJzLKCg+sdj+wRXSP2u/UHnM4jW9TGJfhO42jzL6WVuEvr9q4l7zWzUQKKKhtQ==
 # DEVICE_HISTORY_SECRET has been generated using:
 # NOTE: crypto.generateKeySync was added in v15, v16 is the next LTS release.
-# $ docker run --rm node:22.15.1 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")'
+# $ docker run --rm node:22.17.0 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")'
 DEVICE_HISTORY_SECRET=1b46e6cdf72db02845da06c9517c9cfbbfa0d87357479f4e1df3ce160bd54807
 QUEUE_PROCESSING_ENABLED=true
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index 10e0a7842c..069c1e77de 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -6,7 +6,7 @@ volumes:
 services:
 
   test_unit:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/web
       - ../../node_modules:/overleaf/node_modules
@@ -28,7 +28,7 @@ services:
       - mongo
 
   test_acceptance:
-    image: node:22.15.1
+    image: node:22.17.0
     volumes:
       - .:/overleaf/services/web
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/web/scripts/translations/Dockerfile b/services/web/scripts/translations/Dockerfile
index ada45efb8f..08dc2265c5 100644
--- a/services/web/scripts/translations/Dockerfile
+++ b/services/web/scripts/translations/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22.15.1
+FROM node:22.17.0
 
 WORKDIR /app/scripts/translations
 

From 9fc0373fab8cf4f49602c4bcae04530e19297da2 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Tue, 8 Jul 2025 13:42:17 +0200
Subject: [PATCH 136/274] [terraform] clsi: add C3D trial (#26929)

* [terraform] clsi: add C3D trial

* [terraform] clsi: switch C3D to standard variant with local SSD

GitOrigin-RevId: 6e6ceeb93ee94800d8ce46557322da82dc99fc2a
---
 services/web/app/src/Features/Compile/CompileController.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js
index 69ad20e398..4ff790f5e2 100644
--- a/services/web/app/src/Features/Compile/CompileController.js
+++ b/services/web/app/src/Features/Compile/CompileController.js
@@ -209,7 +209,11 @@ const _CompileController = {
           status,
           compileTime: timings?.compileE2E,
           timeout: limits.timeout,
-          server: clsiServerId?.includes('-c2d-') ? 'faster' : 'normal',
+          server:
+            clsiServerId?.includes('-c2d-') || clsiServerId?.includes('-c3d-')
+              ? 'faster'
+              : 'normal',
+          clsiServerId,
           isAutoCompile,
           isInitialCompile: stats?.isInitialCompile === 1,
           restoredClsiCache: stats?.restoredClsiCache === 1,

From cb945472c7767875fbc7ba58acb9c584594ef2c2 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:20:47 +0300
Subject: [PATCH 137/274] Merge pull request #26610 from
 overleaf/ii-groups-pagination-2

[web] Group members page pagination

GitOrigin-RevId: 9c7635bf24bed0af6d7d1a9626cae310f524b3e0
---
 .../UserMembership/UserMembershipHandler.js   |  6 +-
 .../UserMembership/UserMembershipViewModel.js | 67 +++++++++++++------
 .../web/frontend/extracted-translations.json  |  1 +
 .../components/group-members.tsx              |  9 +++
 .../components/members-table/members-list.tsx | 50 +++++++++++---
 .../context/group-members-context.tsx         | 15 ++++-
 services/web/locales/en.json                  |  1 +
 .../members-table/members-list.spec.tsx       | 10 +++
 .../UserMembershipHandlerTests.js             | 28 ++++----
 .../UserMembershipViewModelTests.js           | 36 +++++-----
 10 files changed, 160 insertions(+), 63 deletions(-)

diff --git a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
index 0632f6e50e..56d92e9c96 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
@@ -79,11 +79,7 @@ async function getPopulatedListOfMembers(entity, attributes) {
     }
   }
 
-  const users = await Promise.all(
-    userObjects.map(userObject =>
-      UserMembershipViewModel.promises.buildAsync(userObject)
-    )
-  )
+  const users = await UserMembershipViewModel.promises.buildAsync(userObjects)
 
   for (const user of users) {
     if (
diff --git a/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js b/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
index 6c94f677b7..1d83a258ef 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
@@ -23,30 +23,59 @@ const UserMembershipViewModel = {
     }
   },
 
-  buildAsync(userOrIdOrEmail, callback) {
+  buildAsync(userOrIdOrEmailArray, callback) {
     if (callback == null) {
       callback = function () {}
     }
-    if (!isObjectIdInstance(userOrIdOrEmail)) {
-      // userOrIdOrEmail is a user or an email and can be parsed by #build
-      return callback(null, UserMembershipViewModel.build(userOrIdOrEmail))
-    }
 
-    const userId = userOrIdOrEmail
-    const projection = {
-      email: 1,
-      first_name: 1,
-      last_name: 1,
-      lastLoggedIn: 1,
-      lastActive: 1,
-      enrollment: 1,
-    }
-    return UserGetter.getUser(userId, projection, function (error, user) {
-      if (error != null || user == null) {
-        return callback(null, buildUserViewModelWithId(userId.toString()))
+    const userObjectIds = userOrIdOrEmailArray.filter(isObjectIdInstance)
+
+    return UserGetter.getUsers(
+      userObjectIds,
+      {
+        email: 1,
+        first_name: 1,
+        last_name: 1,
+        lastLoggedIn: 1,
+        lastActive: 1,
+        enrollment: 1,
+      },
+      function (error, users) {
+        const results = []
+
+        if (error != null) {
+          userOrIdOrEmailArray.forEach(item => {
+            if (isObjectIdInstance(item)) {
+              results.push(buildUserViewModelWithId(item.toString()))
+            } else {
+              // `item` is a user or an email and can be parsed by #build
+              results.push(UserMembershipViewModel.build(item))
+            }
+          })
+        } else {
+          const usersMap = new Map()
+          for (const user of users) {
+            usersMap.set(user._id.toString(), user)
+          }
+
+          userOrIdOrEmailArray.forEach(item => {
+            if (isObjectIdInstance(item)) {
+              const user = usersMap.get(item.toString())
+              if (user == null) {
+                results.push(buildUserViewModelWithId(item.toString()))
+              } else {
+                results.push(buildUserViewModel(user))
+              }
+            } else {
+              // `item` is a user or an email and can be parsed by #build
+              results.push(UserMembershipViewModel.build(item))
+            }
+          })
+        }
+
+        callback(null, results)
       }
-      return callback(null, buildUserViewModel(user))
-    })
+    )
   },
 }
 
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 6e6dfdc5d4..44eedad104 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1026,6 +1026,7 @@
   "math_inline": "",
   "maximum_files_uploaded_together": "",
   "maybe_later": "",
+  "members_added": "",
   "members_management": "",
   "mendeley_dynamic_sync_description": "",
   "mendeley_groups_loading_error": "",
diff --git a/services/web/frontend/js/features/group-management/components/group-members.tsx b/services/web/frontend/js/features/group-management/components/group-members.tsx
index 2e87fe5051..c49fa62af0 100644
--- a/services/web/frontend/js/features/group-management/components/group-members.tsx
+++ b/services/web/frontend/js/features/group-management/components/group-members.tsx
@@ -13,6 +13,7 @@ import OLCard from '@/features/ui/components/ol/ol-card'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLFormControl from '@/features/ui/components/ol/ol-form-control'
 import OLFormText from '@/features/ui/components/ol/ol-form-text'
+import OLNotification from '@/features/ui/components/ol/ol-notification'
 
 export default function GroupMembers() {
   const { isReady } = useWaitForI18n()
@@ -26,6 +27,7 @@ export default function GroupMembers() {
     removeMemberError,
     inviteMemberLoading,
     inviteError,
+    memberAdded,
     paths,
   } = useGroupMembersContext()
   const [emailString, setEmailString] = useState<string>('')
@@ -140,6 +142,13 @@ export default function GroupMembers() {
                 data-testid="add-more-members-form"
               >
                 <p className="small">{t('invite_more_members')}</p>
+                {memberAdded && (
+                  <OLNotification
+                    content={t('members_added')}
+                    type="success"
+                    className="mt-2 mb-3"
+                  />
+                )}
                 <ErrorAlert error={inviteError} />
                 <form onSubmit={onAddMembersSubmit}>
                   <OLRow>
diff --git a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
index 6be4c7cbda..8a46a225bb 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect } from 'react'
+import { useState, useRef, useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { User } from '../../../../../../types/group-management/user'
 import { useGroupMembersContext } from '../../context/group-members-context'
@@ -13,6 +13,9 @@ import getMeta from '@/utils/meta'
 import UnlinkUserModal from './unlink-user-modal'
 import OLTable from '@/features/ui/components/ol/ol-table'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import Pagination from '@/shared/components/pagination'
+
+const USERS_DISPLAY_LIMIT = 50
 
 type ManagedUsersListProps = {
   groupId: string
@@ -31,13 +34,30 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
   const managedUsersActive = getMeta('ol-managedUsersActive')
   const groupSSOActive = getMeta('ol-groupSSOActive')
   const tHeadRowRef = useRef<HTMLTableRowElement>(null)
-  const [colSpan, setColSpan] = useState(0)
+  const [pagination, setPagination] = useState({ currPage: 1, totalPages: 1 })
+
+  const usersForCurrentPage = useMemo(
+    () =>
+      users.slice(
+        (pagination.currPage - 1) * USERS_DISPLAY_LIMIT,
+        pagination.currPage * USERS_DISPLAY_LIMIT
+      ),
+    [users, pagination.currPage]
+  )
+
+  const handlePageClick = (
+    _e: React.MouseEvent<HTMLButtonElement>,
+    page: number
+  ) => {
+    setPagination(p => ({ ...p, currPage: page }))
+  }
 
   useEffect(() => {
-    if (tHeadRowRef.current) {
-      setColSpan(tHeadRowRef.current.querySelectorAll('th').length)
-    }
-  }, [])
+    setPagination(p => ({
+      ...p,
+      totalPages: Math.ceil(users.length / USERS_DISPLAY_LIMIT),
+    }))
+  }, [users.length])
 
   return (
     <div>
@@ -93,12 +113,17 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
         <tbody>
           {users.length === 0 && (
             <tr>
-              <td className="text-center" colSpan={colSpan}>
+              <td
+                className="text-center"
+                colSpan={
+                  tHeadRowRef.current?.querySelectorAll('th').length ?? 0
+                }
+              >
                 <small>{t('no_members')}</small>
               </td>
             </tr>
           )}
-          {users.map(user => (
+          {usersForCurrentPage.map(user => (
             <MemberRow
               key={user.email}
               user={user}
@@ -111,6 +136,15 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
           ))}
         </tbody>
       </OLTable>
+      {pagination.totalPages > 1 && (
+        <div className="d-flex justify-content-center">
+          <Pagination
+            handlePageClick={handlePageClick}
+            currentPage={pagination.currPage}
+            totalPages={pagination.totalPages}
+          />
+        </div>
+      )}
       {userToOffboard && (
         <OffboardManagedUserModal
           user={userToOffboard}
diff --git a/services/web/frontend/js/features/group-management/context/group-members-context.tsx b/services/web/frontend/js/features/group-management/context/group-members-context.tsx
index 63619dc361..ae875c435e 100644
--- a/services/web/frontend/js/features/group-management/context/group-members-context.tsx
+++ b/services/web/frontend/js/features/group-management/context/group-members-context.tsx
@@ -31,6 +31,7 @@ export type GroupMembersContextValue = {
   updateMemberView: (userId: string, updatedUser: User) => void
   inviteMemberLoading: boolean
   inviteError?: APIError
+  memberAdded: boolean
   paths: { [key: string]: string }
 }
 
@@ -58,6 +59,7 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
   const [inviteError, setInviteError] = useState<APIError>()
   const [removeMemberInflightCount, setRemoveMemberInflightCount] = useState(0)
   const [removeMemberError, setRemoveMemberError] = useState<APIError>()
+  const [memberAdded, setMemberAdded] = useState(false)
 
   const groupId = getMeta('ol-groupId')
 
@@ -74,7 +76,9 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
   const addMembers = useCallback(
     (emailString: string) => {
       setInviteError(undefined)
+      setMemberAdded(false)
       const emails = parseEmails(emailString)
+      let isError = false
       mapSeries(emails, async email => {
         setInviteUserInflightCount(count => count + 1)
         try {
@@ -94,8 +98,15 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
         } catch (error: unknown) {
           debugConsole.error(error)
           setInviteError((error as FetchError)?.data?.error || {})
+          isError = true
         }
-        setInviteUserInflightCount(count => count - 1)
+        setInviteUserInflightCount(count => {
+          const newCount = count - 1
+          if (newCount === 0 && !isError) {
+            setMemberAdded(true)
+          }
+          return newCount
+        })
       })
     },
     [paths.addMember, users, setUsers]
@@ -173,6 +184,7 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
       removeMemberError,
       inviteMemberLoading: inviteUserInflightCount > 0,
       inviteError,
+      memberAdded,
       paths,
     }),
     [
@@ -191,6 +203,7 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
       removeMemberError,
       inviteUserInflightCount,
       inviteError,
+      memberAdded,
       paths,
     ]
   )
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 3593bfab7b..34865477e4 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1342,6 +1342,7 @@
   "may": "May",
   "maybe_later": "Maybe later",
   "member_picker": "Select number of users for group plan",
+  "members_added": "Member(s) added.",
   "members_management": "Members management",
   "mendeley": "Mendeley",
   "mendeley_dynamic_sync_description": "With the Mendeley integration, you can import your references into __appName__. You can either import all your references at once or dynamically search your Mendeley library directly from __appName__.",
diff --git a/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
index 0861ab6c34..32958b34d0 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
@@ -121,6 +121,16 @@ describe('MembersList', function () {
         users[1].last_name
       )
     })
+    it('should render the pagination navigation', function () {
+      cy.window().then(win => {
+        win.metaAttributesCache.set(
+          'ol-users',
+          Array.from({ length: 50 }).flatMap(() => users.flat())
+        )
+      })
+      mountManagedUsersList()
+      cy.findByRole('navigation', { name: /pagination navigation/i })
+    })
   })
 
   describe('empty user list', function () {
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js b/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
index f7b665aecd..3bf74c0ab7 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
+++ b/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
@@ -48,7 +48,7 @@ describe('UserMembershipHandler', function () {
 
     this.UserMembershipViewModel = {
       promises: {
-        buildAsync: sinon.stub().resolves({ _id: 'mock-member-id' }),
+        buildAsync: sinon.stub().resolves([{ _id: 'mock-member-id' }]),
       },
       build: sinon.stub().returns(this.newUser),
     }
@@ -118,26 +118,26 @@ describe('UserMembershipHandler', function () {
           this.subscription,
           EntityConfigs.group
         )
-        const expectedCallcount =
-          this.subscription.member_ids.length +
-          this.subscription.invited_emails.length +
-          this.subscription.teamInvites.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync.callCount
-        ).to.equal(expectedCallcount)
+          this.UserMembershipViewModel.promises.buildAsync
+        ).to.be.calledOnceWith(
+          this.subscription.invited_emails.concat(
+            this.subscription.teamInvites[0].email,
+            this.subscription.member_ids
+          )
+        )
       })
     })
 
-    describe('group mamagers', function () {
+    describe('group managers', function () {
       it('build view model for all managers', async function () {
         await this.UserMembershipHandler.promises.getUsers(
           this.subscription,
           EntityConfigs.groupManagers
         )
-        const expectedCallcount = this.subscription.manager_ids.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync.callCount
-        ).to.equal(expectedCallcount)
+          this.UserMembershipViewModel.promises.buildAsync
+        ).to.be.calledOnceWith(this.subscription.manager_ids)
       })
     })
 
@@ -147,11 +147,9 @@ describe('UserMembershipHandler', function () {
           this.institution,
           EntityConfigs.institution
         )
-
-        const expectedCallcount = this.institution.managerIds.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync.callCount
-        ).to.equal(expectedCallcount)
+          this.UserMembershipViewModel.promises.buildAsync
+        ).to.be.calledOnceWith(this.institution.managerIds)
       })
     })
   })
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js b/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
index a8ce9d158f..c5e21a5f48 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
+++ b/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
@@ -25,7 +25,7 @@ const {
 
 describe('UserMembershipViewModel', function () {
   beforeEach(function () {
-    this.UserGetter = { getUser: sinon.stub() }
+    this.UserGetter = { getUsers: sinon.stub() }
     this.UserMembershipViewModel = SandboxedModule.require(modulePath, {
       requires: {
         'mongodb-legacy': { ObjectId },
@@ -87,9 +87,10 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build email', function (done) {
+      this.UserGetter.getUsers.yields(null, [])
       return this.UserMembershipViewModel.buildAsync(
-        this.email,
-        (error, viewModel) => {
+        [this.email],
+        (error, [viewModel]) => {
           assertCalledWith(this.UserMembershipViewModel.build, this.email)
           return done()
         }
@@ -97,9 +98,10 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build user', function (done) {
+      this.UserGetter.getUsers.yields(null, [])
       return this.UserMembershipViewModel.buildAsync(
-        this.user,
-        (error, viewModel) => {
+        [this.user],
+        (error, [viewModel]) => {
           assertCalledWith(this.UserMembershipViewModel.build, this.user)
           return done()
         }
@@ -107,30 +109,34 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build user id', function (done) {
-      this.UserGetter.getUser.yields(null, this.user)
+      const user = {
+        ...this.user,
+        _id: new ObjectId(),
+      }
+      this.UserGetter.getUsers.yields(null, [user])
       return this.UserMembershipViewModel.buildAsync(
-        new ObjectId(),
-        (error, viewModel) => {
+        [user._id],
+        (error, [viewModel]) => {
           expect(error).not.to.exist
           assertNotCalled(this.UserMembershipViewModel.build)
-          expect(viewModel._id).to.equal(this.user._id)
-          expect(viewModel.email).to.equal(this.user.email)
-          expect(viewModel.first_name).to.equal(this.user.first_name)
+          expect(viewModel._id.toString()).to.equal(user._id.toString())
+          expect(viewModel.email).to.equal(user.email)
+          expect(viewModel.first_name).to.equal(user.first_name)
           expect(viewModel.invite).to.equal(false)
           expect(viewModel.email).to.exist
           expect(viewModel.enrollment).to.exist
-          expect(viewModel.enrollment).to.deep.equal(this.user.enrollment)
+          expect(viewModel.enrollment).to.deep.equal(user.enrollment)
           return done()
         }
       )
     })
 
     it('build user id with error', function (done) {
-      this.UserGetter.getUser.yields(new Error('nope'))
+      this.UserGetter.getUsers.yields(new Error('nope'), [])
       const userId = new ObjectId()
       return this.UserMembershipViewModel.buildAsync(
-        userId,
-        (error, viewModel) => {
+        [userId],
+        (error, [viewModel]) => {
           expect(error).not.to.exist
           assertNotCalled(this.UserMembershipViewModel.build)
           expect(viewModel._id).to.equal(userId.toString())

From 37b63f982357eea922351057b7818320953f911a Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:21:51 +0300
Subject: [PATCH 138/274] Merge pull request #26634 from
 overleaf/ii-join-group-copy-improvement

[web] Copy change on the consent screen when joining a managed group

GitOrigin-RevId: e888673778e42b8db2a857a58df89b06c4b38cdb
---
 .../app/src/Features/Subscription/SubscriptionLocator.js   | 7 +++++--
 services/web/frontend/extracted-translations.json          | 2 +-
 services/web/locales/en.json                               | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.js b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
index c0c107eecf..d9956e42cb 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionLocator.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
@@ -4,6 +4,7 @@
 
 const { callbackifyAll } = require('@overleaf/promise-utils')
 const { Subscription } = require('../../models/Subscription')
+const SubscriptionHelper = require('./SubscriptionHelper')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('@overleaf/logger')
 const {
@@ -175,7 +176,8 @@ const SubscriptionLocator = {
 
     const hasActiveGroupSubscription = memberSubscriptions.some(
       subscription =>
-        subscription.recurlyStatus?.state === 'active' && subscription.groupPlan
+        subscription.groupPlan &&
+        SubscriptionHelper.getPaidSubscriptionState(subscription) === 'active'
     )
     if (hasActiveGroupSubscription) {
       // Member of a group plan
@@ -187,7 +189,8 @@ const SubscriptionLocator = {
 
     if (personalSubscription) {
       const hasActivePersonalSubscription =
-        personalSubscription.recurlyStatus?.state === 'active'
+        SubscriptionHelper.getPaidSubscriptionState(personalSubscription) ===
+        'active'
       if (hasActivePersonalSubscription) {
         if (personalSubscription.groupPlan) {
           // Owner of a group plan
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 44eedad104..264b6098e3 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1147,10 +1147,10 @@
   "on_free_plan_upgrade_to_access_features": "",
   "one_step_away_from_professional_features": "",
   "only_group_admin_or_managers_can_delete_your_account_1": "",
+  "only_group_admin_or_managers_can_delete_your_account_10": "",
   "only_group_admin_or_managers_can_delete_your_account_3": "",
   "only_group_admin_or_managers_can_delete_your_account_6": "",
   "only_group_admin_or_managers_can_delete_your_account_7": "",
-  "only_group_admin_or_managers_can_delete_your_account_8": "",
   "only_group_admin_or_managers_can_delete_your_account_9": "",
   "only_importer_can_refresh": "",
   "open_action_menu": "",
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 34865477e4..6d6774dd05 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1505,10 +1505,10 @@
   "ongoing_experiments": "Ongoing experiments",
   "online_latex_editor": "Online LaTeX Editor",
   "only_group_admin_or_managers_can_delete_your_account_1": "By becoming a managed user, your organization will have admin rights over your account and control over your stuff, including the right to close your account and access, delete and share your stuff. As a result:",
+  "only_group_admin_or_managers_can_delete_your_account_10": "If you have an individual subscription, we’ll automatically terminate it and cancel its renewal when your account becomes managed. To request a pro-rata refund for the remainder, please contact Support.",
   "only_group_admin_or_managers_can_delete_your_account_3": "Your group admin and group managers will be able to reassign ownership of your projects to another group member.",
   "only_group_admin_or_managers_can_delete_your_account_6": "Only your group admin or group managers will be able to delete your account or change your account back into an unmanaged account.",
   "only_group_admin_or_managers_can_delete_your_account_7": "Only your group admin or group managers will be able to delete your account or change your account into an unmanaged account.",
-  "only_group_admin_or_managers_can_delete_your_account_8": "We’ll cancel the renewal of your subscription, reach out to Support to request a pro-rata refund. Your individual subscription will be terminated when your account becomes managed.",
   "only_group_admin_or_managers_can_delete_your_account_9": "Once you have become a managed user, <0>you yourself cannot change it back to an unmanaged account</0>. <1>Learn more about managed Overleaf accounts.</1>",
   "only_importer_can_refresh": "Only the person who originally imported this __provider__ file can refresh it.",
   "open_action_menu": "Open __name__ action menu",

From c5fad346f9f0acb9682b5611cc9ee49f58306a7c Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Tue, 8 Jul 2025 14:22:09 +0200
Subject: [PATCH 139/274] [web] link to correct Stripe dashboard from admin
 panel (#26756)

* [web] link to correct Stripe dashboard from admin panel
* [web] be more careful about constructing the base URL
* [web] be extra careful about accessing values in the subscription
* [web] switch to plain text environment variables

GitOrigin-RevId: 5fa802fce11967f56289b11476f39e2e1d5a9c74
---
 services/web/frontend/js/utils/meta.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 69552f9b1a..f8da39f909 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -247,6 +247,7 @@ export interface Meta {
   'ol-splitTestVariants': { [name: string]: string }
   'ol-ssoDisabled': boolean
   'ol-ssoErrorMessage': string
+  'ol-stripeAccountId': string
   'ol-stripeCustomerId': string
   'ol-subscription': any // TODO: mixed types, split into two fields
   'ol-subscriptionChangePreview': SubscriptionChangePreview

From 9b43b82c95f3aedeee5cecbb5b9eb30153746b81 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:22:19 +0300
Subject: [PATCH 140/274] Merge pull request #26770 from
 overleaf/ii-group-admin-managed-status

[web] Managed status for group admin

GitOrigin-RevId: 15db443f1ab06174dd5c30e48eff6b495166ec07
---
 .../members-table/managed-user-status.tsx     |  3 ---
 .../managed-user-status.spec.tsx              | 22 -------------------
 2 files changed, 25 deletions(-)

diff --git a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
index 5ed360de9c..14f4657fe7 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
@@ -30,9 +30,6 @@ export default function ManagedUserStatus({ user }: ManagedUserStatusProps) {
     </span>
   )
 
-  if (user.isEntityAdmin) {
-    return <span className="security-state-group-admin" />
-  }
   if (user.invite) {
     return managedUserInvite
   }
diff --git a/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
index 49cadfe0c9..5c09987695 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
@@ -61,26 +61,4 @@ describe('MemberStatus', function () {
       cy.get('.security-state-not-managed').contains('Managed')
     })
   })
-
-  describe('with the group admin', function () {
-    const user: User = {
-      _id: 'some-user',
-      email: 'some.user@example.com',
-      first_name: 'Some',
-      last_name: 'User',
-      invite: false,
-      last_active_at: new Date(),
-      enrollment: undefined,
-      isEntityAdmin: true,
-    }
-    beforeEach(function () {
-      cy.mount(<ManagedUserStatus user={user} />)
-    })
-
-    it('should render no state indicator', function () {
-      cy.get('.security-state-group-admin')
-        .contains('Managed')
-        .should('not.exist')
-    })
-  })
 })

From aa9dcb19a38598a165ed116285c8f47a43929059 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:22:57 +0300
Subject: [PATCH 141/274] Merge pull request #26829 from
 overleaf/ii-flexible-licensing-manually-billed-users-add-seats

[web] FL manually billed subscriptions with no upsell

GitOrigin-RevId: b5f2083c7eabd0a1a5d024d5699d2c5e5556671a
---
 .../app/src/Features/Subscription/Errors.js   |  3 ++
 .../SubscriptionGroupController.mjs           | 15 +++++--
 .../Subscription/SubscriptionGroupHandler.js  | 22 ++++++++++
 .../web/frontend/extracted-translations.json  |  2 +-
 .../manually-collected-subscription.tsx       |  2 +-
 services/web/locales/en.json                  |  2 +-
 .../SubscriptionGroupController.test.mjs      | 25 +++++++++++
 .../SubscriptionGroupHandlerTests.js          | 43 +++++++++++++++++++
 8 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/Errors.js b/services/web/app/src/Features/Subscription/Errors.js
index 9ebb08c6db..609ec15a73 100644
--- a/services/web/app/src/Features/Subscription/Errors.js
+++ b/services/web/app/src/Features/Subscription/Errors.js
@@ -26,6 +26,8 @@ class SubtotalLimitExceededError extends OError {}
 
 class HasPastDueInvoiceError extends OError {}
 
+class HasNoAdditionalLicenseWhenManuallyCollectedError extends OError {}
+
 class PaymentActionRequiredError extends OError {
   constructor(info) {
     super('Payment action required', info)
@@ -43,4 +45,5 @@ module.exports = {
   InactiveError,
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
+  HasNoAdditionalLicenseWhenManuallyCollectedError,
 }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 792850a1c1..82064c173a 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -19,6 +19,7 @@ import {
   InactiveError,
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
+  HasNoAdditionalLicenseWhenManuallyCollectedError,
 } from './Errors.js'
 
 /**
@@ -164,6 +165,9 @@ async function addSeatsToGroupSubscription(req, res) {
         paymentProviderSubscription,
         userId
       )
+      await SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+        paymentProviderSubscription
+      )
     } else {
       await SubscriptionGroupHandler.promises.ensureSubscriptionCollectionMethodIsNotManual(
         paymentProviderSubscription
@@ -187,7 +191,10 @@ async function addSeatsToGroupSubscription(req, res) {
       )
     }
 
-    if (error instanceof ManuallyCollectedError) {
+    if (
+      error instanceof ManuallyCollectedError ||
+      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
+    ) {
       return res.redirect(
         '/user/subscription/group/manually-collected-subscription'
       )
@@ -231,7 +238,8 @@ async function previewAddSeatsSubscriptionChange(req, res) {
       error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
-      error instanceof HasPastDueInvoiceError
+      error instanceof HasPastDueInvoiceError ||
+      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
     ) {
       return res.status(422).end()
     }
@@ -274,7 +282,8 @@ async function createAddSeatsSubscriptionChange(req, res) {
       error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
-      error instanceof HasPastDueInvoiceError
+      error instanceof HasPastDueInvoiceError ||
+      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
     ) {
       return res.status(422).end()
     }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
index bc179f8d23..977218fdd2 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
@@ -18,6 +18,7 @@ const {
   PendingChangeError,
   InactiveError,
   HasPastDueInvoiceError,
+  HasNoAdditionalLicenseWhenManuallyCollectedError,
 } = require('./Errors')
 const EmailHelper = require('../Helpers/EmailHelper')
 const { InvalidEmailError } = require('../Errors/Errors')
@@ -123,6 +124,22 @@ async function ensureSubscriptionHasNoPastDueInvoice(subscription) {
   }
 }
 
+async function ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+  paymentProviderSubscription
+) {
+  if (
+    paymentProviderSubscription.isCollectionMethodManual &&
+    !paymentProviderSubscription.hasAddOn(MEMBERS_LIMIT_ADD_ON_CODE)
+  ) {
+    throw new HasNoAdditionalLicenseWhenManuallyCollectedError(
+      'This subscription is being collected manually has no "additional-license" add-on',
+      {
+        subscription_id: paymentProviderSubscription.id,
+      }
+    )
+  }
+}
+
 async function getUsersGroupSubscriptionDetails(userId) {
   const subscription =
     await SubscriptionLocator.promises.getUsersSubscription(userId)
@@ -470,6 +487,10 @@ module.exports = {
   ensureSubscriptionHasNoPastDueInvoice: callbackify(
     ensureSubscriptionHasNoPastDueInvoice
   ),
+  ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual:
+    callbackify(
+      ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual
+    ),
   getTotalConfirmedUsersInGroup: callbackify(getTotalConfirmedUsersInGroup),
   isUserPartOfGroup: callbackify(isUserPartOfGroup),
   getGroupPlanUpgradePreview: callbackify(getGroupPlanUpgradePreview),
@@ -484,6 +505,7 @@ module.exports = {
     ensureSubscriptionCollectionMethodIsNotManual,
     ensureSubscriptionHasNoPendingChanges,
     ensureSubscriptionHasNoPastDueInvoice,
+    ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual,
     getTotalConfirmedUsersInGroup,
     isUserPartOfGroup,
     getUsersGroupSubscriptionDetails,
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 264b6098e3..0bf4c09de8 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -873,7 +873,7 @@
   "issued_on": "",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "",
   "it_looks_like_your_account_is_billed_manually": "",
-  "it_looks_like_your_account_is_billed_manually_upgrading_subscription": "",
+  "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "",
   "italics": "",
   "join_beta_program": "",
diff --git a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
index 971d4fa791..a1d984b4bb 100644
--- a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
+++ b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
@@ -24,7 +24,7 @@ function ManuallyCollectedSubscription() {
         content={
           isFlexibleGroupLicensingForManuallyBilledSubscriptions ? (
             <Trans
-              i18nKey="it_looks_like_your_account_is_billed_manually_upgrading_subscription"
+              i18nKey="it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription"
               components={[
                 // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
                 <a href="/contact" rel="noreferrer noopener" />,
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 6d6774dd05..cc1be42f0a 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1131,7 +1131,7 @@
   "it": "Italian",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "It looks like that didn’t work. You can try again or <0>get in touch</0> with our Support team for more help.",
   "it_looks_like_your_account_is_billed_manually": "It looks like your account is being billed manually - adding seats or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
-  "it_looks_like_your_account_is_billed_manually_upgrading_subscription": "It looks like your account is being billed manually - upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
+  "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "It looks like your account is being billed manually - purchasing additional licenses or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "It looks like your payment details are missing. Please <0>update your billing information</0>, or <1>get in touch</1> with our Support team for more help.",
   "italics": "Italics",
   "ja": "Japanese",
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index 2b52f2be37..a64ef71b60 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -73,6 +73,8 @@ describe('SubscriptionGroupController', function () {
           .resolves(ctx.previewSubscriptionChangeData),
         checkBillingInfoExistence: sinon.stub().resolves(ctx.paymentMethod),
         updateSubscriptionPaymentTerms: sinon.stub().resolves(),
+        ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual:
+          sinon.stub().resolves(),
       },
     }
 
@@ -140,6 +142,7 @@ describe('SubscriptionGroupController', function () {
       InactiveError: class extends Error {},
       SubtotalLimitExceededError: class extends Error {},
       HasPastDueInvoiceError: class extends Error {},
+      HasNoAdditionalLicenseWhenManuallyCollectedError: class extends Error {},
     }
 
     vi.doMock(
@@ -521,6 +524,28 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
+    it('should redirect to manually collected subscription error page when collection method is manual and has no additional license add-on', async function (ctx) {
+      await new Promise(resolve => {
+        ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual =
+          sinon
+            .stub()
+            .throws(
+              new ctx.Errors.HasNoAdditionalLicenseWhenManuallyCollectedError()
+            )
+
+        const res = {
+          redirect: url => {
+            url.should.equal(
+              '/user/subscription/group/manually-collected-subscription'
+            )
+            resolve()
+          },
+        }
+
+        ctx.Controller.addSeatsToGroupSubscription(ctx.req, res)
+      })
+    })
+
     it('should redirect to subscription page when there is a pending change', async function (ctx) {
       await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPendingChanges =
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
index 63a6e25fde..87793fe440 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
@@ -806,6 +806,49 @@ describe('SubscriptionGroupHandler', function () {
     })
   })
 
+  describe('ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual', function () {
+    it('should throw if the subscription is manually collected and has no additional license add-on', async function () {
+      await expect(
+        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+          {
+            isCollectionMethodManual: true,
+            hasAddOn: sinon
+              .stub()
+              .withArgs('additional-license')
+              .returns(false),
+          }
+        )
+      ).to.be.rejectedWith(
+        'This subscription is being collected manually has no "additional-license" add-on'
+      )
+    })
+
+    it('should not throw if the subscription is not manually collected and has no additional license add-on and ', async function () {
+      await expect(
+        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+          {
+            isCollectionMethodManual: false,
+            hasAddOn: sinon
+              .stub()
+              .withArgs('additional-license')
+              .returns(false),
+          }
+        )
+      ).to.not.be.rejected
+    })
+
+    it('should not throw if the subscription is not manually collected and has additional license add-on', async function () {
+      await expect(
+        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+          {
+            isCollectionMethodManual: true,
+            hasAddOn: sinon.stub().withArgs('additional-license').returns(true),
+          }
+        )
+      ).to.not.be.rejected
+    })
+  })
+
   describe('getGroupPlanUpgradePreview', function () {
     it('should generate preview for subscription upgrade', async function () {
       const result = await this.Handler.promises.getGroupPlanUpgradePreview(

From 9d1641a1ab0690651b8455f25e0726404549e931 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:23:22 +0300
Subject: [PATCH 142/274] Merge pull request #26842 from
 overleaf/ii-flexible-licensing-manually-billed-billed-tear-down

[web] FL manually billed subscription feature flag tear down

GitOrigin-RevId: c860e8fc17c14685688fb834260772d9b63bcc6a
---
 .../SubscriptionGroupController.mjs           | 44 ++++---------------
 .../web/frontend/extracted-translations.json  |  1 -
 .../components/add-seats/add-seats.tsx        | 17 +++----
 .../manually-collected-subscription.tsx       | 29 +++---------
 services/web/locales/en.json                  |  1 -
 .../components/add-seats.spec.tsx             |  3 --
 .../SubscriptionGroupController.test.mjs      | 16 ++-----
 7 files changed, 24 insertions(+), 87 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 82064c173a..7aa596836d 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -8,7 +8,6 @@ import SessionManager from '../Authentication/SessionManager.js'
 import UserAuditLogHandler from '../User/UserAuditLogHandler.js'
 import { expressify } from '@overleaf/promise-utils'
 import Modules from '../../infrastructure/Modules.js'
-import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 import UserGetter from '../User/UserGetter.js'
 import { Subscription } from '../../models/Subscription.js'
 import { isProfessionalGroupPlan } from './PlansHelper.mjs'
@@ -152,29 +151,13 @@ async function addSeatsToGroupSubscription(req, res) {
     await SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPastDueInvoice(
       subscription
     )
-
-    const { variant: flexibleLicensingForManuallyBilledSubscriptionsVariant } =
-      await SplitTestHandler.promises.getAssignment(
-        req,
-        res,
-        'flexible-group-licensing-for-manually-billed-subscriptions'
-      )
-
-    if (flexibleLicensingForManuallyBilledSubscriptionsVariant === 'enabled') {
-      await SubscriptionGroupHandler.promises.checkBillingInfoExistence(
-        paymentProviderSubscription,
-        userId
-      )
-      await SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
-        paymentProviderSubscription
-      )
-    } else {
-      await SubscriptionGroupHandler.promises.ensureSubscriptionCollectionMethodIsNotManual(
-        paymentProviderSubscription
-      )
-      // Check if the user has missing billing details
-      await Modules.promises.hooks.fire('getPaymentMethod', userId)
-    }
+    await SubscriptionGroupHandler.promises.checkBillingInfoExistence(
+      paymentProviderSubscription,
+      userId
+    )
+    await SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+      paymentProviderSubscription
+    )
 
     res.render('subscriptions/add-seats', {
       subscriptionId: subscription._id,
@@ -191,10 +174,7 @@ async function addSeatsToGroupSubscription(req, res) {
       )
     }
 
-    if (
-      error instanceof ManuallyCollectedError ||
-      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
-    ) {
+    if (error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError) {
       return res.redirect(
         '/user/subscription/group/manually-collected-subscription'
       )
@@ -235,7 +215,6 @@ async function previewAddSeatsSubscriptionChange(req, res) {
   } catch (error) {
     if (
       error instanceof MissingBillingInfoError ||
-      error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
       error instanceof HasPastDueInvoiceError ||
@@ -279,7 +258,6 @@ async function createAddSeatsSubscriptionChange(req, res) {
   } catch (error) {
     if (
       error instanceof MissingBillingInfoError ||
-      error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
       error instanceof HasPastDueInvoiceError ||
@@ -420,12 +398,6 @@ async function manuallyCollectedSubscription(req, res) {
     const subscription =
       await SubscriptionLocator.promises.getUsersSubscription(userId)
 
-    await SplitTestHandler.promises.getAssignment(
-      req,
-      res,
-      'flexible-group-licensing-for-manually-billed-subscriptions'
-    )
-
     res.render('subscriptions/manually-collected-subscription', {
       groupName: subscription.teamName,
     })
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 0bf4c09de8..c41512312a 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -872,7 +872,6 @@
   "is_email_affiliated": "",
   "issued_on": "",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "",
-  "it_looks_like_your_account_is_billed_manually": "",
   "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "",
   "italics": "",
diff --git a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
index ab9f96a975..609620a958 100644
--- a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
+++ b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
@@ -30,7 +30,6 @@ import {
 } from '../../../../../../types/subscription/subscription-change-preview'
 import { MergeAndOverride, Nullable } from '../../../../../../types/utils'
 import { sendMB } from '../../../../infrastructure/event-tracking'
-import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 export const MAX_NUMBER_OF_USERS = 20
 export const MAX_NUMBER_OF_PO_NUMBER_CHARACTERS = 50
@@ -50,9 +49,6 @@ function AddSeats() {
   const [addSeatsInputError, setAddSeatsInputError] = useState<string>()
   const [poNumberInputError, setPoNumberInputError] = useState<string>()
   const [shouldContactSales, setShouldContactSales] = useState(false)
-  const isFlexibleGroupLicensingForManuallyBilledSubscriptions = useFeatureFlag(
-    'flexible-group-licensing-for-manually-billed-subscriptions'
-  )
   const controller = useAbortController()
   const { signal: addSeatsSignal } = useAbortController()
   const { signal: contactSalesSignal } = useAbortController()
@@ -373,13 +369,12 @@ function AddSeats() {
                       <FormText type="error">{addSeatsInputError}</FormText>
                     )}
                   </FormGroup>
-                  {isFlexibleGroupLicensingForManuallyBilledSubscriptions &&
-                    isCollectionMethodManual && (
-                      <PoNumber
-                        error={poNumberInputError}
-                        validate={validatePoNumber}
-                      />
-                    )}
+                  {isCollectionMethodManual && (
+                    <PoNumber
+                      error={poNumberInputError}
+                      validate={validatePoNumber}
+                    />
+                  )}
                 </div>
                 <CostSummarySection
                   isLoadingCostSummary={isLoadingCostSummary}
diff --git a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
index a1d984b4bb..b2f2580b5f 100644
--- a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
+++ b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
@@ -2,14 +2,9 @@ import { Trans, useTranslation } from 'react-i18next'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
 import Card from '@/features/group-management/components/card'
 import useWaitForI18n from '@/shared/hooks/use-wait-for-i18n'
-import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 function ManuallyCollectedSubscription() {
   const { t } = useTranslation()
-  const isFlexibleGroupLicensingForManuallyBilledSubscriptions = useFeatureFlag(
-    'flexible-group-licensing-for-manually-billed-subscriptions'
-  )
-
   const { isReady } = useWaitForI18n()
 
   if (!isReady) {
@@ -22,23 +17,13 @@ function ManuallyCollectedSubscription() {
         type="error"
         title={t('account_billed_manually')}
         content={
-          isFlexibleGroupLicensingForManuallyBilledSubscriptions ? (
-            <Trans
-              i18nKey="it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription"
-              components={[
-                // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
-                <a href="/contact" rel="noreferrer noopener" />,
-              ]}
-            />
-          ) : (
-            <Trans
-              i18nKey="it_looks_like_your_account_is_billed_manually"
-              components={[
-                // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
-                <a href="/contact" rel="noreferrer noopener" />,
-              ]}
-            />
-          )
+          <Trans
+            i18nKey="it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription"
+            components={[
+              // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
+              <a href="/contact" rel="noreferrer noopener" />,
+            ]}
+          />
         }
         className="m-0"
       />
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index cc1be42f0a..1794050bf8 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1130,7 +1130,6 @@
   "issued_on": "Issued: __date__",
   "it": "Italian",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "It looks like that didn’t work. You can try again or <0>get in touch</0> with our Support team for more help.",
-  "it_looks_like_your_account_is_billed_manually": "It looks like your account is being billed manually - adding seats or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
   "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "It looks like your account is being billed manually - purchasing additional licenses or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "It looks like your payment details are missing. Please <0>update your billing information</0>, or <1>get in touch</1> with our Support team for more help.",
   "italics": "Italics",
diff --git a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
index ead0c74a1c..f26357d842 100644
--- a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
@@ -14,9 +14,6 @@ describe('<AddSeats />', function () {
       win.metaAttributesCache.set('ol-totalLicenses', this.totalLicenses)
       win.metaAttributesCache.set('ol-isProfessional', false)
       win.metaAttributesCache.set('ol-isCollectionMethodManual', true)
-      win.metaAttributesCache.set('ol-splitTestVariants', {
-        'flexible-group-licensing-for-manually-billed-subscriptions': 'enabled',
-      })
     })
 
     cy.mount(
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index a64ef71b60..ddfa8b0790 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -107,12 +107,6 @@ describe('SubscriptionGroupController', function () {
       },
     }
 
-    ctx.SplitTestHandler = {
-      promises: {
-        getAssignment: sinon.stub().resolves({ variant: 'enabled' }),
-      },
-    }
-
     ctx.UserGetter = {
       promises: {
         getUserEmail: sinon.stub().resolves(ctx.user.email),
@@ -174,13 +168,6 @@ describe('SubscriptionGroupController', function () {
       default: ctx.Modules,
     }))
 
-    vi.doMock(
-      '../../../../app/src/Features/SplitTests/SplitTestHandler',
-      () => ({
-        default: ctx.SplitTestHandler,
-      })
-    )
-
     vi.doMock('../../../../app/src/Features/User/UserGetter', () => ({
       default: ctx.UserGetter,
     }))
@@ -459,6 +446,9 @@ describe('SubscriptionGroupController', function () {
             ctx.SubscriptionGroupHandler.promises.checkBillingInfoExistence
               .calledWith(ctx.recurlySubscription, ctx.adminUserId)
               .should.equal(true)
+            ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual
+              .calledWith(ctx.recurlySubscription)
+              .should.equal(true)
             page.should.equal('subscriptions/add-seats')
             props.subscriptionId.should.equal(ctx.subscriptionId)
             props.groupName.should.equal(ctx.subscription.teamName)

From ebf810e836013f4bd3844c251ac39edf4e317bc7 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Tue, 8 Jul 2025 11:40:04 -0400
Subject: [PATCH 143/274] Merge pull request #26968 from
 overleaf/em-revert-jul8

Revert bad deploy

GitOrigin-RevId: fd6227cf4fde7fd8053b47365154d59d15fa115e
---
 .../app/src/Features/Subscription/Errors.js   |  3 -
 .../SubscriptionGroupController.mjs           | 45 +++++++++----
 .../Subscription/SubscriptionGroupHandler.js  | 22 ------
 .../Subscription/SubscriptionLocator.js       |  7 +-
 .../UserMembership/UserMembershipHandler.js   |  6 +-
 .../UserMembership/UserMembershipViewModel.js | 67 ++++++-------------
 .../web/frontend/extracted-translations.json  |  6 +-
 .../components/add-seats/add-seats.tsx        | 17 +++--
 .../components/group-members.tsx              |  9 ---
 .../manually-collected-subscription.tsx       | 29 ++++++--
 .../members-table/managed-user-status.tsx     |  3 +
 .../components/members-table/members-list.tsx | 50 +++-----------
 .../context/group-members-context.tsx         | 15 +----
 services/web/frontend/js/utils/meta.ts        |  1 -
 services/web/locales/en.json                  |  6 +-
 .../components/add-seats.spec.tsx             |  3 +
 .../managed-user-status.spec.tsx              | 22 ++++++
 .../members-table/members-list.spec.tsx       | 10 ---
 .../SubscriptionGroupController.test.mjs      | 41 ++++--------
 .../SubscriptionGroupHandlerTests.js          | 43 ------------
 .../UserMembershipHandlerTests.js             | 28 ++++----
 .../UserMembershipViewModelTests.js           | 36 +++++-----
 22 files changed, 177 insertions(+), 292 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/Errors.js b/services/web/app/src/Features/Subscription/Errors.js
index 609ec15a73..9ebb08c6db 100644
--- a/services/web/app/src/Features/Subscription/Errors.js
+++ b/services/web/app/src/Features/Subscription/Errors.js
@@ -26,8 +26,6 @@ class SubtotalLimitExceededError extends OError {}
 
 class HasPastDueInvoiceError extends OError {}
 
-class HasNoAdditionalLicenseWhenManuallyCollectedError extends OError {}
-
 class PaymentActionRequiredError extends OError {
   constructor(info) {
     super('Payment action required', info)
@@ -45,5 +43,4 @@ module.exports = {
   InactiveError,
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
-  HasNoAdditionalLicenseWhenManuallyCollectedError,
 }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 7aa596836d..792850a1c1 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -8,6 +8,7 @@ import SessionManager from '../Authentication/SessionManager.js'
 import UserAuditLogHandler from '../User/UserAuditLogHandler.js'
 import { expressify } from '@overleaf/promise-utils'
 import Modules from '../../infrastructure/Modules.js'
+import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 import UserGetter from '../User/UserGetter.js'
 import { Subscription } from '../../models/Subscription.js'
 import { isProfessionalGroupPlan } from './PlansHelper.mjs'
@@ -18,7 +19,6 @@ import {
   InactiveError,
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
-  HasNoAdditionalLicenseWhenManuallyCollectedError,
 } from './Errors.js'
 
 /**
@@ -151,13 +151,26 @@ async function addSeatsToGroupSubscription(req, res) {
     await SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPastDueInvoice(
       subscription
     )
-    await SubscriptionGroupHandler.promises.checkBillingInfoExistence(
-      paymentProviderSubscription,
-      userId
-    )
-    await SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
-      paymentProviderSubscription
-    )
+
+    const { variant: flexibleLicensingForManuallyBilledSubscriptionsVariant } =
+      await SplitTestHandler.promises.getAssignment(
+        req,
+        res,
+        'flexible-group-licensing-for-manually-billed-subscriptions'
+      )
+
+    if (flexibleLicensingForManuallyBilledSubscriptionsVariant === 'enabled') {
+      await SubscriptionGroupHandler.promises.checkBillingInfoExistence(
+        paymentProviderSubscription,
+        userId
+      )
+    } else {
+      await SubscriptionGroupHandler.promises.ensureSubscriptionCollectionMethodIsNotManual(
+        paymentProviderSubscription
+      )
+      // Check if the user has missing billing details
+      await Modules.promises.hooks.fire('getPaymentMethod', userId)
+    }
 
     res.render('subscriptions/add-seats', {
       subscriptionId: subscription._id,
@@ -174,7 +187,7 @@ async function addSeatsToGroupSubscription(req, res) {
       )
     }
 
-    if (error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError) {
+    if (error instanceof ManuallyCollectedError) {
       return res.redirect(
         '/user/subscription/group/manually-collected-subscription'
       )
@@ -215,10 +228,10 @@ async function previewAddSeatsSubscriptionChange(req, res) {
   } catch (error) {
     if (
       error instanceof MissingBillingInfoError ||
+      error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
-      error instanceof HasPastDueInvoiceError ||
-      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
+      error instanceof HasPastDueInvoiceError
     ) {
       return res.status(422).end()
     }
@@ -258,10 +271,10 @@ async function createAddSeatsSubscriptionChange(req, res) {
   } catch (error) {
     if (
       error instanceof MissingBillingInfoError ||
+      error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
-      error instanceof HasPastDueInvoiceError ||
-      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
+      error instanceof HasPastDueInvoiceError
     ) {
       return res.status(422).end()
     }
@@ -398,6 +411,12 @@ async function manuallyCollectedSubscription(req, res) {
     const subscription =
       await SubscriptionLocator.promises.getUsersSubscription(userId)
 
+    await SplitTestHandler.promises.getAssignment(
+      req,
+      res,
+      'flexible-group-licensing-for-manually-billed-subscriptions'
+    )
+
     res.render('subscriptions/manually-collected-subscription', {
       groupName: subscription.teamName,
     })
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
index 977218fdd2..bc179f8d23 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
@@ -18,7 +18,6 @@ const {
   PendingChangeError,
   InactiveError,
   HasPastDueInvoiceError,
-  HasNoAdditionalLicenseWhenManuallyCollectedError,
 } = require('./Errors')
 const EmailHelper = require('../Helpers/EmailHelper')
 const { InvalidEmailError } = require('../Errors/Errors')
@@ -124,22 +123,6 @@ async function ensureSubscriptionHasNoPastDueInvoice(subscription) {
   }
 }
 
-async function ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
-  paymentProviderSubscription
-) {
-  if (
-    paymentProviderSubscription.isCollectionMethodManual &&
-    !paymentProviderSubscription.hasAddOn(MEMBERS_LIMIT_ADD_ON_CODE)
-  ) {
-    throw new HasNoAdditionalLicenseWhenManuallyCollectedError(
-      'This subscription is being collected manually has no "additional-license" add-on',
-      {
-        subscription_id: paymentProviderSubscription.id,
-      }
-    )
-  }
-}
-
 async function getUsersGroupSubscriptionDetails(userId) {
   const subscription =
     await SubscriptionLocator.promises.getUsersSubscription(userId)
@@ -487,10 +470,6 @@ module.exports = {
   ensureSubscriptionHasNoPastDueInvoice: callbackify(
     ensureSubscriptionHasNoPastDueInvoice
   ),
-  ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual:
-    callbackify(
-      ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual
-    ),
   getTotalConfirmedUsersInGroup: callbackify(getTotalConfirmedUsersInGroup),
   isUserPartOfGroup: callbackify(isUserPartOfGroup),
   getGroupPlanUpgradePreview: callbackify(getGroupPlanUpgradePreview),
@@ -505,7 +484,6 @@ module.exports = {
     ensureSubscriptionCollectionMethodIsNotManual,
     ensureSubscriptionHasNoPendingChanges,
     ensureSubscriptionHasNoPastDueInvoice,
-    ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual,
     getTotalConfirmedUsersInGroup,
     isUserPartOfGroup,
     getUsersGroupSubscriptionDetails,
diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.js b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
index d9956e42cb..c0c107eecf 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionLocator.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
@@ -4,7 +4,6 @@
 
 const { callbackifyAll } = require('@overleaf/promise-utils')
 const { Subscription } = require('../../models/Subscription')
-const SubscriptionHelper = require('./SubscriptionHelper')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('@overleaf/logger')
 const {
@@ -176,8 +175,7 @@ const SubscriptionLocator = {
 
     const hasActiveGroupSubscription = memberSubscriptions.some(
       subscription =>
-        subscription.groupPlan &&
-        SubscriptionHelper.getPaidSubscriptionState(subscription) === 'active'
+        subscription.recurlyStatus?.state === 'active' && subscription.groupPlan
     )
     if (hasActiveGroupSubscription) {
       // Member of a group plan
@@ -189,8 +187,7 @@ const SubscriptionLocator = {
 
     if (personalSubscription) {
       const hasActivePersonalSubscription =
-        SubscriptionHelper.getPaidSubscriptionState(personalSubscription) ===
-        'active'
+        personalSubscription.recurlyStatus?.state === 'active'
       if (hasActivePersonalSubscription) {
         if (personalSubscription.groupPlan) {
           // Owner of a group plan
diff --git a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
index 56d92e9c96..0632f6e50e 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
@@ -79,7 +79,11 @@ async function getPopulatedListOfMembers(entity, attributes) {
     }
   }
 
-  const users = await UserMembershipViewModel.promises.buildAsync(userObjects)
+  const users = await Promise.all(
+    userObjects.map(userObject =>
+      UserMembershipViewModel.promises.buildAsync(userObject)
+    )
+  )
 
   for (const user of users) {
     if (
diff --git a/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js b/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
index 1d83a258ef..6c94f677b7 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
@@ -23,59 +23,30 @@ const UserMembershipViewModel = {
     }
   },
 
-  buildAsync(userOrIdOrEmailArray, callback) {
+  buildAsync(userOrIdOrEmail, callback) {
     if (callback == null) {
       callback = function () {}
     }
+    if (!isObjectIdInstance(userOrIdOrEmail)) {
+      // userOrIdOrEmail is a user or an email and can be parsed by #build
+      return callback(null, UserMembershipViewModel.build(userOrIdOrEmail))
+    }
 
-    const userObjectIds = userOrIdOrEmailArray.filter(isObjectIdInstance)
-
-    return UserGetter.getUsers(
-      userObjectIds,
-      {
-        email: 1,
-        first_name: 1,
-        last_name: 1,
-        lastLoggedIn: 1,
-        lastActive: 1,
-        enrollment: 1,
-      },
-      function (error, users) {
-        const results = []
-
-        if (error != null) {
-          userOrIdOrEmailArray.forEach(item => {
-            if (isObjectIdInstance(item)) {
-              results.push(buildUserViewModelWithId(item.toString()))
-            } else {
-              // `item` is a user or an email and can be parsed by #build
-              results.push(UserMembershipViewModel.build(item))
-            }
-          })
-        } else {
-          const usersMap = new Map()
-          for (const user of users) {
-            usersMap.set(user._id.toString(), user)
-          }
-
-          userOrIdOrEmailArray.forEach(item => {
-            if (isObjectIdInstance(item)) {
-              const user = usersMap.get(item.toString())
-              if (user == null) {
-                results.push(buildUserViewModelWithId(item.toString()))
-              } else {
-                results.push(buildUserViewModel(user))
-              }
-            } else {
-              // `item` is a user or an email and can be parsed by #build
-              results.push(UserMembershipViewModel.build(item))
-            }
-          })
-        }
-
-        callback(null, results)
+    const userId = userOrIdOrEmail
+    const projection = {
+      email: 1,
+      first_name: 1,
+      last_name: 1,
+      lastLoggedIn: 1,
+      lastActive: 1,
+      enrollment: 1,
+    }
+    return UserGetter.getUser(userId, projection, function (error, user) {
+      if (error != null || user == null) {
+        return callback(null, buildUserViewModelWithId(userId.toString()))
       }
-    )
+      return callback(null, buildUserViewModel(user))
+    })
   },
 }
 
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index c41512312a..6e6dfdc5d4 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -872,7 +872,8 @@
   "is_email_affiliated": "",
   "issued_on": "",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "",
-  "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "",
+  "it_looks_like_your_account_is_billed_manually": "",
+  "it_looks_like_your_account_is_billed_manually_upgrading_subscription": "",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "",
   "italics": "",
   "join_beta_program": "",
@@ -1025,7 +1026,6 @@
   "math_inline": "",
   "maximum_files_uploaded_together": "",
   "maybe_later": "",
-  "members_added": "",
   "members_management": "",
   "mendeley_dynamic_sync_description": "",
   "mendeley_groups_loading_error": "",
@@ -1146,10 +1146,10 @@
   "on_free_plan_upgrade_to_access_features": "",
   "one_step_away_from_professional_features": "",
   "only_group_admin_or_managers_can_delete_your_account_1": "",
-  "only_group_admin_or_managers_can_delete_your_account_10": "",
   "only_group_admin_or_managers_can_delete_your_account_3": "",
   "only_group_admin_or_managers_can_delete_your_account_6": "",
   "only_group_admin_or_managers_can_delete_your_account_7": "",
+  "only_group_admin_or_managers_can_delete_your_account_8": "",
   "only_group_admin_or_managers_can_delete_your_account_9": "",
   "only_importer_can_refresh": "",
   "open_action_menu": "",
diff --git a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
index 609620a958..ab9f96a975 100644
--- a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
+++ b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
@@ -30,6 +30,7 @@ import {
 } from '../../../../../../types/subscription/subscription-change-preview'
 import { MergeAndOverride, Nullable } from '../../../../../../types/utils'
 import { sendMB } from '../../../../infrastructure/event-tracking'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 export const MAX_NUMBER_OF_USERS = 20
 export const MAX_NUMBER_OF_PO_NUMBER_CHARACTERS = 50
@@ -49,6 +50,9 @@ function AddSeats() {
   const [addSeatsInputError, setAddSeatsInputError] = useState<string>()
   const [poNumberInputError, setPoNumberInputError] = useState<string>()
   const [shouldContactSales, setShouldContactSales] = useState(false)
+  const isFlexibleGroupLicensingForManuallyBilledSubscriptions = useFeatureFlag(
+    'flexible-group-licensing-for-manually-billed-subscriptions'
+  )
   const controller = useAbortController()
   const { signal: addSeatsSignal } = useAbortController()
   const { signal: contactSalesSignal } = useAbortController()
@@ -369,12 +373,13 @@ function AddSeats() {
                       <FormText type="error">{addSeatsInputError}</FormText>
                     )}
                   </FormGroup>
-                  {isCollectionMethodManual && (
-                    <PoNumber
-                      error={poNumberInputError}
-                      validate={validatePoNumber}
-                    />
-                  )}
+                  {isFlexibleGroupLicensingForManuallyBilledSubscriptions &&
+                    isCollectionMethodManual && (
+                      <PoNumber
+                        error={poNumberInputError}
+                        validate={validatePoNumber}
+                      />
+                    )}
                 </div>
                 <CostSummarySection
                   isLoadingCostSummary={isLoadingCostSummary}
diff --git a/services/web/frontend/js/features/group-management/components/group-members.tsx b/services/web/frontend/js/features/group-management/components/group-members.tsx
index c49fa62af0..2e87fe5051 100644
--- a/services/web/frontend/js/features/group-management/components/group-members.tsx
+++ b/services/web/frontend/js/features/group-management/components/group-members.tsx
@@ -13,7 +13,6 @@ import OLCard from '@/features/ui/components/ol/ol-card'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLFormControl from '@/features/ui/components/ol/ol-form-control'
 import OLFormText from '@/features/ui/components/ol/ol-form-text'
-import OLNotification from '@/features/ui/components/ol/ol-notification'
 
 export default function GroupMembers() {
   const { isReady } = useWaitForI18n()
@@ -27,7 +26,6 @@ export default function GroupMembers() {
     removeMemberError,
     inviteMemberLoading,
     inviteError,
-    memberAdded,
     paths,
   } = useGroupMembersContext()
   const [emailString, setEmailString] = useState<string>('')
@@ -142,13 +140,6 @@ export default function GroupMembers() {
                 data-testid="add-more-members-form"
               >
                 <p className="small">{t('invite_more_members')}</p>
-                {memberAdded && (
-                  <OLNotification
-                    content={t('members_added')}
-                    type="success"
-                    className="mt-2 mb-3"
-                  />
-                )}
                 <ErrorAlert error={inviteError} />
                 <form onSubmit={onAddMembersSubmit}>
                   <OLRow>
diff --git a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
index b2f2580b5f..971d4fa791 100644
--- a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
+++ b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
@@ -2,9 +2,14 @@ import { Trans, useTranslation } from 'react-i18next'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
 import Card from '@/features/group-management/components/card'
 import useWaitForI18n from '@/shared/hooks/use-wait-for-i18n'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 function ManuallyCollectedSubscription() {
   const { t } = useTranslation()
+  const isFlexibleGroupLicensingForManuallyBilledSubscriptions = useFeatureFlag(
+    'flexible-group-licensing-for-manually-billed-subscriptions'
+  )
+
   const { isReady } = useWaitForI18n()
 
   if (!isReady) {
@@ -17,13 +22,23 @@ function ManuallyCollectedSubscription() {
         type="error"
         title={t('account_billed_manually')}
         content={
-          <Trans
-            i18nKey="it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription"
-            components={[
-              // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
-              <a href="/contact" rel="noreferrer noopener" />,
-            ]}
-          />
+          isFlexibleGroupLicensingForManuallyBilledSubscriptions ? (
+            <Trans
+              i18nKey="it_looks_like_your_account_is_billed_manually_upgrading_subscription"
+              components={[
+                // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
+                <a href="/contact" rel="noreferrer noopener" />,
+              ]}
+            />
+          ) : (
+            <Trans
+              i18nKey="it_looks_like_your_account_is_billed_manually"
+              components={[
+                // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
+                <a href="/contact" rel="noreferrer noopener" />,
+              ]}
+            />
+          )
         }
         className="m-0"
       />
diff --git a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
index 14f4657fe7..5ed360de9c 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
@@ -30,6 +30,9 @@ export default function ManagedUserStatus({ user }: ManagedUserStatusProps) {
     </span>
   )
 
+  if (user.isEntityAdmin) {
+    return <span className="security-state-group-admin" />
+  }
   if (user.invite) {
     return managedUserInvite
   }
diff --git a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
index 8a46a225bb..6be4c7cbda 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect, useMemo } from 'react'
+import { useState, useRef, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { User } from '../../../../../../types/group-management/user'
 import { useGroupMembersContext } from '../../context/group-members-context'
@@ -13,9 +13,6 @@ import getMeta from '@/utils/meta'
 import UnlinkUserModal from './unlink-user-modal'
 import OLTable from '@/features/ui/components/ol/ol-table'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
-import Pagination from '@/shared/components/pagination'
-
-const USERS_DISPLAY_LIMIT = 50
 
 type ManagedUsersListProps = {
   groupId: string
@@ -34,30 +31,13 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
   const managedUsersActive = getMeta('ol-managedUsersActive')
   const groupSSOActive = getMeta('ol-groupSSOActive')
   const tHeadRowRef = useRef<HTMLTableRowElement>(null)
-  const [pagination, setPagination] = useState({ currPage: 1, totalPages: 1 })
-
-  const usersForCurrentPage = useMemo(
-    () =>
-      users.slice(
-        (pagination.currPage - 1) * USERS_DISPLAY_LIMIT,
-        pagination.currPage * USERS_DISPLAY_LIMIT
-      ),
-    [users, pagination.currPage]
-  )
-
-  const handlePageClick = (
-    _e: React.MouseEvent<HTMLButtonElement>,
-    page: number
-  ) => {
-    setPagination(p => ({ ...p, currPage: page }))
-  }
+  const [colSpan, setColSpan] = useState(0)
 
   useEffect(() => {
-    setPagination(p => ({
-      ...p,
-      totalPages: Math.ceil(users.length / USERS_DISPLAY_LIMIT),
-    }))
-  }, [users.length])
+    if (tHeadRowRef.current) {
+      setColSpan(tHeadRowRef.current.querySelectorAll('th').length)
+    }
+  }, [])
 
   return (
     <div>
@@ -113,17 +93,12 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
         <tbody>
           {users.length === 0 && (
             <tr>
-              <td
-                className="text-center"
-                colSpan={
-                  tHeadRowRef.current?.querySelectorAll('th').length ?? 0
-                }
-              >
+              <td className="text-center" colSpan={colSpan}>
                 <small>{t('no_members')}</small>
               </td>
             </tr>
           )}
-          {usersForCurrentPage.map(user => (
+          {users.map(user => (
             <MemberRow
               key={user.email}
               user={user}
@@ -136,15 +111,6 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
           ))}
         </tbody>
       </OLTable>
-      {pagination.totalPages > 1 && (
-        <div className="d-flex justify-content-center">
-          <Pagination
-            handlePageClick={handlePageClick}
-            currentPage={pagination.currPage}
-            totalPages={pagination.totalPages}
-          />
-        </div>
-      )}
       {userToOffboard && (
         <OffboardManagedUserModal
           user={userToOffboard}
diff --git a/services/web/frontend/js/features/group-management/context/group-members-context.tsx b/services/web/frontend/js/features/group-management/context/group-members-context.tsx
index ae875c435e..63619dc361 100644
--- a/services/web/frontend/js/features/group-management/context/group-members-context.tsx
+++ b/services/web/frontend/js/features/group-management/context/group-members-context.tsx
@@ -31,7 +31,6 @@ export type GroupMembersContextValue = {
   updateMemberView: (userId: string, updatedUser: User) => void
   inviteMemberLoading: boolean
   inviteError?: APIError
-  memberAdded: boolean
   paths: { [key: string]: string }
 }
 
@@ -59,7 +58,6 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
   const [inviteError, setInviteError] = useState<APIError>()
   const [removeMemberInflightCount, setRemoveMemberInflightCount] = useState(0)
   const [removeMemberError, setRemoveMemberError] = useState<APIError>()
-  const [memberAdded, setMemberAdded] = useState(false)
 
   const groupId = getMeta('ol-groupId')
 
@@ -76,9 +74,7 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
   const addMembers = useCallback(
     (emailString: string) => {
       setInviteError(undefined)
-      setMemberAdded(false)
       const emails = parseEmails(emailString)
-      let isError = false
       mapSeries(emails, async email => {
         setInviteUserInflightCount(count => count + 1)
         try {
@@ -98,15 +94,8 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
         } catch (error: unknown) {
           debugConsole.error(error)
           setInviteError((error as FetchError)?.data?.error || {})
-          isError = true
         }
-        setInviteUserInflightCount(count => {
-          const newCount = count - 1
-          if (newCount === 0 && !isError) {
-            setMemberAdded(true)
-          }
-          return newCount
-        })
+        setInviteUserInflightCount(count => count - 1)
       })
     },
     [paths.addMember, users, setUsers]
@@ -184,7 +173,6 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
       removeMemberError,
       inviteMemberLoading: inviteUserInflightCount > 0,
       inviteError,
-      memberAdded,
       paths,
     }),
     [
@@ -203,7 +191,6 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
       removeMemberError,
       inviteUserInflightCount,
       inviteError,
-      memberAdded,
       paths,
     ]
   )
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index f8da39f909..69552f9b1a 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -247,7 +247,6 @@ export interface Meta {
   'ol-splitTestVariants': { [name: string]: string }
   'ol-ssoDisabled': boolean
   'ol-ssoErrorMessage': string
-  'ol-stripeAccountId': string
   'ol-stripeCustomerId': string
   'ol-subscription': any // TODO: mixed types, split into two fields
   'ol-subscriptionChangePreview': SubscriptionChangePreview
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 1794050bf8..3593bfab7b 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1130,7 +1130,8 @@
   "issued_on": "Issued: __date__",
   "it": "Italian",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "It looks like that didn’t work. You can try again or <0>get in touch</0> with our Support team for more help.",
-  "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "It looks like your account is being billed manually - purchasing additional licenses or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
+  "it_looks_like_your_account_is_billed_manually": "It looks like your account is being billed manually - adding seats or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
+  "it_looks_like_your_account_is_billed_manually_upgrading_subscription": "It looks like your account is being billed manually - upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "It looks like your payment details are missing. Please <0>update your billing information</0>, or <1>get in touch</1> with our Support team for more help.",
   "italics": "Italics",
   "ja": "Japanese",
@@ -1341,7 +1342,6 @@
   "may": "May",
   "maybe_later": "Maybe later",
   "member_picker": "Select number of users for group plan",
-  "members_added": "Member(s) added.",
   "members_management": "Members management",
   "mendeley": "Mendeley",
   "mendeley_dynamic_sync_description": "With the Mendeley integration, you can import your references into __appName__. You can either import all your references at once or dynamically search your Mendeley library directly from __appName__.",
@@ -1504,10 +1504,10 @@
   "ongoing_experiments": "Ongoing experiments",
   "online_latex_editor": "Online LaTeX Editor",
   "only_group_admin_or_managers_can_delete_your_account_1": "By becoming a managed user, your organization will have admin rights over your account and control over your stuff, including the right to close your account and access, delete and share your stuff. As a result:",
-  "only_group_admin_or_managers_can_delete_your_account_10": "If you have an individual subscription, we’ll automatically terminate it and cancel its renewal when your account becomes managed. To request a pro-rata refund for the remainder, please contact Support.",
   "only_group_admin_or_managers_can_delete_your_account_3": "Your group admin and group managers will be able to reassign ownership of your projects to another group member.",
   "only_group_admin_or_managers_can_delete_your_account_6": "Only your group admin or group managers will be able to delete your account or change your account back into an unmanaged account.",
   "only_group_admin_or_managers_can_delete_your_account_7": "Only your group admin or group managers will be able to delete your account or change your account into an unmanaged account.",
+  "only_group_admin_or_managers_can_delete_your_account_8": "We’ll cancel the renewal of your subscription, reach out to Support to request a pro-rata refund. Your individual subscription will be terminated when your account becomes managed.",
   "only_group_admin_or_managers_can_delete_your_account_9": "Once you have become a managed user, <0>you yourself cannot change it back to an unmanaged account</0>. <1>Learn more about managed Overleaf accounts.</1>",
   "only_importer_can_refresh": "Only the person who originally imported this __provider__ file can refresh it.",
   "open_action_menu": "Open __name__ action menu",
diff --git a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
index f26357d842..ead0c74a1c 100644
--- a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
@@ -14,6 +14,9 @@ describe('<AddSeats />', function () {
       win.metaAttributesCache.set('ol-totalLicenses', this.totalLicenses)
       win.metaAttributesCache.set('ol-isProfessional', false)
       win.metaAttributesCache.set('ol-isCollectionMethodManual', true)
+      win.metaAttributesCache.set('ol-splitTestVariants', {
+        'flexible-group-licensing-for-manually-billed-subscriptions': 'enabled',
+      })
     })
 
     cy.mount(
diff --git a/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
index 5c09987695..49cadfe0c9 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
@@ -61,4 +61,26 @@ describe('MemberStatus', function () {
       cy.get('.security-state-not-managed').contains('Managed')
     })
   })
+
+  describe('with the group admin', function () {
+    const user: User = {
+      _id: 'some-user',
+      email: 'some.user@example.com',
+      first_name: 'Some',
+      last_name: 'User',
+      invite: false,
+      last_active_at: new Date(),
+      enrollment: undefined,
+      isEntityAdmin: true,
+    }
+    beforeEach(function () {
+      cy.mount(<ManagedUserStatus user={user} />)
+    })
+
+    it('should render no state indicator', function () {
+      cy.get('.security-state-group-admin')
+        .contains('Managed')
+        .should('not.exist')
+    })
+  })
 })
diff --git a/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
index 32958b34d0..0861ab6c34 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
@@ -121,16 +121,6 @@ describe('MembersList', function () {
         users[1].last_name
       )
     })
-    it('should render the pagination navigation', function () {
-      cy.window().then(win => {
-        win.metaAttributesCache.set(
-          'ol-users',
-          Array.from({ length: 50 }).flatMap(() => users.flat())
-        )
-      })
-      mountManagedUsersList()
-      cy.findByRole('navigation', { name: /pagination navigation/i })
-    })
   })
 
   describe('empty user list', function () {
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index ddfa8b0790..2b52f2be37 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -73,8 +73,6 @@ describe('SubscriptionGroupController', function () {
           .resolves(ctx.previewSubscriptionChangeData),
         checkBillingInfoExistence: sinon.stub().resolves(ctx.paymentMethod),
         updateSubscriptionPaymentTerms: sinon.stub().resolves(),
-        ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual:
-          sinon.stub().resolves(),
       },
     }
 
@@ -107,6 +105,12 @@ describe('SubscriptionGroupController', function () {
       },
     }
 
+    ctx.SplitTestHandler = {
+      promises: {
+        getAssignment: sinon.stub().resolves({ variant: 'enabled' }),
+      },
+    }
+
     ctx.UserGetter = {
       promises: {
         getUserEmail: sinon.stub().resolves(ctx.user.email),
@@ -136,7 +140,6 @@ describe('SubscriptionGroupController', function () {
       InactiveError: class extends Error {},
       SubtotalLimitExceededError: class extends Error {},
       HasPastDueInvoiceError: class extends Error {},
-      HasNoAdditionalLicenseWhenManuallyCollectedError: class extends Error {},
     }
 
     vi.doMock(
@@ -168,6 +171,13 @@ describe('SubscriptionGroupController', function () {
       default: ctx.Modules,
     }))
 
+    vi.doMock(
+      '../../../../app/src/Features/SplitTests/SplitTestHandler',
+      () => ({
+        default: ctx.SplitTestHandler,
+      })
+    )
+
     vi.doMock('../../../../app/src/Features/User/UserGetter', () => ({
       default: ctx.UserGetter,
     }))
@@ -446,9 +456,6 @@ describe('SubscriptionGroupController', function () {
             ctx.SubscriptionGroupHandler.promises.checkBillingInfoExistence
               .calledWith(ctx.recurlySubscription, ctx.adminUserId)
               .should.equal(true)
-            ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual
-              .calledWith(ctx.recurlySubscription)
-              .should.equal(true)
             page.should.equal('subscriptions/add-seats')
             props.subscriptionId.should.equal(ctx.subscriptionId)
             props.groupName.should.equal(ctx.subscription.teamName)
@@ -514,28 +521,6 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
-    it('should redirect to manually collected subscription error page when collection method is manual and has no additional license add-on', async function (ctx) {
-      await new Promise(resolve => {
-        ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual =
-          sinon
-            .stub()
-            .throws(
-              new ctx.Errors.HasNoAdditionalLicenseWhenManuallyCollectedError()
-            )
-
-        const res = {
-          redirect: url => {
-            url.should.equal(
-              '/user/subscription/group/manually-collected-subscription'
-            )
-            resolve()
-          },
-        }
-
-        ctx.Controller.addSeatsToGroupSubscription(ctx.req, res)
-      })
-    })
-
     it('should redirect to subscription page when there is a pending change', async function (ctx) {
       await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPendingChanges =
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
index 87793fe440..63a6e25fde 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
@@ -806,49 +806,6 @@ describe('SubscriptionGroupHandler', function () {
     })
   })
 
-  describe('ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual', function () {
-    it('should throw if the subscription is manually collected and has no additional license add-on', async function () {
-      await expect(
-        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
-          {
-            isCollectionMethodManual: true,
-            hasAddOn: sinon
-              .stub()
-              .withArgs('additional-license')
-              .returns(false),
-          }
-        )
-      ).to.be.rejectedWith(
-        'This subscription is being collected manually has no "additional-license" add-on'
-      )
-    })
-
-    it('should not throw if the subscription is not manually collected and has no additional license add-on and ', async function () {
-      await expect(
-        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
-          {
-            isCollectionMethodManual: false,
-            hasAddOn: sinon
-              .stub()
-              .withArgs('additional-license')
-              .returns(false),
-          }
-        )
-      ).to.not.be.rejected
-    })
-
-    it('should not throw if the subscription is not manually collected and has additional license add-on', async function () {
-      await expect(
-        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
-          {
-            isCollectionMethodManual: true,
-            hasAddOn: sinon.stub().withArgs('additional-license').returns(true),
-          }
-        )
-      ).to.not.be.rejected
-    })
-  })
-
   describe('getGroupPlanUpgradePreview', function () {
     it('should generate preview for subscription upgrade', async function () {
       const result = await this.Handler.promises.getGroupPlanUpgradePreview(
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js b/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
index 3bf74c0ab7..f7b665aecd 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
+++ b/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
@@ -48,7 +48,7 @@ describe('UserMembershipHandler', function () {
 
     this.UserMembershipViewModel = {
       promises: {
-        buildAsync: sinon.stub().resolves([{ _id: 'mock-member-id' }]),
+        buildAsync: sinon.stub().resolves({ _id: 'mock-member-id' }),
       },
       build: sinon.stub().returns(this.newUser),
     }
@@ -118,26 +118,26 @@ describe('UserMembershipHandler', function () {
           this.subscription,
           EntityConfigs.group
         )
+        const expectedCallcount =
+          this.subscription.member_ids.length +
+          this.subscription.invited_emails.length +
+          this.subscription.teamInvites.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync
-        ).to.be.calledOnceWith(
-          this.subscription.invited_emails.concat(
-            this.subscription.teamInvites[0].email,
-            this.subscription.member_ids
-          )
-        )
+          this.UserMembershipViewModel.promises.buildAsync.callCount
+        ).to.equal(expectedCallcount)
       })
     })
 
-    describe('group managers', function () {
+    describe('group mamagers', function () {
       it('build view model for all managers', async function () {
         await this.UserMembershipHandler.promises.getUsers(
           this.subscription,
           EntityConfigs.groupManagers
         )
+        const expectedCallcount = this.subscription.manager_ids.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync
-        ).to.be.calledOnceWith(this.subscription.manager_ids)
+          this.UserMembershipViewModel.promises.buildAsync.callCount
+        ).to.equal(expectedCallcount)
       })
     })
 
@@ -147,9 +147,11 @@ describe('UserMembershipHandler', function () {
           this.institution,
           EntityConfigs.institution
         )
+
+        const expectedCallcount = this.institution.managerIds.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync
-        ).to.be.calledOnceWith(this.institution.managerIds)
+          this.UserMembershipViewModel.promises.buildAsync.callCount
+        ).to.equal(expectedCallcount)
       })
     })
   })
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js b/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
index c5e21a5f48..a8ce9d158f 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
+++ b/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
@@ -25,7 +25,7 @@ const {
 
 describe('UserMembershipViewModel', function () {
   beforeEach(function () {
-    this.UserGetter = { getUsers: sinon.stub() }
+    this.UserGetter = { getUser: sinon.stub() }
     this.UserMembershipViewModel = SandboxedModule.require(modulePath, {
       requires: {
         'mongodb-legacy': { ObjectId },
@@ -87,10 +87,9 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build email', function (done) {
-      this.UserGetter.getUsers.yields(null, [])
       return this.UserMembershipViewModel.buildAsync(
-        [this.email],
-        (error, [viewModel]) => {
+        this.email,
+        (error, viewModel) => {
           assertCalledWith(this.UserMembershipViewModel.build, this.email)
           return done()
         }
@@ -98,10 +97,9 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build user', function (done) {
-      this.UserGetter.getUsers.yields(null, [])
       return this.UserMembershipViewModel.buildAsync(
-        [this.user],
-        (error, [viewModel]) => {
+        this.user,
+        (error, viewModel) => {
           assertCalledWith(this.UserMembershipViewModel.build, this.user)
           return done()
         }
@@ -109,34 +107,30 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build user id', function (done) {
-      const user = {
-        ...this.user,
-        _id: new ObjectId(),
-      }
-      this.UserGetter.getUsers.yields(null, [user])
+      this.UserGetter.getUser.yields(null, this.user)
       return this.UserMembershipViewModel.buildAsync(
-        [user._id],
-        (error, [viewModel]) => {
+        new ObjectId(),
+        (error, viewModel) => {
           expect(error).not.to.exist
           assertNotCalled(this.UserMembershipViewModel.build)
-          expect(viewModel._id.toString()).to.equal(user._id.toString())
-          expect(viewModel.email).to.equal(user.email)
-          expect(viewModel.first_name).to.equal(user.first_name)
+          expect(viewModel._id).to.equal(this.user._id)
+          expect(viewModel.email).to.equal(this.user.email)
+          expect(viewModel.first_name).to.equal(this.user.first_name)
           expect(viewModel.invite).to.equal(false)
           expect(viewModel.email).to.exist
           expect(viewModel.enrollment).to.exist
-          expect(viewModel.enrollment).to.deep.equal(user.enrollment)
+          expect(viewModel.enrollment).to.deep.equal(this.user.enrollment)
           return done()
         }
       )
     })
 
     it('build user id with error', function (done) {
-      this.UserGetter.getUsers.yields(new Error('nope'), [])
+      this.UserGetter.getUser.yields(new Error('nope'))
       const userId = new ObjectId()
       return this.UserMembershipViewModel.buildAsync(
-        [userId],
-        (error, [viewModel]) => {
+        userId,
+        (error, viewModel) => {
           expect(error).not.to.exist
           assertNotCalled(this.UserMembershipViewModel.build)
           expect(viewModel._id).to.equal(userId.toString())

From 66b7fd8844b9182ab90de88516b7c7729b3953bd Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Wed, 9 Jul 2025 09:32:12 +0200
Subject: [PATCH 144/274] Fix selectors in e2e tests (#26695)

* Fix e2e tests

* Fix e2e tests

GitOrigin-RevId: 10bb27b6b33dd38d35964d327c0122d094a0abc9
---
 services/web/frontend/extracted-translations.json         | 1 +
 .../word-count-modal/components/word-count-modal.tsx      | 8 +++++++-
 services/web/locales/en.json                              | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 6e6dfdc5d4..e0f03dcc99 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -654,6 +654,7 @@
   "git_bridge_modal_review_access": "",
   "git_bridge_modal_see_once": "",
   "git_bridge_modal_use_previous_token": "",
+  "git_clone_project": "",
   "git_integration": "",
   "git_integration_info": "",
   "github": "",
diff --git a/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx b/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx
index ea8371978d..b3dd52f8db 100644
--- a/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx
+++ b/services/web/frontend/js/features/word-count-modal/components/word-count-modal.tsx
@@ -11,7 +11,13 @@ const WordCountModal = memo(function WordCountModal({
   handleHide: () => void
 }) {
   return (
-    <OLModal animation show={show} onHide={handleHide} id="word-count-modal">
+    <OLModal
+      animation
+      show={show}
+      onHide={handleHide}
+      id="word-count-modal"
+      data-testid="word-count-modal"
+    >
       <WordCountModalContent handleHide={handleHide} />
     </OLModal>
   )
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 3593bfab7b..9d5c2ac9b6 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -861,6 +861,7 @@
   "git_bridge_modal_review_access": "<0>You have review access to this project.</0> This means you can pull from __appName__ but you can’t push any changes you make back to this project.",
   "git_bridge_modal_see_once": "You’ll only see this token once. To delete it or generate a new one, visit Account settings. For detailed instructions and troubleshooting, read our <0>help page</0>.",
   "git_bridge_modal_use_previous_token": "If you’re prompted for a password, you can use a previously generated Git authentication token. Or you can generate a new one in Account settings. For more support, read our <0>help page</0>.",
+  "git_clone_project": "Git clone project",
   "git_gitHub_dropbox_mendeley_papers_and_zotero_integrations": "Git, GitHub, Dropbox, Papers, Zotero, and Mendeley integrations",
   "git_integration": "Git integration",
   "git_integration_info": "With Git integration, you can clone your Overleaf projects with Git. For full instructions on how to do this, <0>read our Git Integration help page</0>.",

From 6ce114da7771eca774c11ac8e3e9a10284522aa4 Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:33:01 +0200
Subject: [PATCH 145/274] Revert "Revert "[web] link to correct Stripe
 dashboard from admin panel (#26756)"" (#26984)

This reverts commit 30aae5a0b0849a736e27e34661971dd9a950202e.

GitOrigin-RevId: c4837ece509a1f8da525f49895402f2f4f298f11
---
 services/web/frontend/js/utils/meta.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 69552f9b1a..f8da39f909 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -247,6 +247,7 @@ export interface Meta {
   'ol-splitTestVariants': { [name: string]: string }
   'ol-ssoDisabled': boolean
   'ol-ssoErrorMessage': string
+  'ol-stripeAccountId': string
   'ol-stripeCustomerId': string
   'ol-subscription': any // TODO: mixed types, split into two fields
   'ol-subscriptionChangePreview': SubscriptionChangePreview

From 74063b14e0698efba76a5c30d8e91fefdf153f82 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:51:52 +0100
Subject: [PATCH 146/274] Merge pull request #26909 from
 overleaf/dp-eq-preview-presentation-mode

Prevent codemirror tooltips appearing on top of pdf preview

GitOrigin-RevId: 0c6ce15cd91b4958674fbc247bcd27ce5778f7fc
---
 .../source-editor/extensions/index.ts         |  2 ++
 .../source-editor/extensions/math-preview.ts  | 15 +++-----------
 .../extensions/tooltips-reposition.ts         | 20 +++++++++++++++++++
 .../js/shared/context/layout-context.tsx      | 10 ++++++++++
 4 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 services/web/frontend/js/features/source-editor/extensions/tooltips-reposition.ts

diff --git a/services/web/frontend/js/features/source-editor/extensions/index.ts b/services/web/frontend/js/features/source-editor/extensions/index.ts
index e3c0a28ccb..f7ab774d15 100644
--- a/services/web/frontend/js/features/source-editor/extensions/index.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/index.ts
@@ -53,6 +53,7 @@ import { ranges } from './ranges'
 import { historyOT } from './history-ot'
 import { trackDetachedComments } from './track-detached-comments'
 import { reviewTooltip } from './review-tooltip'
+import { tooltipsReposition } from './tooltips-reposition'
 
 const moduleExtensions: Array<(options: Record<string, any>) => Extension> =
   importOverleafModules('sourceEditorExtensions').map(
@@ -170,4 +171,5 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
   effectListeners(),
   geometryChangeEvent(),
   fileTreeItemDrop(),
+  tooltipsReposition(),
 ]
diff --git a/services/web/frontend/js/features/source-editor/extensions/math-preview.ts b/services/web/frontend/js/features/source-editor/extensions/math-preview.ts
index 3df55b2f28..1b9e051978 100644
--- a/services/web/frontend/js/features/source-editor/extensions/math-preview.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/math-preview.ts
@@ -1,10 +1,4 @@
-import {
-  EditorView,
-  repositionTooltips,
-  showTooltip,
-  Tooltip,
-  ViewPlugin,
-} from '@codemirror/view'
+import { EditorView, showTooltip, Tooltip, ViewPlugin } from '@codemirror/view'
 import {
   Compartment,
   EditorState,
@@ -24,8 +18,8 @@ import { documentCommands } from '../languages/latex/document-commands'
 import { debugConsole } from '@/utils/debugging'
 import { nodeHasError } from '../utils/tree-operations/common'
 import { documentEnvironments } from '../languages/latex/document-environments'
+import { repositionAllTooltips } from './tooltips-reposition'
 
-const REPOSITION_EVENT = 'editor:repositionMathTooltips'
 const HIDE_TOOLTIP_EVENT = 'editor:hideMathTooltip'
 
 export const mathPreview = (enabled: boolean): Extension => {
@@ -81,19 +75,16 @@ export const mathPreviewStateField = StateField.define<{
     showTooltip.compute([field], state => state.field(field).tooltip),
 
     ViewPlugin.define(view => {
-      const listener = () => repositionTooltips(view)
       const hideTooltip = () => {
         view.dispatch({
           effects: hideTooltipEffect.of(null),
         })
       }
 
-      window.addEventListener(REPOSITION_EVENT, listener)
       window.addEventListener(HIDE_TOOLTIP_EVENT, hideTooltip)
 
       return {
         destroy() {
-          window.removeEventListener(REPOSITION_EVENT, listener)
           window.removeEventListener(HIDE_TOOLTIP_EVENT, hideTooltip)
         },
       }
@@ -220,7 +211,7 @@ const buildTooltipContent = (
   renderMath(math.content, math.displayMode, element, definitions)
     .then(() => {
       element.style.opacity = '1'
-      window.dispatchEvent(new Event(REPOSITION_EVENT))
+      repositionAllTooltips()
     })
     .catch(error => {
       debugConsole.error(error)
diff --git a/services/web/frontend/js/features/source-editor/extensions/tooltips-reposition.ts b/services/web/frontend/js/features/source-editor/extensions/tooltips-reposition.ts
new file mode 100644
index 0000000000..cb350b2e06
--- /dev/null
+++ b/services/web/frontend/js/features/source-editor/extensions/tooltips-reposition.ts
@@ -0,0 +1,20 @@
+import { repositionTooltips, ViewPlugin } from '@codemirror/view'
+
+const REPOSITION_EVENT = 'editor:repositionAllTooltips'
+
+export const tooltipsReposition = () =>
+  ViewPlugin.define(view => {
+    const listener = () => repositionTooltips(view)
+
+    window.addEventListener(REPOSITION_EVENT, listener)
+
+    return {
+      destroy() {
+        window.removeEventListener(REPOSITION_EVENT, listener)
+      },
+    }
+  })
+
+export const repositionAllTooltips = () => {
+  window.dispatchEvent(new Event(REPOSITION_EVENT))
+}
diff --git a/services/web/frontend/js/shared/context/layout-context.tsx b/services/web/frontend/js/shared/context/layout-context.tsx
index 8dcc1fd8ff..6bc8c5b222 100644
--- a/services/web/frontend/js/shared/context/layout-context.tsx
+++ b/services/web/frontend/js/shared/context/layout-context.tsx
@@ -21,6 +21,7 @@ import { isMac } from '@/shared/utils/os'
 import { sendSearchEvent } from '@/features/event-tracking/search-events'
 import { useRailContext } from '@/features/ide-redesign/contexts/rail-context'
 import usePersistedState from '@/shared/hooks/use-persisted-state'
+import { repositionAllTooltips } from '@/features/source-editor/extensions/tooltips-reposition'
 
 export type IdeLayout = 'sideBySide' | 'flat'
 export type IdeView = 'editor' | 'file' | 'pdf' | 'history'
@@ -198,6 +199,15 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
     [setPdfLayout, setView]
   )
 
+  // Force codemirror to reposition all tooltips to prevent an issue
+  // where tooltips would sometimes show on top of the pdf preview
+  // https://github.com/overleaf/internal/issues/23840
+  useEffect(() => {
+    if (view === 'pdf' && pdfLayout === 'flat') {
+      repositionAllTooltips()
+    }
+  }, [view, pdfLayout])
+
   const {
     reattach,
     detach,

From 496093203abf9c2a9ccb1ce9428e941f807b0478 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:52:05 +0100
Subject: [PATCH 147/274] Merge pull request #26932 from
 overleaf/dp-auto-expand-first-message

Auto-expand first error log in new editor

GitOrigin-RevId: 03237426fb7127c631b2da3488322deb22b8d63b
---
 .../features/ide-redesign/components/error-logs/log-entry.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx
index a7539450ce..4ff66ba6d3 100644
--- a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx
@@ -40,7 +40,7 @@ type LogEntryProps = {
 }
 
 function LogEntry(props: LogEntryProps) {
-  const [collapsed, setCollapsed] = useState(true)
+  const [collapsed, setCollapsed] = useState(props.index !== 0)
 
   return (
     <ControlledLogEntry

From faabd91e431f1530edb1a2eb3a460e3fd0601866 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:52:14 +0100
Subject: [PATCH 148/274] Merge pull request #26966 from
 overleaf/dp-review-panel-border

Fix review panel border in dark mode

GitOrigin-RevId: 68ad036b6d452be6259afbcd1eae723a873756c2
---
 .../stylesheets/bootstrap-5/pages/editor/review-panel-new.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss
index cf90ef5040..1b950400a5 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/review-panel-new.scss
@@ -41,7 +41,7 @@ $rp-type-blue: #6b7797;
 
   .review-panel-inner {
     border-left: none;
-    border-right: 1px solid var(--border-divider);
+    border-right: 1px solid var(--border-divider-themed);
   }
 
   .review-panel-header {

From e17eaf51d2e832ede686f79b81b19c58849ae1ed Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:52:25 +0100
Subject: [PATCH 149/274] Merge pull request #26967 from
 overleaf/dp-synctex-not-bold

Change synctex icons in new editor to not be bold

GitOrigin-RevId: edb5aab8248c484b3791c0705dd571bdb405e612
---
 .../frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss
index 4c59352df3..57d467eccc 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/pdf.scss
@@ -68,6 +68,12 @@
     border-radius: var(--border-radius-full);
     box-shadow: 0 2px 4px 0 #1e253029;
   }
+
+  .synctex-control {
+    .synctex-control-icon {
+      font-weight: normal;
+    }
+  }
 }
 
 .pdf .toolbar.toolbar-pdf {

From 6969caf69075466c5fbdd4da99b5df1c0f8b9841 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:52:32 +0100
Subject: [PATCH 150/274] Merge pull request #26969 from
 overleaf/dp-chat-text-color

Fix chat empty state colors in dark mode

GitOrigin-RevId: 8daca1971443d0112068bb06bb312ab633d39a20
---
 .../frontend/stylesheets/bootstrap-5/pages/editor/chat.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/chat.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/chat.scss
index b0e50cd95d..5d39e6b414 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/chat.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/chat.scss
@@ -211,7 +211,8 @@
     border-radius: 50%;
     display: inline-block;
     line-height: 32px;
-    background-color: var(--bg-light-secondary);
+    background-color: var(--bg-secondary-themed);
+    color: var(--content-primary-themed);
 
     .material-symbols {
       font-size: 32px;
@@ -219,6 +220,7 @@
   }
 
   .chat-empty-state-title {
+    color: var(--content-primary-themed);
     font-size: var(--font-size-02);
     line-height: var(--line-height-02);
     font-weight: bold;
@@ -227,7 +229,7 @@
   .chat-empty-state-body {
     font-size: var(--font-size-02);
     line-height: var(--line-height-02);
-    color: var(--content-secondary);
+    color: var(--content-secondary-themed);
   }
 }
 

From 97d2954cc02703b8b7cec787b4f43baac02d11df Mon Sep 17 00:00:00 2001
From: Davinder Singh <davibaweja@gmail.com>
Date: Wed, 9 Jul 2025 11:19:29 +0100
Subject: [PATCH 151/274] Home page burger menu scroll fix (#26853)

* adding a scroll fix

* generalising the solution so it works for both BS3 and BS5

GitOrigin-RevId: 8dd0d82356b484adcad9de487b12ecfc4050d109
---
 .../app/views/layout/navbar-marketing-bootstrap-5.pug    | 2 +-
 .../web/app/views/layout/navbar-website-redesign.pug     | 2 +-
 services/web/frontend/js/bootstrap-3.ts                  | 1 +
 services/web/frontend/js/bootstrap-5.ts                  | 1 +
 services/web/frontend/js/features/navbar/index.ts        | 9 +++++++++
 .../stylesheets/bootstrap-5/components/navbar.scss       | 5 +++++
 services/web/frontend/stylesheets/components/navbar.less | 5 +++++
 7 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 services/web/frontend/js/features/navbar/index.ts

diff --git a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
index 29b12a056d..9f9decbefb 100644
--- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
+++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
@@ -36,7 +36,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(
 		- var canDisplayScriptLogMenu = hasFeature('saas') && canDisplayAdminMenu
 
 		if typeof suppressNavbarRight === 'undefined'
-			button.navbar-toggler.collapsed(
+			button#navbar-toggle-btn.navbar-toggler.collapsed(
 				type='button'
 				data-bs-toggle='collapse'
 				data-bs-target='#navbar-main-collapse'
diff --git a/services/web/app/views/layout/navbar-website-redesign.pug b/services/web/app/views/layout/navbar-website-redesign.pug
index 0a8337c2f5..8963037758 100644
--- a/services/web/app/views/layout/navbar-website-redesign.pug
+++ b/services/web/app/views/layout/navbar-website-redesign.pug
@@ -2,7 +2,7 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 	.container-fluid
 		.navbar-header
 			if typeof suppressNavbarRight == 'undefined'
-				button.navbar-toggle.collapsed(
+				button#navbar-toggle-btn.navbar-toggle.collapsed(
 					type='button'
 					data-toggle='collapse'
 					data-target='#navbar-main-collapse'
diff --git a/services/web/frontend/js/bootstrap-3.ts b/services/web/frontend/js/bootstrap-3.ts
index 2c7b3b8214..e9012b7555 100644
--- a/services/web/frontend/js/bootstrap-3.ts
+++ b/services/web/frontend/js/bootstrap-3.ts
@@ -2,3 +2,4 @@ import 'bootstrap'
 import './features/contact-form'
 import './features/bookmarkable-tab/index'
 import './features/tooltip/index-bs3'
+import './features/navbar/index'
diff --git a/services/web/frontend/js/bootstrap-5.ts b/services/web/frontend/js/bootstrap-5.ts
index b9dc3d8679..4b4b09ecfe 100644
--- a/services/web/frontend/js/bootstrap-5.ts
+++ b/services/web/frontend/js/bootstrap-5.ts
@@ -1,3 +1,4 @@
 import './features/bookmarkable-tab/index-bs5'
 import './features/tooltip/index-bs5'
+import './features/navbar/index'
 import 'bootstrap-5'
diff --git a/services/web/frontend/js/features/navbar/index.ts b/services/web/frontend/js/features/navbar/index.ts
new file mode 100644
index 0000000000..706d4853f3
--- /dev/null
+++ b/services/web/frontend/js/features/navbar/index.ts
@@ -0,0 +1,9 @@
+const toggleButton = document.getElementById('navbar-toggle-btn') as HTMLElement
+
+toggleButton.addEventListener('click', () => {
+  // Delay allows Bootstrap to update aria-expanded first
+  setTimeout(() => {
+    const isExpanded = toggleButton.getAttribute('aria-expanded') === 'true'
+    document.body.classList.toggle('no-scroll', isExpanded)
+  }, 5)
+})
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss b/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
index a8855ea1ca..3ec45aef2f 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/navbar.scss
@@ -1,3 +1,8 @@
+.no-scroll {
+  height: 100vh;
+  overflow: hidden;
+}
+
 // Default navbar
 .navbar-default {
   background-color: var(--navbar-bg);
diff --git a/services/web/frontend/stylesheets/components/navbar.less b/services/web/frontend/stylesheets/components/navbar.less
index 06c3346a35..1a329e3ce1 100755
--- a/services/web/frontend/stylesheets/components/navbar.less
+++ b/services/web/frontend/stylesheets/components/navbar.less
@@ -7,6 +7,11 @@
 // Provide a static navbar from which we expand to create full-width, fixed, and
 // other navbar variations.
 
+.no-scroll {
+  height: 100vh;
+  overflow: hidden;
+}
+
 .navbar {
   position: relative;
   min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)

From 8adc7526d93310f6bc220a5e244d3227c735f82e Mon Sep 17 00:00:00 2001
From: Davinder Singh <davibaweja@gmail.com>
Date: Wed, 9 Jul 2025 11:19:50 +0100
Subject: [PATCH 152/274] Tearing down "paywall-change-compile-timeout"
 (#26741)

* removing the split test

* removing translations

* removing comments

* removing odcRole

GitOrigin-RevId: 8654876a6d97c52058fe9416f4495845d1320765
---
 .../src/Features/Project/ProjectController.js |  26 ---
 .../web/app/views/project/editor/_meta.pug    |   5 -
 .../web/frontend/extracted-translations.json  |   7 -
 .../components/pdf-logs-viewer.tsx            |  33 +--
 ...imeout-message-after-paywall-dismissal.tsx | 212 ------------------
 .../timeout-upgrade-paywall-prompt.tsx        | 111 ---------
 services/web/frontend/js/utils/meta.ts        |   2 -
 services/web/locales/en.json                  |   7 -
 8 files changed, 6 insertions(+), 397 deletions(-)
 delete mode 100644 services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx
 delete mode 100644 services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 64454f4eda..cab5c3a230 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -43,7 +43,6 @@ const ProjectAuditLogHandler = require('./ProjectAuditLogHandler')
 const PublicAccessLevels = require('../Authorization/PublicAccessLevels')
 const TagsHandler = require('../Tags/TagsHandler')
 const TutorialHandler = require('../Tutorial/TutorialHandler')
-const OnboardingDataCollectionManager = require('../OnboardingDataCollection/OnboardingDataCollectionManager')
 const UserUpdater = require('../User/UserUpdater')
 const Modules = require('../../infrastructure/Modules')
 const UserGetter = require('../User/UserGetter')
@@ -349,7 +348,6 @@ const _ProjectController = {
       !anonymous && 'writefull-oauth-promotion',
       'hotjar',
       'editor-redesign',
-      'paywall-change-compile-timeout',
       'overleaf-assist-bundle',
       'word-count-client',
       'editor-popup-ux-survey',
@@ -404,13 +402,6 @@ const _ProjectController = {
               userId,
               projectId
             ),
-          odcRole: OnboardingDataCollectionManager.getOnboardingDataValue(
-            userId,
-            'role'
-          ).catch(err => {
-            logger.error({ err, userId })
-            return null
-          }),
         })
       )
     const splitTestAssignments = {}
@@ -463,7 +454,6 @@ const _ProjectController = {
         subscription,
         isTokenMember,
         isInvitedMember,
-        odcRole,
       } = userValues
 
       const brandVariation = project?.brandVariationId
@@ -745,14 +735,6 @@ const _ProjectController = {
         fullFeatureSet = await UserGetter.promises.getUserFeatures(userId)
       }
 
-      const isPaywallChangeCompileTimeoutEnabled =
-        splitTestAssignments['paywall-change-compile-timeout']?.variant ===
-        'enabled'
-
-      const paywallPlans =
-        isPaywallChangeCompileTimeoutEnabled &&
-        (await ProjectController._getPaywallPlansPrices(req, res))
-
       const customerIoEnabled =
         await SplitTestHandler.promises.hasUserBeenAssignedToVariant(
           req,
@@ -873,17 +855,9 @@ const _ProjectController = {
         fixedSizeDocument: true,
         hasTrackChangesFeature: Features.hasFeature('track-changes'),
         projectTags,
-        odcRole:
-          // only use the ODC role value if the split test is enabled
-          splitTestAssignments['paywall-change-compile-timeout']?.variant ===
-          'enabled'
-            ? odcRole
-            : null,
         isSaas: Features.hasFeature('saas'),
         shouldLoadHotjar: splitTestAssignments.hotjar?.variant === 'enabled',
-        isPaywallChangeCompileTimeoutEnabled,
         isOverleafAssistBundleEnabled,
-        paywallPlans,
         customerIoEnabled,
         addonPrices,
         compileSettings: {
diff --git a/services/web/app/views/project/editor/_meta.pug b/services/web/app/views/project/editor/_meta.pug
index 4c49fc4cc7..9eca3a5b69 100644
--- a/services/web/app/views/project/editor/_meta.pug
+++ b/services/web/app/views/project/editor/_meta.pug
@@ -40,13 +40,8 @@ meta(name="ol-projectTags" data-type="json" content=projectTags)
 meta(name="ol-ro-mirror-on-client-no-local-storage" data-type="boolean" content=roMirrorOnClientNoLocalStorage)
 meta(name="ol-isSaas" data-type="boolean" content=isSaas)
 meta(name="ol-shouldLoadHotjar" data-type="boolean" content=shouldLoadHotjar)
-meta(name="ol-odcRole" data-type="string" content=odcRole)
-meta(name="ol-isPaywallChangeCompileTimeoutEnabled" data-type="boolean" content=isPaywallChangeCompileTimeoutEnabled)
 meta(name='ol-customerIoEnabled' data-type="boolean" content=customerIoEnabled)
 meta(name='ol-compileSettings' data-type="json" content=compileSettings)
-if(isPaywallChangeCompileTimeoutEnabled)
-	//- expose plans info to show prices in paywall-change-compile-timeout test 
-	meta(name="ol-paywallPlans", data-type="json" content=paywallPlans)
 if(isOverleafAssistBundleEnabled)
 	//- expose plans info to show prices in paywall-change-compile-timeout test 
 	meta(name="ol-addonPrices", data-type="json" content=addonPrices)
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index e0f03dcc99..9976c9087e 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -523,7 +523,6 @@
   "enable_single_sign_on": "",
   "enable_sso": "",
   "enable_stop_on_first_error_under_recompile_dropdown_menu": "",
-  "enable_stop_on_first_error_under_recompile_dropdown_menu_v2": "",
   "enabled": "",
   "enables_real_time_syntax_checking_in_the_editor": "",
   "enabling": "",
@@ -898,7 +897,6 @@
   "language": "",
   "language_suggestions": "",
   "large_or_high-resolution_images_taking_too_long": "",
-  "large_or_high_resolution_images_taking_too_long_to_process": "",
   "last_active": "",
   "last_active_description": "",
   "last_edit": "",
@@ -921,7 +919,6 @@
   "learn_more": "",
   "learn_more_about": "",
   "learn_more_about_account": "",
-  "learn_more_about_compile_timeouts": "",
   "learn_more_about_link_sharing": "",
   "learn_more_about_managed_users": "",
   "learn_more_about_other_causes_of_compile_timeouts": "",
@@ -1296,7 +1293,6 @@
   "professional": "",
   "progress_bar_percentage": "",
   "project_approaching_file_limit": "",
-  "project_failed_to_compile": "",
   "project_figure_modal": "",
   "project_files": "",
   "project_flagged_too_many_compiles": "",
@@ -1805,7 +1801,6 @@
   "this_project_has_more_than_max_collabs": "",
   "this_project_is_public": "",
   "this_project_is_public_read_only": "",
-  "this_project_need_more_time_to_compile": "",
   "this_project_will_appear_in_your_dropbox_folder_at": "",
   "this_tool_helps_you_insert_figures": "",
   "this_tool_helps_you_insert_simple_tables_into_your_project_without_writing_latex_code_give_feedback": "",
@@ -1990,7 +1985,6 @@
   "upgrade_to_add_more_collaborators_and_access_collaboration_features": "",
   "upgrade_to_get_feature": "",
   "upgrade_to_review": "",
-  "upgrade_to_unlock_more_time": "",
   "upgrade_your_subscription": "",
   "upload": "",
   "upload_file": "",
@@ -2195,7 +2189,6 @@
   "your_project_exceeded_collaborator_limit": "",
   "your_project_exceeded_compile_timeout_limit_on_free_plan": "",
   "your_project_near_compile_timeout_limit": "",
-  "your_project_need_more_time_to_compile": "",
   "your_projects": "",
   "your_role": "",
   "your_subscription": "",
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
index afd4401cbe..f9f91c84fa 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-logs-viewer.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next'
-import { memo, useState } from 'react'
+import { memo } from 'react'
 import classnames from 'classnames'
 import PdfValidationIssue from './pdf-validation-issue'
 import StopOnFirstErrorPrompt from './stop-on-first-error-prompt'
@@ -14,7 +14,6 @@ import PdfCodeCheckFailedNotice from './pdf-code-check-failed-notice'
 import { useDetachCompileContext as useCompileContext } from '../../../shared/context/detach-compile-context'
 import PdfLogEntry from './pdf-log-entry'
 import { usePdfPreviewContext } from '@/features/pdf-preview/components/pdf-preview-provider'
-import TimeoutUpgradePaywallPrompt from './timeout-upgrade-paywall-prompt'
 import getMeta from '@/utils/meta'
 
 function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
@@ -26,7 +25,6 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
     validationIssues,
     showLogs,
     stoppedOnFirstError,
-    isProjectOwner,
   } = useCompileContext()
 
   const { loadingError } = usePdfPreviewContext()
@@ -35,17 +33,6 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
 
   const { t } = useTranslation()
 
-  const [
-    isShowingPrimaryCompileTimeoutPaywall,
-    setIsShowingPrimaryCompileTimeoutPaywall,
-  ] = useState(false)
-  const isPaywallChangeCompileTimeoutEnabled = getMeta(
-    'ol-isPaywallChangeCompileTimeoutEnabled'
-  )
-
-  const isCompileTimeoutPaywallDisplay =
-    isProjectOwner && isPaywallChangeCompileTimeoutEnabled
-
   return (
     <div
       className={classnames('logs-pane', {
@@ -61,13 +48,7 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
         {loadingError && <PdfPreviewError error="pdf-viewer-loading-error" />}
 
         {compileTimeout < 60 && error === 'timedout' ? (
-          isCompileTimeoutPaywallDisplay ? (
-            <TimeoutUpgradePaywallPrompt
-              setIsShowingPrimary={setIsShowingPrimaryCompileTimeoutPaywall}
-            />
-          ) : (
-            <TimeoutUpgradePromptNew />
-          )
+          <TimeoutUpgradePromptNew />
         ) : (
           <>{error && <PdfPreviewError error={error} />}</>
         )}
@@ -93,12 +74,10 @@ function PdfLogsViewer({ alwaysVisible = false }: { alwaysVisible?: boolean }) {
           />
         )}
 
-        {!isShowingPrimaryCompileTimeoutPaywall && (
-          <div className="logs-pane-actions">
-            <PdfClearCacheButton />
-            <PdfDownloadFilesButton />
-          </div>
-        )}
+        <div className="logs-pane-actions">
+          <PdfClearCacheButton />
+          <PdfDownloadFilesButton />
+        </div>
       </div>
     </div>
   )
diff --git a/services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx b/services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx
deleted file mode 100644
index 64ef0fbfc1..0000000000
--- a/services/web/frontend/js/features/pdf-preview/components/timeout-message-after-paywall-dismissal.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-import getMeta from '@/utils/meta'
-import { Trans, useTranslation } from 'react-i18next'
-import { memo, useMemo } from 'react'
-import { useDetachCompileContext } from '@/shared/context/detach-compile-context'
-import StartFreeTrialButton from '@/shared/components/start-free-trial-button'
-import MaterialIcon from '@/shared/components/material-icon'
-import * as eventTracking from '@/infrastructure/event-tracking'
-import PdfLogEntry from './pdf-log-entry'
-
-type TimeoutMessageProps = {
-  segmentation?: eventTracking.Segmentation
-}
-
-function TimeoutMessageAfterPaywallDismissal({
-  segmentation,
-}: TimeoutMessageProps) {
-  const { lastCompileOptions, isProjectOwner } = useDetachCompileContext()
-  return (
-    <div className="website-redesign timeout-upgrade-paywall-prompt">
-      <CompileTimeout
-        isProjectOwner={isProjectOwner}
-        segmentation={segmentation}
-      />
-      {getMeta('ol-ExposedSettings').enableSubscriptions && (
-        <PreventTimeoutHelpMessage
-          lastCompileOptions={lastCompileOptions}
-          segmentation={segmentation}
-        />
-      )}
-    </div>
-  )
-}
-
-type CompileTimeoutProps = {
-  isProjectOwner: boolean
-  segmentation?: eventTracking.Segmentation
-}
-
-const CompileTimeout = memo(function CompileTimeout({
-  isProjectOwner,
-  segmentation,
-}: CompileTimeoutProps) {
-  const { t } = useTranslation()
-
-  const eventSegmentation = useMemo(
-    () => ({
-      ...segmentation,
-      'paywall-version': 'secondary',
-    }),
-    [segmentation]
-  )
-
-  return (
-    <PdfLogEntry
-      headerTitle={t('project_failed_to_compile')}
-      headerIcon={
-        <MaterialIcon
-          type="error"
-          className="log-entry-header-title"
-          size="2x"
-          unfilled
-        />
-      }
-      formattedContent={
-        getMeta('ol-ExposedSettings').enableSubscriptions && (
-          <>
-            <p className="compile-timeout-message">
-              {isProjectOwner ? (
-                <div>
-                  <p>{t('your_project_need_more_time_to_compile')}</p>
-                  <p>{t('upgrade_to_unlock_more_time')}</p>
-                </div>
-              ) : (
-                <div>
-                  <p>{t('this_project_need_more_time_to_compile')}</p>
-                  <p>{t('upgrade_to_unlock_more_time')}</p>
-                </div>
-              )}
-            </p>
-
-            {isProjectOwner === false && (
-              <Trans
-                i18nKey="tell_the_project_owner_and_ask_them_to_upgrade"
-                components={[
-                  // eslint-disable-next-line react/jsx-key
-                  <strong />,
-                ]}
-              />
-            )}
-
-            {isProjectOwner && (
-              <div className="log-entry-cta-container">
-                <StartFreeTrialButton
-                  source="compile-timeout"
-                  buttonProps={{ variant: 'secondary' }}
-                  segmentation={eventSegmentation}
-                >
-                  {t('try_for_free')}
-                </StartFreeTrialButton>
-              </div>
-            )}
-          </>
-        )
-      }
-      // @ts-ignore
-      entryAriaLabel={t('your_compile_timed_out')}
-      level="error"
-    />
-  )
-})
-
-type PreventTimeoutHelpMessageProps = {
-  lastCompileOptions: any
-  segmentation?: eventTracking.Segmentation
-}
-
-const PreventTimeoutHelpMessage = memo(function PreventTimeoutHelpMessage({
-  lastCompileOptions,
-  segmentation,
-}: PreventTimeoutHelpMessageProps) {
-  const { t } = useTranslation()
-
-  function sendInfoClickEvent() {
-    eventTracking.sendMB('paywall-info-click', {
-      'paywall-type': 'compile-timeout',
-      content: 'blog',
-      ...segmentation,
-    })
-  }
-
-  const compileTimeoutChangesBlogLink = (
-    /* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
-    <a
-      aria-label={t('read_more_about_free_compile_timeouts_servers')}
-      href="/blog/changes-to-free-compile-timeout"
-      rel="noopener noreferrer"
-      target="_blank"
-      onClick={sendInfoClickEvent}
-    />
-  )
-
-  return (
-    <PdfLogEntry
-      headerTitle={t('reasons_for_compile_timeouts')}
-      formattedContent={
-        <>
-          {segmentation?.['10s-timeout-warning'] === 'enabled' && (
-            <p>
-              <em>
-                <Trans
-                  i18nKey="were_reducing_compile_timeout"
-                  components={[compileTimeoutChangesBlogLink]}
-                />
-              </em>
-            </p>
-          )}
-          <p>{t('common_causes_of_compile_timeouts_include')}:</p>
-          <ul>
-            <li>
-              {t('large_or_high_resolution_images_taking_too_long_to_process')}
-            </li>
-            <li>
-              <Trans
-                i18nKey="a_fatal_compile_error_that_completely_blocks_compilation"
-                components={[
-                  // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
-                  <a
-                    href="/learn/how-to/Fixing_and_preventing_compile_timeouts#Step_3:_Assess_your_project_for_time-consuming_tasks_and_fatal_errors"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  />,
-                ]}
-              />
-              {!lastCompileOptions.stopOnFirstError && (
-                <>
-                  {' '}
-                  <Trans
-                    i18nKey="enable_stop_on_first_error_under_recompile_dropdown_menu_v2"
-                    components={[
-                      // eslint-disable-next-line react/jsx-key
-                      <strong className="log-bold-text" />,
-                      // eslint-disable-next-line react/jsx-key
-                      <strong className="log-bold-text" />,
-                    ]}
-                  />{' '}
-                </>
-              )}
-            </li>
-          </ul>
-          <p className="mb-0">
-            <Trans
-              i18nKey="learn_more_about_compile_timeouts"
-              components={[
-                // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
-                <a
-                  href="/learn/how-to/Fixing_and_preventing_compile_timeouts"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                />,
-              ]}
-            />
-          </p>
-        </>
-      }
-      // @ts-ignore
-      entryAriaLabel={t('reasons_for_compile_timeouts')}
-      level="raw"
-    />
-  )
-})
-
-export default memo(TimeoutMessageAfterPaywallDismissal)
diff --git a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx b/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx
deleted file mode 100644
index db01b0da7a..0000000000
--- a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-paywall-prompt.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import {
-  Dispatch,
-  SetStateAction,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react'
-import getMeta from '@/utils/meta'
-import * as eventTracking from '@/infrastructure/event-tracking'
-import TimeoutMessageAfterPaywallDismissal from './timeout-message-after-paywall-dismissal'
-import { UpgradePrompt } from '@/shared/components/upgrade-prompt'
-import { useDetachCompileContext } from '@/shared/context/detach-compile-context'
-
-const studentRoles = [
-  'High-school student',
-  'Undergraduate student',
-  "Master's student (e.g. MSc, MA)",
-  'Doctoral student (e.g. PhD, MD, EngD)',
-]
-
-interface TimeoutUpgradePaywallPromptProps {
-  setIsShowingPrimary?: Dispatch<SetStateAction<boolean>>
-}
-
-function TimeoutUpgradePaywallPrompt({
-  setIsShowingPrimary,
-}: TimeoutUpgradePaywallPromptProps) {
-  const odcRole = getMeta('ol-odcRole')
-  const planPrices = getMeta('ol-paywallPlans')
-  const isStudent = useMemo(() => studentRoles.includes(odcRole), [odcRole])
-  const { isProjectOwner } = useDetachCompileContext()
-
-  const [isPaywallDismissed, setIsPaywallDismissed] = useState<boolean>(false)
-  const { reducedTimeoutWarning, compileTimeout } =
-    getMeta('ol-compileSettings')
-
-  const sharedSegmentation = useMemo(
-    () => ({
-      '10s-timeout-warning': reducedTimeoutWarning,
-      'is-owner': isProjectOwner,
-      compileTime: compileTimeout,
-    }),
-    [isProjectOwner, reducedTimeoutWarning, compileTimeout]
-  )
-
-  const sendPaywallEvent = useCallback(
-    (event: string, segmentation?: eventTracking.Segmentation) => {
-      eventTracking.sendMB(event, {
-        'paywall-type': 'compile-timeout',
-        'paywall-version': 'primary',
-        ...sharedSegmentation,
-        ...segmentation,
-      })
-    },
-    [sharedSegmentation]
-  )
-
-  function onClose() {
-    sendPaywallEvent('paywall-dismiss')
-    setIsPaywallDismissed(true)
-    if (setIsShowingPrimary) {
-      setIsShowingPrimary(false)
-    }
-  }
-
-  function onClickInfoLink() {
-    sendPaywallEvent('paywall-info-click', { content: 'plans' })
-  }
-
-  function onClickPaywall() {
-    sendPaywallEvent('paywall-click', {
-      plan: isStudent ? 'student' : 'collaborator',
-    })
-  }
-
-  useEffect(() => {
-    sendPaywallEvent('paywall-prompt', {
-      plan: isStudent ? 'student' : 'collaborator',
-    })
-    if (setIsShowingPrimary) {
-      setIsShowingPrimary(true)
-    }
-  }, [isStudent, setIsShowingPrimary, sendPaywallEvent])
-
-  return (
-    <div>
-      {!isPaywallDismissed ? (
-        <UpgradePrompt
-          title="Unlock more compile time"
-          summary="Your project took too long to compile and timed out."
-          onClose={onClose}
-          planPricing={{
-            student: planPrices?.student,
-            standard: planPrices?.collaborator,
-          }}
-          itmCampaign="compile-timeout"
-          isStudent={isStudent}
-          onClickInfoLink={onClickInfoLink}
-          onClickPaywall={onClickPaywall}
-        />
-      ) : (
-        <TimeoutMessageAfterPaywallDismissal
-          segmentation={sharedSegmentation}
-        />
-      )}
-    </div>
-  )
-}
-
-export default TimeoutUpgradePaywallPrompt
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index f8da39f909..849c7eb4c1 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -146,7 +146,6 @@ export interface Meta {
   'ol-isCollectionMethodManual': boolean
   'ol-isExternalAuthenticationSystemUsed': boolean
   'ol-isManagedAccount': boolean
-  'ol-isPaywallChangeCompileTimeoutEnabled': boolean
   'ol-isProfessional': boolean
   'ol-isRegisteredViaGoogle': boolean
   'ol-isRestrictedTokenMember': boolean
@@ -180,7 +179,6 @@ export interface Meta {
   'ol-notificationsInstitution': InstitutionType[]
   'ol-oauthProviders': OAuthProviders
   'ol-odcData': OnboardingFormData
-  'ol-odcRole': string
   'ol-overallThemes': OverallThemeMeta[]
   'ol-pages': number
   'ol-passwordStrengthOptions': PasswordStrengthOptions
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 9d5c2ac9b6..e695b90350 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -677,7 +677,6 @@
   "enable_single_sign_on": "Enable single sign-on",
   "enable_sso": "Enable SSO",
   "enable_stop_on_first_error_under_recompile_dropdown_menu": "Enable <0>“Stop on first error”</0> under the <1>Recompile</1> drop-down menu to help you find and fix errors right away.",
-  "enable_stop_on_first_error_under_recompile_dropdown_menu_v2": "Enable <0>Stop on first error</0> under the <1>Recompile</1> drop-down menu to help you find and fix errors right away.",
   "enabled": "Enabled",
   "enables_real_time_syntax_checking_in_the_editor": "Enables real-time syntax checking in the editor",
   "enabling": "Enabling",
@@ -1166,7 +1165,6 @@
   "language": "Language",
   "language_suggestions": "Language suggestions",
   "large_or_high-resolution_images_taking_too_long": "Large or high-resolution images taking too long to process. You may be able to <0>optimize them</0>.",
-  "large_or_high_resolution_images_taking_too_long_to_process": "Large or high-resolution images taking too long to process.",
   "last_active": "Last Active",
   "last_active_description": "Last time a project was opened.",
   "last_edit": "Last edit",
@@ -1201,7 +1199,6 @@
   "learn_more": "Learn more",
   "learn_more_about": "Learn more about __appName__",
   "learn_more_about_account": "<0>Learn more</0> about managing your __appName__ account.",
-  "learn_more_about_compile_timeouts": "<0>Learn more</0> about compile timeouts.",
   "learn_more_about_emails": "<0>Learn more</0> about managing your __appName__ emails.",
   "learn_more_about_link_sharing": "Learn more about Link Sharing",
   "learn_more_about_managed_users": "Learn more about Managed Users.",
@@ -1712,7 +1709,6 @@
   "progress_bar_percentage": "Progress bar from 0 to 100%",
   "project": "project",
   "project_approaching_file_limit": "This project is approaching the file limit",
-  "project_failed_to_compile": "Your project failed to compile",
   "project_figure_modal": "Project",
   "project_files": "Project files",
   "project_flagged_too_many_compiles": "This project has been flagged for compiling too often. The limit will be lifted shortly.",
@@ -2331,7 +2327,6 @@
   "this_project_has_more_than_max_collabs": "This project has more than the maximum number of collaborators allowed on the project owner’s Overleaf plan. This means you could lose edit access from __linkSharingDate__.",
   "this_project_is_public": "This project is public and can be edited by anyone with the URL.",
   "this_project_is_public_read_only": "This project is public and can be viewed but not edited by anyone with the URL",
-  "this_project_need_more_time_to_compile": "It looks like this project may need more time to compile than our free plan allows.",
   "this_project_will_appear_in_your_dropbox_folder_at": "This project will appear in your Dropbox folder at ",
   "this_tool_helps_you_insert_figures": "This tool helps you insert figures into your project without needing to write the LaTeX code. The following information explains more about the options in the tool and how to further customize your figures.",
   "this_tool_helps_you_insert_simple_tables_into_your_project_without_writing_latex_code_give_feedback": "This tool helps you insert simple tables into your project without writing LaTeX code. This tool is new, so please <0>give us feedback</0> and look out for additional functionality coming soon.",
@@ -2527,7 +2522,6 @@
   "upgrade_to_add_more_collaborators_and_access_collaboration_features": "Upgrade to add more collaborators and access collaboration features like track changes and full project history.",
   "upgrade_to_get_feature": "Upgrade to get __feature__, plus:",
   "upgrade_to_review": "Upgrade to Review",
-  "upgrade_to_unlock_more_time": "Upgrade now to unlock 24x more compile time on our fastest servers.",
   "upgrade_your_subscription": "Upgrade your subscription",
   "upload": "Upload",
   "upload_failed": "Upload failed",
@@ -2756,7 +2750,6 @@
   "your_project_exceeded_collaborator_limit": "Your project exceeded the collaborator limit and access levels were changed. Select a new access level for your collaborators, or upgrade to add more editors or reviewers.",
   "your_project_exceeded_compile_timeout_limit_on_free_plan": "Your project exceeded the compile timeout limit on our free plan.",
   "your_project_near_compile_timeout_limit": "Your project is near the compile timeout limit for our free plan.",
-  "your_project_need_more_time_to_compile": "It looks like your project may need more time to compile than our free plan allows.",
   "your_projects": "Your projects",
   "your_questions_answered": "Your questions answered",
   "your_role": "Your role",

From 349fb62f606398bebfedfa8190ed23a96035b517 Mon Sep 17 00:00:00 2001
From: Davinder Singh <davibaweja@gmail.com>
Date: Wed, 9 Jul 2025 11:19:59 +0100
Subject: [PATCH 153/274] adding a specific class for quote to avoid overriding
 general blockquote tag (#26987)

GitOrigin-RevId: 046322bdc05b9322ede5920af2b829beca0bc0d2
---
 .../stylesheets/bootstrap-5/pages/website-redesign.scss         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
index 649e5d80a4..2aecaa8390 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/website-redesign.scss
@@ -673,7 +673,7 @@
   }
 
   // most of these are here to replace rules from core/type.less
-  blockquote {
+  blockquote.cms-quote {
     @include heading-lg;
 
     border-left: none;

From 9237d8227b4c0cadf985ca643c4c8ad6270110b4 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 9 Jul 2025 11:20:08 +0100
Subject: [PATCH 154/274] Merge pull request #26972 from
 overleaf/dp-file-tree-icons

Improvements to file tree icon buttons

GitOrigin-RevId: a27b25e11c90f1b833fac0f5ce2c1cb8d0cedb8c
---
 ...alSymbolsRoundedUnfilledPartialSlice.woff2 | Bin 5036 -> 5112 bytes
 .../material-symbols/unfilled-symbols.mjs     |   1 +
 .../file-tree/file-tree-action-buttons.tsx    |   2 +-
 .../bootstrap-5/pages/editor/file-tree.scss   |   4 ----
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2
index a507329c8e0f8aa9241dd20c7d7447cccf8caff3..baac847d54d56c1d17754de133b9f630c59170fc 100644
GIT binary patch
literal 5112
zcmV<U69?>fPew8T0RR9102BBC4gdfE04jt4028190RR9100000000000000000000
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
a6`@uI((pt$3(T5TbfN~HWk~vu65{})JF;8=

literal 5036
zcmV;d6I1MWPew8T0RR91028bL4gdfE04byZ025RI0RR9100000000000000000000
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
Cd2(X_

diff --git a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
index 222be1fd36..b2c1f72eaf 100644
--- a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
+++ b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
@@ -30,6 +30,7 @@ export default /** @type {const} */ ([
   'table_chart',
   'thumb_down',
   'thumb_up',
+  'upload',
   'upload_file',
   'web_asset',
 ])
diff --git a/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx b/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
index 93760b97ab..59e06b00ef 100644
--- a/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
@@ -91,7 +91,7 @@ export default function FileTreeActionButtons() {
           id="upload"
           description={t('upload')}
           onClick={uploadWithAnalytics}
-          iconType="upload_file"
+          iconType="upload"
         />
       )}
       {canBulkDelete && (
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/file-tree.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/file-tree.scss
index 39eb3f2d34..5caabc5889 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/file-tree.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/file-tree.scss
@@ -107,10 +107,6 @@
     &:active {
       color: var(--file-tree-expand-button-color);
     }
-
-    .material-symbols {
-      font-size: 16px;
-    }
   }
 
   .file-tree {

From 905cc5d45f0e87fc3ea4e68b9b12e005f1149178 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Wed, 9 Jul 2025 11:20:47 +0100
Subject: [PATCH 155/274] Move project context out of scope value store
 (#26615)

* Refactor project context to not use scope store

* Fix Cypress tests for project context changes

* Fix frontend React Testing Library tests for project context changes

* Remove redundant code

* Fix some project types in tests

* Remove unused import and fix a type

* Throw an error if updating the project in the project context before joining the project

* Fix some review panel tests

* Remove unused imports

GitOrigin-RevId: 2f0c928b651f387aa980c29aef7d1ba0649790a7
---
 .../js/features/chat/context/chat-context.tsx |   2 +-
 .../editor-clone-project-modal-wrapper.tsx    |  12 +-
 .../components/download-pdf.tsx               |   2 +-
 .../components/download-source.tsx            |   2 +-
 ...-project-wide-settings-socket-listener.tsx |  18 +-
 .../hooks/use-project-wide-settings.tsx       |   4 +-
 .../hooks/use-root-doc-id.tsx                 |   6 +-
 .../hooks/use-save-project-settings.tsx       |  16 +-
 .../hooks/use-set-spell-check-language.tsx    |  13 +-
 .../js/features/editor-left-menu/utils/api.ts |   2 +-
 .../file-tree-upload-conflicts.tsx            |   2 +-
 .../modes/file-tree-import-from-project.tsx   |   2 +-
 .../modes/file-tree-upload-doc.tsx            |   2 +-
 .../file-tree-create/redirect-to-login.tsx    |   2 +-
 .../file-tree-item-menu-items.tsx             |   7 +-
 .../file-tree/components/file-tree-root.tsx   |   2 +-
 .../contexts/file-tree-actionable.tsx         |   2 +-
 .../contexts/file-tree-selectable.tsx         |   3 +-
 .../file-view/components/file-view-header.tsx |   2 +-
 .../file-view/components/file-view-image.tsx  |   2 +-
 .../components/file-view-refresh-button.tsx   |   2 +-
 .../file-view/components/file-view-text.tsx   |   2 +-
 .../history/context/history-context.tsx       |   9 +-
 .../context/file-tree-open-context.tsx        |  10 +-
 .../ide-react/context/ide-react-context.tsx   |  41 +-
 .../ide-react/context/outline-context.tsx     |   2 +-
 .../ide-react/context/permissions-context.tsx |   6 +-
 .../ide-react/context/react-context-root.tsx  |  16 +-
 .../ide-react/context/snapshot-context.tsx    |   2 +-
 .../ide-react/hooks/use-socket-listeners.ts   |  44 +-
 .../components/toolbar/download-project.tsx   |   4 +-
 .../components/pdf-hybrid-download-button.tsx |   2 +-
 .../pdf-preview/components/pdf-js-viewer.tsx  |   2 +-
 .../features/pdf-preview/hooks/use-synctex.ts |   3 +-
 .../components/review-mode-switcher.tsx       |   8 +-
 .../upgrade-track-changes-modal.tsx           |   6 +-
 .../context/changes-users-context.tsx         |   6 +-
 .../context/threads-context.tsx               |   2 +-
 .../context/track-changes-state-context.tsx   |  16 +-
 .../hooks/use-overview-file-collapsed.ts      |   2 +-
 .../hooks/use-project-ranges.ts               |   2 +-
 .../components/add-collaborators.tsx          |  19 +-
 .../components/edit-member.tsx                |  21 +-
 .../components/editor-over-limit-modal.tsx    |  10 +-
 .../share-project-modal/components/invite.tsx |  20 +-
 .../components/link-sharing.tsx               |   7 +-
 .../components/member-privileges.tsx          |   4 +-
 .../components/owner-info.tsx                 |   4 +-
 .../components/send-invites-notice.tsx        |   3 +-
 .../components/share-modal-body.tsx           |  29 +-
 .../components/share-project-modal.tsx        |  21 +-
 .../components/transfer-ownership-modal.tsx   |   6 +-
 .../components/view-member.tsx                |   8 +-
 .../components/view-only-access-modal.tsx     |   3 +-
 .../figure-modal-other-project-source.tsx     |   2 +-
 .../figure-modal-upload-source.tsx            |   2 +-
 .../file-sources/figure-modal-url-source.tsx  |   2 +-
 .../hooks/use-codemirror-scope.ts             |  10 +-
 .../components/word-count-client.tsx          |   3 +-
 .../components/word-count-server.tsx          |   2 +-
 .../js/shared/context/editor-context.tsx      |  62 ++-
 .../shared/context/file-tree-data-context.tsx |   7 +-
 .../shared/context/local-compile-context.tsx  |   9 +-
 .../js/shared/context/project-context.tsx     | 123 +++---
 ...oject-context.tsx => project-metadata.tsx} |  22 +-
 .../shared/hooks/use-stop-on-first-error.ts   |   2 +-
 .../editor-left-menu.spec.tsx                 |  76 ++--
 .../pdf-preview/pdf-preview.spec.tsx          |   3 +-
 .../components/clone-project-modal.test.jsx   |  14 +-
 .../review-panel/review-panel.spec.tsx        |  34 +-
 .../components/share-project-modal.test.jsx   | 377 ++++++++----------
 .../codemirror-editor-autocomplete.spec.tsx   |   3 -
 .../codemirror-editor-figure-modal.spec.tsx   |   9 +
 ...mirror-editor-spellchecker-client.spec.tsx |  13 +-
 ...ror-editor-visual-command-tooltip.spec.tsx |   5 +
 .../codemirror-editor-visual-list.spec.tsx    |   4 +
 .../source-editor/helpers/mock-project.ts     |  78 ++++
 .../source-editor/helpers/mock-scope.ts       |  61 +--
 .../frontend/helpers/editor-providers.tsx     | 141 +++++--
 79 files changed, 806 insertions(+), 703 deletions(-)
 rename services/web/frontend/js/shared/context/types/{project-context.tsx => project-metadata.tsx} (65%)
 create mode 100644 services/web/test/frontend/features/source-editor/helpers/mock-project.ts

diff --git a/services/web/frontend/js/features/chat/context/chat-context.tsx b/services/web/frontend/js/features/chat/context/chat-context.tsx
index b7a8a2c80d..2ef6fc9af3 100644
--- a/services/web/frontend/js/features/chat/context/chat-context.tsx
+++ b/services/web/frontend/js/features/chat/context/chat-context.tsx
@@ -200,7 +200,7 @@ export const ChatProvider: FC<React.PropsWithChildren> = ({ children }) => {
     clientId.current = chatClientIdGenerator.generate()
   }
   const user = useUserContext()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const { chatIsOpen: chatIsOpenOldEditor } = useLayoutContext()
   const { selectedTab: selectedRailTab, isOpen: railIsOpen } = useRailContext()
diff --git a/services/web/frontend/js/features/clone-project-modal/components/editor-clone-project-modal-wrapper.tsx b/services/web/frontend/js/features/clone-project-modal/components/editor-clone-project-modal-wrapper.tsx
index aba9a87fbc..cae44dc1e0 100644
--- a/services/web/frontend/js/features/clone-project-modal/components/editor-clone-project-modal-wrapper.tsx
+++ b/services/web/frontend/js/features/clone-project-modal/components/editor-clone-project-modal-wrapper.tsx
@@ -13,13 +13,9 @@ const EditorCloneProjectModalWrapper = React.memo(
     handleHide: () => void
     openProject: ({ project_id }: { project_id: string }) => void
   }) {
-    const {
-      _id: projectId,
-      name: projectName,
-      tags: projectTags,
-    } = useProjectContext()
+    const { project, tags: projectTags } = useProjectContext()
 
-    if (!projectName) {
+    if (!project) {
       // wait for useProjectContext
       return null
     } else {
@@ -28,8 +24,8 @@ const EditorCloneProjectModalWrapper = React.memo(
           handleHide={handleHide}
           show={show}
           handleAfterCloned={openProject}
-          projectId={projectId}
-          projectName={projectName}
+          projectId={project._id}
+          projectName={project.name}
           projectTags={projectTags}
         />
       )
diff --git a/services/web/frontend/js/features/editor-left-menu/components/download-pdf.tsx b/services/web/frontend/js/features/editor-left-menu/components/download-pdf.tsx
index 31e9073743..406c2b4cc5 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/download-pdf.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/download-pdf.tsx
@@ -9,7 +9,7 @@ import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 export default function DownloadPDF() {
   const { t } = useTranslation()
   const { pdfDownloadUrl, pdfUrl } = useCompileContext()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   function sendDownloadEvent() {
     eventTracking.sendMB('download-pdf-button-click', {
diff --git a/services/web/frontend/js/features/editor-left-menu/components/download-source.tsx b/services/web/frontend/js/features/editor-left-menu/components/download-source.tsx
index 6b25b2a28d..9c9e4b2471 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/download-source.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/download-source.tsx
@@ -6,7 +6,7 @@ import MaterialIcon from '@/shared/components/material-icon'
 
 export default function DownloadSource() {
   const { t } = useTranslation()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   function sendDownloadEvent() {
     eventTracking.sendMB('download-zip-button-click', {
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings-socket-listener.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings-socket-listener.tsx
index fde26a19d9..953084bd25 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings-socket-listener.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings-socket-listener.tsx
@@ -1,40 +1,38 @@
 import { useCallback, useEffect } from 'react'
 import { useIdeContext } from '../../../shared/context/ide-context'
-import useScopeValue from '../../../shared/hooks/use-scope-value'
+import { useProjectContext } from '@/shared/context/project-context'
 import type { ProjectSettings } from '../utils/api'
 
 export default function useProjectWideSettingsSocketListener() {
   const { socket } = useIdeContext()
 
-  const [project, setProject] = useScopeValue<ProjectSettings | undefined>(
-    'project'
-  )
+  const { project, updateProject } = useProjectContext()
 
   const setCompiler = useCallback(
     (compiler: ProjectSettings['compiler']) => {
       if (project) {
-        setProject({ ...project, compiler })
+        updateProject({ compiler })
       }
     },
-    [project, setProject]
+    [project, updateProject]
   )
 
   const setImageName = useCallback(
     (imageName: ProjectSettings['imageName']) => {
       if (project) {
-        setProject({ ...project, imageName })
+        updateProject({ imageName })
       }
     },
-    [project, setProject]
+    [project, updateProject]
   )
 
   const setSpellCheckLanguage = useCallback(
     (spellCheckLanguage: ProjectSettings['spellCheckLanguage']) => {
       if (project) {
-        setProject({ ...project, spellCheckLanguage })
+        updateProject({ spellCheckLanguage })
       }
     },
-    [project, setProject]
+    [project, updateProject]
   )
 
   useEffect(() => {
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings.tsx
index 3e569f2757..0226e87678 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-project-wide-settings.tsx
@@ -1,14 +1,14 @@
 import { useCallback } from 'react'
-import useScopeValue from '../../../shared/hooks/use-scope-value'
 import type { ProjectSettings } from '../utils/api'
 import useRootDocId from './use-root-doc-id'
 import useSaveProjectSettings from './use-save-project-settings'
 import useSetSpellCheckLanguage from './use-set-spell-check-language'
 import { debugConsole } from '@/utils/debugging'
+import { useProjectContext } from '@/shared/context/project-context'
 
 export default function useProjectWideSettings() {
   // The value will be undefined on mount
-  const [project] = useScopeValue<ProjectSettings | undefined>('project')
+  const { project } = useProjectContext()
   const saveProjectSettings = useSaveProjectSettings()
 
   const setCompiler = useCallback(
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
index 2d62431b77..632a3b3ce7 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-root-doc-id.tsx
@@ -1,12 +1,12 @@
 import { useCallback } from 'react'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
-import useScopeValue from '../../../shared/hooks/use-scope-value'
+import { useProjectContext } from '@/shared/context/project-context'
 import type { ProjectSettings } from '../utils/api'
 import useSaveProjectSettings from './use-save-project-settings'
 
 export default function useRootDocId() {
-  const [rootDocId] =
-    useScopeValue<ProjectSettings['rootDocId']>('project.rootDocId')
+  const { project } = useProjectContext()
+  const rootDocId = project?.rootDocId
   const { permissionsLevel } = useIdeReactContext()
   const saveProjectSettings = useSaveProjectSettings()
 
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx
index f34c506708..425cfee74b 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-save-project-settings.tsx
@@ -1,25 +1,21 @@
 import { type ProjectSettings, saveProjectSettings } from '../utils/api'
-import { useProjectContext } from '../../../shared/context/project-context'
-import useScopeValue from '../../../shared/hooks/use-scope-value'
+import { useProjectContext } from '@/shared/context/project-context'
 
 export default function useSaveProjectSettings() {
-  // projectSettings value will be undefined on mount
-  const [projectSettings, setProjectSettings] = useScopeValue<
-    ProjectSettings | undefined
-  >('project')
-  const { _id: projectId } = useProjectContext()
+  const { projectId, project, updateProject } = useProjectContext()
 
   return async (
     key: keyof ProjectSettings,
     newSetting: ProjectSettings[keyof ProjectSettings]
   ) => {
-    if (projectSettings) {
-      const currentSetting = projectSettings[key]
+    if (project) {
+      const currentSetting = project[key]
       if (currentSetting !== newSetting) {
         await saveProjectSettings(projectId, {
           [key]: newSetting,
         })
-        setProjectSettings({ ...projectSettings, [key]: newSetting })
+
+        updateProject({ [key]: newSetting })
       }
     }
   }
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-set-spell-check-language.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-set-spell-check-language.tsx
index 075b2106f3..51ea3673e3 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-set-spell-check-language.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-set-spell-check-language.tsx
@@ -1,12 +1,11 @@
 import { useCallback } from 'react'
-import useScopeValue from '../../../shared/hooks/use-scope-value'
+import { useProjectContext } from '@/shared/context/project-context'
 import { type ProjectSettings, saveUserSettings } from '../utils/api'
 import useSaveProjectSettings from './use-save-project-settings'
 
 export default function useSetSpellCheckLanguage() {
-  const [spellCheckLanguage, setSpellCheckLanguage] = useScopeValue<
-    ProjectSettings['spellCheckLanguage']
-  >('project.spellCheckLanguage')
+  const { project } = useProjectContext()
+  const spellCheckLanguage = project?.spellCheckLanguage
   const saveProjectSettings = useSaveProjectSettings()
 
   return useCallback(
@@ -16,10 +15,8 @@ export default function useSetSpellCheckLanguage() {
         newSpellCheckLanguage !== spellCheckLanguage
 
       if (allowUpdate) {
-        setSpellCheckLanguage(newSpellCheckLanguage)
-
         // Save project settings is created from hooks because it will save the value on
-        // both server-side and client-side (angular scope)
+        // both server-side and client-side (project context)
         saveProjectSettings('spellCheckLanguage', newSpellCheckLanguage)
 
         // For user settings, we only need to save it on server-side,
@@ -27,6 +24,6 @@ export default function useSetSpellCheckLanguage() {
         saveUserSettings('spellCheckLanguage', newSpellCheckLanguage)
       }
     },
-    [setSpellCheckLanguage, spellCheckLanguage, saveProjectSettings]
+    [spellCheckLanguage, saveProjectSettings]
   )
 }
diff --git a/services/web/frontend/js/features/editor-left-menu/utils/api.ts b/services/web/frontend/js/features/editor-left-menu/utils/api.ts
index 3954f7ea5c..122df91f8c 100644
--- a/services/web/frontend/js/features/editor-left-menu/utils/api.ts
+++ b/services/web/frontend/js/features/editor-left-menu/utils/api.ts
@@ -4,7 +4,7 @@ import { postJSON } from '../../../infrastructure/fetch-json'
 import { debugConsole } from '@/utils/debugging'
 import { UserSettings } from '../../../../../types/user-settings'
 
-export type ProjectSettings = {
+export interface ProjectSettings {
   compiler: ProjectCompiler
   imageName: string
   rootDocId: string
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-upload-conflicts.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-upload-conflicts.tsx
index 9d8a66122c..c582edef23 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-upload-conflicts.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-upload-conflicts.tsx
@@ -96,7 +96,7 @@ export function FolderUploadConflicts({
   setError: (error: string) => void
 }) {
   const { t } = useTranslation()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   // Don't allow overwriting files with a folder
   const hasFileConflict = conflicts.some(conflict => conflict.type === 'file')
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-import-from-project.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-import-from-project.tsx
index 7e02183641..8084043af8 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-import-from-project.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-import-from-project.tsx
@@ -191,7 +191,7 @@ function SelectProject({
   setSelectedProject,
 }: SelectProjectProps) {
   const { t } = useTranslation()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const { data, error, loading } = useUserProjects()
 
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx
index 909e1a1962..afd0bf3671 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-create/modes/file-tree-upload-doc.tsx
@@ -28,7 +28,7 @@ export default function FileTreeUploadDoc() {
   const { parentFolderId, cancel, droppedFiles, setDroppedFiles } =
     useFileTreeActionable()
   const { fileTreeData } = useFileTreeData()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const [error, setError] = useState<string>()
 
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-create/redirect-to-login.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-create/redirect-to-login.tsx
index ab32fcecdb..13ba08b86f 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-create/redirect-to-login.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-create/redirect-to-login.tsx
@@ -6,7 +6,7 @@ import { useLocation } from '../../../../shared/hooks/use-location'
 // handle "not-logged-in" errors by redirecting to the login page
 export default function RedirectToLogin() {
   const { t } = useTranslation()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const [secondsToRedirect, setSecondsToRedirect] = useState(10)
   const location = useLocation()
 
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-item/file-tree-item-menu-items.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-item/file-tree-item-menu-items.tsx
index 28f4a47c9b..571156a0a4 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-item/file-tree-item-menu-items.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-item/file-tree-item-menu-items.tsx
@@ -25,14 +25,15 @@ function FileTreeItemMenuItems() {
     selectedFileName,
   } = useFileTreeActionable()
 
-  const { owner } = useProjectContext()
+  const { project } = useProjectContext()
+  const projectOwner = project?.owner?._id
 
   const downloadWithAnalytics = useCallback(() => {
     // we are only interested in downloads of bib files WRT analytics, for the purposes of promoting the tpr integrations
     if (selectedFileName?.endsWith('.bib')) {
-      eventTracking.sendMB('download-bib-file', { projectOwner: owner._id })
+      eventTracking.sendMB('download-bib-file', { projectOwner })
     }
-  }, [selectedFileName, owner])
+  }, [selectedFileName, projectOwner])
 
   const createWithAnalytics = useCallback(() => {
     eventTracking.sendMB('new-file-click', { location: 'file-menu' })
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-root.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-root.tsx
index a6cde94e73..17ca5bf504 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-root.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-root.tsx
@@ -40,7 +40,7 @@ const FileTreeRoot = React.memo<{
 }) {
   const [fileTreeContainer, setFileTreeContainer] =
     useState<HTMLDivElement | null>(null)
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { fileTreeData } = useFileTreeData()
   const isReady = Boolean(projectId && fileTreeData)
   const newEditor = useIsNewEditorEnabled()
diff --git a/services/web/frontend/js/features/file-tree/contexts/file-tree-actionable.tsx b/services/web/frontend/js/features/file-tree/contexts/file-tree-actionable.tsx
index 54723e3e0d..1c144bcf80 100644
--- a/services/web/frontend/js/features/file-tree/contexts/file-tree-actionable.tsx
+++ b/services/web/frontend/js/features/file-tree/contexts/file-tree-actionable.tsx
@@ -222,7 +222,7 @@ function fileTreeActionableReducer(state: State, action: Action) {
 export const FileTreeActionableProvider: FC<React.PropsWithChildren> = ({
   children,
 }) => {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { fileTreeReadOnly } = useFileTreeData()
   const { indexAllReferences } = useReferencesContext()
   const { write } = usePermissionsContext()
diff --git a/services/web/frontend/js/features/file-tree/contexts/file-tree-selectable.tsx b/services/web/frontend/js/features/file-tree/contexts/file-tree-selectable.tsx
index edd1334169..9e0bfc71df 100644
--- a/services/web/frontend/js/features/file-tree/contexts/file-tree-selectable.tsx
+++ b/services/web/frontend/js/features/file-tree/contexts/file-tree-selectable.tsx
@@ -128,7 +128,8 @@ export const FileTreeSelectableProvider: FC<
     onSelect: (value: FindResult[]) => void
   }>
 > = ({ onSelect, children }) => {
-  const { _id: projectId, rootDocId } = useProjectContext()
+  const { projectId, project } = useProjectContext()
+  const rootDocId = project?.rootDocId
 
   const [initialSelectedEntityId] = usePersistedState(
     `doc.open_id.${projectId}`,
diff --git a/services/web/frontend/js/features/file-view/components/file-view-header.tsx b/services/web/frontend/js/features/file-view/components/file-view-header.tsx
index ca228a9304..0c9a218bc8 100644
--- a/services/web/frontend/js/features/file-view/components/file-view-header.tsx
+++ b/services/web/frontend/js/features/file-view/components/file-view-header.tsx
@@ -49,7 +49,7 @@ type FileViewHeaderProps = {
 }
 
 export default function FileViewHeader({ file }: FileViewHeaderProps) {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { fileTreeReadOnly } = useFileTreeData()
   const { t } = useTranslation()
 
diff --git a/services/web/frontend/js/features/file-view/components/file-view-image.tsx b/services/web/frontend/js/features/file-view/components/file-view-image.tsx
index 62a1fd0159..dfa117841d 100644
--- a/services/web/frontend/js/features/file-view/components/file-view-image.tsx
+++ b/services/web/frontend/js/features/file-view/components/file-view-image.tsx
@@ -11,7 +11,7 @@ export default function FileViewImage({
   onLoad: () => void
   onError: () => void
 }) {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   return (
     <img
       src={fileUrl(projectId, file.id, file.hash)}
diff --git a/services/web/frontend/js/features/file-view/components/file-view-refresh-button.tsx b/services/web/frontend/js/features/file-view/components/file-view-refresh-button.tsx
index 622e101ae6..eafe369500 100644
--- a/services/web/frontend/js/features/file-view/components/file-view-refresh-button.tsx
+++ b/services/web/frontend/js/features/file-view/components/file-view-refresh-button.tsx
@@ -31,7 +31,7 @@ export default function FileViewRefreshButton({
   setRefreshError,
   file,
 }: FileViewRefreshButtonProps) {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const [refreshing, setRefreshing] = useState(false)
   const isMountedRef = useIsMounted()
 
diff --git a/services/web/frontend/js/features/file-view/components/file-view-text.tsx b/services/web/frontend/js/features/file-view/components/file-view-text.tsx
index a94e7ec6c5..1b1d575300 100644
--- a/services/web/frontend/js/features/file-view/components/file-view-text.tsx
+++ b/services/web/frontend/js/features/file-view/components/file-view-text.tsx
@@ -16,7 +16,7 @@ export default function FileViewText({
   onLoad: () => void
   onError: () => void
 }) {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const [textPreview, setTextPreview] = useState('')
   const [shouldShowDots, setShouldShowDots] = useState(false)
diff --git a/services/web/frontend/js/features/history/context/history-context.tsx b/services/web/frontend/js/features/history/context/history-context.tsx
index 4fa7fabea6..a7a0746e3c 100644
--- a/services/web/frontend/js/features/history/context/history-context.tsx
+++ b/services/web/frontend/js/features/history/context/history-context.tsx
@@ -78,13 +78,10 @@ const updatesInfoInitialState: HistoryContextValue['updatesInfo'] = {
 function useHistory() {
   const { view } = useLayoutContext()
   const user = useUserContext()
-  const project = useProjectContext()
+  const { projectId, project, features } = useProjectContext()
   const userId = user.id
-  const projectId = project._id
-  const projectOwnerId = project.owner?._id
-  const userHasFullFeature = Boolean(
-    project.features?.versioning || user.isAdmin
-  )
+  const projectOwnerId = project?.owner?._id
+  const userHasFullFeature = Boolean(features.versioning || user.isAdmin)
   const currentUserIsOwner = projectOwnerId === userId
 
   const [selection, setSelection] = useState<Selection>(selectionInitialState)
diff --git a/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx b/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
index d24187abd0..8c9078514c 100644
--- a/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/file-tree-open-context.tsx
@@ -39,7 +39,9 @@ const FileTreeOpenContext = createContext<
 export const FileTreeOpenProvider: FC<React.PropsWithChildren> = ({
   children,
 }) => {
-  const { rootDocId, owner } = useProjectContext()
+  const { project } = useProjectContext()
+  const rootDocId = project?.rootDocId
+  const projectOwner = project?.owner?._id
   const { eventEmitter, projectJoined } = useIdeReactContext()
   const { openDocWithId, openInitialDoc } = useEditorManagerContext()
   const { currentDocumentId } = useEditorOpenDocContext()
@@ -81,7 +83,7 @@ export const FileTreeOpenProvider: FC<React.PropsWithChildren> = ({
         openDocWithId(selected.entity._id, { keepCurrentView: true })
         if (selected.entity.name.endsWith('.bib')) {
           sendMB('open-bib-file', {
-            projectOwner: owner._id,
+            projectOwner,
             isSampleFile: selected.entity.name === 'sample.bib',
             linkedFileProvider: null,
           })
@@ -96,7 +98,7 @@ export const FileTreeOpenProvider: FC<React.PropsWithChildren> = ({
       if (openFile) {
         if (selected?.entity?.name?.endsWith('.bib')) {
           sendMB('open-bib-file', {
-            projectOwner: owner._id,
+            projectOwner,
             isSampleFile: false,
             linkedFileProvider: (selected.entity as FileRef).linkedFileData
               ?.provider,
@@ -105,7 +107,7 @@ export const FileTreeOpenProvider: FC<React.PropsWithChildren> = ({
         window.dispatchEvent(new CustomEvent('file-view:file-opened'))
       }
     },
-    [fileTreeReady, setOpenFile, openDocWithId, owner]
+    [fileTreeReady, setOpenFile, openDocWithId, projectOwner]
   )
 
   const handleFileTreeDelete = useCallback(
diff --git a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
index 147f683174..a55fc3236b 100644
--- a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
@@ -19,6 +19,8 @@ import { postJSON } from '@/infrastructure/fetch-json'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
 import getMeta from '@/utils/meta'
 import { type PermissionsLevel } from '@/features/ide-react/types/permissions'
+import { useProjectContext } from '@/shared/context/project-context'
+import { ProjectMetadata } from '@/shared/context/types/project-metadata'
 
 const LOADED_AT = new Date()
 
@@ -44,10 +46,6 @@ function populateIdeReactScope(store: ReactScopeValueStore) {
   store.set('settings', {})
 }
 
-function populateProjectScope(store: ReactScopeValueStore) {
-  store.allowNonExistentPath('project', true)
-}
-
 function populatePdfScope(store: ReactScopeValueStore) {
   store.allowNonExistentPath('pdf', true)
 }
@@ -61,7 +59,6 @@ export function createReactScopeValueStore() {
   // initialization code together with the context and would only populate
   // necessary values in the store, but this is simpler for now
   populateIdeReactScope(scopeStore)
-  populateProjectScope(scopeStore)
   populatePdfScope(scopeStore)
 
   scopeStore.allowNonExistentPath('hasLintingError')
@@ -94,6 +91,8 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const [projectJoined, setProjectJoined] = useState(false)
 
   const { socket, getSocketDebuggingInfo } = useConnectionContext()
+  const { joinProject, project } = useProjectContext()
+  const spellCheckLanguage = project?.spellCheckLanguage
 
   const reportError = useCallback(
     (error: any, meta?: Record<string, any>) => {
@@ -105,7 +104,7 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
         performance_now: performance.now(),
         release,
         client_load: LOADED_AT,
-        spellCheckLanguage: scopeStore.get('project.spellCheckLanguage'),
+        spellCheckLanguage,
         ...getSocketDebuggingInfo(),
       }
 
@@ -124,17 +123,28 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
         },
       })
     },
-    [release, projectId, getSocketDebuggingInfo, scopeStore]
+    [release, projectId, getSocketDebuggingInfo, spellCheckLanguage]
   )
 
   // Populate scope values when joining project, then fire project:joined event
   useEffect(() => {
     function handleJoinProjectResponse({
-      project: { rootDoc_id: rootDocId, ..._project },
+      project: {
+        rootDoc_id: rootDocId,
+        publicAccesLevel: publicAccessLevel,
+        ..._project
+      },
       permissionsLevel,
     }: JoinProjectPayload) {
-      const project = { ..._project, rootDocId }
-      scopeStore.set('project', project)
+      const project = { ..._project, rootDocId, publicAccessLevel }
+
+      // Cast the project from the payload as ProjectMetadata to ensure it has
+      // the correct type for the context. It must be close enough because the
+      // data structure hasn't changed and it worked previously. This type
+      // coercion was previously sidestepped by adding the project to the scope
+      // store, which does not enforce types.
+      joinProject(project as unknown as ProjectMetadata)
+
       setPermissionsLevel(permissionsLevel)
       // Make watchers update immediately
       scopeStore.flushUpdates()
@@ -142,21 +152,12 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
       setProjectJoined(true)
     }
 
-    function handleMainBibliographyDocUpdated(payload: string) {
-      scopeStore.set('project.mainBibliographyDoc_id', payload)
-    }
-
     socket.on('joinProjectResponse', handleJoinProjectResponse)
-    socket.on('mainBibliographyDocUpdated', handleMainBibliographyDocUpdated)
 
     return () => {
       socket.removeListener('joinProjectResponse', handleJoinProjectResponse)
-      socket.removeListener(
-        'mainBibliographyDocUpdated',
-        handleMainBibliographyDocUpdated
-      )
     }
-  }, [socket, eventEmitter, scopeStore])
+  }, [socket, eventEmitter, scopeStore, joinProject])
 
   const ide = useMemo(() => {
     return {
diff --git a/services/web/frontend/js/features/ide-react/context/outline-context.tsx b/services/web/frontend/js/features/ide-react/context/outline-context.tsx
index ea3c38d105..40c2cb1928 100644
--- a/services/web/frontend/js/features/ide-react/context/outline-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/outline-context.tsx
@@ -124,7 +124,7 @@ export const OutlineProvider: FC<React.PropsWithChildren> = ({ children }) => {
     [openDocName]
   )
 
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const storageKey = `file_outline.expanded.${projectId}`
 
   const [outlineExpanded, setOutlineExpanded] = useState(
diff --git a/services/web/frontend/js/features/ide-react/context/permissions-context.tsx b/services/web/frontend/js/features/ide-react/context/permissions-context.tsx
index bdb101d3f5..c3621aac23 100644
--- a/services/web/frontend/js/features/ide-react/context/permissions-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/permissions-context.tsx
@@ -98,7 +98,7 @@ export const PermissionsProvider: React.FC<React.PropsWithChildren> = ({
   const { permissionsLevel } = useIdeReactContext()
   const hasViewerPermissions = useViewerPermissions()
   const anonymous = getMeta('ol-anonymous')
-  const project = useProjectContext()
+  const { features } = useProjectContext()
 
   useEffect(() => {
     let activePermissionsMap
@@ -106,7 +106,7 @@ export const PermissionsProvider: React.FC<React.PropsWithChildren> = ({
       activePermissionsMap = linkSharingWarningPermissionsMap
     } else if (anonymous) {
       activePermissionsMap = anonymousPermissionsMap
-    } else if (!project.features.trackChanges) {
+    } else if (!features.trackChanges) {
       activePermissionsMap = noTrackChangesPermissionsMap
     } else {
       activePermissionsMap = permissionsMap
@@ -117,7 +117,7 @@ export const PermissionsProvider: React.FC<React.PropsWithChildren> = ({
     permissionsLevel,
     setPermissions,
     hasViewerPermissions,
-    project.features.trackChanges,
+    features.trackChanges,
   ])
 
   useEffect(() => {
diff --git a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
index f85e2c40fa..6236f2bfe2 100644
--- a/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
+++ b/services/web/frontend/js/features/ide-react/context/react-context-root.tsx
@@ -75,10 +75,10 @@ export const ReactContextRoot: FC<
     <Providers.SplitTestProvider>
       <Providers.ModalsContextProvider>
         <Providers.ConnectionProvider>
-          <Providers.IdeReactProvider>
-            <Providers.UserProvider>
-              <Providers.UserSettingsProvider>
-                <Providers.ProjectProvider>
+          <Providers.ProjectProvider>
+            <Providers.IdeReactProvider>
+              <Providers.UserProvider>
+                <Providers.UserSettingsProvider>
                   <Providers.SnapshotProvider>
                     <Providers.DetachProvider>
                       <Providers.EditorPropertiesProvider>
@@ -128,10 +128,10 @@ export const ReactContextRoot: FC<
                       </Providers.EditorPropertiesProvider>
                     </Providers.DetachProvider>
                   </Providers.SnapshotProvider>
-                </Providers.ProjectProvider>
-              </Providers.UserSettingsProvider>
-            </Providers.UserProvider>
-          </Providers.IdeReactProvider>
+                </Providers.UserSettingsProvider>
+              </Providers.UserProvider>
+            </Providers.IdeReactProvider>
+          </Providers.ProjectProvider>
         </Providers.ConnectionProvider>
       </Providers.ModalsContextProvider>
     </Providers.SplitTestProvider>
diff --git a/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx b/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx
index 817e03fe86..34b782b5bf 100644
--- a/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/snapshot-context.tsx
@@ -55,7 +55,7 @@ export const SnapshotContext = createContext<
 >(undefined)
 
 export const SnapshotProvider: FC<React.PropsWithChildren> = ({ children }) => {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const [snapshotLoadingState, setSnapshotLoadingState] =
     useState<SnapshotLoadingState>('')
   const [snapshotUpdater] = useState(() => new SnapshotUpdater(projectId))
diff --git a/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts b/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts
index 388fa0299b..55d9f01ba9 100644
--- a/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts
+++ b/services/web/frontend/js/features/ide-react/hooks/use-socket-listeners.ts
@@ -4,7 +4,7 @@ import {
   listProjectInvites,
   listProjectMembers,
 } from '@/features/share-project-modal/utils/api'
-import useScopeValue from '@/shared/hooks/use-scope-value'
+import { useProjectContext } from '@/shared/context/project-context'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { useModalsContext } from '@/features/ide-react/context/modals-context'
@@ -16,11 +16,9 @@ import { useLocation } from '@/shared/hooks/use-location'
 function useSocketListeners() {
   const { t } = useTranslation()
   const { socket } = useConnectionContext()
-  const { permissionsLevel, projectId } = useIdeReactContext()
   const { showGenericMessageModal } = useModalsContext()
-  const [, setPublicAccessLevel] = useScopeValue('project.publicAccesLevel')
-  const [, setProjectMembers] = useScopeValue('project.members')
-  const [, setProjectInvites] = useScopeValue('project.invites')
+  const { permissionsLevel } = useIdeReactContext()
+  const { projectId, updateProject } = useProjectContext()
   const location = useLocation()
 
   useSocketListener(
@@ -51,10 +49,10 @@ function useSocketListeners() {
     useCallback(
       (data: { newAccessLevel?: PublicAccessLevel }) => {
         if (data.newAccessLevel) {
-          setPublicAccessLevel(data.newAccessLevel)
+          updateProject({ publicAccessLevel: data.newAccessLevel })
         }
       },
-      [setPublicAccessLevel]
+      [updateProject]
     )
   )
 
@@ -65,13 +63,13 @@ function useSocketListeners() {
       listProjectMembers(projectId)
         .then(({ members }) => {
           if (members) {
-            setProjectMembers(members)
+            updateProject({ members })
           }
         })
         .catch(err => {
           debugConsole.error('Error fetching members for project', err)
         })
-    }, [projectId, setProjectMembers])
+    }, [projectId, updateProject])
   )
 
   useSocketListener(
@@ -83,7 +81,7 @@ function useSocketListeners() {
           listProjectMembers(projectId)
             .then(({ members }) => {
               if (members) {
-                setProjectMembers(members)
+                updateProject({ members })
               }
             })
             .catch(err => {
@@ -95,7 +93,7 @@ function useSocketListeners() {
           listProjectInvites(projectId)
             .then(({ invites }) => {
               if (invites) {
-                setProjectInvites(invites)
+                updateProject({ invites })
               }
             })
             .catch(err => {
@@ -103,7 +101,29 @@ function useSocketListeners() {
             })
         }
       },
-      [projectId, setProjectInvites, setProjectMembers, permissionsLevel]
+      [projectId, updateProject, permissionsLevel]
+    )
+  )
+
+  useSocketListener(
+    socket,
+    'mainBibliographyDocUpdated',
+    useCallback(
+      (payload: string) => {
+        updateProject({ mainBibliographyDocId: payload })
+      },
+      [updateProject]
+    )
+  )
+
+  useSocketListener(
+    socket,
+    'projectNameUpdated',
+    useCallback(
+      (payload: string) => {
+        updateProject({ name: payload })
+      },
+      [updateProject]
     )
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/download-project.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/download-project.tsx
index 712c874309..9be57c130e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/download-project.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/download-project.tsx
@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next'
 
 export const DownloadProjectZip = () => {
   const { t } = useTranslation()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const sendDownloadEvent = useCallback(() => {
     sendMB('download-zip-button-click', {
       projectId,
@@ -44,7 +44,7 @@ export const DownloadProjectZip = () => {
 export const DownloadProjectPDF = () => {
   const { t } = useTranslation()
   const { pdfDownloadUrl, pdfUrl } = useCompileContext()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const sendDownloadEvent = useCallback(() => {
     sendMB('download-pdf-button-click', {
       projectId,
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-hybrid-download-button.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-hybrid-download-button.tsx
index bf0b0378d2..4a6991f30b 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-hybrid-download-button.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-hybrid-download-button.tsx
@@ -9,7 +9,7 @@ import MaterialIcon from '@/shared/components/material-icon'
 function PdfHybridDownloadButton() {
   const { pdfDownloadUrl } = useCompileContext()
 
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const { t } = useTranslation()
   const description = pdfDownloadUrl
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx
index 4a098e67da..e0ed7fdb78 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-js-viewer.tsx
@@ -23,7 +23,7 @@ type PdfJsViewerProps = {
 }
 
 function PdfJsViewer({ url, pdfFile }: PdfJsViewerProps) {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const { setError, firstRenderDone, highlights, position, setPosition } =
     useCompileContext()
diff --git a/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts b/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts
index 667374bb66..51c8eefc7c 100644
--- a/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts
+++ b/services/web/frontend/js/features/pdf-preview/hooks/use-synctex.ts
@@ -28,7 +28,8 @@ export default function useSynctex(): {
   syncToCodeInFlight: boolean
   canSyncToPdf: boolean
 } {
-  const { _id: projectId, rootDocId } = useProjectContext()
+  const { projectId, project } = useProjectContext()
+  const rootDocId = project?.rootDocId
 
   const { clsiServerId, pdfFile, position, setShowLogs, setHighlights } =
     useCompileContext()
diff --git a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
index 74c865632c..b95b1a11b4 100644
--- a/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/review-mode-switcher.tsx
@@ -55,7 +55,7 @@ function ReviewModeSwitcher() {
   const mode = useCurrentMode()
   const { permissionsLevel } = useIdeReactContext()
   const { write, trackedWrite } = usePermissionsContext()
-  const project = useProjectContext()
+  const { features } = useProjectContext()
   const [showUpgradeModal, setShowUpgradeModal] = useState(false)
   const showViewOption = permissionsLevel === 'readOnly'
   const view = useCodeMirrorViewContext()
@@ -100,7 +100,7 @@ function ReviewModeSwitcher() {
                 view.focus()
                 return
               }
-              if (!project.features.trackChanges) {
+              if (!features.trackChanges) {
                 setShowUpgradeModal(true)
               } else {
                 sendMB('editing-mode-change', {
@@ -212,7 +212,7 @@ const ModeSwitcherToggleButtonContent = forwardRef<
   })
 
   const user = useUserContext()
-  const project = useProjectContext()
+  const { features } = useProjectContext()
   const { reviewPanelOpen } = useLayoutContext()
   const { inactiveTutorials } = useEditorContext()
 
@@ -222,7 +222,7 @@ const ModeSwitcherToggleButtonContent = forwardRef<
   const canShowReviewModePromo =
     reviewPanelOpen &&
     currentMode !== 'review' &&
-    project.features.trackChanges &&
+    features.trackChanges &&
     user.signUpDate &&
     user.signUpDate < '2025-03-15' &&
     !hasCompletedReviewModeTutorial
diff --git a/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal.tsx b/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal.tsx
index 4948a00ce3..4611060438 100644
--- a/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal.tsx
+++ b/services/web/frontend/js/features/review-panel-new/components/upgrade-track-changes-modal.tsx
@@ -26,7 +26,7 @@ function UpgradeTrackChangesModal({
   setShow,
 }: UpgradeTrackChangesModalProps) {
   const { t } = useTranslation()
-  const project = useProjectContext()
+  const { project } = useProjectContext()
   const user = useUserContext()
 
   return (
@@ -62,9 +62,9 @@ function UpgradeTrackChangesModal({
             </ul>
           </OLCol>
         </OLRow>
-        {project.owner && (
+        {Boolean(project?.owner) && (
           <div className="text-center">
-            {project.owner._id === user.id ? (
+            {project?.owner._id === user.id ? (
               user.allowedFreeTrial ? (
                 <OLButton
                   variant="premium"
diff --git a/services/web/frontend/js/features/review-panel-new/context/changes-users-context.tsx b/services/web/frontend/js/features/review-panel-new/context/changes-users-context.tsx
index 5911b3fc0e..98220ea639 100644
--- a/services/web/frontend/js/features/review-panel-new/context/changes-users-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/changes-users-context.tsx
@@ -29,7 +29,8 @@ export const ChangesUsersContext = createContext<ChangesUsers | undefined>(
 export const ChangesUsersProvider: FC<React.PropsWithChildren> = ({
   children,
 }) => {
-  const { _id: projectId, members, owner } = useProjectContext()
+  const { projectId, project } = useProjectContext()
+  const { members, owner } = project || {}
   const { isRestrictedTokenMember } = useEditorContext()
 
   const [changesUsers, setChangesUsers] = useState<ChangesUsers>()
@@ -49,6 +50,9 @@ export const ChangesUsersProvider: FC<React.PropsWithChildren> = ({
 
   // add the project owner and members to the changes users data
   const value = useMemo(() => {
+    if (!owner || !members) {
+      return
+    }
     const value: ChangesUsers = new Map(changesUsers)
     value.set(owner._id, { ...owner, id: owner._id })
     for (const member of members) {
diff --git a/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx b/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
index 5ad69245c7..6b73073bfc 100644
--- a/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/threads-context.tsx
@@ -49,7 +49,7 @@ const ThreadsActionsContext = createContext<ThreadsActions | undefined>(
 )
 
 export const ThreadsProvider: FC<React.PropsWithChildren> = ({ children }) => {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { currentDocument } = useEditorOpenDocContext()
   const { isRestrictedTokenMember } = useEditorContext()
 
diff --git a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
index 453fec51b7..e68ef1fec1 100644
--- a/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
+++ b/services/web/frontend/js/features/review-panel-new/context/track-changes-state-context.tsx
@@ -15,7 +15,7 @@ import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-
 import { useUserContext } from '@/shared/context/user-context'
 import { postJSON } from '@/infrastructure/fetch-json'
 import useEventListener from '@/shared/hooks/use-event-listener'
-import { ProjectContextValue } from '@/shared/context/types/project-context'
+import { ProjectMetadata } from '@/shared/context/types/project-metadata'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
 
 export type TrackChangesState = {
@@ -48,14 +48,14 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
 }) => {
   const permissions = usePermissionsContext()
   const { socket } = useConnectionContext()
-  const project = useProjectContext()
+  const { projectId, project, features } = useProjectContext()
   const user = useUserContext()
   const { setWantTrackChanges } = useEditorPropertiesContext()
 
   // TODO: update project.trackChangesState instead?
   const [trackChangesValue, setTrackChangesValue] = useState<
-    ProjectContextValue['trackChangesState']
-  >(project.trackChangesState ?? false)
+    ProjectMetadata['trackChangesState']
+  >(project?.trackChangesState ?? false)
 
   useSocketListener(socket, 'toggle-track-changes', setTrackChangesValue)
 
@@ -88,11 +88,11 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
 
   const saveTrackChanges = useCallback(
     async (trackChangesBody: SaveTrackChangesRequestBody) => {
-      postJSON(`/project/${project._id}/track_changes`, {
+      postJSON(`/project/${projectId}/track_changes`, {
         body: trackChangesBody,
       })
     },
-    [project._id]
+    [projectId]
   )
 
   const saveTrackChangesForCurrentUser = useCallback(
@@ -122,7 +122,7 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
     useCallback(() => {
       if (
         user.id &&
-        project.features.trackChanges &&
+        features.trackChanges &&
         permissions.write &&
         !onForEveryone
       ) {
@@ -139,7 +139,7 @@ export const TrackChangesStateProvider: FC<React.PropsWithChildren> = ({
       onForMembers,
       onForEveryone,
       permissions.write,
-      project.features.trackChanges,
+      features.trackChanges,
       user.id,
     ])
   )
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts b/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts
index 47bce33e9f..f2f12ec664 100644
--- a/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts
+++ b/services/web/frontend/js/features/review-panel-new/hooks/use-overview-file-collapsed.ts
@@ -23,7 +23,7 @@ const safeParse = (value: string) => {
 }
 
 export default function useOverviewFileCollapsed(docId: DocId) {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const [collapsedDocs, setCollapsedDocs] = usePersistedState<
     Record<DocId, boolean>,
     string
diff --git a/services/web/frontend/js/features/review-panel-new/hooks/use-project-ranges.ts b/services/web/frontend/js/features/review-panel-new/hooks/use-project-ranges.ts
index 95e854d9ca..23ff05479e 100644
--- a/services/web/frontend/js/features/review-panel-new/hooks/use-project-ranges.ts
+++ b/services/web/frontend/js/features/review-panel-new/hooks/use-project-ranges.ts
@@ -6,7 +6,7 @@ import useSocketListener from '@/features/ide-react/hooks/use-socket-listener'
 import { useConnectionContext } from '@/features/ide-react/context/connection-context'
 
 export default function useProjectRanges() {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const [error, setError] = useState<Error>()
   const [projectRanges, setProjectRanges] = useState<Map<string, Ranges>>()
   const [loading, setLoading] = useState(true)
diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
index e80fb03711..a224d704f8 100644
--- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
@@ -23,9 +23,10 @@ export default function AddCollaborators({ readOnly }: { readOnly?: boolean }) {
 
   const { t } = useTranslation()
 
-  const { updateProject, setInFlight, setError } = useShareProjectContext()
+  const { setInFlight, setError } = useShareProjectContext()
 
-  const { _id: projectId, members, invites, features } = useProjectContext()
+  const { projectId, project, features, updateProject } = useProjectContext()
+  const { members, invites } = project || {}
 
   const currentMemberEmails = useMemo(
     () => (members || []).map(member => member.email).sort(),
@@ -82,9 +83,7 @@ export default function AddCollaborators({ readOnly }: { readOnly?: boolean }) {
       let data
 
       try {
-        const invite = (invites || []).find(
-          invite => invite.email === normalisedEmail
-        )
+        const invite = invites?.find(invite => invite.email === normalisedEmail)
 
         if (invite) {
           data = await resendInvite(projectId, invite)
@@ -109,8 +108,8 @@ export default function AddCollaborators({ readOnly }: { readOnly?: boolean }) {
           // invitation is only populated on successful invite, meaning that for paywall and other cases this will be null
           successful_invite: !!data.invite,
           users_updated: !!(data.users || data.user),
-          current_collaborators_amount: members.length,
-          current_invites_amount: invites.length,
+          current_collaborators_amount: members?.length || 0,
+          current_invites_amount: invites?.length || 0,
           role,
           previousEditorsAmount,
           previousReviewersAmount,
@@ -144,15 +143,15 @@ export default function AddCollaborators({ readOnly }: { readOnly?: boolean }) {
         setInFlight(false)
       } else if (data.invite) {
         updateProject({
-          invites: invites.concat(data.invite),
+          invites: invites?.concat(data.invite) || [data.invite],
         })
       } else if (data.users) {
         updateProject({
-          members: members.concat(data.users),
+          members: members?.concat(data.users) || data.users,
         })
       } else if (data.user) {
         updateProject({
-          members: members.concat(data.user),
+          members: members?.concat(data.user) || [data.user],
         })
       }
 
diff --git a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
index 9f24cddc4a..c8a7216e2c 100644
--- a/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/edit-member.tsx
@@ -6,7 +6,7 @@ import { removeMemberFromProject, updateMember } from '../utils/api'
 import { useProjectContext } from '@/shared/context/project-context'
 import { sendMB } from '@/infrastructure/event-tracking'
 import { Select } from '@/shared/components/select'
-import type { ProjectContextMember } from '@/shared/context/types/project-context'
+import type { ProjectMember } from '@/shared/context/types/project-metadata'
 import { PermissionsLevel } from '@/features/ide-react/types/permissions'
 import { linkSharingEnforcementDate } from '../utils/link-sharing'
 import OLButton from '@/features/ui/components/ol/ol-button'
@@ -19,7 +19,7 @@ import { upgradePlan } from '@/main/account-upgrade'
 type PermissionsOption = PermissionsLevel | 'removeAccess' | 'downgraded'
 
 type EditMemberProps = {
-  member: ProjectContextMember
+  member: ProjectMember
   hasExceededCollaboratorLimit: boolean
   hasBeenDowngraded: boolean
   canAddCollaborators: boolean
@@ -51,8 +51,9 @@ export default function EditMember({
     setPrivileges(member.privileges)
   }, [member.privileges])
 
-  const { updateProject, monitorRequest } = useShareProjectContext()
-  const { _id: projectId, members, invites } = useProjectContext()
+  const { monitorRequest } = useShareProjectContext()
+  const { projectId, project, updateProject } = useProjectContext()
+  const { members, invites } = project || {}
   const user = useUserContext()
 
   // Immediately commit this change if it's lower impact (eg. editor > viewer)
@@ -88,14 +89,15 @@ export default function EditMember({
     } else if (newPrivileges === 'removeAccess') {
       monitorRequest(() => removeMemberFromProject(projectId, member)).then(
         () => {
-          const updatedMembers = members.filter(existing => existing !== member)
+          const updatedMembers =
+            members?.filter(existing => existing !== member) || []
           updateProject({
             members: updatedMembers,
           })
           sendMB('collaborator-removed', {
             project_id: projectId,
             current_collaborators_amount: updatedMembers.length,
-            current_invites_amount: invites.length,
+            current_invites_amount: invites?.length || 0,
           })
         }
       )
@@ -110,9 +112,10 @@ export default function EditMember({
         })
       ).then(() => {
         updateProject({
-          members: members.map(item =>
-            item._id === member._id ? { ...item, newPrivileges } : item
-          ),
+          members:
+            members?.map(item =>
+              item._id === member._id ? { ...item, newPrivileges } : item
+            ) || [],
         })
       })
     }
diff --git a/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx b/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx
index 8914d8ba3b..acfdc0a3e0 100644
--- a/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/editor-over-limit-modal.tsx
@@ -12,7 +12,8 @@ const EditorOverLimitModal = () => {
 
   const { isProjectOwner } = useEditorContext()
   const { permissionsLevel } = useIdeReactContext()
-  const { members, features, _id: projectId } = useProjectContext()
+  const { project, features, projectId } = useProjectContext()
+  const members = project?.members
 
   const handleHide = () => {
     setShow(false)
@@ -24,7 +25,12 @@ const EditorOverLimitModal = () => {
   useEffect(() => {
     const showModalCooldownHours = 24
     const hasExceededCollaboratorLimit = () => {
-      if (isProjectOwner || !features || permissionsLevel === 'readOnly') {
+      if (
+        isProjectOwner ||
+        !features ||
+        !members ||
+        permissionsLevel === 'readOnly'
+      ) {
         return false
       }
 
diff --git a/services/web/frontend/js/features/share-project-modal/components/invite.tsx b/services/web/frontend/js/features/share-project-modal/components/invite.tsx
index e9d761e4ee..391a6f69dd 100644
--- a/services/web/frontend/js/features/share-project-modal/components/invite.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/invite.tsx
@@ -10,13 +10,13 @@ import OLCol from '@/features/ui/components/ol/ol-col'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import MaterialIcon from '@/shared/components/material-icon'
-import { ProjectContextMember } from '@/shared/context/types/project-context'
+import { ProjectMember } from '@/shared/context/types/project-metadata'
 
 export default function Invite({
   invite,
   isProjectOwner,
 }: {
-  invite: ProjectContextMember
+  invite: ProjectMember
   isProjectOwner: boolean
 }) {
   const { t } = useTranslation()
@@ -44,10 +44,10 @@ export default function Invite({
   )
 }
 
-function ResendInvite({ invite }: { invite: ProjectContextMember }) {
+function ResendInvite({ invite }: { invite: ProjectMember }) {
   const { t } = useTranslation()
   const { monitorRequest, setError, inFlight } = useShareProjectContext()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   // const buttonRef = useRef(null)
   //
@@ -87,23 +87,25 @@ function ResendInvite({ invite }: { invite: ProjectContextMember }) {
   )
 }
 
-function RevokeInvite({ invite }: { invite: ProjectContextMember }) {
+function RevokeInvite({ invite }: { invite: ProjectMember }) {
   const { t } = useTranslation()
-  const { updateProject, monitorRequest } = useShareProjectContext()
-  const { _id: projectId, invites, members } = useProjectContext()
+  const { monitorRequest } = useShareProjectContext()
+  const { projectId, project, updateProject } = useProjectContext()
+  const { invites, members } = project || {}
 
   function handleClick(event: React.MouseEvent) {
     event.preventDefault()
 
     monitorRequest(() => revokeInvite(projectId, invite)).then(() => {
-      const updatedInvites = invites.filter(existing => existing !== invite)
+      const updatedInvites =
+        invites?.filter(existing => existing !== invite) || []
       updateProject({
         invites: updatedInvites,
       })
       sendMB('collaborator-invite-revoked', {
         project_id: projectId,
         current_invites_amount: updatedInvites.length,
-        current_collaborators_amount: members.length,
+        current_collaborators_amount: members?.length || 0,
       })
     })
   }
diff --git a/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx b/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx
index a2d17734b0..e4db7e9a68 100644
--- a/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/link-sharing.tsx
@@ -33,7 +33,8 @@ export default function LinkSharing() {
 
   const { monitorRequest } = useShareProjectContext()
 
-  const { _id: projectId, publicAccessLevel } = useProjectContext()
+  const { projectId, project } = useProjectContext()
+  const { publicAccessLevel } = project || {}
 
   // set the access level of a project
   const setAccessLevel = useCallback(
@@ -145,7 +146,7 @@ function TokenBasedSharing({
   showLinks: boolean
 }) {
   const { t } = useTranslation()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const [tokens, setTokens] = useState<Tokens | null>(null)
 
@@ -244,7 +245,7 @@ function LegacySharing({
 
 export function ReadOnlyTokenLink() {
   const { t } = useTranslation()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   const [tokens, setTokens] = useState<Tokens | null>(null)
 
diff --git a/services/web/frontend/js/features/share-project-modal/components/member-privileges.tsx b/services/web/frontend/js/features/share-project-modal/components/member-privileges.tsx
index c2b7bf98ef..0ed0d9bb8a 100644
--- a/services/web/frontend/js/features/share-project-modal/components/member-privileges.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/member-privileges.tsx
@@ -1,10 +1,10 @@
-import { ProjectContextMember } from '@/shared/context/types/project-context'
+import { ProjectMember } from '@/shared/context/types/project-metadata'
 import { useTranslation } from 'react-i18next'
 
 export default function MemberPrivileges({
   privileges,
 }: {
-  privileges: ProjectContextMember['privileges']
+  privileges: ProjectMember['privileges']
 }) {
   const { t } = useTranslation()
 
diff --git a/services/web/frontend/js/features/share-project-modal/components/owner-info.tsx b/services/web/frontend/js/features/share-project-modal/components/owner-info.tsx
index c289c41568..2f30dd2f20 100644
--- a/services/web/frontend/js/features/share-project-modal/components/owner-info.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/owner-info.tsx
@@ -6,14 +6,14 @@ import MaterialIcon from '@/shared/components/material-icon'
 
 export default function OwnerInfo() {
   const { t } = useTranslation()
-  const { owner } = useProjectContext()
+  const { project } = useProjectContext()
 
   return (
     <OLRow className="project-member">
       <OLCol xs={8}>
         <div className="project-member-email-icon">
           <MaterialIcon type="person" />
-          <div className="email-warning">{owner?.email}</div>
+          <div className="email-warning">{project?.owner.email}</div>
         </div>
       </OLCol>
       <OLCol xs={4} className="text-end">
diff --git a/services/web/frontend/js/features/share-project-modal/components/send-invites-notice.tsx b/services/web/frontend/js/features/share-project-modal/components/send-invites-notice.tsx
index c7417db158..155f908ed4 100644
--- a/services/web/frontend/js/features/share-project-modal/components/send-invites-notice.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/send-invites-notice.tsx
@@ -7,7 +7,8 @@ import OLRow from '@/features/ui/components/ol/ol-row'
 import OLCol from '@/features/ui/components/ol/ol-col'
 
 export default function SendInvitesNotice() {
-  const { publicAccessLevel } = useProjectContext()
+  const { project } = useProjectContext()
+  const { publicAccessLevel } = project || {}
   const { isPendingEditor } = useEditorContext()
   const { t } = useTranslation()
 
diff --git a/services/web/frontend/js/features/share-project-modal/components/share-modal-body.tsx b/services/web/frontend/js/features/share-project-modal/components/share-modal-body.tsx
index 886e877f55..c12ad1d2a5 100644
--- a/services/web/frontend/js/features/share-project-modal/components/share-modal-body.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/share-modal-body.tsx
@@ -12,7 +12,8 @@ import RecaptchaConditions from '@/shared/components/recaptcha-conditions'
 import getMeta from '@/utils/meta'
 
 export default function ShareModalBody() {
-  const { members, invites, features } = useProjectContext()
+  const { project, features } = useProjectContext()
+  const { members, invites } = project || {}
   const { isProjectOwner } = useEditorContext()
 
   // whether the project has not reached the collaborator limit
@@ -26,12 +27,12 @@ export default function ShareModalBody() {
       return true
     }
 
-    const editorInvites = invites.filter(
-      invite => invite.privileges !== 'readOnly'
-    ).length
+    const editorInvites =
+      invites?.filter(invite => invite.privileges !== 'readOnly').length || 0
 
     return (
-      members.filter(member => member.privileges !== 'readOnly').length +
+      (members?.filter(member => member.privileges !== 'readOnly').length ||
+        0) +
         editorInvites <
       (features.collaborators ?? 1)
     )
@@ -40,11 +41,11 @@ export default function ShareModalBody() {
   // determine if some but not all pending editors' permissions have been resolved,
   // for moving between warning and info notification states etc.
   const somePendingEditorsResolved = useMemo(() => {
-    return (
-      members.some(member =>
+    return Boolean(
+      members?.some(member =>
         ['readAndWrite', 'review'].includes(member.privileges)
       ) &&
-      members.some(member => member.pendingEditor || member.pendingReviewer)
+        members?.some(member => member.pendingEditor || member.pendingReviewer)
     )
   }, [members])
 
@@ -56,13 +57,14 @@ export default function ShareModalBody() {
     if (features.collaborators === -1) {
       return false
     }
-    return members.some(
-      member => member.pendingEditor || member.pendingReviewer
+    return (
+      members?.some(member => member.pendingEditor || member.pendingReviewer) ||
+      false
     )
   }, [features, isProjectOwner, members])
 
   const hasExceededCollaboratorLimit = useMemo(() => {
-    if (!isProjectOwner || !features) {
+    if (!isProjectOwner || !features || !members) {
       return false
     }
 
@@ -77,6 +79,9 @@ export default function ShareModalBody() {
   }, [features, isProjectOwner, members])
 
   const sortedMembers = useMemo(() => {
+    if (!members) {
+      return []
+    }
     return [
       ...members.filter(member => member.privileges === 'readAndWrite'),
       ...members.filter(member => member.pendingEditor),
@@ -126,7 +131,7 @@ export default function ShareModalBody() {
         )
       )}
 
-      {invites.map(invite => (
+      {(invites || []).map(invite => (
         <Invite
           key={invite._id}
           invite={invite}
diff --git a/services/web/frontend/js/features/share-project-modal/components/share-project-modal.tsx b/services/web/frontend/js/features/share-project-modal/components/share-project-modal.tsx
index 2328d1d844..6dabc9f9d8 100644
--- a/services/web/frontend/js/features/share-project-modal/components/share-project-modal.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/share-project-modal.tsx
@@ -9,12 +9,10 @@ import ShareProjectModalContent from './share-project-modal-content'
 import { useProjectContext } from '@/shared/context/project-context'
 import { useSplitTestContext } from '@/shared/context/split-test-context'
 import { sendMB } from '@/infrastructure/event-tracking'
-import { ProjectContextUpdateValue } from '@/shared/context/types/project-context'
 import { useEditorContext } from '@/shared/context/editor-context'
 import customLocalStorage from '@/infrastructure/local-storage'
 
 type ShareProjectContextValue = {
-  updateProject: (project: ProjectContextUpdateValue) => void
   monitorRequest: <T extends Promise<unknown>>(request: () => T) => T
   inFlight: boolean
   setInFlight: React.Dispatch<
@@ -61,7 +59,7 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
     useState<ShareProjectContextValue['inFlight']>(false)
   const [error, setError] = useState<ShareProjectContextValue['error']>()
 
-  const project = useProjectContext()
+  const { project, projectId } = useProjectContext()
   const { isProjectOwner } = useEditorContext()
 
   const { splitTestVariants } = useSplitTestContext()
@@ -70,7 +68,7 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
   // is over collaborator limit or has pending editors (once every 24 hours)
   useEffect(() => {
     const hasExceededCollaboratorLimit = () => {
-      if (!isProjectOwner || !project.features) {
+      if (!isProjectOwner || !project || !project.features) {
         return false
       }
 
@@ -88,7 +86,7 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
     }
 
     if (hasExceededCollaboratorLimit()) {
-      const localStorageKey = `last-shown-share-modal.${project._id}`
+      const localStorageKey = `last-shown-share-modal.${projectId}`
       const lastShownShareModalTime =
         customLocalStorage.getItem(localStorageKey)
       if (
@@ -99,17 +97,17 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
         customLocalStorage.setItem(localStorageKey, Date.now())
       }
     }
-  }, [project, isProjectOwner, handleOpen])
+  }, [project, isProjectOwner, handleOpen, projectId])
 
   // send tracking event when the modal is opened
   useEffect(() => {
     if (show) {
       sendMB('share-modal-opened', {
         splitTestVariant: splitTestVariants['null-test-share-modal'],
-        project_id: project._id,
+        project_id: projectId,
       })
     }
-  }, [splitTestVariants, project._id, show])
+  }, [splitTestVariants, projectId, show])
 
   // reset error when the modal is opened
   useEffect(() => {
@@ -147,12 +145,6 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
     return promise
   }, [])
 
-  // merge the new data with the old project data
-  const updateProject = useCallback(
-    (data: ProjectContextUpdateValue) => Object.assign(project, data),
-    [project]
-  )
-
   if (!project) {
     return null
   }
@@ -160,7 +152,6 @@ const ShareProjectModal = React.memo(function ShareProjectModal({
   return (
     <ShareProjectContext.Provider
       value={{
-        updateProject,
         monitorRequest,
         inFlight,
         setInFlight,
diff --git a/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.tsx b/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.tsx
index 02100d2a2a..707d9d4b91 100644
--- a/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/transfer-ownership-modal.tsx
@@ -12,13 +12,13 @@ import OLModal, {
 import OLNotification from '@/features/ui/components/ol/ol-notification'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import { Spinner } from 'react-bootstrap'
-import { ProjectContextMember } from '@/shared/context/types/project-context'
+import { ProjectMember } from '@/shared/context/types/project-metadata'
 
 export default function TransferOwnershipModal({
   member,
   cancel,
 }: {
-  member: ProjectContextMember
+  member: ProjectMember
   cancel: () => void
 }) {
   const { t } = useTranslation()
@@ -27,7 +27,7 @@ export default function TransferOwnershipModal({
   const [error, setError] = useState(false)
   const location = useLocation()
 
-  const { _id: projectId, name: projectName } = useProjectContext()
+  const { projectId, name: projectName } = useProjectContext()
 
   function confirm() {
     setError(false)
diff --git a/services/web/frontend/js/features/share-project-modal/components/view-member.tsx b/services/web/frontend/js/features/share-project-modal/components/view-member.tsx
index d4cf2e9333..1822af9ce3 100644
--- a/services/web/frontend/js/features/share-project-modal/components/view-member.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/view-member.tsx
@@ -2,13 +2,9 @@ import MemberPrivileges from './member-privileges'
 import OLRow from '@/features/ui/components/ol/ol-row'
 import OLCol from '@/features/ui/components/ol/ol-col'
 import MaterialIcon from '@/shared/components/material-icon'
-import { ProjectContextMember } from '@/shared/context/types/project-context'
+import { ProjectMember } from '@/shared/context/types/project-metadata'
 
-export default function ViewMember({
-  member,
-}: {
-  member: ProjectContextMember
-}) {
+export default function ViewMember({ member }: { member: ProjectMember }) {
   return (
     <OLRow className="project-member">
       <OLCol xs={8}>
diff --git a/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx b/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx
index d474e681c1..daae76bd7a 100644
--- a/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/view-only-access-modal.tsx
@@ -12,7 +12,8 @@ const ViewOnlyAccessModal = () => {
 
   const { isProjectOwner, isPendingEditor } = useEditorContext()
   const { permissionsLevel } = useIdeReactContext()
-  const { members, features, _id: projectId } = useProjectContext()
+  const { features, projectId, project } = useProjectContext()
+  const members = project?.members
 
   const handleHide = () => {
     setShow(false)
diff --git a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx
index 6ab6acb6a0..12c6ba0e7a 100644
--- a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx
+++ b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-other-project-source.tsx
@@ -34,7 +34,7 @@ export const FigureModalOtherProjectSource: FC = () => {
   const { t } = useTranslation()
   const view = useCodeMirrorViewContext()
   const { dispatch } = useFigureModalContext()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { loading: projectsLoading, data: projects, error } = useUserProjects()
   const [selectedProject, setSelectedProject] = useState<null | Project>(null)
   const { hasLinkedProjectFileFeature, hasLinkedProjectOutputFileFeature } =
diff --git a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-upload-source.tsx b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-upload-source.tsx
index 94877fb233..b92398ef4b 100644
--- a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-upload-source.tsx
+++ b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-upload-source.tsx
@@ -34,7 +34,7 @@ export const FigureModalUploadFileSource: FC = () => {
   const { t } = useTranslation()
   const view = useCodeMirrorViewContext()
   const { dispatch, pastedImageData } = useFigureModalContext()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { rootFile } = useCurrentProjectFolders()
   const [folder, setFolder] = useState<File | null>(null)
   const [nameDirty, setNameDirty] = useState<boolean>(false)
diff --git a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx
index 2db449e172..c93ebd5c94 100644
--- a/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx
+++ b/services/web/frontend/js/features/source-editor/components/figure-modal/file-sources/figure-modal-url-source.tsx
@@ -46,7 +46,7 @@ export const FigureModalUrlSource: FC = () => {
   const [url, setUrl] = useState<string>('')
   const [nameDirty, setNameDirty] = useState<boolean>(false)
   const [name, setName] = useState<string>('')
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { rootFile } = useCurrentProjectFolders()
   const [folder, setFolder] = useState<File>(rootFile)
 
diff --git a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
index f894758de9..8e46bdd7c5 100644
--- a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
+++ b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useRef } from 'react'
 import { EditorState } from '@codemirror/state'
-import useScopeValue from '../../../shared/hooks/use-scope-value'
 import useScopeEventEmitter from '../../../shared/hooks/use-scope-event-emitter'
 import useEventListener from '../../../shared/hooks/use-event-listener'
 import useScopeEventListener from '../../../shared/hooks/use-scope-event-listener'
@@ -55,6 +54,7 @@ import { GotoOffsetOptions } from '@/features/ide-react/context/editor-manager-c
 import { GotoLineOptions } from '@/features/ide-react/types/goto-line-options'
 import { useOnlineUsersContext } from '@/features/ide-react/context/online-users-context'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import { useProjectContext } from '@/shared/context/project-context'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
 import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 import { SearchQuery } from '@codemirror/search'
@@ -92,17 +92,13 @@ function useCodeMirrorScope(view: EditorView) {
 
   const { onlineUserCursorHighlights } = useOnlineUsersContext()
 
-  let [spellCheckLanguage] = useScopeValue<string>('project.spellCheckLanguage')
+  const { project, features: projectFeatures } = useProjectContext()
+  let spellCheckLanguage = project?.spellCheckLanguage || ''
   // spell check is off when read-only
   if (!permissions.write && !permissions.trackedWrite) {
     spellCheckLanguage = ''
   }
 
-  const [projectFeatures] =
-    useScopeValue<Record<string, boolean | string | number | undefined>>(
-      'project.features'
-    )
-
   const hunspellManager = useHunspell(spellCheckLanguage)
 
   const { showVisual: visual, trackChanges } = useEditorPropertiesContext()
diff --git a/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx b/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx
index 4dd58958ac..f5208166c4 100644
--- a/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx
+++ b/services/web/frontend/js/features/word-count-modal/components/word-count-client.tsx
@@ -19,7 +19,8 @@ export const WordCountClient: FC = () => {
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState(false)
   const [data, setData] = useState<WordCountData | null>(null)
-  const { projectSnapshot, rootDocId } = useProjectContext()
+  const { projectSnapshot, project } = useProjectContext()
+  const rootDocId = project?.rootDocId
   const { spellCheckLanguage } = useProjectSettingsContext()
   const { openDocs } = useEditorManagerContext()
   const { currentDocument } = useEditorOpenDocContext()
diff --git a/services/web/frontend/js/features/word-count-modal/components/word-count-server.tsx b/services/web/frontend/js/features/word-count-modal/components/word-count-server.tsx
index a34807864e..4435b48500 100644
--- a/services/web/frontend/js/features/word-count-modal/components/word-count-server.tsx
+++ b/services/web/frontend/js/features/word-count-modal/components/word-count-server.tsx
@@ -10,7 +10,7 @@ import { debugConsole } from '@/utils/debugging'
 import { WordCounts } from '@/features/word-count-modal/components/word-counts'
 
 export const WordCountServer: FC = () => {
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
   const { clsiServerId } = useLocalCompileContext()
 
   const [loading, setLoading] = useState(true)
diff --git a/services/web/frontend/js/shared/context/editor-context.tsx b/services/web/frontend/js/shared/context/editor-context.tsx
index 945c6b63af..d3d56fe64a 100644
--- a/services/web/frontend/js/shared/context/editor-context.tsx
+++ b/services/web/frontend/js/shared/context/editor-context.tsx
@@ -9,9 +9,7 @@ import {
   useMemo,
   useState,
 } from 'react'
-import useScopeValue from '../hooks/use-scope-value'
 import useBrowserWindow from '../hooks/use-browser-window'
-import { useIdeContext } from './ide-context'
 import { useProjectContext } from './project-context'
 import { useDetachContext } from './detach-context'
 import getMeta from '../../utils/meta'
@@ -46,12 +44,18 @@ export const EditorContext = createContext<
 >(undefined)
 
 export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
-  const { socket } = useIdeContext()
   const { id: userId, featureUsage } = useUserContext()
   const { role } = useDetachContext()
   const { showGenericMessageModal } = useModalsContext()
 
-  const { owner, features, _id: projectId, members } = useProjectContext()
+  const {
+    features,
+    projectId,
+    project,
+    name: projectName,
+    updateProject,
+  } = useProjectContext()
+  const { owner, members } = project || {}
 
   const cobranding = useMemo(() => {
     const brandVariation = getMeta('ol-brandVariation')
@@ -71,8 +75,6 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
     )
   }, [])
 
-  const [projectName, setProjectName] = useScopeValue('project.name')
-
   const [inactiveTutorials, setInactiveTutorials] = useState(
     () => getMeta('ol-inactiveTutorials') || []
   )
@@ -95,10 +97,12 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
 
   const isPendingEditor = useMemo(
     () =>
-      members?.some(
-        member =>
-          member._id === userId &&
-          (member.pendingEditor || member.pendingReviewer)
+      Boolean(
+        members?.some(
+          member =>
+            member._id === userId &&
+            (member.pendingEditor || member.pendingReviewer)
+        )
       ),
     [members, userId]
   )
@@ -110,33 +114,25 @@ export const EditorProvider: FC<React.PropsWithChildren> = ({ children }) => {
     [inactiveTutorials]
   )
 
-  useEffect(() => {
-    if (socket) {
-      socket.on('projectNameUpdated', setProjectName)
-      return () => socket.removeListener('projectNameUpdated', setProjectName)
-    }
-  }, [socket, setProjectName])
-
   const renameProject = useCallback(
     (newName: string) => {
-      setProjectName((oldName: string) => {
-        if (oldName !== newName) {
-          saveProjectSettings(projectId, { name: newName }).catch(
-            (response: any) => {
-              setProjectName(oldName)
-              const { data, status } = response
+      const oldName = projectName
+      if (newName !== oldName) {
+        updateProject({ name: newName })
+        saveProjectSettings(projectId, { name: newName }).catch(
+          (response: any) => {
+            updateProject({ name: oldName })
+            const { data, status } = response
 
-              showGenericMessageModal(
-                'Error renaming project',
-                status === 400 ? data : 'Please try again in a moment'
-              )
-            }
-          )
-        }
-        return newName
-      })
+            showGenericMessageModal(
+              'Error renaming project',
+              status === 400 ? data : 'Please try again in a moment'
+            )
+          }
+        )
+      }
     },
-    [setProjectName, projectId, showGenericMessageModal]
+    [projectName, updateProject, projectId, showGenericMessageModal]
   )
 
   const { setTitle } = useBrowserWindow()
diff --git a/services/web/frontend/js/shared/context/file-tree-data-context.tsx b/services/web/frontend/js/shared/context/file-tree-data-context.tsx
index 889c865e91..be48f52776 100644
--- a/services/web/frontend/js/shared/context/file-tree-data-context.tsx
+++ b/services/web/frontend/js/shared/context/file-tree-data-context.tsx
@@ -8,7 +8,6 @@ import {
   FC,
   useEffect,
 } from 'react'
-import useScopeValue from '../hooks/use-scope-value'
 import {
   renameInTree,
   deleteInTree,
@@ -20,7 +19,6 @@ import useDeepCompareEffect from '../../shared/hooks/use-deep-compare-effect'
 import { docsInFolder } from '@/features/file-tree/util/docs-in-folder'
 import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
 import { Folder } from '../../../../types/folder'
-import { Project } from '../../../../types/project'
 import { MainDocument } from '../../../../types/project-settings'
 import { FindResult } from '@/features/file-tree/util/path'
 import {
@@ -28,6 +26,7 @@ import {
   useSnapshotContext,
 } from '@/features/ide-react/context/snapshot-context'
 import importOverleafModules from '../../../macros/import-overleaf-module.macro'
+import { useProjectContext } from '@/shared/context/project-context'
 import { useIdeReactContext } from '@/features/ide-react/context/ide-react-context'
 
 const { buildFileTree, createFolder } =
@@ -182,7 +181,7 @@ export function useFileTreeData() {
 export const FileTreeDataProvider: FC<React.PropsWithChildren> = ({
   children,
 }) => {
-  const [project] = useScopeValue<Project>('project')
+  const { project } = useProjectContext()
   const { currentDocumentId, setOpenDocName } = useEditorOpenDocContext()
   const { permissionsLevel } = useIdeReactContext()
   const { fileTreeFromHistory, snapshot, snapshotVersion } =
@@ -195,7 +194,7 @@ export const FileTreeDataProvider: FC<React.PropsWithChildren> = ({
   useEffect(() => {
     if (fileTreeFromHistory) return
     setRootFolder(project?.rootFolder)
-  }, [project, fileTreeFromHistory])
+  }, [project?.rootFolder, fileTreeFromHistory])
 
   useEffect(() => {
     if (!fileTreeFromHistory) return
diff --git a/services/web/frontend/js/shared/context/local-compile-context.tsx b/services/web/frontend/js/shared/context/local-compile-context.tsx
index 827688c2b2..0e938aa881 100644
--- a/services/web/frontend/js/shared/context/local-compile-context.tsx
+++ b/services/web/frontend/js/shared/context/local-compile-context.tsx
@@ -131,13 +131,8 @@ export const LocalCompileProvider: FC<React.PropsWithChildren> = ({
   const { currentDocument } = useEditorOpenDocContext()
   const { role } = useDetachContext()
 
-  const {
-    _id: projectId,
-    rootDocId,
-    joinedOnce,
-    imageName,
-    compiler: compilerName,
-  } = useProjectContext()
+  const { projectId, joinedOnce, project } = useProjectContext()
+  const { rootDocId, imageName, compiler: compilerName } = project || {}
 
   const { pdfPreviewOpen } = useLayoutContext()
 
diff --git a/services/web/frontend/js/shared/context/project-context.tsx b/services/web/frontend/js/shared/context/project-context.tsx
index f294a88021..8861aba1a5 100644
--- a/services/web/frontend/js/shared/context/project-context.tsx
+++ b/services/web/frontend/js/shared/context/project-context.tsx
@@ -1,10 +1,31 @@
-import { FC, createContext, useContext, useMemo, useState } from 'react'
-import useScopeValue from '../hooks/use-scope-value'
+import {
+  FC,
+  createContext,
+  useContext,
+  useMemo,
+  useState,
+  useCallback,
+} from 'react'
 import getMeta from '@/utils/meta'
-import { ProjectContextValue } from './types/project-context'
+import { ProjectUpdate, ProjectMetadata } from './types/project-metadata'
 import { ProjectSnapshot } from '@/infrastructure/project-snapshot'
+import { Tag } from '../../../../app/src/Features/Tags/types'
 
-const ProjectContext = createContext<ProjectContextValue | undefined>(undefined)
+type ProjectContextValue = {
+  projectId: ProjectMetadata['_id']
+  project: ProjectMetadata | null
+  joinProject: (project: ProjectMetadata) => void
+  updateProject: (projectUpdate: ProjectUpdate) => void
+  joinedOnce: boolean
+  projectSnapshot: ProjectSnapshot
+  tags: Tag[]
+  features: ProjectMetadata['features']
+  name: ProjectMetadata['name']
+}
+
+export const ProjectContext = createContext<ProjectContextValue | undefined>(
+  undefined
+)
 
 export function useProjectContext() {
   const context = useContext(ProjectContext)
@@ -18,35 +39,33 @@ export function useProjectContext() {
   return context
 }
 
-// when the provider is created the project is still not added to the Angular
-// scope. A few props are populated to prevent errors in existing React
-// components
-const projectFallback = {
-  _id: getMeta('ol-project_id'),
-  name: '',
-  features: {},
-}
-
 export const ProjectProvider: FC<React.PropsWithChildren> = ({ children }) => {
-  const [project] = useScopeValue('project')
-  const joinedOnce = !!project
+  const [joinedOnce, setJoinedOnce] = useState(false)
+  const [project, setProject] = useState<ProjectMetadata | null>(null)
 
-  const {
-    _id,
-    compiler,
-    imageName,
-    name,
-    rootDocId,
-    members,
-    invites,
-    features,
-    publicAccesLevel: publicAccessLevel,
-    owner,
-    trackChangesState,
-    mainBibliographyDoc_id: mainBibliographyDocId,
-  } = project || projectFallback
+  // Expose some project properties with fallbacks for convenience
+  const projectId = project ? project._id : getMeta('ol-project_id')
+  const name = project ? project.name : ''
+  const features = project ? project.features : {}
 
-  const [projectSnapshot] = useState(() => new ProjectSnapshot(_id))
+  const joinProject = useCallback((projectData: ProjectMetadata) => {
+    setProject(projectData)
+    setJoinedOnce(true)
+  }, [])
+
+  const updateProject = useCallback((projectUpdateData: ProjectUpdate) => {
+    setProject(projectData => {
+      // Only perform the update if `project` is already set, otherwise we could
+      // end up with an incomplete project object
+      if (!projectData) {
+        throw new Error('Project not initialized. Use joinProject first.')
+      }
+
+      return Object.assign({}, projectData, projectUpdateData)
+    })
+  }, [])
+
+  const [projectSnapshot] = useState(() => new ProjectSnapshot(projectId))
 
   const tags = useMemo(
     () =>
@@ -56,41 +75,17 @@ export const ProjectProvider: FC<React.PropsWithChildren> = ({ children }) => {
     []
   )
 
-  const value = useMemo(() => {
-    return {
-      _id,
-      compiler,
-      imageName,
-      name,
-      rootDocId,
-      members,
-      invites,
-      features,
-      publicAccessLevel,
-      owner,
-      tags,
-      trackChangesState,
-      mainBibliographyDocId,
-      projectSnapshot,
-      joinedOnce,
-    }
-  }, [
-    _id,
-    compiler,
-    imageName,
-    name,
-    rootDocId,
-    members,
-    invites,
-    features,
-    publicAccessLevel,
-    owner,
-    tags,
-    trackChangesState,
-    mainBibliographyDocId,
-    projectSnapshot,
+  const value = {
+    projectId,
+    project,
+    joinProject,
+    updateProject,
     joinedOnce,
-  ])
+    projectSnapshot,
+    tags,
+    features,
+    name,
+  }
 
   return (
     <ProjectContext.Provider value={value}>{children}</ProjectContext.Provider>
diff --git a/services/web/frontend/js/shared/context/types/project-context.tsx b/services/web/frontend/js/shared/context/types/project-metadata.tsx
similarity index 65%
rename from services/web/frontend/js/shared/context/types/project-context.tsx
rename to services/web/frontend/js/shared/context/types/project-metadata.tsx
index 4e1abdc420..b0847dfda7 100644
--- a/services/web/frontend/js/shared/context/types/project-context.tsx
+++ b/services/web/frontend/js/shared/context/types/project-metadata.tsx
@@ -1,9 +1,9 @@
 import { UserId } from '../../../../../types/user'
 import { PublicAccessLevel } from '../../../../../types/public-access-level'
-import { ProjectSnapshot } from '@/infrastructure/project-snapshot'
-import { Tag } from '../../../../../app/src/Features/Tags/types'
+import { ProjectSettings } from '@/features/editor-left-menu/utils/api'
+import { Folder } from '../../../../../types/folder'
 
-export type ProjectContextMember = {
+export type ProjectMember = {
   _id: UserId
   privileges: 'readOnly' | 'readAndWrite' | 'review'
   email: string
@@ -13,15 +13,11 @@ export type ProjectContextMember = {
   pendingReviewer?: boolean
 }
 
-export type ProjectContextValue = {
+export interface ProjectMetadata extends ProjectSettings {
   _id: string
-  name: string
-  rootDocId?: string
   mainBibliographyDocId?: string
-  compiler: string
-  imageName: string
-  members: ProjectContextMember[]
-  invites: ProjectContextMember[]
+  members: ProjectMember[]
+  invites: ProjectMember[]
   features: {
     collaborators?: number
     compileGroup?: 'alpha' | 'standard' | 'priority'
@@ -44,10 +40,8 @@ export type ProjectContextValue = {
     privileges: string
     signUpDate: string
   }
-  tags: Tag[]
+  rootFolder?: Folder[]
   trackChangesState: boolean | Record<UserId | '__guests__', boolean>
-  projectSnapshot: ProjectSnapshot
-  joinedOnce: boolean
 }
 
-export type ProjectContextUpdateValue = Partial<ProjectContextValue>
+export type ProjectUpdate = Partial<ProjectMetadata>
diff --git a/services/web/frontend/js/shared/hooks/use-stop-on-first-error.ts b/services/web/frontend/js/shared/hooks/use-stop-on-first-error.ts
index 05dc7e36e6..b85c7a0e7d 100644
--- a/services/web/frontend/js/shared/hooks/use-stop-on-first-error.ts
+++ b/services/web/frontend/js/shared/hooks/use-stop-on-first-error.ts
@@ -10,7 +10,7 @@ type UseStopOnFirstErrorProps = {
 export function useStopOnFirstError(opts: UseStopOnFirstErrorProps = {}) {
   const { eventSource } = opts
   const { stopOnFirstError, setStopOnFirstError } = useCompileContext()
-  const { _id: projectId } = useProjectContext()
+  const { projectId } = useProjectContext()
 
   type Opts = {
     projectId: string
diff --git a/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx b/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx
index 72955f38e6..d65669f720 100644
--- a/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx
+++ b/services/web/test/frontend/components/editor-left-menu/editor-left-menu.spec.tsx
@@ -4,11 +4,16 @@ import {
   OverallThemeMeta,
   SpellCheckLanguage,
 } from '../../../../types/project-settings'
-import { EditorProviders } from '../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeProjectProvider,
+} from '../../helpers/editor-providers'
 import { mockScope } from './scope'
 import { Folder } from '../../../../types/folder'
 import { docsInFolder } from '@/features/file-tree/util/docs-in-folder'
 import getMeta from '@/utils/meta'
+import { mockProject } from '../../features/source-editor/helpers/mock-project'
+import { UserId } from '../../../../types/user'
 
 describe('<EditorLeftMenu />', function () {
   beforeEach(function () {
@@ -57,9 +62,14 @@ describe('<EditorLeftMenu />', function () {
 
     it('render full menu', function () {
       const scope = mockScope()
+      const project = mockProject()
 
       cy.mount(
-        <EditorProviders scope={scope} layoutContext={{ leftMenuShown: true }}>
+        <EditorProviders
+          scope={scope}
+          layoutContext={{ leftMenuShown: true }}
+          providers={{ ProjectProvider: makeProjectProvider(project) }}
+        >
           <EditorLeftMenu />
         </EditorProviders>
       )
@@ -209,12 +219,6 @@ describe('<EditorLeftMenu />', function () {
         })
 
         const scope = mockScope({
-          project: {
-            members: [],
-            owner: {
-              _id: '123',
-            },
-          },
           user: {
             features: {
               dropbox: false,
@@ -226,6 +230,14 @@ describe('<EditorLeftMenu />', function () {
           <EditorProviders
             scope={scope}
             layoutContext={{ leftMenuShown: true }}
+            projectOwner={{
+              _id: '123' as UserId,
+              email: 'owner@example.com',
+              first_name: 'Test',
+              last_name: 'Owner',
+              privileges: 'owner',
+              signUpDate: new Date('2025-07-07').toISOString(),
+            }}
           >
             <EditorLeftMenu />
           </EditorProviders>
@@ -236,21 +248,25 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows git modal correctly', function () {
-        const scope = mockScope({
-          project: {
-            owner: {
-              _id: '123',
-            },
-            features: {
-              gitBridge: true,
-            },
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
           <EditorProviders
             scope={scope}
             layoutContext={{ leftMenuShown: true }}
+            projectOwner={{
+              _id: '123' as UserId,
+              email: 'owner@example.com',
+              first_name: 'Test',
+              last_name: 'Owner',
+              privileges: 'owner',
+              signUpDate: new Date('2025-07-07').toISOString(),
+            }}
+            projectFeatures={
+              {
+                gitBridge: true,
+              } as any
+            }
           >
             <EditorLeftMenu />
           </EditorProviders>
@@ -262,21 +278,25 @@ describe('<EditorLeftMenu />', function () {
       })
 
       it('shows git modal paywall correctly', function () {
-        const scope = mockScope({
-          project: {
-            owner: {
-              _id: '123',
-            },
-            features: {
-              gitBridge: false,
-            },
-          },
-        })
+        const scope = mockScope()
 
         cy.mount(
           <EditorProviders
             scope={scope}
             layoutContext={{ leftMenuShown: true }}
+            projectOwner={{
+              _id: '123' as UserId,
+              email: 'owner@example.com',
+              first_name: 'Test',
+              last_name: 'Owner',
+              privileges: 'owner',
+              signUpDate: new Date('2025-07-07').toISOString(),
+            }}
+            projectFeatures={
+              {
+                gitBridge: false,
+              } as any
+            }
           >
             <EditorLeftMenu />
           </EditorProviders>
diff --git a/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
index 47f7e1024d..34a3893ab5 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-preview.spec.tsx
@@ -9,6 +9,7 @@ import {
 } from '../../../../frontend/js/shared/context/layout-context'
 import { FC, PropsWithChildren, useEffect } from 'react'
 import { useLocalCompileContext } from '@/shared/context/local-compile-context'
+import { ProjectCompiler } from '../../../../types/project-settings'
 
 const storeAndFireEvent = (win: typeof window, key: string, value: unknown) => {
   localStorage.setItem(key, value)
@@ -215,7 +216,7 @@ describe('<PdfPreview/>', function () {
         cached: false,
         setup: () => {},
         props: {
-          compiler: 'lualatex',
+          compiler: 'lualatex' as ProjectCompiler,
         },
       },
       'ignores the compile from cache when draft mode changed': {
diff --git a/services/web/test/frontend/features/clone-project-modal/components/clone-project-modal.test.jsx b/services/web/test/frontend/features/clone-project-modal/components/clone-project-modal.test.jsx
index 6a837ed81f..0f523349e6 100644
--- a/services/web/test/frontend/features/clone-project-modal/components/clone-project-modal.test.jsx
+++ b/services/web/test/frontend/features/clone-project-modal/components/clone-project-modal.test.jsx
@@ -15,9 +15,9 @@ describe('<EditorCloneProjectModalWrapper />', function () {
     fetchMock.removeRoutes().clearHistory()
   })
 
-  const project = {
-    _id: 'project-1',
-    name: 'Test Project',
+  const contextProps = {
+    projectId: 'project-1',
+    projectName: 'Test Project',
   }
 
   it('renders the translated modal title', async function () {
@@ -30,7 +30,7 @@ describe('<EditorCloneProjectModalWrapper />', function () {
         openProject={openProject}
         show
       />,
-      { scope: { project } }
+      contextProps
     )
 
     await screen.findByText('Copy project')
@@ -55,7 +55,7 @@ describe('<EditorCloneProjectModalWrapper />', function () {
         openProject={openProject}
         show
       />,
-      { scope: { project } }
+      contextProps
     )
 
     const cancelButton = await screen.findByRole('button', { name: 'Cancel' })
@@ -123,7 +123,7 @@ describe('<EditorCloneProjectModalWrapper />', function () {
         openProject={openProject}
         show
       />,
-      { scope: { project } }
+      contextProps
     )
 
     const button = await screen.findByRole('button', { name: 'Copy' })
@@ -160,7 +160,7 @@ describe('<EditorCloneProjectModalWrapper />', function () {
         openProject={openProject}
         show
       />,
-      { scope: { project } }
+      contextProps
     )
 
     const button = await screen.findByRole('button', { name: 'Copy' })
diff --git a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
index 9cccd5093b..fcad15969b 100644
--- a/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
+++ b/services/web/test/frontend/features/review-panel/review-panel.spec.tsx
@@ -1,12 +1,14 @@
 import CodeMirrorEditor from '../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import {
   EditorProviders,
+  makeProjectProvider,
   USER_EMAIL,
   USER_ID,
 } from '../../helpers/editor-providers'
 import { mockScope } from '../source-editor/helpers/mock-scope'
 import { TestContainer } from '../source-editor/helpers/test-container'
 import { docId } from '../source-editor/helpers/mock-doc'
+import { mockProject } from '../source-editor/helpers/mock-project'
 
 const userData = {
   avatar_text: 'User',
@@ -181,14 +183,22 @@ describe('<ReviewPanel />', function () {
           removeChangeIds,
         },
       },
-      projectFeatures: { trackChangesVisible: true },
+    })
+    const project = mockProject({
+      projectOwner: {
+        _id: USER_ID,
+      },
+      projectFeatures: { trackChanges: false, trackChangesVisible: true },
     })
 
     cy.wrap(scope).as('scope')
 
     cy.mount(
       <TestContainer className="rp-size-expanded">
-        <EditorProviders scope={scope}>
+        <EditorProviders
+          scope={scope}
+          providers={{ ProjectProvider: makeProjectProvider(project) }}
+        >
           <CodeMirrorEditor />
         </EditorProviders>
       </TestContainer>
@@ -653,6 +663,10 @@ describe('<ReviewPanel /> in mini mode', function () {
       projectFeatures: { trackChangesVisible: true },
     })
 
+    const project = mockProject({
+      projectFeatures: { trackChangesVisible: true },
+    })
+
     cy.intercept('GET', '/project/*/ranges', [
       {
         id: docId,
@@ -672,7 +686,10 @@ describe('<ReviewPanel /> in mini mode', function () {
 
     cy.mount(
       <TestContainer>
-        <EditorProviders scope={scope}>
+        <EditorProviders
+          scope={scope}
+          providers={{ ProjectProvider: makeProjectProvider(project) }}
+        >
           <CodeMirrorEditor />
         </EditorProviders>
       </TestContainer>
@@ -717,7 +734,7 @@ describe('<ReviewPanel /> in mini mode', function () {
     cy.get('.review-panel-mini').should('not.exist')
   })
 
-  it("doesn't render mini when a resolved comments is present in document", function () {
+  it("doesn't render mini when a resolved comment is present in document", function () {
     render({
       comments: [
         {
@@ -747,7 +764,7 @@ describe('<ReviewPanel /> in mini mode', function () {
     cy.get('.review-panel-mini').should('not.exist')
   })
 
-  it('renders mini when a unresolved comments is present in document', function () {
+  it('renders mini when an unresolved comment is present in document', function () {
     render({
       comments: [
         {
@@ -796,6 +813,8 @@ describe('<ReviewPanel /> for free users', function () {
   function mountEditor(ownerId = USER_ID) {
     const scope = mockScope(undefined, {
       permissions: { write: true, trackedWrite: false, comment: true },
+    })
+    const project = mockProject({
       projectFeatures: { trackChanges: false, trackChangesVisible: true },
       projectOwner: {
         _id: ownerId,
@@ -806,7 +825,10 @@ describe('<ReviewPanel /> for free users', function () {
 
     cy.mount(
       <TestContainer className="rp-size-expanded">
-        <EditorProviders scope={scope}>
+        <EditorProviders
+          scope={scope}
+          providers={{ ProjectProvider: makeProjectProvider(project) }}
+        >
           <CodeMirrorEditor />
         </EditorProviders>
       </TestContainer>
diff --git a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
index 793ff7b16d..548423e90f 100644
--- a/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
+++ b/services/web/test/frontend/features/share-project-modal/components/share-project-modal.test.jsx
@@ -1,18 +1,19 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import { screen, fireEvent, render, waitFor } from '@testing-library/react'
+import { screen, fireEvent, waitFor } from '@testing-library/react'
 import fetchMock from 'fetch-mock'
 import userEvent from '@testing-library/user-event'
 
 import ShareProjectModal from '../../../../../frontend/js/features/share-project-modal/components/share-project-modal'
 import { renderWithEditorContext } from '../../../helpers/render-with-context'
 import {
-  EditorProviders,
+  makeProjectProvider,
+  projectDefaults,
   USER_EMAIL,
   USER_ID,
 } from '../../../helpers/editor-providers'
 import { location } from '@/shared/components/location'
-import useScopeValue from '@/shared/hooks/use-scope-value'
+import { useProjectContext } from '@/shared/context/project-context'
 
 async function changePrivilegeLevel(screen, { current, next }) {
   const select = screen.getByDisplayValue(current)
@@ -23,22 +24,25 @@ async function changePrivilegeLevel(screen, { current, next }) {
   fireEvent.click(option)
 }
 
-describe('<ShareProjectModal/>', function () {
-  const project = {
-    _id: 'test-project',
-    name: 'Test Project',
-    features: {
-      collaborators: 10,
-      compileGroup: 'standard',
-    },
-    owner: {
-      _id: USER_ID,
-      email: USER_EMAIL,
-    },
-    members: [],
-    invites: [],
-  }
+const shareModalProjectDefaults = Object.assign({}, projectDefaults, {
+  _id: 'test-project',
+  name: 'Test Project',
+  features: {
+    collaborators: 10,
+    compileGroup: 'standard',
+  },
+  owner: {
+    _id: USER_ID,
+    email: USER_EMAIL,
+  },
+})
 
+function createContextProps(projectOverrides) {
+  const project = Object.assign({}, shareModalProjectDefaults, projectOverrides)
+  return { providers: { ProjectProvider: makeProjectProvider(project) } }
+}
+
+describe('<ShareProjectModal/>', function () {
   const contacts = [
     // user with edited name
     {
@@ -101,9 +105,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('renders the modal', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps()
+    )
 
     await screen.findByText('Share Project')
   })
@@ -113,7 +118,7 @@ describe('<ShareProjectModal/>', function () {
 
     renderWithEditorContext(
       <ShareProjectModal {...modalProps} handleHide={handleHide} />,
-      { scope: { project } }
+      createContextProps()
     )
 
     const [headerCloseButton, footerCloseButton] = await screen.findAllByRole(
@@ -128,9 +133,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('handles access level "private"', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project: { ...project, publicAccesLevel: 'private' } },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'private' })
+    )
 
     await screen.findByText('Link sharing is off')
     await screen.findByRole('button', { name: 'Turn on link sharing' })
@@ -149,10 +155,11 @@ describe('<ShareProjectModal/>', function () {
       readAndWriteHashPrefix: 'taEVki',
       readOnlyHashPrefix: 'j2xYbL',
     }
-    fetchMock.get(`/project/${project._id}/tokens`, tokens)
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project: { ...project, publicAccesLevel: 'tokenBased' } },
-    })
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, tokens)
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased' })
+    )
 
     await screen.findByText('Link sharing is on')
     await screen.findByRole('button', { name: 'Turn off link sharing' })
@@ -171,9 +178,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('handles legacy access level "readAndWrite"', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project: { ...project, publicAccesLevel: 'readAndWrite' } },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'readAndWrite' })
+    )
 
     await screen.findByText(
       'This project is public and can be edited by anyone with the URL.'
@@ -182,9 +190,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('handles legacy access level "readOnly"', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project: { ...project, publicAccesLevel: 'readOnly' } },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'readOnly' })
+    )
 
     await screen.findByText(
       'This project is public and can be viewed but not edited by anyone with the URL'
@@ -193,7 +202,7 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('displays actions for project-owners', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
 
     const invites = [
       {
@@ -204,18 +213,9 @@ describe('<ShareProjectModal/>', function () {
     ]
 
     // render as project owner: actions should be present
-    render(
-      <EditorProviders
-        scope={{
-          project: {
-            ...project,
-            invites,
-            publicAccesLevel: 'tokenBased',
-          },
-        }}
-      >
-        <ShareProjectModal {...modalProps} />
-      </EditorProviders>
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased', invites })
     )
 
     await screen.findByRole('button', { name: 'Turn off link sharing' })
@@ -231,23 +231,13 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    render(
-      <EditorProviders
-        scope={{
-          project: {
-            ...project,
-            invites,
-            publicAccesLevel: 'tokenBased',
-          },
-        }}
-        user={{
-          id: 'non-project-owner',
-          email: 'non-project-owner@example.com',
-        }}
-      >
-        <ShareProjectModal {...modalProps} />
-      </EditorProviders>
-    )
+    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
+      ...createContextProps({ publicAccessLevel: 'tokenBased', invites }),
+      user: {
+        id: 'non-project-owner',
+        email: 'non-project-owner@example.com',
+      },
+    })
 
     await screen.findByText(
       'To change access permissions, please ask the project owner'
@@ -269,23 +259,13 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    render(
-      <EditorProviders
-        scope={{
-          project: {
-            ...project,
-            invites,
-            publicAccesLevel: 'private',
-          },
-        }}
-        user={{
-          id: 'non-project-owner',
-          email: 'non-project-owner@example.com',
-        }}
-      >
-        <ShareProjectModal {...modalProps} />
-      </EditorProviders>
-    )
+    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
+      ...createContextProps({ publicAccessLevel: 'private', invites }),
+      user: {
+        id: 'non-project-owner',
+        email: 'non-project-owner@example.com',
+      },
+    })
 
     await screen.findByText(
       'To add more collaborators or turn on link sharing, please ask the project owner'
@@ -300,11 +280,11 @@ describe('<ShareProjectModal/>', function () {
 
   it('only shows read-only token link to restricted token members', async function () {
     window.metaAttributesCache.set('ol-isRestrictedTokenMember', true)
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
 
     renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
+      ...createContextProps({ publicAccessLevel: 'private' }),
       isRestrictedTokenMember: true,
-      scope: { project: { ...project, publicAccesLevel: 'tokenBased' } },
     })
 
     // no buttons
@@ -346,18 +326,12 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          members,
-          invites,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased', members, invites })
+    )
 
     const projectOwnerEmail = USER_EMAIL
 
@@ -381,7 +355,7 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('resends an invite', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
     fetchMock.postOnce(
       'express:/project/:projectId/invite/:inviteId/resend',
       204
@@ -395,15 +369,10 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          invites,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased', invites })
+    )
 
     const [, closeButton] = screen.getAllByRole('button', {
       name: 'Close',
@@ -419,7 +388,7 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('revokes an invite', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
     fetchMock.deleteOnce('express:/project/:projectId/invite/:inviteId', 204)
 
     const invites = [
@@ -430,15 +399,10 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          invites,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased', invites })
+    )
 
     const [, closeButton] = screen.getAllByRole('button', {
       name: 'Close',
@@ -453,7 +417,7 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('changes member privileges to read + write', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
     fetchMock.putOnce('express:/project/:projectId/users/:userId', 204)
 
     const members = [
@@ -464,17 +428,12 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          members,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased', members })
+    )
 
-    const [, closeButton] = await screen.getAllByRole('button', {
+    const [, closeButton] = screen.getAllByRole('button', {
       name: 'Close',
     })
 
@@ -494,7 +453,7 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('removes a member from the project', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
     fetchMock.deleteOnce('express:/project/:projectId/users/:userId', 204)
 
     const members = [
@@ -505,15 +464,10 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          members,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased', members })
+    )
 
     expect(
       await screen.findAllByText('member-viewer@example.com')
@@ -537,7 +491,7 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('changes member privileges to owner with confirmation', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
     fetchMock.postOnce('express:/project/:projectId/transfer-ownership', 204)
 
     const members = [
@@ -548,15 +502,10 @@ describe('<ShareProjectModal/>', function () {
       },
     ]
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          members,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased', members })
+    )
 
     await screen.findByText('member-viewer@example.com')
     expect(screen.queryAllByText('member-viewer@example.com')).to.have.length(1)
@@ -586,16 +535,12 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('sends invites to input email addresses', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({ publicAccessLevel: 'tokenBased' })
+    )
 
     const [inputElement] = await screen.findAllByLabelText('Add people')
 
@@ -680,26 +625,24 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('displays a message when the collaborator limit is reached', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
     fetchMock.post(
       '/event/paywall-prompt',
       {},
       { body: { 'paywall-type': 'project-sharing' } }
     )
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          publicAccesLevel: 'tokenBased',
-          features: {
-            collaborators: 0,
-            compileGroup: 'standard',
-            trackChangesVisible: true,
-          },
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({
+        publicAccessLevel: 'tokenBased',
+        features: {
+          collaborators: 0,
+          compileGroup: 'standard',
+          trackChangesVisible: true,
         },
-      },
-    })
+      })
+    )
 
     await screen.findByText('Add more collaborators')
 
@@ -719,24 +662,22 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('counts reviewers towards the collaborator limit', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          features: {
-            collaborators: 1,
-            trackChangesVisible: true,
-          },
-          members: [
-            {
-              _id: 'reviewer-id',
-              email: 'reviewer@example.com',
-              privileges: 'review',
-            },
-          ],
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({
+        features: {
+          collaborators: 1,
+          trackChangesVisible: true,
         },
-      },
-    })
+        members: [
+          {
+            _id: 'reviewer-id',
+            email: 'reviewer@example.com',
+            privileges: 'review',
+          },
+        ],
+      })
+    )
 
     await screen.findByText('Add more collaborators')
 
@@ -757,16 +698,14 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('handles server error responses', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
 
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: {
-        project: {
-          ...project,
-          publicAccesLevel: 'tokenBased',
-        },
-      },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps({
+        publicAccessLevel: 'tokenBased',
+      })
+    )
 
     // loading contacts
     await waitFor(() => {
@@ -818,21 +757,25 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('handles switching between access levels', async function () {
-    fetchMock.get(`/project/${project._id}/tokens`, {})
+    fetchMock.get(`/project/${shareModalProjectDefaults._id}/tokens`, {})
     fetchMock.post('express:/project/:projectId/settings/admin', 204)
 
     let setPublicAccessLevel = function () {}
 
     function WrappedModal() {
-      setPublicAccessLevel = useScopeValue('project.publicAccesLevel')[1]
+      const { updateProject } = useProjectContext()
+      setPublicAccessLevel = publicAccessLevel => {
+        updateProject({ publicAccessLevel })
+      }
       return <ShareProjectModal {...modalProps} />
     }
 
-    renderWithEditorContext(<WrappedModal />, {
-      scope: {
-        project: { ...project, publicAccesLevel: 'private' },
-      },
-    })
+    renderWithEditorContext(
+      <WrappedModal />,
+      createContextProps({
+        publicAccessLevel: 'private',
+      })
+    )
 
     await screen.findByText('Link sharing is off')
 
@@ -848,8 +791,8 @@ describe('<ShareProjectModal/>', function () {
     })
 
     // NOTE: the project data is usually updated via the websocket connection
-    // but we can't do that so we're doing it via the scope value store (this
-    // will be via the project context when this value has been migrated)
+    // but we can't do that so we're doing it via the project context, which is
+    // exposed in a hacky way here
     setPublicAccessLevel('tokenBased')
 
     await screen.findByText('Link sharing is on')
@@ -870,9 +813,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('avoids selecting unmatched contact', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps()
+    )
 
     const [inputElement] = await screen.findAllByLabelText('Add people')
 
@@ -924,9 +868,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('selects contact by typing the entire email and blurring the input', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps()
+    )
 
     const [inputElement] = await screen.findAllByLabelText('Add people')
 
@@ -959,9 +904,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('selects contact by typing a partial email and selecting the suggestion', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps()
+    )
 
     const [inputElement] = await screen.findAllByLabelText('Add people')
 
@@ -993,9 +939,10 @@ describe('<ShareProjectModal/>', function () {
   })
 
   it('allows an email address to be selected, removed, then re-added', async function () {
-    renderWithEditorContext(<ShareProjectModal {...modalProps} />, {
-      scope: { project },
-    })
+    renderWithEditorContext(
+      <ShareProjectModal {...modalProps} />,
+      createContextProps()
+    )
 
     const [inputElement] = await screen.findAllByLabelText('Add people')
 
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-autocomplete.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-autocomplete.spec.tsx
index 932482205f..fc8831efd5 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-autocomplete.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-autocomplete.spec.tsx
@@ -64,7 +64,6 @@ describe('autocomplete', { scrollBehavior: false }, function () {
     ]
 
     const scope = mockScope()
-    scope.project.rootFolder = rootFolder
 
     cy.mount(
       <TestContainer>
@@ -446,7 +445,6 @@ describe('autocomplete', { scrollBehavior: false }, function () {
     ]
 
     const scope = mockScope()
-    scope.project.rootFolder = rootFolder
 
     cy.mount(
       <TestContainer>
@@ -910,7 +908,6 @@ describe('autocomplete', { scrollBehavior: false }, function () {
     ]
 
     const scope = mockScope()
-    scope.project.rootFolder = rootFolder
 
     cy.mount(
       <TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
index bd8eebfb18..e9896699c3 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
@@ -2,12 +2,15 @@ import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/
 import {
   EditorProviders,
   makeEditorPropertiesProvider,
+  makeProjectProvider,
+  USER_ID,
 } from '../../../helpers/editor-providers'
 import { mockScope, rootFolderId } from '../helpers/mock-scope'
 import { FC } from 'react'
 import { FileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
 import { TestContainer } from '../helpers/test-container'
 import getMeta from '@/utils/meta'
+import { mockProject } from '../helpers/mock-project'
 
 const clickToolbarButton = (text: string) => {
   cy.findByLabelText(text).click()
@@ -44,6 +47,11 @@ describe('<FigureModal />', function () {
   function mount() {
     const content = ''
     const scope = mockScope(content)
+    const project = mockProject({
+      projectOwner: {
+        _id: USER_ID,
+      },
+    })
 
     const FileTreePathProvider: FC<React.PropsWithChildren> = ({
       children,
@@ -69,6 +77,7 @@ describe('<FigureModal />', function () {
           scope={scope}
           providers={{
             FileTreePathProvider,
+            ProjectProvider: makeProjectProvider(project),
             EditorPropertiesProvider: makeEditorPropertiesProvider({
               showVisual: true,
               showSymbolPalette: false,
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-spellchecker-client.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-spellchecker-client.spec.tsx
index ee96d76d53..3677884a0c 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-spellchecker-client.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-spellchecker-client.spec.tsx
@@ -1,9 +1,13 @@
 import { mockScope } from '../helpers/mock-scope'
-import { EditorProviders } from '../../../helpers/editor-providers'
+import {
+  EditorProviders,
+  makeProjectProvider,
+} from '../../../helpers/editor-providers'
 import CodeMirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { TestContainer } from '../helpers/test-container'
 import forEach from 'mocha-each'
 import PackageVersions from '../../../../../app/src/infrastructure/PackageVersions'
+import { mockProject } from '../helpers/mock-project'
 
 const languages = [
   { code: 'af', dic: 'af_ZA', name: 'Afrikaans' },
@@ -125,11 +129,14 @@ forEach(Object.keys(suggestions)).describe(
       cy.interceptEvents()
 
       const scope = mockScope(content)
-      scope.project.spellCheckLanguage = spellCheckLanguage
+      const project = mockProject({ spellCheckLanguage })
 
       cy.mount(
         <TestContainer>
-          <EditorProviders scope={scope}>
+          <EditorProviders
+            scope={scope}
+            providers={{ ProjectProvider: makeProjectProvider(project) }}
+          >
             <CodeMirrorEditor />
           </EditorProviders>
         </TestContainer>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx
index 720335c035..7ffd4f0fcd 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-command-tooltip.spec.tsx
@@ -1,19 +1,24 @@
 import {
   EditorProviders,
   makeEditorPropertiesProvider,
+  makeProjectProvider,
 } from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import { TestContainer } from '../helpers/test-container'
+import { mockProject } from '../helpers/mock-project'
 
 const mountEditor = (content: string) => {
   const scope = mockScope(content)
 
+  const project = mockProject()
+
   cy.mount(
     <TestContainer>
       <EditorProviders
         scope={scope}
         providers={{
+          ProjectProvider: makeProjectProvider(project),
           EditorPropertiesProvider: makeEditorPropertiesProvider({
             showVisual: true,
             showSymbolPalette: false,
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx
index cc5bbdbe55..ca7efaca04 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-visual-list.spec.tsx
@@ -1,20 +1,24 @@
 import {
   EditorProviders,
   makeEditorPropertiesProvider,
+  makeProjectProvider,
 } from '../../../helpers/editor-providers'
 import CodemirrorEditor from '../../../../../frontend/js/features/source-editor/components/codemirror-editor'
 import { mockScope } from '../helpers/mock-scope'
 import { TestContainer } from '../helpers/test-container'
 import { isMac } from '@/shared/utils/os'
+import { mockProject } from '../helpers/mock-project'
 
 const mountEditor = (content: string) => {
   const scope = mockScope(content)
+  const project = mockProject()
 
   cy.mount(
     <TestContainer>
       <EditorProviders
         scope={scope}
         providers={{
+          ProjectProvider: makeProjectProvider(project),
           EditorPropertiesProvider: makeEditorPropertiesProvider({
             showVisual: true,
             showSymbolPalette: false,
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-project.ts b/services/web/test/frontend/features/source-editor/helpers/mock-project.ts
new file mode 100644
index 0000000000..f9848d1a96
--- /dev/null
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-project.ts
@@ -0,0 +1,78 @@
+import { docId } from './mock-doc'
+import { Folder } from '../../../../../types/folder'
+import { UserId } from '../../../../../types/user'
+import { ProjectCompiler } from '../../../../../types/project-settings'
+
+export const rootFolderId = '012345678901234567890123'
+export const figuresFolderId = '123456789012345678901234'
+export const figureId = '234567890123456789012345'
+export const mockProject = ({
+  projectFeatures = {},
+  projectOwner = undefined,
+  spellCheckLanguage = 'en',
+  rootFolder = null,
+}: any = {}) => {
+  return {
+    _id: 'test-project',
+    name: 'Test Project',
+    spellCheckLanguage,
+    rootDocId: '_root_doc_id',
+    rootFolder:
+      rootFolder ||
+      ([
+        {
+          _id: rootFolderId,
+          name: 'rootFolder',
+          docs: [
+            {
+              _id: docId,
+              name: 'test.tex',
+            },
+          ],
+          folders: [
+            {
+              _id: figuresFolderId,
+              name: 'figures',
+              docs: [
+                {
+                  _id: 'fake-nested-doc-id',
+                  name: 'foo.tex',
+                },
+              ],
+              folders: [],
+              fileRefs: [
+                {
+                  _id: figureId,
+                  name: 'frog.jpg',
+                  hash: '42',
+                },
+                {
+                  _id: 'fake-figure-id',
+                  name: 'unicorn.png',
+                  hash: '43',
+                },
+              ],
+            },
+          ],
+          fileRefs: [],
+        },
+      ] as Folder[]),
+    features: {
+      trackChanges: true,
+      ...projectFeatures,
+    },
+    compiler: 'pdflatex' as ProjectCompiler,
+    imageName: 'texlive-full:2024.1',
+    trackChangesState: false,
+    invites: [],
+    members: [],
+    owner: projectOwner || {
+      _id: '124abd' as UserId,
+      email: 'owner@example.com',
+      first_name: 'Test',
+      last_name: 'Owner',
+      privileges: 'owner',
+      signUpDate: new Date('2025-07-07').toISOString(),
+    },
+  }
+}
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
index c01d20f164..830a9c97a2 100644
--- a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
@@ -1,18 +1,10 @@
 import { docId, mockDoc } from './mock-doc'
 import { sleep } from '../../../helpers/sleep'
-import { Folder } from '../../../../../types/folder'
 
 export const rootFolderId = '012345678901234567890123'
-export const figuresFolderId = '123456789012345678901234'
-export const figureId = '234567890123456789012345'
 export const mockScope = (
   content?: string,
-  {
-    docOptions = {},
-    projectFeatures = {},
-    permissions = {},
-    projectOwner = undefined,
-  }: any = {}
+  { docOptions = {}, permissions = {} }: any = {}
 ) => {
   return {
     editor: {
@@ -21,55 +13,8 @@ export const mockScope = (
       currentDocumentId: docId,
       wantTrackChanges: false,
     },
-    project: {
-      _id: 'test-project',
-      name: 'Test Project',
-      spellCheckLanguage: 'en',
-      rootFolder: [
-        {
-          _id: rootFolderId,
-          name: 'rootFolder',
-          docs: [
-            {
-              _id: docId,
-              name: 'test.tex',
-            },
-          ],
-          folders: [
-            {
-              _id: figuresFolderId,
-              name: 'figures',
-              docs: [
-                {
-                  _id: 'fake-nested-doc-id',
-                  name: 'foo.tex',
-                },
-              ],
-              folders: [],
-              fileRefs: [
-                {
-                  _id: figureId,
-                  name: 'frog.jpg',
-                  hash: '42',
-                },
-                {
-                  _id: 'fake-figure-id',
-                  name: 'unicorn.png',
-                  hash: '43',
-                },
-              ],
-            },
-          ],
-          fileRefs: [],
-        },
-      ] as Folder[],
-      features: {
-        trackChanges: true,
-        ...projectFeatures,
-      },
-      trackChangesState: {},
-      members: [],
-      owner: projectOwner,
+    pdf: {
+      logEntryAnnotations: {},
     },
     permissions: {
       comment: true,
diff --git a/services/web/test/frontend/helpers/editor-providers.tsx b/services/web/test/frontend/helpers/editor-providers.tsx
index a20c7f015f..a82adefdbd 100644
--- a/services/web/test/frontend/helpers/editor-providers.tsx
+++ b/services/web/test/frontend/helpers/editor-providers.tsx
@@ -23,10 +23,12 @@ import {
   EditorOpenDocContext,
   type EditorOpenDocContextState,
 } from '@/features/ide-react/context/editor-open-doc-context'
+import { ProjectContext } from '@/shared/context/project-context'
 import { ReactContextRoot } from '@/features/ide-react/context/react-context-root'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import useDetachLayout from '@/shared/hooks/use-detach-layout'
 import useExposedState from '@/shared/hooks/use-exposed-state'
+import { ProjectSnapshot } from '@/infrastructure/project-snapshot'
 import {
   EditorPropertiesContext,
   EditorPropertiesContextValue,
@@ -42,6 +44,12 @@ import type { PermissionsLevel } from '@/features/ide-react/types/permissions'
 import type { Folder } from '../../../types/folder'
 import type { SocketDebuggingInfo } from '@/features/ide-react/connection/types/connection-state'
 import type { DocumentContainer } from '@/features/ide-react/editor/document-container'
+import {
+  ProjectMetadata,
+  ProjectUpdate,
+} from '@/shared/context/types/project-metadata'
+import { UserId } from '../../../types/user'
+import { ProjectCompiler } from '../../../types/project-settings'
 
 // these constants can be imported in tests instead of
 // using magic strings
@@ -68,10 +76,11 @@ const defaultUserSettings = {
 export type EditorProvidersProps = {
   user?: { id: string; email: string }
   projectId?: string
-  projectOwner?: { _id: string; email: string }
+  projectName?: string
+  projectOwner?: ProjectMetadata['owner']
   rootDocId?: string
   imageName?: string
-  compiler?: string
+  compiler?: ProjectCompiler
   socket?: Socket
   isRestrictedTokenMember?: boolean
   scope?: Record<string, any>
@@ -85,6 +94,46 @@ export type EditorProvidersProps = {
   providers?: Record<string, React.FC<React.PropsWithChildren<any>>>
 }
 
+export const projectDefaults = {
+  _id: PROJECT_ID,
+  name: PROJECT_NAME,
+  owner: {
+    _id: '124abd' as UserId,
+    email: 'owner@example.com',
+    first_name: 'Test',
+    last_name: 'Owner',
+    privileges: 'owner',
+    signUpDate: new Date('2025-07-07').toISOString(),
+  },
+  features: {
+    referencesSearch: true,
+    gitBridge: false,
+  },
+  rootDocId: '_root_doc_id',
+  rootFolder: [
+    {
+      _id: 'root-folder-id',
+      name: 'rootFolder',
+      docs: [
+        {
+          _id: '_root_doc_id',
+          name: 'main.tex',
+        },
+      ],
+      folders: [],
+      fileRefs: [],
+    },
+  ],
+  imageName: 'texlive-full:2024.1',
+  compiler: 'pdflatex' as ProjectCompiler,
+  members: [],
+  invites: [],
+}
+
+/**
+ * @typedef {import('@/shared/context/layout-context').LayoutContextValue} LayoutContextValue
+ * @type Partial<LayoutContextValue>
+ */
 const layoutContextDefault = {
   view: 'editor',
   openFile: null,
@@ -99,37 +148,23 @@ const layoutContextDefault = {
 
 export function EditorProviders({
   user = { id: USER_ID, email: USER_EMAIL },
-  projectId = PROJECT_ID,
-  projectOwner = {
-    _id: '124abd',
-    email: 'owner@example.com',
-  },
-  rootDocId = '_root_doc_id',
-  imageName = 'texlive-full:2024.1',
-  compiler = 'pdflatex',
+  projectId = projectDefaults._id,
+  projectName = projectDefaults.name,
+  projectOwner = projectDefaults.owner,
+  rootDocId = projectDefaults.rootDocId,
+  imageName = projectDefaults.imageName,
+  compiler = projectDefaults.compiler,
   socket = new SocketIOMock() as any as Socket,
   isRestrictedTokenMember = false,
   scope: defaultScope = {},
   features = {
     referencesSearch: true,
+    gitBridge: false,
   },
   projectFeatures = features,
   permissionsLevel = 'owner',
   children,
-  rootFolder = [
-    {
-      _id: 'root-folder-id',
-      name: 'rootFolder',
-      docs: [
-        {
-          _id: '_root_doc_id',
-          name: 'main.tex',
-        },
-      ],
-      folders: [],
-      fileRefs: [],
-    },
-  ],
+  rootFolder = projectDefaults.rootFolder,
   /** @type {Partial<LayoutContext>} */
   layoutContext = layoutContextDefault,
   userSettings = {},
@@ -166,21 +201,26 @@ export function EditorProviders({
         currentDocumentId: null,
         wantTrackChanges: false,
       },
-      project: {
-        _id: projectId,
-        name: PROJECT_NAME,
-        owner: projectOwner,
-        features: projectFeatures,
-        rootDocId,
-        rootFolder,
-        imageName,
-        compiler,
-      },
       permissionsLevel,
     },
     defaultScope
   )
 
+  const project = {
+    _id: projectId,
+    name: projectName,
+    owner: projectOwner,
+    features: projectFeatures,
+    rootDocId,
+    rootFolder,
+    imageName,
+    compiler,
+    members: [],
+    invites: [],
+    trackChangesState: false,
+    spellCheckLanguage: 'en',
+  }
+
   // Add details for useUserContext
   window.metaAttributesCache.set('ol-user', { ...user, features })
   window.metaAttributesCache.set('ol-project_id', projectId)
@@ -199,6 +239,7 @@ export function EditorProviders({
           wantTrackChanges: scope.editor.wantTrackChanges,
         }),
         LayoutProvider: makeLayoutProvider(layoutContext),
+        ProjectProvider: makeProjectProvider(project),
         ...providers,
       }}
     >
@@ -503,3 +544,35 @@ export function makeEditorPropertiesProvider(
 
   return EditorPropertiesProvider
 }
+
+export function makeProjectProvider(initialProject: ProjectMetadata) {
+  const ProjectProvider: FC<PropsWithChildren> = ({ children }) => {
+    const [project, setProject] = useState(initialProject)
+
+    const updateProject = useCallback((projectUpdateData: ProjectUpdate) => {
+      setProject(projectData =>
+        Object.assign({}, projectData, projectUpdateData)
+      )
+    }, [])
+
+    const value = {
+      projectId: project._id,
+      project,
+      joinProject: () => {},
+      updateProject,
+      joinedOnce: true,
+      projectSnapshot: new ProjectSnapshot(project._id),
+      tags: [],
+      features: project.features,
+      name: project.name,
+    }
+
+    return (
+      <ProjectContext.Provider value={value}>
+        {children}
+      </ProjectContext.Provider>
+    )
+  }
+
+  return ProjectProvider
+}

From 59b34d7c2b81af4e923d2defb4e3a98b1a9ab9b5 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Wed, 9 Jul 2025 13:11:36 +0200
Subject: [PATCH 156/274] Fix table layout of Audit logs (#26796)

GitOrigin-RevId: 9882b3ba56bfbe6e78b03e1721ab77dcd55a7e85
---
 .../web/frontend/stylesheets/bootstrap-5/base/layout.scss    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss b/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss
index d27fb59ad7..89feb11880 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/base/layout.scss
@@ -90,3 +90,8 @@ hr {
 .full-height {
   height: 100%;
 }
+
+.table-fixed {
+  table-layout: fixed;
+  word-wrap: break-word;
+}

From bae2eb3861349bf3877f521f579b0d840830c702 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Wed, 9 Jul 2025 13:11:46 +0200
Subject: [PATCH 157/274] Improve landmarks on the learn pages (#26821)

* Add search HTML tag and improve landmarks

* Add material symbol icons

* Add translation and improve landmarks

GitOrigin-RevId: bd0ddcce16348883c58ae547623b8e615b55df27
---
 .../app/views/_mixins/faq_search-marketing.pug  | 17 ++++++++++-------
 services/web/locales/en.json                    |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/services/web/app/views/_mixins/faq_search-marketing.pug b/services/web/app/views/_mixins/faq_search-marketing.pug
index 1b161dbdf6..677e6f03a3 100644
--- a/services/web/app/views/_mixins/faq_search-marketing.pug
+++ b/services/web/app/views/_mixins/faq_search-marketing.pug
@@ -1,23 +1,26 @@
+include ./material_symbol.pug
+
 mixin faq_search-marketing(headerText, headerClass)
 	if typeof settings.algolia != 'undefined' && typeof settings.algolia.indexes != 'undefined' && typeof settings.algolia.indexes.wiki != 'undefined'
 		if headerText
 			div(class=headerClass) #{headerText}
-		.wiki
+		search.wiki
 			form.project-search.form-horizontal(role='search' data-ol-faq-search)
 				.form-group.has-feedback.has-feedback-left
 					.col-sm-12
+						label.visually-hidden(for='search-help-library') Search help library…
 						input.form-control(
+							id='search-help-library'
 							type='search'
 							placeholder='Search help library…'
-							aria-label='Search help library…'
 						)
-						i.fa.fa-search.form-control-feedback-left(aria-hidden='true')
-						i.fa.fa-times.form-control-feedback(
-							style='cursor: pointer'
-							hidden
-							data-ol-clear-search
+						+material-symbol('search').form-control-feedback-left(
 							aria-hidden='true'
 						)
+						+material-symbol('clear').form-control-feedback(
+							data-ol-clear-search
+							hidden
+						)
 						button.sr-only(
 							type='button'
 							hidden
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index e695b90350..01a9fc4bd6 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -565,6 +565,7 @@
   "document_updated_externally": "Document Updated Externally",
   "document_updated_externally_detail": "This document was just updated externally. Any recent changes you have made may have been overwritten. To see previous versions, please look in the history.",
   "documentation": "Documentation",
+  "documentation_articles": "Documentation and articles",
   "does_not_contain_or_significantly_match_your_email": "does not contain or significantly match your email",
   "doesnt_match": "Doesn’t match",
   "doing_this_allow_log_in_through_institution": "Doing this will allow you to log in to <b>__appName__</b> through your institution and will reconfirm your institutional email address.",

From 7219043c6bf31fd331a212b80d2ec3567a40c3d2 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Wed, 9 Jul 2025 08:05:31 -0400
Subject: [PATCH 158/274] Merge pull request #26918 from
 overleaf/em-transfer-to-reviewer

Support ownership transfer to reviewer

GitOrigin-RevId: 1e97439e720a2125028a1776525f5c3766a289ef
---
 .../Collaborators/OwnershipTransferHandler.js |  6 ++++
 .../OwnershipTransferHandlerTests.js          | 34 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js b/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js
index 82c9c37ac7..e22818ebb8 100644
--- a/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js
+++ b/services/web/app/src/Features/Collaborators/OwnershipTransferHandler.js
@@ -85,6 +85,7 @@ async function _getProject(projectId) {
     owner_ref: 1,
     collaberator_refs: 1,
     readOnly_refs: 1,
+    reviewer_refs: 1,
     name: 1,
   })
   if (project == null) {
@@ -104,8 +105,13 @@ async function _getUser(userId) {
 function _getUserPermissions(user, project) {
   const collaboratorIds = project.collaberator_refs || []
   const readOnlyIds = project.readOnly_refs || []
+  const reviewerIds = project.reviewer_refs || []
   if (collaboratorIds.some(collaboratorId => collaboratorId.equals(user._id))) {
     return PrivilegeLevels.READ_AND_WRITE
+  } else if (
+    reviewerIds.some(collaboratorId => collaboratorId.equals(user._id))
+  ) {
+    return PrivilegeLevels.REVIEW
   } else if (
     readOnlyIds.some(collaboratorId => collaboratorId.equals(user._id))
   ) {
diff --git a/services/web/test/unit/src/Collaborators/OwnershipTransferHandlerTests.js b/services/web/test/unit/src/Collaborators/OwnershipTransferHandlerTests.js
index 3ef77e3500..4994a3f129 100644
--- a/services/web/test/unit/src/Collaborators/OwnershipTransferHandlerTests.js
+++ b/services/web/test/unit/src/Collaborators/OwnershipTransferHandlerTests.js
@@ -19,12 +19,17 @@ describe('OwnershipTransferHandler', function () {
       _id: new ObjectId(),
       email: 'readonly@example.com',
     }
+    this.reviewer = {
+      _id: new ObjectId(),
+      email: 'reviewer@example.com',
+    }
     this.project = {
       _id: new ObjectId(),
       name: 'project',
       owner_ref: this.user._id,
       collaberator_refs: [this.collaborator._id],
       readOnly_refs: [this.readOnlyCollaborator._id],
+      reviewer_refs: [this.reviewer._id],
     }
     this.ProjectGetter = {
       promises: {
@@ -97,6 +102,9 @@ describe('OwnershipTransferHandler', function () {
       this.UserGetter.promises.getUser
         .withArgs(this.readOnlyCollaborator._id)
         .resolves(this.readOnlyCollaborator)
+      this.UserGetter.promises.getUser
+        .withArgs(this.reviewer._id)
+        .resolves(this.reviewer)
     })
 
     it("should return a not found error if the project can't be found", async function () {
@@ -200,6 +208,32 @@ describe('OwnershipTransferHandler', function () {
       )
     })
 
+    it('should transfer ownership of the project to a reviewer', async function () {
+      await this.handler.promises.transferOwnership(
+        this.project._id,
+        this.reviewer._id
+      )
+      expect(this.ProjectModel.updateOne).to.have.been.calledWith(
+        { _id: this.project._id },
+        sinon.match({ $set: { owner_ref: this.reviewer._id } })
+      )
+    })
+
+    it('gives old owner reviewer permissions if new owner was previously a reviewer', async function () {
+      await this.handler.promises.transferOwnership(
+        this.project._id,
+        this.reviewer._id
+      )
+      expect(
+        this.CollaboratorsHandler.promises.addUserIdToProject
+      ).to.have.been.calledWith(
+        this.project._id,
+        this.reviewer._id,
+        this.user._id,
+        PrivilegeLevels.REVIEW
+      )
+    })
+
     it('should flush the project to tpds', async function () {
       await this.handler.promises.transferOwnership(
         this.project._id,

From b165fea0de6e91205896bc66b13f4cbf17262861 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Wed, 9 Jul 2025 08:09:47 -0400
Subject: [PATCH 159/274] Merge pull request #26915 from
 overleaf/em-jd-increase-max-request-size

Increase web's max JSON request size to 12 MB

GitOrigin-RevId: 91da31e14570e770553049d8376ae1686eba3336
---
 services/web/config/settings.defaults.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index 6edb19e6df..a324330bbd 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -710,12 +710,13 @@ module.exports = {
   //   - the doc content
   //   - text ranges spanning the whole doc
   //
-  // There's also overhead required for the JSON encoding and the UTF-8 encoding,
-  // theoretically up to 3 times the max doc length. On the other hand, we don't
-  // want to block the event loop with JSON parsing, so we try to find a
-  // practical compromise.
+  // There's also overhead required for the JSON encoding and the UTF-8
+  // encoding, theoretically up to 6 times the max doc length (e.g. a document
+  // entirely filled with "\u0011" characters). On the other hand, we don't want
+  // to block the event loop with JSON parsing, so we try to find a practical
+  // compromise.
   max_json_request_size:
-    parseInt(process.env.MAX_JSON_REQUEST_SIZE) || 6 * 1024 * 1024, // 6 MB
+    parseInt(process.env.MAX_JSON_REQUEST_SIZE) || 12 * 1024 * 1024, // 12 MB
 
   // Internal configs
   // ----------------

From b843603bb1e91e5c112efeb53bfc0ad00dc606d9 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 9 Jul 2025 13:47:40 +0100
Subject: [PATCH 160/274] Use data-type="number" for numeric meta values
 (#26775)

GitOrigin-RevId: 844f56383457ee7f2043af553b7dd5ae1b33f8a9
---
 services/web/app/views/project/editor/_meta.pug               | 4 ++--
 services/web/app/views/user/settings.pug                      | 2 +-
 .../web/app/views/user_membership/group-members-react.pug     | 2 +-
 .../group-management/components/add-seats/add-seats.tsx       | 2 +-
 services/web/frontend/js/utils/meta.ts                        | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/services/web/app/views/project/editor/_meta.pug b/services/web/app/views/project/editor/_meta.pug
index 9eca3a5b69..f45ce6aaf2 100644
--- a/services/web/app/views/project/editor/_meta.pug
+++ b/services/web/app/views/project/editor/_meta.pug
@@ -9,8 +9,8 @@ meta(name="ol-anonymous" data-type="boolean" content=anonymous)
 meta(name="ol-brandVariation" data-type="json" content=brandVariation)
 meta(name="ol-isTokenMember" data-type="boolean" content=isTokenMember)
 meta(name="ol-isRestrictedTokenMember" data-type="boolean" content=isRestrictedTokenMember)
-meta(name="ol-maxDocLength" data-type="json" content=maxDocLength)
-meta(name="ol-maxReconnectGracefullyIntervalMs" data-type="json" content=maxReconnectGracefullyIntervalMs)
+meta(name="ol-maxDocLength" data-type="number" content=maxDocLength)
+meta(name="ol-maxReconnectGracefullyIntervalMs" data-type="number" content=maxReconnectGracefullyIntervalMs)
 meta(name="ol-wikiEnabled" data-type="boolean" content=settings.proxyLearn)
 meta(name="ol-capabilities" data-type="json" content=capabilities)
 meta(name="ol-projectHistoryBlobsEnabled" data-type="boolean" content=projectHistoryBlobsEnabled)
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index dc63e27abe..45d21c7572 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -46,7 +46,7 @@ block append meta
 		data-type='json'
 		content=personalAccessTokens
 	)
-	meta(name='ol-emailAddressLimit' data-type='json' content=emailAddressLimit)
+	meta(name='ol-emailAddressLimit' data-type='number' content=emailAddressLimit)
 	meta(
 		name='ol-currentManagedUserAdminEmail'
 		data-type='string'
diff --git a/services/web/app/views/user_membership/group-members-react.pug b/services/web/app/views/user_membership/group-members-react.pug
index 4020ebdf58..7767cf026e 100644
--- a/services/web/app/views/user_membership/group-members-react.pug
+++ b/services/web/app/views/user_membership/group-members-react.pug
@@ -8,7 +8,7 @@ block append meta
 	meta(name='ol-users' data-type='json' content=users)
 	meta(name='ol-groupId' data-type='string' content=groupId)
 	meta(name='ol-groupName' data-type='string' content=name)
-	meta(name='ol-groupSize' data-type='json' content=groupSize)
+	meta(name='ol-groupSize' data-type='number' content=groupSize)
 	meta(
 		name='ol-managedUsersActive'
 		data-type='boolean'
diff --git a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
index ab9f96a975..5f9237807d 100644
--- a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
+++ b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
@@ -44,7 +44,7 @@ function AddSeats() {
   const { t } = useTranslation()
   const groupName = getMeta('ol-groupName')
   const subscriptionId = getMeta('ol-subscriptionId')
-  const totalLicenses = Number(getMeta('ol-totalLicenses'))
+  const totalLicenses = getMeta('ol-totalLicenses')
   const isProfessional = getMeta('ol-isProfessional')
   const isCollectionMethodManual = getMeta('ol-isCollectionMethodManual')
   const [addSeatsInputError, setAddSeatsInputError] = useState<string>()
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 849c7eb4c1..908838c38f 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -159,7 +159,7 @@ export interface Meta {
   'ol-languages': SpellCheckLanguage[]
   'ol-learnedWords': string[]
   'ol-legacyEditorThemes': string[]
-  'ol-licenseQuantity': number | undefined
+  'ol-licenseQuantity'?: number
   'ol-loadingText': string
   'ol-managedGroupSubscriptions': ManagedGroupSubscription[]
   'ol-managedInstitutions': ManagedInstitution[]
@@ -320,6 +320,7 @@ export default function getMeta<T extends keyof Meta>(name: T): Meta[T] {
       value = element.hasAttribute('content')
       break
     case 'json':
+    case 'number':
       if (!plainTextValue) {
         // JSON.parse('') throws
         value = undefined

From b87b83e33cfc05f1e1be242493390f6d52786331 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 9 Jul 2025 13:47:55 +0100
Subject: [PATCH 161/274] Use full URL for keyboard shortcuts documentation
 (#26777)

GitOrigin-RevId: dc165fc475a0d2513eaebec0176479dd538a7bac
---
 .../hotkeys-modal/components/hotkeys-modal-bottom-text.jsx     | 3 ++-
 .../components/hotkeys-modal-bottom-text.test.jsx              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/hotkeys-modal/components/hotkeys-modal-bottom-text.jsx b/services/web/frontend/js/features/hotkeys-modal/components/hotkeys-modal-bottom-text.jsx
index db6507e823..a11b79f004 100644
--- a/services/web/frontend/js/features/hotkeys-modal/components/hotkeys-modal-bottom-text.jsx
+++ b/services/web/frontend/js/features/hotkeys-modal/components/hotkeys-modal-bottom-text.jsx
@@ -10,8 +10,9 @@ export default function HotkeysModalBottomText() {
           // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
           <a
             onClick={() => eventTracking.sendMB('left-menu-hotkeys-template')}
-            href="/articles/overleaf-keyboard-shortcuts/qykqfvmxdnjf"
+            href="https://www.overleaf.com/articles/overleaf-keyboard-shortcuts/qykqfvmxdnjf"
             target="_blank"
+            rel="noreferrer"
           />,
         ]}
       />
diff --git a/services/web/test/frontend/features/hotkeys-modal/components/hotkeys-modal-bottom-text.test.jsx b/services/web/test/frontend/features/hotkeys-modal/components/hotkeys-modal-bottom-text.test.jsx
index c3baeefa66..399a99ead4 100644
--- a/services/web/test/frontend/features/hotkeys-modal/components/hotkeys-modal-bottom-text.test.jsx
+++ b/services/web/test/frontend/features/hotkeys-modal/components/hotkeys-modal-bottom-text.test.jsx
@@ -15,7 +15,7 @@ describe('<HotkeysModalBottomText />', function () {
     })
 
     expect(link.getAttribute('href')).to.equal(
-      `/articles/overleaf-keyboard-shortcuts/qykqfvmxdnjf`
+      `https://www.overleaf.com/articles/overleaf-keyboard-shortcuts/qykqfvmxdnjf`
     )
   })
 })

From b410de7c3951bd3e00e3477cd3bcb85e870419f1 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 9 Jul 2025 13:48:24 +0100
Subject: [PATCH 162/274] Disable Insert > Comment menu item when no text is
 selected (#26805)

GitOrigin-RevId: a5fdd662cd487359f9b09212a449d7831bb5dcac
---
 .../ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx b/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx
index 7f23b4f51c..ba96d049f8 100644
--- a/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx
+++ b/services/web/frontend/js/features/ide-redesign/hooks/use-toolbar-menu-editor-commands.tsx
@@ -177,6 +177,7 @@ export const useToolbarMenuBarEditorCommands = () => {
         handler: () => {
           commands.addComment()
         },
+        disabled: state.selection.main.empty,
       },
       /************************************
        *         Format menu
@@ -286,6 +287,7 @@ export const useToolbarMenuBarEditorCommands = () => {
     newEditor,
     trackedWrite,
     isTeXFile,
+    state.selection.main.empty,
   ])
 
   const { toggleSymbolPalette } = useEditorPropertiesContext()

From bd64f09b9191ab3a855ef2a56b099295cccc571a Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 9 Jul 2025 13:48:44 +0100
Subject: [PATCH 163/274] Test entity counts on admin project info page
 (#26845)

GitOrigin-RevId: a49926358f367a7cbfb8aa2a1bc77a1cc1fd0b77
---
 services/web/frontend/js/utils/meta.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 908838c38f..0d4fdaad48 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -195,7 +195,7 @@ export interface Meta {
   'ol-preventCompileOnLoad'?: boolean
   'ol-primaryEmail': { email: string; confirmed: boolean }
   'ol-project': any // TODO
-  'ol-projectEntityCounts'?: { files: number; docs: number }
+  'ol-projectEntityCounts': { files: number; docs: number }
   'ol-projectHistoryBlobsEnabled': boolean
   'ol-projectName': string
   'ol-projectOwnerHasPremiumOnPageLoad': boolean

From 3e9d60c25a010eef51c605f8f40ce75a174e9909 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 9 Jul 2025 13:49:09 +0100
Subject: [PATCH 164/274] Ensure collaborator cursor colour is updated (#26847)

GitOrigin-RevId: 7057cdbb4815d5f1c5e5771d38255e58f592f9cd
---
 .../source-editor/extensions/cursor-highlights.ts  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts b/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
index ccdc8b90e7..3fef2b2771 100644
--- a/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
@@ -166,7 +166,7 @@ export const setCursorHighlights = (
 
 class CursorMarker extends RectangleMarker {
   constructor(
-    private highlight: Highlight,
+    public highlight: Highlight,
     className: string,
     left: number,
     top: number,
@@ -181,6 +181,18 @@ class CursorMarker extends RectangleMarker {
     element.style.setProperty('--hue', String(this.highlight.hue))
     return element
   }
+
+  update(element: HTMLDivElement, prev: CursorMarker) {
+    if (!super.update(element, prev)) {
+      return false
+    }
+    element.style.setProperty('--hue', String(this.highlight.hue))
+    return true
+  }
+
+  eq(other: CursorMarker) {
+    return super.eq(other) && this.highlight.hue === other.highlight.hue
+  }
 }
 
 // draw the collaborator cursors in a separate layer, so they don't affect word wrapping

From d617fd0754299defd19f25624f0ed5cbb015da54 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Wed, 9 Jul 2025 13:50:09 +0100
Subject: [PATCH 165/274] Add visual preview (#26947)

GitOrigin-RevId: f77b59219909971b11416f196783b3ab7198ed91
---
 .../src/Features/Project/ProjectController.js |   1 +
 .../pdf-preview/components/pdf-preview.tsx    |   6 +
 .../components/pdf-synctex-controls.tsx       |   6 +
 .../pdf-preview/components/visual-preview.tsx | 165 ++++++++++++++++++
 .../components/codemirror-toolbar.tsx         |   4 +-
 .../source-editor/extensions/language.ts      |   2 +-
 .../source-editor/extensions/visual/visual.ts |   2 +-
 7 files changed, 183 insertions(+), 3 deletions(-)
 create mode 100644 services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index cab5c3a230..fc65da7b44 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -334,6 +334,7 @@ const _ProjectController = {
 
     const splitTests = [
       'compile-log-events',
+      'visual-preview',
       'external-socket-heartbeat',
       'null-test-share-modal',
       'populate-clsi-cache',
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-preview.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-preview.tsx
index b0e692e201..e7757e99cd 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-preview.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-preview.tsx
@@ -3,10 +3,16 @@ import { memo } from 'react'
 import withErrorBoundary from '../../../infrastructure/error-boundary'
 import PdfPreviewErrorBoundaryFallback from './pdf-preview-error-boundary-fallback'
 import { useLayoutContext } from '../../../shared/context/layout-context'
+import { VisualPreview } from './visual-preview'
+import { useEditorViewContext } from '@/features/ide-react/context/editor-view-context'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 function PdfPreview() {
   const { detachRole } = useLayoutContext()
+  const { view } = useEditorViewContext()
+  const visualPreviewEnabled = useFeatureFlag('visual-preview')
   if (detachRole === 'detacher') return null
+  if (visualPreviewEnabled && view) return <VisualPreview view={view} />
   return <PdfPreviewPane />
 }
 
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-synctex-controls.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-synctex-controls.tsx
index 0167a98db1..aee9a12549 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-synctex-controls.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-synctex-controls.tsx
@@ -10,6 +10,7 @@ import MaterialIcon from '@/shared/components/material-icon'
 import { Spinner } from 'react-bootstrap'
 import { Placement } from 'react-bootstrap/types'
 import useSynctex from '../hooks/use-synctex'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 const GoToCodeButton = memo(function GoToCodeButton({
   syncToCode,
@@ -135,6 +136,11 @@ function PdfSynctexControls() {
     syncToPdfInFlight,
     canSyncToPdf,
   } = useSynctex()
+  const visualPreviewEnabled = useFeatureFlag('visual-preview')
+
+  if (visualPreviewEnabled) {
+    return null
+  }
 
   if (!position) {
     return null
diff --git a/services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx b/services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx
new file mode 100644
index 0000000000..b166ca4563
--- /dev/null
+++ b/services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx
@@ -0,0 +1,165 @@
+import { FC, useEffect, useRef, useState } from 'react'
+import {
+  CodeMirrorStateContext,
+  CodeMirrorViewContext,
+} from '@/features/source-editor/components/codemirror-context'
+import { EditorView } from '@codemirror/view'
+import { EditorState, StateEffect } from '@codemirror/state'
+import useIsMounted from '@/shared/hooks/use-is-mounted'
+import { docName } from '@/features/source-editor/extensions/doc-name'
+import {
+  language,
+  Metadata,
+  setMetadata,
+} from '@/features/source-editor/extensions/language'
+import { showContentWhenParsed } from '@/features/source-editor/extensions/visual/visual'
+import { usePhrases } from '@/features/source-editor/hooks/use-phrases'
+import {
+  setEditorTheme,
+  theme,
+} from '@/features/source-editor/extensions/theme'
+import { useFileTreeData } from '@/shared/context/file-tree-data-context'
+import { useFileTreePathContext } from '@/features/file-tree/contexts/file-tree-path'
+import {
+  visualHighlightStyle,
+  visualTheme,
+} from '@/features/source-editor/extensions/visual/visual-theme'
+import { tableGeneratorTheme } from '@/features/source-editor/extensions/visual/table-generator'
+import { atomicDecorations } from '@/features/source-editor/extensions/visual/atomic-decorations'
+import { markDecorations } from '@/features/source-editor/extensions/visual/mark-decorations'
+import { useEditorOpenDocContext } from '@/features/ide-react/context/editor-open-doc-context'
+import { isValidTeXFile } from '@/main/is-valid-tex-file'
+import { mousedown } from '@/features/source-editor/extensions/visual/selection'
+
+export const VisualPreview: FC<{ view: EditorView }> = ({ view }) => {
+  const [previewState, setPreviewState] = useState<EditorState>()
+
+  const { fileTreeData } = useFileTreeData()
+  const { previewByPath } = useFileTreePathContext()
+  const { currentDocument, openDocName } = useEditorOpenDocContext()
+  const phrases = usePhrases()
+
+  const isMountedRef = useIsMounted()
+  const viewRef = useRef<EditorView | undefined>()
+  const containerRef = useRef<HTMLDivElement>(null)
+  const previewByPathRef = useRef(previewByPath)
+  const metadataRef = useRef<Metadata>({
+    labels: new Set(),
+    packageNames: new Set(),
+    referenceKeys: new Set(),
+    commands: [],
+    fileTreeData,
+  })
+
+  useEffect(() => {
+    if (!currentDocument) {
+      return
+    }
+
+    const state = EditorState.create({
+      doc: view.state.doc,
+      extensions: [
+        EditorView.lineWrapping,
+        EditorState.readOnly.of(true),
+        EditorView.editable.of(false),
+        EditorState.phrases.of(phrases),
+        docName('main.tex'),
+        language('main.tex', metadataRef.current, { syntaxValidation: false }),
+        theme({
+          fontSize: 14,
+          fontFamily: 'monaco',
+          lineHeight: 'normal',
+          overallTheme: 'light-',
+        }),
+        EditorView.theme({
+          '&.cm-editor': {
+            background: '#fff',
+          },
+          '.ol-cm-preamble-wrapper, .ol-cm-end-document-widget': {
+            visibility: 'hidden',
+          },
+        }),
+        visualTheme,
+        visualHighlightStyle,
+        tableGeneratorTheme,
+        mousedown,
+        atomicDecorations({
+          previewByPath: previewByPathRef.current,
+        }),
+        markDecorations, // NOTE: must be after atomicDecorations, so that mark decorations wrap inline widgets
+        showContentWhenParsed,
+        EditorView.contentAttributes.of({ 'aria-label': 'Visual preview' }),
+      ],
+    })
+
+    const preview = new EditorView({
+      state,
+      dispatchTransactions(trs) {
+        preview.update(trs)
+        if (isMountedRef.current) {
+          setPreviewState(preview.state)
+        }
+      },
+      scrollTo: EditorView.scrollIntoView(state.selection.main, {
+        y: 'center',
+      }),
+    })
+
+    setEditorTheme('overleaf').then(spec => {
+      preview.dispatch(spec)
+    })
+
+    containerRef.current?.replaceChildren(preview.dom)
+
+    viewRef.current = preview
+
+    view.dispatch({
+      effects: StateEffect.appendConfig.of([
+        EditorView.updateListener.of(update => {
+          if (update.docChanged) {
+            for (const tr of update.transactions) {
+              preview.dispatch({
+                changes: tr.changes,
+              })
+            }
+          }
+
+          if (update.selectionSet) {
+            preview.dispatch({
+              effects: EditorView.scrollIntoView(update.state.selection.main, {
+                y: 'center',
+              }),
+            })
+          }
+        }),
+      ]),
+    })
+  }, [phrases, view, currentDocument, isMountedRef])
+
+  useEffect(() => {
+    if (fileTreeData) {
+      metadataRef.current.fileTreeData = fileTreeData
+      window.setTimeout(() => {
+        viewRef.current?.dispatch(setMetadata(metadataRef.current))
+      })
+    }
+  }, [fileTreeData, view])
+
+  useEffect(() => {
+    return () => {
+      viewRef.current?.destroy()
+    }
+  }, [view])
+
+  if (!openDocName || !isValidTeXFile(openDocName)) {
+    return null
+  }
+
+  return (
+    <CodeMirrorStateContext.Provider value={previewState}>
+      <CodeMirrorViewContext.Provider value={viewRef.current}>
+        <div ref={containerRef} style={{ height: '100%' }} />
+      </CodeMirrorViewContext.Provider>
+    </CodeMirrorStateContext.Provider>
+  )
+}
diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
index 5cf95763f4..b106968c60 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
@@ -26,6 +26,7 @@ import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-
 import Breadcrumbs from '@/features/ide-redesign/components/breadcrumbs'
 import classNames from 'classnames'
 import { useUserSettingsContext } from '@/shared/context/user-settings-context'
+import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 export const CodeMirrorToolbar = () => {
   const view = useCodeMirrorViewContext()
@@ -45,6 +46,7 @@ const Toolbar = memo(function Toolbar() {
   const {
     userSettings: { breadcrumbs },
   } = useUserSettingsContext()
+  const visualPreviewEnabled = useFeatureFlag('visual-preview')
 
   const [overflowed, setOverflowed] = useState(false)
 
@@ -157,7 +159,7 @@ const Toolbar = memo(function Toolbar() {
           className="ol-cm-toolbar toolbar-editor"
           ref={elementRef}
         >
-          <EditorSwitch />
+          {!visualPreviewEnabled && <EditorSwitch />}
           {showActions && (
             <ToolbarItems
               state={state}
diff --git a/services/web/frontend/js/features/source-editor/extensions/language.ts b/services/web/frontend/js/features/source-editor/extensions/language.ts
index b36c14135c..721fb48587 100644
--- a/services/web/frontend/js/features/source-editor/extensions/language.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/language.ts
@@ -20,7 +20,7 @@ type Options = {
   syntaxValidation: boolean
 }
 
-type Metadata = {
+export type Metadata = {
   labels: Set<string>
   packageNames: Set<string>
   commands: Command[]
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
index af6d2e559a..f0e4a25ff7 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual.ts
@@ -94,7 +94,7 @@ const parsedAttributesConf = new Compartment()
  * A view plugin which shows the editor content, makes it focusable,
  * and restores the scroll position, once the initial decorations have been applied.
  */
-const showContentWhenParsed = [
+export const showContentWhenParsed = [
   parsedAttributesConf.of([EditorView.editable.of(false)]),
   ViewPlugin.define(view => {
     const showContent = () => {

From 11cb140fe32c7cd57e680e3833f3e22e29c8cc1e Mon Sep 17 00:00:00 2001
From: Domagoj Kriskovic <dom.kriskovic@overleaf.com>
Date: Wed, 9 Jul 2025 15:59:42 +0200
Subject: [PATCH 166/274] Move AI related functions from
 PaymentProviderEntities to AiHelper (#26956)

* Move AI related functions from PaymentProviderEntities to AiHelper

* added @ts-check

GitOrigin-RevId: 8c8eec334b40a7f8f8533f6d5194f428112f68f9
---
 .../src/Features/Project/ProjectController.js |  4 +-
 .../app/src/Features/Subscription/AiHelper.js | 46 +++++++++++++++++++
 .../Features/Subscription/FeaturesUpdater.js  |  2 +-
 .../Subscription/PaymentProviderEntities.js   | 43 +----------------
 .../Subscription/RecurlyEventHandler.js       |  2 +-
 .../Subscription/SubscriptionController.js    | 11 ++---
 .../Subscription/SubscriptionHelper.js        |  2 +-
 .../Subscription/SubscriptionLocator.js       |  5 +-
 .../SubscriptionViewModelBuilder.js           |  6 +--
 .../src/Subscription/FeaturesUpdaterTests.js  |  2 +-
 .../PaymentProviderEntitiesTest.js            |  4 +-
 .../SubscriptionControllerTests.js            |  2 +-
 12 files changed, 65 insertions(+), 64 deletions(-)
 create mode 100644 services/web/app/src/Features/Subscription/AiHelper.js

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index fc65da7b44..4075b06bb7 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -46,9 +46,7 @@ const TutorialHandler = require('../Tutorial/TutorialHandler')
 const UserUpdater = require('../User/UserUpdater')
 const Modules = require('../../infrastructure/Modules')
 const UserGetter = require('../User/UserGetter')
-const {
-  isStandaloneAiAddOnPlanCode,
-} = require('../Subscription/PaymentProviderEntities')
+const { isStandaloneAiAddOnPlanCode } = require('../Subscription/AiHelper')
 const SubscriptionController = require('../Subscription/SubscriptionController.js')
 const { formatCurrency } = require('../../util/currency')
 
diff --git a/services/web/app/src/Features/Subscription/AiHelper.js b/services/web/app/src/Features/Subscription/AiHelper.js
new file mode 100644
index 0000000000..3a383f7b07
--- /dev/null
+++ b/services/web/app/src/Features/Subscription/AiHelper.js
@@ -0,0 +1,46 @@
+// @ts-check
+// Initially, this functions lived in PaymentProviderEntities.js,
+// but it was moved to this file to prevent circular dependency issue
+
+const AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE = 'assistant'
+const AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE = 'assistant-annual'
+const AI_ADD_ON_CODE = 'assistant'
+
+/**
+ * Returns whether the given plan code is a standalone AI plan
+ *
+ * @param {string} planCode
+ * @return {boolean}
+ */
+function isStandaloneAiAddOnPlanCode(planCode) {
+  return (
+    planCode === AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE ||
+    planCode === AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE
+  )
+}
+
+/**
+ * Returns whether subscription change will have have the ai bundle once the change is processed
+ *
+ * @param {Object} subscriptionChange The subscription change object coming from payment provider
+ * type should be PaymentProviderSubscriptionChange but if imported here, it creates a circular dependency
+ * TODO: fix this when moved to es modules
+ *
+ * @return {boolean}
+ */
+function subscriptionChangeIsAiAssistUpgrade(subscriptionChange) {
+  return Boolean(
+    isStandaloneAiAddOnPlanCode(subscriptionChange.nextPlanCode) ||
+      subscriptionChange.nextAddOns?.some(
+        addOn => addOn.code === AI_ADD_ON_CODE
+      )
+  )
+}
+
+module.exports = {
+  AI_ADD_ON_CODE,
+  AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE,
+  AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE,
+  isStandaloneAiAddOnPlanCode,
+  subscriptionChangeIsAiAssistUpgrade,
+}
diff --git a/services/web/app/src/Features/Subscription/FeaturesUpdater.js b/services/web/app/src/Features/Subscription/FeaturesUpdater.js
index 16413c501c..c9ecea4dbb 100644
--- a/services/web/app/src/Features/Subscription/FeaturesUpdater.js
+++ b/services/web/app/src/Features/Subscription/FeaturesUpdater.js
@@ -15,7 +15,7 @@ const UserGetter = require('../User/UserGetter')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const Queues = require('../../infrastructure/Queues')
 const Modules = require('../../infrastructure/Modules')
-const { AI_ADD_ON_CODE } = require('./PaymentProviderEntities')
+const { AI_ADD_ON_CODE } = require('./AiHelper')
 
 /**
  * Enqueue a job for refreshing features for the given user
diff --git a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
index 4efecba0f5..c8c09d5113 100644
--- a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
+++ b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
@@ -9,13 +9,9 @@
 const OError = require('@overleaf/o-error')
 const { DuplicateAddOnError, AddOnNotPresentError } = require('./Errors')
 const PlansLocator = require('./PlansLocator')
-
-let SubscriptionHelper = null // Work around circular import (loaded at the bottom of the file)
-
+const SubscriptionHelper = require('./SubscriptionHelper')
+const { AI_ADD_ON_CODE, isStandaloneAiAddOnPlanCode } = require('./AiHelper')
 const MEMBERS_LIMIT_ADD_ON_CODE = 'additional-license'
-const AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE = 'assistant'
-const AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE = 'assistant-annual'
-const AI_ADD_ON_CODE = 'assistant'
 
 class PaymentProviderSubscription {
   /**
@@ -588,18 +584,6 @@ class PaymentProviderAccount {
   }
 }
 
-/**
- * Returns whether the given plan code is a standalone AI plan
- *
- * @param {string} planCode
- */
-function isStandaloneAiAddOnPlanCode(planCode) {
-  return (
-    planCode === AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE ||
-    planCode === AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE
-  )
-}
-
 /**
  * Returns whether the given plan code is a group plan
  *
@@ -609,27 +593,8 @@ function isGroupPlanCode(planCode) {
   return planCode.includes('group')
 }
 
-/**
- * Returns whether subscription change will have have the ai bundle once the change is processed
- *
- * @param {PaymentProviderSubscriptionChange} subscriptionChange The subscription change object coming from payment provider
- *
- * @return {boolean}
- */
-function subscriptionChangeIsAiAssistUpgrade(subscriptionChange) {
-  return Boolean(
-    isStandaloneAiAddOnPlanCode(subscriptionChange.nextPlanCode) ||
-      subscriptionChange.nextAddOns?.some(
-        addOn => addOn.code === AI_ADD_ON_CODE
-      )
-  )
-}
-
 module.exports = {
-  AI_ADD_ON_CODE,
   MEMBERS_LIMIT_ADD_ON_CODE,
-  AI_ASSIST_STANDALONE_MONTHLY_PLAN_CODE,
-  AI_ASSIST_STANDALONE_ANNUAL_PLAN_CODE,
   PaymentProviderSubscription,
   PaymentProviderSubscriptionAddOn,
   PaymentProviderSubscriptionChange,
@@ -643,9 +608,5 @@ module.exports = {
   PaymentProviderCoupon,
   PaymentProviderAccount,
   isGroupPlanCode,
-  isStandaloneAiAddOnPlanCode,
-  subscriptionChangeIsAiAssistUpgrade,
   PaymentProviderImmediateCharge,
 }
-
-SubscriptionHelper = require('./SubscriptionHelper')
diff --git a/services/web/app/src/Features/Subscription/RecurlyEventHandler.js b/services/web/app/src/Features/Subscription/RecurlyEventHandler.js
index 51314b4b31..c131ee10ec 100644
--- a/services/web/app/src/Features/Subscription/RecurlyEventHandler.js
+++ b/services/web/app/src/Features/Subscription/RecurlyEventHandler.js
@@ -1,7 +1,7 @@
 const SplitTestHandler = require('../SplitTests/SplitTestHandler')
 const AnalyticsManager = require('../Analytics/AnalyticsManager')
 const SubscriptionEmailHandler = require('./SubscriptionEmailHandler')
-const { AI_ADD_ON_CODE } = require('./PaymentProviderEntities')
+const { AI_ADD_ON_CODE } = require('./AiHelper')
 const { ObjectId } = require('mongodb-legacy')
 
 const INVOICE_SUBSCRIPTION_LIMIT = 10
diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js
index 0cf1dd959c..fe79f3caed 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionController.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionController.js
@@ -27,9 +27,11 @@ const Modules = require('../../infrastructure/Modules')
 const async = require('async')
 const HttpErrorHandler = require('../Errors/HttpErrorHandler')
 const RecurlyClient = require('./RecurlyClient')
-const { AI_ADD_ON_CODE } = require('./PaymentProviderEntities')
+const {
+  AI_ADD_ON_CODE,
+  subscriptionChangeIsAiAssistUpgrade,
+} = require('./AiHelper')
 const PlansLocator = require('./PlansLocator')
-const PaymentProviderEntities = require('./PaymentProviderEntities')
 const { User } = require('../../models/User')
 const UserGetter = require('../User/UserGetter')
 const PermissionsManager = require('../Authorization/PermissionsManager')
@@ -377,10 +379,7 @@ async function previewAddonPurchase(req, res) {
 
     const { isPremium: hasAiAssistViaWritefull } =
       await UserGetter.promises.getWritefullData(userId)
-    const isAiUpgrade =
-      PaymentProviderEntities.subscriptionChangeIsAiAssistUpgrade(
-        subscriptionChange
-      )
+    const isAiUpgrade = subscriptionChangeIsAiAssistUpgrade(subscriptionChange)
     if (hasAiAssistViaWritefull && isAiUpgrade) {
       return res.redirect(
         '/user/subscription?redirect-reason=writefull-entitled'
diff --git a/services/web/app/src/Features/Subscription/SubscriptionHelper.js b/services/web/app/src/Features/Subscription/SubscriptionHelper.js
index 0a93fa3479..35c3b4c132 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionHelper.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionHelper.js
@@ -1,6 +1,6 @@
 const { formatCurrency } = require('../../util/currency')
 const GroupPlansData = require('./GroupPlansData')
-const { isStandaloneAiAddOnPlanCode } = require('./PaymentProviderEntities')
+const { isStandaloneAiAddOnPlanCode } = require('./AiHelper')
 
 /**
  * If the user changes to a less expensive plan, we shouldn't apply the change immediately.
diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.js b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
index c0c107eecf..a8db8979f8 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionLocator.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
@@ -6,10 +6,7 @@ const { callbackifyAll } = require('@overleaf/promise-utils')
 const { Subscription } = require('../../models/Subscription')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('@overleaf/logger')
-const {
-  AI_ADD_ON_CODE,
-  isStandaloneAiAddOnPlanCode,
-} = require('./PaymentProviderEntities')
+const { AI_ADD_ON_CODE, isStandaloneAiAddOnPlanCode } = require('./AiHelper')
 require('./GroupPlansData') // make sure dynamic group plans are loaded
 
 const SubscriptionLocator = {
diff --git a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
index 3681975a38..5252abc070 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
@@ -1,10 +1,8 @@
 // ts-check
 const Settings = require('@overleaf/settings')
 const PlansLocator = require('./PlansLocator')
-const {
-  isStandaloneAiAddOnPlanCode,
-  MEMBERS_LIMIT_ADD_ON_CODE,
-} = require('./PaymentProviderEntities')
+const { isStandaloneAiAddOnPlanCode } = require('./AiHelper')
+const { MEMBERS_LIMIT_ADD_ON_CODE } = require('./PaymentProviderEntities')
 const SubscriptionFormatters = require('./SubscriptionFormatters')
 const SubscriptionLocator = require('./SubscriptionLocator')
 const InstitutionsGetter = require('../Institutions/InstitutionsGetter')
diff --git a/services/web/test/unit/src/Subscription/FeaturesUpdaterTests.js b/services/web/test/unit/src/Subscription/FeaturesUpdaterTests.js
index 8cdf313395..dccbff476c 100644
--- a/services/web/test/unit/src/Subscription/FeaturesUpdaterTests.js
+++ b/services/web/test/unit/src/Subscription/FeaturesUpdaterTests.js
@@ -4,7 +4,7 @@ const sinon = require('sinon')
 const { ObjectId } = require('mongodb-legacy')
 const {
   AI_ADD_ON_CODE,
-} = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
+} = require('../../../../app/src/Features/Subscription/AiHelper')
 
 const MODULE_PATH = '../../../../app/src/Features/Subscription/FeaturesUpdater'
 
diff --git a/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js b/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
index 07c401dfb8..2cb7037e67 100644
--- a/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
+++ b/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
@@ -4,13 +4,15 @@ const SandboxedModule = require('sandboxed-module')
 const { expect } = require('chai')
 const Errors = require('../../../../app/src/Features/Subscription/Errors')
 const {
-  AI_ADD_ON_CODE,
   PaymentProviderSubscriptionChangeRequest,
   PaymentProviderSubscriptionUpdateRequest,
   PaymentProviderSubscriptionChange,
   PaymentProviderSubscription,
   PaymentProviderSubscriptionAddOnUpdate,
 } = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
+const {
+  AI_ADD_ON_CODE,
+} = require('../../../../app/src/Features/Subscription/AiHelper')
 const SubscriptionHelper = require('../../../../app/src/Features/Subscription/SubscriptionHelper')
 
 const MODULE_PATH =
diff --git a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
index 61f9debc8d..24ce1bce8b 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionControllerTests.js
@@ -9,7 +9,7 @@ const SubscriptionErrors = require('../../../../app/src/Features/Subscription/Er
 const SubscriptionHelper = require('../../../../app/src/Features/Subscription/SubscriptionHelper')
 const {
   AI_ADD_ON_CODE,
-} = require('../../../../app/src/Features/Subscription/PaymentProviderEntities')
+} = require('../../../../app/src/Features/Subscription/AiHelper')
 
 const mockSubscriptions = {
   'subscription-123-active': {

From 3c63c1ac3ec498ff794ff36d495c09f5cde33cec Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Wed, 9 Jul 2025 15:01:57 +0100
Subject: [PATCH 167/274] Merge pull request #26971 from
 overleaf/dp-settings-button-active-state

Avoid using OLIconButton to remove active background on rail settings button

GitOrigin-RevId: c0a6c47e258ff350e82dfc465f9d37123411e446
---
 .../js/features/ide-redesign/components/rail.tsx  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index 470d3c8ccd..1625e56b0d 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -31,7 +31,6 @@ import { RailHelpContactUsModal } from './help/contact-us'
 import { HistorySidebar } from '@/features/ide-react/components/history-sidebar'
 import DictionarySettingsModal from './settings/editor-settings/dictionary-settings-modal'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
-import OLIconButton from '@/features/ui/components/ol/ol-icon-button'
 import { useChatContext } from '@/features/chat/context/chat-context'
 import { useEditorAnalytics } from '@/shared/hooks/use-editor-analytics'
 import {
@@ -391,13 +390,17 @@ const RailActionElement = ({ action }: { action: RailAction }) => {
         description={action.title}
         overlayProps={{ delay: 0, placement: 'right' }}
       >
-        <OLIconButton
+        <button
           onClick={onActionClick}
           className="ide-rail-tab-link ide-rail-tab-button"
-          icon={action.icon}
-          accessibilityLabel={action.title}
-          unfilled
-        />
+          aria-label={action.title}
+        >
+          <MaterialIcon
+            className="ide-rail-tab-link-icon"
+            type={action.icon}
+            unfilled
+          />
+        </button>
       </OLTooltip>
     )
   }

From 298f56cbe55646352dbe8668ae41911caac747e4 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Wed, 9 Jul 2025 15:04:09 +0100
Subject: [PATCH 168/274] [web] Support multi-byte characters in online user
 name (#26882)

GitOrigin-RevId: 9547ed7df13fcf8bb51ddd8c3f59167c2099e4e6
---
 .../components/online-users/online-users-widget.tsx            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/online-users/online-users-widget.tsx b/services/web/frontend/js/features/ide-redesign/components/online-users/online-users-widget.tsx
index bac1787e10..07aaa647a9 100644
--- a/services/web/frontend/js/features/ide-redesign/components/online-users/online-users-widget.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/online-users/online-users-widget.tsx
@@ -86,9 +86,10 @@ const OnlineUserWidget = ({
 
 const OnlineUserCircle = ({ user }: { user: OnlineUser }) => {
   const backgroundColor = getBackgroundColorForUserId(user.user_id)
+  const [character] = [...user.name]
   return (
     <span className="online-user-circle" style={{ backgroundColor }}>
-      {user.name.charAt(0)}
+      {character}
     </span>
   )
 }

From da203d6e968658861c543bb7341efb799e21bc28 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Wed, 9 Jul 2025 08:12:30 -0700
Subject: [PATCH 169/274] Merge pull request #26749 from
 overleaf/mf-tear-down-plans-page-bs5

[web] Tear down plans-page-bs5 and make the bs5 version the default version

GitOrigin-RevId: 6a4d8c8a75597bbda23057f8ca404cf6c5e1f428
---
 .../web/app/views/layout-website-redesign.pug |    2 -
 .../views/subscriptions/plans/_faq_new.pug    |   25 +-
 .../subscriptions/plans/_plans_faq_tabs.pug   |   33 -
 .../web/frontend/stylesheets/app/plans.less   | 1425 -----------------
 .../web/frontend/stylesheets/core/grid.less   |   42 -
 .../web/frontend/stylesheets/main-style.less  |    1 -
 6 files changed, 5 insertions(+), 1523 deletions(-)
 delete mode 100644 services/web/frontend/stylesheets/app/plans.less

diff --git a/services/web/app/views/layout-website-redesign.pug b/services/web/app/views/layout-website-redesign.pug
index 5d7bce6c4d..a6d621d8b2 100644
--- a/services/web/app/views/layout-website-redesign.pug
+++ b/services/web/app/views/layout-website-redesign.pug
@@ -15,8 +15,6 @@ block body
 
 	block content
 
-	//- bootstrapVersion needed here, because plans.pug uses both BS version
-	//- If the `plans-page-bs5` split test has been completed, remove bootstrapVersion logic
 	if typeof suppressFooter == 'undefined'
 		if showThinFooter
 			if bootstrapVersion === 5
diff --git a/services/web/app/views/subscriptions/plans/_faq_new.pug b/services/web/app/views/subscriptions/plans/_faq_new.pug
index 760f27b1a4..5939ed3545 100644
--- a/services/web/app/views/subscriptions/plans/_faq_new.pug
+++ b/services/web/app/views/subscriptions/plans/_faq_new.pug
@@ -14,30 +14,15 @@ include ../../_mixins/material_symbol
 
 	.row
 		.col-xs-12
-			div(
-				class={
-					'plans-faq-tabs': bootstrapVersion === 5,
-					'ol-tabs': bootstrapVersion === 5,
-					'ol-tabs-scrollable': bootstrapVersion === 3,
-				}
-			)
+			.ol-tabs.plans-faq-tabs
 				.nav-tabs-container
 					ul.nav.nav-tabs(role='tablist')
-						//- In the bs5 version of plans page, the `active` class need to be added to the `a` tag instead of the parent `li` tag
-						//- If the `plans-page-bs5` split test has been completed, remove the `active` class from the `li` tag since we're not using it anymore
-						//- If the `plans-page-bs5` split test has been completed, remove the `data-toggle` because it is not needed anymore (bs5 uses `data-bs-toggle`)
-						li(role='presentation' class={
-							active: bootstrapVersion === 3,
-						})
-							a(
+						li(role='presentation')
+							a.active(
 								role='tab'
-								data-toggle='tab'
 								data-bs-toggle='tab'
 								href='#' + managingYourSubscription
 								aria-controls=managingYourSubscription
-								class={
-									active: bootstrapVersion === 5,
-								}
 							)
 								| #{translate('managing_your_subscription')}
 						li(role='presentation')
@@ -72,8 +57,8 @@ include ../../_mixins/material_symbol
 			span #{translate('still_have_questions')}
 			button(
 				data-ol-open-contact-form-modal='general'
-				data-bs-toggle=bootstrapVersion === 5 ? 'modal' : undefined
-				data-bs-target=bootstrapVersion === 5 ? '#contactUsModal' : undefined
+				data-bs-toggle='modal'
+				data-bs-target='#contactUsModal'
 			)
 				span(style='margin-right: 4px') #{translate('contact_support')}
 				+material-symbol-rounded('arrow_right_alt', 'icon-md')
diff --git a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
index 59eac8efac..c20ad3ace9 100644
--- a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
+++ b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
@@ -1,4 +1,3 @@
-//- If the `plans-page-bs5` split test has been completed, remove the `data-toggle` and `data-target` because it is not needed anymore (bs5 uses `data-bs-toggle` and `data-bs-target`)
 include ../../_mixins/material_symbol
 
 mixin managingYourSubscription
@@ -6,8 +5,6 @@ mixin managingYourSubscription
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#managingYourSubscriptionQ1'
 				data-bs-toggle='collapse'
 				data-bs-target='#managingYourSubscriptionQ1'
 				aria-expanded='false'
@@ -24,8 +21,6 @@ mixin managingYourSubscription
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#managingYourSubscriptionQ2'
 				data-bs-toggle='collapse'
 				data-bs-target='#managingYourSubscriptionQ2'
 				aria-expanded='false'
@@ -40,8 +35,6 @@ mixin managingYourSubscription
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#managingYourSubscriptionQ3'
 				data-bs-toggle='collapse'
 				data-bs-target='#managingYourSubscriptionQ3'
 				aria-expanded='false'
@@ -56,8 +49,6 @@ mixin managingYourSubscription
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#managingYourSubscriptionQ4'
 				data-bs-toggle='collapse'
 				data-bs-target='#managingYourSubscriptionQ4'
 				aria-expanded='false'
@@ -85,8 +76,6 @@ mixin overleafIndividualPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafIndividualPlansQ1'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafIndividualPlansQ1'
 				aria-expanded='false'
@@ -114,8 +103,6 @@ mixin overleafIndividualPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafIndividualPlansQ2'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafIndividualPlansQ2'
 				aria-expanded='false'
@@ -131,8 +118,6 @@ mixin overleafIndividualPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafIndividualPlansQ3'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafIndividualPlansQ3'
 				aria-expanded='false'
@@ -149,8 +134,6 @@ mixin overleafIndividualPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafIndividualPlansQ4'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafIndividualPlansQ4'
 				aria-expanded='false'
@@ -167,8 +150,6 @@ mixin overleafIndividualPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafIndividualPlansQ5'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafIndividualPlansQ5'
 				aria-expanded='false'
@@ -183,8 +164,6 @@ mixin overleafIndividualPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafIndividualPlansQ6'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafIndividualPlansQ6'
 				aria-expanded='false'
@@ -199,8 +178,6 @@ mixin overleafIndividualPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafIndividualPlansQ7'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafIndividualPlansQ7'
 				aria-expanded='false'
@@ -218,8 +195,6 @@ mixin overleafGroupPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafGroupPlansQ1'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafGroupPlansQ1'
 				aria-expanded='false'
@@ -235,8 +210,6 @@ mixin overleafGroupPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafGroupPlansQ2'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafGroupPlansQ2'
 				aria-expanded='false'
@@ -261,8 +234,6 @@ mixin overleafGroupPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafGroupPlansQ3'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafGroupPlansQ3'
 				aria-expanded='false'
@@ -277,8 +248,6 @@ mixin overleafGroupPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafGroupPlansQ4'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafGroupPlansQ4'
 				aria-expanded='false'
@@ -328,8 +297,6 @@ mixin overleafGroupPlans
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
 				type='button'
-				data-toggle='collapse'
-				data-target='#overleafGroupPlansQ5'
 				data-bs-toggle='collapse'
 				data-bs-target='#overleafGroupPlansQ5'
 				aria-expanded='false'
diff --git a/services/web/frontend/stylesheets/app/plans.less b/services/web/frontend/stylesheets/app/plans.less
deleted file mode 100644
index 47bd2603c3..0000000000
--- a/services/web/frontend/stylesheets/app/plans.less
+++ /dev/null
@@ -1,1425 +0,0 @@
-@z-index-plans-new-tabs: 1;
-@z-index-group-member-picker-list: 1;
-@z-index-plans-new-tabs-content: 0;
-
-@highlighted-heading-line-height: (@line-height-03 / 1rem) * 16px; // convert to px
-@highlighted-heading-padding-vertical: @spacing-02;
-@highlighted-heading-height: (
-  @highlighted-heading-line-height + (2 * @highlighted-heading-padding-vertical)
-);
-
-@switcher-container-margin-bottom: @highlighted-heading-height + @spacing-10;
-
-@nondiscounted-price-element-height: var(--line-height-02);
-
-@group-member-picker-height: 24px;
-@group-member-picker-top-height: 36px;
-@group-member-picker-sm-width: 50%;
-@group-member-picker-md-width: 25%;
-@group-member-picker-min-width: 234px;
-
-@container-plans-responsive-width: 95%;
-@table-4-column-width: 25%;
-@table-5-column-width: 20%;
-
-.plans-new-design {
-  padding-top: var(--header-height);
-
-  .container {
-    padding: 0 var(--spacing-06);
-
-    @media (min-width: @screen-sm-min) {
-      width: @container-plans-responsive-width;
-    }
-    @media (min-width: @screen-xl-min) {
-      width: @container-xl;
-    }
-
-    .geo-banner-container {
-      margin-top: var(--spacing-08);
-    }
-
-    .plans-new-design-content-spacing {
-      margin-top: var(--spacing-16);
-    }
-
-    .interstitial-new-design-content-spacing {
-      margin-top: var(--spacing-13);
-    }
-  }
-  .main-heading-section {
-    text-align: center;
-    max-width: 885px;
-    margin-left: auto;
-    margin-right: auto;
-
-    @media (max-width: @screen-xs-max) {
-      text-align: left;
-      padding: 0 16px;
-    }
-
-    .plans-page-heading {
-      margin-top: 8px;
-      margin-bottom: unset;
-      font-size: 3rem;
-      font-weight: 600;
-      line-height: 64px;
-      @media (max-width: @screen-xs-max) {
-        font-size: 2.25rem;
-        line-height: 48px;
-        padding-right: 5rem;
-      }
-    }
-
-    .plans-page-sub-heading {
-      font-size: 1.125rem;
-      line-height: 24px;
-      margin-top: 16px;
-      margin-bottom: unset;
-    }
-  }
-
-  .plans-new-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    @media (min-width: @screen-sm-min) {
-      border-left: 1px solid var(--neutral-20);
-      border-right: 1px solid var(--neutral-20);
-      border-bottom: 1px solid var(--neutral-20);
-      border-radius: 8px;
-    }
-
-    // this is the border between the tabs and the content, specifically on the left and right side
-    // this is necessary to enable top border radius on the plans-new-content
-    &::before {
-      content: '';
-      display: block;
-      z-index: @z-index-plans-new-tabs-content;
-      position: absolute;
-      top: -1px; // make border overlap with the border on .plans-new-tabs
-      width: 100%;
-      height: 20px; // arbitrary height since it's transparent, make sure that it's bigger than border radius
-      background: transparent;
-      border-top: 1px solid var(--neutral-20);
-
-      @media (min-width: @screen-sm-min) {
-        border-top-left-radius: 8px;
-        border-top-right-radius: 8px;
-      }
-    }
-  }
-
-  .plans-new-tabs-container {
-    z-index: @z-index-plans-new-tabs;
-    margin-top: var(--spacing-16);
-
-    // explicit padding to tell that the bottom left and bottom right
-    // does not have bottom border defined in .plans-new-tabs
-    // technically unnecessary because padding is already defined in bootstrap column
-    padding: 0 16px;
-  }
-
-  .plans-new-tabs {
-    display: flex;
-    justify-content: center;
-    gap: 8px;
-    border-bottom: 1px solid var(--neutral-20);
-
-    .plans-new-tab {
-      cursor: pointer;
-      font-size: 16px;
-      font-weight: 600;
-      border-top-right-radius: 8px;
-      border-top-left-radius: 8px;
-
-      .plans-new-tab-link {
-        border: unset;
-        display: flex;
-        align-items: center;
-        color: var(--neutral-70);
-        margin: 0;
-        border-top-right-radius: 8px;
-        border-top-left-radius: 8px;
-        border: 1px solid var(--neutral-20);
-        padding: var(--spacing-05) var(--spacing-08);
-        gap: var(--spacing-04);
-
-        &:focus {
-          background-color: unset;
-          outline: 0;
-        }
-
-        &:hover {
-          background-color: var(--neutral-20);
-        }
-
-        // tab navigation focus style
-        &:focus-visible {
-          .box-shadow-button-input();
-          outline: 0;
-        }
-
-        .group-discount-bubble {
-          padding: var(--spacing-01) var(--spacing-04);
-          background-color: var(--green-10);
-          color: var(--green-50);
-          border-radius: var(--border-radius-full-new);
-          font-family: 'DM Mono', monospace;
-          font-feature-settings: 'ss05';
-          font-size: var(--font-size-01);
-          line-height: var(--line-height-01);
-          font-weight: 500;
-
-          @media (max-width: @screen-xs-max) {
-            display: none;
-          }
-        }
-
-        @media (max-width: @screen-xs-max) {
-          font-size: var(--font-size-02);
-          line-height: var(--line-height-02);
-          padding: var(--spacing-05);
-          gap: var(--spacing-02);
-        }
-      }
-
-      &.active {
-        .plans-new-tab-link {
-          border: 1px solid white;
-          position: relative;
-          color: var(--green-50);
-
-          // remove the border on tab focus
-          &:focus-visible {
-            &::before {
-              content: unset;
-            }
-          }
-
-          &::before {
-            content: '';
-            position: absolute;
-            background: border-box
-              linear-gradient(
-                to bottom,
-                @green-50 0%,
-                @neutral-20 85%,
-                @neutral-20 100%
-              );
-            -webkit-mask:
-              linear-gradient(white 0 0) padding-box,
-              linear-gradient(white 0 0);
-            mask:
-              linear-gradient(white 0 0) padding-box,
-              linear-gradient(white 0 0);
-            -webkit-mask-composite: xor;
-            mask-composite: exclude;
-            border-top-right-radius: 8px;
-            border-top-left-radius: 8px;
-            border: 1px solid transparent;
-            border-bottom: 1px solid white;
-
-            // make the border overlap with the .plans-new-tab-link border
-            top: 0;
-            bottom: -2px;
-            left: -1px;
-            right: -1px;
-          }
-
-          &:hover {
-            background-color: unset;
-          }
-        }
-
-        .plans-new-discount-badge {
-          background-color: var(--green-10);
-          color: var(--green-60);
-        }
-      }
-    }
-  }
-
-  .plans-new-period-switcher-container {
-    position: relative;
-    display: inline-flex;
-    background-color: var(--neutral-10);
-    border-radius: var(--border-radius-full-new);
-    padding: var(--spacing-03);
-    margin-top: var(--spacing-09);
-    margin-bottom: @switcher-container-margin-bottom;
-    gap: var(--spacing-04);
-
-    @media (max-width: @screen-xs-max) {
-      margin-bottom: var(--spacing-09);
-    }
-
-    label {
-      display: inline-flex;
-      align-items: center;
-      margin: 0;
-      font-size: var(--font-size-05);
-      font-weight: 600;
-      line-height: var(--line-height-04);
-      text-align: center;
-      padding: var(--spacing-01) var(--spacing-04);
-      border-radius: var(--border-radius-full-new);
-
-      &:hover {
-        background-color: var(--neutral-20);
-        cursor: pointer;
-      }
-    }
-
-    input[type='radio'] {
-      position: absolute;
-      left: -9999px;
-      &:focus,
-      &:focus-visible {
-        outline: 0;
-      }
-    }
-
-    input[type='radio']:focus-visible + label,
-    input[type='radio']:checked:focus-visible + label {
-      .box-shadow-button-input();
-    }
-
-    input[type='radio']:checked + label {
-      background-color: var(--green-50);
-      color: white;
-      box-shadow: 0px 2px 4px 0px rgba(30, 37, 48, 0.16);
-      .plans-new-discount-badge {
-        background-color: var(--green-10);
-        color: var(--green-60);
-      }
-    }
-
-    .plans-new-discount-badge {
-      margin-left: var(--spacing-03);
-    }
-  }
-
-  .plans-new-discount-badge {
-    font-size: var(--font-size-01);
-    font-family: 'DM Mono', monospace;
-    padding: 2px 8px;
-    height: 20px;
-    border-radius: 10px;
-    background-color: var(--neutral-70);
-    color: white;
-    display: flex;
-    align-items: center;
-    font-weight: 500;
-    line-height: var(--line-height-01);
-  }
-
-  .plans-new-tab-content {
-    width: 100%;
-    border: none;
-    padding-top: 0;
-
-    @media (max-width: @screen-xs-min) {
-      padding: 0;
-    }
-  }
-
-  .plans-new-mobile {
-    display: none;
-
-    @media (max-width: @screen-xs-max) {
-      display: block;
-    }
-  }
-
-  .plans-new-desktop {
-    display: block;
-
-    @media (max-width: @screen-xs-max) {
-      display: none;
-    }
-  }
-
-  .plans-new-table {
-    width: 100%;
-
-    // keep the borders separate to help with spacing and alignment in the CTAs
-    border-collapse: separate;
-    border-spacing: 0;
-
-    th,
-    td {
-      width: @table-4-column-width;
-    }
-  }
-
-  .plans-new-table-student {
-    margin-left: @table-4-column-width / 2;
-  }
-
-  .plans-new-table-student-verification {
-    font-weight: 600;
-    font-size: var(--font-size-01);
-    text-align: center;
-  }
-
-  .plans-new-table-group {
-    margin-top: @spacing-11 + @highlighted-heading-height;
-  }
-
-  thead th {
-    position: relative;
-    padding: var(--spacing-06) var(--spacing-08) var(--spacing-04)
-      var(--spacing-08);
-    font-size: var(--font-size-05);
-    font-weight: 600;
-    line-height: var(--line-height-04);
-    color: var(--neutral-90);
-    text-align: center;
-
-    @media (max-width: @screen-md-max) {
-      padding: var(--spacing-05) var(--spacing-05) 0 var(--spacing-05);
-    }
-  }
-
-  .plans-new-table-subheader {
-    vertical-align: top;
-    padding: 0 var(--spacing-08);
-    @media (max-width: @screen-md-max) {
-      padding: 0 var(--spacing-05);
-    }
-
-    &.plans-new-table-icon-cta-cell,
-    &.plans-subheader-monthly-cta {
-      vertical-align: bottom;
-    }
-  }
-
-  .plans-new-table-cta-row {
-    td {
-      padding-bottom: var(--spacing-06);
-      @media (max-width: @screen-md-max) {
-        padding-bottom: var(--spacing-05);
-      }
-
-      // use transparent borders to use the same spacing as highlighted cells
-      &:not(.plans-new-table-highlighted-cell) {
-        border-right: var(--border-width-base) solid transparent;
-        border-left: var(--border-width-base) solid transparent;
-      }
-    }
-
-    .btn-block + .btn-block {
-      margin-top: var(--spacing-04);
-    }
-  }
-
-  .plans-new-table-header-grid-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    s,
-    .match-original-price-height {
-      font-size: var(--font-size-02);
-      line-height: @nondiscounted-price-element-height;
-      color: var(--neutral-60);
-      font-weight: 600;
-    }
-
-    .plans-new-table-header-price {
-      font-size: var(--font-size-08);
-      font-weight: 600;
-      line-height: var(--line-height-07);
-      color: var(--neutral-90);
-    }
-
-    .plans-new-table-header-price-unit {
-      font-size: var(--font-size-02);
-      line-height: var(--line-height-02);
-      text-align: center;
-    }
-
-    .plans-new-table-cta {
-      margin-top: auto;
-      a:nth-child(2) {
-        margin-top: var(--spacing-04);
-      }
-    }
-
-    .plans-new-table-header-icon {
-      font-size: 56px;
-      color: var(--neutral-90);
-    }
-  }
-
-  .plans-new-table-header-price-unit-total {
-    font-size: var(--font-size-01);
-    line-height: var(--line-height-01);
-  }
-
-  .plans-new-table-header-desc {
-    margin-top: var(--spacing-05);
-    margin-bottom: var(--spacing-08);
-    font-size: var(--font-size-02);
-    line-height: var(--line-height-02);
-  }
-
-  .plans-new-group-member-picker {
-    .plans-new-group-member-picker-text {
-      font-size: var(--font-size-02);
-      line-height: var(--line-height-02);
-      font-weight: 600;
-      margin-bottom: var(--spacing-02);
-    }
-
-    .plans-new-group-member-picker-form {
-      position: relative;
-
-      .plans-new-group-member-picker-button {
-        width: 100%;
-        background-color: white;
-        border-radius: var(--border-radius-base-new);
-        border: 1px solid var(--neutral-60);
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: var(--spacing-01) var(--spacing-03);
-        margin-bottom: var(--spacing-04);
-        height: @group-member-picker-height;
-        font-size: var(--font-size-02);
-        line-height: var(--line-height-02);
-
-        &[aria-expanded='true'] {
-          i {
-            transform: rotate(180deg);
-            transition: transform 0.35s ease;
-          }
-        }
-
-        &[aria-expanded='false'] {
-          i {
-            transition: transform 0.35s ease;
-          }
-        }
-
-        &[data-ol-plans-new-group-member-picker-button='group-all'] {
-          height: @group-member-picker-top-height;
-        }
-      }
-
-      ul.plans-new-group-member-picker-list {
-        list-style-type: none;
-        margin-bottom: 0;
-        overflow: auto; // to enable box-shadow
-        box-shadow: 0px 2px 4px 0px rgba(30, 37, 48, 0.16);
-        padding: var(--spacing-02);
-        position: absolute;
-        top: @group-member-picker-height;
-        background-color: white;
-        width: 100%;
-        margin-top: var(--spacing-01);
-        z-index: @z-index-group-member-picker-list;
-
-        &[data-ol-plans-new-group-member-picker-dropdown='group-all'] {
-          top: @group-member-picker-top-height;
-        }
-      }
-
-      li.plans-new-group-member-picker-footer {
-        font-size: var(--font-size-02);
-        line-height: var(--line-height-02);
-        padding: var(--spacing-05) var(--spacing-04);
-
-        span {
-          display: block;
-        }
-
-        button {
-          font-weight: 400;
-          padding: 0;
-          font-size: var(--font-size-02);
-          line-height: var(--line-height-02);
-        }
-      }
-
-      li {
-        position: relative;
-
-        &:not(:last-child) {
-          margin-bottom: var(--spacing-02);
-        }
-
-        &:not(.plans-new-group-member-picker-footer):hover {
-          input[type='radio']:not(:checked) + p {
-            background-color: var(--neutral-10);
-          }
-        }
-
-        input[type='radio'] {
-          position: absolute;
-          opacity: 0;
-          cursor: pointer;
-
-          &:focus + p {
-            &:extend(.input-focus-style);
-          }
-
-          + p {
-            padding: var(--spacing-05) var(--spacing-08) var(--spacing-05)
-              var(--spacing-04);
-            margin-bottom: 0;
-            border-radius: var(--border-radius-base-new);
-          }
-        }
-
-        input[type='radio']:checked + p {
-          background-color: var(--green-10);
-          color: var(--green-70);
-          position: relative;
-          word-wrap: break-word;
-
-          &::after {
-            content: url(../../../public/img/material-icons/check-green-20.svg);
-            position: absolute;
-            right: 12px;
-            top: 50%;
-            transform: translateY(-50%);
-
-            @media (max-width: @screen-sm-max) {
-              right: var(--spacing-04);
-            }
-          }
-        }
-
-        label {
-          width: 100%;
-          font-size: var(--font-size-02);
-          line-height: var(--line-height-02);
-          margin-bottom: var(--spacing-00);
-          font-weight: 400;
-          cursor: pointer;
-          border-radius: var(--border-radius-base-new);
-
-          .list-item-footer {
-            font-size: var(--font-size-01);
-            line-height: var(--line-height-01);
-          }
-        }
-      }
-
-      .plans-new-edu-discount {
-        display: flex;
-        align-items: flex-start;
-        gap: var(--spacing-04);
-        margin-bottom: var(--spacing-06);
-        font-weight: 400;
-
-        input[type='checkbox'] {
-          margin: var(--spacing-02);
-          accent-color: var(--green-50);
-
-          &:focus-visible {
-            .box-shadow-button-input();
-          }
-        }
-
-        .plans-new-edu-discount-content {
-          display: flex;
-          flex-direction: column;
-
-          span {
-            line-height: var(--line-height-03);
-            color: var(--neutral-90);
-          }
-
-          small {
-            color: var(--neutral-70);
-            font-size: var(--font-size-01);
-            line-height: var(--line-height-01);
-          }
-        }
-      }
-    }
-  }
-
-  .plans-new-table-body:last-of-type {
-    .plans-new-table-feature-row:last-of-type {
-      .plans-new-table-feature-td.plans-new-table-highlighted-cell {
-        border-bottom: var(--border-width-base) solid var(--green-50);
-      }
-    }
-  }
-
-  .plans-new-table-heading-row {
-    // this means min-height, min-height does not work in table layout
-    // https://stackoverflow.com/questions/7790222
-    height: 64px;
-  }
-
-  .plans-new-table-heading-text {
-    padding: var(--spacing-05) var(--spacing-08) var(--spacing-05)
-      var(--spacing-05);
-    font-weight: 600;
-    font-size: var(--font-size-04);
-    line-height: var(--line-height-03);
-    vertical-align: bottom;
-  }
-
-  .plans-new-table-feature-row {
-    &:nth-child(even) {
-      background-color: var(--neutral-10);
-    }
-  }
-
-  .plans-new-table-section-without-header-row {
-    &:nth-child(odd):not(.plans-new-table-heading-row) {
-      background-color: var(--neutral-10);
-    }
-    &:nth-child(even):not(.plans-new-table-heading-row) {
-      background-color: var(--white);
-    }
-  }
-
-  .plans-new-table-feature-th {
-    font-weight: normal;
-    padding: var(--spacing-05) var(--spacing-08) var(--spacing-05)
-      var(--spacing-05);
-
-    .plans-new-table-feature-th-content {
-      line-height: var(--line-height-03);
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      .plans-new-table-feature-tooltip-icon {
-        cursor: help;
-        margin-left: var(--spacing-05);
-      }
-
-      .tooltip.in {
-        opacity: 1;
-      }
-
-      .tooltip-inner {
-        padding: var(--spacing-04) var(--spacing-06);
-        max-width: 258px;
-        width: 258px;
-        font-family: Lato, sans-serif;
-        font-size: var(--font-size-02);
-        text-align: left;
-        background-color: var(--neutral-90);
-        border-radius: var(--border-radius-base-new);
-      }
-    }
-  }
-
-  .plans-new-table-feature-td {
-    padding: var(--spacing-05) var(--spacing-08);
-    text-align: center;
-    line-height: var(--line-height-03);
-
-    .green-round-background {
-      margin-right: 0;
-    }
-  }
-
-  .plans-new-table-highlighted-heading {
-    position: absolute;
-    left: calc(-1 * var(--border-width-base));
-    top: -1 * @highlighted-heading-height;
-    height: @highlighted-heading-height;
-    width: calc(100% + (2 * var(--border-width-base)));
-    border-top-left-radius: var(--border-radius-large-new);
-    border-top-right-radius: var(--border-radius-large-new);
-    padding: @highlighted-heading-padding-vertical var(--spacing-04);
-    font-weight: 600;
-    text-align: center;
-    line-height: @highlighted-heading-line-height;
-    background-color: var(--green-50);
-    color: var(--white);
-    font-size: var(--font-size-03);
-  }
-
-  .plans-new-table-highlighted-cell {
-    border-right: var(--border-width-base) solid var(--green-50);
-    border-left: var(--border-width-base) solid var(--green-50);
-  }
-
-  .ai-assist {
-    color: var(--neutral-90);
-
-    @media (min-width: @screen-sm-min) {
-      padding-left: 0 !important;
-      padding-right: 0 !important;
-    }
-
-    .ai-assist-heading {
-      margin-top: var(--spacing-12);
-      margin-bottom: var(--spacing-12);
-      text-align: center;
-    }
-
-    .ai-assist-container {
-      padding: var(--spacing-10);
-      border: 4px solid var(--neutral-10);
-      border-radius: var(--border-radius-large-new);
-      background:
-        linear-gradient(270deg, var(--blue-10), #fff) 0.13%,
-        #fff 63.21%;
-
-      @media (max-width: @screen-sm-max) {
-        background: #fff;
-        border-width: 2px;
-        border-radius: var(--border-radius-medium-new);
-        border-color: var(--premium-gradient);
-        padding: var(--spacing-09);
-      }
-
-      .ai-assist-content {
-        display: flex;
-        justify-content: space-between;
-        gap: var(--spacing-07);
-
-        @media (max-width: @screen-sm-max) {
-          flex-direction: column;
-        }
-        .ai-assist-left {
-          display: flex;
-          gap: var(--spacing-07);
-          flex-direction: column;
-          max-width: @screen-xs;
-
-          @media (max-width: @screen-sm-max) {
-            max-width: 100%;
-          }
-
-          .ai-assist-price {
-            font-weight: 600;
-            font-size: var(--font-size-03);
-
-            @media (max-width: @screen-sm-max) {
-              font-weight: normal;
-              font-size: var(--font-size-02);
-              .price {
-                font-size: var(--font-size-08);
-                font-weight: 600;
-              }
-            }
-          }
-          .ai-assist-annually-price {
-            display: block;
-          }
-          .ai-assist-monthly-price {
-            display: none;
-          }
-          .ai-assist-header-switch {
-            display: none;
-          }
-
-          .ai-assist-header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-
-            .ai-assist-header-content {
-              display: flex;
-              gap: var(--spacing-06);
-              align-items: center;
-
-              h3 {
-                font-size: var(--font-size-07);
-                margin: 0;
-                padding: 0;
-
-                @media (max-width: @screen-sm-max) {
-                  font-size: var(--font-size-05);
-                }
-              }
-
-              img {
-                @media (max-width: @screen-sm-max) {
-                  width: 24px;
-                }
-              }
-            }
-
-            .ai-assist-header-switch {
-              align-items: center;
-              gap: var(--spacing-03);
-              user-select: none;
-
-              input {
-                margin: 0;
-              }
-
-              label {
-                margin: 0;
-                font-weight: normal;
-              }
-            }
-          }
-        }
-        .ai-assist-right {
-          display: flex;
-          align-items: center;
-          gap: var(--spacing-06);
-
-          .ai-assist-features {
-            list-style: none;
-            display: flex;
-            flex-direction: column;
-            gap: var(--spacing-04);
-            min-width: 210px;
-            margin-bottom: 0;
-
-            .feature-item {
-              display: flex;
-              align-items: center;
-              font-size: var(--font-size-03);
-              cursor: default;
-
-              .feature-icon {
-                margin-right: var(--spacing-05);
-                color: var(--neutral-70);
-                width: 16px;
-                height: 16px;
-              }
-
-              .feature-text {
-                color: var(--neutral-90);
-              }
-            }
-
-            @media (min-width: @screen-sm-min) {
-              .feature-item-selected {
-                .feature-text {
-                  color: var(--blue-50);
-                  font-weight: 600;
-                }
-
-                .feature-icon {
-                  content: url(../../../public/img/check-circle-blue-filled.svg);
-                }
-              }
-            }
-          }
-
-          .ai-assist-images {
-            display: flex;
-            align-items: flex-start;
-            width: 280px;
-            justify-content: center;
-
-            @media (max-width: @screen-sm-max) {
-              display: none;
-            }
-          }
-        }
-      }
-    }
-
-    .ai-assist-header-switch {
-      display: flex !important;
-    }
-
-    .ai-assist-button-container {
-      display: flex;
-      gap: var(--spacing-05);
-
-      &.mobile {
-        display: none;
-        margin-top: var(--spacing-06);
-        flex-direction: column;
-      }
-
-      @media (max-width: @screen-sm-max) {
-        &.mobile {
-          display: flex;
-        }
-        &.desktop {
-          display: none;
-        }
-      }
-
-      .btn.monthly {
-        display: none;
-      }
-    }
-
-    .overleaf-assist-screenshot {
-      height: auto;
-      max-width: 280px;
-      max-height: 200px;
-      border-radius: var(--border-radius-base-new);
-      display: none;
-
-      &.selected {
-        display: block;
-        -webkit-animation: fade-in 1s;
-        animation: fade-in 1s;
-      }
-    }
-  }
-  .ai-assist.monthly-period {
-    .ai-assist-annually-price {
-      display: none !important;
-    }
-    .ai-assist-monthly-price {
-      display: block !important;
-    }
-    .ai-assist-button-container .btn.annual {
-      display: none !important;
-    }
-    .ai-assist-button-container .btn.monthly {
-      display: block !important;
-    }
-  }
-
-  .plans-new-organizations {
-    padding: var(--spacing-13) var(--spacing-08);
-
-    .plans-new-organizations-text {
-      text-align: center;
-      font-size: var(--font-size-05);
-      line-height: var(--line-height-04);
-      margin-bottom: var(--spacing-00);
-    }
-
-    .plans-new-organizations-logo {
-      margin-top: var(--spacing-09);
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-
-      @media (max-width: @screen-md-max) {
-        flex-wrap: wrap;
-        gap: 30px;
-      }
-    }
-  }
-
-  .plans-card-container-mobile {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    gap: var(--spacing-06);
-
-    .mt-spacing-06 {
-      margin-top: var(--spacing-06);
-    }
-
-    .highlighted-plans-card {
-      border: 2px solid var(--green-50) !important;
-    }
-
-    .plans-card-mobile {
-      padding: var(--spacing-09);
-      border: 2px solid var(--neutral-20);
-      width: 100%; // might need max-width
-      border-radius: 8px;
-      display: flex;
-      flex-direction: column;
-
-      .plans-card-title-mobile {
-        color: var(--neutral-90);
-        font-size: var(--font-size-05); // 20px
-        font-weight: 600;
-        line-height: var(--line-height-04);
-      }
-
-      .plans-card-icon-container-mobile {
-        margin-top: var(--spacing-04);
-        .plans-card-icon {
-          font-size: var(--font-size-09);
-          color: var(--neutral-90);
-        }
-      }
-
-      s {
-        padding: var(--spacing-04) 0 0 0;
-        color: var(--neutral-60);
-        font-size: var(--font-size-04); // 18px
-        font-weight: 600;
-        line-height: var(--line-height-05);
-        margin-bottom: var(--spacing-04);
-      }
-
-      .plans-card-price-container-mobile {
-        display: flex;
-        align-items: baseline;
-      }
-
-      .group-plans-card-price-container-mobile {
-        display: flex;
-        align-items: center;
-      }
-
-      .plans-card-price-mobile {
-        color: var(--neutral-90);
-        font-size: var(--font-size-08); // 36px
-        font-weight: 600;
-        line-height: var(--line-height-07);
-        margin-right: var(--spacing-03);
-      }
-
-      .light-gray-text {
-        color: var(--neutral-70);
-        font-size: var(--font-size-02); // 14px
-        line-height: var(--line-height-02);
-      }
-
-      .plans-card-description-mobile {
-        .green-round-background {
-          width: 20px;
-          height: 20px;
-        }
-
-        .plans-card-description-list-mobile {
-          list-style-type: none;
-          padding-left: 0;
-          margin-bottom: unset;
-          li {
-            display: flex;
-            margin-top: var(--spacing-05);
-          }
-        }
-
-        .plans-card-cta-container {
-          margin-top: var(--spacing-08);
-          width: 100%;
-
-          .btn-block + .btn-block {
-            margin-top: var(--spacing-04);
-          }
-        }
-      }
-    }
-  }
-
-  .plans-new-group-tab-card-container {
-    margin-top: var(--spacing-09);
-  }
-
-  .plans-features-table-section-container-mobile {
-    margin-top: var(--spacing-13);
-    .plans-features-section-heading-mobile {
-      font-size: var(--font-size-06);
-      font-weight: 600;
-      line-height: var(--line-height-05);
-      color: var(--neutral-90);
-      text-align: center;
-      margin-bottom: var(--spacing-08);
-    }
-
-    .plans-features-table-mobile {
-      width: 100%;
-
-      .plans-features-table-sticky-header {
-        position: sticky;
-        top: 0;
-      }
-
-      .plans-features-table-header {
-        margin-bottom: var(--space-08);
-      }
-
-      .plans-features-table-header-container-mobile {
-        margin: var(--spacing-08) auto;
-        border-bottom: unset;
-        width: 100%;
-        max-width: 544px;
-
-        .plans-features-table-header-item-mobile {
-          width: 33%;
-          min-width: 114px;
-          padding: unset;
-
-          .plans-features-table-header-item-content-mobile {
-            padding: var(--spacing-04);
-            text-align: center;
-            background-color: var(--neutral-10);
-          }
-
-          .plans-group-features-table-header-item-content-mobile {
-            padding: var(--spacing-04);
-            text-align: center;
-            background-color: var(--neutral-10);
-            height: 64px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-
-          .plans-features-table-header-item-title-mobile {
-            color: var(--neutral-90);
-            line-height: var(--line-height-03);
-            font-weight: 600;
-            font-size: var(--font-size-03);
-          }
-
-          .plans-features-table-header-item-price-mobile {
-            font-weight: 400;
-            color: var(--neutral-70);
-            line-height: var(--line-height-01);
-            font-size: var(--spacing-05);
-          }
-        }
-
-        .highlighted-styles {
-          background-color: var(--neutral-80);
-
-          .plans-features-table-header-item-title-mobile,
-          .plans-features-table-header-item-price-mobile {
-            color: var(--white);
-          }
-        }
-
-        .plans-features-table-header-item-content-mobile.highlighted,
-        .plans-group-features-table-header-item-content-mobile.highlighted {
-          .highlighted-styles;
-        }
-      }
-
-      tr.plans-features-table-row-for-margin {
-        height: var(--spacing-08);
-      }
-
-      .plans-features-table-body-container-mobile {
-        .plans-features-table-row-heading-mobile {
-          font-weight: 600;
-          text-align: center;
-          line-height: var(--line-height-03);
-          .plans-features-table-row-section-heading-content-mobile {
-            padding-top: var(--spacing-08);
-            padding-bottom: var(--spacing-05);
-            font-size: var(--font-size-04);
-            color: var(--neutral-90);
-          }
-        }
-
-        // .plans-features-table-row-title-mobile and .plans-features-table-row-mobile are combined together to make one row visually, so we are using factors of 4 to alternatively color their backgrounds.
-        .plans-features-table-row-title-mobile {
-          &.plans-features-table-row-title-mobile-without-heading {
-            &:nth-child(4n - 3) {
-              background-color: var(--neutral-10);
-            }
-
-            &:nth-child(4n - 1) {
-              background-color: var(--white);
-            }
-          }
-
-          &:nth-child(4n - 2) {
-            background-color: var(--neutral-10);
-          }
-
-          &:nth-child(4n) {
-            background-color: var(--white);
-          }
-
-          .plans-features-table-row-title-content-mobile {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            padding-top: var(--spacing-06);
-            font-weight: 600;
-            line-height: var(--line-height-03);
-            .plans-features-table-row-title-accordion {
-              display: flex;
-              justify-content: center;
-              flex-direction: column;
-              align-items: center;
-              text-align: center;
-              padding: 0 var(--spacing-04);
-              .plans-features-table-row-title-accordion-header {
-                font-size: var(--font-size-03);
-                font-weight: 600;
-                line-height: var(--line-height-03);
-                display: flex;
-                justify-content: center;
-                background-color: unset;
-                border: unset;
-                .plans-features-table-row-title-accordion-icon {
-                  display: flex;
-                  align-items: center;
-                  transition: transform 0.35s ease;
-                  margin-left: var(--spacing-02);
-                }
-
-                &:not(.collapsed) {
-                  .plans-features-table-row-title-accordion-icon {
-                    transform: rotate(180deg);
-                    transition: transform 0.35s ease;
-                  }
-                }
-              }
-              .plans-features-table-row-title-accordion-body {
-                font-size: var(--font-size-01);
-                line-height: var(--line-height-01);
-                font-weight: 400;
-              }
-            }
-          }
-        }
-
-        .plans-features-table-row-mobile {
-          &.plans-features-table-row-mobile-without-heading {
-            &:nth-child(4n - 2) {
-              background-color: var(--neutral-10);
-            }
-
-            &:nth-child(4n) {
-              background-color: var(--white);
-            }
-          }
-
-          &:nth-child(4n - 3) {
-            background-color: var(--white);
-          }
-
-          &:nth-child(4n - 1) {
-            background-color: var(--neutral-10);
-          }
-
-          .plans-features-table-cell-content-mobile {
-            text-align: center;
-            padding-top: var(--spacing-05);
-            padding-bottom: var(--spacing-06);
-          }
-        }
-      }
-    }
-  }
-
-  .plans-price-disclaimer {
-    font-size: var(--font-size-01);
-    line-height: var(--line-height-01);
-    margin-top: var(--spacing-08);
-    text-align: center;
-
-    &:last-child {
-      margin-bottom: var(--spacing-11);
-    }
-
-    &:not(:last-child) {
-      margin-bottom: var(--spacing-08);
-    }
-
-    .plans-price-disclaimer-icons {
-      display: flex;
-      justify-content: center;
-      gap: var(--spacing-04);
-    }
-  }
-
-  .only-show-for-specific-plan-type {
-    display: none;
-  }
-  &[data-ol-current-plan-type='group'] {
-    .show-for-plan-type-group {
-      display: block;
-    }
-  }
-  &[data-ol-current-plan-type='individual'] {
-    .show-for-plan-type-individual {
-      display: block;
-    }
-  }
-  &[data-ol-current-plan-type='student'] {
-    .show-for-plan-type-student {
-      display: block;
-    }
-  }
-
-  .only-show-for-specific-plan-period {
-    display: none;
-  }
-  &[data-ol-current-plan-period='annual'] {
-    .show-for-plan-period-annual {
-      display: block;
-    }
-  }
-  &[data-ol-current-plan-period='monthly'] {
-    .show-for-plan-period-monthly {
-      display: block;
-    }
-  }
-}
-
-.plans-overleaf-common-request {
-  color: var(--neutral-90);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: var(--spacing-04) var(--spacing-08);
-  text-align: center;
-  gap: var(--spacing-06);
-
-  @media (max-width: @screen-xs-max) {
-    flex-direction: column;
-    margin: 0;
-  }
-
-  a {
-    font-size: var(--font-size-02);
-    line-height: var(--line-height-02);
-  }
-}
-
-.plans-faq {
-  .faq-heading-container {
-    text-align: center;
-    margin-bottom: var(--spacing-10);
-
-    @media (max-width: @screen-xs-max) {
-      text-align: unset;
-    }
-  }
-
-  .plans-faq-support {
-    margin-top: var(--spacing-06);
-    margin-bottom: var(--spacing-06);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: var(--spacing-04);
-
-    span {
-      line-height: var(--line-height-03);
-      font-size: var(--font-size-04);
-    }
-
-    button {
-      font-family: 'DM Mono', monospace;
-      font-weight: 500;
-      text-decoration: none;
-      color: var(--green-50);
-      line-height: var(--line-height-03);
-      font-size: var(--font-size-04);
-      background-color: var(--white);
-      border: unset;
-      display: flex;
-      align-items: center;
-    }
-  }
-}
-
-.plans-new-design.plans-interstitial-new-design {
-  padding-top: var(--header-height);
-  padding-bottom: var(--spacing-09);
-
-  .plans-interstitial-new-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
-  .plans-new-table {
-    th,
-    td {
-      width: @table-5-column-width;
-    }
-  }
-}
diff --git a/services/web/frontend/stylesheets/core/grid.less b/services/web/frontend/stylesheets/core/grid.less
index 7f4d3264c9..a45ef73f4f 100755
--- a/services/web/frontend/stylesheets/core/grid.less
+++ b/services/web/frontend/stylesheets/core/grid.less
@@ -74,45 +74,3 @@
 @media (min-width: @screen-lg-min) {
   .make-grid(lg);
 }
-
-.website-redesign {
-  // whitelist for the pages to use the new grid
-  // TODO: remove this whitelist once all pages are using the new grid
-  .plans-new-design,
-  .plans-page {
-    // Container widths
-    //
-    // Set the container width, and override it for fixed navbars in media queries.
-
-    .container {
-      .container-fixed(@grid-gutter-width-new);
-
-      @media (min-width: @screen-sm-min) {
-        width: @container-sm;
-      }
-      @media (min-width: @screen-md-min) {
-        width: @container-md;
-      }
-      @media (min-width: @screen-lg-min) {
-        width: @container-lg;
-      }
-      @media (min-width: @screen-xl-min) {
-        width: @container-xl;
-      }
-    }
-
-    // Row
-    //
-    // Rows contain and clear the floats of your columns.
-
-    .row {
-      .make-row(@grid-gutter-width-new);
-    }
-
-    // Columns
-    //
-    // Common styles for small and large grid columns
-
-    .make-grid-columns(@grid-gutter-width-new);
-  }
-}
diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less
index 9911686ad5..d3a7d272d1 100644
--- a/services/web/frontend/stylesheets/main-style.less
+++ b/services/web/frontend/stylesheets/main-style.less
@@ -101,7 +101,6 @@
 @import 'app/project-list.less';
 @import 'app/project-list-react.less';
 @import 'app/editor.less';
-@import 'app/plans.less';
 @import 'app/recurly.less';
 @import 'app/bonus.less';
 @import 'app/blog.less';

From 1e9dcd9983cdab4529c9bf139db58a4aaa5b46bb Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Wed, 9 Jul 2025 08:13:29 -0700
Subject: [PATCH 170/274] Merge pull request #26750 from
 overleaf/mf-fix-tooltip-disabled-plans-cta

[web] Fix tooltip isn't showing properly in plans CTA for disabled state in bs5 plans page

GitOrigin-RevId: e734e3ed93cfa8c28211d4f721aded1e968d142a
---
 .../web/frontend/stylesheets/bootstrap-5/pages/plans.scss     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
index b24ae34b71..5c11e46cd8 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
@@ -1475,6 +1475,10 @@ $z-index-group-member-picker-list: 1;
 
 .plans-cta {
   display: block;
+
+  a {
+    display: block;
+  }
 }
 
 .plans-faq-tabs {

From c62c2d6157dc14dc00861abf29e473fd330e9a54 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Wed, 9 Jul 2025 08:13:41 -0700
Subject: [PATCH 171/274] Merge pull request #26820 from
 overleaf/mf-fix-btn-class-missing-homepage

[web] Fix missing `.btn` class from the "begin now" card

GitOrigin-RevId: ec51d3875a1a567a6bf051761becb3202e0fb580
---
 services/web/app/views/_mixins/begin_now_card.pug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/app/views/_mixins/begin_now_card.pug b/services/web/app/views/_mixins/begin_now_card.pug
index 6dbf1137ec..e32225adac 100644
--- a/services/web/app/views/_mixins/begin_now_card.pug
+++ b/services/web/app/views/_mixins/begin_now_card.pug
@@ -17,7 +17,7 @@ mixin begin_now_card
 				p.card-links
 					if !isUserLoggedIn
 						a.btn.btn-primary.card-link(href=registerURL) #{translate("sign_up_for_free")}
-					a.card-link(
+					a.btn.card-link(
 						href=plansURL
 						class={'btn-primary': isUserLoggedIn, 'btn-secondary': !isUserLoggedIn}
 					) #{translate("explore_all_plans")}

From 8ea682cba3f7bb9a135eaa63626d3b32d3aeb159 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Wed, 9 Jul 2025 08:14:46 -0700
Subject: [PATCH 172/274] Merge pull request #26823 from
 overleaf/mf-re-add-cta-click-event-homepage

[web] Re-add homepage CTA click events that were accidentally removed

GitOrigin-RevId: d0452562f0a39f396e54ade0127e1fa2801f917b
---
 services/web/app/views/_mixins/begin_now_card.pug | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/services/web/app/views/_mixins/begin_now_card.pug b/services/web/app/views/_mixins/begin_now_card.pug
index e32225adac..5ce33d7d61 100644
--- a/services/web/app/views/_mixins/begin_now_card.pug
+++ b/services/web/app/views/_mixins/begin_now_card.pug
@@ -1,4 +1,4 @@
-mixin begin_now_card
+mixin begin_now_card(eventTracking, locationEventSegmentation)
 	- var registerURL = '/register'
 	- var plansURL = '/user/subscription/plans'
 	- var isUserLoggedIn = !!getSessionUser()
@@ -16,8 +16,18 @@ mixin begin_now_card
 				p #{translate("discover_why_over_people_worldwide_trust_overleaf", {count: settings.userCountInMillions})}
 				p.card-links
 					if !isUserLoggedIn
-						a.btn.btn-primary.card-link(href=registerURL) #{translate("sign_up_for_free")}
+						a.btn.btn-primary.card-link(
+							href=registerURL
+							event-tracking-mb=eventTracking ? 'true' : null
+							event-tracking=eventTracking
+							event-tracking-trigger=eventTracking ? 'click' : null
+							event-segmentation=eventTracking ? {location: locationEventSegmentation, destination: registerURL} : null
+						) #{translate("sign_up_for_free")}
 					a.btn.card-link(
 						href=plansURL
 						class={'btn-primary': isUserLoggedIn, 'btn-secondary': !isUserLoggedIn}
+						event-tracking-mb=eventTracking ? 'true' : null
+						event-tracking=eventTracking
+						event-tracking-trigger=eventTracking ? 'click' : null
+						event-segmentation=eventTracking ? {location: locationEventSegmentation, destination: plansURL} : null
 					) #{translate("explore_all_plans")}

From 698d2aebb114df7d9b3ce08c06f129ac911d29c9 Mon Sep 17 00:00:00 2001
From: Davinder Singh <davibaweja@gmail.com>
Date: Wed, 9 Jul 2025 17:08:12 +0100
Subject: [PATCH 173/274] adding a check on the variable (#27021)

GitOrigin-RevId: 9ecc517ff9bee1dac14e579d494294c0efeb6b69
---
 services/web/frontend/js/features/navbar/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/navbar/index.ts b/services/web/frontend/js/features/navbar/index.ts
index 706d4853f3..d9d7c28bcf 100644
--- a/services/web/frontend/js/features/navbar/index.ts
+++ b/services/web/frontend/js/features/navbar/index.ts
@@ -1,6 +1,6 @@
 const toggleButton = document.getElementById('navbar-toggle-btn') as HTMLElement
 
-toggleButton.addEventListener('click', () => {
+toggleButton?.addEventListener('click', () => {
   // Delay allows Bootstrap to update aria-expanded first
   setTimeout(() => {
     const isExpanded = toggleButton.getAttribute('aria-expanded') === 'true'

From 1083a05d6938015a8ef73398360bd3bdc8ca3cc2 Mon Sep 17 00:00:00 2001
From: Jimmy Domagala-Tang <Jimmy.Domagala-Tang@overleaf.com>
Date: Wed, 9 Jul 2025 13:27:35 -0700
Subject: [PATCH 174/274] adding link to delete writefull account on deletion
 modal (#26974)

GitOrigin-RevId: 6e9dec05a7cecb3013b629bc87b066466db9ed02
---
 .../web/frontend/extracted-translations.json    |  2 +-
 .../settings/components/leave/modal-content.tsx | 17 +++++++++--------
 services/web/locales/en.json                    |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 9976c9087e..b563e611bd 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -789,6 +789,7 @@
   "id": "",
   "identify_errors_with_your_compile": "",
   "if_you_need_to_customize_your_table_further_you_can": "",
+  "if_you_need_to_delete_your_writefull_account": "",
   "if_you_want_more_than_x_licenses_on_your_plan_we_need_to_add_them_for_you": "",
   "if_you_want_to_reduce_the_number_of_licenses_please_contact_support": "",
   "if_your_occupation_not_listed_type_full_name": "",
@@ -1817,7 +1818,6 @@
   "to_confirm_transfer_enter_email_address": "",
   "to_confirm_unlink_all_users_enter_email": "",
   "to_continue_using_upgrade_or_change_your_browser": "",
-  "to_delete_your_writefull_account": "",
   "to_fix_this_you_can": "",
   "to_fix_this_you_can_ask_the_github_repository_owner": "",
   "to_insert_or_move_a_caption_make_sure_tabular_is_directly_within_table": "",
diff --git a/services/web/frontend/js/features/settings/components/leave/modal-content.tsx b/services/web/frontend/js/features/settings/components/leave/modal-content.tsx
index 9ac29d790c..ffe9a99263 100644
--- a/services/web/frontend/js/features/settings/components/leave/modal-content.tsx
+++ b/services/web/frontend/js/features/settings/components/leave/modal-content.tsx
@@ -10,8 +10,6 @@ import {
   OLModalTitle,
 } from '@/features/ui/components/ol/ol-modal'
 
-const WRITEFULL_SUPPORT_EMAIL = 'support@writefull.com'
-
 type LeaveModalContentProps = {
   handleHide: () => void
   inFlight: boolean
@@ -46,13 +44,16 @@ function LeaveModalContentBlock({
       />
       <p>
         <Trans
-          i18nKey="to_delete_your_writefull_account"
-          values={{ email: WRITEFULL_SUPPORT_EMAIL }}
-          shouldUnescape
-          tOptions={{ interpolation: { escapeValue: true } }}
+          i18nKey="if_you_need_to_delete_your_writefull_account"
           components={{
-            // eslint-disable-next-line jsx-a11y/anchor-has-content
-            a: <a href={`mailto:${WRITEFULL_SUPPORT_EMAIL}`} />,
+            a: (
+              // eslint-disable-next-line jsx-a11y/anchor-has-content
+              <a
+                href="https://my.writefull.com/account"
+                target="_blank"
+                rel="noopener noreferrer"
+              />
+            ),
           }}
         />
       </p>
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 01a9fc4bd6..d560e93b4d 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1018,6 +1018,7 @@
   "if_have_existing_can_link": "If you have an existing <b>__appName__</b> account on another email, you can link it to your <b>__institutionName__</b> account by clicking <b>__clickText__</b>.",
   "if_owner_can_link": "If you own the <b>__appName__</b> account with <b>__email__</b>, you will be allowed to link it to your <b>__institutionName__</b> institutional account.",
   "if_you_need_to_customize_your_table_further_you_can": "If you need to customize your table further, you can. Using LaTeX code, you can change anything from table styles and border styles to colors and column widths. <0>Read our guide</0> to using tables in LaTeX to help you get started.",
+  "if_you_need_to_delete_your_writefull_account": "If you need to delete your Writefull account, go to your <a>Writefull account settings.</a>",
   "if_you_want_more_than_x_licenses_on_your_plan_we_need_to_add_them_for_you": "If you want more than __count__ licenses on your plan, we need to add them for you. Just click <0>Send request</0> below and we’ll be happy to help.",
   "if_you_want_to_reduce_the_number_of_licenses_please_contact_support": "If you want to reduce the number of licenses on your plan, please <0>contact customer support</0>.",
   "if_your_occupation_not_listed_type_full_name": "If your __occupation__ isn’t listed, you can type the full name.",
@@ -2346,7 +2347,6 @@
   "to_confirm_transfer_enter_email_address": "To accept the invitation, enter the email address linked to your account.",
   "to_confirm_unlink_all_users_enter_email": "To confirm you want to unlink all users, enter your email address:",
   "to_continue_using_upgrade_or_change_your_browser": "To continue using __appName__ without problems you need to upgrade or change to a <0>supported browser</0>.",
-  "to_delete_your_writefull_account": "To delete your Writefull account, or to check if you have one, please contact <a>__email__</a>.",
   "to_fix_this_you_can": "To fix this, you can:",
   "to_fix_this_you_can_ask_the_github_repository_owner": "To fix this, you can ask the GitHub repository owner (<0>__repoOwnerEmail__</0>) to renew their __appName__ subscription and reconnect the project.",
   "to_insert_or_move_a_caption_make_sure_tabular_is_directly_within_table": "To insert or move a caption, make sure \\begin{tabular} is directly within a table environment",

From 102f3a5d5caa9ed6c86b82f7a2bd4152756f777d Mon Sep 17 00:00:00 2001
From: Jimmy Domagala-Tang <Jimmy.Domagala-Tang@overleaf.com>
Date: Wed, 9 Jul 2025 13:27:45 -0700
Subject: [PATCH 175/274] fix: prevent users spam clicking from creating
 multiple projects (#26818)

GitOrigin-RevId: 8e867d02df70424f710b101e23e0889101e31d72
---
 .../new-project-button/modal-content-new-project-form.tsx    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/project-list/components/new-project-button/modal-content-new-project-form.tsx b/services/web/frontend/js/features/project-list/components/new-project-button/modal-content-new-project-form.tsx
index 13e0458127..5f03416a39 100644
--- a/services/web/frontend/js/features/project-list/components/new-project-button/modal-content-new-project-form.tsx
+++ b/services/web/frontend/js/features/project-list/components/new-project-button/modal-content-new-project-form.tsx
@@ -38,6 +38,7 @@ function ModalContentNewProjectForm({ onCancel, template = 'none' }: Props) {
   const { t } = useTranslation()
   const { autoFocusedRef } = useRefWithAutoFocus<HTMLInputElement>()
   const [projectName, setProjectName] = useState('')
+  const [redirecting, setRedirecting] = useState(false)
   const { isLoading, isError, error, runAsync } = useAsync<NewProjectData>()
   const location = useLocation()
 
@@ -52,6 +53,8 @@ function ModalContentNewProjectForm({ onCancel, template = 'none' }: Props) {
     )
       .then(data => {
         if (data.project_id) {
+          // prevents clicking on create again between async load of next page and pending state being finished
+          setRedirecting(true)
           location.assign(`/project/${data.project_id}`)
         }
       })
@@ -100,7 +103,7 @@ function ModalContentNewProjectForm({ onCancel, template = 'none' }: Props) {
         <OLButton
           variant="primary"
           onClick={createNewProject}
-          disabled={projectName === '' || isLoading}
+          disabled={projectName === '' || isLoading || redirecting}
           isLoading={isLoading}
         >
           {t('create')}

From e4a9b13e9a51e38107457728521f08cba5db0037 Mon Sep 17 00:00:00 2001
From: Jimmy Domagala-Tang <Jimmy.Domagala-Tang@overleaf.com>
Date: Wed, 9 Jul 2025 13:47:55 -0700
Subject: [PATCH 176/274] fix: adding target blank to usage limits link in
 assist paywall (#26817) (#26792)

GitOrigin-RevId: da9624b51c0394c81f6355470322d7185a144b21
---
 .../src/Features/Project/ProjectController.js    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 4075b06bb7..6cd297d213 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -647,13 +647,6 @@ const _ProjectController = {
         }
       }
 
-      const hasPaidSubscription = isPaidSubscription(subscription)
-      const hasManuallyCollectedSubscription =
-        subscription?.collectionMethod === 'manual'
-      const assistantDisabled = user.aiErrorAssistant?.enabled === false // the assistant has been manually disabled by the user
-      const canUseErrorAssistant =
-        !hasManuallyCollectedSubscription && !assistantDisabled
-
       let featureUsage = {}
 
       if (Features.hasFeature('saas')) {
@@ -734,6 +727,15 @@ const _ProjectController = {
         fullFeatureSet = await UserGetter.promises.getUserFeatures(userId)
       }
 
+      const hasPaidSubscription = isPaidSubscription(subscription)
+      const hasManuallyCollectedSubscription =
+        subscription?.collectionMethod === 'manual'
+      const assistantDisabled = user.aiErrorAssistant?.enabled === false // the assistant has been manually disabled by the user
+      const canUseErrorAssistant =
+        (!hasManuallyCollectedSubscription ||
+          fullFeatureSet?.aiErrorAssistant) &&
+        !assistantDisabled
+
       const customerIoEnabled =
         await SplitTestHandler.promises.hasUserBeenAssignedToVariant(
           req,

From bfa0459e723a6a8200290c60099bbb2d239a2302 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Thu, 10 Jul 2025 08:53:47 +0100
Subject: [PATCH 177/274] Merge pull request #26928 from
 overleaf/td-remove-use-scope-value

Remove useScopeValue and its associated store

GitOrigin-RevId: 439d6eb16343f65695ef615a9ff697d0cc5ad2c7
---
 .../ide-react/context/ide-react-context.tsx   | 30 +-----------
 .../js/shared/context/ide-context.tsx         |  7 +--
 .../hooks/use-scope-value-setter-only.ts      | 38 ---------------
 .../js/shared/hooks/use-scope-value.ts        | 46 -------------------
 .../web/frontend/stories/decorators/scope.tsx | 31 +------------
 .../source-editor/helpers/mock-scope.ts       |  3 --
 .../frontend/helpers/editor-providers.tsx     | 11 +----
 7 files changed, 5 insertions(+), 161 deletions(-)
 delete mode 100644 services/web/frontend/js/shared/hooks/use-scope-value-setter-only.ts
 delete mode 100644 services/web/frontend/js/shared/hooks/use-scope-value.ts

diff --git a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
index a55fc3236b..cad238f53c 100644
--- a/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
+++ b/services/web/frontend/js/features/ide-react/context/ide-react-context.tsx
@@ -42,33 +42,8 @@ export const IdeReactContext = createContext<IdeReactContextValue | undefined>(
   undefined
 )
 
-function populateIdeReactScope(store: ReactScopeValueStore) {
-  store.set('settings', {})
-}
-
-function populatePdfScope(store: ReactScopeValueStore) {
-  store.allowNonExistentPath('pdf', true)
-}
-
-export function createReactScopeValueStore() {
-  const scopeStore = new ReactScopeValueStore()
-
-  // Populate the scope value store with default values that will be used by
-  // nested contexts that refer to scope values. The ideal would be to leave
-  // initialization of store values up to the nested context, which would keep
-  // initialization code together with the context and would only populate
-  // necessary values in the store, but this is simpler for now
-  populateIdeReactScope(scopeStore)
-  populatePdfScope(scopeStore)
-
-  scopeStore.allowNonExistentPath('hasLintingError')
-
-  return scopeStore
-}
-
 export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const projectId = getMeta('ol-project_id')
-  const [scopeStore] = useState(() => createReactScopeValueStore())
   const [eventEmitter] = useState(createIdeEventEmitter)
   const [permissionsLevel, setPermissionsLevel] =
     useState<PermissionsLevel>('readOnly')
@@ -146,8 +121,6 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
       joinProject(project as unknown as ProjectMetadata)
 
       setPermissionsLevel(permissionsLevel)
-      // Make watchers update immediately
-      scopeStore.flushUpdates()
       eventEmitter.emit('project:joined', { project, permissionsLevel })
       setProjectJoined(true)
     }
@@ -157,7 +130,7 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
     return () => {
       socket.removeListener('joinProjectResponse', handleJoinProjectResponse)
     }
-  }, [socket, eventEmitter, scopeStore, joinProject])
+  }, [socket, eventEmitter, joinProject])
 
   const ide = useMemo(() => {
     return {
@@ -194,7 +167,6 @@ export const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
     <IdeReactContext.Provider value={value}>
       <IdeProvider
         ide={ide}
-        scopeStore={scopeStore}
         scopeEventEmitter={scopeEventEmitter}
         unstableStore={unstableStore}
       >
diff --git a/services/web/frontend/js/shared/context/ide-context.tsx b/services/web/frontend/js/shared/context/ide-context.tsx
index 899dcbce5b..f882680583 100644
--- a/services/web/frontend/js/shared/context/ide-context.tsx
+++ b/services/web/frontend/js/shared/context/ide-context.tsx
@@ -8,7 +8,6 @@ export type Ide = {
 }
 
 type IdeContextValue = Ide & {
-  scopeStore: ScopeValueStore
   scopeEventEmitter: ScopeEventEmitter
   unstableStore: ScopeValueStore
 }
@@ -18,11 +17,10 @@ export const IdeContext = createContext<IdeContextValue | undefined>(undefined)
 export const IdeProvider: FC<
   React.PropsWithChildren<{
     ide: Ide
-    scopeStore: ScopeValueStore
     scopeEventEmitter: ScopeEventEmitter
     unstableStore: ScopeValueStore
   }>
-> = ({ ide, scopeStore, scopeEventEmitter, unstableStore, children }) => {
+> = ({ ide, scopeEventEmitter, unstableStore, children }) => {
   /**
    * Expose unstableStore via `window.overleaf.unstable.store`, so it can be accessed by external extensions.
    *
@@ -49,11 +47,10 @@ export const IdeProvider: FC<
   const value = useMemo<IdeContextValue>(() => {
     return {
       ...ide,
-      scopeStore,
       scopeEventEmitter,
       unstableStore,
     }
-  }, [ide, scopeStore, scopeEventEmitter, unstableStore])
+  }, [ide, scopeEventEmitter, unstableStore])
 
   return <IdeContext.Provider value={value}>{children}</IdeContext.Provider>
 }
diff --git a/services/web/frontend/js/shared/hooks/use-scope-value-setter-only.ts b/services/web/frontend/js/shared/hooks/use-scope-value-setter-only.ts
deleted file mode 100644
index 27564a1d6a..0000000000
--- a/services/web/frontend/js/shared/hooks/use-scope-value-setter-only.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import {
-  type Dispatch,
-  type SetStateAction,
-  useCallback,
-  useState,
-} from 'react'
-import { useIdeContext } from '../context/ide-context'
-import _ from 'lodash'
-
-/**
- * Similar to `useScopeValue`, but instead of creating a two-way binding, only
- * changes in react-> angular direction are propagated, with `value` remaining
- * local and independent of its value in the Angular scope.
- *
- * The interface is compatible with React.useState(), including
- * the option of passing a function to the setter.
- */
-export default function useScopeValueSetterOnly<T = any>(
-  path: string, // dot '.' path of a property in the Angular scope.
-  defaultValue?: T
-): [T | undefined, Dispatch<SetStateAction<T | undefined>>] {
-  const { scopeStore } = useIdeContext()
-
-  const [value, setValue] = useState<T | undefined>(defaultValue)
-
-  const scopeSetter = useCallback(
-    (newValue: SetStateAction<T | undefined>) => {
-      setValue(val => {
-        const actualNewValue = _.isFunction(newValue) ? newValue(val) : newValue
-        scopeStore.set(path, actualNewValue)
-        return actualNewValue
-      })
-    },
-    [path, scopeStore]
-  )
-
-  return [value, scopeSetter]
-}
diff --git a/services/web/frontend/js/shared/hooks/use-scope-value.ts b/services/web/frontend/js/shared/hooks/use-scope-value.ts
deleted file mode 100644
index 594a71f92a..0000000000
--- a/services/web/frontend/js/shared/hooks/use-scope-value.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import {
-  type Dispatch,
-  type SetStateAction,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react'
-import _ from 'lodash'
-import { useIdeContext } from '../context/ide-context'
-
-/**
- * Binds a property in an Angular scope making it accessible in a React
- * component. The interface is compatible with React.useState(), including
- * the option of passing a function to the setter.
- *
- * The generic type is not an actual guarantee because the value for a path is
- * returned as undefined when there is nothing in the scope store for that path.
- */
-export default function useScopeValue<T = any>(
-  path: string // dot '.' path of a property in the Angular scope
-): [T, Dispatch<SetStateAction<T>>] {
-  const { scopeStore } = useIdeContext()
-
-  const [value, setValue] = useState<T>(() => scopeStore.get(path))
-
-  useEffect(() => {
-    return scopeStore.watch<T>(path, (newValue: T) => {
-      // NOTE: this is deliberately wrapped in a function,
-      // to avoid calling setValue directly with a value that's a function
-      setValue(() => newValue)
-    })
-  }, [path, scopeStore])
-
-  const scopeSetter = useCallback(
-    (newValue: SetStateAction<T>) => {
-      setValue(val => {
-        const actualNewValue = _.isFunction(newValue) ? newValue(val) : newValue
-        scopeStore.set(path, actualNewValue)
-        return actualNewValue
-      })
-    },
-    [path, scopeStore]
-  )
-
-  return [value, scopeSetter]
-}
diff --git a/services/web/frontend/stories/decorators/scope.tsx b/services/web/frontend/stories/decorators/scope.tsx
index 8977f582ab..9bde1eebfa 100644
--- a/services/web/frontend/stories/decorators/scope.tsx
+++ b/services/web/frontend/stories/decorators/scope.tsx
@@ -10,10 +10,7 @@ import useFetchMock from '../hooks/use-fetch-mock'
 import { useMeta } from '../hooks/use-meta'
 import SocketIOShim, { SocketIOMock } from '@/ide/connection/SocketIoShim'
 import { IdeContext } from '@/shared/context/ide-context'
-import {
-  IdeReactContext,
-  createReactScopeValueStore,
-} from '@/features/ide-react/context/ide-react-context'
+import { IdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
 import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/react-scope-value-store'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
@@ -57,27 +54,6 @@ const project: Project = {
   ],
 }
 
-const initialScope = {
-  user,
-  project,
-  settings: {
-    pdfViewer: 'js',
-    syntaxValidation: true,
-  },
-  editor: {
-    richText: false,
-
-    // FIXME: This is pretty useless because the editor relies on a much more fleshed-out document, so we rely on overriding it in individual stories
-    sharejs_doc: {
-      doc_id: 'test-doc',
-      getSnapshot: () => 'some doc content',
-      hasBufferedOps: () => false,
-    },
-    open_doc_name: 'testfile.tex',
-  },
-  permissionsLevel: 'owner',
-}
-
 const socket = new SocketIOShim.SocketShimNoop(
   new SocketIOMock()
 ) as unknown as Socket
@@ -195,10 +171,6 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
   }))
 
   const [ideContextValue] = useState(() => {
-    const scopeStore = createReactScopeValueStore()
-    for (const [key, value] of Object.entries(initialScope)) {
-      scopeStore.set(key, value)
-    }
     const scopeEventEmitter = new ReactScopeEventEmitter(new IdeEventEmitter())
     const unstableStore = new ReactScopeValueStore()
 
@@ -212,7 +184,6 @@ const IdeReactProvider: FC<React.PropsWithChildren> = ({ children }) => {
 
     return {
       socket,
-      scopeStore,
       scopeEventEmitter,
       unstableStore,
     }
diff --git a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
index 830a9c97a2..fd19ce4f85 100644
--- a/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
+++ b/services/web/test/frontend/features/source-editor/helpers/mock-scope.ts
@@ -27,8 +27,5 @@ export const mockScope = (
     refreshResolvedCommentsDropdown: cy.stub(() => sleep(1000)),
     onlineUserCursorHighlights: {},
     permissionsLevel: 'owner',
-    $on: cy.stub().log(false),
-    $broadcast: cy.stub().log(false),
-    $emit: cy.stub().log(false),
   }
 }
diff --git a/services/web/test/frontend/helpers/editor-providers.tsx b/services/web/test/frontend/helpers/editor-providers.tsx
index a82adefdbd..accf5ad73d 100644
--- a/services/web/test/frontend/helpers/editor-providers.tsx
+++ b/services/web/test/frontend/helpers/editor-providers.tsx
@@ -11,10 +11,7 @@ import React, {
   type FC,
   type PropsWithChildren,
 } from 'react'
-import {
-  createReactScopeValueStore,
-  IdeReactContext,
-} from '@/features/ide-react/context/ide-react-context'
+import { IdeReactContext } from '@/features/ide-react/context/ide-react-context'
 import { IdeEventEmitter } from '@/features/ide-react/create-ide-event-emitter'
 import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/react-scope-value-store'
 import { ReactScopeEventEmitter } from '@/features/ide-react/scope-event-emitter/react-scope-event-emitter'
@@ -300,11 +297,6 @@ const makeIdeReactProvider = (
     }))
 
     const [ideContextValue] = useState(() => {
-      const scopeStore = createReactScopeValueStore()
-      for (const [key, value] of Object.entries(scope)) {
-        // TODO: path for nested entries
-        scopeStore.set(key, value)
-      }
       const scopeEventEmitter = new ReactScopeEventEmitter(
         new IdeEventEmitter()
       )
@@ -312,7 +304,6 @@ const makeIdeReactProvider = (
 
       return {
         socket,
-        scopeStore,
         scopeEventEmitter,
         unstableStore,
       }

From 6b6ff921ef032aaac35e80dbbecf34ebaa4acc68 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 10 Jul 2025 09:42:08 +0100
Subject: [PATCH 178/274] [web] Add W&C nudges to full-library synced libraries
 (#26784)

GitOrigin-RevId: d958191a543993a0080f0c58ebd373bad0b42aa2
---
 services/web/app/src/Features/Tutorial/TutorialController.mjs   | 1 +
 services/web/frontend/extracted-translations.json               | 2 ++
 .../stylesheets/bootstrap-5/components/notifications.scss       | 1 +
 services/web/locales/en.json                                    | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/services/web/app/src/Features/Tutorial/TutorialController.mjs b/services/web/app/src/Features/Tutorial/TutorialController.mjs
index dd1f9e2828..4f91b64f45 100644
--- a/services/web/app/src/Features/Tutorial/TutorialController.mjs
+++ b/services/web/app/src/Features/Tutorial/TutorialController.mjs
@@ -17,6 +17,7 @@ const VALID_KEYS = [
   'review-mode',
   'new-error-logs-promo',
   'try-redesign-again-nudge-promo',
+  'write-and-cite-nudge-in-linked-file',
   'ide-redesign-new-survey-promo',
 ]
 
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index b563e611bd..d4da0f62f6 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1373,6 +1373,7 @@
   "redo": "",
   "reduce_costs_group_licenses": "",
   "reference_error_relink_hint": "",
+  "reference_manager_lowercase": "",
   "reference_manager_searched_groups": "",
   "reference_managers": "",
   "reference_search": "",
@@ -2133,6 +2134,7 @@
   "you_can_manage_your_reference_manager_integrations_from_your_account_settings_page": "",
   "you_can_now_enable_sso": "",
   "you_can_now_log_in_sso": "",
+  "you_can_now_search_and_add_references_from_your_rm_library_without_needing_to_import_files": "",
   "you_can_request_a_maximum_of_limit_fixes_per_day": "",
   "you_can_select_or_invite_collaborator": "",
   "you_can_select_or_invite_collaborator_plural": "",
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss b/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss
index c0e713c212..e9f35c940d 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/notifications.scss
@@ -127,6 +127,7 @@
       cursor: pointer;
       background: transparent;
       border: 0;
+      color: var(--content-primary);
 
       &:hover,
       &:focus {
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index d560e93b4d..26105b0f05 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1797,6 +1797,7 @@
   "redo": "Redo",
   "reduce_costs_group_licenses": "You can cut down on paperwork and reduce costs with our discounted group licenses.",
   "reference_error_relink_hint": "If this error persists, try re-linking your account here:",
+  "reference_manager_lowercase": "reference manager",
   "reference_manager_searched_groups": "__provider__ search groups",
   "reference_managers": "Reference managers",
   "reference_search": "Advanced reference search",
@@ -2690,6 +2691,7 @@
   "you_can_manage_your_reference_manager_integrations_from_your_account_settings_page": "You can manage your reference manager integrations from your <0>account settings page</0>.",
   "you_can_now_enable_sso": "You can now enable SSO on your group settings page.",
   "you_can_now_log_in_sso": "You can now log in through your institution and if eligible you will receive <0>__appName__ Professional features</0>.",
+  "you_can_now_search_and_add_references_from_your_rm_library_without_needing_to_import_files": "You can now search and add references from your __referenceManager__ library without needing to import files—just type <code>\\cite{}</code> in your .tex file. <a>Learn more</a>",
   "you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page": "You can <0>opt in and out</0> of the program at any time on this page",
   "you_can_request_a_maximum_of_limit_fixes_per_day": "You can request a maximum of __limit__ fixes per day. Please try again tomorrow.",
   "you_can_select_or_invite_collaborator": "You can select or invite __count__ collaborator on your current plan. Upgrade to add more editors or reviewers.",

From 4ab4fbdf5177073f1cc89a7d2751e91c41ed627a Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 10 Jul 2025 09:42:23 +0100
Subject: [PATCH 179/274] Merge pull request #26951 from
 overleaf/mj-layout-broken

[web] Add restoreView to LayoutContext

GitOrigin-RevId: 3a50c1e215c99236f503285fee1c924df57e07e4
---
 .../context/hooks/use-restore-deleted-file.ts |  6 ++--
 .../context/hooks/use-restore-project.ts      |  6 ++--
 .../hooks/use-restore-selected-file.ts        |  6 ++--
 .../toolbar/show-history-button.tsx           | 11 +++++---
 .../components/toolbar/toolbar.tsx            |  6 ++--
 .../components/switch-to-editor-button.tsx    |  4 +--
 .../js/shared/context/layout-context.tsx      | 28 +++++++++++++------
 .../components/full-project-search.spec.tsx   |  1 +
 .../frontend/helpers/editor-providers.tsx     |  7 +++++
 9 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/services/web/frontend/js/features/history/context/hooks/use-restore-deleted-file.ts b/services/web/frontend/js/features/history/context/hooks/use-restore-deleted-file.ts
index 2521454ebc..621bd9b148 100644
--- a/services/web/frontend/js/features/history/context/hooks/use-restore-deleted-file.ts
+++ b/services/web/frontend/js/features/history/context/hooks/use-restore-deleted-file.ts
@@ -21,7 +21,7 @@ type RestorationState =
 
 export function useRestoreDeletedFile() {
   const { projectId } = useHistoryContext()
-  const { setView } = useLayoutContext()
+  const { restoreView } = useLayoutContext()
   const { openDocWithId, openFileWithId } = useEditorManagerContext()
   const { showBoundary } = useErrorBoundary()
   const { fileTreeData } = useFileTreeData()
@@ -37,7 +37,7 @@ export function useRestoreDeletedFile() {
       if (result) {
         setState('complete')
         const { _id: id } = result.entity
-        setView('editor')
+        restoreView()
 
         if (restoredFileMetadata.type === 'doc') {
           openDocWithId(id)
@@ -52,7 +52,7 @@ export function useRestoreDeletedFile() {
     restoredFileMetadata,
     openDocWithId,
     openFileWithId,
-    setView,
+    restoreView,
   ])
 
   useEffect(() => {
diff --git a/services/web/frontend/js/features/history/context/hooks/use-restore-project.ts b/services/web/frontend/js/features/history/context/hooks/use-restore-project.ts
index 71b1b6af12..7813ae0c5c 100644
--- a/services/web/frontend/js/features/history/context/hooks/use-restore-project.ts
+++ b/services/web/frontend/js/features/history/context/hooks/use-restore-project.ts
@@ -7,7 +7,7 @@ type RestorationState = 'initial' | 'restoring' | 'restored' | 'error'
 
 export const useRestoreProject = () => {
   const { showBoundary } = useErrorBoundary()
-  const { setView } = useLayoutContext()
+  const { restoreView } = useLayoutContext()
 
   const [restorationState, setRestorationState] =
     useState<RestorationState>('initial')
@@ -18,14 +18,14 @@ export const useRestoreProject = () => {
       restoreProjectToVersion(projectId, version)
         .then(() => {
           setRestorationState('restored')
-          setView('editor')
+          restoreView()
         })
         .catch(err => {
           setRestorationState('error')
           showBoundary(err)
         })
     },
-    [showBoundary, setView]
+    [showBoundary, restoreView]
   )
 
   return {
diff --git a/services/web/frontend/js/features/history/context/hooks/use-restore-selected-file.ts b/services/web/frontend/js/features/history/context/hooks/use-restore-selected-file.ts
index 168495bc92..d514129e9a 100644
--- a/services/web/frontend/js/features/history/context/hooks/use-restore-selected-file.ts
+++ b/services/web/frontend/js/features/history/context/hooks/use-restore-selected-file.ts
@@ -22,7 +22,7 @@ type RestoreState =
 
 export function useRestoreSelectedFile() {
   const { projectId } = useHistoryContext()
-  const { setView } = useLayoutContext()
+  const { restoreView } = useLayoutContext()
   const { openDocWithId, openFileWithId } = useEditorManagerContext()
   const { showBoundary } = useErrorBoundary()
   const { fileTreeData } = useFileTreeData()
@@ -38,7 +38,7 @@ export function useRestoreSelectedFile() {
       if (result) {
         setState('complete')
         const { _id: id } = result.entity
-        setView('editor')
+        restoreView()
 
         if (restoredFileMetadata.type === 'doc') {
           openDocWithId(id)
@@ -53,7 +53,7 @@ export function useRestoreSelectedFile() {
     restoredFileMetadata,
     openDocWithId,
     openFileWithId,
-    setView,
+    restoreView,
   ])
 
   useEffect(() => {
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/show-history-button.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/show-history-button.tsx
index 5bf25c8852..5540dc5d3b 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/show-history-button.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/show-history-button.tsx
@@ -7,15 +7,18 @@ import { useEditorAnalytics } from '@/shared/hooks/use-editor-analytics'
 
 export default function ShowHistoryButton() {
   const { t } = useTranslation()
-  const { view, setView } = useLayoutContext()
+  const { view, setView, restoreView } = useLayoutContext()
   const { sendEvent } = useEditorAnalytics()
 
   const toggleHistoryOpen = useCallback(() => {
     const action = view === 'history' ? 'close' : 'open'
     sendEvent('navigation-clicked-history', { action })
-
-    setView(view === 'history' ? 'editor' : 'history')
-  }, [view, setView, sendEvent])
+    if (view === 'history') {
+      restoreView()
+    } else {
+      setView('history')
+    }
+  }, [view, setView, sendEvent, restoreView])
 
   return (
     <div className="ide-redesign-toolbar-button-container">
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
index 6da6e2cef9..abe2012231 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/toolbar.tsx
@@ -20,7 +20,7 @@ const [publishModalModules] = importOverleafModules('publishModal')
 const SubmitProjectButton = publishModalModules?.import.NewPublishToolbarButton
 
 export const Toolbar = () => {
-  const { view, setView } = useLayoutContext()
+  const { view, restoreView } = useLayoutContext()
   const { cobranding } = useEditorContext()
   const { permissionsLevel } = useIdeReactContext()
   const shouldDisplaySubmitButton =
@@ -29,8 +29,8 @@ export const Toolbar = () => {
 
   const handleBackToEditorClick = useCallback(() => {
     eventTracking.sendMB('navigation-clicked-history', { action: 'close' })
-    setView('editor')
-  }, [setView])
+    restoreView()
+  }, [restoreView])
 
   if (view === 'history') {
     return (
diff --git a/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx b/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx
index 4b94825e04..b7410de7b1 100644
--- a/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx
@@ -4,7 +4,7 @@ import OLButton from '@/features/ui/components/ol/ol-button'
 import { useLayoutContext } from '../../../shared/context/layout-context'
 
 function SwitchToEditorButton() {
-  const { pdfLayout, setView, detachRole } = useLayoutContext()
+  const { pdfLayout, restoreView, detachRole } = useLayoutContext()
 
   const { t } = useTranslation()
 
@@ -17,7 +17,7 @@ function SwitchToEditorButton() {
   }
 
   function handleClick() {
-    setView('editor')
+    restoreView()
     window.setTimeout(() => {
       window.dispatchEvent(new Event('editor:focus'))
     })
diff --git a/services/web/frontend/js/shared/context/layout-context.tsx b/services/web/frontend/js/shared/context/layout-context.tsx
index 6bc8c5b222..c3647d3926 100644
--- a/services/web/frontend/js/shared/context/layout-context.tsx
+++ b/services/web/frontend/js/shared/context/layout-context.tsx
@@ -8,6 +8,7 @@ import {
   SetStateAction,
   FC,
   useState,
+  useRef,
 } from 'react'
 import useDetachLayout from '../hooks/use-detach-layout'
 import localStorage from '../../infrastructure/local-storage'
@@ -61,6 +62,7 @@ export type LayoutContextValue = LayoutContextOwnStates & {
   pdfPreviewOpen: boolean
   setProjectSearchIsOpen: Dispatch<SetStateAction<boolean>>
   setOpenFile: Dispatch<SetStateAction<BinaryFile | null>>
+  restoreView: () => void
 }
 
 const debugPdfDetach = getMeta('ol-debugPdfDetach')
@@ -85,6 +87,8 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
   const historyToggleEmitter = useScopeEventEmitter('history:toggle', true)
   const { isOpen: railIsOpen, setIsOpen: setRailIsOpen } = useRailContext()
   const [prevRailIsOpen, setPrevRailIsOpen] = useState(railIsOpen)
+  // Whether we came from a file or a document when we left the ide
+  const lastIdeView = useRef<IdeView>('editor')
 
   const setView = useCallback(
     (value: IdeView | null) => {
@@ -103,12 +107,8 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
           setRailIsOpen(prevRailIsOpen)
         }
 
-        if (value === 'editor' && openFile) {
-          // if a file is currently opened, ensure the view is 'file' instead of
-          // 'editor' when the 'editor' view is requested. This is to ensure
-          // that the entity selected in the file tree is the one visible and
-          // that docs don't take precedence over files.
-          return 'file'
+        if (value === 'editor' || value === 'file') {
+          lastIdeView.current = value
         }
 
         return value
@@ -117,7 +117,6 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
     [
       _setView,
       setRailIsOpen,
-      openFile,
       historyToggleEmitter,
       prevRailIsOpen,
       setPrevRailIsOpen,
@@ -125,6 +124,10 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
     ]
   )
 
+  const restoreView = useCallback(() => {
+    setView(lastIdeView.current ?? 'editor')
+  }, [setView])
+
   // whether the chat pane is open
   const [chatIsOpen, setChatIsOpen] = usePersistedState<boolean>(
     'ui.chatOpen',
@@ -192,11 +195,16 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
 
   const changeLayout = useCallback(
     (newLayout: IdeLayout, newView: IdeView = 'editor') => {
+      const targetView = newLayout === 'sideBySide' ? 'editor' : newView
       setPdfLayout(newLayout)
-      setView(newLayout === 'sideBySide' ? 'editor' : newView)
+      if (targetView === 'editor') {
+        restoreView()
+      } else {
+        setView(targetView)
+      }
       setLayoutInLocalStorage(newLayout)
     },
-    [setPdfLayout, setView]
+    [setPdfLayout, setView, restoreView]
   )
 
   // Force codemirror to reposition all tooltips to prevent an issue
@@ -276,6 +284,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
       setLoadingStyleSheet,
       setView,
       view,
+      restoreView,
     }),
     [
       reattach,
@@ -302,6 +311,7 @@ export const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
       setLoadingStyleSheet,
       setView,
       view,
+      restoreView,
     ]
   )
 
diff --git a/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx b/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx
index e87467ee30..6e04a9cf3f 100644
--- a/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx
+++ b/services/web/test/frontend/features/full-project-search/components/full-project-search.spec.tsx
@@ -95,6 +95,7 @@ const createInitialValue = () =>
     setProjectSearchIsOpen: cy.stub(),
     openFile: null,
     setOpenFile: cy.stub(),
+    restoreView: cy.stub(),
   }) satisfies LayoutContextValue
 
 const LayoutProvider: FC<React.PropsWithChildren> = ({ children }) => {
diff --git a/services/web/test/frontend/helpers/editor-providers.tsx b/services/web/test/frontend/helpers/editor-providers.tsx
index accf5ad73d..16df207b88 100644
--- a/services/web/test/frontend/helpers/editor-providers.tsx
+++ b/services/web/test/frontend/helpers/editor-providers.tsx
@@ -409,6 +409,11 @@ const makeLayoutProvider = (
       },
       [setPdfLayout, setView]
     )
+
+    const restoreView = useCallback(() => {
+      setView('editor')
+    }, [])
+
     const {
       reattach,
       detach,
@@ -443,6 +448,7 @@ const makeLayoutProvider = (
         setLoadingStyleSheet,
         setView,
         view,
+        restoreView,
       }),
       [
         reattach,
@@ -469,6 +475,7 @@ const makeLayoutProvider = (
         setLoadingStyleSheet,
         setView,
         view,
+        restoreView,
       ]
     )
 

From 9e6ca01e7fdc7f5c17e56db400d67640f84f5091 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Thu, 10 Jul 2025 09:42:32 +0100
Subject: [PATCH 180/274] Merge pull request #27005 from
 overleaf/mj-editor-redesign-feature-flag

[web] Allow editor redesign to be loaded through feature flag

GitOrigin-RevId: b600b0d42c7a052fde19be3eee46c9e11cc3bac1
---
 .../js/features/ide-redesign/utils/new-editor-utils.ts        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/utils/new-editor-utils.ts b/services/web/frontend/js/features/ide-redesign/utils/new-editor-utils.ts
index ecd492cd5f..5b53ae8a6e 100644
--- a/services/web/frontend/js/features/ide-redesign/utils/new-editor-utils.ts
+++ b/services/web/frontend/js/features/ide-redesign/utils/new-editor-utils.ts
@@ -1,7 +1,9 @@
 import { useUserSettingsContext } from '@/shared/context/user-settings-context'
 import { isInExperiment } from '@/utils/labs-utils'
+import { isSplitTestEnabled } from '@/utils/splitTestUtils'
 
-export const canUseNewEditor = () => isInExperiment('editor-redesign')
+export const canUseNewEditor = () =>
+  isInExperiment('editor-redesign') || isSplitTestEnabled('editor-redesign')
 
 export const useIsNewEditorEnabled = () => {
   const { userSettings } = useUserSettingsContext()

From 029395ebb9f09631be1ec4a980d0569205487424 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 10 Jul 2025 10:23:53 +0100
Subject: [PATCH 181/274] Merge pull request #26990 from
 overleaf/dp-pdf-logs-max-entries

Ensure that PreviewLogsPaneMaxEntries uses new style log entry in new editor

GitOrigin-RevId: 964525a4676eeb341ce168aa3189ef59bb26b1cc
---
 .../preview-logs-pane-max-entries.jsx         | 79 ----------------
 .../preview-logs-pane-max-entries.tsx         | 94 +++++++++++++++++++
 2 files changed, 94 insertions(+), 79 deletions(-)
 delete mode 100644 services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.jsx
 create mode 100644 services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.tsx

diff --git a/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.jsx b/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.jsx
deleted file mode 100644
index eb28e3336a..0000000000
--- a/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.jsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { useCallback } from 'react'
-import PropTypes from 'prop-types'
-import { Trans, useTranslation } from 'react-i18next'
-import OLButton from '@/features/ui/components/ol/ol-button'
-import PreviewLogEntryHeader from './preview-log-entry-header'
-import { useDetachCompileContext as useCompileContext } from '../../../shared/context/detach-compile-context'
-import { useStopOnFirstError } from '../../../shared/hooks/use-stop-on-first-error'
-import MaterialIcon from '@/shared/components/material-icon'
-
-function PreviewLogsPaneMaxEntries({ totalEntries, entriesShown, hasErrors }) {
-  const { t } = useTranslation()
-  const { startCompile, stoppedOnFirstError, setAnimateCompileDropdownArrow } =
-    useCompileContext()
-  const { enableStopOnFirstError } = useStopOnFirstError({
-    eventSource: 'too-many-logs',
-  })
-
-  const title = t('log_entry_maximum_entries_title', {
-    total: totalEntries,
-    displayed: entriesShown,
-  })
-
-  const handleEnableStopOnFirstErrorClick = useCallback(() => {
-    enableStopOnFirstError()
-    startCompile({ stopOnFirstError: true })
-    setAnimateCompileDropdownArrow(true)
-  }, [enableStopOnFirstError, startCompile, setAnimateCompileDropdownArrow])
-
-  return (
-    <div className="log-entry" aria-label={t('log_entry_maximum_entries')}>
-      <PreviewLogEntryHeader level="raw" headerTitle={title} />
-      <div className="log-entry-content">
-        <div className="log-entry-formatted-content">
-          {hasErrors && !stoppedOnFirstError ? (
-            <>
-              <p>
-                <MaterialIcon type="lightbulb" className="align-middle" />
-                &nbsp;
-                <strong>{t('tip')}: </strong>
-                <Trans
-                  i18nKey="log_entry_maximum_entries_enable_stop_on_first_error"
-                  components={[
-                    <OLButton
-                      variant="primary"
-                      size="sm"
-                      key="enable-stop-on-first-error"
-                      onClick={handleEnableStopOnFirstErrorClick}
-                    />,
-                    // eslint-disable-next-line jsx-a11y/anchor-has-content
-                    <a
-                      key="learn-more"
-                      href="https://www.overleaf.com/learn/latex/Questions/Tips_and_Tricks_for_Troubleshooting_LaTeX"
-                    />,
-                  ]}
-                />{' '}
-              </p>
-              <p>{t('log_entry_maximum_entries_see_full_logs')}</p>
-            </>
-          ) : (
-            <p>
-              <MaterialIcon type="lightbulb" className="align-middle" />
-              &nbsp;
-              <strong>{t('tip')}: </strong>
-              {t('log_entry_maximum_entries_see_full_logs')}
-            </p>
-          )}
-        </div>
-      </div>
-    </div>
-  )
-}
-
-PreviewLogsPaneMaxEntries.propTypes = {
-  totalEntries: PropTypes.number,
-  entriesShown: PropTypes.number,
-  hasErrors: PropTypes.bool,
-}
-
-export default PreviewLogsPaneMaxEntries
diff --git a/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.tsx b/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.tsx
new file mode 100644
index 0000000000..f0109a6c03
--- /dev/null
+++ b/services/web/frontend/js/features/preview/components/preview-logs-pane-max-entries.tsx
@@ -0,0 +1,94 @@
+import { useCallback } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import OLButton from '@/features/ui/components/ol/ol-button'
+import { useDetachCompileContext as useCompileContext } from '../../../shared/context/detach-compile-context'
+import { useStopOnFirstError } from '../../../shared/hooks/use-stop-on-first-error'
+import MaterialIcon from '@/shared/components/material-icon'
+import PdfLogEntry from '@/features/pdf-preview/components/pdf-log-entry'
+
+function PreviewLogsPaneMaxEntries({
+  totalEntries,
+  entriesShown,
+  hasErrors,
+}: {
+  totalEntries: number
+  entriesShown: number
+  hasErrors?: boolean
+}) {
+  const { t } = useTranslation()
+
+  const title = t('log_entry_maximum_entries_title', {
+    total: totalEntries,
+    displayed: entriesShown,
+  })
+
+  return (
+    <PdfLogEntry
+      entryAriaLabel={t('log_entry_maximum_entries')}
+      headerTitle={title}
+      level="raw"
+      formattedContent={
+        <PreviewLogsPaneMaxEntriesContent hasErrors={hasErrors} />
+      }
+    />
+  )
+}
+
+function PreviewLogsPaneMaxEntriesContent({
+  hasErrors,
+}: {
+  hasErrors?: boolean
+}) {
+  const { t } = useTranslation()
+  const { startCompile, stoppedOnFirstError, setAnimateCompileDropdownArrow } =
+    useCompileContext()
+  const { enableStopOnFirstError } = useStopOnFirstError({
+    eventSource: 'too-many-logs',
+  })
+
+  const handleEnableStopOnFirstErrorClick = useCallback(() => {
+    enableStopOnFirstError()
+    startCompile({ stopOnFirstError: true })
+    setAnimateCompileDropdownArrow(true)
+  }, [enableStopOnFirstError, startCompile, setAnimateCompileDropdownArrow])
+
+  if (hasErrors && !stoppedOnFirstError) {
+    return (
+      <>
+        <p>
+          <MaterialIcon type="lightbulb" className="align-middle" />
+          &nbsp;
+          <strong>{t('tip')}: </strong>
+          <Trans
+            i18nKey="log_entry_maximum_entries_enable_stop_on_first_error"
+            components={[
+              <OLButton
+                variant="primary"
+                size="sm"
+                key="enable-stop-on-first-error"
+                onClick={handleEnableStopOnFirstErrorClick}
+              />,
+              // eslint-disable-next-line jsx-a11y/anchor-has-content
+              <a
+                key="learn-more"
+                href="https://www.overleaf.com/learn/latex/Questions/Tips_and_Tricks_for_Troubleshooting_LaTeX"
+              />,
+            ]}
+          />{' '}
+        </p>
+        <p>{t('log_entry_maximum_entries_see_full_logs')}</p>
+      </>
+    )
+  }
+
+  return (
+    <p>
+      <MaterialIcon type="lightbulb" className="align-middle" />
+      &nbsp;
+      <strong>{t('tip')}: </strong>
+      {t('log_entry_maximum_entries_see_full_logs')}
+    </p>
+  )
+}
+
+export default PreviewLogsPaneMaxEntries

From 14afc82acf71d721b84d95be0a9175e35b6804b5 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 10 Jul 2025 10:24:06 +0100
Subject: [PATCH 182/274] Merge pull request #27003 from
 overleaf/dp-modal-opacity

Change settings modal appearance tab to have transparent backdrop

GitOrigin-RevId: 9cbf36164a8d82ec5945d06c7107a3b73b334cfe
---
 .../settings/settings-modal-body.tsx          | 51 ++++---------------
 .../components/settings/settings-modal.tsx    | 50 +++++++++++++++++-
 .../bootstrap-5/pages/editor/settings.scss    |  4 ++
 3 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx
index b9a1fddbfe..99b3cea3eb 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx
@@ -1,7 +1,8 @@
 import MaterialIcon, {
   AvailableUnfilledIcon,
 } from '@/shared/components/material-icon'
-import { ReactElement, useMemo, useState } from 'react'
+import { ReactElement } from 'react'
+
 import {
   Nav,
   NavLink,
@@ -9,10 +10,6 @@ import {
   TabContent,
   TabPane,
 } from 'react-bootstrap'
-import { useTranslation } from 'react-i18next'
-import EditorSettings from './editor-settings/editor-settings'
-import AppearanceSettings from './appearance-settings/appearance-settings'
-import CompilerSettings from './compiler-settings/compiler-settings'
 
 export type SettingsEntry = SettingsLink | SettingsTab
 
@@ -30,41 +27,15 @@ type SettingsLink = {
   title: string
 }
 
-export const SettingsModalBody = () => {
-  const { t } = useTranslation()
-  const settingsTabs: SettingsEntry[] = useMemo(
-    () => [
-      {
-        key: 'editor',
-        title: t('editor'),
-        icon: 'code',
-        component: <EditorSettings />,
-      },
-      {
-        key: 'compiler',
-        title: t('compiler'),
-        icon: 'picture_as_pdf',
-        component: <CompilerSettings />,
-      },
-      {
-        key: 'appearance',
-        title: t('appearance'),
-        icon: 'brush',
-        component: <AppearanceSettings />,
-      },
-      {
-        key: 'account_settings',
-        title: t('account_settings'),
-        icon: 'settings',
-        href: '/user/settings',
-      },
-    ],
-    [t]
-  )
-  const [activeTab, setActiveTab] = useState<string | null | undefined>(
-    settingsTabs[0]?.key
-  )
-
+export const SettingsModalBody = ({
+  activeTab,
+  setActiveTab,
+  settingsTabs,
+}: {
+  activeTab: string | null | undefined
+  setActiveTab: (tab: string | null | undefined) => void
+  settingsTabs: SettingsEntry[]
+}) => {
   return (
     <TabContainer
       transition={false}
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx
index 8ee804159f..8da0045f2b 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx
@@ -5,24 +5,70 @@ import OLModal, {
 } from '@/features/ui/components/ol/ol-modal'
 import { useLayoutContext } from '@/shared/context/layout-context'
 import { useTranslation } from 'react-i18next'
-import { SettingsModalBody } from './settings-modal-body'
+import { SettingsEntry, SettingsModalBody } from './settings-modal-body'
+
+import AppearanceSettings from './appearance-settings/appearance-settings'
+import CompilerSettings from './compiler-settings/compiler-settings'
+import EditorSettings from './editor-settings/editor-settings'
+import { useMemo, useState } from 'react'
 
 const SettingsModal = () => {
   // TODO ide-redesign-cleanup: Either rename the field, or introduce a separate
   // one
   const { leftMenuShown, setLeftMenuShown } = useLayoutContext()
   const { t } = useTranslation()
+  const settingsTabs: SettingsEntry[] = useMemo(
+    () => [
+      {
+        key: 'editor',
+        title: t('editor'),
+        icon: 'code',
+        component: <EditorSettings />,
+      },
+      {
+        key: 'compiler',
+        title: t('compiler'),
+        icon: 'picture_as_pdf',
+        component: <CompilerSettings />,
+      },
+      {
+        key: 'appearance',
+        title: t('appearance'),
+        icon: 'brush',
+        component: <AppearanceSettings />,
+      },
+      {
+        key: 'account_settings',
+        title: t('account_settings'),
+        icon: 'settings',
+        href: '/user/settings',
+      },
+    ],
+    [t]
+  )
+  const [activeTab, setActiveTab] = useState<string | null | undefined>(
+    settingsTabs[0]?.key
+  )
   return (
     <OLModal
       show={leftMenuShown}
       onHide={() => setLeftMenuShown(false)}
       size="lg"
+      backdropClassName={
+        activeTab === 'appearance'
+          ? 'ide-settings-modal-transparent-backdrop'
+          : undefined
+      }
     >
       <OLModalHeader closeButton>
         <OLModalTitle>{t('settings')}</OLModalTitle>
       </OLModalHeader>
       <OLModalBody className="ide-settings-modal-body">
-        <SettingsModalBody />
+        <SettingsModalBody
+          activeTab={activeTab}
+          setActiveTab={setActiveTab}
+          settingsTabs={settingsTabs}
+        />
       </OLModalBody>
     </OLModal>
   )
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/settings.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/settings.scss
index 02ce2cca30..e443b6e8ec 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/settings.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/settings.scss
@@ -47,6 +47,10 @@
   padding: 0;
 }
 
+.modal-backdrop.show.ide-settings-modal-transparent-backdrop {
+  opacity: 0;
+}
+
 .ide-settings-section {
   padding-top: var(--spacing-06);
   padding-bottom: var(--spacing-05);

From 6bdcd1f803c74f74ee8920005ee793cd78b50612 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Thu, 10 Jul 2025 10:24:32 +0100
Subject: [PATCH 183/274] Merge pull request #26901 from
 overleaf/rh-hotjar-marketing

Add hotjar tracking to marketing pages

GitOrigin-RevId: 5490392b44a287e4853778416323b3aa5fbfc1ef
---
 .../app/src/Features/StaticPages/HomeController.mjs   | 11 ++++++++++-
 services/web/app/views/layout-website-redesign.pug    |  3 +++
 .../web/frontend/js/features/cookie-banner/index.js   |  3 ++-
 services/web/frontend/js/marketing.ts                 |  1 +
 services/web/frontend/js/pages/marketing/homepage.js  |  1 +
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/services/web/app/src/Features/StaticPages/HomeController.mjs b/services/web/app/src/Features/StaticPages/HomeController.mjs
index cc7361217d..9b0b0fb563 100644
--- a/services/web/app/src/Features/StaticPages/HomeController.mjs
+++ b/services/web/app/src/Features/StaticPages/HomeController.mjs
@@ -6,6 +6,7 @@ import ErrorController from '../Errors/ErrorController.js'
 import SessionManager from '../Authentication/SessionManager.js'
 import { expressify } from '@overleaf/promise-utils'
 import logger from '@overleaf/logger'
+import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 
 const __dirname = new URL('.', import.meta.url).pathname
 
@@ -31,7 +32,15 @@ async function home(req, res) {
       page: req.path,
     })
 
-    res.render('external/home/index')
+    const hotjarAssignment = await SplitTestHandler.promises.getAssignment(
+      req,
+      res,
+      'hotjar-marketing'
+    )
+
+    res.render('external/home/index', {
+      shouldLoadHotjar: hotjarAssignment?.variant === 'enabled',
+    })
   } else {
     res.redirect('/login')
   }
diff --git a/services/web/app/views/layout-website-redesign.pug b/services/web/app/views/layout-website-redesign.pug
index a6d621d8b2..61ed83043b 100644
--- a/services/web/app/views/layout-website-redesign.pug
+++ b/services/web/app/views/layout-website-redesign.pug
@@ -6,6 +6,9 @@ include ./_mixins/bootstrap_js
 block entrypointVar
 	- entrypoint = 'marketing'
 
+block append meta
+	meta(name='ol-shouldLoadHotjar' data-type='boolean' content=shouldLoadHotjar)
+
 block body
 	if typeof suppressNavbar == 'undefined'
 		if bootstrapVersion === 5
diff --git a/services/web/frontend/js/features/cookie-banner/index.js b/services/web/frontend/js/features/cookie-banner/index.js
index 4acb2a6a6c..3d9b2b8d6c 100644
--- a/services/web/frontend/js/features/cookie-banner/index.js
+++ b/services/web/frontend/js/features/cookie-banner/index.js
@@ -30,7 +30,8 @@ function setConsent(value) {
 if (
   getMeta('ol-ExposedSettings').gaToken ||
   getMeta('ol-ExposedSettings').gaTokenV4 ||
-  getMeta('ol-ExposedSettings').propensityId
+  getMeta('ol-ExposedSettings').propensityId ||
+  getMeta('ol-ExposedSettings').hotjarId
 ) {
   document
     .querySelectorAll('[data-ol-cookie-banner-set-consent]')
diff --git a/services/web/frontend/js/marketing.ts b/services/web/frontend/js/marketing.ts
index 5e360b2dd7..df9fd27d83 100644
--- a/services/web/frontend/js/marketing.ts
+++ b/services/web/frontend/js/marketing.ts
@@ -1,5 +1,6 @@
 import './utils/webpack-public-path'
 import './infrastructure/error-reporter'
+import './infrastructure/hotjar'
 import './features/form-helpers/hydrate-form'
 import './features/form-helpers/password-visibility'
 import './features/link-helpers/slow-link'
diff --git a/services/web/frontend/js/pages/marketing/homepage.js b/services/web/frontend/js/pages/marketing/homepage.js
index 47b0e7e55e..99059756fd 100644
--- a/services/web/frontend/js/pages/marketing/homepage.js
+++ b/services/web/frontend/js/pages/marketing/homepage.js
@@ -1,4 +1,5 @@
 import '../../marketing'
+import '@/infrastructure/hotjar'
 
 function homepageAnimation(homepageAnimationEl) {
   function createFrames(word, { buildTime, holdTime, breakTime }) {

From 95b5c1f659c31a3dfad2171a8ad99d42a7ee9986 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Thu, 10 Jul 2025 12:14:16 +0200
Subject: [PATCH 184/274] [terraform] clsi: add C4D trial (#27033)

* [terraform] clsi: add C4D trial

* [terraform] clsi: make SPOT instance setup idempotent

GitOrigin-RevId: 19d5cf0b1f3aaaa967a2b1e78eba77fc1887cc65
---
 services/web/app/src/Features/Compile/CompileController.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js
index 4ff790f5e2..f4b08a84cf 100644
--- a/services/web/app/src/Features/Compile/CompileController.js
+++ b/services/web/app/src/Features/Compile/CompileController.js
@@ -210,7 +210,9 @@ const _CompileController = {
           compileTime: timings?.compileE2E,
           timeout: limits.timeout,
           server:
-            clsiServerId?.includes('-c2d-') || clsiServerId?.includes('-c3d-')
+            clsiServerId?.includes('-c2d-') ||
+            clsiServerId?.includes('-c3d-') ||
+            clsiServerId?.includes('-c4d-')
               ? 'faster'
               : 'normal',
           clsiServerId,

From da0967e90229243772813e3dfcd96b1c66874087 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:21:43 +0300
Subject: [PATCH 185/274] Merge pull request #27015 from
 overleaf/ii-groups-pagination-2-revert

[web] Revert "Group members page pagination"

GitOrigin-RevId: 83c377e319c32110bdaa22970cc378f2aa89be7c
---
 .../UserMembership/UserMembershipHandler.js   |  6 +-
 .../UserMembership/UserMembershipViewModel.js | 67 +++++++++++++------
 .../web/frontend/extracted-translations.json  |  1 +
 .../components/group-members.tsx              |  9 +++
 .../components/members-table/members-list.tsx | 50 +++++++++++---
 .../context/group-members-context.tsx         | 15 ++++-
 services/web/locales/en.json                  |  1 +
 .../members-table/members-list.spec.tsx       | 10 +++
 .../UserMembershipHandlerTests.js             | 28 ++++----
 .../UserMembershipViewModelTests.js           | 36 +++++-----
 10 files changed, 160 insertions(+), 63 deletions(-)

diff --git a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
index 0632f6e50e..56d92e9c96 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipHandler.js
@@ -79,11 +79,7 @@ async function getPopulatedListOfMembers(entity, attributes) {
     }
   }
 
-  const users = await Promise.all(
-    userObjects.map(userObject =>
-      UserMembershipViewModel.promises.buildAsync(userObject)
-    )
-  )
+  const users = await UserMembershipViewModel.promises.buildAsync(userObjects)
 
   for (const user of users) {
     if (
diff --git a/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js b/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
index 6c94f677b7..1d83a258ef 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
+++ b/services/web/app/src/Features/UserMembership/UserMembershipViewModel.js
@@ -23,30 +23,59 @@ const UserMembershipViewModel = {
     }
   },
 
-  buildAsync(userOrIdOrEmail, callback) {
+  buildAsync(userOrIdOrEmailArray, callback) {
     if (callback == null) {
       callback = function () {}
     }
-    if (!isObjectIdInstance(userOrIdOrEmail)) {
-      // userOrIdOrEmail is a user or an email and can be parsed by #build
-      return callback(null, UserMembershipViewModel.build(userOrIdOrEmail))
-    }
 
-    const userId = userOrIdOrEmail
-    const projection = {
-      email: 1,
-      first_name: 1,
-      last_name: 1,
-      lastLoggedIn: 1,
-      lastActive: 1,
-      enrollment: 1,
-    }
-    return UserGetter.getUser(userId, projection, function (error, user) {
-      if (error != null || user == null) {
-        return callback(null, buildUserViewModelWithId(userId.toString()))
+    const userObjectIds = userOrIdOrEmailArray.filter(isObjectIdInstance)
+
+    return UserGetter.getUsers(
+      userObjectIds,
+      {
+        email: 1,
+        first_name: 1,
+        last_name: 1,
+        lastLoggedIn: 1,
+        lastActive: 1,
+        enrollment: 1,
+      },
+      function (error, users) {
+        const results = []
+
+        if (error != null) {
+          userOrIdOrEmailArray.forEach(item => {
+            if (isObjectIdInstance(item)) {
+              results.push(buildUserViewModelWithId(item.toString()))
+            } else {
+              // `item` is a user or an email and can be parsed by #build
+              results.push(UserMembershipViewModel.build(item))
+            }
+          })
+        } else {
+          const usersMap = new Map()
+          for (const user of users) {
+            usersMap.set(user._id.toString(), user)
+          }
+
+          userOrIdOrEmailArray.forEach(item => {
+            if (isObjectIdInstance(item)) {
+              const user = usersMap.get(item.toString())
+              if (user == null) {
+                results.push(buildUserViewModelWithId(item.toString()))
+              } else {
+                results.push(buildUserViewModel(user))
+              }
+            } else {
+              // `item` is a user or an email and can be parsed by #build
+              results.push(UserMembershipViewModel.build(item))
+            }
+          })
+        }
+
+        callback(null, results)
       }
-      return callback(null, buildUserViewModel(user))
-    })
+    )
   },
 }
 
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index d4da0f62f6..47a6e2bcf1 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1025,6 +1025,7 @@
   "math_inline": "",
   "maximum_files_uploaded_together": "",
   "maybe_later": "",
+  "members_added": "",
   "members_management": "",
   "mendeley_dynamic_sync_description": "",
   "mendeley_groups_loading_error": "",
diff --git a/services/web/frontend/js/features/group-management/components/group-members.tsx b/services/web/frontend/js/features/group-management/components/group-members.tsx
index 2e87fe5051..c49fa62af0 100644
--- a/services/web/frontend/js/features/group-management/components/group-members.tsx
+++ b/services/web/frontend/js/features/group-management/components/group-members.tsx
@@ -13,6 +13,7 @@ import OLCard from '@/features/ui/components/ol/ol-card'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLFormControl from '@/features/ui/components/ol/ol-form-control'
 import OLFormText from '@/features/ui/components/ol/ol-form-text'
+import OLNotification from '@/features/ui/components/ol/ol-notification'
 
 export default function GroupMembers() {
   const { isReady } = useWaitForI18n()
@@ -26,6 +27,7 @@ export default function GroupMembers() {
     removeMemberError,
     inviteMemberLoading,
     inviteError,
+    memberAdded,
     paths,
   } = useGroupMembersContext()
   const [emailString, setEmailString] = useState<string>('')
@@ -140,6 +142,13 @@ export default function GroupMembers() {
                 data-testid="add-more-members-form"
               >
                 <p className="small">{t('invite_more_members')}</p>
+                {memberAdded && (
+                  <OLNotification
+                    content={t('members_added')}
+                    type="success"
+                    className="mt-2 mb-3"
+                  />
+                )}
                 <ErrorAlert error={inviteError} />
                 <form onSubmit={onAddMembersSubmit}>
                   <OLRow>
diff --git a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
index 6be4c7cbda..8a46a225bb 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/members-list.tsx
@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect } from 'react'
+import { useState, useRef, useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { User } from '../../../../../../types/group-management/user'
 import { useGroupMembersContext } from '../../context/group-members-context'
@@ -13,6 +13,9 @@ import getMeta from '@/utils/meta'
 import UnlinkUserModal from './unlink-user-modal'
 import OLTable from '@/features/ui/components/ol/ol-table'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import Pagination from '@/shared/components/pagination'
+
+const USERS_DISPLAY_LIMIT = 50
 
 type ManagedUsersListProps = {
   groupId: string
@@ -31,13 +34,30 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
   const managedUsersActive = getMeta('ol-managedUsersActive')
   const groupSSOActive = getMeta('ol-groupSSOActive')
   const tHeadRowRef = useRef<HTMLTableRowElement>(null)
-  const [colSpan, setColSpan] = useState(0)
+  const [pagination, setPagination] = useState({ currPage: 1, totalPages: 1 })
+
+  const usersForCurrentPage = useMemo(
+    () =>
+      users.slice(
+        (pagination.currPage - 1) * USERS_DISPLAY_LIMIT,
+        pagination.currPage * USERS_DISPLAY_LIMIT
+      ),
+    [users, pagination.currPage]
+  )
+
+  const handlePageClick = (
+    _e: React.MouseEvent<HTMLButtonElement>,
+    page: number
+  ) => {
+    setPagination(p => ({ ...p, currPage: page }))
+  }
 
   useEffect(() => {
-    if (tHeadRowRef.current) {
-      setColSpan(tHeadRowRef.current.querySelectorAll('th').length)
-    }
-  }, [])
+    setPagination(p => ({
+      ...p,
+      totalPages: Math.ceil(users.length / USERS_DISPLAY_LIMIT),
+    }))
+  }, [users.length])
 
   return (
     <div>
@@ -93,12 +113,17 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
         <tbody>
           {users.length === 0 && (
             <tr>
-              <td className="text-center" colSpan={colSpan}>
+              <td
+                className="text-center"
+                colSpan={
+                  tHeadRowRef.current?.querySelectorAll('th').length ?? 0
+                }
+              >
                 <small>{t('no_members')}</small>
               </td>
             </tr>
           )}
-          {users.map(user => (
+          {usersForCurrentPage.map(user => (
             <MemberRow
               key={user.email}
               user={user}
@@ -111,6 +136,15 @@ export default function MembersList({ groupId }: ManagedUsersListProps) {
           ))}
         </tbody>
       </OLTable>
+      {pagination.totalPages > 1 && (
+        <div className="d-flex justify-content-center">
+          <Pagination
+            handlePageClick={handlePageClick}
+            currentPage={pagination.currPage}
+            totalPages={pagination.totalPages}
+          />
+        </div>
+      )}
       {userToOffboard && (
         <OffboardManagedUserModal
           user={userToOffboard}
diff --git a/services/web/frontend/js/features/group-management/context/group-members-context.tsx b/services/web/frontend/js/features/group-management/context/group-members-context.tsx
index 63619dc361..ae875c435e 100644
--- a/services/web/frontend/js/features/group-management/context/group-members-context.tsx
+++ b/services/web/frontend/js/features/group-management/context/group-members-context.tsx
@@ -31,6 +31,7 @@ export type GroupMembersContextValue = {
   updateMemberView: (userId: string, updatedUser: User) => void
   inviteMemberLoading: boolean
   inviteError?: APIError
+  memberAdded: boolean
   paths: { [key: string]: string }
 }
 
@@ -58,6 +59,7 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
   const [inviteError, setInviteError] = useState<APIError>()
   const [removeMemberInflightCount, setRemoveMemberInflightCount] = useState(0)
   const [removeMemberError, setRemoveMemberError] = useState<APIError>()
+  const [memberAdded, setMemberAdded] = useState(false)
 
   const groupId = getMeta('ol-groupId')
 
@@ -74,7 +76,9 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
   const addMembers = useCallback(
     (emailString: string) => {
       setInviteError(undefined)
+      setMemberAdded(false)
       const emails = parseEmails(emailString)
+      let isError = false
       mapSeries(emails, async email => {
         setInviteUserInflightCount(count => count + 1)
         try {
@@ -94,8 +98,15 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
         } catch (error: unknown) {
           debugConsole.error(error)
           setInviteError((error as FetchError)?.data?.error || {})
+          isError = true
         }
-        setInviteUserInflightCount(count => count - 1)
+        setInviteUserInflightCount(count => {
+          const newCount = count - 1
+          if (newCount === 0 && !isError) {
+            setMemberAdded(true)
+          }
+          return newCount
+        })
       })
     },
     [paths.addMember, users, setUsers]
@@ -173,6 +184,7 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
       removeMemberError,
       inviteMemberLoading: inviteUserInflightCount > 0,
       inviteError,
+      memberAdded,
       paths,
     }),
     [
@@ -191,6 +203,7 @@ export function GroupMembersProvider({ children }: GroupMembersProviderProps) {
       removeMemberError,
       inviteUserInflightCount,
       inviteError,
+      memberAdded,
       paths,
     ]
   )
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 26105b0f05..346e02ecf9 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1342,6 +1342,7 @@
   "may": "May",
   "maybe_later": "Maybe later",
   "member_picker": "Select number of users for group plan",
+  "members_added": "Member(s) added.",
   "members_management": "Members management",
   "mendeley": "Mendeley",
   "mendeley_dynamic_sync_description": "With the Mendeley integration, you can import your references into __appName__. You can either import all your references at once or dynamically search your Mendeley library directly from __appName__.",
diff --git a/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
index 0861ab6c34..32958b34d0 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/members-list.spec.tsx
@@ -121,6 +121,16 @@ describe('MembersList', function () {
         users[1].last_name
       )
     })
+    it('should render the pagination navigation', function () {
+      cy.window().then(win => {
+        win.metaAttributesCache.set(
+          'ol-users',
+          Array.from({ length: 50 }).flatMap(() => users.flat())
+        )
+      })
+      mountManagedUsersList()
+      cy.findByRole('navigation', { name: /pagination navigation/i })
+    })
   })
 
   describe('empty user list', function () {
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js b/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
index f7b665aecd..3bf74c0ab7 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
+++ b/services/web/test/unit/src/UserMembership/UserMembershipHandlerTests.js
@@ -48,7 +48,7 @@ describe('UserMembershipHandler', function () {
 
     this.UserMembershipViewModel = {
       promises: {
-        buildAsync: sinon.stub().resolves({ _id: 'mock-member-id' }),
+        buildAsync: sinon.stub().resolves([{ _id: 'mock-member-id' }]),
       },
       build: sinon.stub().returns(this.newUser),
     }
@@ -118,26 +118,26 @@ describe('UserMembershipHandler', function () {
           this.subscription,
           EntityConfigs.group
         )
-        const expectedCallcount =
-          this.subscription.member_ids.length +
-          this.subscription.invited_emails.length +
-          this.subscription.teamInvites.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync.callCount
-        ).to.equal(expectedCallcount)
+          this.UserMembershipViewModel.promises.buildAsync
+        ).to.be.calledOnceWith(
+          this.subscription.invited_emails.concat(
+            this.subscription.teamInvites[0].email,
+            this.subscription.member_ids
+          )
+        )
       })
     })
 
-    describe('group mamagers', function () {
+    describe('group managers', function () {
       it('build view model for all managers', async function () {
         await this.UserMembershipHandler.promises.getUsers(
           this.subscription,
           EntityConfigs.groupManagers
         )
-        const expectedCallcount = this.subscription.manager_ids.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync.callCount
-        ).to.equal(expectedCallcount)
+          this.UserMembershipViewModel.promises.buildAsync
+        ).to.be.calledOnceWith(this.subscription.manager_ids)
       })
     })
 
@@ -147,11 +147,9 @@ describe('UserMembershipHandler', function () {
           this.institution,
           EntityConfigs.institution
         )
-
-        const expectedCallcount = this.institution.managerIds.length
         expect(
-          this.UserMembershipViewModel.promises.buildAsync.callCount
-        ).to.equal(expectedCallcount)
+          this.UserMembershipViewModel.promises.buildAsync
+        ).to.be.calledOnceWith(this.institution.managerIds)
       })
     })
   })
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js b/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
index a8ce9d158f..c5e21a5f48 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
+++ b/services/web/test/unit/src/UserMembership/UserMembershipViewModelTests.js
@@ -25,7 +25,7 @@ const {
 
 describe('UserMembershipViewModel', function () {
   beforeEach(function () {
-    this.UserGetter = { getUser: sinon.stub() }
+    this.UserGetter = { getUsers: sinon.stub() }
     this.UserMembershipViewModel = SandboxedModule.require(modulePath, {
       requires: {
         'mongodb-legacy': { ObjectId },
@@ -87,9 +87,10 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build email', function (done) {
+      this.UserGetter.getUsers.yields(null, [])
       return this.UserMembershipViewModel.buildAsync(
-        this.email,
-        (error, viewModel) => {
+        [this.email],
+        (error, [viewModel]) => {
           assertCalledWith(this.UserMembershipViewModel.build, this.email)
           return done()
         }
@@ -97,9 +98,10 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build user', function (done) {
+      this.UserGetter.getUsers.yields(null, [])
       return this.UserMembershipViewModel.buildAsync(
-        this.user,
-        (error, viewModel) => {
+        [this.user],
+        (error, [viewModel]) => {
           assertCalledWith(this.UserMembershipViewModel.build, this.user)
           return done()
         }
@@ -107,30 +109,34 @@ describe('UserMembershipViewModel', function () {
     })
 
     it('build user id', function (done) {
-      this.UserGetter.getUser.yields(null, this.user)
+      const user = {
+        ...this.user,
+        _id: new ObjectId(),
+      }
+      this.UserGetter.getUsers.yields(null, [user])
       return this.UserMembershipViewModel.buildAsync(
-        new ObjectId(),
-        (error, viewModel) => {
+        [user._id],
+        (error, [viewModel]) => {
           expect(error).not.to.exist
           assertNotCalled(this.UserMembershipViewModel.build)
-          expect(viewModel._id).to.equal(this.user._id)
-          expect(viewModel.email).to.equal(this.user.email)
-          expect(viewModel.first_name).to.equal(this.user.first_name)
+          expect(viewModel._id.toString()).to.equal(user._id.toString())
+          expect(viewModel.email).to.equal(user.email)
+          expect(viewModel.first_name).to.equal(user.first_name)
           expect(viewModel.invite).to.equal(false)
           expect(viewModel.email).to.exist
           expect(viewModel.enrollment).to.exist
-          expect(viewModel.enrollment).to.deep.equal(this.user.enrollment)
+          expect(viewModel.enrollment).to.deep.equal(user.enrollment)
           return done()
         }
       )
     })
 
     it('build user id with error', function (done) {
-      this.UserGetter.getUser.yields(new Error('nope'))
+      this.UserGetter.getUsers.yields(new Error('nope'), [])
       const userId = new ObjectId()
       return this.UserMembershipViewModel.buildAsync(
-        userId,
-        (error, viewModel) => {
+        [userId],
+        (error, [viewModel]) => {
           expect(error).not.to.exist
           assertNotCalled(this.UserMembershipViewModel.build)
           expect(viewModel._id).to.equal(userId.toString())

From ca426842c1bdda233346034252b70ec585e4388e Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:22:10 +0300
Subject: [PATCH 186/274] Merge pull request #27014 from
 overleaf/ii-join-group-copy-improvement-revert

[web] Revert "Copy change on the consent screen when joining a managed group"

GitOrigin-RevId: 0690545a38c362f3cd32ec04bc7e2ae36808ebc3
---
 .../app/src/Features/Subscription/SubscriptionLocator.js   | 7 +++++--
 services/web/frontend/extracted-translations.json          | 2 +-
 services/web/locales/en.json                               | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionLocator.js b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
index a8db8979f8..a867cf698a 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionLocator.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionLocator.js
@@ -4,6 +4,7 @@
 
 const { callbackifyAll } = require('@overleaf/promise-utils')
 const { Subscription } = require('../../models/Subscription')
+const SubscriptionHelper = require('./SubscriptionHelper')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('@overleaf/logger')
 const { AI_ADD_ON_CODE, isStandaloneAiAddOnPlanCode } = require('./AiHelper')
@@ -172,7 +173,8 @@ const SubscriptionLocator = {
 
     const hasActiveGroupSubscription = memberSubscriptions.some(
       subscription =>
-        subscription.recurlyStatus?.state === 'active' && subscription.groupPlan
+        subscription.groupPlan &&
+        SubscriptionHelper.getPaidSubscriptionState(subscription) === 'active'
     )
     if (hasActiveGroupSubscription) {
       // Member of a group plan
@@ -184,7 +186,8 @@ const SubscriptionLocator = {
 
     if (personalSubscription) {
       const hasActivePersonalSubscription =
-        personalSubscription.recurlyStatus?.state === 'active'
+        SubscriptionHelper.getPaidSubscriptionState(personalSubscription) ===
+        'active'
       if (hasActivePersonalSubscription) {
         if (personalSubscription.groupPlan) {
           // Owner of a group plan
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 47a6e2bcf1..b063c03418 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1146,10 +1146,10 @@
   "on_free_plan_upgrade_to_access_features": "",
   "one_step_away_from_professional_features": "",
   "only_group_admin_or_managers_can_delete_your_account_1": "",
+  "only_group_admin_or_managers_can_delete_your_account_10": "",
   "only_group_admin_or_managers_can_delete_your_account_3": "",
   "only_group_admin_or_managers_can_delete_your_account_6": "",
   "only_group_admin_or_managers_can_delete_your_account_7": "",
-  "only_group_admin_or_managers_can_delete_your_account_8": "",
   "only_group_admin_or_managers_can_delete_your_account_9": "",
   "only_importer_can_refresh": "",
   "open_action_menu": "",
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 346e02ecf9..b7880fbc57 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1505,10 +1505,10 @@
   "ongoing_experiments": "Ongoing experiments",
   "online_latex_editor": "Online LaTeX Editor",
   "only_group_admin_or_managers_can_delete_your_account_1": "By becoming a managed user, your organization will have admin rights over your account and control over your stuff, including the right to close your account and access, delete and share your stuff. As a result:",
+  "only_group_admin_or_managers_can_delete_your_account_10": "If you have an individual subscription, we’ll automatically terminate it and cancel its renewal when your account becomes managed. To request a pro-rata refund for the remainder, please contact Support.",
   "only_group_admin_or_managers_can_delete_your_account_3": "Your group admin and group managers will be able to reassign ownership of your projects to another group member.",
   "only_group_admin_or_managers_can_delete_your_account_6": "Only your group admin or group managers will be able to delete your account or change your account back into an unmanaged account.",
   "only_group_admin_or_managers_can_delete_your_account_7": "Only your group admin or group managers will be able to delete your account or change your account into an unmanaged account.",
-  "only_group_admin_or_managers_can_delete_your_account_8": "We’ll cancel the renewal of your subscription, reach out to Support to request a pro-rata refund. Your individual subscription will be terminated when your account becomes managed.",
   "only_group_admin_or_managers_can_delete_your_account_9": "Once you have become a managed user, <0>you yourself cannot change it back to an unmanaged account</0>. <1>Learn more about managed Overleaf accounts.</1>",
   "only_importer_can_refresh": "Only the person who originally imported this __provider__ file can refresh it.",
   "open_action_menu": "Open __name__ action menu",

From 8efe921326143d6727b4b7df5b6d493fcf763aab Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:22:20 +0300
Subject: [PATCH 187/274] Merge pull request #27016 from
 overleaf/ii-group-admin-managed-status-revert

[web] Revert "Managed status for group admin"

GitOrigin-RevId: 5a691a4f3702292648d484c8148bb2707c64028c
---
 .../members-table/managed-user-status.tsx     |  3 ---
 .../managed-user-status.spec.tsx              | 22 -------------------
 2 files changed, 25 deletions(-)

diff --git a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
index 5ed360de9c..14f4657fe7 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx
@@ -30,9 +30,6 @@ export default function ManagedUserStatus({ user }: ManagedUserStatusProps) {
     </span>
   )
 
-  if (user.isEntityAdmin) {
-    return <span className="security-state-group-admin" />
-  }
   if (user.invite) {
     return managedUserInvite
   }
diff --git a/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx b/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
index 49cadfe0c9..5c09987695 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/managed-user-status.spec.tsx
@@ -61,26 +61,4 @@ describe('MemberStatus', function () {
       cy.get('.security-state-not-managed').contains('Managed')
     })
   })
-
-  describe('with the group admin', function () {
-    const user: User = {
-      _id: 'some-user',
-      email: 'some.user@example.com',
-      first_name: 'Some',
-      last_name: 'User',
-      invite: false,
-      last_active_at: new Date(),
-      enrollment: undefined,
-      isEntityAdmin: true,
-    }
-    beforeEach(function () {
-      cy.mount(<ManagedUserStatus user={user} />)
-    })
-
-    it('should render no state indicator', function () {
-      cy.get('.security-state-group-admin')
-        .contains('Managed')
-        .should('not.exist')
-    })
-  })
 })

From f5dd356df33adb44408cab05c692c232cb0ee993 Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:22:30 +0300
Subject: [PATCH 188/274] Merge pull request #27017 from
 overleaf/ii-flexible-licensing-manually-billed-users-add-seats-revert

[web] Revert "FL manually billed subscriptions with no upsell"

GitOrigin-RevId: 3ce5441f825f9a364d3c17e3ac09aa3b9e87b0e7
---
 .../app/src/Features/Subscription/Errors.js   |  3 ++
 .../SubscriptionGroupController.mjs           | 15 +++++--
 .../Subscription/SubscriptionGroupHandler.js  | 22 ++++++++++
 .../web/frontend/extracted-translations.json  |  2 +-
 .../manually-collected-subscription.tsx       |  2 +-
 services/web/locales/en.json                  |  2 +-
 .../SubscriptionGroupController.test.mjs      | 25 +++++++++++
 .../SubscriptionGroupHandlerTests.js          | 43 +++++++++++++++++++
 8 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/Errors.js b/services/web/app/src/Features/Subscription/Errors.js
index 9ebb08c6db..609ec15a73 100644
--- a/services/web/app/src/Features/Subscription/Errors.js
+++ b/services/web/app/src/Features/Subscription/Errors.js
@@ -26,6 +26,8 @@ class SubtotalLimitExceededError extends OError {}
 
 class HasPastDueInvoiceError extends OError {}
 
+class HasNoAdditionalLicenseWhenManuallyCollectedError extends OError {}
+
 class PaymentActionRequiredError extends OError {
   constructor(info) {
     super('Payment action required', info)
@@ -43,4 +45,5 @@ module.exports = {
   InactiveError,
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
+  HasNoAdditionalLicenseWhenManuallyCollectedError,
 }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 792850a1c1..82064c173a 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -19,6 +19,7 @@ import {
   InactiveError,
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
+  HasNoAdditionalLicenseWhenManuallyCollectedError,
 } from './Errors.js'
 
 /**
@@ -164,6 +165,9 @@ async function addSeatsToGroupSubscription(req, res) {
         paymentProviderSubscription,
         userId
       )
+      await SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+        paymentProviderSubscription
+      )
     } else {
       await SubscriptionGroupHandler.promises.ensureSubscriptionCollectionMethodIsNotManual(
         paymentProviderSubscription
@@ -187,7 +191,10 @@ async function addSeatsToGroupSubscription(req, res) {
       )
     }
 
-    if (error instanceof ManuallyCollectedError) {
+    if (
+      error instanceof ManuallyCollectedError ||
+      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
+    ) {
       return res.redirect(
         '/user/subscription/group/manually-collected-subscription'
       )
@@ -231,7 +238,8 @@ async function previewAddSeatsSubscriptionChange(req, res) {
       error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
-      error instanceof HasPastDueInvoiceError
+      error instanceof HasPastDueInvoiceError ||
+      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
     ) {
       return res.status(422).end()
     }
@@ -274,7 +282,8 @@ async function createAddSeatsSubscriptionChange(req, res) {
       error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
-      error instanceof HasPastDueInvoiceError
+      error instanceof HasPastDueInvoiceError ||
+      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
     ) {
       return res.status(422).end()
     }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
index bc179f8d23..977218fdd2 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupHandler.js
@@ -18,6 +18,7 @@ const {
   PendingChangeError,
   InactiveError,
   HasPastDueInvoiceError,
+  HasNoAdditionalLicenseWhenManuallyCollectedError,
 } = require('./Errors')
 const EmailHelper = require('../Helpers/EmailHelper')
 const { InvalidEmailError } = require('../Errors/Errors')
@@ -123,6 +124,22 @@ async function ensureSubscriptionHasNoPastDueInvoice(subscription) {
   }
 }
 
+async function ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+  paymentProviderSubscription
+) {
+  if (
+    paymentProviderSubscription.isCollectionMethodManual &&
+    !paymentProviderSubscription.hasAddOn(MEMBERS_LIMIT_ADD_ON_CODE)
+  ) {
+    throw new HasNoAdditionalLicenseWhenManuallyCollectedError(
+      'This subscription is being collected manually has no "additional-license" add-on',
+      {
+        subscription_id: paymentProviderSubscription.id,
+      }
+    )
+  }
+}
+
 async function getUsersGroupSubscriptionDetails(userId) {
   const subscription =
     await SubscriptionLocator.promises.getUsersSubscription(userId)
@@ -470,6 +487,10 @@ module.exports = {
   ensureSubscriptionHasNoPastDueInvoice: callbackify(
     ensureSubscriptionHasNoPastDueInvoice
   ),
+  ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual:
+    callbackify(
+      ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual
+    ),
   getTotalConfirmedUsersInGroup: callbackify(getTotalConfirmedUsersInGroup),
   isUserPartOfGroup: callbackify(isUserPartOfGroup),
   getGroupPlanUpgradePreview: callbackify(getGroupPlanUpgradePreview),
@@ -484,6 +505,7 @@ module.exports = {
     ensureSubscriptionCollectionMethodIsNotManual,
     ensureSubscriptionHasNoPendingChanges,
     ensureSubscriptionHasNoPastDueInvoice,
+    ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual,
     getTotalConfirmedUsersInGroup,
     isUserPartOfGroup,
     getUsersGroupSubscriptionDetails,
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index b063c03418..1f9cd2928c 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -874,7 +874,7 @@
   "issued_on": "",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "",
   "it_looks_like_your_account_is_billed_manually": "",
-  "it_looks_like_your_account_is_billed_manually_upgrading_subscription": "",
+  "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "",
   "italics": "",
   "join_beta_program": "",
diff --git a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
index 971d4fa791..a1d984b4bb 100644
--- a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
+++ b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
@@ -24,7 +24,7 @@ function ManuallyCollectedSubscription() {
         content={
           isFlexibleGroupLicensingForManuallyBilledSubscriptions ? (
             <Trans
-              i18nKey="it_looks_like_your_account_is_billed_manually_upgrading_subscription"
+              i18nKey="it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription"
               components={[
                 // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
                 <a href="/contact" rel="noreferrer noopener" />,
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index b7880fbc57..8b8c13620e 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1133,7 +1133,7 @@
   "it": "Italian",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "It looks like that didn’t work. You can try again or <0>get in touch</0> with our Support team for more help.",
   "it_looks_like_your_account_is_billed_manually": "It looks like your account is being billed manually - adding seats or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
-  "it_looks_like_your_account_is_billed_manually_upgrading_subscription": "It looks like your account is being billed manually - upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
+  "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "It looks like your account is being billed manually - purchasing additional licenses or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "It looks like your payment details are missing. Please <0>update your billing information</0>, or <1>get in touch</1> with our Support team for more help.",
   "italics": "Italics",
   "ja": "Japanese",
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index 2b52f2be37..a64ef71b60 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -73,6 +73,8 @@ describe('SubscriptionGroupController', function () {
           .resolves(ctx.previewSubscriptionChangeData),
         checkBillingInfoExistence: sinon.stub().resolves(ctx.paymentMethod),
         updateSubscriptionPaymentTerms: sinon.stub().resolves(),
+        ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual:
+          sinon.stub().resolves(),
       },
     }
 
@@ -140,6 +142,7 @@ describe('SubscriptionGroupController', function () {
       InactiveError: class extends Error {},
       SubtotalLimitExceededError: class extends Error {},
       HasPastDueInvoiceError: class extends Error {},
+      HasNoAdditionalLicenseWhenManuallyCollectedError: class extends Error {},
     }
 
     vi.doMock(
@@ -521,6 +524,28 @@ describe('SubscriptionGroupController', function () {
       })
     })
 
+    it('should redirect to manually collected subscription error page when collection method is manual and has no additional license add-on', async function (ctx) {
+      await new Promise(resolve => {
+        ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual =
+          sinon
+            .stub()
+            .throws(
+              new ctx.Errors.HasNoAdditionalLicenseWhenManuallyCollectedError()
+            )
+
+        const res = {
+          redirect: url => {
+            url.should.equal(
+              '/user/subscription/group/manually-collected-subscription'
+            )
+            resolve()
+          },
+        }
+
+        ctx.Controller.addSeatsToGroupSubscription(ctx.req, res)
+      })
+    })
+
     it('should redirect to subscription page when there is a pending change', async function (ctx) {
       await new Promise(resolve => {
         ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPendingChanges =
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
index 63a6e25fde..87793fe440 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupHandlerTests.js
@@ -806,6 +806,49 @@ describe('SubscriptionGroupHandler', function () {
     })
   })
 
+  describe('ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual', function () {
+    it('should throw if the subscription is manually collected and has no additional license add-on', async function () {
+      await expect(
+        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+          {
+            isCollectionMethodManual: true,
+            hasAddOn: sinon
+              .stub()
+              .withArgs('additional-license')
+              .returns(false),
+          }
+        )
+      ).to.be.rejectedWith(
+        'This subscription is being collected manually has no "additional-license" add-on'
+      )
+    })
+
+    it('should not throw if the subscription is not manually collected and has no additional license add-on and ', async function () {
+      await expect(
+        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+          {
+            isCollectionMethodManual: false,
+            hasAddOn: sinon
+              .stub()
+              .withArgs('additional-license')
+              .returns(false),
+          }
+        )
+      ).to.not.be.rejected
+    })
+
+    it('should not throw if the subscription is not manually collected and has additional license add-on', async function () {
+      await expect(
+        this.Handler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+          {
+            isCollectionMethodManual: true,
+            hasAddOn: sinon.stub().withArgs('additional-license').returns(true),
+          }
+        )
+      ).to.not.be.rejected
+    })
+  })
+
   describe('getGroupPlanUpgradePreview', function () {
     it('should generate preview for subscription upgrade', async function () {
       const result = await this.Handler.promises.getGroupPlanUpgradePreview(

From 97f1425326789121147041b2086a7305cb790a5e Mon Sep 17 00:00:00 2001
From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:22:43 +0300
Subject: [PATCH 189/274] Merge pull request #27018 from
 overleaf/ii-flexible-licensing-manually-billed-billed-tear-down-revert

[web] Revert "FL manually billed subscription feature flag tear down"

GitOrigin-RevId: 7cc809570d310f56b8f9e1a4f43ca895db8a8073
---
 .../SubscriptionGroupController.mjs           | 44 ++++---------------
 .../web/frontend/extracted-translations.json  |  1 -
 .../components/add-seats/add-seats.tsx        | 17 +++----
 .../manually-collected-subscription.tsx       | 29 +++---------
 services/web/locales/en.json                  |  1 -
 .../components/add-seats.spec.tsx             |  3 --
 .../SubscriptionGroupController.test.mjs      | 16 ++-----
 7 files changed, 24 insertions(+), 87 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 82064c173a..7aa596836d 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -8,7 +8,6 @@ import SessionManager from '../Authentication/SessionManager.js'
 import UserAuditLogHandler from '../User/UserAuditLogHandler.js'
 import { expressify } from '@overleaf/promise-utils'
 import Modules from '../../infrastructure/Modules.js'
-import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 import UserGetter from '../User/UserGetter.js'
 import { Subscription } from '../../models/Subscription.js'
 import { isProfessionalGroupPlan } from './PlansHelper.mjs'
@@ -152,29 +151,13 @@ async function addSeatsToGroupSubscription(req, res) {
     await SubscriptionGroupHandler.promises.ensureSubscriptionHasNoPastDueInvoice(
       subscription
     )
-
-    const { variant: flexibleLicensingForManuallyBilledSubscriptionsVariant } =
-      await SplitTestHandler.promises.getAssignment(
-        req,
-        res,
-        'flexible-group-licensing-for-manually-billed-subscriptions'
-      )
-
-    if (flexibleLicensingForManuallyBilledSubscriptionsVariant === 'enabled') {
-      await SubscriptionGroupHandler.promises.checkBillingInfoExistence(
-        paymentProviderSubscription,
-        userId
-      )
-      await SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
-        paymentProviderSubscription
-      )
-    } else {
-      await SubscriptionGroupHandler.promises.ensureSubscriptionCollectionMethodIsNotManual(
-        paymentProviderSubscription
-      )
-      // Check if the user has missing billing details
-      await Modules.promises.hooks.fire('getPaymentMethod', userId)
-    }
+    await SubscriptionGroupHandler.promises.checkBillingInfoExistence(
+      paymentProviderSubscription,
+      userId
+    )
+    await SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual(
+      paymentProviderSubscription
+    )
 
     res.render('subscriptions/add-seats', {
       subscriptionId: subscription._id,
@@ -191,10 +174,7 @@ async function addSeatsToGroupSubscription(req, res) {
       )
     }
 
-    if (
-      error instanceof ManuallyCollectedError ||
-      error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError
-    ) {
+    if (error instanceof HasNoAdditionalLicenseWhenManuallyCollectedError) {
       return res.redirect(
         '/user/subscription/group/manually-collected-subscription'
       )
@@ -235,7 +215,6 @@ async function previewAddSeatsSubscriptionChange(req, res) {
   } catch (error) {
     if (
       error instanceof MissingBillingInfoError ||
-      error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
       error instanceof HasPastDueInvoiceError ||
@@ -279,7 +258,6 @@ async function createAddSeatsSubscriptionChange(req, res) {
   } catch (error) {
     if (
       error instanceof MissingBillingInfoError ||
-      error instanceof ManuallyCollectedError ||
       error instanceof PendingChangeError ||
       error instanceof InactiveError ||
       error instanceof HasPastDueInvoiceError ||
@@ -420,12 +398,6 @@ async function manuallyCollectedSubscription(req, res) {
     const subscription =
       await SubscriptionLocator.promises.getUsersSubscription(userId)
 
-    await SplitTestHandler.promises.getAssignment(
-      req,
-      res,
-      'flexible-group-licensing-for-manually-billed-subscriptions'
-    )
-
     res.render('subscriptions/manually-collected-subscription', {
       groupName: subscription.teamName,
     })
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 1f9cd2928c..4031c6db26 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -873,7 +873,6 @@
   "is_email_affiliated": "",
   "issued_on": "",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "",
-  "it_looks_like_your_account_is_billed_manually": "",
   "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "",
   "italics": "",
diff --git a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
index 5f9237807d..e795ed6a2d 100644
--- a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
+++ b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
@@ -30,7 +30,6 @@ import {
 } from '../../../../../../types/subscription/subscription-change-preview'
 import { MergeAndOverride, Nullable } from '../../../../../../types/utils'
 import { sendMB } from '../../../../infrastructure/event-tracking'
-import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 export const MAX_NUMBER_OF_USERS = 20
 export const MAX_NUMBER_OF_PO_NUMBER_CHARACTERS = 50
@@ -50,9 +49,6 @@ function AddSeats() {
   const [addSeatsInputError, setAddSeatsInputError] = useState<string>()
   const [poNumberInputError, setPoNumberInputError] = useState<string>()
   const [shouldContactSales, setShouldContactSales] = useState(false)
-  const isFlexibleGroupLicensingForManuallyBilledSubscriptions = useFeatureFlag(
-    'flexible-group-licensing-for-manually-billed-subscriptions'
-  )
   const controller = useAbortController()
   const { signal: addSeatsSignal } = useAbortController()
   const { signal: contactSalesSignal } = useAbortController()
@@ -373,13 +369,12 @@ function AddSeats() {
                       <FormText type="error">{addSeatsInputError}</FormText>
                     )}
                   </FormGroup>
-                  {isFlexibleGroupLicensingForManuallyBilledSubscriptions &&
-                    isCollectionMethodManual && (
-                      <PoNumber
-                        error={poNumberInputError}
-                        validate={validatePoNumber}
-                      />
-                    )}
+                  {isCollectionMethodManual && (
+                    <PoNumber
+                      error={poNumberInputError}
+                      validate={validatePoNumber}
+                    />
+                  )}
                 </div>
                 <CostSummarySection
                   isLoadingCostSummary={isLoadingCostSummary}
diff --git a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
index a1d984b4bb..b2f2580b5f 100644
--- a/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
+++ b/services/web/frontend/js/features/group-management/components/manually-collected-subscription.tsx
@@ -2,14 +2,9 @@ import { Trans, useTranslation } from 'react-i18next'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
 import Card from '@/features/group-management/components/card'
 import useWaitForI18n from '@/shared/hooks/use-wait-for-i18n'
-import { useFeatureFlag } from '@/shared/context/split-test-context'
 
 function ManuallyCollectedSubscription() {
   const { t } = useTranslation()
-  const isFlexibleGroupLicensingForManuallyBilledSubscriptions = useFeatureFlag(
-    'flexible-group-licensing-for-manually-billed-subscriptions'
-  )
-
   const { isReady } = useWaitForI18n()
 
   if (!isReady) {
@@ -22,23 +17,13 @@ function ManuallyCollectedSubscription() {
         type="error"
         title={t('account_billed_manually')}
         content={
-          isFlexibleGroupLicensingForManuallyBilledSubscriptions ? (
-            <Trans
-              i18nKey="it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription"
-              components={[
-                // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
-                <a href="/contact" rel="noreferrer noopener" />,
-              ]}
-            />
-          ) : (
-            <Trans
-              i18nKey="it_looks_like_your_account_is_billed_manually"
-              components={[
-                // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
-                <a href="/contact" rel="noreferrer noopener" />,
-              ]}
-            />
-          )
+          <Trans
+            i18nKey="it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription"
+            components={[
+              // eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key
+              <a href="/contact" rel="noreferrer noopener" />,
+            ]}
+          />
         }
         className="m-0"
       />
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 8b8c13620e..60ab856e03 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1132,7 +1132,6 @@
   "issued_on": "Issued: __date__",
   "it": "Italian",
   "it_looks_like_that_didnt_work_you_can_try_again_or_get_in_touch": "It looks like that didn’t work. You can try again or <0>get in touch</0> with our Support team for more help.",
-  "it_looks_like_your_account_is_billed_manually": "It looks like your account is being billed manually - adding seats or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
   "it_looks_like_your_account_is_billed_manually_purchasing_additional_license_or_upgrading_subscription": "It looks like your account is being billed manually - purchasing additional licenses or upgrading your subscription can only be done by the Support team. Please <0>get in touch</0> for help.",
   "it_looks_like_your_payment_details_are_missing_please_update_your_billing_information": "It looks like your payment details are missing. Please <0>update your billing information</0>, or <1>get in touch</1> with our Support team for more help.",
   "italics": "Italics",
diff --git a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
index ead0c74a1c..f26357d842 100644
--- a/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
+++ b/services/web/test/frontend/features/group-management/components/add-seats.spec.tsx
@@ -14,9 +14,6 @@ describe('<AddSeats />', function () {
       win.metaAttributesCache.set('ol-totalLicenses', this.totalLicenses)
       win.metaAttributesCache.set('ol-isProfessional', false)
       win.metaAttributesCache.set('ol-isCollectionMethodManual', true)
-      win.metaAttributesCache.set('ol-splitTestVariants', {
-        'flexible-group-licensing-for-manually-billed-subscriptions': 'enabled',
-      })
     })
 
     cy.mount(
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index a64ef71b60..ddfa8b0790 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -107,12 +107,6 @@ describe('SubscriptionGroupController', function () {
       },
     }
 
-    ctx.SplitTestHandler = {
-      promises: {
-        getAssignment: sinon.stub().resolves({ variant: 'enabled' }),
-      },
-    }
-
     ctx.UserGetter = {
       promises: {
         getUserEmail: sinon.stub().resolves(ctx.user.email),
@@ -174,13 +168,6 @@ describe('SubscriptionGroupController', function () {
       default: ctx.Modules,
     }))
 
-    vi.doMock(
-      '../../../../app/src/Features/SplitTests/SplitTestHandler',
-      () => ({
-        default: ctx.SplitTestHandler,
-      })
-    )
-
     vi.doMock('../../../../app/src/Features/User/UserGetter', () => ({
       default: ctx.UserGetter,
     }))
@@ -459,6 +446,9 @@ describe('SubscriptionGroupController', function () {
             ctx.SubscriptionGroupHandler.promises.checkBillingInfoExistence
               .calledWith(ctx.recurlySubscription, ctx.adminUserId)
               .should.equal(true)
+            ctx.SubscriptionGroupHandler.promises.ensureSubscriptionHasAdditionalLicenseAddOnWhenCollectionMethodIsManual
+              .calledWith(ctx.recurlySubscription)
+              .should.equal(true)
             page.should.equal('subscriptions/add-seats')
             props.subscriptionId.should.equal(ctx.subscriptionId)
             props.groupName.should.equal(ctx.subscription.teamName)

From 8fab1b54a39d92b09050e55dce7b9098a5dc0394 Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Thu, 10 Jul 2025 11:31:35 +0100
Subject: [PATCH 190/274] Merge pull request #27025 from
 overleaf/bg-delete-redis-buffer-when-project-deleted

delete redis buffer when project deleted

GitOrigin-RevId: eef7b6fdeb04cb556ae47794379d83e659f89b2e
---
 .../history-v1/api/controllers/projects.js    | 16 +------
 .../storage/lib/chunk_store/redis.js          | 48 +++++++++++++++++++
 .../storage/chunk_store_redis_backend.test.js | 44 +++++++++++++++++
 3 files changed, 94 insertions(+), 14 deletions(-)

diff --git a/services/history-v1/api/controllers/projects.js b/services/history-v1/api/controllers/projects.js
index a314e9a5ce..b7f07c4834 100644
--- a/services/history-v1/api/controllers/projects.js
+++ b/services/history-v1/api/controllers/projects.js
@@ -15,11 +15,10 @@ const {
   BlobStore,
   blobHash,
   chunkStore,
+  redisBuffer,
   HashCheckBlobStore,
   ProjectArchive,
   zipStore,
-  persistBuffer,
-  redisBuffer,
 } = require('../../storage')
 
 const render = require('./render')
@@ -229,19 +228,8 @@ async function deleteProject(req, res, next) {
   const projectId = req.swagger.params.project_id.value
   const blobStore = new BlobStore(projectId)
 
-  const farFuture = new Date()
-  farFuture.setTime(farFuture.getTime() + 7 * 24 * 3600 * 1000)
-  const limits = {
-    maxChanges: 0,
-    minChangeTimestamp: farFuture,
-    maxChangeTimestamp: farFuture,
-    autoResync: false,
-  }
-
-  await persistBuffer(projectId, limits)
-  await redisBuffer.expireProject(projectId)
-
   await Promise.all([
+    redisBuffer.hardDeleteProject(projectId),
     chunkStore.deleteProjectChunks(projectId),
     blobStore.deleteBlobs(),
   ])
diff --git a/services/history-v1/storage/lib/chunk_store/redis.js b/services/history-v1/storage/lib/chunk_store/redis.js
index 0a17429018..b8a79b498d 100644
--- a/services/history-v1/storage/lib/chunk_store/redis.js
+++ b/services/history-v1/storage/lib/chunk_store/redis.js
@@ -585,6 +585,53 @@ async function setPersistedVersion(projectId, persistedVersion) {
   }
 }
 
+rclient.defineCommand('hard_delete_project', {
+  numberOfKeys: 6,
+  lua: `
+    local headKey = KEYS[1]
+    local headVersionKey = KEYS[2]
+    local persistedVersionKey = KEYS[3]
+    local expireTimeKey = KEYS[4]
+    local persistTimeKey = KEYS[5]
+    local changesKey = KEYS[6]
+    -- Delete all keys associated with the project
+    redis.call('DEL',
+      headKey,
+      headVersionKey,
+      persistedVersionKey,
+      expireTimeKey,
+      persistTimeKey,
+      changesKey
+    )
+      return 'ok'
+  `,
+})
+
+/** Hard delete a project from Redis by removing all keys associated with it.
+ * This is only to be used when a project is **permanently** deleted.
+ * DO NOT USE THIS FOR ANY OTHER PURPOSES AS IT WILL REMOVE NON-PERSISTED CHANGES.
+ * @param {string} projectId - The unique identifier of the project to delete.
+ * @returns {Promise<string>} A Promise that resolves to 'ok' on success.
+ * @throws {Error} If Redis operations fail.
+ */
+async function hardDeleteProject(projectId) {
+  try {
+    const status = await rclient.hard_delete_project(
+      keySchema.head({ projectId }),
+      keySchema.headVersion({ projectId }),
+      keySchema.persistedVersion({ projectId }),
+      keySchema.expireTime({ projectId }),
+      keySchema.persistTime({ projectId }),
+      keySchema.changes({ projectId })
+    )
+    metrics.inc('chunk_store.redis.hard_delete_project', 1, { status })
+    return status
+  } catch (err) {
+    metrics.inc('chunk_store.redis.hard_delete_project', 1, { status: 'error' })
+    throw err
+  }
+}
+
 rclient.defineCommand('set_expire_time', {
   numberOfKeys: 2,
   lua: `
@@ -794,6 +841,7 @@ module.exports = {
   getChangesSinceVersion,
   getNonPersistedChanges,
   setPersistedVersion,
+  hardDeleteProject,
   setExpireTime,
   expireProject,
   claimExpireJob,
diff --git a/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js b/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
index 8abe7299a0..fc176de192 100644
--- a/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
+++ b/services/history-v1/test/acceptance/js/storage/chunk_store_redis_backend.test.js
@@ -1206,6 +1206,43 @@ describe('chunk buffer Redis backend', function () {
       expect(state.expireTime).to.equal(newTimestamp)
     })
   })
+
+  describe('hardDeleteProject', function () {
+    it('should delete all keys associated with the project', async function () {
+      // Setup project state
+      await setupState(projectId, {
+        headVersion: 5,
+        headSnapshot: new Snapshot(),
+        persistedVersion: 3,
+        persistTime: Date.now(),
+        expireTime: Date.now() + 3600 * 1000, // 1 hour from now
+        changes: 5,
+      })
+
+      // Verify that state exists before deletion
+      let state = await redisBackend.getState(projectId)
+      expect(state.headVersion).to.equal(5)
+
+      // Call hardDeleteProject
+      const result = await redisBackend.hardDeleteProject(projectId)
+      expect(result).to.equal('ok')
+
+      // Verify that all keys are deleted
+      state = await redisBackend.getState(projectId)
+      expect(state.headVersion).to.be.null
+      expect(state.headSnapshot).to.be.null
+      expect(state.persistedVersion).to.be.null
+      expect(state.persistTime).to.be.null
+      expect(state.expireTime).to.be.null
+      expect(state.changes).to.be.an('array').that.is.empty
+    })
+
+    it('should not throw an error if the project does not exist', async function () {
+      // Call hardDeleteProject on a non-existent project
+      const result = await redisBackend.hardDeleteProject(projectId)
+      expect(result).to.equal('ok')
+    })
+  })
 })
 
 async function queueChanges(projectId, changes, opts = {}) {
@@ -1235,6 +1272,7 @@ function makeChange() {
  * @param {string} projectId
  * @param {object} params
  * @param {number} params.headVersion
+ * @param {Snapshot} [params.headSnapshot]
  * @param {number | null} params.persistedVersion
  * @param {number | null} params.persistTime - time when the project should be persisted
  * @param {number | null} params.expireTime - time when the project should expire
@@ -1243,6 +1281,12 @@ function makeChange() {
  */
 async function setupState(projectId, params) {
   await rclient.set(keySchema.headVersion({ projectId }), params.headVersion)
+  if (params.headSnapshot) {
+    await rclient.set(
+      keySchema.head({ projectId }),
+      JSON.stringify(params.headSnapshot.toRaw())
+    )
+  }
   if (params.persistedVersion) {
     await rclient.set(
       keySchema.persistedVersion({ projectId }),

From f0d2df3c438887f17f8170866c1ca58b139d688d Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:52:28 +0100
Subject: [PATCH 191/274] Merge pull request #27040 from
 overleaf/dp-file-tree-close-button

Add close button to file tree rail panel

GitOrigin-RevId: d8abac122e266922b9ca914bc5df6ae7895b3796
---
 ...alSymbolsRoundedUnfilledPartialSlice.woff2 | Bin 5112 -> 5168 bytes
 .../material-symbols/unfilled-symbols.mjs     |   1 +
 .../file-tree/file-tree-action-buttons.tsx    |   8 +++++++
 .../components/rail-panel-header.tsx          |  21 +++++++++++------
 .../js/shared/components/panel-heading.tsx    |  22 +++++++++++-------
 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2
index baac847d54d56c1d17754de133b9f630c59170fc..260d4c367026d78dbd1a1eba997a33c6c2030afb 100644
GIT binary patch
literal 5168
zcmV-06wm8-Pew8T0RR9102D9)4gdfE04o>(029~%0RR9100000000000000000000
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

literal 5112
zcmV<U69?>fPew8T0RR9102BBC4gdfE04jt4028190RR9100000000000000000000
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
a6`@uI((pt$3(T5TbfN~HWk~vu65{})JF;8=

diff --git a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
index b2c1f72eaf..da5a97585c 100644
--- a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
+++ b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
@@ -7,6 +7,7 @@ export default /** @type {const} */ ([
   'auto_delete',
   'book_5',
   'brush',
+  'close',
   'code',
   'content_copy',
   'create_new_folder',
diff --git a/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx b/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
index 59e06b00ef..bcac7c4ba9 100644
--- a/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/file-tree/file-tree-action-buttons.tsx
@@ -6,11 +6,13 @@ import React from 'react'
 import { useCommandProvider } from '@/features/ide-react/hooks/use-command-provider'
 import { usePermissionsContext } from '@/features/ide-react/context/permissions-context'
 import FileTreeActionButton from './file-tree-action-button'
+import { useRailContext } from '../../contexts/rail-context'
 
 export default function FileTreeActionButtons() {
   const { t } = useTranslation()
   const { fileTreeReadOnly } = useFileTreeData()
   const { write } = usePermissionsContext()
+  const { handlePaneCollapse } = useRailContext()
 
   const {
     canCreate,
@@ -102,6 +104,12 @@ export default function FileTreeActionButtons() {
           iconType="delete"
         />
       )}
+      <FileTreeActionButton
+        id="close"
+        description={t('close')}
+        onClick={handlePaneCollapse}
+        iconType="close"
+      />
     </div>
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx b/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
index 94ac2f42af..47d45c6c46 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail-panel-header.tsx
@@ -2,6 +2,7 @@ import { useTranslation } from 'react-i18next'
 import { useRailContext } from '../contexts/rail-context'
 import OLIconButton from '@/features/ui/components/ol/ol-icon-button'
 import React from 'react'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 
 export default function RailPanelHeader({
   title,
@@ -18,13 +19,19 @@ export default function RailPanelHeader({
 
       <div className="rail-panel-header-actions">
         {actions}
-        <OLIconButton
-          onClick={handlePaneCollapse}
-          className="rail-panel-header-button-subdued"
-          icon="close"
-          accessibilityLabel={t('close')}
-          size="sm"
-        />
+        <OLTooltip
+          id="close-rail-panel"
+          description={t('close')}
+          overlayProps={{ placement: 'bottom' }}
+        >
+          <OLIconButton
+            onClick={handlePaneCollapse}
+            className="rail-panel-header-button-subdued"
+            icon="close"
+            accessibilityLabel={t('close')}
+            size="sm"
+          />
+        </OLTooltip>
       </div>
     </header>
   )
diff --git a/services/web/frontend/js/shared/components/panel-heading.tsx b/services/web/frontend/js/shared/components/panel-heading.tsx
index 356fbaa904..08952a5fd1 100644
--- a/services/web/frontend/js/shared/components/panel-heading.tsx
+++ b/services/web/frontend/js/shared/components/panel-heading.tsx
@@ -2,6 +2,7 @@ import { FC } from 'react'
 import SplitTestBadge from '@/shared/components/split-test-badge'
 import MaterialIcon from '@/shared/components/material-icon'
 import { useTranslation } from 'react-i18next'
+import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 
 export const PanelHeading: FC<
   React.PropsWithChildren<{
@@ -26,15 +27,20 @@ export const PanelHeading: FC<
       </div>
 
       {children}
-
-      <button
-        type="button"
-        className="btn panel-heading-close-button"
-        aria-label={t('close')}
-        onClick={handleClose}
+      <OLTooltip
+        id="close-panel"
+        description={t('close')}
+        overlayProps={{ placement: 'bottom' }}
       >
-        <MaterialIcon type="close" />
-      </button>
+        <button
+          type="button"
+          className="btn panel-heading-close-button"
+          aria-label={t('close')}
+          onClick={handleClose}
+        >
+          <MaterialIcon type="close" />
+        </button>
+      </OLTooltip>
     </div>
   )
 }

From d014db9893c26297b859672e78b6eccce59d2665 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:52:44 +0100
Subject: [PATCH 192/274] Merge pull request #27037 from
 overleaf/dp-file-outline-spacing

Reduce line height for file outline items in new editor

GitOrigin-RevId: 4f022a99d264b919cd591eb028eaa24664dc914a
---
 .../frontend/stylesheets/bootstrap-5/pages/editor/outline.scss  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss
index cc815ea058..9d78455f61 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss
@@ -117,6 +117,8 @@
   .outline-item-link {
     flex-grow: 1;
     padding: var(--spacing-02);
+    font-size: var(--font-size-02);
+    line-height: var(--line-height-02);
   }
 }
 

From beb3d87a77028bba0a443f6e0a9137dad9c97ac1 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:52:52 +0100
Subject: [PATCH 193/274] Merge pull request #27036 from
 overleaf/dp-max-errors-message

Fix logic for PdfLogsEntries hasErrors prop

GitOrigin-RevId: ca9346bac807176882059ba758594356a7fa854f
---
 .../ide-redesign/components/error-logs/error-logs.tsx       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx
index a6a62e998a..ffc305939f 100644
--- a/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx
@@ -89,7 +89,11 @@ function ErrorLogs() {
           {entries && (
             <PdfLogsEntries
               entries={entries}
-              hasErrors={includeErrors && entries.length > 0}
+              hasErrors={
+                includeErrors &&
+                logEntries?.errors &&
+                logEntries?.errors.length > 0
+              }
             />
           )}
 

From e7918247b485b4b577f3422ebe9eb086c286e44e Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 10 Jul 2025 14:53:04 +0100
Subject: [PATCH 194/274] Merge pull request #27034 from
 overleaf/dp-rail-tabs-on-click

Ensure rail tab always opens when clicked

GitOrigin-RevId: 70a01fab81c15011753b469a117cde599f98b541
---
 .../features/ide-redesign/components/rail.tsx   | 15 ++++++++++++++-
 .../ide-redesign/contexts/rail-context.tsx      | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index 1625e56b0d..877e40666e 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -44,6 +44,7 @@ import OldErrorPane from './error-logs/old-error-pane'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
 import { useSurveyUrl } from '../hooks/use-survey-url'
 import { useProjectContext } from '@/shared/context/project-context'
+import usePreviousValue from '@/shared/hooks/use-previous-value'
 
 type RailElement = {
   icon: AvailableUnfilledIcon
@@ -217,6 +218,18 @@ export const RailLayout = () => {
 
   const isReviewPanelOpen = selectedTab === 'review-panel'
 
+  const prevTab = usePreviousValue(selectedTab)
+
+  const tabHasChanged = useMemo(() => {
+    return prevTab !== selectedTab
+  }, [prevTab, selectedTab])
+
+  const onCollapse = useCallback(() => {
+    if (!tabHasChanged) {
+      handlePaneCollapse()
+    }
+  }, [tabHasChanged, handlePaneCollapse])
+
   return (
     <TabContainer
       mountOnEnter // Only render when necessary (so that we can lazy load tab content)
@@ -260,7 +273,7 @@ export const RailLayout = () => {
         maxSize={80}
         ref={panelRef}
         collapsible
-        onCollapse={handlePaneCollapse}
+        onCollapse={onCollapse}
         onExpand={handlePaneExpand}
       >
         {isHistoryView && <HistorySidebar />}
diff --git a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
index c52671b42b..4a882076ec 100644
--- a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
+++ b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
@@ -1,5 +1,4 @@
 import { sendSearchEvent } from '@/features/event-tracking/search-events'
-import useCollapsiblePanel from '@/features/ide-react/hooks/use-collapsible-panel'
 import useEventListener from '@/shared/hooks/use-event-listener'
 import { isMac } from '@/shared/utils/os'
 import {
@@ -9,6 +8,8 @@ import {
   SetStateAction,
   useCallback,
   useContext,
+  useEffect,
+  useLayoutEffect,
   useMemo,
   useRef,
   useState,
@@ -55,7 +56,6 @@ export const RailProvider: FC<React.PropsWithChildren> = ({ children }) => {
     }, [])
 
   const panelRef = useRef<ImperativePanelHandle>(null)
-  useCollapsiblePanel(isOpen, panelRef)
 
   const togglePane = useCallback(() => {
     setIsOpen(value => !value)
@@ -73,6 +73,19 @@ export const RailProvider: FC<React.PropsWithChildren> = ({ children }) => {
   //       since it is responsible for opening the initial document.
   const [selectedTab, setSelectedTab] = useState<RailTabKey>('file-tree')
 
+  // Keep the panel collapse/expanded state in sync with isOpen and selectedTab
+  useLayoutEffect(() => {
+    const panelHandle = panelRef.current
+
+    if (panelHandle) {
+      if (isOpen) {
+        panelHandle.expand()
+      } else {
+        panelHandle.collapse()
+      }
+    }
+  }, [isOpen, selectedTab])
+
   const openTab = useCallback(
     (tab: RailTabKey) => {
       setSelectedTab(tab)

From e38b04a3eeea2e62a13d9326d3bcb47e7d4be07b Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:08:20 +0100
Subject: [PATCH 195/274] Merge pull request #27047 from overleaf/dp-fix-lint

Remove unneeded import

GitOrigin-RevId: 4120038529e2b15845b491c624d98bab2819d482
---
 .../frontend/js/features/ide-redesign/contexts/rail-context.tsx  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
index 4a882076ec..16d06edad4 100644
--- a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
+++ b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
@@ -8,7 +8,6 @@ import {
   SetStateAction,
   useCallback,
   useContext,
-  useEffect,
   useLayoutEffect,
   useMemo,
   useRef,

From fd8a4ac0205fa1781c48b24e01e45b0b45ff0660 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Thu, 10 Jul 2025 07:57:13 -0700
Subject: [PATCH 196/274] Merge pull request #26970 from
 overleaf/mf-fix-spacing-issue-plans-faq

[web] Fix various spacing issues in plans page -> faq section

GitOrigin-RevId: d265c4c0b92f093a496ec8a4a180f1061e007b11
---
 .../subscriptions/plans/_plans_faq_tabs.pug   | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
index c20ad3ace9..a2a63b74d9 100644
--- a/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
+++ b/services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
@@ -16,7 +16,9 @@ mixin managingYourSubscription
 			.collapse(id='managingYourSubscriptionQ1')
 				.custom-accordion-body
 					span Yes, you can do this at any time by going to
+					| &nbsp;
 					strong Account > Subscription
+					| &nbsp;
 					span when logged in to Overleaf. You can change plans, switch between monthly and annual billing options, or cancel to downgrade to the free plan. When canceling, your subscription will continue until the end of the billing period.
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
@@ -59,7 +61,8 @@ mixin managingYourSubscription
 					+material-symbol-outlined('keyboard_arrow_down')
 			.collapse(id='managingYourSubscriptionQ4')
 				.custom-accordion-body
-					| You can view and update the card on file by going to Account >
+					span You can view and update the card on file by going to Account >
+					| &nbsp;
 					a.inline-green-link(
 						target='_blank'
 						href='/user/subscription'
@@ -87,8 +90,9 @@ mixin overleafIndividualPlans
 			.collapse(id='overleafIndividualPlansQ1')
 				.custom-accordion-body
 					span You get full access to your chosen plan during your 7-day free trial, and there’s no obligation to continue beyond the trial. Your card will be charged at the end of your trial unless you cancel before then. To cancel, go to
+					| &nbsp;
 					strong Account >
-						|
+						| &nbsp;
 						a.inline-green-link(
 							target='_blank'
 							href='/user/subscription'
@@ -98,6 +102,7 @@ mixin overleafIndividualPlans
 							event-segmentation={button: 'contact', location: 'faq'}
 						)
 							span Subscription
+					| &nbsp;
 					span when logged in to Overleaf (the trial will continue for the full 7 days).
 
 		.custom-accordion-item
@@ -129,7 +134,9 @@ mixin overleafIndividualPlans
 			.collapse(id='overleafIndividualPlansQ3')
 				.custom-accordion-body
 					span No. Only the subscriber’s account will be upgraded. An individual Standard subscription allows you to invite 10 people per project to edit the project with you. Your collaborators can access features such as the full document history and extended compile time, but
+					| &nbsp;
 					strong only
+					| &nbsp;
 					span for the project(s) they’re working on with you. If your collaborators want access to those features on their own projects, they will need to purchase their own subscription. (If you work with the same people regularly, you might find a group subscription more cost effective.)
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
@@ -145,7 +152,9 @@ mixin overleafIndividualPlans
 			.collapse(id='overleafIndividualPlansQ4')
 				.custom-accordion-body
 					span If you have an Overleaf subscription, then your project collaborators will have access to features like real-time track changes and document history, but
+					| &nbsp;
 					strong only
+					| &nbsp;
 					span for the project(s) they’re working on with you. If your collaborators want access to those features on their own projects, they will need to purchase their own subscription. (If you work with the same people regularly, you might find a group subscription more cost effective.)
 		.custom-accordion-item
 			button.custom-accordion-header.collapsed(
@@ -220,7 +229,8 @@ mixin overleafGroupPlans
 					+material-symbol-outlined('keyboard_arrow_down')
 			.collapse(id='overleafGroupPlansQ2')
 				.custom-accordion-body
-					| Our Group subscriptions allow you to purchase access to our premium features for multiple people. They’re easy to manage, help save on paperwork, and allow groups of 5 or more to purchase via purchase order (PO). We also offer discounts on purchases of Group subscriptions for more than 20 users; just get in touch with our
+					span Our Group subscriptions allow you to purchase access to our premium features for multiple people. They’re easy to manage, help save on paperwork, and allow groups of 5 or more to purchase via purchase order (PO). We also offer discounts on purchases of Group subscriptions for more than 20 users; just get in touch with our
+					| &nbsp;
 					a.inline-green-link(
 						target='_blank'
 						href='/for/contact-sales'
@@ -259,7 +269,8 @@ mixin overleafGroupPlans
 			.collapse(id='overleafGroupPlansQ4')
 				.custom-accordion-body
 					div
-						| You can add up to 20 licenses using the
+						span You can add up to 20 licenses using the
+						| &nbsp;
 						a.inline-green-link(
 							target='_blank'
 							href='/user/subscription'
@@ -269,8 +280,9 @@ mixin overleafGroupPlans
 							event-segmentation={button: 'contact', location: 'faq'}
 						)
 							span subscription management page
-						|
-						| accessed by going to Account >
+						| &nbsp;
+						span accessed by going to Account >
+						| &nbsp;
 						a.inline-green-link(
 							target='_blank'
 							href='/user/subscription'
@@ -280,10 +292,11 @@ mixin overleafGroupPlans
 							event-segmentation={button: 'contact', location: 'faq'}
 						)
 							span Subscription
-						|
-						| when logged into Overleaf. The cost per license will be prorated at the current per license rate, and will end with your existing renewal date.
+						| &nbsp;
+						span when logged into Overleaf. The cost per license will be prorated at the current per license rate, and will end with your existing renewal date.
 					.mt-2
-						| If you need more than 20 licenses added to your subscription, please
+						span If you need more than 20 licenses added to your subscription, please
+						| &nbsp;
 						a.inline-green-link(
 							target='_blank'
 							href='/for/contact-sales'
@@ -307,7 +320,8 @@ mixin overleafGroupPlans
 					+material-symbol-outlined('keyboard_arrow_down')
 			.collapse(id='overleafGroupPlansQ5')
 				.custom-accordion-body
-					| You can upgrade your plan from Group Standard to Group Professional on the
+					span You can upgrade your plan from Group Standard to Group Professional on the
+					| &nbsp;
 					a.inline-green-link(
 						target='_blank'
 						href='/user/subscription'

From 028d4b481fa936c5ea771ceb90c35a7d2abc399a Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Thu, 10 Jul 2025 07:58:00 -0700
Subject: [PATCH 197/274] Merge pull request #26965 from
 overleaf/mf-trials-convert-to-regular-should-not-send-subscription-renewed

[web] Stop sending any event when trial changes to active for Stripe subscription on `customer.subscription.updated` stripe webhook event type

GitOrigin-RevId: 11256878cd2828036aad3130a05ad36d95466199
---
 services/web/types/stripe/webhook-event.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/types/stripe/webhook-event.ts b/services/web/types/stripe/webhook-event.ts
index c0c182e047..f0a08284ed 100644
--- a/services/web/types/stripe/webhook-event.ts
+++ b/services/web/types/stripe/webhook-event.ts
@@ -22,6 +22,7 @@ export type CustomerSubscriptionUpdatedWebhookEvent = {
           },
         ]
       }
+      status?: Stripe.Subscription.Status
     }
   }
 }

From 8a07389ce68fdb0ef5663f0dda4c85e13b428af7 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Thu, 10 Jul 2025 07:58:24 -0700
Subject: [PATCH 198/274] Merge pull request #26979 from
 overleaf/mf-show-error-alert-in-plans-page

[web] Show error alert in plans page if error occurs when accessing Stripe checkout page

GitOrigin-RevId: 51cce691b25bc6bd59ee004c2ba495b75639c737
---
 services/web/locales/en.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 60ab856e03..35c7787e1e 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -2169,6 +2169,8 @@
   "stop_on_validation_error": "Check syntax before compile",
   "store_your_work": "Store your work on your own infrastructure",
   "stretch_width_to_text": "Stretch width to text",
+  "stripe_error_please_wait_and_try_again": "There is an error with our payment processor, please wait a few minutes and try again.",
+  "stripe_key_error_please_contact_support": "There is an error with our payment processor, please <0>contact support.</0>",
   "strongly_agree": "Strongly agree",
   "strongly_disagree": "Strongly disagree",
   "student": "Student",

From 85ecef4d965d338849e100fa627b8256f7a07d8f Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:01:24 +0100
Subject: [PATCH 199/274] Merge pull request #26652 from
 overleaf/bg-run-e2e-tests-under-wayland

allow running e2e tests under Wayland

GitOrigin-RevId: 281186059300b4012e7f57b963b2577bfd5d0d93
---
 server-ce/test/docker-compose.yml       | 1 +
 services/web/docker-compose.cypress.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server-ce/test/docker-compose.yml b/server-ce/test/docker-compose.yml
index f4255e241b..029b73fc62 100644
--- a/server-ce/test/docker-compose.yml
+++ b/server-ce/test/docker-compose.yml
@@ -91,6 +91,7 @@ services:
     volumes:
       - ./:/e2e
       - /tmp/.X11-unix:/tmp/.X11-unix
+      - ${XAUTHORITY:-/dev/null}:/home/node/.Xauthority
     user: "${DOCKER_USER:-1000:1000}"
     environment:
       CYPRESS_SHARD:
diff --git a/services/web/docker-compose.cypress.yml b/services/web/docker-compose.cypress.yml
index 5c0cb95c1b..9568fef98f 100644
--- a/services/web/docker-compose.cypress.yml
+++ b/services/web/docker-compose.cypress.yml
@@ -4,6 +4,7 @@ services:
     volumes:
       - ../../:/overleaf
       - /tmp/.X11-unix:/tmp/.X11-unix
+      - ${XAUTHORITY:-/dev/null}:/home/node/.Xauthority
     working_dir: /overleaf/services/web
     entrypoint: npm
     command: run cypress:open-ct

From 2f2862ecd79c568efaadbecaf40e11c6d4ac9610 Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:33:41 +0100
Subject: [PATCH 200/274] Merge pull request #26637 from
 overleaf/bg-clsi-fix-process-group-for-local-compiles

fix "stop compile" option for local command runner in CE/SP

GitOrigin-RevId: 7986b505362aaf33ac6e161b3b54458baba1e2e6
---
 server-ce/test/helpers/compile.ts             |  8 ++++
 server-ce/test/sandboxed-compiles.spec.ts     | 36 +++++++++++++-
 services/clsi/app/js/LocalCommandRunner.js    |  1 +
 .../clsi/test/acceptance/js/StopCompile.js    | 47 +++++++++++++++++++
 .../clsi/test/acceptance/js/helpers/Client.js | 10 ++++
 5 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 services/clsi/test/acceptance/js/StopCompile.js

diff --git a/server-ce/test/helpers/compile.ts b/server-ce/test/helpers/compile.ts
index 9f0c9e4150..d41e43221f 100644
--- a/server-ce/test/helpers/compile.ts
+++ b/server-ce/test/helpers/compile.ts
@@ -9,6 +9,14 @@ export function throttledRecompile() {
   return recompile
 }
 
+export function stopCompile(options: { delay?: number } = {}) {
+  const { delay = 0 } = options
+  cy.wait(delay)
+  cy.log('Stop compile')
+  cy.findByRole('button', { name: 'Toggle compile options menu' }).click()
+  cy.findByRole('menuitem', { name: 'Stop compilation' }).click()
+}
+
 export function prepareWaitForNextCompileSlot() {
   let lastCompile = 0
   function queueReset() {
diff --git a/server-ce/test/sandboxed-compiles.spec.ts b/server-ce/test/sandboxed-compiles.spec.ts
index c84af1897b..62c87384d6 100644
--- a/server-ce/test/sandboxed-compiles.spec.ts
+++ b/server-ce/test/sandboxed-compiles.spec.ts
@@ -1,7 +1,7 @@
 import { ensureUserExists, login } from './helpers/login'
 import { createProject } from './helpers/project'
 import { isExcludedBySharding, startWith } from './helpers/config'
-import { throttledRecompile } from './helpers/compile'
+import { throttledRecompile, stopCompile } from './helpers/compile'
 import { v4 as uuid } from 'uuid'
 import { waitUntilScrollingFinished } from './helpers/waitUntilScrollingFinished'
 import { beforeWithReRunOnTestRetry } from './helpers/beforeWithReRunOnTestRetry'
@@ -56,8 +56,40 @@ describe('SandboxedCompiles', function () {
     checkSyncTeX()
     checkXeTeX()
     checkRecompilesAfterErrors()
+    checkStopCompile()
   })
 
+  function checkStopCompile() {
+    it('users can stop a running compile', function () {
+      login('user@example.com')
+      createProject('test-project')
+      // create an infinite loop in the main document
+      // this will cause the compile to run indefinitely
+      cy.findByText('\\maketitle').parent().click()
+      cy.findByText('\\maketitle')
+        .parent()
+        .type('\n\\def\\x{{}Hello!\\par\\x}\\x')
+      cy.log('Start compile')
+      // We need to start the compile manually because we do not want to wait for it to finish
+      cy.findByText('Recompile').click()
+      // Now stop the compile and kill the latex process
+      stopCompile({ delay: 1000 })
+      cy.get('.logs-pane')
+        .invoke('text')
+        .should('match', /PDF Rendering Error|Compilation cancelled/)
+      // Check that the previous compile is not running in the background by
+      // disabling the infinite loop and recompiling
+      cy.findByText('\\def').parent().click()
+      cy.findByText('\\def').parent().type('{home}disabled loop% ')
+      cy.findByText('Recompile').click()
+      cy.get('.pdf-viewer').should('contain.text', 'disabled loop')
+      cy.get('.logs-pane').should(
+        'not.contain.text',
+        'A previous compile is still running'
+      )
+    })
+  }
+
   function checkSyncTeX() {
     // TODO(25342): re-enable
     // eslint-disable-next-line mocha/no-skipped-tests
@@ -227,6 +259,7 @@ describe('SandboxedCompiles', function () {
     checkSyncTeX()
     checkXeTeX()
     checkRecompilesAfterErrors()
+    checkStopCompile()
   })
 
   describe.skip('unavailable in CE', function () {
@@ -241,5 +274,6 @@ describe('SandboxedCompiles', function () {
     checkSyncTeX()
     checkXeTeX()
     checkRecompilesAfterErrors()
+    checkStopCompile()
   })
 })
diff --git a/services/clsi/app/js/LocalCommandRunner.js b/services/clsi/app/js/LocalCommandRunner.js
index ce27473358..aa62825443 100644
--- a/services/clsi/app/js/LocalCommandRunner.js
+++ b/services/clsi/app/js/LocalCommandRunner.js
@@ -54,6 +54,7 @@ module.exports = CommandRunner = {
       cwd: directory,
       env,
       stdio: ['pipe', 'pipe', 'ignore'],
+      detached: true,
     })
 
     let stdout = ''
diff --git a/services/clsi/test/acceptance/js/StopCompile.js b/services/clsi/test/acceptance/js/StopCompile.js
new file mode 100644
index 0000000000..103a70f37d
--- /dev/null
+++ b/services/clsi/test/acceptance/js/StopCompile.js
@@ -0,0 +1,47 @@
+const Client = require('./helpers/Client')
+const ClsiApp = require('./helpers/ClsiApp')
+const { expect } = require('chai')
+
+describe('Stop compile', function () {
+  before(function (done) {
+    this.request = {
+      options: {
+        timeout: 100,
+      }, // seconds
+      resources: [
+        {
+          path: 'main.tex',
+          content: `\
+\\documentclass{article}
+\\begin{document}
+\\def\\x{Hello!\\par\\x}
+\\x
+\\end{document}\
+`,
+        },
+      ],
+    }
+    this.project_id = Client.randomId()
+    ClsiApp.ensureRunning(() => {
+      // start the compile in the background
+      Client.compile(this.project_id, this.request, (error, res, body) => {
+        this.compileResult = { error, res, body }
+      })
+      // wait for 1 second before stopping the compile
+      setTimeout(() => {
+        Client.stopCompile(this.project_id, (error, res, body) => {
+          this.stopResult = { error, res, body }
+          setTimeout(done, 1000) // allow time for the compile request to terminate
+        })
+      }, 1000)
+    })
+  })
+
+  it('should force a compile response with an error status', function () {
+    expect(this.stopResult.error).to.be.null
+    expect(this.stopResult.res.statusCode).to.equal(204)
+    expect(this.compileResult.res.statusCode).to.equal(200)
+    expect(this.compileResult.body.compile.status).to.equal('terminated')
+    expect(this.compileResult.body.compile.error).to.equal('terminated')
+  })
+})
diff --git a/services/clsi/test/acceptance/js/helpers/Client.js b/services/clsi/test/acceptance/js/helpers/Client.js
index a0bdce734f..49bf7390c6 100644
--- a/services/clsi/test/acceptance/js/helpers/Client.js
+++ b/services/clsi/test/acceptance/js/helpers/Client.js
@@ -42,6 +42,16 @@ module.exports = Client = {
     )
   },
 
+  stopCompile(projectId, callback) {
+    if (callback == null) {
+      callback = function () {}
+    }
+    return request.post(
+      { url: `${this.host}/project/${projectId}/compile/stop` },
+      callback
+    )
+  },
+
   clearCache(projectId, callback) {
     if (callback == null) {
       callback = function () {}

From bc49968908b070353aeda0fe6da2c3fd10880b05 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:08:45 -0400
Subject: [PATCH 201/274] Merge pull request #27060 from
 overleaf/em-log-oauth-authenticate-errors

Log OAuth authentication errors

GitOrigin-RevId: 32bb3c66b61d0de8cbbfe1da08042f06b4f4342a
---
 .../src/Features/Authentication/AuthenticationController.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js
index 7a97d2ac9c..c321ce3edf 100644
--- a/services/web/app/src/Features/Authentication/AuthenticationController.js
+++ b/services/web/app/src/Features/Authentication/AuthenticationController.js
@@ -392,6 +392,10 @@ const AuthenticationController = {
         req.oauth_user = token.user
         next()
       } catch (err) {
+        logger.warn(
+          { errName: err.name, errMessage: err.message },
+          'OAuth authenticate error'
+        )
         if (
           err.code === 400 &&
           err.message === 'Invalid request: malformed authorization header'

From d5e00845c6526ecccdc423409eb8d0db9fe75f55 Mon Sep 17 00:00:00 2001
From: Jimmy Domagala-Tang <Jimmy.Domagala-Tang@overleaf.com>
Date: Thu, 10 Jul 2025 14:46:51 -0700
Subject: [PATCH 202/274] Revert "Merge pull request #27060 from
 overleaf/em-log-oauth-authenticate-errors" (#27062)

This reverts commit 32bb3c66b61d0de8cbbfe1da08042f06b4f4342a, reversing
changes made to 5e87b704cd90478aedc8d8befa0aa5787a53177b.

Co-authored-by: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
GitOrigin-RevId: 10b51500e3429a637dc76e3cec7d6b2764708ddb
---
 .../src/Features/Authentication/AuthenticationController.js   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js
index c321ce3edf..7a97d2ac9c 100644
--- a/services/web/app/src/Features/Authentication/AuthenticationController.js
+++ b/services/web/app/src/Features/Authentication/AuthenticationController.js
@@ -392,10 +392,6 @@ const AuthenticationController = {
         req.oauth_user = token.user
         next()
       } catch (err) {
-        logger.warn(
-          { errName: err.name, errMessage: err.message },
-          'OAuth authenticate error'
-        )
         if (
           err.code === 400 &&
           err.message === 'Invalid request: malformed authorization header'

From 406312d49534c14c65b5a8b9396fc483ede41a63 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Fri, 11 Jul 2025 09:14:21 +0200
Subject: [PATCH 203/274] Merge pull request #26513 from
 overleaf/msm-fix-sso-disable-managed-group

[web] Fix disable managed users clears SSO enrollment

GitOrigin-RevId: 75742840b5cee98a203ad11e9213e2e31cf18985
---
 .../acceptance/src/helpers/Subscription.mjs   |  4 ++++
 .../test/acceptance/src/helpers/groupSSO.mjs  | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/services/web/test/acceptance/src/helpers/Subscription.mjs b/services/web/test/acceptance/src/helpers/Subscription.mjs
index 420dda56d9..6b6f87e4d6 100644
--- a/services/web/test/acceptance/src/helpers/Subscription.mjs
+++ b/services/web/test/acceptance/src/helpers/Subscription.mjs
@@ -88,6 +88,10 @@ class PromisifiedSubscription {
     await Modules.promises.hooks.fire('enableManagedUsers', this._id)
   }
 
+  async disableManagedUsers() {
+    await Modules.promises.hooks.fire('disableManagedUsers', this._id)
+  }
+
   async enableFeatureSSO() {
     await SubscriptionModel.findOneAndUpdate(
       { _id: new ObjectId(this._id) },
diff --git a/services/web/test/acceptance/src/helpers/groupSSO.mjs b/services/web/test/acceptance/src/helpers/groupSSO.mjs
index 1953b3e787..4388279578 100644
--- a/services/web/test/acceptance/src/helpers/groupSSO.mjs
+++ b/services/web/test/acceptance/src/helpers/groupSSO.mjs
@@ -187,6 +187,29 @@ export async function linkGroupMember(
   return userHelper
 }
 
+export async function checkUserHasSSOLinked(userId, groupId) {
+  const internalProviderId = getProviderId(groupId)
+  const user = await UserGetter.promises.getUser(
+    { _id: userId },
+    { samlIdentifiers: 1, enrollment: 1 }
+  )
+
+  const { enrollment, samlIdentifiers } = user
+  const linkedToGroupSSO = samlIdentifiers.some(
+    identifier => identifier.providerId === internalProviderId
+  )
+  if (!linkedToGroupSSO) {
+    throw new Error('user saml identifiers are not linked to subscription')
+  }
+
+  const userIsEnrolledInSSO = enrollment.sso.some(
+    sso => sso.groupId.toString() === groupId.toString()
+  )
+  if (!userIsEnrolledInSSO) {
+    throw new Error('user is not enrolled in subscription')
+  }
+}
+
 export async function setConfigAndEnableSSO(
   subscriptionHelper,
   adminEmailPassword,

From 5351488f0ef52d5ae53e967416d6a1bba1865636 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Fri, 11 Jul 2025 09:15:00 +0200
Subject: [PATCH 204/274] [web] Feature disablement status on user's admin
 panel (#26924)

* [web] Feature disablement status on user's admin panel

Adds a visual hint on the end user's admin panel when
dropbox/chat/ai features are disabled

GitOrigin-RevId: ded7a80120821ff606cc2c3b61bc2d82615c6026
---
 services/web/frontend/js/utils/meta.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 0d4fdaad48..748ae74789 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -85,7 +85,7 @@ export interface Meta {
   'ol-cannot-link-other-third-party-sso': boolean
   'ol-cannot-reactivate-subscription': boolean
   'ol-cannot-use-ai': boolean
-  'ol-capabilities': Array<'dropbox' | 'chat'>
+  'ol-capabilities': Array<'dropbox' | 'chat' | 'use-ai'>
   'ol-compileSettings': {
     reducedTimeoutWarning: string
     compileTimeout: number

From 72aca352fcedbcff53c0ca9138235736974b84e3 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Fri, 11 Jul 2025 09:15:15 +0200
Subject: [PATCH 205/274] [web] Group audit log for Feature disablement
 (#26930)

Adds a `update-group-policy` group audit log including the policies that are toggled.

GitOrigin-RevId: a582d612d20c8547995228e6b92b730373a89b63
---
 services/web/test/acceptance/src/helpers/Subscription.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/web/test/acceptance/src/helpers/Subscription.mjs b/services/web/test/acceptance/src/helpers/Subscription.mjs
index 6b6f87e4d6..1ce0e87afd 100644
--- a/services/web/test/acceptance/src/helpers/Subscription.mjs
+++ b/services/web/test/acceptance/src/helpers/Subscription.mjs
@@ -85,7 +85,10 @@ class PromisifiedSubscription {
   }
 
   async enableManagedUsers() {
-    await Modules.promises.hooks.fire('enableManagedUsers', this._id)
+    await Modules.promises.hooks.fire('enableManagedUsers', this._id, {
+      initiatorId: this.admin_id,
+      ipAddress: '123.456.789.0',
+    })
   }
 
   async disableManagedUsers() {

From 39b4581e1dce46d3006122708836ae23eee52276 Mon Sep 17 00:00:00 2001
From: Mathias Jakobsen <mathias.jakobsen@overleaf.com>
Date: Fri, 11 Jul 2025 10:07:25 +0100
Subject: [PATCH 206/274] Merge pull request #26735 from
 overleaf/mj-system-theme

[web] Add new system theme to the editor

GitOrigin-RevId: b65083c5e96abc493556e901c861689cb7e3bbf7
---
 .../app/src/infrastructure/ExpressLocals.js   |  8 +++
 .../hooks/use-set-overall-theme.tsx           | 10 ++--
 .../pdf-preview/components/visual-preview.tsx |  2 +-
 .../source-editor/extensions/theme.ts         | 16 +++---
 .../hooks/use-codemirror-scope.ts             | 11 ++--
 .../shared/hooks/use-active-overall-theme.tsx | 54 +++++++++++++++++++
 .../web/frontend/js/shared/utils/styles.ts    |  2 +-
 .../js/components/full-project-search-ui.tsx  |  4 +-
 8 files changed, 85 insertions(+), 22 deletions(-)
 create mode 100644 services/web/frontend/js/shared/hooks/use-active-overall-theme.tsx

diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index 51c2c2186b..b4d62e1c12 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -201,6 +201,9 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
         if (res.locals.isIEEE(brandVariation?.brand_id)) {
           return enableIeeeBranding ? 'ieee-' : ''
         } else if (userSettings && userSettings.overallTheme != null) {
+          if (!['', 'light-'].includes(userSettings.overallTheme)) {
+            return ''
+          }
           return userSettings.overallTheme
         }
       }
@@ -350,6 +353,11 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
           val: 'light-',
           path: res.locals.buildCssPath('light-'),
         },
+        {
+          name: 'System',
+          val: 'system',
+          path: res.locals.buildCssPath(),
+        },
       ]
     }
     next()
diff --git a/services/web/frontend/js/features/editor-left-menu/hooks/use-set-overall-theme.tsx b/services/web/frontend/js/features/editor-left-menu/hooks/use-set-overall-theme.tsx
index 6701c78d1f..a026da61e5 100644
--- a/services/web/frontend/js/features/editor-left-menu/hooks/use-set-overall-theme.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/hooks/use-set-overall-theme.tsx
@@ -4,7 +4,7 @@ import { saveUserSettings } from '../utils/api'
 import { UserSettings } from '../../../../../types/user-settings'
 import { useUserSettingsContext } from '@/shared/context/user-settings-context'
 import getMeta from '@/utils/meta'
-import { isIEEEBranded } from '@/utils/is-ieee-branded'
+import { useActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 
 export default function useSetOverallTheme() {
   const { userSettings, setUserSettings } = useUserSettingsContext()
@@ -16,13 +16,13 @@ export default function useSetOverallTheme() {
     },
     [setUserSettings]
   )
+  const activeOverallTheme = useActiveOverallTheme()
 
   useEffect(() => {
     // Sets the body's data-theme attribute for theming
-    const theme =
-      overallTheme === 'light-' && !isIEEEBranded() ? 'light' : 'default'
-    document.body.dataset.theme = theme
-  }, [overallTheme])
+    document.body.dataset.theme =
+      activeOverallTheme === 'dark' ? 'default' : 'light'
+  }, [activeOverallTheme])
 
   return useCallback(
     (newOverallTheme: UserSettings['overallTheme']) => {
diff --git a/services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx b/services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx
index b166ca4563..074d26501a 100644
--- a/services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/visual-preview.tsx
@@ -69,7 +69,7 @@ export const VisualPreview: FC<{ view: EditorView }> = ({ view }) => {
           fontSize: 14,
           fontFamily: 'monaco',
           lineHeight: 'normal',
-          overallTheme: 'light-',
+          activeOverallTheme: 'light',
         }),
         EditorView.theme({
           '&.cm-editor': {
diff --git a/services/web/frontend/js/features/source-editor/extensions/theme.ts b/services/web/frontend/js/features/source-editor/extensions/theme.ts
index 2fd6a77533..3b3ac4afdf 100644
--- a/services/web/frontend/js/features/source-editor/extensions/theme.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/theme.ts
@@ -3,12 +3,8 @@ import { Annotation, Compartment, TransactionSpec } from '@codemirror/state'
 import { syntaxHighlighting } from '@codemirror/language'
 import { classHighlighter } from './class-highlighter'
 import classNames from 'classnames'
-import {
-  FontFamily,
-  LineHeight,
-  OverallTheme,
-  userStyles,
-} from '@/shared/utils/styles'
+import { FontFamily, LineHeight, userStyles } from '@/shared/utils/styles'
+import { ActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 
 const optionsThemeConf = new Compartment()
 const selectedThemeConf = new Compartment()
@@ -18,7 +14,7 @@ type Options = {
   fontSize: number
   fontFamily: FontFamily
   lineHeight: LineHeight
-  overallTheme: OverallTheme
+  activeOverallTheme: ActiveOverallTheme
 }
 
 export const theme = (options: Options) => [
@@ -58,7 +54,7 @@ const createThemeFromOptions = ({
   fontSize = 12,
   fontFamily = 'monaco',
   lineHeight = 'normal',
-  overallTheme = '',
+  activeOverallTheme = 'dark',
 }: Options) => {
   // Theme styles that depend on settings.
   const styles = userStyles({ fontSize, fontFamily, lineHeight })
@@ -66,7 +62,9 @@ const createThemeFromOptions = ({
   return [
     EditorView.editorAttributes.of({
       class: classNames(
-        overallTheme === '' ? 'overall-theme-dark' : 'overall-theme-light'
+        activeOverallTheme === 'dark'
+          ? 'overall-theme-dark'
+          : 'overall-theme-light'
       ),
       style: Object.entries({
         '--font-size': styles.fontSize,
diff --git a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
index 8e46bdd7c5..fb29613f7f 100644
--- a/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
+++ b/services/web/frontend/js/features/source-editor/hooks/use-codemirror-scope.ts
@@ -59,6 +59,7 @@ import { usePermissionsContext } from '@/features/ide-react/context/permissions-
 import { useEditorPropertiesContext } from '@/features/ide-react/context/editor-properties-context'
 import { SearchQuery } from '@codemirror/search'
 import { beforeChangeDocEffect } from '@/features/source-editor/extensions/before-change-doc'
+import { useActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 
 function useCodeMirrorScope(view: EditorView) {
   const { fileTreeData } = useFileTreeData()
@@ -79,7 +80,6 @@ function useCodeMirrorScope(view: EditorView) {
     fontFamily,
     fontSize,
     lineHeight,
-    overallTheme,
     autoComplete,
     editorTheme,
     autoPairDelimiters,
@@ -89,6 +89,7 @@ function useCodeMirrorScope(view: EditorView) {
     referencesSearchMode,
     enableNewEditor,
   } = userSettings
+  const activeOverallTheme = useActiveOverallTheme()
 
   const { onlineUserCursorHighlights } = useOnlineUsersContext()
 
@@ -119,7 +120,7 @@ function useCodeMirrorScope(view: EditorView) {
     fontFamily,
     fontSize,
     lineHeight,
-    overallTheme,
+    activeOverallTheme,
     editorTheme,
   })
 
@@ -128,7 +129,7 @@ function useCodeMirrorScope(view: EditorView) {
       fontFamily,
       fontSize,
       lineHeight,
-      overallTheme,
+      activeOverallTheme,
       editorTheme,
     }
 
@@ -137,14 +138,14 @@ function useCodeMirrorScope(view: EditorView) {
         fontFamily,
         fontSize,
         lineHeight,
-        overallTheme,
+        activeOverallTheme,
       })
     )
 
     setEditorTheme(editorTheme).then(spec => {
       view.dispatch(spec)
     })
-  }, [view, fontFamily, fontSize, lineHeight, overallTheme, editorTheme])
+  }, [view, fontFamily, fontSize, lineHeight, activeOverallTheme, editorTheme])
 
   const settingsRef = useRef({
     autoComplete,
diff --git a/services/web/frontend/js/shared/hooks/use-active-overall-theme.tsx b/services/web/frontend/js/shared/hooks/use-active-overall-theme.tsx
new file mode 100644
index 0000000000..388c78cf38
--- /dev/null
+++ b/services/web/frontend/js/shared/hooks/use-active-overall-theme.tsx
@@ -0,0 +1,54 @@
+import { useUserSettingsContext } from '@/shared/context/user-settings-context'
+import { OverallTheme } from '@/shared/utils/styles'
+import { isIEEEBranded } from '@/utils/is-ieee-branded'
+import { useEffect, useMemo, useState } from 'react'
+
+export type ActiveOverallTheme = 'dark' | 'light'
+
+const mediaWatcher = window.matchMedia?.('(prefers-color-scheme: dark)') ?? {
+  // If matchMedia is not supported, use the default (dark) theme
+  matches: true,
+  addEventListener: () => {},
+  removeEventListener: () => {},
+}
+
+function getTheme(
+  overallTheme: OverallTheme,
+  prefersDark: boolean
+): ActiveOverallTheme {
+  if (isIEEEBranded()) {
+    return 'dark'
+  }
+  if (overallTheme === 'light-') {
+    return 'light'
+  }
+  if (overallTheme === 'system') {
+    return prefersDark ? 'dark' : 'light'
+  }
+  return 'dark'
+}
+
+export const useActiveOverallTheme = (): ActiveOverallTheme => {
+  const [browserPrefersDarkMode, setBrowserPrefersDarkMode] = useState(
+    mediaWatcher.matches
+  )
+  const {
+    userSettings: { overallTheme },
+  } = useUserSettingsContext()
+
+  const activeOverallTheme = useMemo<ActiveOverallTheme>(() => {
+    return getTheme(overallTheme, browserPrefersDarkMode)
+  }, [overallTheme, browserPrefersDarkMode])
+
+  useEffect(() => {
+    const listener = (e: MediaQueryListEvent) => {
+      setBrowserPrefersDarkMode(e.matches)
+    }
+    mediaWatcher.addEventListener('change', listener)
+    return () => {
+      mediaWatcher.removeEventListener('change', listener)
+    }
+  }, [])
+
+  return activeOverallTheme
+}
diff --git a/services/web/frontend/js/shared/utils/styles.ts b/services/web/frontend/js/shared/utils/styles.ts
index 2b30b3ed7c..c03f3052f7 100644
--- a/services/web/frontend/js/shared/utils/styles.ts
+++ b/services/web/frontend/js/shared/utils/styles.ts
@@ -1,4 +1,4 @@
-export type OverallTheme = '' | 'light-'
+export type OverallTheme = '' | 'light-' | 'system'
 
 export const fontFamilies = {
   monaco: ['Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'monospace'],
diff --git a/services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx b/services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx
index db42a927a4..69acc9e38c 100644
--- a/services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx
+++ b/services/web/modules/full-project-search/frontend/js/components/full-project-search-ui.tsx
@@ -37,6 +37,7 @@ import { FullProjectSearchResults } from './full-project-search-results'
 import { signalWithTimeout } from '@/utils/abort-signal'
 import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
 import RailPanelHeader from '@/features/ide-redesign/components/rail-panel-header'
+import { useActiveOverallTheme } from '@/shared/hooks/use-active-overall-theme'
 
 const FullProjectSearchUI: FC = () => {
   const { t } = useTranslation()
@@ -57,6 +58,7 @@ const FullProjectSearchUI: FC = () => {
     () => userStyles(userSettings),
     [userSettings]
   )
+  const activeOverallTheme = useActiveOverallTheme()
 
   const abortControllerRef = useRef<AbortController | null>(null)
 
@@ -183,7 +185,7 @@ const FullProjectSearchUI: FC = () => {
     <div
       className="full-project-search"
       style={variableStyle}
-      data-bs-theme={userSettings.overallTheme === 'light-' ? 'light' : 'dark'}
+      data-bs-theme={activeOverallTheme === 'light' ? 'light' : 'dark'}
     >
       {newEditor ? (
         <RailPanelHeader title={t('search')} />

From 35f5588be40f5a7920b56af9c293802e1eece6ff Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Fri, 11 Jul 2025 11:58:10 +0200
Subject: [PATCH 207/274] Tear down cms-pages-bs5 feature flag - BS3 CMS pages
 (#27032)

* Remove cms-pages-bs5 assignments

* Remove BS3 version of CMS pages

* Remove website-redesign.less

* Remove default variant and update path

* Use async await

GitOrigin-RevId: a7728de85d971cd1cc66f340a5bc6f6e45c16101
---
 .../stylesheets/app/website-redesign.less     | 1188 -----------------
 .../web/frontend/stylesheets/main-style.less  |    1 -
 2 files changed, 1189 deletions(-)
 delete mode 100644 services/web/frontend/stylesheets/app/website-redesign.less

diff --git a/services/web/frontend/stylesheets/app/website-redesign.less b/services/web/frontend/stylesheets/app/website-redesign.less
deleted file mode 100644
index c66e801f4c..0000000000
--- a/services/web/frontend/stylesheets/app/website-redesign.less
+++ /dev/null
@@ -1,1188 +0,0 @@
-@cta-card-bg-color: var(--dark-jungle-green);
-
-.website-redesign-overflow-unset {
-  overflow: unset !important;
-}
-
-.website-redesign {
-  // hero section of features, enterprises, and universities will have an image that will overflow the page
-  overflow-x: hidden;
-
-  p,
-  div,
-  h1,
-  h2,
-  h3,
-  h4,
-  a,
-  strong {
-    font-family: 'Noto Sans', sans-serif;
-  }
-
-  h1 {
-    font-weight: 600;
-    .heading-2xl();
-
-    @media (max-width: @screen-sm-max) {
-      .heading-xl();
-    }
-  }
-
-  h2 {
-    font-weight: 600;
-    margin-top: 0;
-    .heading-xl();
-
-    @media (max-width: @screen-sm-max) {
-      .heading-lg();
-    }
-  }
-
-  h3 {
-    font-weight: 600;
-  }
-
-  h1,
-  h2,
-  h3 {
-    > span.eyebrow-text {
-      display: block;
-      margin-bottom: @margin-xs;
-    }
-  }
-
-  .eyebrow-text {
-    .mono-text;
-  }
-
-  // override .btn default style
-  .btn {
-    font-weight: 600;
-  }
-
-  .img-rounded {
-    // TODO: design specifies 'border-radius-large' which is 5px, but uses 16px
-    border-radius: 16px;
-  }
-
-  .plans-cards {
-    @media (min-width: @screen-md-min) {
-      display: flex; /* equal heights */
-      flex-wrap: wrap;
-    }
-
-    .plans-card-container {
-      min-height: 348px;
-
-      @media (max-width: @screen-sm-max) {
-        margin-bottom: 16px;
-        min-height: unset;
-      }
-    }
-
-    .plans-card {
-      border-radius: 8px;
-      padding: 0;
-      height: 100%;
-
-      .plans-card-inner {
-        padding: 36px;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        font-size: 16px;
-
-        .plans-card-inner-title {
-          font-size: 20px;
-          font-weight: 600;
-          margin-top: 0;
-        }
-
-        ul {
-          list-style-type: none;
-          padding: 0;
-          margin: 0;
-
-          li {
-            margin-bottom: 8px;
-          }
-        }
-
-        .plans-card-inner-footer {
-          margin-top: auto;
-          display: flex;
-          flex-direction: column;
-          gap: 12px;
-
-          @media (max-width: @screen-sm-max) {
-            margin-top: 16px;
-          }
-        }
-      }
-
-      &.grey-border {
-        border: 2px solid var(--neutral-20);
-      }
-
-      &.blue-border {
-        border: solid 2px var(--sapphire-blue);
-        border-radius: 8px;
-
-        .plans-card-inner-title {
-          color: var(--sapphire-blue);
-        }
-      }
-    }
-  }
-
-  .plans-bottom-text {
-    font-size: 1.125rem;
-  }
-
-  .info-cards {
-    @media (min-width: @screen-md-min) {
-      display: flex; /* equal heights */
-      flex-wrap: wrap;
-    }
-
-    .info-card-container {
-      margin-bottom: 16px;
-
-      .info-card {
-        border-radius: 8px;
-        height: 100%;
-        box-shadow:
-          0px 2px 4px 0px #1e253014,
-          0px 4px 12px 0px #1e25301f;
-        border-top: 8px solid var(--sapphire-blue);
-        padding: 32px 40px 32px 40px;
-
-        &.info-card-big-text {
-          h3 {
-            font-size: 1.5rem;
-            line-height: 1.333;
-          }
-
-          p {
-            font-size: 1.125rem;
-            line-height: 1.333;
-          }
-        }
-
-        .material-symbols {
-          color: var(--sapphire-blue);
-        }
-      }
-    }
-  }
-
-  .security-heading-section {
-    @media (max-width: @screen-sm-max) {
-      p {
-        text-align: left;
-      }
-
-      h2 {
-        width: 100%;
-        text-align: left;
-      }
-    }
-
-    .heading-and-stickers-container {
-      display: flex;
-      justify-content: center;
-
-      .lock-sticker {
-        width: 70px;
-        position: absolute;
-        top: -95px;
-        right: -50px;
-
-        @media (max-width: @screen-lg) {
-          right: -105px;
-        }
-
-        @media (max-width: @screen-sm-max) {
-          display: none;
-        }
-      }
-
-      .arrow-sticker {
-        width: 140px;
-        position: absolute;
-        top: -50px;
-        right: -15px;
-
-        @media (max-width: @screen-lg) {
-          right: -70px;
-        }
-        @media (max-width: @screen-sm-max) {
-          display: none;
-        }
-      }
-    }
-  }
-
-  .customer-story-card-title {
-    margin-top: 25px;
-    margin-bottom: 12.5px;
-    font-size: 1.5rem;
-    font-weight: 600;
-
-    a {
-      display: flex;
-      justify-content: space-between;
-      color: var(--neutral-90);
-      i {
-        font-size: 1.5rem;
-      }
-    }
-  }
-
-  .customer-story-content {
-    .table-of-contents-section {
-      padding-right: 64px;
-      @media (max-width: @screen-sm-max) {
-        display: none;
-      }
-
-      .table-of-contents {
-        border-top: 1px solid var(--neutral-30);
-        border-bottom: 1px solid var(--neutral-30);
-        padding: 32px 0;
-
-        .heading {
-          font-size: 1.125rem;
-          font-weight: 600;
-          line-height: 1.333;
-          color: var(--green-60);
-        }
-        li {
-          list-style: none;
-          padding-top: 16px;
-          font-weight: 500;
-          a {
-            text-decoration: none;
-            color: var(--neutral-70);
-          }
-        }
-      }
-    }
-
-    .story-details-section {
-      h3 {
-        font-size: 1.875rem;
-        line-height: 1.333;
-        margin-top: 0;
-      }
-
-      .at-glance-section {
-        padding-top: 24px;
-        p {
-          margin-top: 16px;
-        }
-      }
-
-      p {
-        font-size: 1.125rem;
-      }
-
-      .border-r-16 {
-        border-radius: 16px;
-      }
-
-      .introduction-image-caption {
-        padding-top: 16px;
-      }
-
-      .stats-card {
-        display: flex;
-        flex-direction: row;
-        padding: 32px;
-        border-radius: 16px;
-        background: var(--dark-jungle-green);
-        color: var(--white);
-        @media (max-width: @screen-sm-max) {
-          flex-direction: column;
-        }
-
-        .stats {
-          h3 {
-            font-size: 2rem;
-            font-weight: 600;
-          }
-
-          p {
-            font-weight: 600;
-            height: 50px;
-          }
-        }
-      }
-    }
-
-    .customer-quote {
-      border-left: 2px solid var(--green-60);
-      padding-left: 16px;
-
-      blockquote {
-        color: var(--neutral-90);
-        font-size: 1.6rem;
-        line-height: 1.333;
-      }
-
-      p {
-        margin-top: 1rem;
-        font-size: 1.125rem;
-      }
-    }
-  }
-
-  .features-card {
-    display: flex; /* equal heights */
-    flex-wrap: wrap;
-    align-items: center;
-
-    .features-card-media,
-    .features-card-media-right {
-      padding-top: 24px;
-
-      img.img-responsive {
-        width: 100%;
-      }
-
-      video {
-        box-shadow:
-          0px 4px 6px 0px rgba(30, 37, 48, 0.12),
-          0px 8px 16px 0px rgba(30, 37, 48, 0.12);
-        max-height: 100%;
-        width: auto;
-        width: 100%;
-      }
-
-      @media (max-width: @screen-sm-max) {
-        margin-bottom: 50px;
-      }
-    }
-
-    @media (min-width: @screen-md-min) {
-      .features-card-media-right {
-        padding-left: 64px;
-      }
-
-      .features-card-media {
-        padding-right: 64px;
-      }
-    }
-
-    .features-card-description,
-    .features-card-description-list {
-      padding-top: 16px;
-
-      p {
-        margin-bottom: 16px;
-        font-size: 1.125rem;
-        line-height: 1.333;
-
-        @media (max-width: @screen-sm-max) {
-          font-size: 1rem;
-          line-height: 1.375;
-        }
-      }
-
-      a.green-link {
-        margin-top: 4px;
-        display: block;
-      }
-    }
-
-    .features-card-description {
-      h3 {
-        font-size: 1.5rem;
-        line-height: 1.4;
-        margin-bottom: 8px;
-      }
-    }
-
-    .features-card-description-list {
-      h3 {
-        font-size: 1.875rem;
-        line-height: 1.5;
-      }
-
-      ul.list-simple-text,
-      ul.list-heading-text {
-        list-style-type: none;
-        padding: 0;
-        margin: 0;
-
-        li {
-          margin-bottom: 12px;
-          font-size: 1.125rem;
-          line-height: 1.333;
-          display: flex;
-
-          .label-premium {
-            margin-left: 0;
-            font-family: 'Noto Sans', sans-serif;
-          }
-
-          @media (max-width: @screen-sm-max) {
-            font-size: 1rem;
-            line-height: 1.375;
-          }
-        }
-      }
-
-      ul.list-heading-text {
-        li {
-          h4 {
-            margin-top: 0;
-            margin-bottom: 8px;
-            font-size: 20px;
-            font-weight: 600;
-          }
-        }
-      }
-    }
-  }
-
-  .features-card-hero {
-    display: flex; /* equal heights */
-    flex-wrap: wrap;
-    align-items: center;
-    position: relative;
-    height: 655px;
-    padding-top: @line-height-computed * 2;
-
-    @media (max-width: @screen-sm-max) {
-      height: unset;
-      padding-top: 0;
-    }
-
-    .features-card-description {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-
-      h1 {
-        &.features-card-hero-smaller-title {
-          @media (min-width: @screen-lg-min) {
-            // 3rem is the default, this is a workaround for big screen
-            // since 6-width column on md screen size will wrap the text in three lines
-            font-size: 2.8rem;
-          }
-        }
-      }
-
-      p {
-        font-size: 1.25rem;
-        width: 90%;
-
-        @media (max-width: @screen-sm-max) {
-          font-size: 1.125rem;
-          line-height: 1.33;
-          width: unset;
-        }
-      }
-    }
-
-    .features-card-image {
-      position: absolute;
-      // on wide screen, image will be fixed without any variable width translation
-      transform: translateX(600px);
-      top: 100px;
-      width: 720px;
-      height: auto;
-      padding: 0px 15px;
-
-      // starting from 1500px, image will have a variable translation that depends on screen width
-      // this will make image "fixed" on a specific point on the screen
-      @media (max-width: 1500px) {
-        transform: translateX(calc(50vw - 121px));
-      }
-
-      @media (max-width: 1400px) {
-        width: 650px;
-        transform: translateX(calc(50vw - 52px));
-      }
-
-      // bootstrap layout changes on 1200px (@screen-lg), add a specific
-      // case for this exact width
-      @media (min-width: 1200px) and (max-width: 1200px) {
-        width: 600px;
-        transform: translateX(calc(50vw));
-      }
-
-      @media (max-width: 1199px) {
-        width: 600px;
-        transform: translateX(calc(50vw - 106px));
-      }
-
-      @media (max-width: 1100px) {
-        width: 550px;
-        transform: translateX(calc(50vw - 55px));
-      }
-
-      // 991px
-      @media (max-width: @screen-sm-max) {
-        position: relative;
-        transform: none;
-        top: 0;
-        width: 100%;
-        margin-bottom: 50px;
-      }
-
-      img.img-responsive {
-        width: 100%;
-      }
-    }
-
-    .sticky-tags {
-      position: absolute;
-      z-index: 2;
-      height: 160px;
-      bottom: -105px;
-      right: 55px;
-
-      @media (max-width: 1400px) {
-        height: 150px;
-        bottom: -103px;
-        right: 47px;
-      }
-
-      @media (max-width: 1200px) {
-        height: 130px;
-        bottom: -87px;
-      }
-
-      @media (max-width: 1100px) {
-        height: 120px;
-        bottom: -81px;
-      }
-
-      // 991px
-      @media (max-width: @screen-sm-max) {
-        height: 130px;
-        bottom: -75px;
-        right: 70px;
-      }
-
-      // 767px
-      @media (max-width: @screen-xs-max) {
-        height: 24%;
-        bottom: -10vw; // scale with width
-        right: 9.5vw; // scale with width
-      }
-    }
-  }
-
-  .organization-logos-container {
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-
-    @media (max-width: @screen-md-max) {
-      flex-wrap: wrap;
-      gap: 30px;
-    }
-
-    .organization-logo {
-      object-fit: contain;
-      max-height: 62px;
-
-      &.samsung-logo {
-        max-height: 110px;
-        height: 110px;
-      }
-
-      @media (max-width: @screen-md-max) {
-        max-height: 40px;
-        flex-basis: 34%;
-      }
-    }
-  }
-
-  .template-cards {
-    .template-card {
-      > img.img-responsive {
-        width: 100%;
-        border-radius: 8px;
-      }
-
-      .template-card-title {
-        font-size: 24px;
-        margin-top: 16px;
-        margin-bottom: 8px;
-
-        a {
-          width: 100%;
-          font-weight: 600;
-          color: var(--neutral-90);
-          display: inline-flex;
-          justify-content: space-between;
-          text-decoration: none;
-
-          &:hover {
-            text-decoration: underline;
-          }
-        }
-
-        .material-symbols {
-          vertical-align: middle;
-          text-decoration: none;
-        }
-      }
-
-      .template-card-text {
-        font-size: 16px;
-      }
-
-      &:not(:last-of-type) {
-        @media (max-width: @screen-sm-max) {
-          margin-bottom: 40px;
-        }
-      }
-    }
-  }
-
-  .lime-color-text {
-    color: var(--malachite);
-  }
-
-  .cta-card-individual-customer {
-    display: flex;
-    justify-content: space-between;
-    padding: 64px;
-    background-image:
-      linear-gradient(
-        to right,
-        rgba(0, 0, 0, 0.4) 0%,
-        @cta-card-bg-color 20%,
-        @cta-card-bg-color 100%
-      ),
-      url('../../../public/img/website-redesign/overleaf-pattern-purple.png');
-    background-size: cover;
-    color: var(--white);
-    border-radius: 8px;
-
-    @media (max-width: @screen-sm-max) {
-      padding: 48px 24px;
-    }
-
-    h2 {
-      font-size: 1.875rem;
-      color: var(--white);
-    }
-    p {
-      font-size: 1.125rem;
-    }
-
-    .btn-container {
-      padding-top: 10px;
-      display: flex;
-      justify-content: center;
-      align-items: flex-start;
-    }
-  }
-
-  .paragraph-line-height {
-    line-height: 1.333; // 24px
-  }
-
-  .cta-card {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 64px;
-    color: var(--white);
-    background-image:
-      linear-gradient(
-        to right,
-        rgba(0, 0, 0, 0.4) 0%,
-        @cta-card-bg-color 25%,
-        @cta-card-bg-color 75%,
-        rgba(0, 0, 0, 0.4) 100%
-      ),
-      url('../../../public/img/website-redesign/overleaf-pattern-purple.png');
-    background-size: cover;
-    border-radius: 8px;
-
-    @media (max-width: @screen-sm-max) {
-      padding: 48px 24px;
-    }
-
-    .cta-card-title {
-      font-size: 3.25rem; // 52px
-      margin-bottom: 8px;
-      line-height: 1.3;
-
-      &.title-mono {
-        > span {
-          // override Noto Sans
-          .dm-mono;
-        }
-      }
-
-      span.purple-color {
-        color: #939aff;
-        font-weight: 400;
-      }
-
-      span.lime-color {
-        font-weight: 500;
-        color: var(--malachite);
-      }
-
-      @media (max-width: @screen-sm-max) {
-        font-size: 2.25rem; // 36px
-      }
-    }
-
-    .cta-card-text {
-      font-size: 1.125rem;
-      line-height: 1.333;
-      margin: 8px 0;
-      text-align: center;
-    }
-
-    .cta-card-quote {
-      font-size: 1.875rem; // 30px
-      font-weight: 600;
-      line-height: 2.5rem; // 40px
-      letter-spacing: 0em;
-      text-align: center;
-    }
-  }
-
-  .quote-card {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 32px;
-    background: var(--dark-jungle-green);
-    color: white;
-    border-radius: 16px;
-    text-align: center;
-
-    blockquote {
-      font-size: 1.875rem; // 30px
-      font-weight: 600;
-      line-height: 1.26;
-
-      @media (max-width: @screen-sm-max) {
-        font-size: 1.5rem; // 24px
-        line-height: 1.333;
-      }
-    }
-
-    .quote-card-img {
-      margin-top: 32px;
-      margin-bottom: 16px;
-    }
-
-    .quote-card-link {
-      color: var(--green-30);
-    }
-
-    @media (max-width: @screen-sm-max) {
-      padding: 56px 24px 56px 24px;
-    }
-  }
-
-  .integrations-card {
-    display: flex; /* for center align */
-    flex-wrap: wrap;
-    align-items: center;
-
-    .integrations-icons {
-      img {
-        width: 6rem; // 96px
-        height: 6rem; // 96px
-      }
-
-      .first-row,
-      .second-row {
-        display: flex;
-      }
-
-      .first-row {
-        justify-content: space-between;
-      }
-
-      .second-row {
-        margin-top: 40px;
-        justify-content: space-evenly;
-      }
-    }
-  }
-
-  .text-with-bg {
-    .dm-mono;
-    padding: 0 @padding-sm;
-    border-radius: 10px;
-    margin-top: 5px;
-
-    // will make all spans content inline while avoiding overflowing the viewport in mobile
-    // https://developer.mozilla.org/en-US/docs/Web/CSS/display#flow-root
-    // https://css-tricks.com/display-flow-root/
-    display: inline flow-root;
-
-    &.tangerine-bg {
-      background-color: var(--vivid-tangerine);
-    }
-
-    &.purple-bg {
-      background-color: var(--ceil);
-    }
-
-    &.yellow-bg {
-      background-color: var(--caramel);
-    }
-
-    &.green-bg {
-      background-color: var(--green-30);
-    }
-  }
-
-  .security-info {
-    .security-info-first-row {
-      margin-bottom: 32px;
-      @media (max-width: @screen-sm-max) {
-        margin-bottom: 0;
-      }
-    }
-
-    .security-info-item {
-      @media (max-width: @screen-sm-max) {
-        margin-bottom: 16px;
-      }
-    }
-  }
-
-  .resources {
-    @media (min-width: @screen-md-min) {
-      display: flex; /* equal heights */
-      flex-wrap: wrap;
-    }
-    .resources-card {
-      display: flex;
-      flex-wrap: wrap;
-      flex-direction: column;
-      margin-bottom: 48px;
-      align-content: flex-start;
-
-      @media (max-width: @screen-sm-max) {
-        margin-bottom: 16px;
-      }
-
-      img {
-        width: 56px;
-      }
-
-      h3 {
-        width: 100%;
-      }
-
-      a {
-        margin-top: auto;
-      }
-    }
-  }
-
-  .centered-block {
-    @media (min-width: @screen-md-min) {
-      text-align: center;
-    }
-  }
-
-  .heading-section-md-align-left {
-    @media (max-width: @screen-md-min) {
-      display: flex;
-      flex-direction: column;
-      align-items: baseline;
-
-      h2 {
-        text-align: left;
-      }
-      p {
-        text-align: left;
-      }
-    }
-  }
-
-  .dm-mono {
-    font-family: 'DM Mono', monospace;
-    // We're using the "ss05" (stylistic set 5) version of the DM Mono, by setting the `font-feature-settings` rule
-    // https://developer.mozilla.org/en-US/docs/Web/CSS/font-feature-settings
-    // We use the ss05 specifically to remove the "squiggle" below the f letter.
-    // You can try removing the `font-feature-settings` rule and check what happens to the letter "f",
-    // as it's quite hard to describe it with sentences alone
-    font-feature-settings: 'ss05';
-  }
-
-  .mono-text {
-    .dm-mono;
-    color: var(--green-60);
-    font-size: 1.125rem;
-    font-weight: 500;
-    line-height: 1.5rem;
-    margin: 0;
-  }
-
-  .customer-stories-hero-heading {
-    @media (max-width: @screen-sm-max) {
-      font-size: 2.25rem;
-      line-height: 1.333;
-    }
-  }
-
-  .customer-stories-hero-text {
-    font-size: 1.25rem;
-  }
-
-  .customer-stories-logos-text {
-    font-size: 1.125rem;
-  }
-
-  .link-with-arrow {
-    .dm-mono;
-    font-size: var(--font-size-04);
-    line-height: var(--line-height-03);
-    font-weight: 500;
-    color: var(--green-50);
-
-    .material-symbols {
-      vertical-align: middle;
-      padding-bottom: 3px;
-      font-size: 24px;
-      line-height: inherit;
-      margin-left: var(--spacing-02);
-    }
-
-    &:hover {
-      color: var(--green-60);
-    }
-  }
-
-  .link-monospace {
-    .dm-mono;
-    font-weight: 500;
-    color: var(--green-50);
-    &:hover {
-      color: var(--green-60);
-    }
-  }
-
-  .green-link {
-    .link-with-arrow;
-    // TODO: replace .green-link uses with .link-with-arrow
-  }
-
-  .inline-green-link {
-    color: var(--green-50);
-    padding: 0;
-    text-decoration: underline;
-    // text-decoration-;skip-ink is for letter with descender (like 'g' and 'y')
-    // this will force underline to not skip the descender
-    text-decoration-skip-ink: none;
-
-    &:hover {
-      color: var(--green-60);
-    }
-
-    &:focus {
-      &:extend(.input-focus-style);
-    }
-  }
-
-  .btn-blue {
-    background: var(--sapphire-blue);
-    color: var(--white);
-
-    &:hover {
-      background: var(--sapphire-blue-dark);
-    }
-  }
-
-  .btn-primary {
-    &:not([disabled]) {
-      background: var(--green-50);
-      color: var(--white);
-
-      &:hover {
-        background: var(--green-60);
-      }
-    }
-  }
-
-  a {
-    &:focus,
-    &:focus-visible {
-      outline: 0;
-    }
-
-    &:focus-visible {
-      .box-shadow-button-input();
-    }
-
-    .material-symbols {
-      vertical-align: middle;
-      margin-left: var(--spacing-02);
-      padding-bottom: 3px;
-    }
-
-    &.link-lg {
-      font-size: var(--font-size-04);
-      line-height: var(--line-height-03);
-
-      i {
-        font-size: 24px;
-        line-height: inherit;
-      }
-    }
-  }
-
-  .round-background {
-    border-radius: 50%;
-    font-size: 1.5rem;
-    top: 4px;
-    vertical-align: middle;
-    margin-right: 8px;
-    width: 24px;
-    height: 24px;
-  }
-
-  .green-round-background {
-    .round-background;
-    background: var(--green-30);
-  }
-
-  .blue-round-background {
-    .round-background;
-    background: var(--blue-10);
-    color: var(--blue-40);
-  }
-
-  // most of these are here to replace rules from core/type.less
-  blockquote {
-    border-left: none;
-    font-size: 1.875rem;
-    line-height: 1.333;
-    font-weight: 600;
-    quotes: '\201C' '\201D'; // override default quotes
-    padding: unset;
-    margin: unset;
-    font-family: 'Noto Sans', sans-serif;
-
-    &::after {
-      visibility: visible;
-      display: inline;
-      margin-left: 1px; // it's too tight to the text otherwise
-    }
-
-    &::before {
-      color: inherit;
-      margin-right: 0;
-      vertical-align: 0;
-    }
-
-    &::after,
-    &::before {
-      font-size: 1.875rem;
-      line-height: 1.333;
-    }
-
-    @media (max-width: @screen-sm-max) {
-      font-size: 1.5rem;
-      line-height: 1.333;
-
-      &::after,
-      &::before {
-        visibility: visible;
-        font-size: 1.5rem;
-        line-height: 1.333;
-      }
-    }
-  }
-
-  .circle-img {
-    height: 64px;
-    max-width: 64px;
-  }
-
-  .responsive-button-container {
-    display: flex;
-    margin-top: 24px;
-    gap: 16px;
-
-    &.centered-buttons {
-      justify-content: center;
-    }
-
-    &.align-left-button-sm {
-      @media (max-width: @screen-sm-max) {
-        justify-content: start;
-      }
-    }
-
-    @media (max-width: @screen-xs-max) {
-      width: 100%;
-      flex-direction: column;
-    }
-  }
-
-  .label-premium {
-    height: 20px; // override default height
-  }
-
-  .label-premium-block-md {
-    @media (max-width: @screen-md-max) {
-      display: block;
-      width: fit-content;
-      margin: 10px 0px 0px 0px;
-    }
-  }
-
-  .header-description {
-    p {
-      font-size: 1.25rem;
-      line-height: 1.4;
-      margin-bottom: 0;
-
-      @media (max-width: @screen-sm-max) {
-        font-size: 1.125rem;
-        line-height: 1.33;
-      }
-    }
-  }
-
-  .editor-pdf-video {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 585px;
-    padding: 0px 15px;
-
-    @media (max-width: @screen-sm-max) {
-      height: auto;
-    }
-
-    video {
-      box-shadow: 0px 60px 25px -15px rgba(16, 24, 40, 0.2);
-      max-height: 100%;
-      width: auto;
-
-      @media (max-width: @screen-sm-max) {
-        width: 100%;
-      }
-    }
-  }
-
-  .overleaf-sticker {
-    float: right;
-
-    @media (max-width: @screen-sm-max) {
-      width: 74px; // 70% of 106px
-    }
-  }
-}
diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less
index d3a7d272d1..ac72ff6d0a 100644
--- a/services/web/frontend/stylesheets/main-style.less
+++ b/services/web/frontend/stylesheets/main-style.less
@@ -123,7 +123,6 @@
 @import 'app/templates-v2.less';
 @import 'app/login-register.less';
 @import 'app/import.less';
-@import 'app/website-redesign.less';
 @import 'app/add-secondary-email-prompt.less';
 @import 'app/confirm-email.less';
 

From e35f79bf32399939c9b95b55a0ca04e7eac978b5 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Fri, 11 Jul 2025 13:49:48 +0200
Subject: [PATCH 208/274] Tear down bs5-auth-pages feature flag (#27035)

* Remove auth-pages-bs5 test assignment setPassword

* Remove auth-pages-bs5 test assignment passwordReset

* Remove auth-pages-bs5 test assignment primaryEmailCheck

* Remove auth-pages-bs5 test assignment reconfirm

* Remove - bootstrap5PageStatus = 'enabled'

* Remove primary-email-check.less

* Fix spacing

* Remove unused translations

* Removed unused SplitTestHandler

* Update password_reset_sentence_case to password_reset

GitOrigin-RevId: d5a5c9a1576f325186aa103c4b7ad8fb819b790a
---
 .../PasswordReset/PasswordResetController.mjs |  29 +---
 .../src/Features/User/UserEmailsController.js |  13 +-
 .../src/Features/User/UserPagesController.mjs |  11 +-
 .../web/app/views/user/passwordReset-bs5.pug  |  81 ----------
 services/web/app/views/user/passwordReset.pug | 118 +++++++-------
 .../app/views/user/primaryEmailCheck-bs5.pug  |  42 -----
 .../web/app/views/user/primaryEmailCheck.pug  |  71 ++++-----
 services/web/app/views/user/reconfirm-bs5.pug |  73 ---------
 services/web/app/views/user/reconfirm.pug     | 101 ++++++------
 .../web/app/views/user/setPassword-bs5.pug    |  87 ----------
 services/web/app/views/user/setPassword.pug   | 150 +++++++++---------
 .../stylesheets/app/primary-email-check.less  |  39 -----
 .../web/frontend/stylesheets/main-style.less  |   1 -
 services/web/locales/en.json                  |   6 +-
 .../PasswordResetController.test.mjs          |  12 --
 .../src/User/UserEmailsControllerTests.js     |   5 -
 16 files changed, 218 insertions(+), 621 deletions(-)
 delete mode 100644 services/web/app/views/user/passwordReset-bs5.pug
 delete mode 100644 services/web/app/views/user/primaryEmailCheck-bs5.pug
 delete mode 100644 services/web/app/views/user/reconfirm-bs5.pug
 delete mode 100644 services/web/app/views/user/setPassword-bs5.pug
 delete mode 100644 services/web/frontend/stylesheets/app/primary-email-check.less

diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
index 771782c302..2963c56653 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
@@ -8,7 +8,6 @@ import UserSessionsManager from '../User/UserSessionsManager.js'
 import OError from '@overleaf/o-error'
 import EmailsHelper from '../Helpers/EmailHelper.js'
 import { expressify } from '@overleaf/promise-utils'
-import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 
 async function setNewUserPassword(req, res, next) {
   let user
@@ -149,12 +148,6 @@ async function requestReset(req, res, next) {
 }
 
 async function renderSetPasswordForm(req, res, next) {
-  const { variant } = await SplitTestHandler.promises.getAssignment(
-    req,
-    res,
-    'bs5-auth-pages'
-  )
-
   if (req.query.passwordResetToken != null) {
     try {
       const result =
@@ -167,10 +160,6 @@ async function renderSetPasswordForm(req, res, next) {
         return res.redirect('/user/password/reset?error=token_expired')
       }
       req.session.resetToken = req.query.passwordResetToken
-      if (variant === 'enabled') {
-        req.session.setPasswordBS5 = true
-      }
-
       let emailQuery = ''
 
       if (typeof req.query.email === 'string') {
@@ -199,13 +188,7 @@ async function renderSetPasswordForm(req, res, next) {
   const passwordResetToken = req.session.resetToken
   delete req.session.resetToken
 
-  const template = req.session.setPasswordBS5
-    ? 'user/setPassword-bs5'
-    : 'user/setPassword'
-
-  delete req.session.setPasswordBS5
-
-  res.render(template, {
+  res.render('user/setPassword', {
     title: 'set_password',
     email,
     passwordResetToken,
@@ -218,16 +201,8 @@ async function renderRequestResetForm(req, res) {
   if (errorQuery === 'token_expired') {
     error = 'password_reset_token_expired'
   }
-  const { variant } = await SplitTestHandler.promises.getAssignment(
-    req,
-    res,
-    'bs5-auth-pages'
-  )
 
-  const template =
-    variant === 'enabled' ? 'user/passwordReset-bs5' : 'user/passwordReset'
-
-  res.render(template, {
+  res.render('user/passwordReset', {
     title: 'reset_password',
     error,
   })
diff --git a/services/web/app/src/Features/User/UserEmailsController.js b/services/web/app/src/Features/User/UserEmailsController.js
index 8a7c2bbeb4..e4ad7423af 100644
--- a/services/web/app/src/Features/User/UserEmailsController.js
+++ b/services/web/app/src/Features/User/UserEmailsController.js
@@ -20,7 +20,6 @@ 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
 
@@ -527,18 +526,8 @@ async function primaryEmailCheckPage(req, res) {
     userId,
     'primary-email-check-page-displayed'
   )
-  const { variant } = await SplitTestHandler.promises.getAssignment(
-    req,
-    res,
-    'bs5-auth-pages'
-  )
 
-  const template =
-    variant === 'enabled'
-      ? 'user/primaryEmailCheck-bs5'
-      : 'user/primaryEmailCheck'
-
-  res.render(template)
+  res.render('user/primaryEmailCheck')
 }
 
 async function primaryEmailCheck(req, res) {
diff --git a/services/web/app/src/Features/User/UserPagesController.mjs b/services/web/app/src/Features/User/UserPagesController.mjs
index d353ca88e3..8b5263c37d 100644
--- a/services/web/app/src/Features/User/UserPagesController.mjs
+++ b/services/web/app/src/Features/User/UserPagesController.mjs
@@ -10,7 +10,6 @@ import SubscriptionLocator from '../Subscription/SubscriptionLocator.js'
 import _ from 'lodash'
 import { expressify } from '@overleaf/promise-utils'
 import Features from '../../infrastructure/Features.js'
-import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
 import Modules from '../../infrastructure/Modules.js'
 
 async function settingsPage(req, res) {
@@ -193,16 +192,8 @@ async function reconfirmAccountPage(req, res) {
   const pageData = {
     reconfirm_email: req.session.reconfirm_email,
   }
-  const { variant } = await SplitTestHandler.promises.getAssignment(
-    req,
-    res,
-    'bs5-auth-pages'
-  )
 
-  const template =
-    variant === 'enabled' ? 'user/reconfirm-bs5' : 'user/reconfirm'
-
-  res.render(template, pageData)
+  res.render('user/reconfirm', pageData)
 }
 
 const UserPagesController = {
diff --git a/services/web/app/views/user/passwordReset-bs5.pug b/services/web/app/views/user/passwordReset-bs5.pug
deleted file mode 100644
index f69553b849..0000000000
--- a/services/web/app/views/user/passwordReset-bs5.pug
+++ /dev/null
@@ -1,81 +0,0 @@
-extends ../layout-website-redesign
-include ../_mixins/recaptcha
-include ../_mixins/notification
-
-block vars
-	- var suppressNavbar = true
-	- var suppressFooter = true
-	- isWebsiteRedesign = true
-
-block content
-	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
-
-	if showCaptcha
-		script(
-			type='text/javascript'
-			nonce=scriptNonce
-			src='https://www.recaptcha.net/recaptcha/api.js?render=explicit'
-		)
-		div(
-			id='recaptcha'
-			class='g-recaptcha'
-			data-sitekey=settings.recaptcha.siteKey
-			data-size='invisible'
-			data-badge='inline'
-		)
-
-	main#main-content(data-ol-captcha-retry-trigger-area='')
-		a.auth-aux-logo(href='/')
-			img(src=buildImgPath('ol-brand/overleaf-o-dark.svg') alt=settings.appName)
-		.auth-aux-container
-			form(
-				name='passwordResetForm'
-				captcha-action-name=showCaptcha ? 'passwordReset' : false
-				data-ol-async-form
-				action='/user/password/reset'
-				method='POST'
-				captcha=showCaptcha ? '' : false
-			)
-				if error === 'password_reset_token_expired'
-					h1.h3.mb-3.mt-0 #{translate("sorry_your_token_expired")}
-					p #{translate('please_request_a_new_password_reset_email_and_follow_the_link')}.
-				else
-					h1.h3.mb-3.mt-0(data-ol-not-sent) #{translate("password_reset_sentence_case")}
-					h1.h3.mb-3.mt-0(hidden data-ol-sent) #{translate("check_your_email")} 
-					p.mb-3.pb-3(data-ol-not-sent) #{translate("enter_your_email_address_below_and_we_will_send_you_a_link_to_reset_your_password")}.
-
-				div(data-ol-not-sent)
-					+formMessagesNewStyle
-					if error && error !== 'password_reset_token_expired'
-						+notification({ariaLive: 'assertive', type: 'error', className: 'mb-3', content: translate(error)})
-
-					div(data-ol-custom-form-message='no-password-allowed-due-to-sso' hidden)
-						+notification({ariaLive: 'polite', type: 'error', className: 'mb-3', content: translate('you_cant_reset_password_due_to_sso', {}, [{name: 'a', attrs: {href: '/sso-login'}}])})
-					input(name='_csrf' type='hidden' value=csrfToken)
-					.form-group.mb-3
-						label.form-label(for='email') #{translate("email")}
-						input#email.form-control(
-							name='email'
-							aria-label='email'
-							type='email'
-							required
-							autocomplete='username'
-							autofocus
-						)
-					.actions
-						button.btn.btn-primary.w-100.mb-3(
-							type='submit'
-							data-ol-disabled-inflight
-							aria-label=translate('reset_password_sentence_case')
-						)
-							span(data-ol-inflight='idle')
-								| #{translate("reset_password_sentence_case")}
-							span(hidden data-ol-inflight='pending')
-								| #{translate("requesting_password_reset")}…
-						a.btn.btn-ghost.w-100.mb-3(href='/login') #{translate("back_to_log_in")}
-				div(hidden data-ol-sent)
-					p.mb-4 #{translate('password_reset_email_sent')}
-					a.btn.btn-primary.w-100.mb-3(href='/login') #{translate('back_to_log_in')}
-
-			if showCaptcha
-				+recaptchaConditions
diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug
index e3396a5cc0..f498baff23 100644
--- a/services/web/app/views/user/passwordReset.pug
+++ b/services/web/app/views/user/passwordReset.pug
@@ -1,9 +1,11 @@
-extends ../layout-marketing
+extends ../layout-website-redesign
 include ../_mixins/recaptcha
-include ../_mixins/material_symbol
+include ../_mixins/notification
 
 block vars
-	- bootstrap5PageStatus = 'disabled'
+	- var suppressNavbar = true
+	- var suppressFooter = true
+	- isWebsiteRedesign = true
 
 block content
 	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
@@ -22,68 +24,58 @@ block content
 			data-badge='inline'
 		)
 
-	main#main-content.content.content-alt(data-ol-captcha-retry-trigger-area='')
-		.container-custom-sm.mx-auto
-			.card
-				form(
-					name='passwordResetForm'
-					captcha-action-name=showCaptcha ? 'passwordReset' : false
-					data-ol-async-form
-					action='/user/password/reset'
-					method='POST'
-					captcha=showCaptcha ? '' : false
-				)
-					if error === 'password_reset_token_expired'
-						h3.mt-0.mb-2 #{translate("sorry_your_token_expired")}
-						p #{translate('please_request_a_new_password_reset_email_and_follow_the_link')}.
-					else
-						h3.mt-0.mb-2(data-ol-not-sent) #{translate("password_reset")}
-						h3.mt-0.mb-2(hidden data-ol-sent) #{translate("check_your_email")}
-						p(data-ol-not-sent) #{translate("enter_your_email_address_below_and_we_will_send_you_a_link_to_reset_your_password")}.
+	main#main-content(data-ol-captcha-retry-trigger-area='')
+		a.auth-aux-logo(href='/')
+			img(src=buildImgPath('ol-brand/overleaf-o-dark.svg') alt=settings.appName)
+		.auth-aux-container
+			form(
+				name='passwordResetForm'
+				captcha-action-name=showCaptcha ? 'passwordReset' : false
+				data-ol-async-form
+				action='/user/password/reset'
+				method='POST'
+				captcha=showCaptcha ? '' : false
+			)
+				if error === 'password_reset_token_expired'
+					h1.h3.mb-3.mt-0 #{translate("sorry_your_token_expired")}
+					p #{translate('please_request_a_new_password_reset_email_and_follow_the_link')}.
+				else
+					h1.h3.mb-3.mt-0(data-ol-not-sent) #{translate("password_reset")}
+					h1.h3.mb-3.mt-0(hidden data-ol-sent) #{translate("check_your_email")} 
+					p.mb-3.pb-3(data-ol-not-sent) #{translate("enter_your_email_address_below_and_we_will_send_you_a_link_to_reset_your_password")}.
 
-					div(data-ol-not-sent)
-						+formMessages
-						if error && error !== 'password_reset_token_expired'
-							.alert.alert-danger.mb-2(role='alert' aria-live='assertive')
-								| #{translate(error)}
+				div(data-ol-not-sent)
+					+formMessagesNewStyle
+					if error && error !== 'password_reset_token_expired'
+						+notification({ariaLive: 'assertive', type: 'error', className: 'mb-3', content: translate(error)})
 
-						div(data-ol-custom-form-message='no-password-allowed-due-to-sso' hidden)
-							.notification.notification-type-error(
-								aria-live='polite'
-								style='margin-bottom: 10px'
-							)
-								.notification-icon
-									+material-symbol-rounded('error')
-								.notification-content-and-cta
-									.notification-content
-										p
-											| !{translate("you_cant_reset_password_due_to_sso", {}, [{name: 'a', attrs: {href: '/sso-login'}}])}
-
-						input(name='_csrf' type='hidden' value=csrfToken)
-						.form-group.mb-3
-							label(for='email') #{translate("email")}
-							input#email.form-control(
-								name='email'
-								aria-label='email'
-								type='email'
-								placeholder=translate('enter_your_email_address')
-								required
-								autocomplete='username'
-								autofocus
-							)
-						.actions
-							button.btn.btn-primary.w-100(
-								type='submit'
-								data-ol-disabled-inflight
-								aria-label=translate('request_password_reset_to_reconfirm')
-							)
-								span(data-ol-inflight='idle')
-									| #{translate("request_password_reset")}
-								span(hidden data-ol-inflight='pending')
-									| #{translate("requesting_password_reset")}…
-					div(hidden data-ol-sent)
-						p.mb-4 #{translate('password_reset_email_sent')}
-						a(href='/login') #{translate('back_to_log_in')}
+					div(data-ol-custom-form-message='no-password-allowed-due-to-sso' hidden)
+						+notification({ariaLive: 'polite', type: 'error', className: 'mb-3', content: translate('you_cant_reset_password_due_to_sso', {}, [{name: 'a', attrs: {href: '/sso-login'}}])})
+					input(name='_csrf' type='hidden' value=csrfToken)
+					.form-group.mb-3
+						label.form-label(for='email') #{translate("email")}
+						input#email.form-control(
+							name='email'
+							aria-label='email'
+							type='email'
+							required
+							autocomplete='username'
+							autofocus
+						)
+					.actions
+						button.btn.btn-primary.w-100.mb-3(
+							type='submit'
+							data-ol-disabled-inflight
+							aria-label=translate('reset_password_sentence_case')
+						)
+							span(data-ol-inflight='idle')
+								| #{translate("reset_password_sentence_case")}
+							span(hidden data-ol-inflight='pending')
+								| #{translate("requesting_password_reset")}…
+						a.btn.btn-ghost.w-100.mb-3(href='/login') #{translate("back_to_log_in")}
+				div(hidden data-ol-sent)
+					p.mb-4 #{translate('password_reset_email_sent')}
+					a.btn.btn-primary.w-100.mb-3(href='/login') #{translate('back_to_log_in')}
 
 			if showCaptcha
 				+recaptchaConditions
diff --git a/services/web/app/views/user/primaryEmailCheck-bs5.pug b/services/web/app/views/user/primaryEmailCheck-bs5.pug
deleted file mode 100644
index f45f15d0ca..0000000000
--- a/services/web/app/views/user/primaryEmailCheck-bs5.pug
+++ /dev/null
@@ -1,42 +0,0 @@
-extends ../layout-website-redesign
-
-block vars
-	- bootstrap5PageStatus = 'enabled'
-	- isWebsiteRedesign = true
-
-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)
-					+formMessagesNewStyle
-
-					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/app/views/user/primaryEmailCheck.pug b/services/web/app/views/user/primaryEmailCheck.pug
index 8a0f1e6e94..cd3f0399a0 100644
--- a/services/web/app/views/user/primaryEmailCheck.pug
+++ b/services/web/app/views/user/primaryEmailCheck.pug
@@ -1,42 +1,41 @@
-extends ../layout-marketing
+extends ../layout-website-redesign
 
 block vars
-	- bootstrap5PageStatus = 'disabled'
+	- isWebsiteRedesign = true
 
 block content
-	main.content.content-alt#main-content
-		.login-register-container.primary-email-check-container
-			.card.primary-email-check-card
-				img.primary-email-check-logo(src=buildImgPath("ol-brand/overleaf.svg") alt=settings.appName)
-				h3.primary-email-check-header #{translate("keep_your_account_safe")}
-				.login-register-form.primary-email-check-form(data-ol-multi-submit)
-					p.small
-						| !{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()
+	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)
+					+formMessagesNewStyle
 
-						button.btn-primary.btn.btn-block.btn-primary-email-check-button.primary-email-confirm-button(
-							type='submit'
-							data-ol-disabled-inflight
-						)
-							span(data-ol-inflight="idle") #{translate("yes_that_is_correct")}
-							span(hidden data-ol-inflight="pending") #{translate("confirming")}…
+					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-secondary.btn.btn-block.btn-primary-email-check-button.primary-email-change-button(
-						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
-						|  #{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' }}])}
+				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/app/views/user/reconfirm-bs5.pug b/services/web/app/views/user/reconfirm-bs5.pug
deleted file mode 100644
index e8e640d10c..0000000000
--- a/services/web/app/views/user/reconfirm-bs5.pug
+++ /dev/null
@@ -1,73 +0,0 @@
-extends ../layout-website-redesign
-include ../_mixins/recaptcha
-
-block vars
-	- isWebsiteRedesign = true
-
-block content
-	- var email = reconfirm_email ? reconfirm_email : ''
-	- var showCaptcha = settings.recaptcha && settings.recaptcha.siteKey && !(settings.recaptcha.disabled && settings.recaptcha.disabled.passwordReset)
-
-	if showCaptcha
-		script(
-			type='text/javascript'
-			nonce=scriptNonce
-			src='https://www.recaptcha.net/recaptcha/api.js?render=explicit'
-		)
-		div(
-			id='recaptcha'
-			class='g-recaptcha'
-			data-sitekey=settings.recaptcha.siteKey
-			data-size='invisible'
-			data-badge='inline'
-		)
-
-	main#main-content(data-ol-captcha-retry-trigger-area='')
-		.container.auth-aux-container(style='max-width: 420px')
-			form(
-				name='reconfirmAccountForm'
-				captcha-action-name=showCaptcha ? 'passwordReset' : false
-				data-ol-async-form
-				action='/user/reconfirm'
-				method='POST'
-				aria-label=translate('request_reconfirmation_email')
-				captcha=showCaptcha ? '' : false
-			)
-				h1.h5.mb-3 #{translate("reconfirm_account")}
-				p #{translate('reconfirm_explained')}
-					|
-					a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
-					| .
-
-				div(data-ol-not-sent)
-					+formMessagesNewStyle
-
-					input(name='_csrf' type='hidden' value=csrfToken)
-					.form-group.mb-3
-						label.form-label(for='email') #{translate("please_enter_email")}
-						input.form-control(
-							name='email'
-							aria-label='email'
-							type='email'
-							placeholder='email@example.com'
-							required
-							autofocus
-							value=email
-						)
-					.actions
-						button.btn.btn-primary.w-100(
-							style='white-space: normal'
-							type='submit'
-							data-ol-disabled-inflight
-							aria-label=translate('request_password_reset_to_reconfirm')
-						)
-							span(data-ol-inflight='idle')
-								| #{translate('request_password_reset_to_reconfirm')}
-							span(hidden data-ol-inflight='pending')
-								| #{translate('request_password_reset_to_reconfirm')}… 
-				div(hidden data-ol-sent)
-					.alert.alert-success(role='alert' aria-live='polite')
-						span #{translate('password_reset_email_sent')}
-
-			if showCaptcha
-				+recaptchaConditions
diff --git a/services/web/app/views/user/reconfirm.pug b/services/web/app/views/user/reconfirm.pug
index 8cfe2ec218..876c28edaf 100644
--- a/services/web/app/views/user/reconfirm.pug
+++ b/services/web/app/views/user/reconfirm.pug
@@ -1,8 +1,8 @@
-extends ../layout-marketing
+extends ../layout-website-redesign
 include ../_mixins/recaptcha
 
 block vars
-	- bootstrap5PageStatus = 'disabled'
+	- isWebsiteRedesign = true
 
 block content
 	- var email = reconfirm_email ? reconfirm_email : ''
@@ -22,53 +22,52 @@ block content
 			data-badge='inline'
 		)
 
-	main#main-content.content.content-alt(data-ol-captcha-retry-trigger-area='')
-		.container
-			.row
-				.col-sm-12.col-md-6.col-md-offset-3
-					.card
-						h1.card-header #{translate("reconfirm_account")}
-						p #{translate('reconfirm_explained')}&nbsp;
-							a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
-							| .
-						form(
-							name='reconfirmAccountForm'
-							captcha-action-name=showCaptcha ? 'passwordReset' : false
-							data-ol-async-form
-							action='/user/reconfirm'
-							method='POST'
-							aria-label=translate('request_reconfirmation_email')
-							captcha=showCaptcha ? '' : false
-						)
-							div(data-ol-not-sent)
-								+formMessages
+	main#main-content(data-ol-captcha-retry-trigger-area='')
+		.container.auth-aux-container(style='max-width: 420px')
+			form(
+				name='reconfirmAccountForm'
+				captcha-action-name=showCaptcha ? 'passwordReset' : false
+				data-ol-async-form
+				action='/user/reconfirm'
+				method='POST'
+				aria-label=translate('request_reconfirmation_email')
+				captcha=showCaptcha ? '' : false
+			)
+				h1.h5.mb-3 #{translate("reconfirm_account")}
+				p #{translate('reconfirm_explained')}
+					| &nbsp;
+					a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail}
+					| .
 
-								input(name='_csrf' type='hidden' value=csrfToken)
-								.form-group
-									label(for='email') #{translate("please_enter_email")}
-									input.form-control(
-										name='email'
-										aria-label='email'
-										type='email'
-										placeholder='email@example.com'
-										required
-										autofocus
-										value=email
-									)
-								.actions
-									button.btn.btn-primary(
-										type='submit'
-										data-ol-disabled-inflight
-										aria-label=translate('request_password_reset_to_reconfirm')
-									)
-										span(data-ol-inflight='idle')
-											| #{translate('request_password_reset_to_reconfirm')}
-										span(hidden data-ol-inflight='pending')
-											| #{translate('request_password_reset_to_reconfirm')}… 
-							div(hidden data-ol-sent)
-								.alert.alert-success(role='alert' aria-live='polite')
-									span #{translate('password_reset_email_sent')}
-			.row
-				.col-sm-12.col-md-6.col-md-offset-3
-					if showCaptcha
-						+recaptchaConditions
+				div(data-ol-not-sent)
+					+formMessagesNewStyle
+
+					input(name='_csrf' type='hidden' value=csrfToken)
+					.form-group.mb-3
+						label.form-label(for='email') #{translate("please_enter_email")}
+						input.form-control(
+							name='email'
+							aria-label='email'
+							type='email'
+							placeholder='email@example.com'
+							required
+							autofocus
+							value=email
+						)
+					.actions
+						button.btn.btn-primary.w-100(
+							style='white-space: normal'
+							type='submit'
+							data-ol-disabled-inflight
+							aria-label=translate('request_password_reset_to_reconfirm')
+						)
+							span(data-ol-inflight='idle')
+								| #{translate('request_password_reset_to_reconfirm')}
+							span(hidden data-ol-inflight='pending')
+								| #{translate('request_password_reset_to_reconfirm')}… 
+				div(hidden data-ol-sent)
+					.alert.alert-success(role='alert' aria-live='polite')
+						span #{translate('password_reset_email_sent')}
+
+			if showCaptcha
+				+recaptchaConditions
diff --git a/services/web/app/views/user/setPassword-bs5.pug b/services/web/app/views/user/setPassword-bs5.pug
deleted file mode 100644
index 5081d22409..0000000000
--- a/services/web/app/views/user/setPassword-bs5.pug
+++ /dev/null
@@ -1,87 +0,0 @@
-extends ../layout-website-redesign
-
-block vars
-	- var suppressNavbar = true
-	- var suppressFooter = true
-	- isWebsiteRedesign = true
-
-block content
-	main#main-content
-		a.auth-aux-logo(href='/')
-			img(src=buildImgPath('ol-brand/overleaf-o-dark.svg') alt=settings.appName)
-		.auth-aux-container
-			form(
-				name='passwordResetForm'
-				data-ol-async-form
-				action='/user/password/set'
-				method='POST'
-				data-ol-hide-on-error='token-expired'
-			)
-				div(hidden data-ol-sent)
-					h1.h3.mb-3.mt-0 #{translate("password_updated")}
-					p.mb-4 #{translate("your_password_has_been_successfully_changed")}.
-					a.btn.btn-primary.w-100(href='/login') #{translate("log_in_now")}
-
-				div(data-ol-not-sent)
-					h1.h3.mb-3.mt-0 #{translate("reset_your_password")}
-					p(data-ol-hide-on-error-message='token-expired') #{translate("create_a_new_password_for_your_account")}.
-					+formMessagesNewStyle
-
-					+customFormMessageNewStyle('password-contains-email', 'danger')
-						| #{translate('invalid_password_contains_email')}.
-						| #{translate('use_a_different_password')}.
-
-					+customFormMessageNewStyle('password-too-similar', 'danger')
-						| #{translate('invalid_password_too_similar')}.
-						| #{translate('use_a_different_password')}.
-
-					+customFormMessageNewStyle('token-expired', 'danger')
-						| #{translate('password_reset_token_expired')}
-						br
-						a(href='/user/password/reset')
-							| #{translate('request_new_password_reset_email')}
-
-					input(name='_csrf' type='hidden' value=csrfToken)
-					input(name='email' type='text' hidden autocomplete='username' value=email)
-
-					.form-group.mb-3
-						label.form-label(
-							for='passwordField'
-							data-ol-hide-on-error-message='token-expired'
-						) #{translate("new_password")}
-						input#passwordField.form-control.auth-aux-new-password(
-							name='password'
-							type='password'
-							autocomplete='new-password'
-							autofocus
-							required
-							minlength=settings.passwordStrengthOptions.length.min
-						)
-
-						+customValidationMessageNewStyle('invalid-password')
-							| #{translate('invalid_password')}.
-
-						+customValidationMessageNewStyle('password-must-be-different')
-							| #{translate('password_cant_be_the_same_as_current_one')}.
-
-						+customValidationMessageNewStyle('password-must-be-strong')
-							| !{translate('password_was_detected_on_a_public_list_of_known_compromised_passwords', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}])}.
-							| #{translate('use_a_different_password')}.
-
-						input(name='passwordResetToken' type='hidden' value=passwordResetToken)
-					div(data-ol-hide-on-error-message='token-expired')
-						div #{translate('in_order_to_have_a_secure_account_make_sure_your_password')}
-						ul.mb-3.ps-4
-							li #{translate('is_longer_than_n_characters', {n: settings.passwordStrengthOptions.length.min})}
-							li #{translate('does_not_contain_or_significantly_match_your_email')}
-							li #{translate('is_not_used_on_any_other_website')}
-					.actions
-						button.btn.btn-primary.w-100(
-							type='submit'
-							data-ol-disabled-inflight
-							aria-label=translate('set_new_password')
-						) 
-							span(data-ol-inflight='idle')
-								| #{translate('set_new_password')}
-							span(hidden data-ol-inflight='pending')
-								| #{translate('set_new_password')}…
diff --git a/services/web/app/views/user/setPassword.pug b/services/web/app/views/user/setPassword.pug
index 653bc52045..5081d22409 100644
--- a/services/web/app/views/user/setPassword.pug
+++ b/services/web/app/views/user/setPassword.pug
@@ -1,91 +1,87 @@
-extends ../layout-marketing
+extends ../layout-website-redesign
 
 block vars
-	- bootstrap5PageStatus = 'disabled'
+	- var suppressNavbar = true
+	- var suppressFooter = true
+	- isWebsiteRedesign = true
 
 block content
-	main#main-content.content.content-alt
-		.container-custom-sm.mx-auto
-			.card
-				form(
-					name='passwordResetForm'
-					data-ol-async-form
-					action='/user/password/set'
-					method='POST'
-					data-ol-hide-on-error='token-expired'
-				)
-					div(hidden data-ol-sent)
-						h3.mt-0.mb-2 #{translate("password_updated")}
-						p.mb-4 #{translate("your_password_has_been_successfully_changed")}.
-						a(href='/login') #{translate("log_in_now")}
+	main#main-content
+		a.auth-aux-logo(href='/')
+			img(src=buildImgPath('ol-brand/overleaf-o-dark.svg') alt=settings.appName)
+		.auth-aux-container
+			form(
+				name='passwordResetForm'
+				data-ol-async-form
+				action='/user/password/set'
+				method='POST'
+				data-ol-hide-on-error='token-expired'
+			)
+				div(hidden data-ol-sent)
+					h1.h3.mb-3.mt-0 #{translate("password_updated")}
+					p.mb-4 #{translate("your_password_has_been_successfully_changed")}.
+					a.btn.btn-primary.w-100(href='/login') #{translate("log_in_now")}
 
-					div(data-ol-not-sent)
-						h3.mt-0.mb-2 #{translate("reset_your_password")}
-						p(data-ol-hide-on-error-message='token-expired') #{translate("create_a_new_password_for_your_account")}.
-						+formMessages
+				div(data-ol-not-sent)
+					h1.h3.mb-3.mt-0 #{translate("reset_your_password")}
+					p(data-ol-hide-on-error-message='token-expired') #{translate("create_a_new_password_for_your_account")}.
+					+formMessagesNewStyle
 
-						+customFormMessage('password-contains-email', 'danger')
-							| #{translate('invalid_password_contains_email')}.
-							| #{translate('use_a_different_password')}.
+					+customFormMessageNewStyle('password-contains-email', 'danger')
+						| #{translate('invalid_password_contains_email')}.
+						| #{translate('use_a_different_password')}.
 
-						+customFormMessage('password-too-similar', 'danger')
-							| #{translate('invalid_password_too_similar')}.
-							| #{translate('use_a_different_password')}.
+					+customFormMessageNewStyle('password-too-similar', 'danger')
+						| #{translate('invalid_password_too_similar')}.
+						| #{translate('use_a_different_password')}.
 
-						+customFormMessage('token-expired', 'danger')
-							| #{translate('password_reset_token_expired')}
-							br
-							a(href='/user/password/reset')
-								| #{translate('request_new_password_reset_email')}
+					+customFormMessageNewStyle('token-expired', 'danger')
+						| #{translate('password_reset_token_expired')}
+						br
+						a(href='/user/password/reset')
+							| #{translate('request_new_password_reset_email')}
 
-						input(name='_csrf' type='hidden' value=csrfToken)
-						input(
-							name='email'
-							type='text'
-							hidden
-							autocomplete='username'
-							value=email
+					input(name='_csrf' type='hidden' value=csrfToken)
+					input(name='email' type='text' hidden autocomplete='username' value=email)
+
+					.form-group.mb-3
+						label.form-label(
+							for='passwordField'
+							data-ol-hide-on-error-message='token-expired'
+						) #{translate("new_password")}
+						input#passwordField.form-control.auth-aux-new-password(
+							name='password'
+							type='password'
+							autocomplete='new-password'
+							autofocus
+							required
+							minlength=settings.passwordStrengthOptions.length.min
 						)
 
-						.form-group
-							label(
-								for='passwordField'
-								data-ol-hide-on-error-message='token-expired'
-							) #{translate("new_password")}
-							input#passwordField.form-control(
-								name='password'
-								type='password'
-								placeholder=translate('enter_your_new_password')
-								autocomplete='new-password'
-								autofocus
-								required
-								minlength=settings.passwordStrengthOptions.length.min
-							)
+						+customValidationMessageNewStyle('invalid-password')
+							| #{translate('invalid_password')}.
 
-							+customValidationMessage('invalid-password')
-								| #{translate('invalid_password')}.
+						+customValidationMessageNewStyle('password-must-be-different')
+							| #{translate('password_cant_be_the_same_as_current_one')}.
 
-							+customValidationMessage('password-must-be-different')
-								| #{translate('password_cant_be_the_same_as_current_one')}.
+						+customValidationMessageNewStyle('password-must-be-strong')
+							| !{translate('password_was_detected_on_a_public_list_of_known_compromised_passwords', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}])}.
+							| #{translate('use_a_different_password')}.
 
-							+customValidationMessage('password-must-be-strong')
-								| !{translate('password_was_detected_on_a_public_list_of_known_compromised_passwords', {}, [{name: 'a', attrs: {href: 'https://haveibeenpwned.com/passwords', rel: 'noopener noreferrer', target: '_blank'}}])}.
-								| #{translate('use_a_different_password')}.
-
-							input(name='passwordResetToken' type='hidden' value=passwordResetToken)
-						div(data-ol-hide-on-error-message='token-expired')
-							div #{translate('in_order_to_have_a_secure_account_make_sure_your_password')}
-							ul.mb-4.ps-4
-								li #{translate('is_longer_than_n_characters', {n: settings.passwordStrengthOptions.length.min})}
-								li #{translate('does_not_contain_or_significantly_match_your_email')}
-								li #{translate('is_not_used_on_any_other_website')}
-						.actions
-							button.btn.btn-primary.w-100(
-								type='submit'
-								data-ol-disabled-inflight
-								aria-label=translate('set_new_password')
-							) 
-								span(data-ol-inflight='idle')
-									| #{translate('set_new_password')}
-								span(hidden data-ol-inflight='pending')
-									| #{translate('set_new_password')}… 
+						input(name='passwordResetToken' type='hidden' value=passwordResetToken)
+					div(data-ol-hide-on-error-message='token-expired')
+						div #{translate('in_order_to_have_a_secure_account_make_sure_your_password')}
+						ul.mb-3.ps-4
+							li #{translate('is_longer_than_n_characters', {n: settings.passwordStrengthOptions.length.min})}
+							li #{translate('does_not_contain_or_significantly_match_your_email')}
+							li #{translate('is_not_used_on_any_other_website')}
+					.actions
+						button.btn.btn-primary.w-100(
+							type='submit'
+							data-ol-disabled-inflight
+							aria-label=translate('set_new_password')
+						) 
+							span(data-ol-inflight='idle')
+								| #{translate('set_new_password')}
+							span(hidden data-ol-inflight='pending')
+								| #{translate('set_new_password')}…
diff --git a/services/web/frontend/stylesheets/app/primary-email-check.less b/services/web/frontend/stylesheets/app/primary-email-check.less
deleted file mode 100644
index 2a1a766fd4..0000000000
--- a/services/web/frontend/stylesheets/app/primary-email-check.less
+++ /dev/null
@@ -1,39 +0,0 @@
-.primary-email-check-container {
-  max-width: 400px !important;
-}
-
-.primary-email-check-card {
-  padding: 24px;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-
-  .primary-email-confirm-button {
-    margin-top: 12px;
-  }
-
-  .primary-email-change-button {
-    margin-bottom: 12px;
-  }
-
-  p {
-    margin-bottom: 0;
-  }
-}
-
-.primary-email-check-header {
-  margin-top: 12px;
-  margin-bottom: 0;
-}
-
-.primary-email-check-form {
-  padding: 0 !important;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.primary-email-check-logo {
-  width: 130px;
-  margin: 0 auto;
-}
diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less
index ac72ff6d0a..1898c6be66 100644
--- a/services/web/frontend/stylesheets/main-style.less
+++ b/services/web/frontend/stylesheets/main-style.less
@@ -116,7 +116,6 @@
 @import 'app/error-pages.less';
 @import 'app/editor/history-v2.less';
 @import 'app/open-in-overleaf.less';
-@import 'app/primary-email-check';
 @import 'app/grammarly';
 @import 'app/front-chat-widget.less';
 @import 'app/ol-chat.less';
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 35c7787e1e..7fbe27fc3c 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -688,9 +688,7 @@
   "enter_the_code": "Enter the 6-digit code sent to __email__.",
   "enter_the_confirmation_code": "Enter the 6-digit confirmation code sent to __email__.",
   "enter_the_number_of_licenses_youd_like_to_add_to_see_the_cost_breakdown": "Enter the number of licenses you’d like to add to see the cost breakdown.",
-  "enter_your_email_address": "Enter your email address",
   "enter_your_email_address_below_and_we_will_send_you_a_link_to_reset_your_password": "Enter your email address below, and we will send you a link to reset your password",
-  "enter_your_new_password": "Enter your new password",
   "equation_generator": "Equation Generator",
   "equation_preview": "Equation preview",
   "error": "Error",
@@ -1584,9 +1582,8 @@
   "password_change_successful": "Password changed",
   "password_compromised_try_again_or_use_known_device_or_reset": "The password you’ve entered is on a <0>public list of compromised passwords</0>. Please try logging in from a device you’ve previously used or <1>reset your password</1>",
   "password_managed_externally": "Password settings are managed externally",
-  "password_reset": "Password Reset",
+  "password_reset": "Password reset",
   "password_reset_email_sent": "You have been sent an email to complete your password reset.",
-  "password_reset_sentence_case": "Password reset",
   "password_reset_token_expired": "Your password reset token has expired. Please request a new password reset email and follow the link there.",
   "password_too_long_please_reset": "Maximum password length exceeded. Please reset your password.",
   "password_updated": "Password updated",
@@ -1860,7 +1857,6 @@
   "republish": "Republish",
   "request_new_password_reset_email": "Request a new password reset email",
   "request_overleaf_common": "Request Overleaf Commons",
-  "request_password_reset": "Request password reset",
   "request_password_reset_to_reconfirm": "Request password reset email to reconfirm",
   "request_reconfirmation_email": "Request reconfirmation email",
   "request_sent_thank_you": "Message sent! Our team will review it and reply by email.",
diff --git a/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs b/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
index 70439baa33..d225c7ff81 100644
--- a/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
+++ b/services/web/test/unit/src/PasswordReset/PasswordResetController.test.mjs
@@ -59,11 +59,6 @@ describe('PasswordResetController', function () {
         removeReconfirmFlag: sinon.stub().resolves(),
       },
     }
-    ctx.SplitTestHandler = {
-      promises: {
-        getAssignment: sinon.stub().resolves('default'),
-      },
-    }
 
     vi.doMock('@overleaf/settings', () => ({
       default: ctx.settings,
@@ -112,13 +107,6 @@ describe('PasswordResetController', function () {
       default: ctx.UserUpdater,
     }))
 
-    vi.doMock(
-      '../../../../app/src/Features/SplitTests/SplitTestHandler',
-      () => ({
-        default: ctx.SplitTestHandler,
-      })
-    )
-
     ctx.PasswordResetController = (await import(MODULE_PATH)).default
   })
 
diff --git a/services/web/test/unit/src/User/UserEmailsControllerTests.js b/services/web/test/unit/src/User/UserEmailsControllerTests.js
index ae94194084..b89df8821a 100644
--- a/services/web/test/unit/src/User/UserEmailsControllerTests.js
+++ b/services/web/test/unit/src/User/UserEmailsControllerTests.js
@@ -101,11 +101,6 @@ describe('UserEmailsController', function () {
         '../Analytics/AnalyticsManager': this.AnalyticsManager,
         './UserAuditLogHandler': this.UserAuditLogHandler,
         '../../infrastructure/RateLimiter': this.RateLimiter,
-        '../SplitTests/SplitTestHandler': {
-          promises: {
-            getAssignment: sinon.stub().resolves('default'),
-          },
-        },
       },
     })
   })

From 6abd4fe23e81ee1c909d85f4e165c2909b562eff Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Fri, 11 Jul 2025 08:44:27 -0400
Subject: [PATCH 209/274] Merge pull request #26975 from
 overleaf/em-dsmp-subscribe

Add DS mobile app subscribe/unsubscribe endpoints

GitOrigin-RevId: 7396ccd54671016c62d61076e5e92ff3ecd42338
---
 services/web/app/src/models/User.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/web/app/src/models/User.js b/services/web/app/src/models/User.js
index c1701023c4..d1be356197 100644
--- a/services/web/app/src/models/User.js
+++ b/services/web/app/src/models/User.js
@@ -225,6 +225,9 @@ const UserSchema = new Schema(
     analyticsId: { type: String },
     completedTutorials: Schema.Types.Mixed,
     suspended: { type: Boolean },
+    dsMobileApp: {
+      subscribed: { type: Boolean },
+    },
   },
   { minimize: false }
 )

From a9fa1aa598d1b2dc1abd08dd1c25e463f82af07b Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 11 Jul 2025 13:53:18 +0100
Subject: [PATCH 210/274] Replace uses of `resolve` in place of a NextFunction

rejectOnError is safer

GitOrigin-RevId: 9ae988975ce5c4921964ecdab5892b72def0e78e
---
 .../TokenAccessController.test.mjs            | 198 +++++++++---------
 1 file changed, 97 insertions(+), 101 deletions(-)

diff --git a/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs b/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
index 03f68476f8..7586757cf0 100644
--- a/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
+++ b/services/web/test/unit/src/TokenAccess/TokenAccessController.test.mjs
@@ -286,20 +286,20 @@ describe('TokenAccessController', function () {
 
     describe('normal case (edit slot available)', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.LimitationsManager.promises.canAcceptEditCollaboratorInvite.resolves(
-            true
-          )
-          ctx.req.params = { token: ctx.token }
-          ctx.req.body = {
-            confirmedByUser: true,
-            tokenHashPrefix: '#prefix',
-          }
+        ctx.LimitationsManager.promises.canAcceptEditCollaboratorInvite.resolves(
+          true
+        )
+        ctx.req.params = { token: ctx.token }
+        ctx.req.body = {
+          confirmedByUser: true,
+          tokenHashPrefix: '#prefix',
+        }
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.grantTokenAccessReadAndWrite(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -362,20 +362,20 @@ describe('TokenAccessController', function () {
 
     describe('when there are no edit collaborator slots available', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.LimitationsManager.promises.canAcceptEditCollaboratorInvite.resolves(
-            false
-          )
-          ctx.req.params = { token: ctx.token }
-          ctx.req.body = {
-            confirmedByUser: true,
-            tokenHashPrefix: '#prefix',
-          }
+        ctx.LimitationsManager.promises.canAcceptEditCollaboratorInvite.resolves(
+          false
+        )
+        ctx.req.params = { token: ctx.token }
+        ctx.req.body = {
+          confirmedByUser: true,
+          tokenHashPrefix: '#prefix',
+        }
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.grantTokenAccessReadAndWrite(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -440,15 +440,15 @@ describe('TokenAccessController', function () {
 
     describe('when the access was already granted', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.project.tokenAccessReadAndWrite_refs.push(ctx.user._id)
-          ctx.req.params = { token: ctx.token }
-          ctx.req.body = { confirmedByUser: true }
+        ctx.project.tokenAccessReadAndWrite_refs.push(ctx.user._id)
+        ctx.req.params = { token: ctx.token }
+        ctx.req.body = { confirmedByUser: true }
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.grantTokenAccessReadAndWrite(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -480,14 +480,14 @@ describe('TokenAccessController', function () {
 
     describe('hash prefix missing in request', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.req.params = { token: ctx.token }
-          ctx.req.body = { confirmedByUser: true }
+        ctx.req.params = { token: ctx.token }
+        ctx.req.body = { confirmedByUser: true }
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.grantTokenAccessReadAndWrite(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -518,7 +518,7 @@ describe('TokenAccessController', function () {
 
     describe('user is owner of project', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
+        await new Promise((resolve, reject) => {
           ctx.AuthorizationManager.promises.getPrivilegeLevelForProject.returns(
             PrivilegeLevels.OWNER
           )
@@ -528,7 +528,7 @@ describe('TokenAccessController', function () {
           ctx.TokenAccessController.grantTokenAccessReadAndWrite(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -556,12 +556,12 @@ describe('TokenAccessController', function () {
       })
       describe('ANONYMOUS_READ_AND_WRITE_ENABLED is undefined', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
+          await new Promise((resolve, reject) => {
             ctx.res.callback = resolve
             ctx.TokenAccessController.grantTokenAccessReadAndWrite(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -596,14 +596,14 @@ describe('TokenAccessController', function () {
 
       describe('ANONYMOUS_READ_AND_WRITE_ENABLED is true', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
-            ctx.TokenAccessHandler.ANONYMOUS_READ_AND_WRITE_ENABLED = true
+          ctx.TokenAccessHandler.ANONYMOUS_READ_AND_WRITE_ENABLED = true
+          await new Promise((resolve, reject) => {
             ctx.res.callback = resolve
 
             ctx.TokenAccessController.grantTokenAccessReadAndWrite(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -638,21 +638,19 @@ describe('TokenAccessController', function () {
       })
       describe('when token is for v1 project', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
-            ctx.TokenAccessHandler.promises.getProjectByToken.resolves(
-              undefined
-            )
-            ctx.TokenAccessHandler.promises.getV1DocInfo.resolves({
-              exists: true,
-              has_owner: true,
-            })
-            ctx.req.params = { token: ctx.token }
-            ctx.req.body = { tokenHashPrefix: '#prefix' }
+          ctx.TokenAccessHandler.promises.getProjectByToken.resolves(undefined)
+          ctx.TokenAccessHandler.promises.getV1DocInfo.resolves({
+            exists: true,
+            has_owner: true,
+          })
+          ctx.req.params = { token: ctx.token }
+          ctx.req.body = { tokenHashPrefix: '#prefix' }
+          await new Promise((resolve, reject) => {
             ctx.res.callback = resolve
             ctx.TokenAccessController.grantTokenAccessReadAndWrite(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -684,20 +682,18 @@ describe('TokenAccessController', function () {
 
       describe('when token is not for a v1 or v2 project', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
-            ctx.TokenAccessHandler.promises.getProjectByToken.resolves(
-              undefined
-            )
-            ctx.TokenAccessHandler.promises.getV1DocInfo.resolves({
-              exists: false,
-            })
-            ctx.req.params = { token: ctx.token }
-            ctx.req.body = { tokenHashPrefix: '#prefix' }
+          ctx.TokenAccessHandler.promises.getProjectByToken.resolves(undefined)
+          ctx.TokenAccessHandler.promises.getV1DocInfo.resolves({
+            exists: false,
+          })
+          ctx.req.params = { token: ctx.token }
+          ctx.req.body = { tokenHashPrefix: '#prefix' }
+          await new Promise((resolve, reject) => {
             ctx.res.callback = resolve
             ctx.TokenAccessController.grantTokenAccessReadAndWrite(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -854,14 +850,14 @@ describe('TokenAccessController', function () {
   describe('grantTokenAccessReadOnly', function () {
     describe('normal case', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.req.params = { token: ctx.token }
-          ctx.req.body = { confirmedByUser: true, tokenHashPrefix: '#prefix' }
+        ctx.req.params = { token: ctx.token }
+        ctx.req.body = { confirmedByUser: true, tokenHashPrefix: '#prefix' }
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.grantTokenAccessReadOnly(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -903,15 +899,15 @@ describe('TokenAccessController', function () {
 
     describe('when the access was already granted', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.project.tokenAccessReadOnly_refs.push(ctx.user._id)
-          ctx.req.params = { token: ctx.token }
-          ctx.req.body = { confirmedByUser: true }
+        ctx.project.tokenAccessReadOnly_refs.push(ctx.user._id)
+        ctx.req.params = { token: ctx.token }
+        ctx.req.body = { confirmedByUser: true }
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.grantTokenAccessReadOnly(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -944,15 +940,15 @@ describe('TokenAccessController', function () {
 
     describe('anonymous users', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.req.params = { token: ctx.token }
-          ctx.SessionManager.getLoggedInUserId.returns(null)
+        ctx.req.params = { token: ctx.token }
+        ctx.SessionManager.getLoggedInUserId.returns(null)
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
 
           ctx.TokenAccessController.grantTokenAccessReadOnly(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -974,17 +970,17 @@ describe('TokenAccessController', function () {
 
     describe('user is owner of project', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
-          ctx.AuthorizationManager.promises.getPrivilegeLevelForProject.returns(
-            PrivilegeLevels.OWNER
-          )
-          ctx.req.params = { token: ctx.token }
-          ctx.req.body = {}
+        ctx.AuthorizationManager.promises.getPrivilegeLevelForProject.returns(
+          PrivilegeLevels.OWNER
+        )
+        ctx.req.params = { token: ctx.token }
+        ctx.req.body = {}
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.grantTokenAccessReadOnly(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -1042,12 +1038,12 @@ describe('TokenAccessController', function () {
 
     describe('when not in link sharing changes test', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
+        await new Promise((resolve, reject) => {
           ctx.AsyncFormHelper.redirect = sinon.stub().callsFake(() => resolve())
           ctx.TokenAccessController.ensureUserCanUseSharingUpdatesConsentPage(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })
@@ -1101,17 +1097,17 @@ describe('TokenAccessController', function () {
 
       describe('when user is already an invited editor', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
-            ctx.CollaboratorsGetter.promises.isUserInvitedReadWriteMemberOfProject.resolves(
-              true
-            )
+          ctx.CollaboratorsGetter.promises.isUserInvitedReadWriteMemberOfProject.resolves(
+            true
+          )
+          await new Promise((resolve, reject) => {
             ctx.AsyncFormHelper.redirect = sinon
               .stub()
               .callsFake(() => resolve())
             ctx.TokenAccessController.ensureUserCanUseSharingUpdatesConsentPage(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -1127,17 +1123,17 @@ describe('TokenAccessController', function () {
 
       describe('when user not a read write token member', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
-            ctx.CollaboratorsGetter.promises.userIsReadWriteTokenMember.resolves(
-              false
-            )
+          ctx.CollaboratorsGetter.promises.userIsReadWriteTokenMember.resolves(
+            false
+          )
+          await new Promise((resolve, reject) => {
             ctx.AsyncFormHelper.redirect = sinon
               .stub()
               .callsFake(() => resolve())
             ctx.TokenAccessController.ensureUserCanUseSharingUpdatesConsentPage(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -1167,15 +1163,15 @@ describe('TokenAccessController', function () {
 
       describe('previously joined token access user moving to named collaborator', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
-            ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
-              false
-            )
+          ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
+            false
+          )
+          await new Promise((resolve, reject) => {
             ctx.res.callback = resolve
             ctx.TokenAccessController.moveReadWriteToCollaborators(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -1206,15 +1202,15 @@ describe('TokenAccessController', function () {
 
       describe('previously joined token access user moving to named collaborator', function () {
         beforeEach(async function (ctx) {
-          await new Promise(resolve => {
-            ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
-              false
-            )
+          ctx.CollaboratorsGetter.promises.isUserInvitedMemberOfProject.resolves(
+            false
+          )
+          await new Promise((resolve, reject) => {
             ctx.res.callback = resolve
             ctx.TokenAccessController.moveReadWriteToCollaborators(
               ctx.req,
               ctx.res,
-              resolve
+              ctx.rejectOnError(reject)
             )
           })
         })
@@ -1245,12 +1241,12 @@ describe('TokenAccessController', function () {
 
     describe('previously joined token access user moving to anonymous viewer', function () {
       beforeEach(async function (ctx) {
-        await new Promise(resolve => {
+        await new Promise((resolve, reject) => {
           ctx.res.callback = resolve
           ctx.TokenAccessController.moveReadWriteToReadOnly(
             ctx.req,
             ctx.res,
-            resolve
+            ctx.rejectOnError(reject)
           )
         })
       })

From 122c618e53f7ff50f528bce6b51be875fa44c92c Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Fri, 11 Jul 2025 11:58:53 -0400
Subject: [PATCH 211/274] Merge pull request #27085 from
 overleaf/em-upgrade-oauth-tokens

Script for upgrading OAuth token scopes

GitOrigin-RevId: 9411494d402a1ff4bdc275ce54d574049a5f5060
---
 .../scripts/oauth/upgrade_token_scopes.mjs    | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 services/web/scripts/oauth/upgrade_token_scopes.mjs

diff --git a/services/web/scripts/oauth/upgrade_token_scopes.mjs b/services/web/scripts/oauth/upgrade_token_scopes.mjs
new file mode 100644
index 0000000000..f28417c1ec
--- /dev/null
+++ b/services/web/scripts/oauth/upgrade_token_scopes.mjs
@@ -0,0 +1,75 @@
+import minimist from 'minimist'
+import { db } from '../../app/src/infrastructure/mongodb.js'
+
+const OPTS = parseArgs()
+
+function parseArgs() {
+  const args = minimist(process.argv.slice(2), {
+    boolean: ['help', 'commit'],
+  })
+  if (args.help) {
+    usage()
+    process.exit(0)
+  }
+
+  if (args._.length === 0) {
+    usage()
+    process.exit(1)
+  }
+
+  return {
+    appIds: args._,
+    commit: args.commit,
+  }
+}
+
+function usage() {
+  console.error(`Usage: updgrade_token_scopes.mjs [--commit] APP_ID ...
+
+  This script will upgrade all existing OAuth tokens for the given app(s) so
+  that their scope matches the scope configured on the app.
+
+  USE WITH CAUTION: any token with limited scope previously issued will be
+  upgraded to support all scopes available to the app.
+  `)
+}
+
+async function main() {
+  for (const appId of OPTS.appIds) {
+    const app = await db.oauthApplications.findOne({ id: appId })
+    if (app == null) {
+      console.error(`App "${appId}" not found. Skipping.`)
+      continue
+    }
+
+    const expectedScope = (app.scopes ?? []).join(' ')
+
+    const filter = {
+      oauthApplication_id: app._id,
+      scope: { $ne: expectedScope },
+    }
+    if (OPTS.commit) {
+      const result = await db.oauthAccessTokens.updateMany(filter, {
+        $set: { scope: expectedScope },
+      })
+      console.error(
+        `App "${appId}": upgraded ${result.modifiedCount} access tokens`
+      )
+    } else {
+      const count = await db.oauthAccessTokens.count(filter)
+      console.error(`App "${appId}": would upgrade ${count} access tokens`)
+    }
+  }
+
+  if (!OPTS.commit) {
+    console.error('This was a dry run. Re-run with --commit to apply changes')
+  }
+}
+
+try {
+  await main()
+  process.exit(0)
+} catch (error) {
+  console.error(error)
+  process.exit(1)
+}

From 2ac46151f8ff8d24cf62d38804b71ec9fd5ec20e Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Mon, 14 Jul 2025 10:26:52 +0200
Subject: [PATCH 212/274] Merge pull request #26996 from
 overleaf/kh-include-region-in-errors

[web] improve errors thrown from StripeClient & PaymentService

GitOrigin-RevId: 59319936cc0caa876d80b068aac324dfe469b343
---
 .../app/src/Features/Subscription/Errors.js   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/services/web/app/src/Features/Subscription/Errors.js b/services/web/app/src/Features/Subscription/Errors.js
index 609ec15a73..ee474fa710 100644
--- a/services/web/app/src/Features/Subscription/Errors.js
+++ b/services/web/app/src/Features/Subscription/Errors.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 const Errors = require('../Errors/Errors')
 const OError = require('@overleaf/o-error')
 
@@ -28,17 +30,41 @@ class HasPastDueInvoiceError extends OError {}
 
 class HasNoAdditionalLicenseWhenManuallyCollectedError extends OError {}
 
+/**
+ * @typedef {Object} PaymentActionRequiredInfo
+ * @property {string} PaymentActionRequiredInfo.clientSecret
+ * @property {string} PaymentActionRequiredInfo.publicKey
+ */
 class PaymentActionRequiredError extends OError {
+  /**
+   * @param {PaymentActionRequiredInfo} info
+   */
   constructor(info) {
     super('Payment action required', info)
   }
 }
 
+/**
+ * @typedef {Object} PaymentFailedInfo
+ * @property {string} PaymentFailedInfo.subscriptionId
+ * @property {string} PaymentFailedInfo.reason
+ * @property {string} PaymentFailedInfo.adviceCode
+ */
+class PaymentFailedError extends OError {
+  /**
+   * @param {PaymentFailedInfo} info
+   */
+  constructor(info) {
+    super('Failed to process payment', info)
+  }
+}
+
 module.exports = {
   RecurlyTransactionError,
   DuplicateAddOnError,
   AddOnNotPresentError,
   PaymentActionRequiredError,
+  PaymentFailedError,
   MissingBillingInfoError,
   ManuallyCollectedError,
   PendingChangeError,

From ea2ba8cdbeb93c6383cc09b60bbb51b9ac697b81 Mon Sep 17 00:00:00 2001
From: Kristina <7614497+khjrtbrg@users.noreply.github.com>
Date: Mon, 14 Jul 2025 10:27:38 +0200
Subject: [PATCH 213/274] [web] add error messages for payment failing on
 upgrade (#27054)

* [web] add error messages for payment failing to upgrade modal
* [web] show payment error on preview change page
* [web] add separate message for 3ds failure

GitOrigin-RevId: b2680ff9b4f01e42f31c1c11457f216a5eadf49d
---
 .../Subscription/SubscriptionController.js    |  19 ++++
 .../web/frontend/extracted-translations.json  |   4 +
 .../modals/confirm-change-plan-modal.tsx      |  24 ++--
 .../preview-subscription-change/root.tsx      |  13 +--
 .../shared/payment-error-notification.tsx     |  66 +++++++++++
 .../subscription/data/subscription-url.ts     |   3 +-
 services/web/locales/en.json                  |   4 +
 .../active/change-plan/change-plan.test.tsx   |  10 +-
 .../payment-error-notification.test.tsx       | 103 ++++++++++++++++++
 9 files changed, 213 insertions(+), 33 deletions(-)
 create mode 100644 services/web/frontend/js/features/subscription/components/shared/payment-error-notification.tsx
 create mode 100644 services/web/test/frontend/features/subscription/components/shared/payment-error-notification.test.tsx

diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js
index fe79f3caed..def0abf7ac 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionController.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionController.js
@@ -20,6 +20,7 @@ const {
   DuplicateAddOnError,
   AddOnNotPresentError,
   PaymentActionRequiredError,
+  PaymentFailedError,
 } = require('./Errors')
 const SplitTestHandler = require('../SplitTests/SplitTestHandler')
 const AuthorizationManager = require('../Authorization/AuthorizationManager')
@@ -449,11 +450,29 @@ async function purchaseAddon(req, res, next) {
         { addon: addOnCode }
       )
     } else if (err instanceof PaymentActionRequiredError) {
+      logger.debug(
+        { userId: user._id },
+        'Customer needs to perform payment action to complete transaction'
+      )
       return res.status(402).json({
         message: 'Payment action required',
         clientSecret: err.info.clientSecret,
         publicKey: err.info.publicKey,
       })
+    } else if (err instanceof PaymentFailedError) {
+      logger.debug(
+        {
+          userId: user._id,
+          reason: err.info.reason,
+          adviceCode: err.info.adviceCode,
+        },
+        'Payment failed for transaction'
+      )
+      return res.status(402).json({
+        message: 'Payment failed',
+        reason: err.info.reason,
+        adviceCode: err.info.adviceCode,
+      })
     } else {
       if (err instanceof Error) {
         OError.tag(err, 'something went wrong purchasing add-ons', {
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 4031c6db26..f4bb6c7c8e 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -1207,6 +1207,10 @@
   "pause_subscription": "",
   "pause_subscription_for": "",
   "pay_now": "",
+  "payment_error_3ds_failed": "",
+  "payment_error_generic": "",
+  "payment_error_intermittent_error": "",
+  "payment_error_update_payment_method": "",
   "payment_provider_unreachable_error": "",
   "payment_summary": "",
   "pdf_compile_in_progress_error": "",
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx
index a964009dcc..9693ad3e23 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx
@@ -16,12 +16,12 @@ import OLModal, {
   OLModalTitle,
 } from '@/features/ui/components/ol/ol-modal'
 import OLButton from '@/features/ui/components/ol/ol-button'
-import OLNotification from '@/features/ui/components/ol/ol-notification'
+import PaymentErrorNotification from '@/features/subscription/components/shared/payment-error-notification'
 import handleStripePaymentAction from '@/features/subscription/util/handle-stripe-payment-action'
 
 export function ConfirmChangePlanModal() {
   const modalId: SubscriptionDashModalIds = 'change-to-plan'
-  const [error, setError] = useState(false)
+  const [error, setError] = useState<FetchError | null>(null)
   const [inflight, setInflight] = useState(false)
   const { t } = useTranslation()
   const { handleCloseModal, modalIdShown, plans, planCodeToChangeTo } =
@@ -30,7 +30,7 @@ export function ConfirmChangePlanModal() {
   const location = useLocation()
 
   async function handleConfirmChange() {
-    setError(false)
+    setError(null)
     setInflight(true)
 
     try {
@@ -41,11 +41,12 @@ export function ConfirmChangePlanModal() {
       })
       location.reload()
     } catch (e) {
-      const { handled } = await handleStripePaymentAction(e as FetchError)
+      const fetchError = e as FetchError
+      const { handled } = await handleStripePaymentAction(fetchError)
       if (handled) {
         location.reload()
       } else {
-        setError(true)
+        setError(fetchError)
         setInflight(false)
       }
     }
@@ -73,18 +74,7 @@ export function ConfirmChangePlanModal() {
       </OLModalHeader>
 
       <OLModalBody>
-        {error && (
-          <OLNotification
-            type="error"
-            aria-live="polite"
-            content={
-              <>
-                {t('generic_something_went_wrong')}. {t('try_again')}.{' '}
-                {t('generic_if_problem_continues_contact_us')}.
-              </>
-            }
-          />
-        )}
+        {error !== null && <PaymentErrorNotification error={error} />}
         <p>
           <Trans
             i18nKey="sure_you_want_to_change_plan"
diff --git a/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx b/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx
index 112d15d7e3..a7cd0aeb5c 100644
--- a/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx
+++ b/services/web/frontend/js/features/subscription/components/preview-subscription-change/root.tsx
@@ -12,7 +12,6 @@ import useAsync from '@/shared/hooks/use-async'
 import { useLocation } from '@/shared/hooks/use-location'
 import { debugConsole } from '@/utils/debugging'
 import { FetchError, postJSON } from '@/infrastructure/fetch-json'
-import Notification from '@/shared/components/notification'
 import OLCard from '@/features/ui/components/ol/ol-card'
 import OLRow from '@/features/ui/components/ol/ol-row'
 import OLCol from '@/features/ui/components/ol/ol-col'
@@ -21,6 +20,7 @@ import { subscriptionUpdateUrl } from '@/features/subscription/data/subscription
 import * as eventTracking from '@/infrastructure/event-tracking'
 import sparkleText from '@/shared/svgs/ai-sparkle-text.svg'
 import { useFeatureFlag } from '@/shared/context/split-test-context'
+import PaymentErrorNotification from '@/features/subscription/components/shared/payment-error-notification'
 import handleStripePaymentAction from '../../util/handle-stripe-payment-action'
 
 function PreviewSubscriptionChange() {
@@ -96,15 +96,8 @@ function PreviewSubscriptionChange() {
             ) : null}
 
             {payNowTask.isError && (
-              <Notification
-                type="error"
-                aria-live="polite"
-                content={
-                  <>
-                    {t('generic_something_went_wrong')}. {t('try_again')}.{' '}
-                    {t('generic_if_problem_continues_contact_us')}.
-                  </>
-                }
+              <PaymentErrorNotification
+                error={payNowTask.error as FetchError}
               />
             )}
 
diff --git a/services/web/frontend/js/features/subscription/components/shared/payment-error-notification.tsx b/services/web/frontend/js/features/subscription/components/shared/payment-error-notification.tsx
new file mode 100644
index 0000000000..a727be6e51
--- /dev/null
+++ b/services/web/frontend/js/features/subscription/components/shared/payment-error-notification.tsx
@@ -0,0 +1,66 @@
+import { FetchError } from '@/infrastructure/fetch-json'
+import { Trans } from 'react-i18next'
+import OLNotification from '@/features/ui/components/ol/ol-notification'
+import { billingPortalUrl } from '../../data/subscription-url'
+
+type Props = {
+  error: FetchError | null
+}
+
+export default function PaymentErrorNotification({ error }: Props) {
+  if (!error) {
+    return
+  }
+
+  let message
+  switch (error.data?.adviceCode) {
+    case 'try_again_later':
+      message = (
+        <Trans
+          i18nKey="payment_error_intermittent_error"
+          components={[
+            /* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
+            <a href="/contact" target="_blank" />,
+          ]}
+        />
+      )
+      break
+    case 'do_not_try_again':
+    case 'confirm_card_data':
+      message = (
+        <Trans
+          i18nKey="payment_error_update_payment_method"
+          components={[
+            /* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
+            <a href={billingPortalUrl} />,
+          ]}
+        />
+      )
+      break
+    default:
+      // clientSecret indicates they needed to pass a 3DS challenge
+      if (error.data?.clientSecret) {
+        message = (
+          <Trans
+            i18nKey="payment_error_3ds_failed"
+            components={[
+              /* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
+              <a href="/contact" target="_blank" />,
+            ]}
+          />
+        )
+      } else {
+        message = (
+          <Trans
+            i18nKey="payment_error_generic"
+            components={[
+              /* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
+              <a href="/contact" target="_blank" />,
+            ]}
+          />
+        )
+      }
+  }
+
+  return <OLNotification type="error" aria-live="polite" content={message} />
+}
diff --git a/services/web/frontend/js/features/subscription/data/subscription-url.ts b/services/web/frontend/js/features/subscription/data/subscription-url.ts
index 9dc294b4f6..b26c635a05 100644
--- a/services/web/frontend/js/features/subscription/data/subscription-url.ts
+++ b/services/web/frontend/js/features/subscription/data/subscription-url.ts
@@ -4,4 +4,5 @@ export const cancelPendingSubscriptionChangeUrl =
 export const cancelSubscriptionUrl = '/user/subscription/cancel'
 export const redirectAfterCancelSubscriptionUrl = '/user/subscription/canceled'
 export const extendTrialUrl = '/user/subscription/extend'
-export const reactivateSubscriptionUrl = '/user/subscription/reactivate'
\ No newline at end of file
+export const reactivateSubscriptionUrl = '/user/subscription/reactivate'
+export const billingPortalUrl = '/user/subscription/payment/account-management'
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 7fbe27fc3c..c5ba1f84b7 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1594,6 +1594,10 @@
   "pause_subscription": "Pause subscription",
   "pause_subscription_for": "Pause subscription for",
   "pay_now": "Pay now",
+  "payment_error_3ds_failed": "We couldn’t complete your payment because authentication wasn’t successful. Please try again or choose a different payment method. If the problem continues please <0>contact us</0>.",
+  "payment_error_generic": "Sorry, something went wrong. Please try again. If the problem continues please <0>contact us</0>.",
+  "payment_error_intermittent_error": "We were unable to process your payment. Please try again later or <0>contact us</0> for assistance.",
+  "payment_error_update_payment_method": "Your payment was declined. Please <0>update your billing information</0> and try again.",
   "payment_method_accepted": "__paymentMethod__ accepted",
   "payment_provider_unreachable_error": "Sorry, there was an error talking to our payment provider. Please try again in a few moments.\nIf you are using any ad or script blocking extensions in your browser, you may need to temporarily disable them.",
   "payment_summary": "Payment summary",
diff --git a/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx
index 7ffe7760d8..bbcb955d2d 100644
--- a/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx
+++ b/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx
@@ -238,11 +238,11 @@ describe('<ChangePlanModal />', function () {
 
       screen.getByRole('button', { name: 'Processing…' })
 
-      await screen.findByText('Sorry, something went wrong. ', { exact: false })
-      await screen.findByText('Please try again. ', { exact: false })
-      await screen.findByText('If the problem continues please contact us.', {
-        exact: false,
-      })
+      await screen.findAllByText(
+        (content, element) =>
+          element?.textContent ===
+          'Sorry, something went wrong. Please try again. If the problem continues please contact us.'
+      )
 
       expect(
         within(screen.getByRole('dialog'))
diff --git a/services/web/test/frontend/features/subscription/components/shared/payment-error-notification.test.tsx b/services/web/test/frontend/features/subscription/components/shared/payment-error-notification.test.tsx
new file mode 100644
index 0000000000..e88551b20b
--- /dev/null
+++ b/services/web/test/frontend/features/subscription/components/shared/payment-error-notification.test.tsx
@@ -0,0 +1,103 @@
+import { expect } from 'chai'
+import { render, screen } from '@testing-library/react'
+import PaymentErrorNotification from '../../../../../../frontend/js/features/subscription/components/shared/payment-error-notification'
+import { FetchError } from '@/infrastructure/fetch-json'
+import { billingPortalUrl } from '@/features/subscription/data/subscription-url'
+
+describe('<PaymentErrorNotification />', function () {
+  it('does not render if error is missing', function () {
+    render(<PaymentErrorNotification error={null} />)
+
+    expect(screen.queryByRole('link')).to.be.null
+  })
+
+  it('renders a generic error if adviceCode is missing', function () {
+    const error = { data: { adviceCode: null } } as FetchError
+
+    render(<PaymentErrorNotification error={error} />)
+
+    expect(
+      screen.queryAllByText(
+        (content, element) =>
+          element?.textContent ===
+          'Sorry, something went wrong. Please try again. If the problem continues please contact us.'
+      ).length
+    ).to.be.greaterThan(0)
+
+    const link = screen.queryByRole('link')
+    expect(link).to.exist
+    expect(link?.getAttribute('href')).to.equal('/contact')
+  })
+
+  it('renders an error if adviceCode is missing but clientSecret is present', function () {
+    const error = { data: { clientSecret: 'cs_12345' } } as FetchError
+
+    render(<PaymentErrorNotification error={error} />)
+
+    expect(
+      screen.queryAllByText(
+        (content, element) =>
+          element?.textContent ===
+          'We couldn’t complete your payment because authentication wasn’t successful. Please try again or choose a different payment method. If the problem continues please contact us.'
+      ).length
+    ).to.be.greaterThan(0)
+
+    const link = screen.queryByRole('link')
+    expect(link).to.exist
+    expect(link?.getAttribute('href')).to.equal('/contact')
+  })
+
+  it('renders a error to try again if adviceCode is try_again_later', function () {
+    const error = { data: { adviceCode: 'try_again_later' } } as FetchError
+
+    render(<PaymentErrorNotification error={error} />)
+
+    expect(
+      screen.queryAllByText(
+        (content, element) =>
+          element?.textContent ===
+          'We were unable to process your payment. Please try again later or contact us for assistance.'
+      ).length
+    ).to.be.greaterThan(0)
+
+    const link = screen.queryByRole('link')
+    expect(link).to.exist
+    expect(link?.getAttribute('href')).to.equal('/contact')
+  })
+
+  it('renders an error to update payment method if adviceCode do_not_try_again', function () {
+    const error = { data: { adviceCode: 'do_not_try_again' } } as FetchError
+
+    render(<PaymentErrorNotification error={error} />)
+
+    expect(
+      screen.queryAllByText(
+        (content, element) =>
+          element?.textContent ===
+          'Your payment was declined. Please update your billing information and try again.'
+      ).length
+    ).to.be.greaterThan(0)
+
+    const link = screen.queryByRole('link')
+    expect(link).to.exist
+    expect(link?.getAttribute('href')).to.equal(billingPortalUrl)
+  })
+
+  it('renders an error to update payment method if adviceCode confirm_card_data', function () {
+    const error = { data: { adviceCode: 'confirm_card_data' } } as FetchError
+
+    render(<PaymentErrorNotification error={error} />)
+
+    expect(
+      screen.queryAllByText(
+        (content, element) =>
+          element?.textContent ===
+          'Your payment was declined. Please update your billing information and try again.'
+      ).length
+    ).to.be.greaterThan(0)
+
+    const link = screen.queryByRole('link')
+    expect(link).to.exist
+    expect(link?.getAttribute('href')).to.equal(billingPortalUrl)
+  })
+})

From c20c17b68e8e7893fee9bedcbb84c17597752464 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Mon, 14 Jul 2025 11:11:19 +0200
Subject: [PATCH 214/274] [web] Fix `clockDelta` computation in socket
 diagnostic (#27022)

GitOrigin-RevId: f27ac2b182c650a38cf74806152e10460a8dd21b
---
 .../socket-diagnostics/components/use-socket-manager.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/socket-diagnostics/components/use-socket-manager.ts b/services/web/frontend/js/features/socket-diagnostics/components/use-socket-manager.ts
index a0035052f5..9636c8e282 100644
--- a/services/web/frontend/js/features/socket-diagnostics/components/use-socket-manager.ts
+++ b/services/web/frontend/js/features/socket-diagnostics/components/use-socket-manager.ts
@@ -79,7 +79,7 @@ export function useSocketManager() {
         const beforeTime = info.data.time
         const now = Date.now()
         const latency = now - beforeTime
-        const clockDelta = (beforeTime + beforeTime) / 2 - info.serverTime
+        const clockDelta = (beforeTime + now) / 2 - info.serverTime
         setDebugInfo(prev => ({
           ...prev,
           received: prev.received + 1,

From 4c03ebe4ee0017b80e99e10bc22dfb41c67f2909 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Mon, 14 Jul 2025 11:12:49 +0200
Subject: [PATCH 215/274] [web] Add some types for existing capabilities and
 PermissionController (#27048)

* Add types on existing Capabilities code

* Add ts-expect-error comments

* Minor code changes to satisfy types

* Remove ts-check because of unrelated errors

* Remove some ts-expect-error comments

* Revert "Remove some ts-expect-error comments"

This reverts commit 76cc0a073710eecf4f8b88f8579405838607f4d5.

* Remove the `@ts-check`s for now

It looks like typescript is somewhat flaky. We can re-enable this later

* Remove the `@ts-expect-error`s

* Remove return type

GitOrigin-RevId: 57bbd370654592c0662047e72e61f91bf38e0949
---
 .../Authorization/PermissionsController.js    | 25 +++++++--
 .../Authorization/PermissionsManager.js       | 51 +++++++++++--------
 services/web/types/capabilities.ts            | 11 ++++
 3 files changed, 61 insertions(+), 26 deletions(-)
 create mode 100644 services/web/types/capabilities.ts

diff --git a/services/web/app/src/Features/Authorization/PermissionsController.js b/services/web/app/src/Features/Authorization/PermissionsController.js
index c9ffac3c7c..27b99081c6 100644
--- a/services/web/app/src/Features/Authorization/PermissionsController.js
+++ b/services/web/app/src/Features/Authorization/PermissionsController.js
@@ -10,9 +10,16 @@ const Modules = require('../../infrastructure/Modules')
 const { expressify } = require('@overleaf/promise-utils')
 const Features = require('../../infrastructure/Features')
 
+/**
+ * @typedef {(import('express').Request)} Request
+ * @typedef {(import('express').Response)} Response
+ * @typedef {(import('express').NextFunction)} NextFunction
+ * @typedef {import('./PermissionsManager').Capability} Capability
+ */
+
 /**
  * Function that returns middleware to add an `assertPermission` function to the request object to check if the user has a specific capability.
- * @returns {Function} The middleware function that adds the `assertPermission` function to the request object.
+ * @returns {() => (req: Request, res: Response, next: NextFunction) => void} The middleware function that adds the `assertPermission` function to the request object.
  */
 function useCapabilities() {
   const middleware = async function (req, res, next) {
@@ -30,12 +37,15 @@ function useCapabilities() {
       return next()
     }
     try {
-      let results = await Modules.promises.hooks.fire(
+      /**
+       * @type {{groupPolicy: Record<string, boolean>}[][]}
+       */
+      const hookResponses = await Modules.promises.hooks.fire(
         'getGroupPolicyForUser',
         req.user
       )
       // merge array of all results from all modules
-      results = results.flat()
+      const results = hookResponses.flat()
 
       if (results.length > 0) {
         // get the combined group policy applying to the user
@@ -70,8 +80,8 @@ function useCapabilities() {
 
 /**
  * Function that returns middleware to check if the user has permission to access a resource.
- * @param {[string]} requiredCapabilities - the capabilities required to access the resource.
- * @returns {Function} The middleware function that checks if the user has the required capabilities.
+ * @param {...Capability} requiredCapabilities - the capabilities required to access the resource.
+ * @returns {(req: Request, res: Response, next: NextFunction) => void} The middleware function that checks if the user has the required capabilities.
  */
 function requirePermission(...requiredCapabilities) {
   if (
@@ -80,6 +90,11 @@ function requirePermission(...requiredCapabilities) {
   ) {
     throw new Error('invalid required capabilities')
   }
+  /**
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
   const doRequest = async function (req, res, next) {
     if (!Features.hasFeature('saas')) {
       return next()
diff --git a/services/web/app/src/Features/Authorization/PermissionsManager.js b/services/web/app/src/Features/Authorization/PermissionsManager.js
index a20280a941..aad1021b24 100644
--- a/services/web/app/src/Features/Authorization/PermissionsManager.js
+++ b/services/web/app/src/Features/Authorization/PermissionsManager.js
@@ -45,16 +45,23 @@ const { callbackify } = require('util')
 const { ForbiddenError } = require('../Errors/Errors')
 const Modules = require('../../infrastructure/Modules')
 
+/**
+ * @typedef {(import('../../../../types/capabilities').Capability)} Capability
+ */
+
+/** @type {Map<string, Map<Capability, boolean>>} */
 const POLICY_TO_CAPABILITY_MAP = new Map()
 const POLICY_TO_VALIDATOR_MAP = new Map()
+/** @type {Map<Capability, boolean>} */
 const DEFAULT_PERMISSIONS = new Map()
+/** @type {Set<string>} */
 const ALLOWED_PROPERTIES = new Set()
 
 /**
  * Throws an error if the given capability is not registered.
  *
  * @private
- * @param {string} capability - The name of the capability to check.
+ * @param {Capability} capability - The name of the capability to check.
  * @throws {Error} If the capability is not registered.
  */
 function ensureCapabilityExists(capability) {
@@ -66,7 +73,7 @@ function ensureCapabilityExists(capability) {
 /**
  * Validates an group policy object
  *
- * @param {Object} policies - An object containing policy names and booleans
+ * @param {Record<string, boolean>} policies - An object containing policy names and booleans
  *   as key-value entries.
  * @throws {Error} if the `policies` object contains a policy that is not
  *   registered, or the policy value is not a boolean
@@ -85,7 +92,7 @@ function validatePolicies(policies) {
 /**
  * Registers a new capability with the given name and options.
  *
- * @param {string} name - The name of the capability to register.
+ * @param {Capability} name - The name of the capability to register.
  * @param {Object} options - The options for the capability.
  * @param {boolean} options.default - The default value for the capability
  *   (required).
@@ -108,7 +115,7 @@ function registerCapability(name, options) {
  * Registers a new policy with the given name, capabilities, and options.
  *
  * @param {string} name - The name of the policy to register.
- * @param {Object} capabilities - The capabilities for the policy.
+ * @param {Partial<Record<Capability, boolean>>|Map<Capability, boolean>} capabilities - The capabilities for the policy.
  * @param {Object} [options] - The options for the policy.
  * @param {Function?} [options.validator] - The optional validator function for the
  *   policy.
@@ -122,10 +129,11 @@ function registerPolicy(name, capabilities, options = {}) {
   if (POLICY_TO_CAPABILITY_MAP.has(name)) {
     throw new Error(`policy already registered: ${name}`)
   }
+
+  /** @type {[Capability, boolean][]} */
+  const entries = Object.entries(capabilities)
   // check that all the entries in the capability set exist and are booleans
-  for (const [capabilityName, capabilityValue] of Object.entries(
-    capabilities
-  )) {
+  for (const [capabilityName, capabilityValue] of entries) {
     // check that the capability exists (look in the default permissions)
     if (!DEFAULT_PERMISSIONS.has(capabilityName)) {
       throw new Error(`unknown capability: ${capabilityName}`)
@@ -158,19 +166,18 @@ function registerAllowedProperty(name) {
 
 /**
  * returns the set of allowed properties that have been registered
- *
- * @returns {Set} ALLOWED_PROPERTIES
  */
 function getAllowedProperties() {
   return ALLOWED_PROPERTIES
 }
+
 /**
  * Returns an array of policy names that are enforced based on the provided
  * group policy object.
  *
  * @private
- * @param {Object} groupPolicy - The group policy object to check.
- * @returns {Array} An array of policy names that are enforced.
+ * @param {Partial<Map<Capability , boolean>>} groupPolicy - The group policy object to check.
+ * @returns {Capability[]} An array of policy names that are enforced.
  */
 function getEnforcedPolicyNames(groupPolicy = {}) {
   if (!groupPolicy) {
@@ -192,7 +199,7 @@ function getEnforcedPolicyNames(groupPolicy = {}) {
  * @private
  * @param {string} policyName - The name of the policy to retrieve the
  *   capability value from.
- * @param {string} capability - The name of the capability to retrieve the value
+ * @param {Capability} capability - The name of the capability to retrieve the value
  *   for.
  * @returns {boolean | undefined} The value of the capability for the policy, or
  *   undefined if the policy or capability is not found.
@@ -205,7 +212,7 @@ function getCapabilityValueFromPolicy(policyName, capability) {
  * Returns the default value for the specified capability.
  *
  * @private
- * @param {string} capability - The name of the capability to retrieve the
+ * @param {Capability} capability - The name of the capability to retrieve the
  *   default value for.
  * @returns {boolean | undefined} The default value for the capability, or
  *   undefined if the capability is not found.
@@ -222,9 +229,10 @@ function getValidatorFromPolicy(policyName) {
  * Returns a set of default capabilities based on the DEFAULT_PERMISSIONS map.
  *
  * @private
- * @returns {Set} A set of default capabilities.
+ * @returns {Set<Capability>} A set of default capabilities.
  */
 function getDefaultCapabilities() {
+  /** @type {Set<Capability>} */
   const defaultCapabilities = new Set()
   for (const [
     capabilityName,
@@ -242,7 +250,7 @@ function getDefaultCapabilities() {
  * which are not allowed by the policy.
  *
  * @private
- * @param {Set} capabilitySet - The set of capabilities to apply the policy to.
+ * @param {Set<Capability>} capabilitySet - The set of capabilities to apply the policy to.
  * @param {string} policyName - The name of the policy to apply.
  * @throws {Error} If the policy is unknown.
  */
@@ -281,10 +289,11 @@ function getUserCapabilities(groupPolicy) {
 /**
  * Combines an array of group policies into a single policy object.
  *
- * @param {Array} groupPolicies - An array of group policies.
- * @returns {Object} - The combined group policy object.
+ * @param {Record<string, boolean>[]} groupPolicies - An array of group policies.
+ * @returns {Record<string, boolean>} - The combined group policy object.
  */
 function combineGroupPolicies(groupPolicies) {
+  /** @type {Record<string, boolean>} */
   const combinedGroupPolicy = {}
   for (const groupPolicy of groupPolicies) {
     const enforcedPolicyNames = getEnforcedPolicyNames(groupPolicy)
@@ -335,7 +344,7 @@ function getUserRestrictions(groupPolicy) {
  * policy.
  *
  * @param {Object} groupPolicy - The group policy object for the user.
- * @param {string} capability - The name of the capability to check permission
+ * @param {Capability} capability - The name of the capability to check permission
  *   for.
  * @returns {boolean} True if the user has permission for the capability, false
  *   otherwise.
@@ -349,7 +358,7 @@ function hasPermission(groupPolicy, capability) {
   )
   // if there are no results, or none of the policies apply, return the default permission
   if (results.length === 0 || results.every(result => result === undefined)) {
-    return getDefaultPermission(capability)
+    return !!getDefaultPermission(capability)
   }
   // only allow the permission if all the results are true, otherwise deny it
   return results.every(result => result === true)
@@ -395,7 +404,7 @@ async function getUserValidationStatus({ user, groupPolicy, subscription }) {
  *
  * @param {Object} user - The user object to retrieve the group policy for.
  *   Only the user's _id is required
- * @param {Array} capabilities - The list of the capabilities to check permission for.
+ * @param {Capability[]} requiredCapabilities - The list of the capabilities to check permission for.
  * @returns {Promise<void>}
  * @throws {Error} If the user does not have permission
  */
@@ -417,7 +426,7 @@ async function assertUserPermissions(user, requiredCapabilities) {
  *
  * @param {Object} user - The user object to retrieve the group policy for.
  *   Only the user's _id is required
- * @param {Array} capabilities - The list of the capabilities to check permission for.
+ * @param {Capability[]} requiredCapabilities - The list of the capabilities to check permission for.
  * @returns {Promise<Boolean>} - true if the user has all permissions, false if not
  */
 async function checkUserPermissions(user, requiredCapabilities) {
diff --git a/services/web/types/capabilities.ts b/services/web/types/capabilities.ts
new file mode 100644
index 0000000000..961c554cfa
--- /dev/null
+++ b/services/web/types/capabilities.ts
@@ -0,0 +1,11 @@
+export type Capability =
+  | 'add-secondary-email'
+  | 'change-password'
+  | 'chat'
+  | 'delete-own-account'
+  | 'dropbox'
+  | 'endorse-email'
+  | 'join-subscription'
+  | 'leave-group-subscription'
+  | 'start-subscription'
+  | 'use-ai'

From 10f4722641db5d83ceb5d708c26e24e3bb9be23e Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Mon, 14 Jul 2025 11:13:27 +0200
Subject: [PATCH 216/274] [web] Add some types to web module (#27051)

* Update `WebModule` types

* Add `if (module.middleware)` so types are satisfied

GitOrigin-RevId: 875fa2710a65d557037771c3eb76ff3cb0e73429
---
 .../web/app/src/infrastructure/Modules.js     | 24 +++++++++++++++----
 services/web/types/web-module.ts              | 10 +++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/services/web/app/src/infrastructure/Modules.js b/services/web/app/src/infrastructure/Modules.js
index b1c134f1d6..20975a3642 100644
--- a/services/web/app/src/infrastructure/Modules.js
+++ b/services/web/app/src/infrastructure/Modules.js
@@ -1,3 +1,5 @@
+// @ts-check
+
 const fs = require('fs')
 const Path = require('path')
 const { promisify, callbackify } = require('util')
@@ -6,11 +8,17 @@ const Views = require('./Views')
 const _ = require('lodash')
 const Metrics = require('@overleaf/metrics')
 
+/** @import { WebModule } from "../../../types/web-module" */
+/** @import { RequestHandler } from "express" */
+
 const MODULE_BASE_PATH = Path.join(__dirname, '/../../../modules')
 
+/** @type {WebModule[]} */
 const _modules = []
 let _modulesLoaded = false
 const _hooks = {}
+
+/** @type {Record<string, RequestHandler[]>} */
 const _middleware = {}
 let _viewIncludes = {}
 
@@ -38,6 +46,7 @@ async function loadModulesImpl() {
     const module = await import(
       Path.join(MODULE_BASE_PATH, moduleName, 'index.mjs')
     )
+    /** @type {WebModule & {name: string}} */
     const loadedModule = module.default || module
 
     loadedModule.name = moduleName
@@ -161,12 +170,14 @@ function attachHook(name, method) {
 
 async function attachMiddleware() {
   for (const module of await modules()) {
-    for (const middleware in module.middleware || {}) {
-      const method = module.middleware[middleware]
-      if (_middleware[middleware] == null) {
-        _middleware[middleware] = []
+    if (module.middleware) {
+      for (const middleware in module.middleware) {
+        const method = module.middleware[middleware]
+        if (_middleware[middleware] == null) {
+          _middleware[middleware] = []
+        }
+        _middleware[middleware].push(method)
       }
-      _middleware[middleware].push(method)
     }
   }
 }
@@ -186,6 +197,9 @@ async function fireHook(name, ...args) {
   return results
 }
 
+/**
+ * @param {string} name
+ */
 async function getMiddleware(name) {
   // ensure that modules are loaded if we need to call a middleware
   if (!_modulesLoaded) {
diff --git a/services/web/types/web-module.ts b/services/web/types/web-module.ts
index 406d03d85b..298f430df2 100644
--- a/services/web/types/web-module.ts
+++ b/services/web/types/web-module.ts
@@ -1,3 +1,5 @@
+import type { RequestHandler } from 'express'
+
 type LinkedFileAgent = {
   createLinkedFile: (
     projectId: string,
@@ -41,6 +43,11 @@ export type WebModule = {
       privateApiRouter?: any,
       publicApiRouter?: any
     ) => void
+    applyNonCsrfRouter?: (
+      webRouter: any,
+      privateApiRouter?: any,
+      publicApiRouter?: any
+    ) => void
   }
   nonCsrfRouter?: {
     apply: (webRouter: any, privateApiRouter: any, publicApiRouter: any) => void
@@ -49,7 +56,7 @@ export type WebModule = {
     [name: string]: (args: any[]) => void
   }
   middleware?: {
-    [name: string]: (req: any, res: any, next: any) => void
+    [name: string]: RequestHandler
   }
   sessionMiddleware?: (webRouter: any, options: any) => void
   start?: () => Promise<void>
@@ -57,4 +64,5 @@ export type WebModule = {
   linkedFileAgents?: {
     [name: string]: () => LinkedFileAgent
   }
+  viewIncludes?: Record<string, string[]>
 }

From fe8964cc0af66729afe6fa00f6a6997fc02f2821 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Mon, 14 Jul 2025 10:51:04 +0100
Subject: [PATCH 217/274] Merge pull request #26994 from
 overleaf/rh-cio-ai-assist

Expose AI status to customer.io

GitOrigin-RevId: 7e69676d686326f50b16cbae9b1e4d97c14612fa
---
 .../Project/ProjectListController.mjs         | 47 ++++++++++++++-----
 services/web/app/views/_customer_io.pug       | 27 +++++++++--
 .../Project/ProjectListController.test.mjs    |  1 +
 3 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectListController.mjs b/services/web/app/src/Features/Project/ProjectListController.mjs
index 60d964e532..4c4ed17fb2 100644
--- a/services/web/app/src/Features/Project/ProjectListController.mjs
+++ b/services/web/app/src/Features/Project/ProjectListController.mjs
@@ -423,6 +423,8 @@ async function projectListPage(req, res, next) {
   // customer.io: Premium nudge experiment
   // Only do customer-io-trial-conversion assignment for users not in India/China and not in group/commons
   let customerIoEnabled = false
+  const aiBlocked = !(await _canUseAIAssist(user))
+  const hasAiAssist = await _userHasAIAssist(user)
   if (!userIsMemberOfGroupSubscription && !inEnterpriseCommons) {
     try {
       const ip = req.ip
@@ -487,6 +489,8 @@ async function projectListPage(req, res, next) {
     userRestrictions: Array.from(req.userRestrictions || []),
     customerIoEnabled,
     showAiAssistNotification,
+    aiBlocked,
+    hasAiAssist,
   })
 }
 
@@ -771,6 +775,35 @@ function _hasActiveFilter(filters) {
   )
 }
 
+async function _userHasAIAssist(user) {
+  // Check if the user has AI Assist enabled via Overleaf
+  if (user.features?.aiErrorAssistant) {
+    return true
+  }
+  // Check if the user has AI Assist enabled via Writefull
+  const { isPremium: hasAiAssistViaWritefull } =
+    await UserGetter.promises.getWritefullData(user._id)
+  if (hasAiAssistViaWritefull) {
+    return true
+  }
+  return false
+}
+
+// Determines if user is able to enable AI assist
+// based on their permissions and settings
+// It does NOT determine if the user has AI Assist enabled
+async function _canUseAIAssist(user) {
+  // Check if the assistant has been manually disabled by the user
+  if (user.aiErrorAssistant?.enabled === false) {
+    return false
+  }
+
+  // Check if the user can use AI features (policy check)
+  return await PermissionsManager.promises.checkUserPermissions(user, [
+    'use-ai',
+  ])
+}
+
 async function _showAiAssistNotification(user) {
   // Check if the assistant has been manually disabled by the user
   if (user.aiErrorAssistant?.enabled === false) {
@@ -794,18 +827,8 @@ async function _showAiAssistNotification(user) {
     return false
   }
 
-  // Check if the user already has AI Assist via Overleaf
-  if (user.features?.aiErrorAssistant) {
-    return false
-  }
-  // Check if the user already has AI Assist via Writefull
-  const { isPremium: hasAiAssistViaWritefull } =
-    await UserGetter.promises.getWritefullData(user._id)
-  if (hasAiAssistViaWritefull) {
-    return false
-  }
-
-  return true
+  const userHasAiAssist = await _userHasAIAssist(user)
+  return !userHasAiAssist
 }
 
 export default {
diff --git a/services/web/app/views/_customer_io.pug b/services/web/app/views/_customer_io.pug
index 781dfaab13..61b4dc9f1d 100644
--- a/services/web/app/views/_customer_io.pug
+++ b/services/web/app/views/_customer_io.pug
@@ -1,11 +1,22 @@
 if(customerIoEnabled && ExposedSettings.cioWriteKey && ExposedSettings.cioSiteId)
-	script(type="text/javascript", id="cio-loader", nonce=scriptNonce, data-best-subscription=(usersBestSubscription && usersBestSubscription.type), data-cio-write-key=ExposedSettings.cioWriteKey, data-cio-site-id=ExposedSettings.cioSiteId, data-session-analytics-id=getSessionAnalyticsId(), data-user-id=getLoggedInUserId()).
+	-
+		function boolAttr(value) {
+			return value !== undefined ? String(value) : null;
+		}
+	script(type="text/javascript", id="cio-loader", nonce=scriptNonce, data-best-subscription=(usersBestSubscription && usersBestSubscription.type), data-ai-blocked=boolAttr(aiBlocked), data-has-ai-assist=boolAttr(hasAiAssist), data-cio-write-key=ExposedSettings.cioWriteKey, data-cio-site-id=ExposedSettings.cioSiteId, data-session-analytics-id=getSessionAnalyticsId(), data-user-id=getLoggedInUserId()).
+		
+		function parseBool(value) {
+			return value === 'true' ? true : value === 'false' ? false : undefined;
+		}
+		
 		var cioSettings = document.querySelector('#cio-loader').dataset;
 		var analyticsId = cioSettings.sessionAnalyticsId;
 		var siteId = cioSettings.cioSiteId;
 		var writeKey = cioSettings.cioWriteKey;
 		var userId = cioSettings.userId;
-		var usersBestSubscription = cioSettings.bestSubscription
+		var usersBestSubscription = cioSettings.bestSubscription;
+		var aiBlocked = parseBool(cioSettings.aiBlocked);
+		var hasAiAssist = parseBool(cioSettings.hasAiAssist);
 
 
 		!function(){var i="cioanalytics", analytics=(window[i]=window[i]||[]);if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on","addSourceMiddleware","addIntegrationMiddleware","setAnonymousId","addDestinationMiddleware"];analytics.factory=function(e){return function(){var t=Array.prototype.slice.call(arguments);t.unshift(e);analytics.push(t);return analytics}};for(var e=0;e<analytics.methods.length;e++){var key=analytics.methods[e];analytics[key]=analytics.factory(key)}analytics.load=function(key,e){var t=document.createElement("script");t.type="text/javascript";t.async=!0;t.setAttribute('data-global-customerio-analytics-key', i);t.src="https://cdp.customer.io/v1/analytics-js/snippet/" + key + "/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);analytics._writeKey=key;analytics._loadOptions=e};analytics.SNIPPET_VERSION="4.15.3";
@@ -23,5 +34,15 @@ if(customerIoEnabled && ExposedSettings.cioWriteKey && ExposedSettings.cioSiteId
 			if (analyticsId) {
 				analytics.setAnonymousId(analyticsId);
 			};
-			analytics.identify(analyticsId, {overleafId: userId, 'best-subscription-type': usersBestSubscription  });
+			
+			function addIfDefined(obj, key, value) {
+				if (typeof value !== 'undefined') obj[key] = value;
+			}
+			
+			var identifyData = {overleafId: userId};
+			addIfDefined(identifyData, 'best-subscription-type', usersBestSubscription);
+			addIfDefined(identifyData, 'aiBlocked', aiBlocked);
+			addIfDefined(identifyData, 'hasAiAssist', hasAiAssist);
+			
+			analytics.identify(analyticsId, identifyData);
 		}}();
diff --git a/services/web/test/unit/src/Project/ProjectListController.test.mjs b/services/web/test/unit/src/Project/ProjectListController.test.mjs
index 3ff120ce4c..1f83bfb0c5 100644
--- a/services/web/test/unit/src/Project/ProjectListController.test.mjs
+++ b/services/web/test/unit/src/Project/ProjectListController.test.mjs
@@ -87,6 +87,7 @@ describe('ProjectListController', function () {
       promises: {
         getUsers: sinon.stub().resolves(ctx.usersArr),
         getUserFullEmails: sinon.stub().resolves([]),
+        getWritefullData: sinon.stub().resolves({ isPremium: true }),
       },
     }
     ctx.Features = {

From 1b70f09bee2f9fbc61ba08ca4970f172d7dd0d30 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Mon, 14 Jul 2025 10:51:28 +0100
Subject: [PATCH 218/274] Merge pull request #27031 from
 overleaf/rh-safari-video-el

Catch video autoplay errors from Safari

GitOrigin-RevId: c2ed2b0a720603bfb80ebb3025c4ed107eec7f06
---
 .../frontend/js/features/autoplay-video/index.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/services/web/frontend/js/features/autoplay-video/index.js b/services/web/frontend/js/features/autoplay-video/index.js
index d706f9058b..0f66f67d65 100644
--- a/services/web/frontend/js/features/autoplay-video/index.js
+++ b/services/web/frontend/js/features/autoplay-video/index.js
@@ -1,3 +1,5 @@
+import { debugConsole } from '@/utils/debugging'
+
 function setup(videoEl) {
   const reducedMotionReduce = window.matchMedia(
     '(prefers-reduced-motion: reduce)'
@@ -35,10 +37,18 @@ function setup(videoEl) {
           videoIsVisible = true
           if (videoEl.readyState >= videoEl.HAVE_FUTURE_DATA) {
             if (!videoEl.ended) {
-              videoEl.play()
+              videoEl
+                .play()
+                .catch(error =>
+                  debugConsole.error('Video autoplay failed:', error)
+                )
+            } else {
+              videoEl
+                .play()
+                .catch(error =>
+                  debugConsole.error('Video autoplay failed:', error)
+                )
             }
-          } else {
-            videoEl.play()
           }
         } else {
           videoIsVisible = false

From caedd0f850d0e711748ad3b4d5eaa32fd3c2d2bb Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Mon, 14 Jul 2025 10:51:43 +0100
Subject: [PATCH 219/274] Merge pull request #27046 from
 overleaf/rh-header-footer

Header and footer changes

GitOrigin-RevId: 963b07e6240401b6fc87ace7328b6f5a2046dc6c
---
 .../layout/fat-footer-website-redesign.pug    | 38 ++++++++++---------
 services/web/app/views/layout/fat-footer.pug  | 38 ++++++++++---------
 .../web/frontend/extracted-translations.json  | 14 +++----
 .../components/sidebar/sidebar-ds-nav.tsx     |  2 +-
 .../bootstrap-5/footer/fat-footer.tsx         | 26 +++++++------
 .../bootstrap-5/components/footer.scss        |  4 +-
 .../stylesheets/components/footer.less        |  4 +-
 services/web/locales/en.json                  | 20 +++++-----
 8 files changed, 79 insertions(+), 67 deletions(-)

diff --git a/services/web/app/views/layout/fat-footer-website-redesign.pug b/services/web/app/views/layout/fat-footer-website-redesign.pug
index 26e003ad56..5a613df44a 100644
--- a/services/web/app/views/layout/fat-footer-website-redesign.pug
+++ b/services/web/app/views/layout/fat-footer-website-redesign.pug
@@ -13,15 +13,26 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 				ul.list-unstyled
 					li
 						a(href='/about') #{translate('footer_about_us')}
-					li
-						a(href='/about/values') #{translate('our_values')}
 					li
 						a(href='https://digitalscience.pinpointhq.com/') #{translate('careers')}
-					li
-						a(href='/for/press') !{translate('press_and_awards')}
 					li
 						a(href='/blog') #{translate('blog')}
 
+			.footer-section
+				h2.footer-section-heading #{translate('solutions')}
+
+				ul.list-unstyled
+					li
+						a(href='/for/enterprises') #{translate('for_business')}
+					li
+						a(href='/for/universities') #{translate('for_universities')}
+					li
+						a(href='/for/government') #{translate('for_government')}
+					li
+						a(href='/for/publishers') #{translate('for_publishers')}
+					li
+						a(href='/about/customer-stories') #{translate('customer_stories')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('learn')}
 
@@ -40,24 +51,19 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 						a(href='/learn/latex/Tables') #{translate('how_to_create_tables')}
 
 			.footer-section
-				h2.footer-section-heading !{translate('footer_plans_and_pricing')}
+				h2.footer-section-heading !{translate('pricing')}
 
 				ul.list-unstyled
 					li
-						a(href='/learn/how-to/Overleaf_premium_features') #{translate('premium_features')}
-					li
-						a(href='/user/subscription/plans?itm_referrer=footer-for-indv-groups') !{translate('for_individuals_and_groups')}
-					li
-						a(href='/for/enterprises') #{translate('for_business')}
-					li
-						a(href='/for/universities') #{translate('for_universities')}
+						a(href='/user/subscription/plans?itm_referrer=footer-for-indv') #{translate('for_individuals')}
+					li
+						a(
+							href='/user/subscription/plans?plan=group&itm_referrer=footer-for-groups'
+						) !{translate('for_groups_and_organizations')}
 					li
 						a(
-							data-ol-for-students-link
 							href='/user/subscription/plans?itm_referrer=footer-for-students#student-annual'
 						) #{translate('for_students')}
-					li
-						a(href='/for/government') #{translate('for_government')}
 
 			.footer-section
 				h2.footer-section-heading #{translate('get_involved')}
@@ -73,8 +79,6 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 				h2.footer-section-heading #{translate('help')}
 
 				ul.list-unstyled
-					li
-						a(href='/about/why-latex') #{translate('why_latex')}
 					li
 						a(href='/learn') #{translate('Documentation')} 
 					li
diff --git a/services/web/app/views/layout/fat-footer.pug b/services/web/app/views/layout/fat-footer.pug
index d672d5ec29..518511b11f 100644
--- a/services/web/app/views/layout/fat-footer.pug
+++ b/services/web/app/views/layout/fat-footer.pug
@@ -13,15 +13,26 @@ footer.fat-footer.hidden-print
 				ul.list-unstyled
 					li
 						a(href='/about') #{translate('footer_about_us')}
-					li
-						a(href='/about/values') #{translate('our_values')}
 					li
 						a(href='https://digitalscience.pinpointhq.com/') #{translate('careers')}
-					li
-						a(href='/for/press') !{translate('press_and_awards')}
 					li
 						a(href='/blog') #{translate('blog')}
 
+			.footer-section
+				h2.footer-section-heading #{translate('solutions')}
+
+				ul.list-unstyled
+					li
+						a(href='/for/enterprises') #{translate('for_business')}
+					li
+						a(href='/for/universities') #{translate('for_universities')}
+					li
+						a(href='/for/government') #{translate('for_government')}
+					li
+						a(href='/for/publishers') #{translate('for_publishers')}
+					li
+						a(href='/about/customer-stories') #{translate('customer_stories')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('learn')}
 
@@ -40,24 +51,19 @@ footer.fat-footer.hidden-print
 						a(href='/learn/latex/Tables') #{translate('how_to_create_tables')}
 
 			.footer-section
-				h2.footer-section-heading !{translate('footer_plans_and_pricing')}
+				h2.footer-section-heading !{translate('pricing')}
 
 				ul.list-unstyled
 					li
-						a(href='/learn/how-to/Overleaf_premium_features') #{translate('premium_features')}
-					li
-						a(href='/user/subscription/plans?itm_referrer=footer-for-indv-groups') !{translate('for_individuals_and_groups')}
-					li
-						a(href='/for/enterprises') #{translate('for_enterprise')}
-					li
-						a(href='/for/universities') #{translate('for_universities')}
+						a(href='/user/subscription/plans?itm_referrer=footer-for-indv') #{translate('for_individuals')}
+					li
+						a(
+							href='/user/subscription/plans?plan=group&itm_referrer=footer-for-groups'
+						) !{translate('for_groups_and_organizations')}
 					li
 						a(
-							data-ol-for-students-link
 							href='/user/subscription/plans?itm_referrer=footer-for-students#student-annual'
 						) #{translate('for_students')}
-					li
-						a(href='/for/government') #{translate('for_government')}
 
 			.footer-section
 				h2.footer-section-heading #{translate('get_involved')}
@@ -73,8 +79,6 @@ footer.fat-footer.hidden-print
 				h2.footer-section-heading #{translate('help')}
 
 				ul.list-unstyled
-					li
-						a(href='/about/why-latex') #{translate('why_latex')}
 					li
 						a(href='/learn') #{translate('Documentation')} 
 					li
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index f4bb6c7c8e..345bbb7a0e 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -11,7 +11,8 @@
   "Get Involved": "",
   "Help": "",
   "Learn": "",
-  "Plans and Pricing": "",
+  "Pricing": "",
+  "Solutions": "",
   "a_custom_size_has_been_used_in_the_latex_code": "",
   "a_fatal_compile_error_that_completely_blocks_compilation": "",
   "a_file_with_that_name_already_exists_and_will_be_overriden": "",
@@ -357,6 +358,7 @@
   "currently_subscribed_to_plan": "",
   "custom": "",
   "custom_borders": "",
+  "customer_stories": "",
   "customize_your_group_subscription": "",
   "customizing_figures": "",
   "customizing_tables": "",
@@ -601,10 +603,12 @@
   "footer_contact_us": "",
   "footer_navigation": "",
   "footnotes": "",
-  "for_enterprise": "",
+  "for_business": "",
   "for_government": "",
-  "for_individuals_and_groups": "",
+  "for_groups_and_organizations": "",
+  "for_individuals": "",
   "for_more_information_see_managed_accounts_section": "",
+  "for_publishers": "",
   "for_students": "",
   "for_universities": "",
   "format": "",
@@ -1167,7 +1171,6 @@
   "other_logs_and_files": "",
   "other_output_files": "",
   "our_team_will_get_back_to_you_shortly": "",
-  "our_values": "",
   "out_of_sync": "",
   "out_of_sync_detail": "",
   "output_file": "",
@@ -1273,10 +1276,8 @@
   "postal_code": "",
   "premium": "",
   "premium_feature": "",
-  "premium_features": "",
   "premium_plan_label": "",
   "presentation_mode": "",
-  "press_and_awards": "",
   "previous_page": "",
   "price": "",
   "primarily_work_study_question": "",
@@ -2089,7 +2090,6 @@
   "what_should_we_call_you": "",
   "whats_different_in_the_new_editor": "",
   "when_you_tick_the_include_caption_box": "",
-  "why_latex": "",
   "why_might_this_happen": "",
   "why_not_pause_instead": "",
   "wide": "",
diff --git a/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx b/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
index 289fb5bbb0..e548d994ec 100644
--- a/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
+++ b/services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx
@@ -33,7 +33,7 @@ function SidebarDsNav() {
   const sendMB = useSendProjectListMB()
   const { sessionUser, showSubscriptionLink, items } = getMeta('ol-navbar')
   const helpItem = items.find(
-    item => item.text === 'help'
+    item => item.text === 'help_and_resources'
   ) as NavbarDropdownItemData
   const { containerRef, scrolledUp, scrolledDown } = useScrolled()
   return (
diff --git a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx
index 790d6fe790..8592997f9a 100644
--- a/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx
+++ b/services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx
@@ -21,12 +21,20 @@ function FatFooter() {
       title: t('About'),
       links: [
         { href: '/about', label: t('footer_about_us') },
-        { href: '/about/values', label: t('our_values') },
         { href: 'https://digitalscience.pinpointhq.com/', label: t('careers') },
-        { href: '/for/press', label: t('press_and_awards') },
         { href: '/blog', label: t('blog') },
       ],
     },
+    {
+      title: t('Solutions'),
+      links: [
+        { href: '/for/enterprises', label: t('for_business') },
+        { href: '/for/universities', label: t('for_universities') },
+        { href: '/for/government', label: t('for_government') },
+        { href: '/for/publishers', label: t('for_publishers') },
+        { href: '/about/customer-stories', label: t('customer_stories') },
+      ],
+    },
     {
       title: t('Learn'),
       links: [
@@ -45,23 +53,20 @@ function FatFooter() {
       ],
     },
     {
-      title: t('Plans and Pricing'),
+      title: t('Pricing'),
       links: [
         {
-          href: '/learn/how-to/Overleaf_premium_features',
-          label: t('premium_features'),
+          href: '/user/subscription/plans?itm_referrer=footer-for-indv',
+          label: t('for_individuals'),
         },
         {
-          href: '/user/subscription/plans?itm_referrer=footer-for-indv-groups',
-          label: t('for_individuals_and_groups'),
+          href: '/user/subscription/plans?plan=group&itm_referrer=footer-for-groups',
+          label: t('for_groups_and_organizations'),
         },
-        { href: '/for/enterprises', label: t('for_enterprise') },
-        { href: '/for/universities', label: t('for_universities') },
         {
           href: '/user/subscription/plans?itm_referrer=footer-for-students#student-annual',
           label: t('for_students'),
         },
-        { href: '/for/government', label: t('for_government') },
       ],
     },
     {
@@ -77,7 +82,6 @@ function FatFooter() {
     {
       title: t('Help'),
       links: [
-        { href: '/about/why-latex', label: t('why_latex') },
         { href: '/learn', label: t('Documentation') },
         { href: '/contact', label: t('footer_contact_us') },
         { href: 'https://status.overleaf.com/', label: t('website_status') },
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/footer.scss b/services/web/frontend/stylesheets/bootstrap-5/components/footer.scss
index cd92669668..48e4a25261 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/footer.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/footer.scss
@@ -354,12 +354,12 @@ footer.site-footer {
     }
 
     .fat-footer-sections {
-      grid-template-columns: repeat(6, 1fr);
+      grid-template-columns: repeat(7, 1fr);
       grid-template-rows: auto;
     }
 
     .footer-section:last-of-type {
-      grid-column: 6;
+      grid-column: 7;
     }
   }
 }
diff --git a/services/web/frontend/stylesheets/components/footer.less b/services/web/frontend/stylesheets/components/footer.less
index b36f51ab11..e966d3a9dc 100644
--- a/services/web/frontend/stylesheets/components/footer.less
+++ b/services/web/frontend/stylesheets/components/footer.less
@@ -279,12 +279,12 @@ footer.site-footer {
     }
 
     .fat-footer-sections {
-      grid-template-columns: repeat(6, 1fr);
+      grid-template-columns: repeat(7, 1fr);
       grid-template-rows: auto;
     }
 
     .footer-section:last-of-type {
-      grid-column: 6;
+      grid-column: 7;
     }
   }
 }
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index c5ba1f84b7..23cc4e251a 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -475,6 +475,7 @@
   "custom": "Custom",
   "custom_borders": "Custom borders",
   "customer_resource_portal": "Customer resource portal",
+  "customer_stories": "Customer stories",
   "customize": "Customize",
   "customize_your_group_subscription": "Customize your group subscription",
   "customizing_figures": "Customizing figures",
@@ -736,7 +737,6 @@
   "featured": "Featured",
   "featured_latex_templates": "Featured LaTeX Templates",
   "features": "Features",
-  "features_and_benefits": "Features & Benefits",
   "features_like_track_changes": "Features like real-time track changes",
   "february": "February",
   "figure": "Figure",
@@ -783,12 +783,11 @@
   "footer_about_us": "About us",
   "footer_contact_us": "Contact us",
   "footer_navigation": "Footer navigation",
-  "footer_plans_and_pricing": "Plans & pricing",
   "footnotes": "Footnotes",
   "for_business": "For business",
-  "for_enterprise": "For enterprise",
   "for_government": "For government",
-  "for_individuals_and_groups": "For individuals & groups",
+  "for_groups_and_organizations": "For groups and organizations",
+  "for_individuals": "For individuals",
   "for_large_institutions_and_organizations_need_sitewide_on_premise": "For large institutions and organizations that need site-wide access or an on-premises solution.",
   "for_more_information_see_managed_accounts_section": "For more information, see the \"Managed Accounts\" section in <0>our terms of use</0>, which you agree to by clicking Accept invitation.",
   "for_publishers": "For publishers",
@@ -943,7 +942,9 @@
   "have_more_days_to_try": "Have another <strong>__days__ days</strong> on your trial!",
   "headers": "Headers",
   "help": "Help",
+  "help_and_resources": "Help & resources",
   "help_articles_matching": "Help articles matching your subject",
+  "help_guides": "Help guides",
   "help_improve_overleaf_fill_out_this_survey": "If you would like to help us improve Overleaf, please take a moment to fill out <0>this survey</0>.",
   "help_improve_screen_reader_fill_out_this_survey": "Help us improve your experience using a screen reader with __appName__ by filling out this quick survey.",
   "help_shape_the_future_of_overleaf": "Help shape the future of Overleaf",
@@ -1135,7 +1136,7 @@
   "italics": "Italics",
   "ja": "Japanese",
   "january": "January",
-  "join_beta_program": "Join beta program",
+  "join_beta_program": "Join the beta program",
   "join_labs": "Join Labs",
   "join_now": "Join now",
   "join_overleaf_labs": "Join Overleaf Labs",
@@ -1182,7 +1183,7 @@
   "latex_articles_page_title": "Articles - Papers, Presentations, Reports and more",
   "latex_examples": "LaTeX examples",
   "latex_examples_page_title": "Examples - Equations, Formatting, TikZ, Packages and More",
-  "latex_in_thirty_minutes": "LaTeX in 30 minutes",
+  "latex_in_thirty_minutes": "Learn LaTeX in 30 minutes",
   "latex_places_figures_according_to_a_special_algorithm": "LaTeX places figures according to a special algorithm. You can use something called ‘placement parameters’ to influence the positioning of the figure. <0>Find out how</>",
   "latex_places_tables_according_to_a_special_algorithm": "LaTeX places tables according to a special algorithm. You can use “placement parameters” to influence the position of the table. <0>This article</0> explains how to do this.",
   "latex_templates": "LaTeX Templates",
@@ -1534,7 +1535,6 @@
   "other_sessions": "Other Sessions",
   "other_ways_to_log_in": "Other ways to log in",
   "our_team_will_get_back_to_you_shortly": "Our team will get back to you shortly.",
-  "our_values": "Our values",
   "out_of_sync": "Out of sync",
   "out_of_sync_detail": "Sorry, this file has gone out of sync and we need to do a full refresh.<0 /><1>Please see this help guide for more information</1>",
   "output_file": "Output file",
@@ -1635,7 +1635,6 @@
   "plan": "Plan",
   "plan_tooltip": "You’re on the __plan__ plan. Click to find out how to make the most of your Overleaf premium features.",
   "planned_maintenance": "Planned Maintenance",
-  "plans_amper_pricing": "Plans & Pricing",
   "plans_and_pricing": "Plans and Pricing",
   "plans_and_pricing_lowercase": "plans and pricing",
   "please_ask_the_project_owner_to_upgrade_more_collaborators": "Please ask the project owner to upgrade their plan to allow more collaborators.",
@@ -1680,13 +1679,12 @@
   "postal_code": "Postal code",
   "premium": "Premium",
   "premium_feature": "Premium feature",
-  "premium_features": "Premium features",
   "premium_plan_label": "You’re using <b>Overleaf Premium</b>",
   "presentation": "Presentation",
   "presentation_mode": "Presentation mode",
-  "press_and_awards": "Press & awards",
   "previous_page": "Previous page",
   "price": "Price",
+  "pricing": "Pricing",
   "primarily_work_study_question": "Where do you primarily work or study?",
   "primarily_work_study_question_company": "Company",
   "primarily_work_study_question_government": "Government",
@@ -1708,6 +1706,7 @@
   "processing": "processing",
   "processing_uppercase": "Processing",
   "processing_your_request": "Please wait while we process your request.",
+  "product": "Product",
   "professional": "Professional",
   "progress_bar_percentage": "Progress bar from 0 to 100%",
   "project": "project",
@@ -2069,6 +2068,7 @@
   "six_per_project": "6 per project",
   "skip": "Skip",
   "skip_to_content": "Skip to content",
+  "solutions": "Solutions",
   "something_not_right": "Something’s not right",
   "something_went_wrong": "Something went wrong",
   "something_went_wrong_canceling_your_subscription": "Something went wrong canceling your subscription. Please contact Support.",

From 2e2415c56e24da793ec80173a194541465fa791b Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Mon, 14 Jul 2025 12:14:02 +0200
Subject: [PATCH 220/274] [server-pro] move revision from
 /var/www/revisions.txt into label (#27071)

Co-authored-by: Brian Gough <brian.gough@overleaf.com>
GitOrigin-RevId: d760498b50006a23f446a91647954d00fa22f2f2
---
 server-ce/Dockerfile | 6 ------
 server-ce/Makefile   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile
index 0c33505550..5f32eb67cb 100644
--- a/server-ce/Dockerfile
+++ b/server-ce/Dockerfile
@@ -115,9 +115,3 @@ ENV LOG_LEVEL="info"
 EXPOSE 80
 
 ENTRYPOINT ["/sbin/my_init"]
-
-# Store the revision
-# ------------------
-# This should be the last step to optimize docker image caching.
-ARG MONOREPO_REVISION
-RUN echo "monorepo-server-ce,$MONOREPO_REVISION" > /var/www/revisions.txt
diff --git a/server-ce/Makefile b/server-ce/Makefile
index eb6ea772f1..853a99d05e 100644
--- a/server-ce/Makefile
+++ b/server-ce/Makefile
@@ -33,7 +33,7 @@ build-community:
 	  --build-arg BUILDKIT_INLINE_CACHE=1 \
 	  --progress=plain \
 	  --build-arg OVERLEAF_BASE_TAG \
-	  --build-arg MONOREPO_REVISION \
+	  --label "com.overleaf.ce.revision=$(MONOREPO_REVISION)" \
 	  --cache-from $(OVERLEAF_LATEST) \
 	  --cache-from $(OVERLEAF_BRANCH) \
 	  --file Dockerfile \

From 0f1d672a575ba2f9bcbbff658e9b6636acac1f67 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Mon, 14 Jul 2025 14:45:13 +0200
Subject: [PATCH 221/274] [server-ce] update copy/logo in README (#27104)

* [server-ce] add warning on not using sandboxed compiles

Co-authored-by: Mathew Evans <matt.evans@overleaf.com>

* [server-ce] update logo

Co-authored-by: Jamie Liu <jamie.liu@overleaf.com>

---------

Co-authored-by: Mathew Evans <matt.evans@overleaf.com>
Co-authored-by: Jamie Liu <jamie.liu@overleaf.com>
GitOrigin-RevId: 9fafa951af9918924eae5493dbe8f9aa3dfc87b2
---
 README.md    |   5 +++++
 doc/logo.png | Bin 72621 -> 13169 bytes
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 4895254926..524a831262 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,11 @@
 
 [Overleaf](https://www.overleaf.com) is an open-source online real-time collaborative LaTeX editor. We run a hosted version at [www.overleaf.com](https://www.overleaf.com), but you can also run your own local version, and contribute to the development of Overleaf.
 
+> [!CAUTION]
+> Overleaf Community Edition is intended for use in environments where **all** users are trusted. Community Edition is **not** appropriate for scenarios where isolation of users is required due to Sandbox Compiles not being available. When not using Sandboxed Compiles, users have full read and write access to the `sharelatex` container resources (filesystem, network, environment variables) when running LaTeX compiles.
+
+For more information on Sandbox Compiles check out our [documentation](https://docs.overleaf.com/on-premises/configuration/overleaf-toolkit/server-pro-only-configuration/sandboxed-compiles).
+
 ## Enterprise
 
 If you want help installing and maintaining Overleaf in your lab or workplace, we offer an officially supported version called [Overleaf Server Pro](https://www.overleaf.com/for/enterprises). It also includes more features for security (SSO with LDAP or SAML), administration and collaboration (e.g. tracked changes). [Find out more!](https://www.overleaf.com/for/enterprises)
diff --git a/doc/logo.png b/doc/logo.png
index 106926b0950802d42414a1d94952e73f703d5c25..f154ac0ccaa9daf804fb7136ebda89edb2707b8a 100644
GIT binary patch
literal 13169
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
Ck_S=%

literal 72621
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
K?aekNUin{HQ`J=f


From 1768bef22af889a79971decdbda83674ca75ff7a Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com>
Date: Mon, 14 Jul 2025 09:08:28 -0500
Subject: [PATCH 222/274] Merge pull request #26366 from overleaf/jel-group-csv

[web] Include in group members CSV if user is managed and/or linked to the group's SSO

GitOrigin-RevId: 449974917d98cf121ea46eaa58be4b3666d88268
---
 .../UserMembershipController.mjs              |  68 +++++++---
 .../UserMembershipController.test.mjs         | 117 +++++++++++++++++-
 2 files changed, 167 insertions(+), 18 deletions(-)

diff --git a/services/web/app/src/Features/UserMembership/UserMembershipController.mjs b/services/web/app/src/Features/UserMembership/UserMembershipController.mjs
index 4be1221255..1f2516b0f5 100644
--- a/services/web/app/src/Features/UserMembership/UserMembershipController.mjs
+++ b/services/web/app/src/Features/UserMembership/UserMembershipController.mjs
@@ -13,6 +13,7 @@ import { Parser as CSVParser } from 'json2csv'
 import { expressify } from '@overleaf/promise-utils'
 import PlansLocator from '../Subscription/PlansLocator.js'
 import RecurlyClient from '../Subscription/RecurlyClient.js'
+import Modules from '../../infrastructure/Modules.js'
 
 async function manageGroupMembers(req, res, next) {
   const { entity: subscription, entityConfig } = req
@@ -121,6 +122,56 @@ async function _renderManagersPage(req, res, next, template) {
   })
 }
 
+async function exportCsv(req, res) {
+  let ssoEnabled
+  const { entity, entityConfig } = req
+  const fields = ['email', 'last_logged_in_at', 'last_active_at']
+
+  const { managedUsersEnabled } = entity
+
+  let users = await UserMembershipHandler.promises.getUsers(
+    entity,
+    entityConfig
+  )
+
+  if (entity.ssoConfig) {
+    const ssoEnabledResult = await Modules.promises.hooks.fire(
+      'hasGroupSSOEnabled',
+      entity
+    )
+    ssoEnabled = ssoEnabledResult?.[0]
+  }
+
+  if (managedUsersEnabled) {
+    fields.push('managed')
+  }
+
+  if (ssoEnabled) {
+    fields.push('sso')
+  }
+
+  if (managedUsersEnabled || ssoEnabled) {
+    users = users.map(user => {
+      if (managedUsersEnabled) {
+        user.managed =
+          user.enrollment?.managedBy?.toString() === entity._id.toString()
+      }
+
+      if (ssoEnabled) {
+        user.sso = !!user.enrollment?.sso?.some(
+          groupLinked =>
+            groupLinked.groupId.toString() === entity._id.toString()
+        )
+      }
+      return user
+    })
+  }
+
+  const csvParser = new CSVParser({ fields })
+
+  csvAttachment(res, csvParser.parse(users), 'Group.csv')
+}
+
 export default {
   manageGroupMembers: expressify(manageGroupMembers),
   manageGroupManagers: expressify(manageGroupManagers),
@@ -208,22 +259,7 @@ export default {
       }
     )
   },
-  exportCsv(req, res, next) {
-    const { entity, entityConfig } = req
-    const fields = ['email', 'last_logged_in_at', 'last_active_at']
-
-    UserMembershipHandler.getUsers(
-      entity,
-      entityConfig,
-      function (error, users) {
-        if (error != null) {
-          return next(error)
-        }
-        const csvParser = new CSVParser({ fields })
-        csvAttachment(res, csvParser.parse(users), 'Group.csv')
-      }
-    )
-  },
+  exportCsv: expressify(exportCsv),
   new(req, res, next) {
     res.render('user_membership/new', {
       entityName: req.params.name,
diff --git a/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs b/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
index de2391275d..1726b2a41b 100644
--- a/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
+++ b/services/web/test/unit/src/UserMembership/UserMembershipController.test.mjs
@@ -59,6 +59,48 @@ describe('UserMembershipController', function () {
         last_logged_in_at: '2020-05-20T10:41:11.407Z',
         last_active_at: '2021-05-20T10:41:11.407Z',
       },
+      {
+        _id: 'mock-member-id-3',
+        email: 'mock-email-3@foo.com',
+        last_logged_in_at: '2021-08-10T10:41:11.407Z',
+        last_active_at: '2021-08-20T10:41:11.407Z',
+        enrollment: {
+          managedBy: 'some-other-subscription-id',
+          enrolledAt: '2021-05-20T10:41:11.407Z',
+          sso: undefined,
+        },
+      },
+      {
+        _id: 'mock-member-id-4',
+        email: 'mock-email-4@foo.com',
+        last_logged_in_at: '2021-01-01T10:41:11.407Z',
+        last_active_at: '2021-01-02T10:41:11.407Z',
+        enrollment: {
+          managedBy: 'mock-subscription-id',
+          enrolledAt: '2021-01-02T10:41:11.407Z',
+          sso: undefined,
+        },
+      },
+      {
+        _id: 'mock-member-id-5',
+        email: 'mock-email-5@foo.com',
+        last_logged_in_at: '2023-01-01T10:41:11.407Z',
+        last_active_at: '2023-01-02T10:41:11.407Z',
+        enrollment: {
+          sso: [{ groupId: ctx.subscription._id }],
+        },
+      },
+      {
+        _id: 'mock-member-id-6',
+        email: 'mock-email-6@foo.com',
+        last_logged_in_at: '2024-01-01T10:41:11.407Z',
+        last_active_at: '2024-01-02T10:41:11.407Z',
+        enrollment: {
+          managedBy: 'mock-subscription-id',
+          enrolledAt: '2024-01-02T10:41:11.407Z',
+          sso: [{ groupId: ctx.subscription._id }],
+        },
+      },
     ]
 
     ctx.Settings = {
@@ -143,6 +185,17 @@ describe('UserMembershipController', function () {
       SSOConfig: ctx.SSOConfig,
     }))
 
+    ctx.Modules = {
+      promises: {
+        hooks: {
+          fire: sinon.stub(),
+        },
+      },
+    }
+    vi.doMock('../../../../app/src/infrastructure/Modules.js', () => ({
+      default: ctx.Modules,
+    }))
+
     ctx.UserMembershipController = (await import(modulePath)).default
   })
 
@@ -377,7 +430,7 @@ describe('UserMembershipController', function () {
 
     it('get users', function (ctx) {
       sinon.assert.calledWithMatch(
-        ctx.UserMembershipHandler.getUsers,
+        ctx.UserMembershipHandler.promises.getUsers,
         ctx.subscription,
         { modelName: 'Subscription' }
       )
@@ -398,7 +451,67 @@ describe('UserMembershipController', function () {
     it('should export the correct csv', function (ctx) {
       assertCalledWith(
         ctx.res.send,
-        '"email","last_logged_in_at","last_active_at"\n"mock-email-1@foo.com","2020-08-09T12:43:11.467Z","2021-08-09T12:43:11.467Z"\n"mock-email-2@foo.com","2020-05-20T10:41:11.407Z","2021-05-20T10:41:11.407Z"'
+        '"email","last_logged_in_at","last_active_at"\n"mock-email-1@foo.com","2020-08-09T12:43:11.467Z","2021-08-09T12:43:11.467Z"\n"mock-email-2@foo.com","2020-05-20T10:41:11.407Z","2021-05-20T10:41:11.407Z"\n"mock-email-3@foo.com","2021-08-10T10:41:11.407Z","2021-08-20T10:41:11.407Z"\n"mock-email-4@foo.com","2021-01-01T10:41:11.407Z","2021-01-02T10:41:11.407Z"\n"mock-email-5@foo.com","2023-01-01T10:41:11.407Z","2023-01-02T10:41:11.407Z"\n"mock-email-6@foo.com","2024-01-01T10:41:11.407Z","2024-01-02T10:41:11.407Z"'
+      )
+    })
+  })
+
+  describe('exportCsv when group is managed', function () {
+    beforeEach(function (ctx) {
+      ctx.req.entity = Object.assign(
+        { managedUsersEnabled: true },
+        ctx.subscription
+      )
+      ctx.req.entityConfig = EntityConfigs.groupManagers
+      ctx.res = new MockResponse()
+      ctx.UserMembershipController.exportCsv(ctx.req, ctx.res)
+    })
+
+    it('should export the correct csv', function (ctx) {
+      assertCalledWith(
+        ctx.res.send,
+        '"email","last_logged_in_at","last_active_at","managed"\n"mock-email-1@foo.com","2020-08-09T12:43:11.467Z","2021-08-09T12:43:11.467Z",false\n"mock-email-2@foo.com","2020-05-20T10:41:11.407Z","2021-05-20T10:41:11.407Z",false\n"mock-email-3@foo.com","2021-08-10T10:41:11.407Z","2021-08-20T10:41:11.407Z",false\n"mock-email-4@foo.com","2021-01-01T10:41:11.407Z","2021-01-02T10:41:11.407Z",true\n"mock-email-5@foo.com","2023-01-01T10:41:11.407Z","2023-01-02T10:41:11.407Z",false\n"mock-email-6@foo.com","2024-01-01T10:41:11.407Z","2024-01-02T10:41:11.407Z",true'
+      )
+    })
+  })
+
+  describe('exportCsv when group has SSO', function () {
+    beforeEach(function (ctx) {
+      ctx.req.entity = Object.assign(
+        { ssoConfig: 'sso-config-id' },
+        ctx.subscription
+      )
+      ctx.req.entityConfig = EntityConfigs.groupManagers
+      ctx.Modules.promises.hooks.fire.resolves([true])
+      ctx.res = new MockResponse()
+      ctx.UserMembershipController.exportCsv(ctx.req, ctx.res)
+    })
+
+    it('should export the correct csv', function (ctx) {
+      assertCalledWith(
+        ctx.res.send,
+        '"email","last_logged_in_at","last_active_at","sso"\n"mock-email-1@foo.com","2020-08-09T12:43:11.467Z","2021-08-09T12:43:11.467Z",false\n"mock-email-2@foo.com","2020-05-20T10:41:11.407Z","2021-05-20T10:41:11.407Z",false\n"mock-email-3@foo.com","2021-08-10T10:41:11.407Z","2021-08-20T10:41:11.407Z",false\n"mock-email-4@foo.com","2021-01-01T10:41:11.407Z","2021-01-02T10:41:11.407Z",false\n"mock-email-5@foo.com","2023-01-01T10:41:11.407Z","2023-01-02T10:41:11.407Z",true\n"mock-email-6@foo.com","2024-01-01T10:41:11.407Z","2024-01-02T10:41:11.407Z",true'
+      )
+    })
+  })
+
+  describe('exportCsv when group has SSO and managed users enabled', function () {
+    beforeEach(function (ctx) {
+      ctx.req.entity = Object.assign(
+        { managedUsersEnabled: true },
+        { ssoConfig: 'sso-config-id' },
+        ctx.subscription
+      )
+      ctx.req.entityConfig = EntityConfigs.groupManagers
+      ctx.Modules.promises.hooks.fire.resolves([true])
+      ctx.res = new MockResponse()
+      ctx.UserMembershipController.exportCsv(ctx.req, ctx.res)
+    })
+
+    it('should export the correct csv', function (ctx) {
+      assertCalledWith(
+        ctx.res.send,
+        '"email","last_logged_in_at","last_active_at","managed","sso"\n"mock-email-1@foo.com","2020-08-09T12:43:11.467Z","2021-08-09T12:43:11.467Z",false,false\n"mock-email-2@foo.com","2020-05-20T10:41:11.407Z","2021-05-20T10:41:11.407Z",false,false\n"mock-email-3@foo.com","2021-08-10T10:41:11.407Z","2021-08-20T10:41:11.407Z",false,false\n"mock-email-4@foo.com","2021-01-01T10:41:11.407Z","2021-01-02T10:41:11.407Z",true,false\n"mock-email-5@foo.com","2023-01-01T10:41:11.407Z","2023-01-02T10:41:11.407Z",false,true\n"mock-email-6@foo.com","2024-01-01T10:41:11.407Z","2024-01-02T10:41:11.407Z",true,true'
       )
     })
   })

From 3c24c9bcc9003024012834c8d6ae4bbdab17c950 Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com>
Date: Mon, 14 Jul 2025 09:08:44 -0500
Subject: [PATCH 223/274] Merge pull request #26473 from
 overleaf/jel-group-domainCapture

[web] Add admin toggle for setting `domainCapture` feature for groups

GitOrigin-RevId: d4dc373aa0d7863f83129126613a38d914afbd5f
---
 services/web/app/src/models/Subscription.js | 1 +
 services/web/frontend/js/utils/meta.ts      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/web/app/src/models/Subscription.js b/services/web/app/src/models/Subscription.js
index 4a5fed6f1f..e082b26afa 100644
--- a/services/web/app/src/models/Subscription.js
+++ b/services/web/app/src/models/Subscription.js
@@ -42,6 +42,7 @@ const SubscriptionSchema = new Schema(
     features: {
       managedUsers: { type: Boolean, default: true },
       groupSSO: { type: Boolean, default: true },
+      domainCapture: { type: Boolean, default: false },
     },
     addOns: Schema.Types.Mixed,
     overleaf: {
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 748ae74789..8f6f8a7ec1 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -44,7 +44,10 @@ import {
 import { SuggestedLanguage } from '../../../types/system-message'
 import type { TeamInvite } from '../../../types/team-invite'
 import { GroupPlans } from '../../../types/subscription/dashboard/group-plans'
-import { GroupSSOLinkingStatus } from '../../../types/subscription/sso'
+import {
+  GroupSSOLinkingStatus,
+  SSOConfig,
+} from '../../../types/subscription/sso'
 import { PasswordStrengthOptions } from '../../../types/password-strength-options'
 import { Subscription as ProjectDashboardSubscription } from '../../../types/project/dashboard/subscription'
 import { ThirdPartyIds } from '../../../types/third-party-ids'
@@ -121,6 +124,7 @@ export interface Meta {
   'ol-groupPlans': GroupPlans
   'ol-groupPolicy': GroupPolicy
   'ol-groupSSOActive': boolean
+  'ol-groupSSOConfig'?: SSOConfig
   'ol-groupSSOTestResult': GroupSSOTestResult
   'ol-groupSettingsAdvertisedFor': string[]
   'ol-groupSettingsEnabledFor': string[]

From 524402e817163d8689a3e7d7de500ee87a81fc9c Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com>
Date: Mon, 14 Jul 2025 09:47:01 -0500
Subject: [PATCH 224/274] Merge pull request #26603 from
 overleaf/jel-domainCaptureEnabled

[web] Add admin toggle for setting `domainCaptureEnabled` feature for groups

GitOrigin-RevId: d116a493402f39c06b3267bf5294ed90ed3e762d
---
 services/web/app/src/models/Subscription.js | 1 +
 services/web/types/admin/subscription.ts    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/services/web/app/src/models/Subscription.js b/services/web/app/src/models/Subscription.js
index e082b26afa..aa840a67de 100644
--- a/services/web/app/src/models/Subscription.js
+++ b/services/web/app/src/models/Subscription.js
@@ -36,6 +36,7 @@ const SubscriptionSchema = new Schema(
     teamNotice: { type: String },
     planCode: { type: String },
     groupPlan: { type: Boolean, default: false },
+    domainCaptureEnabled: { type: Boolean, default: false },
     managedUsersEnabled: { type: Boolean, default: false },
     membersLimit: { type: Number, default: 0 },
     customAccount: Boolean,
diff --git a/services/web/types/admin/subscription.ts b/services/web/types/admin/subscription.ts
index 811ebf54bf..2d23da20f2 100644
--- a/services/web/types/admin/subscription.ts
+++ b/services/web/types/admin/subscription.ts
@@ -18,6 +18,7 @@ export type Subscription = {
   groupPlan: boolean
   customAccount: boolean
   ssoConfig: SSOConfig
+  domainCaptureEnabled?: boolean
   managedUsersEnabled: boolean
   v1_id: number
   salesforce_id: string
@@ -25,4 +26,7 @@ export type Subscription = {
   paymentProvider:
     | RecurlyAdminClientPaymentProvider
     | StripeAdminClientPaymentProvider
+  features: {
+    domainCapture?: boolean
+  }
 }

From 488d0fdf9ed88b3acb0d7e0965c9543057625803 Mon Sep 17 00:00:00 2001
From: Rebeka Dekany <50901361+rebekadekany@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:54:03 +0200
Subject: [PATCH 225/274] Preserve source-only extensions on file switch
 (#27080)

GitOrigin-RevId: 661c70b78a508619e6532b87b0409f546b4d9e82
---
 .../test/create-and-compile-project.spec.ts   | 10 +++++--
 server-ce/test/editor.spec.ts                 |  5 +++-
 server-ce/test/project-sharing.spec.ts        | 27 +++++++++++++++----
 server-ce/test/sandboxed-compiles.spec.ts     |  8 ++++--
 .../source-editor/extensions/index.ts         |  2 +-
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/server-ce/test/create-and-compile-project.spec.ts b/server-ce/test/create-and-compile-project.spec.ts
index 959a3be107..a0e03fe8d0 100644
--- a/server-ce/test/create-and-compile-project.spec.ts
+++ b/server-ce/test/create-and-compile-project.spec.ts
@@ -40,9 +40,15 @@ describe('Project creation and compilation', function () {
     cy.get('.cm-line').should('have.length', 1)
     cy.get('.cm-line').type(markdownContent)
     cy.findByText('main.tex').click()
-    cy.get('.cm-content').should('contain.text', '\\maketitle')
+    cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+      'contain.text',
+      '\\maketitle'
+    )
     cy.findByText(fileName).click()
-    cy.get('.cm-content').should('contain.text', markdownContent)
+    cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+      'contain.text',
+      markdownContent
+    )
   })
 
   it('can link and display linked image from other project', function () {
diff --git a/server-ce/test/editor.spec.ts b/server-ce/test/editor.spec.ts
index f8f7f0f53c..d0060518de 100644
--- a/server-ce/test/editor.spec.ts
+++ b/server-ce/test/editor.spec.ts
@@ -104,7 +104,10 @@ describe('editor', () => {
         force: true,
       })
       cy.get('button').contains('𝜉').click()
-      cy.get('.cm-content').should('contain.text', '\\xi')
+      cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+        'contain.text',
+        '\\xi'
+      )
 
       cy.log('recompile to force flush and avoid "unsaved changes" prompt')
       recompile()
diff --git a/server-ce/test/project-sharing.spec.ts b/server-ce/test/project-sharing.spec.ts
index e26439264b..4da2209332 100644
--- a/server-ce/test/project-sharing.spec.ts
+++ b/server-ce/test/project-sharing.spec.ts
@@ -55,8 +55,15 @@ describe('Project Sharing', function () {
 
   function expectContentReadOnlyAccess() {
     cy.url().should('match', /\/project\/[a-fA-F0-9]{24}/)
-    cy.get('.cm-content').should('contain.text', '\\maketitle')
-    cy.get('.cm-content').should('have.attr', 'contenteditable', 'false')
+    cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+      'contain.text',
+      '\\maketitle'
+    )
+    cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+      'have.attr',
+      'contenteditable',
+      'false'
+    )
   }
 
   function expectContentWriteAccess() {
@@ -64,13 +71,23 @@ describe('Project Sharing', function () {
     cy.url().should('match', /\/project\/[a-fA-F0-9]{24}/)
     const recompile = throttledRecompile()
     // wait for the editor to finish loading
-    cy.get('.cm-content').should('contain.text', '\\maketitle')
+    cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+      'contain.text',
+      '\\maketitle'
+    )
     // the editor should be writable
-    cy.get('.cm-content').should('have.attr', 'contenteditable', 'true')
+    cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+      'have.attr',
+      'contenteditable',
+      'true'
+    )
     cy.findByText('\\maketitle').parent().click()
     cy.findByText('\\maketitle').parent().type(`\n\\section{{}${section}}`)
     // should have written
-    cy.get('.cm-content').should('contain.text', `\\section{${section}}`)
+    cy.findByRole('textbox', { name: /Source Editor editing/i }).should(
+      'contain.text',
+      `\\section{${section}}`
+    )
     // check PDF
     recompile()
     cy.get('.pdf-viewer').should('contain.text', projectName)
diff --git a/server-ce/test/sandboxed-compiles.spec.ts b/server-ce/test/sandboxed-compiles.spec.ts
index 62c87384d6..71f5b43392 100644
--- a/server-ce/test/sandboxed-compiles.spec.ts
+++ b/server-ce/test/sandboxed-compiles.spec.ts
@@ -161,7 +161,9 @@ describe('SandboxedCompiles', function () {
         })
 
         cy.log('navigate to Section A')
-        cy.get('.cm-content').within(() => cy.findByText('Section A').click())
+        cy.findByRole('textbox', { name: /Source Editor editing/i }).within(
+          () => cy.findByText('Section A').click()
+        )
         cy.get('[aria-label="Go to code location in PDF"]').click()
         cy.get('@title').then((title: any) => {
           waitUntilScrollingFinished('.pdfjs-viewer-inner', title)
@@ -170,7 +172,9 @@ describe('SandboxedCompiles', function () {
         })
 
         cy.log('navigate to Section B')
-        cy.get('.cm-content').within(() => cy.findByText('Section B').click())
+        cy.findByRole('textbox', { name: /Source Editor editing/i }).within(
+          () => cy.findByText('Section B').click()
+        )
         cy.get('[aria-label="Go to code location in PDF"]').click()
         cy.get('@sectionA').then((title: any) => {
           waitUntilScrollingFinished('.pdfjs-viewer-inner', title)
diff --git a/services/web/frontend/js/features/source-editor/extensions/index.ts b/services/web/frontend/js/features/source-editor/extensions/index.ts
index f7ab774d15..9471bb5aad 100644
--- a/services/web/frontend/js/features/source-editor/extensions/index.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/index.ts
@@ -80,7 +80,7 @@ export const createExtensions = (options: Record<string, any>): Extension[] => [
   // A built-in extension that enables soft line wrapping.
   EditorView.lineWrapping,
   sourceOnly(
-    options.visual,
+    options.visual.visual,
     EditorView.contentAttributes.of({ 'aria-label': 'Source Editor editing' })
   ),
   // A built-in extension that re-indents input if the language defines an indentOnInput field in its language data.

From 42a408c6ae7fe4fea194500767b4020a71613b13 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Tue, 15 Jul 2025 09:58:18 +0100
Subject: [PATCH 226/274] Merge pull request #27053 from
 overleaf/dp-review-panel-disabled

Disable review panel tab when it cannot be opened in new editor

GitOrigin-RevId: 586ef06bc7cd27efdec6cb7ccc287f4ad41e4da5
---
 .../web/frontend/js/features/ide-redesign/components/rail.tsx | 3 ++-
 .../frontend/stylesheets/bootstrap-5/pages/editor/rail.scss   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index 877e40666e..0c8d49202d 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -142,6 +142,7 @@ export const RailLayout = () => {
         title: t('review_panel'),
         component: null,
         hide: !features.trackChangesVisible,
+        disabled: view !== 'editor',
       },
       {
         key: 'chat',
@@ -160,7 +161,7 @@ export const RailLayout = () => {
         disabled: errorLogsDisabled,
       },
     ],
-    [t, features.trackChangesVisible, newErrorlogs, errorLogsDisabled]
+    [t, features.trackChangesVisible, newErrorlogs, errorLogsDisabled, view]
   )
 
   const railActions: RailAction[] = useMemo(
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss
index bc8e42daaa..46f30a3028 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/rail.scss
@@ -65,6 +65,10 @@ body {
   position: relative;
   overflow: visible;
 
+  &.disabled {
+    color: var(--content-disabled-themed);
+  }
+
   &:visited,
   &:focus {
     color: var(--ide-rail-color);

From ce074ecf114285d3a04d3b28428991c866004e3a Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Tue, 15 Jul 2025 09:58:30 +0100
Subject: [PATCH 227/274] Merge pull request #27128 from
 overleaf/mj-ide-tooltip-teardown

[web] Editor Redesign: Tear down editor nudge tooltips

GitOrigin-RevId: 83c412ad782d041c960eba8533ffc49935524b9c
---
 .../src/Features/Project/ProjectController.js |  2 --
 .../web/frontend/extracted-translations.json  |  4 ----
 .../try-new-editor-button.tsx                 | 20 +------------------
 .../components/toolbar/labs-actions.tsx       | 17 +---------------
 services/web/locales/en.json                  |  4 ----
 5 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 6cd297d213..3570834e04 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -351,8 +351,6 @@ const _ProjectController = {
       'word-count-client',
       'editor-popup-ux-survey',
       'new-editor-error-logs-redesign',
-      'ide-redesign-experiment-nudge',
-      'ide-redesign-new-survey-prompt',
     ].filter(Boolean)
 
     const getUserValues = async userId =>
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index 345bbb7a0e..b0e70cafe3 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -442,7 +442,6 @@
   "doing_this_will_verify_affiliation_and_allow_log_in_2": "",
   "done": "",
   "dont_forget_you_currently_have": "",
-  "dont_miss_out_on_the_updated_editor": "",
   "dont_reload_or_close_this_tab": "",
   "double_clicking_on_the_pdf_shows": "",
   "download": "",
@@ -780,7 +779,6 @@
   "hotkey_toggle_track_changes": "",
   "hotkey_undo": "",
   "hotkeys": "",
-  "how_are_you_finding_the_updates_to_the_new_editor": "",
   "how_it_works": "",
   "how_many_licenses_do_you_want_to_buy": "",
   "how_to_create_tables": "",
@@ -1737,7 +1735,6 @@
   "take_short_survey": "",
   "take_survey": "",
   "tell_the_project_owner_and_ask_them_to_upgrade": "",
-  "tell_us_what_you_think": "",
   "template": "",
   "template_description": "",
   "template_title_taken_from_project_title": "",
@@ -2081,7 +2078,6 @@
   "were_performing_maintenance": "",
   "were_redesigning_our_editor_to_make_it_easier_to_use": "",
   "were_reducing_compile_timeout": "",
-  "weve_been_making_changes_and_improvements_why_not_give_it_a_try": "",
   "what_did_you_find_most_helpful": "",
   "what_do_you_need_help_with": "",
   "what_does_this_mean": "",
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
index 775c985a1f..c9b85025de 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/try-new-editor-button.tsx
@@ -1,19 +1,13 @@
-import { useCallback, useRef } from 'react'
+import { useCallback } from 'react'
 import OLButton from '../ui/components/ol/ol-button'
 import { useIdeRedesignSwitcherContext } from '../ide-react/context/ide-redesign-switcher-context'
 import MaterialIcon from '@/shared/components/material-icon'
 import { useTranslation } from 'react-i18next'
-import TooltipPromotion from '../ide-redesign/components/tooltip-promo'
-
-const TUTORIAL_KEY = 'try-redesign-again-nudge-promo'
-const EVENT_DATA = { name: 'try-redesign-again-nudge-promotion' }
 
 const TryNewEditorButton = () => {
   const { t } = useTranslation()
   const { setShowSwitcherModal } = useIdeRedesignSwitcherContext()
 
-  const switcherButtonRef = useRef(null)
-
   const onClick = useCallback(() => {
     setShowSwitcherModal(true)
   }, [setShowSwitcherModal])
@@ -25,21 +19,9 @@ const TryNewEditorButton = () => {
         size="sm"
         leadingIcon={<MaterialIcon type="experiment" unfilled />}
         variant="secondary"
-        ref={switcherButtonRef}
       >
         {t('try_the_new_editor')}
       </OLButton>
-      <TooltipPromotion
-        target={switcherButtonRef.current}
-        splitTestName="ide-redesign-experiment-nudge"
-        tutorialKey={TUTORIAL_KEY}
-        eventData={EVENT_DATA}
-        className="toolbar-experiment-tooltip"
-        header={t('dont_miss_out_on_the_updated_editor')}
-        content={t(
-          'weve_been_making_changes_and_improvements_why_not_give_it_a_try'
-        )}
-      />
     </div>
   )
 }
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
index 56b4323b61..69c38d3b6a 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/labs-actions.tsx
@@ -2,13 +2,9 @@ import { useIdeRedesignSwitcherContext } from '@/features/ide-react/context/ide-
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
 import MaterialIcon from '@/shared/components/material-icon'
-import { useCallback, useRef } from 'react'
+import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSurveyUrl } from '../../hooks/use-survey-url'
-import TooltipPromotion from '../tooltip-promo'
-
-const TUTORIAL_KEY = 'ide-redesign-new-survey-promo'
-const EVENT_DATA = { name: 'ide-redesign-new-survey-promotion' }
 
 export const LabsActions = () => {
   const { t } = useTranslation()
@@ -17,7 +13,6 @@ export const LabsActions = () => {
     setShowSwitcherModal(true)
   }, [setShowSwitcherModal])
   const surveyURL = useSurveyUrl()
-  const feedbackLinkRef = useRef<HTMLAnchorElement>(null)
 
   return (
     <>
@@ -42,7 +37,6 @@ export const LabsActions = () => {
       </div>
       <div className="ide-redesign-toolbar-button-container">
         <a
-          ref={feedbackLinkRef}
           href={surveyURL}
           rel="noopener noreferrer"
           target="_blank"
@@ -50,15 +44,6 @@ export const LabsActions = () => {
         >
           {t('give_feedback')}
         </a>
-        <TooltipPromotion
-          target={feedbackLinkRef.current}
-          splitTestName="ide-redesign-new-survey-prompt"
-          content={t('tell_us_what_you_think')}
-          header={t('how_are_you_finding_the_updates_to_the_new_editor')}
-          eventData={EVENT_DATA}
-          tutorialKey={TUTORIAL_KEY}
-          placement="bottom"
-        />
       </div>
     </>
   )
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 23cc4e251a..e67a350dac 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -575,7 +575,6 @@
   "done": "Done",
   "dont_forget_you_currently_have": "Don’t forget, you currently have:",
   "dont_have_account": "Don’t have an account?",
-  "dont_miss_out_on_the_updated_editor": "Don’t miss out on the updated editor",
   "dont_reload_or_close_this_tab": "Don’t reload or close this tab.",
   "double_clicking_on_the_pdf_shows": "Double clicking on the PDF shows the corresponding location in code. Added word count (7 May 2025)",
   "download": "Download",
@@ -1000,7 +999,6 @@
   "hotkey_toggle_track_changes": "Toggle track changes",
   "hotkey_undo": "Undo",
   "hotkeys": "Hotkeys",
-  "how_are_you_finding_the_updates_to_the_new_editor": "How are you finding the updates to the new editor?",
   "how_it_works": "How it works",
   "how_many_licenses_do_you_want_to_buy": "How many licenses do you want to buy?",
   "how_many_users_do_you_need": "How many users do you need?",
@@ -2237,7 +2235,6 @@
   "take_short_survey": "Take a short survey",
   "take_survey": "Take survey",
   "tell_the_project_owner_and_ask_them_to_upgrade": "<0>Tell the project owner</0> and ask them to upgrade their Overleaf plan if you need more compile time.",
-  "tell_us_what_you_think": "Tell us what you think",
   "template": "Template",
   "template_approved_by_publisher": "This template has been approved by the publisher",
   "template_description": "Template Description",
@@ -2628,7 +2625,6 @@
   "were_performing_maintenance": "We’re performing maintenance on Overleaf and you need to wait a moment. Sorry for any inconvenience. The editor will refresh automatically in __seconds__ seconds.",
   "were_redesigning_our_editor_to_make_it_easier_to_use": "We’re redesigning our editor to make it easier to use and ensure it’s future ready. Try it out and give us your feedback to help us get this right. (Some features are still in the works, so you can switch back at any time.)",
   "were_reducing_compile_timeout": "We’re in the process of <0>reducing the compile timeout limit</0> on our free plan, which may affect your project in future.",
-  "weve_been_making_changes_and_improvements_why_not_give_it_a_try": "We’ve been making changes and improvements. Why not give it a try?",
   "what_did_you_find_most_helpful": "What did you find most helpful?",
   "what_do_you_need": "What do you need?",
   "what_do_you_need_help_with": "What do you need help with?",

From 5b5e6507545158174a8adb85f058a87438cf1212 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Tue, 15 Jul 2025 09:58:37 +0100
Subject: [PATCH 228/274] Merge pull request #27078 from
 overleaf/mj-dark-mode-panel-border

[web] Use correct border color between toolbar and editor

GitOrigin-RevId: 48e08bdec57b25f2f70731f89c66be8c487b9e41
---
 .../extensions/toolbar/toolbar-panel.ts              | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
index 30eb0098f8..24d43eb236 100644
--- a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
@@ -319,8 +319,18 @@ const toolbarTheme = EditorView.theme({
   },
 })
 
+const toolbarBorderTheme = EditorView.baseTheme({
+  '&light.overall-theme-dark .cm-panels-top': {
+    borderBottom: '1px solid var(--border-divider-dark)',
+  },
+})
+
 /**
  * A panel which contains the editor toolbar, provided by a state field which allows the toolbar to be toggled,
  * and styles for the toolbar.
  */
-export const toolbarPanel = () => [toolbarState, toolbarTheme]
+export const toolbarPanel = () => [
+  toolbarState,
+  toolbarTheme,
+  toolbarBorderTheme,
+]

From 1375f695d37fa814a8d38d2deed6631d5b1ddd10 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Tue, 15 Jul 2025 09:58:48 +0100
Subject: [PATCH 229/274] Merge pull request #27079 from
 overleaf/mj-base-theme-extraction

[web] Extract breadcrumbs theme to constant

GitOrigin-RevId: 55d65597a85a7da5cf5506caf8e13d4e2977fb1f
---
 .../extensions/breadcrumbs-panel.ts           | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/services/web/frontend/js/features/source-editor/extensions/breadcrumbs-panel.ts b/services/web/frontend/js/features/source-editor/extensions/breadcrumbs-panel.ts
index a3768a9d5a..9572b16567 100644
--- a/services/web/frontend/js/features/source-editor/extensions/breadcrumbs-panel.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/breadcrumbs-panel.ts
@@ -1,5 +1,35 @@
 import { EditorView } from '@codemirror/view'
 
+const breadcrumbsTheme = EditorView.baseTheme({
+  '.ol-cm-breadcrumbs-portal': {
+    display: 'flex',
+    pointerEvents: 'none !important',
+    '& > *': {
+      pointerEvents: 'all',
+    },
+  },
+  '.ol-cm-breadcrumbs': {
+    height: 'var(--breadcrumbs-height)',
+    flex: 1,
+    display: 'flex',
+    alignItems: 'center',
+    gap: 'var(--spacing-01)',
+    fontSize: 'var(--font-size-01)',
+    padding: 'var(--spacing-02)',
+    overflow: 'auto',
+    scrollbarWidth: 'thin',
+    '& > *': {
+      flexShrink: '0',
+    },
+  },
+  '&light .ol-cm-breadcrumb-chevron': {
+    color: 'var(--neutral-30)',
+  },
+  '&dark .ol-cm-breadcrumb-chevron': {
+    color: 'var(--neutral-50)',
+  },
+})
+
 /**
  * A panel which contains the editor breadcrumbs
  */
@@ -8,34 +38,6 @@ export function breadcrumbPanel() {
     EditorView.editorAttributes.of({
       style: '--breadcrumbs-height: 28px;',
     }),
-    EditorView.baseTheme({
-      '.ol-cm-breadcrumbs-portal': {
-        display: 'flex',
-        pointerEvents: 'none !important',
-        '& > *': {
-          pointerEvents: 'all',
-        },
-      },
-      '.ol-cm-breadcrumbs': {
-        height: 'var(--breadcrumbs-height)',
-        flex: 1,
-        display: 'flex',
-        alignItems: 'center',
-        gap: 'var(--spacing-01)',
-        fontSize: 'var(--font-size-01)',
-        padding: 'var(--spacing-02)',
-        overflow: 'auto',
-        scrollbarWidth: 'thin',
-        '& > *': {
-          flexShrink: '0',
-        },
-      },
-      '&light .ol-cm-breadcrumb-chevron': {
-        color: 'var(--neutral-30)',
-      },
-      '&dark .ol-cm-breadcrumb-chevron': {
-        color: 'var(--neutral-50)',
-      },
-    }),
+    breadcrumbsTheme,
   ]
 }

From 9e22ed9c3fef6c767dfe489d5486432a504c3bce Mon Sep 17 00:00:00 2001
From: Liangjun Song <146005915+adai26@users.noreply.github.com>
Date: Tue, 15 Jul 2025 12:02:15 +0100
Subject: [PATCH 230/274] Merge pull request #26934 from
 overleaf/ls-support-individual-to-group-plan-upgrade

Support individual to group plan upgrade in Stripe

GitOrigin-RevId: 24cbe7bd6de86a4d9410e1abc49b6457e0871f40
---
 .../Subscription/PaymentProviderEntities.js   |  78 +++++++------
 .../src/Features/Subscription/PlansLocator.js |  38 +++++++
 .../SubscriptionGroupController.mjs           |  16 +++
 .../Subscription/SubscriptionRouter.mjs       |   7 ++
 .../SubscriptionViewModelBuilder.js           |  40 ++++---
 .../subscription-dashboard-context.tsx        |  69 +++++++-----
 .../util/recurly-group-plan-code.ts           |   8 ++
 .../subscription/util/recurly-pricing.ts      |  51 ++++++++-
 services/web/frontend/js/utils/meta.ts        |   1 -
 .../PaymentProviderEntitiesTest.js            | 103 ++++++++++++++++--
 .../src/Subscription/PlansLocatorTests.js     |  35 ++++++
 .../SubscriptionViewModelBuilderTests.js      |   9 ++
 12 files changed, 364 insertions(+), 91 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
index c8c09d5113..5e64f634de 100644
--- a/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
+++ b/services/web/app/src/Features/Subscription/PaymentProviderEntities.js
@@ -94,7 +94,7 @@ class PaymentProviderSubscription {
    * @return {boolean}
    */
   isGroupSubscription() {
-    return isGroupPlanCode(this.planCode)
+    return PlansLocator.isGroupPlanCode(this.planCode)
   }
 
   /**
@@ -118,33 +118,32 @@ class PaymentProviderSubscription {
 
   /**
    * Change this subscription's plan
-   *
+   * @param {string} planCode - the new plan code
+   * @param {number} [quantity] - the quantity of the plan
+   * @param {boolean} [shouldChangeAtTermEnd] - whether the change should be applied at the end of the term
    * @return {PaymentProviderSubscriptionChangeRequest}
    */
-  getRequestForPlanChange(planCode) {
-    const currentPlan = PlansLocator.findLocalPlanInSettings(this.planCode)
-    if (currentPlan == null) {
-      throw new OError('Unable to find plan in settings', {
-        planCode: this.planCode,
-      })
-    }
-    const newPlan = PlansLocator.findLocalPlanInSettings(planCode)
-    if (newPlan == null) {
-      throw new OError('Unable to find plan in settings', { planCode })
-    }
-    const isInTrial = SubscriptionHelper.isInTrial(this.trialPeriodEnd)
-    const shouldChangeAtTermEnd = SubscriptionHelper.shouldPlanChangeAtTermEnd(
-      currentPlan,
-      newPlan,
-      isInTrial
-    )
-
+  getRequestForPlanChange(planCode, quantity, shouldChangeAtTermEnd) {
     const changeRequest = new PaymentProviderSubscriptionChangeRequest({
       subscription: this,
       timeframe: shouldChangeAtTermEnd ? 'term_end' : 'now',
       planCode,
     })
 
+    if (quantity !== 1) {
+      // Only group plans in Stripe can have larger than 1 quantity
+      // This is because in Stripe, the group plans are configued with per-seat pricing
+      // and the quantity is the number of seats
+      // Setting the members limit add-on quantity accordingly
+      // so it is compitible with Recurly's group plan model (1 base plan + add-on for each member)
+      changeRequest.addOnUpdates = [
+        new PaymentProviderSubscriptionAddOnUpdate({
+          code: MEMBERS_LIMIT_ADD_ON_CODE,
+          quantity,
+        }),
+      ]
+    }
+
     // Carry the AI add-on to the new plan if applicable
     if (
       this.isStandaloneAiAddOn() ||
@@ -155,7 +154,9 @@ class PaymentProviderSubscription {
         code: AI_ADD_ON_CODE,
         quantity: 1,
       })
-      changeRequest.addOnUpdates = [addOnUpdate]
+      changeRequest.addOnUpdates = changeRequest.addOnUpdates
+        ? [...changeRequest.addOnUpdates, addOnUpdate]
+        : [addOnUpdate]
     }
 
     return changeRequest
@@ -360,6 +361,31 @@ class PaymentProviderSubscription {
   get isCollectionMethodManual() {
     return this.collectionMethod === 'manual'
   }
+
+  /**
+   * Determine if a plan change should be applied at the end of the term
+   *
+   * @param {string} newPlanCode
+   * @returns {boolean}
+   */
+  shouldPlanChangeAtTermEnd(newPlanCode) {
+    const currentPlan = PlansLocator.findLocalPlanInSettings(this.planCode)
+    if (currentPlan == null) {
+      throw new OError('Unable to find plan in settings', {
+        planCode: this.planCode,
+      })
+    }
+    const newPlan = PlansLocator.findLocalPlanInSettings(newPlanCode)
+    if (newPlan == null) {
+      throw new OError('Unable to find plan in settings', { newPlanCode })
+    }
+    const isInTrial = SubscriptionHelper.isInTrial(this.trialPeriodEnd)
+    return SubscriptionHelper.shouldPlanChangeAtTermEnd(
+      currentPlan,
+      newPlan,
+      isInTrial
+    )
+  }
 }
 
 /**
@@ -584,15 +610,6 @@ class PaymentProviderAccount {
   }
 }
 
-/**
- * Returns whether the given plan code is a group plan
- *
- * @param {string} planCode
- */
-function isGroupPlanCode(planCode) {
-  return planCode.includes('group')
-}
-
 module.exports = {
   MEMBERS_LIMIT_ADD_ON_CODE,
   PaymentProviderSubscription,
@@ -607,6 +624,5 @@ module.exports = {
   PaymentProviderPlan,
   PaymentProviderCoupon,
   PaymentProviderAccount,
-  isGroupPlanCode,
   PaymentProviderImmediateCharge,
 }
diff --git a/services/web/app/src/Features/Subscription/PlansLocator.js b/services/web/app/src/Features/Subscription/PlansLocator.js
index 67d2f31c52..98bb5ddf7a 100644
--- a/services/web/app/src/Features/Subscription/PlansLocator.js
+++ b/services/web/app/src/Features/Subscription/PlansLocator.js
@@ -137,9 +137,47 @@ function findLocalPlanInSettings(planCode) {
   return null
 }
 
+/**
+ * Returns whether the given plan code is a group plan
+ *
+ * @param {string} planCode
+ */
+function isGroupPlanCode(planCode) {
+  return planCode.includes('group')
+}
+
+/**
+ * Adapts a legacy Recurly group plan code (e.g., `group_professional_5_educational`)
+ * into its corresponding Stripe-compatible plan code (e.g., `group_professional_educational`),
+ * extracting the license quantity where applicable.
+ *
+ *  @param {RecurlyPlanCode} planCode
+ * @returns {{ planCode: RecurlyPlanCode, quantity: number }}
+ */
+function convertLegacyGroupPlanCodeToConsolidatedGroupPlanCodeIfNeeded(
+  planCode
+) {
+  const pattern =
+    /^group_(collaborator|professional)_(2|3|4|5|10|20|50)_(educational|enterprise)$/
+
+  const match = planCode.match(pattern)
+  if (match == null) {
+    return { planCode, quantity: 1 }
+  }
+
+  const [, tier, size, usage] = match
+  const newPlanCode = /** @type {RecurlyPlanCode} */ (
+    usage === 'enterprise' ? `group_${tier}` : `group_${tier}_${usage}`
+  )
+
+  return { planCode: newPlanCode, quantity: Number(size) }
+}
+
 module.exports = {
   ensurePlansAreSetupCorrectly,
   findLocalPlanInSettings,
   buildStripeLookupKey,
   getPlanTypeAndPeriodFromRecurlyPlanCode,
+  isGroupPlanCode,
+  convertLegacyGroupPlanCodeToConsolidatedGroupPlanCodeIfNeeded,
 }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 7aa596836d..4276ebd6e7 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -425,6 +425,21 @@ async function subtotalLimitExceeded(req, res) {
   }
 }
 
+async function getGroupPlanPerUserPrices(req, res) {
+  try {
+    const userId = SessionManager.getLoggedInUserId(req.session)
+    const prices = await Modules.promises.hooks.fire(
+      'getGroupPlanPerUserPrices',
+      userId,
+      req.query.currency
+    )
+    return res.json(prices[0])
+  } catch (error) {
+    logger.err({ error }, 'error trying to get websale group product prices')
+    return res.sendStatus(500)
+  }
+}
+
 export default {
   removeUserFromGroup: expressify(removeUserFromGroup),
   removeSelfFromGroup: expressify(removeSelfFromGroup),
@@ -441,4 +456,5 @@ export default {
   missingBillingInformation: expressify(missingBillingInformation),
   manuallyCollectedSubscription: expressify(manuallyCollectedSubscription),
   subtotalLimitExceeded: expressify(subtotalLimitExceeded),
+  getGroupPlanPerUserPrices: expressify(getGroupPlanPerUserPrices),
 }
diff --git a/services/web/app/src/Features/Subscription/SubscriptionRouter.mjs b/services/web/app/src/Features/Subscription/SubscriptionRouter.mjs
index 154a1882b2..6cc83bf232 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionRouter.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionRouter.mjs
@@ -106,6 +106,13 @@ export default {
       SubscriptionGroupController.subscriptionUpgradePage
     )
 
+    webRouter.get(
+      '/user/subscription/group/group-plan-per-user-prices',
+      AuthenticationController.requireLogin(),
+      RateLimiterMiddleware.rateLimit(subscriptionRateLimiter),
+      SubscriptionGroupController.getGroupPlanPerUserPrices
+    )
+
     webRouter.post(
       '/user/subscription/group/upgrade-subscription',
       AuthenticationController.requireLogin(),
diff --git a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
index 5252abc070..9672af6cd5 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
+++ b/services/web/app/src/Features/Subscription/SubscriptionViewModelBuilder.js
@@ -34,6 +34,20 @@ function serializeMongooseObject(object) {
     : object
 }
 
+async function isEligibleForGroupPlan(service, isInTrial) {
+  if (isInTrial) {
+    return false
+  }
+
+  if (service === 'recurly') {
+    return true
+  }
+  const [result] = await Modules.promises.hooks.fire(
+    'canUpgradeFromIndividualToGroup'
+  )
+  return result
+}
+
 async function buildUsersSubscriptionViewModel(user, locale = 'en') {
   let {
     personalSubscription,
@@ -112,9 +126,7 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') {
         _id: group._id,
         planCode: group.planCode,
         teamName: group.teamName,
-        admin_id: {
-          email: group.admin_id.email,
-        },
+        admin_id: { email: group.admin_id.email },
         userIsGroupManager,
       }
 
@@ -141,10 +153,7 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') {
         planCode: group.planCode,
         groupPlan: group.groupPlan,
         teamName: group.teamName,
-        admin_id: {
-          _id: group.admin_id._id,
-          email: group.admin_id.email,
-        },
+        admin_id: { _id: group.admin_id._id, email: group.admin_id.email },
         features: group.features,
         userIsGroupMember,
       }
@@ -221,6 +230,8 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') {
 
   if (personalSubscription && paymentRecord && paymentRecord.subscription) {
     // don't return subscription payment information
+    personalSubscription.service =
+      personalSubscription.paymentProvider?.service ?? 'recurly'
     delete personalSubscription.paymentProvider
     delete personalSubscription.recurly
     delete personalSubscription.recurlySubscription_id
@@ -277,8 +288,10 @@ async function buildUsersSubscriptionViewModel(user, locale = 'en') {
         !isInTrial &&
         !paymentRecord.subscription.planCode.includes('ann') &&
         !paymentRecord.subscription.addOns?.length > 0,
-      isEligibleForGroupPlan:
-        paymentRecord.subscription.service === 'recurly' && !isInTrial,
+      isEligibleForGroupPlan: await isEligibleForGroupPlan(
+        paymentRecord.subscription.service,
+        isInTrial
+      ),
     }
 
     const isMonthlyCollaboratorPlan =
@@ -405,9 +418,7 @@ async function getUsersSubscriptionDetails(user) {
     individualSubscription =
       await SubscriptionLocator.promises.getUsersSubscription(user)
   }
-  let bestSubscription = {
-    type: 'free',
-  }
+  let bestSubscription = { type: 'free' }
   if (currentInstitutionsWithLicence?.length) {
     for (const institutionMembership of currentInstitutionsWithLicence) {
       const plan = PlansLocator.findLocalPlanInSettings(
@@ -601,8 +612,5 @@ module.exports = {
   buildUsersSubscriptionViewModel: callbackify(buildUsersSubscriptionViewModel),
   buildPlansList,
   buildPlansListForSubscriptionDash,
-  promises: {
-    buildUsersSubscriptionViewModel,
-    getUsersSubscriptionDetails,
-  },
+  promises: { buildUsersSubscriptionViewModel, getUsersSubscriptionDetails },
 }
diff --git a/services/web/frontend/js/features/subscription/context/subscription-dashboard-context.tsx b/services/web/frontend/js/features/subscription/context/subscription-dashboard-context.tsx
index bb7ff46566..0dda7dce89 100644
--- a/services/web/frontend/js/features/subscription/context/subscription-dashboard-context.tsx
+++ b/services/web/frontend/js/features/subscription/context/subscription-dashboard-context.tsx
@@ -22,7 +22,8 @@ import { Institution } from '../../../../../types/institution'
 import getMeta from '../../../utils/meta'
 import {
   loadDisplayPriceWithTaxPromise,
-  loadGroupDisplayPriceWithTaxPromise,
+  loadGroupDisplayPriceWithTaxForRecurlyPromise,
+  loadGroupDisplayPriceWithTaxForStripePromise,
 } from '../util/recurly-pricing'
 import { isRecurlyLoaded } from '../util/is-recurly-loaded'
 import { SubscriptionDashModalIds } from '../../../../../types/subscription/dashboard/modal-ids'
@@ -199,36 +200,46 @@ export function SubscriptionDashboardProvider({
 
   useEffect(() => {
     if (
-      isRecurlyLoaded() &&
-      groupPlanToChangeToCode &&
-      groupPlanToChangeToSize &&
-      groupPlanToChangeToUsage &&
-      personalSubscription?.payment
+      !groupPlanToChangeToCode ||
+      !groupPlanToChangeToSize ||
+      !groupPlanToChangeToUsage ||
+      !personalSubscription?.payment
     ) {
-      setQueryingGroupPlanToChangeToPrice(true)
-
-      const { currency, taxRate } = personalSubscription.payment
-      const fetchGroupDisplayPrice = async () => {
-        setGroupPlanToChangeToPriceError(false)
-        let priceData
-        try {
-          priceData = await loadGroupDisplayPriceWithTaxPromise(
-            groupPlanToChangeToCode,
-            currency,
-            taxRate,
-            groupPlanToChangeToSize,
-            groupPlanToChangeToUsage,
-            i18n.language
-          )
-        } catch (e) {
-          debugConsole.error(e)
-          setGroupPlanToChangeToPriceError(true)
-        }
-        setQueryingGroupPlanToChangeToPrice(false)
-        setGroupPlanToChangeToPrice(priceData)
-      }
-      fetchGroupDisplayPrice()
+      return
     }
+
+    let loadGroupDisplayPrice
+    if (personalSubscription.service?.includes('stripe')) {
+      loadGroupDisplayPrice = loadGroupDisplayPriceWithTaxForStripePromise
+    } else if (isRecurlyLoaded()) {
+      loadGroupDisplayPrice = loadGroupDisplayPriceWithTaxForRecurlyPromise
+    } else {
+      return
+    }
+
+    setQueryingGroupPlanToChangeToPrice(true)
+
+    const { currency, taxRate } = personalSubscription.payment
+    const fetchGroupDisplayPrice = async () => {
+      setGroupPlanToChangeToPriceError(false)
+      let priceData
+      try {
+        priceData = await loadGroupDisplayPrice(
+          groupPlanToChangeToCode,
+          currency,
+          taxRate,
+          groupPlanToChangeToSize,
+          groupPlanToChangeToUsage,
+          i18n.language
+        )
+      } catch (e) {
+        debugConsole.error(e)
+        setGroupPlanToChangeToPriceError(true)
+      }
+      setQueryingGroupPlanToChangeToPrice(false)
+      setGroupPlanToChangeToPrice(priceData)
+    }
+    fetchGroupDisplayPrice()
   }, [
     groupPlanToChangeToUsage,
     groupPlanToChangeToSize,
diff --git a/services/web/frontend/js/features/subscription/util/recurly-group-plan-code.ts b/services/web/frontend/js/features/subscription/util/recurly-group-plan-code.ts
index 3d52d5bcdb..a43a4b3901 100644
--- a/services/web/frontend/js/features/subscription/util/recurly-group-plan-code.ts
+++ b/services/web/frontend/js/features/subscription/util/recurly-group-plan-code.ts
@@ -5,3 +5,11 @@ export function getRecurlyGroupPlanCode(
 ) {
   return `group_${planCode}_${size}_${usage}`
 }
+
+export function getConsolidatedGroupPlanCode(planCode: string, usage: string) {
+  if (usage === 'enterprise') {
+    return `group_${planCode}`
+  }
+
+  return `group_${planCode}_${usage}`
+}
diff --git a/services/web/frontend/js/features/subscription/util/recurly-pricing.ts b/services/web/frontend/js/features/subscription/util/recurly-pricing.ts
index 584174da1a..5a1911169a 100644
--- a/services/web/frontend/js/features/subscription/util/recurly-pricing.ts
+++ b/services/web/frontend/js/features/subscription/util/recurly-pricing.ts
@@ -1,9 +1,15 @@
 import { SubscriptionPricingState } from '@recurly/recurly-js'
 import { PriceForDisplayData } from '../../../../../types/subscription/plan'
 import { CurrencyCode } from '../../../../../types/subscription/currency'
-import { getRecurlyGroupPlanCode } from './recurly-group-plan-code'
+import {
+  getRecurlyGroupPlanCode,
+  getConsolidatedGroupPlanCode,
+} from './recurly-group-plan-code'
 import { debugConsole } from '@/utils/debugging'
 import { formatCurrency } from '@/shared/utils/currency'
+import { getJSON } from '../../../infrastructure/fetch-json'
+
+let groupPlanPerUserPrices: Record<string, number> | undefined
 
 function queryRecurlyPlanPrice(planCode: string, currency: CurrencyCode) {
   return new Promise(resolve => {
@@ -73,7 +79,7 @@ export async function loadDisplayPriceWithTaxPromise(
     )
 }
 
-export async function loadGroupDisplayPriceWithTaxPromise(
+export async function loadGroupDisplayPriceWithTaxForRecurlyPromise(
   groupPlanCode: string,
   currencyCode: CurrencyCode,
   taxRate: number,
@@ -102,3 +108,44 @@ export async function loadGroupDisplayPriceWithTaxPromise(
 
   return price
 }
+
+export async function loadGroupDisplayPriceWithTaxForStripePromise(
+  groupPlanCode: string,
+  currencyCode: CurrencyCode,
+  taxRate: number,
+  size: string,
+  usage: string,
+  locale: string
+) {
+  if (!groupPlanPerUserPrices) {
+    groupPlanPerUserPrices = await getJSON<Record<string, number>>(
+      `/user/subscription/group/group-plan-per-user-prices?currency=${currencyCode}`
+    )
+  }
+
+  const planCode = getConsolidatedGroupPlanCode(groupPlanCode, usage)
+
+  if (!(planCode in groupPlanPerUserPrices)) {
+    throw new Error(
+      `Group plan code ${planCode} not found in groupPlanPerUserPrices`
+    )
+  }
+
+  const subtotalPrice = groupPlanPerUserPrices[planCode] * parseInt(size)
+
+  const result = formatPriceForDisplayData(
+    subtotalPrice.toString(),
+    taxRate,
+    currencyCode,
+    locale
+  )
+
+  result.perUserDisplayPrice = formatCurrency(
+    groupPlanPerUserPrices[planCode],
+    currencyCode,
+    locale,
+    true
+  )
+
+  return result
+}
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 8f6f8a7ec1..26a116a494 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -78,7 +78,6 @@ export interface Meta {
   // dynamic keys based on permissions
   'ol-canUseAddSeatsFeature': boolean
   'ol-canUseFlexibleLicensing': boolean
-  'ol-canUseFlexibleLicensingForConsolidatedPlans': boolean
   'ol-cannot-add-secondary-email': boolean
   'ol-cannot-change-password': boolean
   'ol-cannot-delete-own-account': boolean
diff --git a/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js b/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
index 2cb7037e67..7b2b85b4d8 100644
--- a/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
+++ b/services/web/test/unit/src/Subscription/PaymentProviderEntitiesTest.js
@@ -27,6 +27,10 @@ describe('PaymentProviderEntities', function () {
           { planCode: 'cheap-plan', price_in_cents: 500 },
           { planCode: 'regular-plan', price_in_cents: 1000 },
           { planCode: 'premium-plan', price_in_cents: 2000 },
+          {
+            planCode: 'group_collaborator_10_enterprise',
+            price_in_cents: 10000,
+          },
         ],
         features: [],
       }
@@ -81,8 +85,11 @@ describe('PaymentProviderEntities', function () {
         it('returns a change request for upgrades', function () {
           const { PaymentProviderSubscriptionChangeRequest } =
             this.PaymentProviderEntities
-          const changeRequest =
-            this.subscription.getRequestForPlanChange('premium-plan')
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'premium-plan',
+            1,
+            this.subscription.shouldPlanChangeAtTermEnd('premium-plan')
+          )
           expect(changeRequest).to.deep.equal(
             new PaymentProviderSubscriptionChangeRequest({
               subscription: this.subscription,
@@ -95,8 +102,11 @@ describe('PaymentProviderEntities', function () {
         it('returns a change request for downgrades', function () {
           const { PaymentProviderSubscriptionChangeRequest } =
             this.PaymentProviderEntities
-          const changeRequest =
-            this.subscription.getRequestForPlanChange('cheap-plan')
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'cheap-plan',
+            1,
+            this.subscription.shouldPlanChangeAtTermEnd('cheap-plan')
+          )
           expect(changeRequest).to.deep.equal(
             new PaymentProviderSubscriptionChangeRequest({
               subscription: this.subscription,
@@ -112,8 +122,11 @@ describe('PaymentProviderEntities', function () {
           this.subscription.trialPeriodEnd = fiveDaysFromNow
           const { PaymentProviderSubscriptionChangeRequest } =
             this.PaymentProviderEntities
-          const changeRequest =
-            this.subscription.getRequestForPlanChange('cheap-plan')
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'cheap-plan',
+            1,
+            this.subscription.shouldPlanChangeAtTermEnd('cheap-plan')
+          )
           expect(changeRequest).to.deep.equal(
             new PaymentProviderSubscriptionChangeRequest({
               subscription: this.subscription,
@@ -127,8 +140,11 @@ describe('PaymentProviderEntities', function () {
           const { PaymentProviderSubscriptionChangeRequest } =
             this.PaymentProviderEntities
           this.addOn.code = AI_ADD_ON_CODE
-          const changeRequest =
-            this.subscription.getRequestForPlanChange('premium-plan')
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'premium-plan',
+            1,
+            this.subscription.shouldPlanChangeAtTermEnd('premium-plan')
+          )
           expect(changeRequest).to.deep.equal(
             new PaymentProviderSubscriptionChangeRequest({
               subscription: this.subscription,
@@ -148,8 +164,11 @@ describe('PaymentProviderEntities', function () {
           const { PaymentProviderSubscriptionChangeRequest } =
             this.PaymentProviderEntities
           this.addOn.code = AI_ADD_ON_CODE
-          const changeRequest =
-            this.subscription.getRequestForPlanChange('cheap-plan')
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'cheap-plan',
+            1,
+            this.subscription.shouldPlanChangeAtTermEnd('cheap-plan')
+          )
           expect(changeRequest).to.deep.equal(
             new PaymentProviderSubscriptionChangeRequest({
               subscription: this.subscription,
@@ -170,8 +189,11 @@ describe('PaymentProviderEntities', function () {
             this.PaymentProviderEntities
           this.subscription.planCode = 'assistant-annual'
           this.subscription.addOns = []
-          const changeRequest =
-            this.subscription.getRequestForPlanChange('cheap-plan')
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'cheap-plan',
+            1,
+            this.subscription.shouldPlanChangeAtTermEnd('cheap-plan')
+          )
           expect(changeRequest).to.deep.equal(
             new PaymentProviderSubscriptionChangeRequest({
               subscription: this.subscription,
@@ -186,6 +208,63 @@ describe('PaymentProviderEntities', function () {
             })
           )
         })
+
+        it('upgrade from individual to group plan for Stripe subscription', function () {
+          this.subscription.service = 'stripe-uk'
+          const { PaymentProviderSubscriptionChangeRequest } =
+            this.PaymentProviderEntities
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'group_collaborator',
+            10,
+            this.subscription.shouldPlanChangeAtTermEnd(
+              'group_collaborator_10_enterprise'
+            )
+          )
+          expect(changeRequest).to.deep.equal(
+            new PaymentProviderSubscriptionChangeRequest({
+              subscription: this.subscription,
+              timeframe: 'now',
+              planCode: 'group_collaborator',
+              addOnUpdates: [
+                new PaymentProviderSubscriptionAddOnUpdate({
+                  code: 'additional-license',
+                  quantity: 10,
+                }),
+              ],
+            })
+          )
+        })
+
+        it('upgrade from individual to group plan and preserves the AI add-on for Stripe subscription', function () {
+          this.subscription.service = 'stripe-uk'
+          const { PaymentProviderSubscriptionChangeRequest } =
+            this.PaymentProviderEntities
+          this.addOn.code = AI_ADD_ON_CODE
+          const changeRequest = this.subscription.getRequestForPlanChange(
+            'group_collaborator',
+            10,
+            this.subscription.shouldPlanChangeAtTermEnd(
+              'group_collaborator_10_enterprise'
+            )
+          )
+          expect(changeRequest).to.deep.equal(
+            new PaymentProviderSubscriptionChangeRequest({
+              subscription: this.subscription,
+              timeframe: 'now',
+              planCode: 'group_collaborator',
+              addOnUpdates: [
+                new PaymentProviderSubscriptionAddOnUpdate({
+                  code: 'additional-license',
+                  quantity: 10,
+                }),
+                new PaymentProviderSubscriptionAddOnUpdate({
+                  code: AI_ADD_ON_CODE,
+                  quantity: 1,
+                }),
+              ],
+            })
+          )
+        })
       })
 
       describe('getRequestForAddOnPurchase()', function () {
diff --git a/services/web/test/unit/src/Subscription/PlansLocatorTests.js b/services/web/test/unit/src/Subscription/PlansLocatorTests.js
index bd15f5cfaa..7e35ccea58 100644
--- a/services/web/test/unit/src/Subscription/PlansLocatorTests.js
+++ b/services/web/test/unit/src/Subscription/PlansLocatorTests.js
@@ -266,4 +266,39 @@ describe('PlansLocator', function () {
       expect(period).to.equal('annual')
     })
   })
+
+  describe('convertLegacyGroupPlanCodeToConsolidatedGroupPlanCodeIfNeeded', function () {
+    it('returns original plan name for non-group plan codes', function () {
+      expect(
+        this.PlansLocator.convertLegacyGroupPlanCodeToConsolidatedGroupPlanCodeIfNeeded(
+          'professional'
+        )
+      ).to.deep.equal({
+        planCode: 'professional',
+        quantity: 1,
+      })
+    })
+
+    it('converts Recurly enterprise group plan codes to Stripe group plan codes', function () {
+      expect(
+        this.PlansLocator.convertLegacyGroupPlanCodeToConsolidatedGroupPlanCodeIfNeeded(
+          'group_collaborator_10_enterprise'
+        )
+      ).to.deep.equal({
+        planCode: 'group_collaborator',
+        quantity: 10,
+      })
+    })
+
+    it('converts Recurly educational group plan codes to Stripe group plan codes', function () {
+      expect(
+        this.PlansLocator.convertLegacyGroupPlanCodeToConsolidatedGroupPlanCodeIfNeeded(
+          'group_professional_10_educational'
+        )
+      ).to.deep.equal({
+        planCode: 'group_professional_educational',
+        quantity: 10,
+      })
+    })
+  })
 })
diff --git a/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js b/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js
index 86eb51070e..235abf600e 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js
+++ b/services/web/test/unit/src/Subscription/SubscriptionViewModelBuilderTests.js
@@ -150,6 +150,11 @@ describe('SubscriptionViewModelBuilder', function () {
     this.PlansLocator = {
       findLocalPlanInSettings: sinon.stub(),
     }
+    this.SplitTestHandler = {
+      promises: {
+        getAssignmentForUser: sinon.stub().resolves({ variant: 'default' }),
+      },
+    }
     this.SubscriptionViewModelBuilder = SandboxedModule.require(modulePath, {
       requires: {
         '@overleaf/settings': this.Settings,
@@ -168,6 +173,7 @@ describe('SubscriptionViewModelBuilder', function () {
         './V1SubscriptionManager': {},
         '../Publishers/PublishersGetter': this.PublishersGetter,
         './SubscriptionHelper': SubscriptionHelper,
+        '../SplitTests/SplitTestHandler': this.SplitTestHandler,
       },
     })
 
@@ -659,6 +665,9 @@ describe('SubscriptionViewModelBuilder', function () {
       describe('isEligibleForGroupPlan', function () {
         it('is false for Stripe subscriptions', async function () {
           this.paymentRecord.service = 'stripe-us'
+          this.Modules.promises.hooks.fire
+            .withArgs('canUpgradeFromIndividualToGroup')
+            .resolves([false])
           const result =
             await this.SubscriptionViewModelBuilder.promises.buildUsersSubscriptionViewModel(
               this.user

From 1daa49d9d2bf597dfdfd0d981f24a3e5bb5f1fb5 Mon Sep 17 00:00:00 2001
From: Liangjun Song <146005915+adai26@users.noreply.github.com>
Date: Tue, 15 Jul 2025 12:02:44 +0100
Subject: [PATCH 231/274] Merge pull request #27093 from
 overleaf/ls-support-3ds-in-group-plan-update-flows

Support 3DS verification in group plan update flows

GitOrigin-RevId: 3206f612e5699f39ac44864daf6610da2956e6ca
---
 .../SubscriptionGroupController.mjs           | 16 +++++
 .../components/add-seats/add-seats.tsx        | 55 +++++++++------
 .../upgrade-subscription.tsx                  | 36 +++++++---
 .../modals/change-to-group-modal.tsx          | 11 ++-
 .../SubscriptionGroupController.test.mjs      | 67 +++++++++++++++++++
 5 files changed, 152 insertions(+), 33 deletions(-)

diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
index 4276ebd6e7..7091d2916d 100644
--- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
+++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs
@@ -19,6 +19,7 @@ import {
   SubtotalLimitExceededError,
   HasPastDueInvoiceError,
   HasNoAdditionalLicenseWhenManuallyCollectedError,
+  PaymentActionRequiredError,
 } from './Errors.js'
 
 /**
@@ -273,6 +274,14 @@ async function createAddSeatsSubscriptionChange(req, res) {
       })
     }
 
+    if (error instanceof PaymentActionRequiredError) {
+      return res.status(402).json({
+        message: 'Payment action required',
+        clientSecret: error.info.clientSecret,
+        publicKey: error.info.publicKey,
+      })
+    }
+
     logger.err(
       { error },
       'error trying to create "add seats" subscription change'
@@ -369,6 +378,13 @@ async function upgradeSubscription(req, res) {
     await SubscriptionGroupHandler.promises.upgradeGroupPlan(userId)
     return res.sendStatus(200)
   } catch (error) {
+    if (error instanceof PaymentActionRequiredError) {
+      return res.status(402).json({
+        message: 'Payment action required',
+        clientSecret: error.info.clientSecret,
+        publicKey: error.info.publicKey,
+      })
+    }
     logger.err({ error }, 'error trying to upgrade subscription')
     return res.sendStatus(500)
   }
diff --git a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
index e795ed6a2d..f598ee9ddc 100644
--- a/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
+++ b/services/web/frontend/js/features/group-management/components/add-seats/add-seats.tsx
@@ -30,6 +30,7 @@ import {
 } from '../../../../../../types/subscription/subscription-change-preview'
 import { MergeAndOverride, Nullable } from '../../../../../../types/utils'
 import { sendMB } from '../../../../infrastructure/event-tracking'
+import handleStripePaymentAction from '@/features/subscription/util/handle-stripe-payment-action'
 
 export const MAX_NUMBER_OF_USERS = 20
 export const MAX_NUMBER_OF_PO_NUMBER_CHARACTERS = 50
@@ -60,13 +61,12 @@ function AddSeats() {
     reset: resetCostSummaryData,
     error: errorCostSummary,
   } = useAsync<CostSummaryData, FetchError>()
-  const {
-    isLoading: isAddingSeats,
-    isError: isErrorAddingSeats,
-    isSuccess: isSuccessAddingSeats,
-    runAsync: runAsyncAddSeats,
-    data: addedSeatsData,
-  } = useAsync<{ adding: number }>()
+  const [isAddingSeats, setIsAddingSeats] = useState(false)
+  const [isErrorAddingSeats, setIsErrorAddingSeats] = useState(false)
+  const [isSuccessAddingSeats, setIsSuccessAddingSeats] = useState(false)
+  const [addedSeatsData, setAddedSeatsData] = useState<{
+    adding: number
+  } | null>(null)
   const {
     isLoading: isSendingMailToSales,
     isError: isErrorSendingMailToSales,
@@ -217,21 +217,34 @@ function AddSeats() {
       sendMB('flex-add-users-form', {
         action: 'click-add-user-button',
       })
-      const post = postJSON('/user/subscription/group/add-users/create', {
-        signal: addSeatsSignal,
-        body: {
-          adding: Number(rawSeats),
-          poNumber,
-        },
-      })
-      runAsyncAddSeats(post)
-        .then(() => {
+      setIsAddingSeats(true)
+      try {
+        const response = await postJSON<{
+          adding: number
+        }>('/user/subscription/group/add-users/create', {
+          signal: addSeatsSignal,
+          body: {
+            adding: Number(rawSeats),
+            poNumber,
+          },
+        })
+        sendMB('flex-add-users-success')
+        setIsSuccessAddingSeats(true)
+        setAddedSeatsData(response)
+      } catch (error) {
+        const { handled } = await handleStripePaymentAction(error as FetchError)
+        if (handled) {
           sendMB('flex-add-users-success')
-        })
-        .catch(() => {
-          debugConsole.error()
-          sendMB('flex-add-users-error')
-        })
+          setIsSuccessAddingSeats(true)
+          setAddedSeatsData({ adding: Number(rawSeats) })
+          return
+        }
+        debugConsole.error(error)
+        sendMB('flex-add-users-error')
+        setIsErrorAddingSeats(true)
+      } finally {
+        setIsAddingSeats(false)
+      }
     }
   }
 
diff --git a/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription.tsx b/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription.tsx
index 467ce88dea..b4ce898ecb 100644
--- a/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription.tsx
+++ b/services/web/frontend/js/features/group-management/components/upgrade-subscription/upgrade-subscription.tsx
@@ -1,35 +1,49 @@
 import getMeta from '@/utils/meta'
-import { postJSON } from '@/infrastructure/fetch-json'
+import { FetchError, postJSON } from '@/infrastructure/fetch-json'
 import { useTranslation, Trans } from 'react-i18next'
 import { Card, Row, Col } from 'react-bootstrap'
 import IconButton from '@/features/ui/components/bootstrap-5/icon-button'
 import Button from '@/features/ui/components/bootstrap-5/button'
 import UpgradeSubscriptionPlanDetails from './upgrade-subscription-plan-details'
-import useAsync from '@/shared/hooks/use-async'
 import RequestStatus from '../request-status'
 import UpgradeSummary, {
   SubscriptionChange,
 } from './upgrade-subscription-upgrade-summary'
 import { debugConsole } from '@/utils/debugging'
 import { sendMB } from '../../../../infrastructure/event-tracking'
+import handleStripePaymentAction from '@/features/subscription/util/handle-stripe-payment-action'
+import { useState } from 'react'
 
 function UpgradeSubscription() {
   const { t } = useTranslation()
   const groupName = getMeta('ol-groupName')
   const preview = getMeta('ol-subscriptionChangePreview') as SubscriptionChange
-  const { isError, runAsync, isSuccess, isLoading } = useAsync()
-  const onSubmit = () => {
+  const [isError, setIsError] = useState(false)
+  const [isLoading, setIsLoading] = useState(false)
+  const [isSuccess, setIsSuccess] = useState(false)
+  const onSubmit = async () => {
     sendMB('flex-upgrade-form', {
       action: 'click-upgrade-button',
     })
-    runAsync(postJSON('/user/subscription/group/upgrade-subscription'))
-      .then(() => {
+    setIsLoading(true)
+
+    try {
+      await postJSON('/user/subscription/group/upgrade-subscription')
+      sendMB('flex-upgrade-success')
+      setIsSuccess(true)
+    } catch (error) {
+      const { handled } = await handleStripePaymentAction(error as FetchError)
+      if (handled) {
         sendMB('flex-upgrade-success')
-      })
-      .catch(() => {
-        debugConsole.error()
-        sendMB('flex-upgrade-error')
-      })
+        setIsSuccess(true)
+        return
+      }
+      debugConsole.error(error)
+      sendMB('flex-upgrade-error')
+      setIsError(true)
+    } finally {
+      setIsLoading(false)
+    }
   }
 
   if (isSuccess) {
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
index 8cc992f1f9..f27d024d0c 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
@@ -2,7 +2,10 @@ import { useEffect, useState } from 'react'
 import { useTranslation, Trans } from 'react-i18next'
 import { PaidSubscription } from '../../../../../../../../../../types/subscription/dashboard/subscription'
 import { PriceForDisplayData } from '../../../../../../../../../../types/subscription/plan'
-import { postJSON } from '../../../../../../../../infrastructure/fetch-json'
+import {
+  postJSON,
+  FetchError,
+} from '../../../../../../../../infrastructure/fetch-json'
 import getMeta from '../../../../../../../../utils/meta'
 import { useSubscriptionDashboardContext } from '../../../../../../context/subscription-dashboard-context'
 import GenericErrorAlert from '../../../../generic-error-alert'
@@ -23,6 +26,7 @@ import { useContactUsModal } from '@/shared/hooks/use-contact-us-modal'
 import { UserProvider } from '@/shared/context/user-context'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLNotification from '@/features/ui/components/ol/ol-notification'
+import handleStripePaymentAction from '@/features/subscription/util/handle-stripe-payment-action'
 
 const educationalPercentDiscount = 40
 
@@ -136,6 +140,11 @@ export function ChangeToGroupModal() {
       })
       location.reload()
     } catch (e) {
+      const { handled } = await handleStripePaymentAction(e as FetchError)
+      if (handled) {
+        location.reload()
+        return
+      }
       setError(true)
       setInflight(false)
     }
diff --git a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
index ddfa8b0790..4783a44bcb 100644
--- a/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
+++ b/services/web/test/unit/src/Subscription/SubscriptionGroupController.test.mjs
@@ -137,6 +137,12 @@ describe('SubscriptionGroupController', function () {
       SubtotalLimitExceededError: class extends Error {},
       HasPastDueInvoiceError: class extends Error {},
       HasNoAdditionalLicenseWhenManuallyCollectedError: class extends Error {},
+      PaymentActionRequiredError: class extends Error {
+        constructor(info) {
+          super('Payment action required')
+          this.info = info
+        }
+      },
     }
 
     vi.doMock(
@@ -718,6 +724,38 @@ describe('SubscriptionGroupController', function () {
         ctx.Controller.createAddSeatsSubscriptionChange(ctx.req, res)
       })
     })
+
+    it('should send 402 response with PaymentActionRequiredError', async function (ctx) {
+      await new Promise(resolve => {
+        const adding = 2
+        ctx.req.body = { adding }
+        const error = new ctx.Errors.PaymentActionRequiredError({
+          clientSecret: 'secret',
+          publicKey: 'key',
+        })
+        ctx.SubscriptionGroupHandler.promises.createAddSeatsSubscriptionChange =
+          sinon.stub().throws(error)
+
+        const res = {
+          status: statusCode => {
+            statusCode.should.equal(402)
+
+            return {
+              json: data => {
+                data.should.deep.equal({
+                  message: 'Payment action required',
+                  clientSecret: error.info.clientSecret,
+                  publicKey: error.info.publicKey,
+                })
+                resolve()
+              },
+            }
+          },
+        }
+
+        ctx.Controller.createAddSeatsSubscriptionChange(ctx.req, res)
+      })
+    })
   })
 
   describe('submitForm', function () {
@@ -896,5 +934,34 @@ describe('SubscriptionGroupController', function () {
         ctx.Controller.upgradeSubscription(ctx.req, res)
       })
     })
+
+    it('should send 402 response with PaymentActionRequiredError', async function (ctx) {
+      await new Promise(resolve => {
+        const error = new ctx.Errors.PaymentActionRequiredError({
+          clientSecret: 'secret',
+          publicKey: 'public',
+        })
+        ctx.SubscriptionGroupHandler.promises.upgradeGroupPlan = sinon
+          .stub()
+          .rejects(error)
+        const res = {
+          status: code => {
+            code.should.equal(402)
+            return {
+              json: data => {
+                data.should.deep.equal({
+                  message: 'Payment action required',
+                  clientSecret: error.info.clientSecret,
+                  publicKey: error.info.publicKey,
+                })
+                resolve()
+              },
+            }
+          },
+        }
+
+        ctx.Controller.upgradeSubscription(ctx.req, res)
+      })
+    })
   })
 })

From 1833bd3d00c6c5f271d4f899dc76ed6315cc4a55 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com>
Date: Tue, 15 Jul 2025 10:15:02 -0400
Subject: [PATCH 232/274] Merge pull request #27126 from
 overleaf/em-fix-persist-changes

Fix chunk creation over a one change chunk

GitOrigin-RevId: aecae334849522975b83c77224ee27db64de4ed8
---
 .../storage/lib/chunk_store/index.js          |  2 +-
 .../acceptance/js/storage/chunk_store.test.js |  3 ++-
 .../js/storage/persist_changes.test.js        | 22 +++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/services/history-v1/storage/lib/chunk_store/index.js b/services/history-v1/storage/lib/chunk_store/index.js
index 286a8d8764..f387b68d90 100644
--- a/services/history-v1/storage/lib/chunk_store/index.js
+++ b/services/history-v1/storage/lib/chunk_store/index.js
@@ -246,7 +246,7 @@ async function create(projectId, chunk, earliestChangeTimestamp) {
 
   const opts = {}
   if (chunkStart > 0) {
-    const oldChunk = await backend.getChunkForVersion(projectId, chunkStart - 1)
+    const oldChunk = await backend.getChunkForVersion(projectId, chunkStart)
 
     if (oldChunk.endVersion !== chunkStart) {
       throw new ChunkVersionConflictError(
diff --git a/services/history-v1/test/acceptance/js/storage/chunk_store.test.js b/services/history-v1/test/acceptance/js/storage/chunk_store.test.js
index 8b06b8e412..df1e36e9cd 100644
--- a/services/history-v1/test/acceptance/js/storage/chunk_store.test.js
+++ b/services/history-v1/test/acceptance/js/storage/chunk_store.test.js
@@ -8,6 +8,7 @@ const { ObjectId } = require('mongodb')
 const { projects } = require('../../../../storage/lib/mongodb')
 const {
   ChunkVersionConflictError,
+  VersionNotFoundError,
 } = require('../../../../storage/lib/chunk_store/errors')
 
 const {
@@ -396,7 +397,7 @@ describe('chunkStore', function () {
             const newChunk = makeChunk([change], 7)
             await expect(
               chunkStore.create(projectId, newChunk)
-            ).to.be.rejectedWith(ChunkVersionConflictError)
+            ).to.be.rejectedWith(VersionNotFoundError)
             const latestChunk = await chunkStore.loadLatest(projectId)
             expect(latestChunk.toRaw()).to.deep.equal(thirdChunk.toRaw())
           })
diff --git a/services/history-v1/test/acceptance/js/storage/persist_changes.test.js b/services/history-v1/test/acceptance/js/storage/persist_changes.test.js
index 0bb8836cc1..4c491db4a3 100644
--- a/services/history-v1/test/acceptance/js/storage/persist_changes.test.js
+++ b/services/history-v1/test/acceptance/js/storage/persist_changes.test.js
@@ -67,7 +67,7 @@ describe('persistChanges', function () {
     expect(chunk.getChanges().length).to.equal(1)
   })
 
-  it('persists changes in two chunks', async function () {
+  it('persists changes in three chunks', async function () {
     const limitsToPersistImmediately = {
       maxChunkChanges: 1,
       minChangeTimestamp: farFuture,
@@ -84,7 +84,12 @@ describe('persistChanges', function () {
       new Date(),
       []
     )
-    const changes = [firstChange, secondChange]
+    const thirdChange = new Change(
+      [new AddFileOperation('c.tex', File.fromString(''))],
+      new Date(),
+      []
+    )
+    const changes = [firstChange, secondChange, thirdChange]
 
     await chunkStore.initializeProject(projectId)
     const result = await persistChanges(
@@ -99,20 +104,23 @@ describe('persistChanges', function () {
         'a.tex': {
           content: '',
         },
+        'b.tex': {
+          content: '',
+        },
       },
     })
-    const history = new History(snapshot, [secondChange])
-    const currentChunk = new Chunk(history, 1)
+    const history = new History(snapshot, [thirdChange])
+    const currentChunk = new Chunk(history, 2)
     expect(result).to.deep.equal({
-      numberOfChangesPersisted: 2,
+      numberOfChangesPersisted: 3,
       originalEndVersion: 0,
       currentChunk,
       resyncNeeded: false,
     })
 
     const chunk = await chunkStore.loadLatest(projectId)
-    expect(chunk.getStartVersion()).to.equal(1)
-    expect(chunk.getEndVersion()).to.equal(2)
+    expect(chunk.getStartVersion()).to.equal(2)
+    expect(chunk.getEndVersion()).to.equal(3)
     expect(chunk.getChanges().length).to.equal(1)
   })
 

From 3e29af53a8b497d78f3d7defb2b88128e04d14e1 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Tue, 15 Jul 2025 08:25:27 -0700
Subject: [PATCH 233/274] Merge pull request #27058 from
 overleaf/mf-re-add-sticky-header-plans-page

[web] Re-add sticky header for mobile plans table on bs5 version of the plans page

GitOrigin-RevId: 2c97e9983f8d0e1beb312c135558758a7f4f2ec0
---
 services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
index 5c11e46cd8..9894af31f7 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/plans.scss
@@ -23,6 +23,7 @@ $z-index-group-member-picker-list: 1;
   --border-radius-large-new: 16px; // TODO: put this variable in a decent location
 
   padding-top: $header-height;
+  overflow: unset;
 
   .container {
     padding: 0 var(--spacing-06);

From 8c39add8652e9e90063bc2cb5c6a79f92e0c29dd Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Tue, 15 Jul 2025 18:24:57 +0200
Subject: [PATCH 234/274] [clsi-cache] meter ingress and egress bandwidth
 (#27143)

* [mics] fix "app" label in clsi-cache metrics in dev-env

* [clsi-cache] validate filePath when processing file

* [clsi-cache] meter ingress and egress bandwidth

Files are downloaded directly from nginx, hence we cannot meter egress
in clsi-cache easily.

GitOrigin-RevId: 24de8c41728f0e9c984113c1470dec6153e75f20
---
 libraries/stream-utils/index.js               | 19 +++++++++++++++++++
 package-lock.json                             |  3 +++
 services/clsi/app/js/CLSICacheHandler.js      | 10 +++++++++-
 services/clsi/package.json                    |  1 +
 .../Features/Compile/ClsiCacheController.js   | 10 +++++++++-
 .../src/Features/Compile/ClsiCacheHandler.js  | 16 ++++++++++++++++
 .../src/Features/Compile/ClsiCacheManager.js  | 12 +++++++++++-
 services/web/package.json                     |  1 +
 8 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/libraries/stream-utils/index.js b/libraries/stream-utils/index.js
index e4c7d60c94..7719d409a4 100644
--- a/libraries/stream-utils/index.js
+++ b/libraries/stream-utils/index.js
@@ -145,6 +145,24 @@ class LoggerStream extends Transform {
   }
 }
 
+class MeteredStream extends Transform {
+  #Metrics
+  #metric
+  #labels
+
+  constructor(Metrics, metric, labels) {
+    super()
+    this.#Metrics = Metrics
+    this.#metric = metric
+    this.#labels = labels
+  }
+
+  _transform(chunk, encoding, callback) {
+    this.#Metrics.count(this.#metric, chunk.byteLength, 1, this.#labels)
+    callback(null, chunk)
+  }
+}
+
 // Export our classes
 
 module.exports = {
@@ -153,6 +171,7 @@ module.exports = {
   LoggerStream,
   LimitedStream,
   TimeoutStream,
+  MeteredStream,
   SizeExceededError,
   AbortError,
 }
diff --git a/package-lock.json b/package-lock.json
index d615e38f9a..bb23eb3f78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42590,6 +42590,7 @@
         "@overleaf/o-error": "*",
         "@overleaf/promise-utils": "*",
         "@overleaf/settings": "*",
+        "@overleaf/stream-utils": "*",
         "archiver": "5.3.2",
         "async": "^3.2.5",
         "body-parser": "^1.20.3",
@@ -42625,6 +42626,7 @@
         "@overleaf/o-error": "*",
         "@overleaf/promise-utils": "*",
         "@overleaf/settings": "*",
+        "@overleaf/stream-utils": "*",
         "body-parser": "^1.20.3",
         "bunyan": "^1.8.15",
         "celebrate": "^15.0.3",
@@ -44807,6 +44809,7 @@
         "@overleaf/promise-utils": "*",
         "@overleaf/redis-wrapper": "*",
         "@overleaf/settings": "*",
+        "@overleaf/stream-utils": "*",
         "@phosphor-icons/react": "^2.1.7",
         "@slack/webhook": "^7.0.2",
         "@stripe/stripe-js": "^7.3.0",
diff --git a/services/clsi/app/js/CLSICacheHandler.js b/services/clsi/app/js/CLSICacheHandler.js
index b9415ae3ec..26acd221f9 100644
--- a/services/clsi/app/js/CLSICacheHandler.js
+++ b/services/clsi/app/js/CLSICacheHandler.js
@@ -13,6 +13,7 @@ const {
 const logger = require('@overleaf/logger')
 const Metrics = require('@overleaf/metrics')
 const Settings = require('@overleaf/settings')
+const { MeteredStream } = require('@overleaf/stream-utils')
 const { CACHE_SUBDIR } = require('./OutputCacheManager')
 const { isExtraneousFile } = require('./ResourceWriter')
 
@@ -204,7 +205,13 @@ async function downloadOutputDotSynctexFromCompileCache(
   const dst = Path.join(outputDir, 'output.synctex.gz')
   const tmp = dst + crypto.randomUUID()
   try {
-    await pipeline(stream, fs.createWriteStream(tmp))
+    await pipeline(
+      stream,
+      new MeteredStream(Metrics, 'clsi_cache_egress', {
+        path: 'output.synctex.gz',
+      }),
+      fs.createWriteStream(tmp)
+    )
     await fs.promises.rename(tmp, dst)
   } catch (err) {
     try {
@@ -253,6 +260,7 @@ async function downloadLatestCompileCache(projectId, userId, compileDir) {
   let abort = false
   await pipeline(
     stream,
+    new MeteredStream(Metrics, 'clsi_cache_egress', { path: 'output.tar.gz' }),
     createGunzip(),
     tarFs.extract(compileDir, {
       // use ignore hook for counting entries (files+folders) and validation.
diff --git a/services/clsi/package.json b/services/clsi/package.json
index f6fa7aff01..fe31c430bd 100644
--- a/services/clsi/package.json
+++ b/services/clsi/package.json
@@ -23,6 +23,7 @@
     "@overleaf/o-error": "*",
     "@overleaf/promise-utils": "*",
     "@overleaf/settings": "*",
+    "@overleaf/stream-utils": "*",
     "archiver": "5.3.2",
     "async": "^3.2.5",
     "body-parser": "^1.20.3",
diff --git a/services/web/app/src/Features/Compile/ClsiCacheController.js b/services/web/app/src/Features/Compile/ClsiCacheController.js
index d76f0a02bd..6065b25578 100644
--- a/services/web/app/src/Features/Compile/ClsiCacheController.js
+++ b/services/web/app/src/Features/Compile/ClsiCacheController.js
@@ -11,6 +11,8 @@ const CompileController = require('./CompileController')
 const { expressify } = require('@overleaf/promise-utils')
 const ClsiCacheHandler = require('./ClsiCacheHandler')
 const ProjectGetter = require('../Project/ProjectGetter')
+const { MeteredStream } = require('@overleaf/stream-utils')
+const Metrics = require('@overleaf/metrics')
 
 /**
  * Download a file from a specific build on the clsi-cache.
@@ -64,7 +66,13 @@ async function downloadFromCache(req, res) {
   )
   try {
     res.writeHead(response.status)
-    await pipeline(stream, res)
+    await pipeline(
+      stream,
+      new MeteredStream(Metrics, 'clsi_cache_egress', {
+        path: ClsiCacheHandler.getEgressLabel(filename),
+      }),
+      res
+    )
   } catch (err) {
     const reqAborted = Boolean(req.destroyed)
     const streamingStarted = Boolean(res.headersSent)
diff --git a/services/web/app/src/Features/Compile/ClsiCacheHandler.js b/services/web/app/src/Features/Compile/ClsiCacheHandler.js
index bb0414bf03..4f74d237d6 100644
--- a/services/web/app/src/Features/Compile/ClsiCacheHandler.js
+++ b/services/web/app/src/Features/Compile/ClsiCacheHandler.js
@@ -34,6 +34,21 @@ function validateFilename(filename) {
   }
 }
 
+/**
+ * Keep in sync with getIngressLabel in services/clsi-cache/app/js/utils.js
+ *
+ * @param {string} fsPath
+ * @return {string}
+ */
+function getEgressLabel(fsPath) {
+  if (fsPath.endsWith('.blg')) {
+    // .blg files may have custom names and can be in nested folders.
+    return 'output.blg'
+  }
+  // The rest is limited to 5 file names via validateFilename: output.pdf, etc.
+  return fsPath
+}
+
 /**
  * Clear the cache on all clsi-cache instances.
  *
@@ -224,6 +239,7 @@ async function prepareCacheSource(
 }
 
 module.exports = {
+  getEgressLabel,
   clearCache,
   getOutputFile,
   getLatestOutputFile,
diff --git a/services/web/app/src/Features/Compile/ClsiCacheManager.js b/services/web/app/src/Features/Compile/ClsiCacheManager.js
index b1ef2a46ac..0c172642ee 100644
--- a/services/web/app/src/Features/Compile/ClsiCacheManager.js
+++ b/services/web/app/src/Features/Compile/ClsiCacheManager.js
@@ -7,6 +7,7 @@ const SplitTestHandler = require('../SplitTests/SplitTestHandler')
 const UserGetter = require('../User/UserGetter')
 const Settings = require('@overleaf/settings')
 const { fetchJson, RequestFailedError } = require('@overleaf/fetch-utils')
+const Metrics = require('@overleaf/metrics')
 
 /**
  * Get the most recent build and metadata
@@ -71,7 +72,13 @@ async function getLatestCompileResult(projectId, userId) {
 async function tryGetLatestCompileResult(projectId, userId, signal) {
   const {
     internal: { location: metaLocation },
-    external: { isUpToDate, allFiles, zone, shard: clsiCacheShard },
+    external: {
+      isUpToDate,
+      allFiles,
+      zone,
+      shard: clsiCacheShard,
+      size: jsonSize,
+    },
   } = await getLatestBuildFromCache(
     projectId,
     userId,
@@ -93,6 +100,9 @@ async function tryGetLatestCompileResult(projectId, userId, signal) {
     }
     throw err
   }
+  Metrics.count('clsi_cache_egress', jsonSize, 1, {
+    path: ClsiCacheHandler.getEgressLabel('output.overleaf.json'),
+  })
 
   const [, editorId, buildId] = metaLocation.match(
     /\/build\/([a-f0-9-]+?)-([a-f0-9]+-[a-f0-9]+)\//
diff --git a/services/web/package.json b/services/web/package.json
index 45f8453242..b0cee1af06 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -91,6 +91,7 @@
     "@overleaf/promise-utils": "*",
     "@overleaf/redis-wrapper": "*",
     "@overleaf/settings": "*",
+    "@overleaf/stream-utils": "*",
     "@phosphor-icons/react": "^2.1.7",
     "@slack/webhook": "^7.0.2",
     "@stripe/stripe-js": "^7.3.0",

From 9720413218e6749760bb0c2d5f9d392b98ac2e5a Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Tue, 15 Jul 2025 18:48:48 +0200
Subject: [PATCH 235/274] [web] add support for pug caching when running E2E
 tests in dev-env (#27073)

GitOrigin-RevId: bbb53723bd1bc22db5b3d440539f1624a905341f
---
 services/web/app/src/infrastructure/Server.mjs | 2 +-
 services/web/config/settings.defaults.js       | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/web/app/src/infrastructure/Server.mjs b/services/web/app/src/infrastructure/Server.mjs
index 9e548bdc9e..6aba16e682 100644
--- a/services/web/app/src/infrastructure/Server.mjs
+++ b/services/web/app/src/infrastructure/Server.mjs
@@ -134,7 +134,7 @@ app.set('views', fileURLToPath(new URL('../../views', import.meta.url)))
 app.set('view engine', 'pug')
 
 if (Settings.enabledServices.includes('web')) {
-  if (app.get('env') !== 'development') {
+  if (Settings.enablePugCache || app.get('env') !== 'development') {
     logger.debug('enabling view cache for production or acceptance tests')
     app.enable('view cache')
   }
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index a324330bbd..66f29de333 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -807,7 +807,10 @@ module.exports = {
     '/templates/index': '/templates/',
   },
 
-  reloadModuleViewsOnEachRequest: process.env.NODE_ENV === 'development',
+  enablePugCache: process.env.ENABLE_PUG_CACHE === 'true',
+  reloadModuleViewsOnEachRequest:
+    process.env.ENABLE_PUG_CACHE !== 'true' &&
+    process.env.NODE_ENV === 'development',
 
   rateLimit: {
     subnetRateLimiterDisabled:

From 93c6353b90be80bc667876646529381551dc2e0d Mon Sep 17 00:00:00 2001
From: MoxAmber <amber.steele@overleaf.com>
Date: Wed, 16 Jul 2025 12:17:18 +0100
Subject: [PATCH 236/274] Merge pull request #27120 from
 overleaf/as-compile-timeout-date-change

[web] Update compile timeout enforcement date

GitOrigin-RevId: 9c6957bad440a381e954e1f4de98d603d31aef42
---
 services/web/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index e67a350dac..9f7a97449c 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1090,7 +1090,7 @@
   "integrations": "Integrations",
   "integrations_like_github": "Integrations like GitHub Sync",
   "interested_in_cheaper_personal_plan": "Would you be interested in the cheaper <0>__price__</0> Personal plan?",
-  "introducing_shorter_compile_timeout": "We’re <0>introducing a shorter compile timeout limit</0>. This project currently exceeds the new limit, so it might not compile from 16th July 2025.",
+  "introducing_shorter_compile_timeout": "We’re <0>introducing a shorter compile timeout limit</0>. This project currently exceeds the new limit, so it might not compile from 25th August 2025.",
   "invalid_certificate": "Invalid certificate. Please check the certificate and try again.",
   "invalid_confirmation_code": "That didn’t work. Please check the code and try again.",
   "invalid_email": "An email address is invalid",

From 5669a7d1c82205c4e6696cba1955e27430154921 Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:24:16 +0100
Subject: [PATCH 237/274] Merge pull request #27147 from
 overleaf/bg-filestore-migration-for-server-pro-II

add support for fetching files via http from filestore in back_fill_file_hash script and tests

GitOrigin-RevId: 8dea6383ed6fe9ee6786a5695e2deee93b1cdd84
---
 .../storage/scripts/back_fill_file_hash.mjs   |  48 +++++-
 .../js/storage/back_fill_file_hash.test.mjs   | 153 +++++++++---------
 2 files changed, 119 insertions(+), 82 deletions(-)

diff --git a/services/history-v1/storage/scripts/back_fill_file_hash.mjs b/services/history-v1/storage/scripts/back_fill_file_hash.mjs
index ba3e0d4359..5a590e347a 100644
--- a/services/history-v1/storage/scripts/back_fill_file_hash.mjs
+++ b/services/history-v1/storage/scripts/back_fill_file_hash.mjs
@@ -33,7 +33,6 @@ import {
   makeProjectKey,
 } from '../lib/blob_store/index.js'
 import { backedUpBlobs as backedUpBlobsCollection, db } from '../lib/mongodb.js'
-import filestorePersistor from '../lib/persistor.js'
 import commandLineArgs from 'command-line-args'
 import readline from 'node:readline'
 
@@ -179,6 +178,37 @@ const STREAM_HIGH_WATER_MARK = parseInt(
 const LOGGING_INTERVAL = parseInt(process.env.LOGGING_INTERVAL || '60000', 10)
 const SLEEP_BEFORE_EXIT = parseInt(process.env.SLEEP_BEFORE_EXIT || '1000', 10)
 
+// Filestore endpoint location
+const FILESTORE_HOST = process.env.FILESTORE_HOST || '127.0.0.1'
+const FILESTORE_PORT = process.env.FILESTORE_PORT || '3009'
+
+async function fetchFromFilestore(projectId, fileId) {
+  const url = `http://${FILESTORE_HOST}:${FILESTORE_PORT}/project/${projectId}/file/${fileId}`
+  const response = await fetch(url)
+  if (!response.ok) {
+    if (response.status === 404) {
+      throw new NotFoundError('file not found in filestore', {
+        status: response.status,
+      })
+    }
+    const body = await response.text()
+    throw new OError('fetchFromFilestore failed', {
+      projectId,
+      fileId,
+      status: response.status,
+      body,
+    })
+  }
+  if (!response.body) {
+    throw new OError('fetchFromFilestore response has no body', {
+      projectId,
+      fileId,
+      status: response.status,
+    })
+  }
+  return response.body
+}
+
 const projectsCollection = db.collection('projects')
 /** @type {ProjectsCollection} */
 const typedProjectsCollection = db.collection('projects')
@@ -348,8 +378,7 @@ async function processFile(entry, filePath) {
     } catch (err) {
       if (gracefulShutdownInitiated) throw err
       if (err instanceof NotFoundError) {
-        const { bucketName } = OError.getFullInfo(err)
-        if (bucketName === USER_FILES_BUCKET_NAME && !RETRY_FILESTORE_404) {
+        if (!RETRY_FILESTORE_404) {
           throw err // disable retries for not found in filestore bucket case
         }
       }
@@ -416,10 +445,8 @@ async function processFileOnce(entry, filePath) {
   }
 
   STATS.readFromGCSCount++
-  const src = await filestorePersistor.getObjectStream(
-    USER_FILES_BUCKET_NAME,
-    `${projectId}/${fileId}`
-  )
+  // make a fetch request to filestore itself
+  const src = await fetchFromFilestore(projectId, fileId)
   const dst = fs.createWriteStream(filePath, {
     highWaterMark: STREAM_HIGH_WATER_MARK,
   })
@@ -1327,14 +1354,21 @@ async function processDeletedProjects() {
 }
 
 async function main() {
+  console.log('Starting project file backup...')
   await loadGlobalBlobs()
+  console.log('Loaded global blobs:', GLOBAL_BLOBS.size)
   if (PROJECT_IDS_FROM) {
+    console.log(
+      `Processing projects from file: ${PROJECT_IDS_FROM}, this may take a while...`
+    )
     await processProjectsFromFile()
   } else {
     if (PROCESS_NON_DELETED_PROJECTS) {
+      console.log('Processing non-deleted projects...')
       await processNonDeletedProjects()
     }
     if (PROCESS_DELETED_PROJECTS) {
+      console.log('Processing deleted projects...')
       await processDeletedProjects()
     }
   }
diff --git a/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs b/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs
index fd39369a71..8f861d3934 100644
--- a/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs
+++ b/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs
@@ -15,7 +15,6 @@ import { execFile } from 'node:child_process'
 import chai, { expect } from 'chai'
 import chaiExclude from 'chai-exclude'
 import config from 'config'
-import ObjectPersistor from '@overleaf/object-persistor'
 import { WritableBuffer } from '@overleaf/stream-utils'
 import {
   backupPersistor,
@@ -27,6 +26,8 @@ import {
   makeProjectKey,
 } from '../../../../storage/lib/blob_store/index.js'
 
+import express from 'express'
+
 chai.use(chaiExclude)
 const TIMEOUT = 20 * 1_000
 
@@ -36,15 +37,58 @@ const { tieringStorageClass } = config.get('backupPersistor')
 const projectsCollection = db.collection('projects')
 const deletedProjectsCollection = db.collection('deletedProjects')
 
-const FILESTORE_PERSISTOR = ObjectPersistor({
-  backend: 'gcs',
-  gcs: {
-    endpoint: {
-      apiEndpoint: process.env.GCS_API_ENDPOINT,
-      projectId: process.env.GCS_PROJECT_ID,
-    },
-  },
-})
+class MockFilestore {
+  constructor() {
+    this.host = process.env.FILESTORE_HOST || '127.0.0.1'
+    this.port = process.env.FILESTORE_PORT || 3009
+    // create a server listening on this.host and this.port
+    this.files = {}
+
+    this.app = express()
+
+    this.app.get('/project/:projectId/file/:fileId', (req, res) => {
+      const { projectId, fileId } = req.params
+      const content = this.files[projectId]?.[fileId]
+      if (!content) return res.status(404).end()
+      res.status(200).end(content)
+    })
+  }
+
+  start() {
+    // reset stored files
+    this.files = {}
+    // start the server
+    if (this.serverPromise) {
+      return this.serverPromise
+    } else {
+      this.serverPromise = new Promise((resolve, reject) => {
+        this.server = this.app.listen(this.port, this.host, err => {
+          if (err) return reject(err)
+          resolve()
+        })
+      })
+      return this.serverPromise
+    }
+  }
+
+  addFile(projectId, fileId, fileContent) {
+    if (!this.files[projectId]) {
+      this.files[projectId] = {}
+    }
+    this.files[projectId][fileId] = fileContent
+  }
+
+  deleteObject(projectId, fileId) {
+    if (this.files[projectId]) {
+      delete this.files[projectId][fileId]
+      if (Object.keys(this.files[projectId]).length === 0) {
+        delete this.files[projectId]
+      }
+    }
+  }
+}
+
+const mockFilestore = new MockFilestore()
 
 /**
  * @param {ObjectId} objectId
@@ -472,67 +516,36 @@ describe('back_fill_file_hash script', function () {
   }
 
   async function populateFilestore() {
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId0}/${fileId0}`,
-      Stream.Readable.from([fileId0.toString()])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId0}/${fileId6}`,
-      Stream.Readable.from([fileId6.toString()])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId0}/${fileId7}`,
-      Stream.Readable.from([contentFile7])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId1}/${fileId1}`,
-      Stream.Readable.from([fileId1.toString()])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId2}/${fileId2}`,
-      Stream.Readable.from([fileId2.toString()])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId3}/${fileId3}`,
-      Stream.Readable.from([fileId3.toString()])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId3}/${fileId10}`,
+    await mockFilestore.addFile(projectId0, fileId0, fileId0.toString())
+    await mockFilestore.addFile(projectId0, fileId6, fileId6.toString())
+    await mockFilestore.addFile(projectId0, fileId7, contentFile7)
+    await mockFilestore.addFile(projectId1, fileId1, fileId1.toString())
+    await mockFilestore.addFile(projectId2, fileId2, fileId2.toString())
+    await mockFilestore.addFile(projectId3, fileId3, fileId3.toString())
+    await mockFilestore.addFile(
+      projectId3,
+      fileId10,
       // fileId10 is dupe of fileId3
-      Stream.Readable.from([fileId3.toString()])
+      fileId3.toString()
     )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectId3}/${fileId11}`,
+    await mockFilestore.addFile(
+      projectId3,
+      fileId11,
       // fileId11 is dupe of fileId3
-      Stream.Readable.from([fileId3.toString()])
+      fileId3.toString()
     )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectIdDeleted0}/${fileId4}`,
-      Stream.Readable.from([fileId4.toString()])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectIdDeleted1}/${fileId5}`,
-      Stream.Readable.from([fileId5.toString()])
-    )
-    await FILESTORE_PERSISTOR.sendStream(
-      USER_FILES_BUCKET_NAME,
-      `${projectIdBadFileTree3}/${fileId9}`,
-      Stream.Readable.from([fileId9.toString()])
+    await mockFilestore.addFile(projectIdDeleted0, fileId4, fileId4.toString())
+    await mockFilestore.addFile(projectIdDeleted1, fileId5, fileId5.toString())
+    await mockFilestore.addFile(
+      projectIdBadFileTree3,
+      fileId9,
+      fileId9.toString()
     )
   }
 
   async function prepareEnvironment() {
     await cleanup.everything()
+    await mockFilestore.start()
     await populateMongo()
     await populateHistoryV1()
     await populateFilestore()
@@ -1117,10 +1130,7 @@ describe('back_fill_file_hash script', function () {
     beforeEach('prepare environment', prepareEnvironment)
 
     it('should gracefully handle fatal errors', async function () {
-      await FILESTORE_PERSISTOR.deleteObject(
-        USER_FILES_BUCKET_NAME,
-        `${projectId0}/${fileId0}`
-      )
+      mockFilestore.deleteObject(projectId0, fileId0)
       const t0 = Date.now()
       const { stats, result } = await tryRunScript([], {
         RETRIES: '10',
@@ -1148,17 +1158,10 @@ describe('back_fill_file_hash script', function () {
     })
 
     it('should retry on error', async function () {
-      await FILESTORE_PERSISTOR.deleteObject(
-        USER_FILES_BUCKET_NAME,
-        `${projectId0}/${fileId0}`
-      )
+      mockFilestore.deleteObject(projectId0, fileId0)
       const restoreFileAfter5s = async () => {
         await setTimeout(5_000)
-        await FILESTORE_PERSISTOR.sendStream(
-          USER_FILES_BUCKET_NAME,
-          `${projectId0}/${fileId0}`,
-          Stream.Readable.from([fileId0.toString()])
-        )
+        mockFilestore.addFile(projectId0, fileId0, fileId0.toString())
       }
       // use Promise.allSettled to ensure the above sendStream call finishes before this test completes
       const [

From 9c16a852951d4d398dfbb9b7d741e31ce216b106 Mon Sep 17 00:00:00 2001
From: Tim Down <158919+timdown@users.noreply.github.com>
Date: Thu, 17 Jul 2025 09:03:55 +0100
Subject: [PATCH 238/274] Merge pull request #24030 from
 overleaf/td-bs5-remove-font-awesome

Remove Font Awesome in BS5

GitOrigin-RevId: 3ee9b136ac9ecda57ba9985d1da7d7a7e6b275e6
---
 .../views/_mixins/faq_search-marketing.pug    |  4 +-
 .../layout/navbar-marketing-bootstrap-5.pug   |  3 +-
 .../web/app/views/layout/navbar-marketing.pug |  2 +-
 .../views/layout/navbar-website-redesign.pug  |  2 +-
 .../web/frontend/extracted-translations.json  |  1 +
 .../js/features/contact-form/search.js        |  8 ++-
 .../components/left-menu-button.tsx           |  2 +-
 .../components/layout-dropdown-button.tsx     |  2 +-
 .../frontend/js/features/faq-search/index.js  |  1 +
 .../js/features/form-helpers/hydrate-form.js  |  6 +--
 .../features/form-helpers/input-validator.js  |  4 +-
 .../components/group-members.tsx              |  2 +-
 .../components/managers-table.tsx             |  2 +-
 .../change-list/owner-paywall-prompt.tsx      | 21 +-------
 .../components/change-list/toggle-switch.tsx  |  4 +-
 .../components/resize/horizontal-toggler.tsx  | 12 ++++-
 .../components/pdf-log-entry-raw-content.tsx  | 12 +----
 .../components/pdf-zoom-dropdown.tsx          |  2 +-
 .../components/color-picker/color-picker.tsx  |  2 +-
 .../accessibility-survey-banner.tsx           |  2 +-
 .../settings/components/linking/status.tsx    | 22 +++-----
 .../components/add-collaborators.tsx          |  2 +-
 .../components/editor-switch.tsx              |  2 +-
 .../paste-html/pasted-content-menu.tsx        |  5 +-
 .../toolbar/column-width-modal/modal.tsx      |  5 +-
 .../toolbar/section-heading-dropdown.tsx      |  4 +-
 .../extensions/visual/pasted-content.tsx      |  3 ++
 .../extensions/visual/visual-theme.ts         |  3 ++
 .../visual-widgets/editable-graphics.ts       | 18 +++++--
 .../visual/visual-widgets/preamble.ts         | 46 +++++++++++++----
 .../visual-widgets/table-rendering-error.ts   |  8 +--
 .../change-plan/individual-plans-table.tsx    | 12 +++--
 .../modals/change-to-group-modal.tsx          |  6 +--
 .../components/token-access-root.tsx          |  6 +--
 .../create-icon.js => utils/material-icon.ts} |  7 +--
 .../components/word-counts.tsx                |  8 +--
 .../frontend/js/shared/components/close.tsx   |  3 +-
 .../js/shared/components/icon-checked.jsx     | 10 ----
 .../frontend/js/shared/components/icon.tsx    | 44 ----------------
 .../js/shared/components/processing.jsx       | 23 ---------
 ...rade-benefits.jsx => upgrade-benefits.tsx} |  7 +--
 .../web/frontend/stories/icon.stories.jsx     | 50 ------------------
 .../web/frontend/stories/ui/badge.stories.tsx |  4 +-
 .../bootstrap-5/components/all.scss           |  1 +
 .../components/upgrade-benefits.scss          |  3 ++
 .../stylesheets/bootstrap-5/main-style.scss   |  1 -
 .../bootstrap-5/modals/contact-us-modal.scss  |  9 ----
 .../bootstrap-5/modules/symbol-palette.scss   |  4 --
 .../bootstrap-5/pages/editor/ide.scss         | 35 ++++---------
 .../frontend/stylesheets/core/utilities.less  |  6 ++-
 services/web/locales/en.json                  |  2 +-
 .../frontend/js/components/register-form.jsx  |  2 +-
 .../codemirror-editor-figure-modal.spec.tsx   | 37 ++++++++++----
 .../frontend/shared/components/icon.test.jsx  | 51 -------------------
 .../shared/components/processing.test.jsx     | 16 ------
 55 files changed, 192 insertions(+), 367 deletions(-)
 rename services/web/frontend/js/features/{form-helpers/create-icon.js => utils/material-icon.ts} (50%)
 delete mode 100644 services/web/frontend/js/shared/components/icon-checked.jsx
 delete mode 100644 services/web/frontend/js/shared/components/icon.tsx
 delete mode 100644 services/web/frontend/js/shared/components/processing.jsx
 rename services/web/frontend/js/shared/components/{upgrade-benefits.jsx => upgrade-benefits.tsx} (78%)
 delete mode 100644 services/web/frontend/stories/icon.stories.jsx
 create mode 100644 services/web/frontend/stylesheets/bootstrap-5/components/upgrade-benefits.scss
 delete mode 100644 services/web/test/frontend/shared/components/icon.test.jsx
 delete mode 100644 services/web/test/frontend/shared/components/processing.test.jsx

diff --git a/services/web/app/views/_mixins/faq_search-marketing.pug b/services/web/app/views/_mixins/faq_search-marketing.pug
index 677e6f03a3..b45168ec70 100644
--- a/services/web/app/views/_mixins/faq_search-marketing.pug
+++ b/services/web/app/views/_mixins/faq_search-marketing.pug
@@ -21,7 +21,7 @@ mixin faq_search-marketing(headerText, headerClass)
 							data-ol-clear-search
 							hidden
 						)
-						button.sr-only(
+						button.visually-hidden(
 							type='button'
 							hidden
 							data-ol-clear-search
@@ -31,7 +31,7 @@ mixin faq_search-marketing(headerText, headerClass)
 				.row(role='region' aria-label='search results')
 					.col-md-12
 						div(data-ol-search-results-wrapper)
-							span.sr-only(aria-live='polite' data-ol-search-sr-help-message)
+							span.visually-hidden(aria-live='polite' data-ol-search-sr-help-message)
 							div(data-ol-search-results)
 						.row-spaced-small.search-result.card.card-thin(
 							hidden
diff --git a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
index 9f9decbefb..75cc065e73 100644
--- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
+++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
@@ -1,4 +1,5 @@
 include ../_mixins/navbar
+include ../_mixins/material_symbol
 
 nav.navbar.navbar-default.navbar-main.navbar-expand-lg(
 	class={
@@ -44,7 +45,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(
 				aria-expanded='false'
 				aria-label='Toggle ' + translate('navigation')
 			)
-				i.fa.fa-bars(aria-hidden='true')
+				+material-symbol('menu')
 
 			#navbar-main-collapse.navbar-collapse.collapse
 				ul.nav.navbar-nav.navbar-right.ms-auto(role='menubar')
diff --git a/services/web/app/views/layout/navbar-marketing.pug b/services/web/app/views/layout/navbar-marketing.pug
index 4d374bd8ad..bb26ff8d40 100644
--- a/services/web/app/views/layout/navbar-marketing.pug
+++ b/services/web/app/views/layout/navbar-marketing.pug
@@ -16,7 +16,7 @@ nav.navbar.navbar-default.navbar-main(
 			- var enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
 			if enableUpgradeButton
 				//- prettier-ignore
-				a.btn.btn-primary.pull-right.me-2.visible-xs(
+				a.btn.btn-primary.float-end.me-2.visible-xs(
 					href='/user/subscription/plans'
 					event-tracking='upgrade-button-click'
 					event-tracking-mb='true'
diff --git a/services/web/app/views/layout/navbar-website-redesign.pug b/services/web/app/views/layout/navbar-website-redesign.pug
index 8963037758..210cf3a120 100644
--- a/services/web/app/views/layout/navbar-website-redesign.pug
+++ b/services/web/app/views/layout/navbar-website-redesign.pug
@@ -11,7 +11,7 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar
 					i.fa.fa-bars(aria-hidden='true')
 			- var enableUpgradeButton = projectDashboardReact && usersBestSubscription && (usersBestSubscription.type === 'free' || usersBestSubscription.type === 'standalone-ai-add-on')
 			if enableUpgradeButton
-				a.btn.btn-primary.pull-right.me-2.visible-xs(
+				a.btn.btn-primary.float-end.me-2.visible-xs(
 					href='/user/subscription/plans'
 					event-tracking='upgrade-button-click'
 					event-tracking-mb='true'
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index b0e70cafe3..ef2a9c6a2c 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -272,6 +272,7 @@
   "collaborate_online_and_offline": "",
   "collaborator_chat": "",
   "collabs_per_proj": "",
+  "collabs_per_proj_multiple": "",
   "collabs_per_proj_single": "",
   "collapse": "",
   "column_width": "",
diff --git a/services/web/frontend/js/features/contact-form/search.js b/services/web/frontend/js/features/contact-form/search.js
index 1787a068be..eaa34bdeeb 100644
--- a/services/web/frontend/js/features/contact-form/search.js
+++ b/services/web/frontend/js/features/contact-form/search.js
@@ -1,6 +1,7 @@
 import _ from 'lodash'
 import { formatWikiHit, searchWiki } from '../algolia-search/search-wiki'
 import { sendMB } from '../../infrastructure/event-tracking'
+import { materialIcon } from '@/features/utils/material-icon'
 
 export function setupSearch(formEl) {
   const inputEl = formEl.querySelector('[name="subject"]')
@@ -45,11 +46,8 @@ export function setupSearch(formEl) {
         contentEl.innerHTML = pageName
         linkEl.append(contentEl)
 
-        const iconEl = document.createElement('i')
-        iconEl.className = 'material-symbols dropdown-item-trailing-icon'
-        iconEl.textContent = 'open_in_new'
-        iconEl.setAttribute('aria-hidden', 'true')
-        iconEl.translate = false
+        const iconEl = materialIcon('open_in_new')
+        iconEl.classList.add('dropdown-item-trailing-icon')
         linkEl.append(iconEl)
 
         resultsEl.append(liEl)
diff --git a/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx b/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx
index 4d4efe6dbc..f1cd54750f 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/left-menu-button.tsx
@@ -43,7 +43,7 @@ export default function LeftMenuButton({
         <LeftMenuButtonIcon svgIcon={svgIcon} icon={icon} />
         <span translate={translate}>{children}</span>
         {disabledAccesibilityText ? (
-          <span className="sr-only">{disabledAccesibilityText}</span>
+          <span className="visually-hidden">{disabledAccesibilityText}</span>
         ) : null}
       </div>
     )
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.tsx
index ff0fbda5f1..addd6a013e 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.tsx
@@ -172,7 +172,7 @@ export const LayoutDropdownButtonUi = ({
   return (
     <>
       {processing && (
-        <div aria-live="assertive" className="sr-only">
+        <div aria-live="assertive" className="visually-hidden">
           {t('layout_processing')}
         </div>
       )}
diff --git a/services/web/frontend/js/features/faq-search/index.js b/services/web/frontend/js/features/faq-search/index.js
index 8774ee235a..1ddf26beb4 100644
--- a/services/web/frontend/js/features/faq-search/index.js
+++ b/services/web/frontend/js/features/faq-search/index.js
@@ -102,6 +102,7 @@ function setupSearch(formEl) {
 
   // display initial results
   handleChange()
+  updateClearBtnVisibility()
 }
 
 document.querySelectorAll('[data-ol-faq-search]').forEach(setupSearch)
diff --git a/services/web/frontend/js/features/form-helpers/hydrate-form.js b/services/web/frontend/js/features/form-helpers/hydrate-form.js
index 89bd1a657d..3d546203fc 100644
--- a/services/web/frontend/js/features/form-helpers/hydrate-form.js
+++ b/services/web/frontend/js/features/form-helpers/hydrate-form.js
@@ -4,7 +4,7 @@ import { canSkipCaptcha, validateCaptchaV2 } from './captcha'
 import inputValidator from './input-validator'
 import { disableElement, enableElement } from '../utils/disableElement'
 import { isBootstrap5 } from '@/features/utils/bootstrap-5'
-import createIcon from '@/features/form-helpers/create-icon'
+import { materialIcon } from '@/features/utils/material-icon'
 
 // Form helper(s) to handle:
 // - Attaching to the relevant form elements
@@ -165,7 +165,7 @@ function createNotificationFromMessageBS5(message) {
   if (materialIcon) {
     const iconEl = document.createElement('div')
     iconEl.className = 'notification-icon'
-    const iconSpan = createIcon(materialIcon)
+    const iconSpan = materialIcon(materialIcon)
     iconEl.append(iconSpan)
     messageEl.append(iconEl)
   }
@@ -313,7 +313,7 @@ function showMessagesNewStyle(formEl, messageBag) {
       }
 
       // create the left icon
-      const icon = createIcon(
+      const icon = materialIcon(
         message.type === 'error' ? 'error' : 'check_circle'
       )
       const messageIcon = document.createElement('div')
diff --git a/services/web/frontend/js/features/form-helpers/input-validator.js b/services/web/frontend/js/features/form-helpers/input-validator.js
index f01c4af3da..25038b6a1a 100644
--- a/services/web/frontend/js/features/form-helpers/input-validator.js
+++ b/services/web/frontend/js/features/form-helpers/input-validator.js
@@ -1,5 +1,5 @@
 import { isBootstrap5 } from '@/features/utils/bootstrap-5'
-import createIcon from '@/features/form-helpers/create-icon'
+import { materialIcon } from '@/features/utils/material-icon'
 
 export default function inputValidator(inputEl) {
   const messageEl = document.createElement('div')
@@ -15,7 +15,7 @@ export default function inputValidator(inputEl) {
 
   // In Bootstrap 5, add an icon
   if (isBootstrap5()) {
-    const iconEl = createIcon('error')
+    const iconEl = materialIcon('error')
     messageInnerEl.append(iconEl)
   }
   messageInnerEl.append(messageTextNode)
diff --git a/services/web/frontend/js/features/group-management/components/group-members.tsx b/services/web/frontend/js/features/group-management/components/group-members.tsx
index c49fa62af0..4e94645c94 100644
--- a/services/web/frontend/js/features/group-management/components/group-members.tsx
+++ b/services/web/frontend/js/features/group-management/components/group-members.tsx
@@ -113,7 +113,7 @@ export default function GroupMembers() {
               className="page-header mb-4"
               data-testid="page-header-members-details"
             >
-              <div className="pull-right">
+              <div className="float-end">
                 {selectedUsers.length === 0 && groupSizeDetails()}
                 {removeMemberLoading ? (
                   <OLButton variant="danger" disabled>
diff --git a/services/web/frontend/js/features/group-management/components/managers-table.tsx b/services/web/frontend/js/features/group-management/components/managers-table.tsx
index 3f701b698d..d91b4acc67 100644
--- a/services/web/frontend/js/features/group-management/components/managers-table.tsx
+++ b/services/web/frontend/js/features/group-management/components/managers-table.tsx
@@ -153,7 +153,7 @@ export function ManagersTable({
               className="page-header mb-4"
               data-testid="page-header-members-details"
             >
-              <div className="pull-right">
+              <div className="float-end">
                 {removeMemberInflightCount > 0 ? (
                   <OLButton variant="danger" disabled>
                     {t('removing')}&hellip;
diff --git a/services/web/frontend/js/features/history/components/change-list/owner-paywall-prompt.tsx b/services/web/frontend/js/features/history/components/change-list/owner-paywall-prompt.tsx
index 8053792db9..f4c528670c 100644
--- a/services/web/frontend/js/features/history/components/change-list/owner-paywall-prompt.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/owner-paywall-prompt.tsx
@@ -1,16 +1,8 @@
 import { useTranslation } from 'react-i18next'
-import Icon from '../../../../shared/components/icon'
 import { useCallback, useEffect, useState } from 'react'
 import * as eventTracking from '../../../../infrastructure/event-tracking'
 import StartFreeTrialButton from '../../../../shared/components/start-free-trial-button'
-
-function FeatureItem({ text }: { text: string }) {
-  return (
-    <li>
-      <Icon type="check" /> {text}
-    </li>
-  )
-}
+import UpgradeBenefits from '@/shared/components/upgrade-benefits'
 
 export function OwnerPaywallPrompt() {
   const { t } = useTranslation()
@@ -34,16 +26,7 @@ export function OwnerPaywallPrompt() {
           {t('upgrade_to_get_feature', { feature: 'full project history' })}
         </strong>
       </p>
-      <ul className="history-feature-list">
-        <FeatureItem text={t('unlimited_projects')} />
-        <FeatureItem
-          text={t('collabs_per_proj', { collabcount: 'Multiple' })}
-        />
-        <FeatureItem text={t('full_doc_history')} />
-        <FeatureItem text={t('sync_to_dropbox')} />
-        <FeatureItem text={t('sync_to_github')} />
-        <FeatureItem text={t('compile_larger_projects')} />
-      </ul>
+      <UpgradeBenefits className="history-feature-list" />
       <p>
         <StartFreeTrialButton
           source="history"
diff --git a/services/web/frontend/js/features/history/components/change-list/toggle-switch.tsx b/services/web/frontend/js/features/history/components/change-list/toggle-switch.tsx
index 478630808c..078f092c51 100644
--- a/services/web/frontend/js/features/history/components/change-list/toggle-switch.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/toggle-switch.tsx
@@ -61,7 +61,9 @@ function ToggleSwitch({ labelsOnly, setLabelsOnly }: ToggleSwitchProps) {
 
   return (
     <fieldset className="toggle-switch">
-      <legend className="sr-only">{t('history_view_a11y_description')}</legend>
+      <legend className="visually-hidden">
+        {t('history_view_a11y_description')}
+      </legend>
       <input
         type="radio"
         name="labels-only-toggle-switch"
diff --git a/services/web/frontend/js/features/ide-react/components/resize/horizontal-toggler.tsx b/services/web/frontend/js/features/ide-react/components/resize/horizontal-toggler.tsx
index fba41ee8d8..a5079d397a 100644
--- a/services/web/frontend/js/features/ide-react/components/resize/horizontal-toggler.tsx
+++ b/services/web/frontend/js/features/ide-react/components/resize/horizontal-toggler.tsx
@@ -1,5 +1,6 @@
 import classNames from 'classnames'
 import OLTooltip from '@/features/ui/components/ol/ol-tooltip'
+import MaterialIcon from '@/shared/components/material-icon'
 
 type HorizontalTogglerType = 'west' | 'east'
 
@@ -42,7 +43,16 @@ export function HorizontalToggler({
         aria-label={description}
         title=""
         onClick={() => setIsOpen(!isOpen)}
-      />
+      >
+        <MaterialIcon
+          type={
+            (togglerType === 'west' && isOpen) ||
+            (togglerType === 'east' && !isOpen)
+              ? 'chevron_left'
+              : 'chevron_right'
+          }
+        />
+      </button>
     </OLTooltip>
   )
 }
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
index 2ace1667f3..7c3258f8c6 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-log-entry-raw-content.tsx
@@ -3,7 +3,6 @@ import { useResizeObserver } from '../../../shared/hooks/use-resize-observer'
 import { useTranslation } from 'react-i18next'
 import classNames from 'classnames'
 import OLButton from '@/features/ui/components/ol/ol-button'
-import Icon from '../../../shared/components/icon'
 
 export default function PdfLogEntryRawContent({
   rawContent,
@@ -53,17 +52,10 @@ export default function PdfLogEntryRawContent({
           <OLButton
             variant="secondary"
             size="sm"
+            leadingIcon={expanded ? 'expand_less' : 'expand_more'}
             onClick={() => setExpanded(value => !value)}
           >
-            {expanded ? (
-              <>
-                <Icon type="angle-up" /> {t('collapse')}
-              </>
-            ) : (
-              <>
-                <Icon type="angle-down" /> {t('expand')}
-              </>
-            )}
+            {expanded ? t('collapse') : t('expand')}
           </OLButton>
         </div>
       )}
diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-zoom-dropdown.tsx b/services/web/frontend/js/features/pdf-preview/components/pdf-zoom-dropdown.tsx
index 75d0663c80..d0dc2cdbaa 100644
--- a/services/web/frontend/js/features/pdf-preview/components/pdf-zoom-dropdown.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/pdf-zoom-dropdown.tsx
@@ -172,7 +172,7 @@ function PdfZoomDropdown({
 
 function Shortcut({ keys }: { keys: string[] }) {
   return (
-    <span className="pull-right">
+    <span className="float-end">
       {keys.map((key, idx) => (
         <span
           className={classNames({
diff --git a/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx b/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx
index 9634e47d62..ca2621e003 100644
--- a/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx
+++ b/services/web/frontend/js/features/project-list/components/color-picker/color-picker.tsx
@@ -44,7 +44,7 @@ function ColorPickerItem({ color, name }: ColorPickerItemProps) {
       tabIndex={0}
       onKeyDown={handleKeyDown}
     >
-      <span id={name} className="sr-only">
+      <span id={name} className="visually-hidden">
         {t('select_color', { name })}
       </span>
       {!pickingCustomColor && color === selectedColor && (
diff --git a/services/web/frontend/js/features/project-list/components/notifications/accessibility-survey-banner.tsx b/services/web/frontend/js/features/project-list/components/notifications/accessibility-survey-banner.tsx
index 0cbf782262..a77dd450f7 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/accessibility-survey-banner.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/accessibility-survey-banner.tsx
@@ -27,7 +27,7 @@ function AccessibilitySurveyBanner() {
 
   return (
     <Notification
-      className="sr-only"
+      className="visually-hidden"
       type="info"
       onDismiss={handleClose}
       content={<p>{t('help_improve_screen_reader_fill_out_this_survey')}</p>}
diff --git a/services/web/frontend/js/features/settings/components/linking/status.tsx b/services/web/frontend/js/features/settings/components/linking/status.tsx
index c2c95c68b2..670a272cdf 100644
--- a/services/web/frontend/js/features/settings/components/linking/status.tsx
+++ b/services/web/frontend/js/features/settings/components/linking/status.tsx
@@ -1,5 +1,6 @@
 import { ReactNode } from 'react'
-import Icon from '../../../../shared/components/icon'
+import MaterialIcon from '@/shared/components/material-icon'
+import OLSpinner from '@/features/ui/components/ol/ol-spinner'
 
 type Status = 'pending' | 'success' | 'error'
 
@@ -28,29 +29,20 @@ function StatusIcon({ status }: StatusIconProps) {
   switch (status) {
     case 'success':
       return (
-        <Icon
-          type="check-circle"
-          fw
+        <MaterialIcon
+          type="check_circle"
           className="settings-widget-status-icon status-success"
         />
       )
     case 'error':
       return (
-        <Icon
-          type="times-circle"
-          fw
+        <MaterialIcon
+          type="cancel"
           className="settings-widget-status-icon status-error"
         />
       )
     case 'pending':
-      return (
-        <Icon
-          type="circle"
-          fw
-          className="settings-widget-status-icon status-pending"
-          spin
-        />
-      )
+      return <OLSpinner size="sm" />
     default:
       return null
   }
diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
index a224d704f8..157f23b116 100644
--- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
+++ b/services/web/frontend/js/features/share-project-modal/components/add-collaborators.tsx
@@ -216,7 +216,7 @@ export default function AddCollaborators({ readOnly }: { readOnly?: boolean }) {
       </OLFormGroup>
 
       <OLFormGroup>
-        <div className="pull-right add-collaborator-controls">
+        <div className="float-end add-collaborator-controls">
           <Select
             dataTestId="add-collaborator-select"
             items={privilegeOptions}
diff --git a/services/web/frontend/js/features/source-editor/components/editor-switch.tsx b/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
index 6b80f4f6f7..5890b6c04e 100644
--- a/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
+++ b/services/web/frontend/js/features/source-editor/components/editor-switch.tsx
@@ -39,7 +39,7 @@ function EditorSwitch() {
       aria-label={t('toolbar_code_visual_editor_switch')}
     >
       <fieldset className="toggle-switch">
-        <legend className="sr-only">Editor mode.</legend>
+        <legend className="visually-hidden">Editor mode.</legend>
 
         <input
           type="radio"
diff --git a/services/web/frontend/js/features/source-editor/components/paste-html/pasted-content-menu.tsx b/services/web/frontend/js/features/source-editor/components/paste-html/pasted-content-menu.tsx
index 7fed825d33..11ed441e33 100644
--- a/services/web/frontend/js/features/source-editor/components/paste-html/pasted-content-menu.tsx
+++ b/services/web/frontend/js/features/source-editor/components/paste-html/pasted-content-menu.tsx
@@ -7,7 +7,6 @@ import {
   useRef,
   useState,
 } from 'react'
-import Icon from '../../../../shared/components/icon'
 import { useTranslation } from 'react-i18next'
 import { EditorView } from '@codemirror/view'
 import { PastedContent } from '../../extensions/visual/pasted-content'
@@ -135,7 +134,7 @@ export const PastedContentMenu: FC<{
                 }}
               >
                 <span style={{ visibility: formatted ? 'visible' : 'hidden' }}>
-                  <Icon type="check" fw />
+                  <MaterialIcon type="check" />
                 </span>
                 <span className="ol-cm-pasted-content-menu-item-label">
                   {t('paste_with_formatting')}
@@ -155,7 +154,7 @@ export const PastedContentMenu: FC<{
                 }}
               >
                 <span style={{ visibility: formatted ? 'hidden' : 'visible' }}>
-                  <Icon type="check" fw />
+                  <MaterialIcon type="check" />
                 </span>
                 <span className="ol-cm-pasted-content-menu-item-label">
                   {t('paste_without_formatting')}
diff --git a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx
index cc56059182..d23031f7bd 100644
--- a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx
+++ b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx
@@ -163,7 +163,10 @@ const ColumnWidthModalBody = () => {
                 <Select
                   label={
                     <>
-                      &nbsp;<span className="sr-only">{t('length_unit')}</span>
+                      &nbsp;
+                      <span className="visually-hidden">
+                        {t('length_unit')}
+                      </span>
                     </>
                   }
                   items={UNITS}
diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx
index 19c0bf8e52..18b6985549 100644
--- a/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx
+++ b/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx
@@ -13,7 +13,7 @@ import OLPopover from '@/features/ui/components/ol/ol-popover'
 import useEventListener from '../../../../shared/hooks/use-event-listener'
 import useDropdown from '../../../../shared/hooks/use-dropdown'
 import { emitToolbarEvent } from '../../extensions/toolbar/utils/analytics'
-import Icon from '../../../../shared/components/icon'
+import MaterialIcon from '@/shared/components/material-icon'
 import { useTranslation } from 'react-i18next'
 
 const levels = new Map([
@@ -66,7 +66,7 @@ export const SectionHeadingDropdown = () => {
         onClick={() => setOverflowOpen(!overflowOpen)}
       >
         <span>{currentLabel}</span>
-        <Icon type="caret-down" fw />
+        <MaterialIcon type="expand_more" />
       </button>
 
       {overflowOpen && (
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/pasted-content.tsx b/services/web/frontend/js/features/source-editor/extensions/visual/pasted-content.tsx
index 7321e74a89..9235028c33 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/pasted-content.tsx
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/pasted-content.tsx
@@ -100,6 +100,9 @@ const pastedContentTheme = EditorView.baseTheme({
     '&:hover': {
       backgroundColor: 'rgba(125, 125, 125, 0.2)',
     },
+    '& .material-symbols': {
+      verticalAlign: 'middle',
+    },
   },
   '.ol-cm-pasted-content-menu-item-label': {
     flex: 1,
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-theme.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-theme.ts
index 357bb99248..255acae0a6 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-theme.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-theme.ts
@@ -379,6 +379,9 @@ const mainVisualTheme = EditorView.theme({
     display: 'flex',
     justifyContent: 'space-between',
     alignItems: 'center',
+    '& .material-symbols': {
+      verticalAlign: 'middle',
+    },
   },
   '.ol-cm-preamble-expand-icon': {
     width: '32px',
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/editable-graphics.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/editable-graphics.ts
index abdc9ba484..aae3befefa 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/editable-graphics.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/editable-graphics.ts
@@ -2,6 +2,7 @@ import { EditorView } from '@codemirror/view'
 import { GraphicsWidget } from './graphics'
 import { editFigureDataEffect } from '../../figure-modal'
 import { emitToolbarEvent } from '../../toolbar/utils/analytics'
+import { materialIcon } from '@/features/utils/material-icon'
 
 export class EditableGraphicsWidget extends GraphicsWidget {
   setEditDispatcher(button: HTMLButtonElement, view: EditorView) {
@@ -49,10 +50,19 @@ export class EditableGraphicsWidget extends GraphicsWidget {
     const button = document.createElement('button')
     button.setAttribute('aria-label', view.state.phrase('edit_figure'))
     this.setEditDispatcher(button, view)
-    button.classList.add('btn', 'btn-secondary', 'ol-cm-graphics-edit-button')
-    const buttonLabel = document.createElement('span')
-    buttonLabel.classList.add('fa', 'fa-pencil')
-    button.append(buttonLabel)
+    button.classList.add(
+      'btn',
+      'btn-secondary',
+      'ol-cm-graphics-edit-button',
+      'icon-button',
+      'd-inline-grid'
+    )
+
+    const buttonContent = button.appendChild(document.createElement('span'))
+    buttonContent.className = 'button-content'
+
+    buttonContent.appendChild(materialIcon('edit'))
+
     return button
   }
 
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/preamble.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/preamble.ts
index 5f37469ab1..d1d9d77b44 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/preamble.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/preamble.ts
@@ -1,6 +1,34 @@
 import { EditorSelection, StateEffect } from '@codemirror/state'
 import { EditorView, WidgetType } from '@codemirror/view'
 import { SyntaxNode } from '@lezer/common'
+import { materialIcon } from '@/features/utils/material-icon'
+
+function createIcon({
+  type,
+  accessibilityLabel,
+  className,
+}: {
+  type: string
+  accessibilityLabel: string
+  className?: string
+}) {
+  const docFragment = document.createDocumentFragment()
+
+  const buttonIcon = materialIcon(type)
+  if (className) {
+    buttonIcon.classList.add(className)
+  }
+  docFragment.append(buttonIcon)
+
+  if (accessibilityLabel) {
+    const accessibilityLabelEl = document.createElement('span')
+    accessibilityLabelEl.className = 'visually-hidden'
+    accessibilityLabelEl.textContent = accessibilityLabel
+    docFragment.append(accessibilityLabelEl)
+  }
+
+  return docFragment
+}
 
 export type Preamble = {
   from: number
@@ -29,20 +57,20 @@ export class PreambleWidget extends WidgetType {
     const element = document.createElement('div')
     wrapper.appendChild(element)
     element.classList.add('ol-cm-preamble-widget')
-    const expandIcon = document.createElement('i')
-    expandIcon.classList.add(
-      'ol-cm-preamble-expand-icon',
-      'fa',
-      'fa-chevron-down'
-    )
+    const expandIcon = createIcon({
+      type: 'expand_more',
+      accessibilityLabel: view.state.phrase('expand'),
+      className: 'ol-cm-preamble-expand-icon',
+    })
     const helpText = document.createElement('div')
     const helpLink = document.createElement('a')
     helpLink.href =
       '/learn/latex/Learn_LaTeX_in_30_minutes#The_preamble_of_a_document'
     helpLink.target = '_blank'
-    const icon = document.createElement('i')
-    icon.classList.add('fa', 'fa-question-circle')
-    icon.title = view.state.phrase('learn_more')
+    const icon = createIcon({
+      type: 'help',
+      accessibilityLabel: view.state.phrase('learn_more'),
+    })
     helpLink.appendChild(icon)
     const textNode = document.createElement('span')
     textNode.classList.add('ol-cm-preamble-text')
diff --git a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts
index 68da3ab058..df6fb6df20 100644
--- a/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/visual/visual-widgets/table-rendering-error.ts
@@ -1,5 +1,6 @@
 import { EditorView, WidgetType } from '@codemirror/view'
 import { SyntaxNode } from '@lezer/common'
+import { materialIcon } from '@/features/utils/material-icon'
 
 export class TableRenderingErrorWidget extends WidgetType {
   private hasTableNode: boolean
@@ -14,12 +15,7 @@ export class TableRenderingErrorWidget extends WidgetType {
     warning.role = 'alert'
     const icon = document.createElement('div')
     icon.classList.add('notification-icon')
-    const iconType = document.createElement('span')
-    iconType.classList.add('material-symbols')
-    iconType.setAttribute('aria-hidden', 'true')
-    iconType.setAttribute('translate', 'no')
-    iconType.textContent = 'info'
-    icon.appendChild(iconType)
+    icon.appendChild(materialIcon('info'))
     warning.appendChild(icon)
     const messageWrapper = document.createElement('div')
     messageWrapper.classList.add('notification-content-and-cta')
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx
index d8c98fc56b..95282cdbe4 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/individual-plans-table.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Plan } from '../../../../../../../../../types/subscription/plan'
-import Icon from '../../../../../../../shared/components/icon'
+import MaterialIcon from '@/shared/components/material-icon'
 import { useSubscriptionDashboardContext } from '../../../../../context/subscription-dashboard-context'
 import OLButton from '@/features/ui/components/ol/ol-button'
 
@@ -46,16 +46,18 @@ function ChangePlanButton({ plan }: { plan: Plan }) {
     return <KeepCurrentPlanButton />
   } else if (isCurrentPlanForUser && !personalSubscription.pendingPlan) {
     return (
-      <b>
-        <Icon type="check" /> {t('your_plan')}
+      <b className="d-inline-flex align-items-center">
+        <MaterialIcon type="check" />
+        &nbsp;{t('your_plan')}
       </b>
     )
   } else if (
     personalSubscription?.pendingPlan?.planCode?.split('_')[0] === plan.planCode
   ) {
     return (
-      <b>
-        <Icon type="check" /> {t('your_new_plan')}
+      <b className="d-inline-flex align-items-center">
+        <MaterialIcon type="check" />
+        &nbsp;{t('your_new_plan')}
       </b>
     )
   } else {
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
index f27d024d0c..6f09f0c88c 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
@@ -73,7 +73,7 @@ function GroupPrice({
       <span aria-hidden>
         {totalPrice} <span className="small">/ {t('year')}</span>
       </span>
-      <span className="sr-only">
+      <span className="visually-hidden">
         {queryingGroupPlanToChangeToPrice
           ? t('loading_prices')
           : t('x_price_per_year', {
@@ -87,7 +87,7 @@ function GroupPrice({
             price: perUserPrice,
           })}
         </span>
-        <span className="sr-only">
+        <span className="visually-hidden">
           {queryingGroupPlanToChangeToPrice
             ? t('loading_prices')
             : t('x_price_per_user', {
@@ -216,7 +216,7 @@ export function ChangeToGroupModal() {
                   <li>{t('track_changes')}</li>
                   <li>
                     <span aria-hidden>+ {t('more').toLowerCase()}</span>
-                    <span className="sr-only">{t('plus_more')}</span>
+                    <span className="visually-hidden">{t('plus_more')}</span>
                   </li>
                 </ul>
               </div>
diff --git a/services/web/frontend/js/features/token-access/components/token-access-root.tsx b/services/web/frontend/js/features/token-access/components/token-access-root.tsx
index fa3a860dd3..6d0faa91a6 100644
--- a/services/web/frontend/js/features/token-access/components/token-access-root.tsx
+++ b/services/web/frontend/js/features/token-access/components/token-access-root.tsx
@@ -11,8 +11,8 @@ import {
   RequireAcceptData,
   RequireAcceptScreen,
 } from '@/features/token-access/components/require-accept-screen'
-import Icon from '@/shared/components/icon'
 import importOverleafModules from '../../../../macros/import-overleaf-module.macro'
+import MaterialIcon from '@/shared/components/material-icon'
 
 type Mode = 'access-attempt' | 'v1Import' | 'requireAccept'
 
@@ -111,14 +111,14 @@ function TokenAccessRoot() {
   }
 
   return (
-    <div className="full-size">
+    <div>
       <div>
         <a
           href="/project"
           // TODO: class name
           style={{ fontSize: '2rem', marginLeft: '1rem', color: '#ddd' }}
         >
-          <Icon type="arrow-left" />
+          <MaterialIcon type="arrow_left_alt" style={{ fontSize: 'inherit' }} />
         </a>
       </div>
 
diff --git a/services/web/frontend/js/features/form-helpers/create-icon.js b/services/web/frontend/js/features/utils/material-icon.ts
similarity index 50%
rename from services/web/frontend/js/features/form-helpers/create-icon.js
rename to services/web/frontend/js/features/utils/material-icon.ts
index 13b2a04bf3..e643f31fa0 100644
--- a/services/web/frontend/js/features/form-helpers/create-icon.js
+++ b/services/web/frontend/js/features/utils/material-icon.ts
@@ -1,8 +1,9 @@
-export default function createIcon(type) {
+export function materialIcon(type: string) {
   const icon = document.createElement('span')
   icon.className = 'material-symbols'
-  icon.setAttribute('aria-hidden', 'true')
-  icon.setAttribute('translate', 'no')
   icon.textContent = type
+  icon.ariaHidden = 'true'
+  icon.translate = false
+
   return icon
 }
diff --git a/services/web/frontend/js/features/word-count-modal/components/word-counts.tsx b/services/web/frontend/js/features/word-count-modal/components/word-counts.tsx
index e8a9731b7b..79777a0cab 100644
--- a/services/web/frontend/js/features/word-count-modal/components/word-counts.tsx
+++ b/services/web/frontend/js/features/word-count-modal/components/word-counts.tsx
@@ -26,27 +26,27 @@ export const WordCounts: FC<{
 
       <Row>
         <Col xs={4}>
-          <div className="pull-right">{t('total_words')}:</div>
+          <div className="float-end">{t('total_words')}:</div>
         </Col>
         <Col xs={6}>{data.textWords}</Col>
       </Row>
       <Row>
         <Col xs={4}>
-          <div className="pull-right">{t('headers')}:</div>
+          <div className="float-end">{t('headers')}:</div>
         </Col>
         <Col xs={6}>{data.headers}</Col>
       </Row>
 
       <Row>
         <Col xs={4}>
-          <div className="pull-right">{t('math_inline')}:</div>
+          <div className="float-end">{t('math_inline')}:</div>
         </Col>
         <Col xs={6}>{data.mathInline}</Col>
       </Row>
 
       <Row>
         <Col xs={4}>
-          <div className="pull-right">{t('math_display')}:</div>
+          <div className="float-end">{t('math_display')}:</div>
         </Col>
         <Col xs={6}>{data.mathDisplay}</Col>
       </Row>
diff --git a/services/web/frontend/js/shared/components/close.tsx b/services/web/frontend/js/shared/components/close.tsx
index 17c24ce092..1cff45e930 100644
--- a/services/web/frontend/js/shared/components/close.tsx
+++ b/services/web/frontend/js/shared/components/close.tsx
@@ -12,7 +12,7 @@ function Close({ onDismiss, variant = 'light' }: CloseProps) {
   return (
     <button
       type="button"
-      className={`close pull-right ${variant}`}
+      className={`close float-end ${variant}`}
       onClick={onDismiss}
     >
       <MaterialIcon
@@ -20,7 +20,6 @@ function Close({ onDismiss, variant = 'light' }: CloseProps) {
         className="align-text-bottom"
         accessibilityLabel={t('close')}
       />
-      <span className="sr-only">{t('close')}</span>
     </button>
   )
 }
diff --git a/services/web/frontend/js/shared/components/icon-checked.jsx b/services/web/frontend/js/shared/components/icon-checked.jsx
deleted file mode 100644
index 0409327910..0000000000
--- a/services/web/frontend/js/shared/components/icon-checked.jsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useTranslation } from 'react-i18next'
-
-import Icon from './icon'
-
-function IconChecked() {
-  const { t } = useTranslation()
-  return <Icon type="check" fw accessibilityLabel={t('selected')} />
-}
-
-export default IconChecked
diff --git a/services/web/frontend/js/shared/components/icon.tsx b/services/web/frontend/js/shared/components/icon.tsx
deleted file mode 100644
index 052b05edd2..0000000000
--- a/services/web/frontend/js/shared/components/icon.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import classNames from 'classnames'
-
-type IconOwnProps = {
-  type: string
-  spin?: boolean
-  fw?: boolean
-  modifier?: string
-  accessibilityLabel?: string
-}
-
-export type IconProps = IconOwnProps &
-  Omit<React.ComponentProps<'i'>, keyof IconOwnProps>
-
-function Icon({
-  type,
-  spin,
-  fw,
-  modifier,
-  className = '',
-  accessibilityLabel,
-  ...rest
-}: IconProps) {
-  const iconClassName = classNames(
-    'fa',
-    `fa-${type}`,
-    {
-      'fa-spin': spin,
-      'fa-fw': fw,
-      [`fa-${modifier}`]: modifier,
-    },
-    className
-  )
-
-  return (
-    <>
-      <i className={iconClassName} aria-hidden="true" {...rest} />
-      {accessibilityLabel && (
-        <span className="visually-hidden">{accessibilityLabel}</span>
-      )}
-    </>
-  )
-}
-
-export default Icon
diff --git a/services/web/frontend/js/shared/components/processing.jsx b/services/web/frontend/js/shared/components/processing.jsx
deleted file mode 100644
index 6580ff2d5d..0000000000
--- a/services/web/frontend/js/shared/components/processing.jsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import PropTypes from 'prop-types'
-import { useTranslation } from 'react-i18next'
-import Icon from './icon'
-
-function Processing({ isProcessing }) {
-  const { t } = useTranslation()
-  if (isProcessing) {
-    return (
-      <div aria-live="polite">
-        {t('processing')}…&nbsp;
-        <Icon type="refresh" fw spin />
-      </div>
-    )
-  } else {
-    return <></>
-  }
-}
-
-Processing.propTypes = {
-  isProcessing: PropTypes.bool.isRequired,
-}
-
-export default Processing
diff --git a/services/web/frontend/js/shared/components/upgrade-benefits.jsx b/services/web/frontend/js/shared/components/upgrade-benefits.tsx
similarity index 78%
rename from services/web/frontend/js/shared/components/upgrade-benefits.jsx
rename to services/web/frontend/js/shared/components/upgrade-benefits.tsx
index 535b0c8a5f..9ab3d01e86 100644
--- a/services/web/frontend/js/shared/components/upgrade-benefits.jsx
+++ b/services/web/frontend/js/shared/components/upgrade-benefits.tsx
@@ -1,16 +1,17 @@
 import MaterialIcon from '@/shared/components/material-icon'
 import { useTranslation } from 'react-i18next'
 import { memo } from 'react'
+import classNames from 'classnames'
 
 function Check() {
   return <MaterialIcon type="check" />
 }
 
-function UpgradeBenefits() {
+function UpgradeBenefits({ className }: { className?: string }) {
   const { t } = useTranslation()
 
   return (
-    <ul className="list-unstyled upgrade-benefits">
+    <ul className={classNames('list-unstyled upgrade-benefits', className)}>
       <li>
         <Check />
         &nbsp;
@@ -19,7 +20,7 @@ function UpgradeBenefits() {
       <li>
         <Check />
         &nbsp;
-        {t('collabs_per_proj', { collabcount: 'Multiple' })}
+        {t('collabs_per_proj_multiple')}
       </li>
       <li>
         <Check />
diff --git a/services/web/frontend/stories/icon.stories.jsx b/services/web/frontend/stories/icon.stories.jsx
deleted file mode 100644
index d0f0d2d885..0000000000
--- a/services/web/frontend/stories/icon.stories.jsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import Icon from '../js/shared/components/icon'
-
-export const Type = args => {
-  return (
-    <>
-      <Icon {...args} />
-      <div>
-        <a
-          href="https://fontawesome.com/v4.7.0/icons/"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Font Awesome icons
-        </a>
-      </div>
-    </>
-  )
-}
-Type.args = {
-  type: 'tasks',
-}
-
-export const Spinner = args => {
-  return <Icon {...args} />
-}
-Spinner.args = {
-  type: 'spinner',
-  spin: true,
-}
-
-export const FixedWidth = args => {
-  return <Icon {...args} />
-}
-FixedWidth.args = {
-  type: 'tasks',
-  fw: true,
-}
-
-export const AccessibilityLabel = args => {
-  return <Icon {...args} />
-}
-AccessibilityLabel.args = {
-  type: 'check',
-  accessibilityLabel: 'Check',
-}
-
-export default {
-  title: 'Shared / Components / Icon',
-  component: Icon,
-}
diff --git a/services/web/frontend/stories/ui/badge.stories.tsx b/services/web/frontend/stories/ui/badge.stories.tsx
index be4d3a84ab..1b551d3254 100644
--- a/services/web/frontend/stories/ui/badge.stories.tsx
+++ b/services/web/frontend/stories/ui/badge.stories.tsx
@@ -1,5 +1,5 @@
 import Badge from '@/features/ui/components/bootstrap-5/badge'
-import Icon from '@/shared/components/icon'
+import MaterialIcon from '@/shared/components/material-icon'
 import type { Meta, StoryObj } from '@storybook/react'
 import classnames from 'classnames'
 
@@ -49,7 +49,7 @@ export const BadgePrepend: Story = {
     return (
       <Badge
         className={classnames({ 'text-dark': args.bg === 'light' })}
-        prepend={<Icon type="star" fw />}
+        prepend={<MaterialIcon type="star" />}
         {...args}
       />
     )
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/all.scss b/services/web/frontend/stylesheets/bootstrap-5/components/all.scss
index 639f6b4ff5..a0237b47f0 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/components/all.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/all.scss
@@ -46,3 +46,4 @@
 @import 'upgrade-prompt';
 @import 'integrations-panel';
 @import 'group-members';
+@import 'upgrade-benefits';
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/upgrade-benefits.scss b/services/web/frontend/stylesheets/bootstrap-5/components/upgrade-benefits.scss
new file mode 100644
index 0000000000..d9702c3f64
--- /dev/null
+++ b/services/web/frontend/stylesheets/bootstrap-5/components/upgrade-benefits.scss
@@ -0,0 +1,3 @@
+.upgrade-benefits li {
+  display: flex;
+}
diff --git a/services/web/frontend/stylesheets/bootstrap-5/main-style.scss b/services/web/frontend/stylesheets/bootstrap-5/main-style.scss
index eb705b461d..73294452ef 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/main-style.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/main-style.scss
@@ -7,7 +7,6 @@
 @import '../../fonts/noto-serif/noto-serif.css';
 @import '../../fonts/open-dyslexic-mono/open-dyslexic-mono.css';
 @import '../../fonts/material-symbols/material-symbols.css';
-@import '../../fonts/font-awesome/font-awesome.css';
 
 // Vendor CSS
 // TODO Bootstrap 5: Check whether this works with Bootstrap 5, and whether we can replace it
diff --git a/services/web/frontend/stylesheets/bootstrap-5/modals/contact-us-modal.scss b/services/web/frontend/stylesheets/bootstrap-5/modals/contact-us-modal.scss
index 7ac5e62cbc..a0a373c94b 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/modals/contact-us-modal.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/modals/contact-us-modal.scss
@@ -60,15 +60,6 @@
     span {
       text-decoration: underline;
     }
-
-    .fa {
-      color: inherit;
-      text-decoration: none;
-    }
-  }
-
-  .fa {
-    color: var(--neutral-30);
   }
 }
 
diff --git a/services/web/frontend/stylesheets/bootstrap-5/modules/symbol-palette.scss b/services/web/frontend/stylesheets/bootstrap-5/modules/symbol-palette.scss
index dd6d5f64f8..a0a1d4b716 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/modules/symbol-palette.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/modules/symbol-palette.scss
@@ -199,9 +199,5 @@
 
   .upgrade-benefits {
     column-count: 2;
-
-    li {
-      display: flex;
-    }
   }
 }
diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss
index 8fe5ced008..a60298a53f 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide.scss
@@ -248,6 +248,15 @@ $editor-toggler-bg-dark-color: color.adjust(
   top: 50%;
   background-color: var(--editor-toggler-bg-color);
 
+  .material-symbols {
+    font-size: var(--font-size-02);
+    -moz-osx-font-smoothing: grayscale;
+    font-weight: bold;
+    color: var(--white);
+    user-select: none;
+    pointer-events: none;
+  }
+
   &:hover,
   &:focus {
     outline: none;
@@ -262,37 +271,11 @@ $editor-toggler-bg-dark-color: color.adjust(
     inset: 0 -3px;
   }
 
-  &::after {
-    font-family: FontAwesome; /* stylelint-disable-line font-family-no-missing-generic-family-keyword */
-    -moz-osx-font-smoothing: grayscale;
-    font-size: 65%;
-    font-weight: bold;
-    color: var(--white);
-    user-select: none;
-    pointer-events: none;
-  }
-
   &:hover {
     background-color: var(--bg-accent-01);
   }
 }
 
-.custom-toggler-east::after {
-  content: '\f105';
-}
-
-.custom-toggler-west::after {
-  content: '\f104';
-}
-
-.custom-toggler-closed.custom-toggler-east::after {
-  content: '\f104';
-}
-
-.custom-toggler-closed.custom-toggler-west::after {
-  content: '\f105';
-}
-
 .vertical-resize-handle {
   height: 6px;
   background-color: var(--editor-resizer-bg-color);
diff --git a/services/web/frontend/stylesheets/core/utilities.less b/services/web/frontend/stylesheets/core/utilities.less
index 227ebad4b1..3e9e2dbc33 100755
--- a/services/web/frontend/stylesheets/core/utilities.less
+++ b/services/web/frontend/stylesheets/core/utilities.less
@@ -11,10 +11,12 @@
 .center-block {
   .center-block();
 }
-.pull-right {
+.pull-right,
+.float-end {
   float: right !important;
 }
-.pull-left {
+.pull-left,
+.float-start {
   float: left !important;
 }
 
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 9f7a97449c..adfb33d8f8 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -355,6 +355,7 @@
   "collaborator_chat": "Collaborator chat",
   "collabratec_account_not_registered": "IEEE Collabratec™ account not registered. Please connect to Overleaf from IEEE Collabratec™ or log in with a different account.",
   "collabs_per_proj": "__collabcount__ collaborators per project",
+  "collabs_per_proj_multiple": "Multiple collaborators per project",
   "collabs_per_proj_single": "__collabcount__ collaborator per project",
   "collapse": "Collapse",
   "column_width": "Column width",
@@ -1475,7 +1476,6 @@
   "notification_features_upgraded_by_affiliation": "Good news! Your affiliated organization __institutionName__ has an Overleaf subscription, and you now have access to all of Overleaf’s Professional features.",
   "notification_personal_and_group_subscriptions": "We’ve spotted that you’ve got <0>more than one active __appName__ subscription</0>. To avoid paying more than you need to, <1>review your subscriptions</1>.",
   "notification_personal_subscription_not_required_due_to_affiliation": " Good news! Your affiliated organization __institutionName__ has an Overleaf subscription, and you now have access to Overleaf’s Professional features through your affiliation. You can cancel your individual subscription without losing access to any features.",
-  "notification_project_invite": "<b>__userName__</b> would like you to join <b>__projectName__</b> <a class=\"btn btn-sm btn-info pull-right\" href=\"/project/__projectId__/invite/token/__token__\">Join Project</a>",
   "notification_project_invite_accepted_message": "You’ve joined <b>__projectName__</b>",
   "notification_project_invite_message": "<b>__userName__</b> would like you to join <b>__projectName__</b>",
   "november": "November",
diff --git a/services/web/modules/user-activate/frontend/js/components/register-form.jsx b/services/web/modules/user-activate/frontend/js/components/register-form.jsx
index 7008781631..ec4a91f7e5 100644
--- a/services/web/modules/user-activate/frontend/js/components/register-form.jsx
+++ b/services/web/modules/user-activate/frontend/js/components/register-form.jsx
@@ -63,7 +63,7 @@ function RegisterForm({
             aria-label="emails to register"
             aria-describedby="input-details"
           />
-          <p id="input-details" className="sr-only">
+          <p id="input-details" className="visually-hidden">
             Enter the emails you would like to register and separate them using
             commas
           </p>
diff --git a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
index e9896699c3..22a99e1fc7 100644
--- a/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
+++ b/services/web/test/frontend/features/source-editor/components/codemirror-editor-figure-modal.spec.tsx
@@ -126,9 +126,11 @@ describe('<FigureModal />', function () {
         matchUrl(`/project/test-project/upload?folder_id=${rootFolderId}`)
       )
 
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
+        '\\begin{figure}    \\centeringedit    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
       )
     })
 
@@ -172,9 +174,12 @@ describe('<FigureModal />', function () {
         cy.findByText('frog.jpg').click()
       })
       cy.findByRole('button', { name: 'Insert figure' }).click()
+
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
+        '\\begin{figure}    \\centeringedit    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
       )
     })
   })
@@ -258,9 +263,11 @@ describe('<FigureModal />', function () {
         },
       })
 
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
+        '\\begin{figure}    \\centeringedit    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
       )
     })
 
@@ -285,9 +292,11 @@ describe('<FigureModal />', function () {
         },
       })
 
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
+        '\\begin{figure}    \\centeringedit    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
       )
     })
   })
@@ -429,9 +438,11 @@ describe('<FigureModal />', function () {
         },
       })
 
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
+        '\\begin{figure}    \\centeringedit    \\caption{Enter Caption}    🏷fig:enter-label\\end{figure}'
       )
     })
 
@@ -455,9 +466,12 @@ describe('<FigureModal />', function () {
 
       // If caption is selected then typing will replace the whole caption
       cy.focused().type('My caption')
+
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering    \\caption{My caption}    🏷fig:enter-label\\end{figure}'
+        '\\begin{figure}    \\centeringedit    \\caption{My caption}    🏷fig:enter-label\\end{figure}'
       )
     })
 
@@ -482,9 +496,12 @@ describe('<FigureModal />', function () {
 
       // If label is selected then typing will replace the whole label
       cy.focused().type('fig:my-label')
+
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering    \\label{fig:my-label}\\end{figure}'
+        '\\begin{figure}    \\centeringedit    \\label{fig:my-label}\\end{figure}'
       )
     })
 
@@ -504,16 +521,18 @@ describe('<FigureModal />', function () {
         },
       })
 
+      // Note that we have to include the 'edit' text from the edit button's
+      // icon, which is literal text in the document
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering\\end{figure}'
+        '\\begin{figure}    \\centeringedit\\end{figure}'
       )
 
       cy.focused().type('Some more text')
 
       cy.get('.cm-content').should(
         'have.text',
-        '\\begin{figure}    \\centering\\end{figure}Some more text'
+        '\\begin{figure}    \\centeringedit\\end{figure}Some more text'
       )
     })
   })
diff --git a/services/web/test/frontend/shared/components/icon.test.jsx b/services/web/test/frontend/shared/components/icon.test.jsx
deleted file mode 100644
index b10bf0c7c8..0000000000
--- a/services/web/test/frontend/shared/components/icon.test.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { expect } from 'chai'
-import { screen, render } from '@testing-library/react'
-
-import Icon from '../../../../frontend/js/shared/components/icon'
-
-describe('<Icon />', function () {
-  it('renders basic fa classes', function () {
-    const { container } = render(<Icon type="angle-down" />)
-    const element = container.querySelector('i.fa.fa-angle-down')
-    expect(element).to.exist
-  })
-
-  it('renders with aria-hidden', function () {
-    const { container } = render(<Icon type="angle-down" />)
-    const element = container.querySelector('i[aria-hidden="true"]')
-    expect(element).to.exist
-  })
-
-  it('renders accessible label', function () {
-    render(<Icon type="angle-down" accessibilityLabel="Accessible Foo" />)
-    screen.getByText('Accessible Foo')
-  })
-
-  it('renders with spin', function () {
-    const { container } = render(<Icon type="angle-down" spin />)
-    const element = container.querySelector('i.fa.fa-angle-down.fa-spin')
-    expect(element).to.exist
-  })
-
-  it('renders with fw', function () {
-    const { container } = render(<Icon type="angle-down" fw />)
-    const element = container.querySelector('i.fa.fa-angle-down.fa-fw')
-    expect(element).to.exist
-  })
-
-  it('renders with modifier', function () {
-    const { container } = render(<Icon type="angle-down" modifier="2x" />)
-    const element = container.querySelector('i.fa.fa-angle-down.fa-2x')
-    expect(element).to.exist
-  })
-
-  it('renders with custom clases', function () {
-    const { container } = render(
-      <Icon type="angle-down" className="custom-icon-class" />
-    )
-    const element = container.querySelector(
-      'i.fa.fa-angle-down.custom-icon-class'
-    )
-    expect(element).to.exist
-  })
-})
diff --git a/services/web/test/frontend/shared/components/processing.test.jsx b/services/web/test/frontend/shared/components/processing.test.jsx
deleted file mode 100644
index a053193721..0000000000
--- a/services/web/test/frontend/shared/components/processing.test.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { expect } from 'chai'
-import { render } from '@testing-library/react'
-import Processing from '../../../../frontend/js/shared/components/processing'
-
-describe('<Processing />', function () {
-  it('renders processing UI when isProcessing is true', function () {
-    const { container } = render(<Processing isProcessing />)
-    const element = container.querySelector('i.fa.fa-refresh')
-    expect(element).to.exist
-  })
-  it('does not render processing UI when isProcessing is false', function () {
-    const { container } = render(<Processing isProcessing={false} />)
-    const element = container.querySelector('i.fa.fa-refresh')
-    expect(element).to.not.exist
-  })
-})

From 29d9408a695eb2dc0301d51b0a97476dced1ab3a Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Tue, 15 Jul 2025 14:14:39 +0100
Subject: [PATCH 239/274] Add vitest check when initialising redis

This is similar to the Mocha checks and will error if a connection is
attempted.

GitOrigin-RevId: 35e73cb56dc7c72393c55f40b6c18e9aaf74ab50
---
 services/web/app/src/infrastructure/RedisWrapper.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/web/app/src/infrastructure/RedisWrapper.js b/services/web/app/src/infrastructure/RedisWrapper.js
index fecb00ab14..3017d03e47 100644
--- a/services/web/app/src/infrastructure/RedisWrapper.js
+++ b/services/web/app/src/infrastructure/RedisWrapper.js
@@ -3,8 +3,9 @@ const redis = require('@overleaf/redis-wrapper')
 const { addConnectionDrainer } = require('./GracefulShutdown')
 
 if (
-  typeof global.beforeEach === 'function' &&
-  process.argv.join(' ').match(/unit/)
+  (typeof global.beforeEach === 'function' &&
+    process.argv.join(' ').match(/unit/)) ||
+  process.env.VITEST
 ) {
   throw new Error(
     'It looks like unit tests are running, but you are connecting to Redis. Missing a stub?'

From 5df6047fd8ec38ca556d36fefee6e2b963cd37ec Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 11 Jul 2025 10:47:19 +0100
Subject: [PATCH 240/274] Add npm engines entry

GitOrigin-RevId: 4f5ba34447d339cebba654835045c3eff1e23b39
---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 7326023473..388b750c3d 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,9 @@
     "prettier": "3.6.2",
     "typescript": "^5.8.3"
   },
+  "engines": {
+    "npm": "11.4.2"
+  },
   "overrides": {
     "swagger-tools@0.10.4": {
       "path-to-regexp": "3.3.0",

From f054a5658fd66fe0b2ab98325347157c05380a50 Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Fri, 11 Jul 2025 10:47:37 +0100
Subject: [PATCH 241/274] Run npm install with new npm version

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 8d81e73f528c34ad8df8b09716198dbaeebee23f
---
 package-lock.json | 122 ++--------------------------------------------
 1 file changed, 3 insertions(+), 119 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bb23eb3f78..2b3a5868a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,6 +57,9 @@
         "eslint-plugin-unicorn": "^56.0.0",
         "prettier": "3.6.2",
         "typescript": "^5.8.3"
+      },
+      "engines": {
+        "npm": "11.4.2"
       }
     },
     "jobs/mirror-documentation": {
@@ -13818,7 +13821,6 @@
       "integrity": "sha512-iQGAUO4ziQRpfv7kix6tO6JOWqjI0K4vt8AynvHWzDPZxYSba3zd6RojGNPsYWSR7Xv+dRXYx+GU8oTiK1FRUA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@transloadit/prettier-bytes": "^0.3.4",
         "@uppy/store-default": "^3.2.2",
@@ -38817,11 +38819,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
       "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
     },
-    "node_modules/swagger-client/node_modules/traverse": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
-      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
-    },
     "node_modules/swagger-client/node_modules/url": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
@@ -45290,13 +45287,6 @@
         "node": ">=12.16"
       }
     },
-    "services/web/node_modules/@transloadit/prettier-bytes": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.9.tgz",
-      "integrity": "sha512-pCvdmea/F3Tn4hAtHqNXmjcixSaroJJ+L3STXlYJdir1g1m2mRQpWbN8a4SvgQtaw2930Ckhdx8qXdXBFMKbAA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "services/web/node_modules/@types/debug": {
       "version": "4.1.12",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
@@ -45464,23 +45454,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "services/web/node_modules/@uppy/core": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@uppy/core/-/core-3.8.0.tgz",
-      "integrity": "sha512-C93vVhid929+VLGjaD9CZOLJDg8GkEGMUGveFp3Tyo/wujiG+sB3fOF+c6TzKpzPLfNtVpskU1BnI7tZrq1LWw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@transloadit/prettier-bytes": "0.0.9",
-        "@uppy/store-default": "^3.2.0",
-        "@uppy/utils": "^5.7.0",
-        "lodash": "^4.17.21",
-        "mime-match": "^1.0.2",
-        "namespace-emitter": "^2.0.1",
-        "nanoid": "^4.0.0",
-        "preact": "^10.5.13"
-      }
-    },
     "services/web/node_modules/@uppy/dashboard": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/@uppy/dashboard/-/dashboard-3.7.1.tgz",
@@ -45591,17 +45564,6 @@
         }
       }
     },
-    "services/web/node_modules/@uppy/utils": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/@uppy/utils/-/utils-5.7.0.tgz",
-      "integrity": "sha512-AJj7gAx5YfMgyevwOxVdIP2h4Nw/O6h57wKA6gj+Lce6tMORcqzGt4yQiKBsrBI0bPyFWCbzA3vX5t0//1JCBA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "preact": "^10.5.13"
-      }
-    },
     "services/web/node_modules/@uppy/xhr-upload": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/@uppy/xhr-upload/-/xhr-upload-3.6.0.tgz",
@@ -45765,18 +45727,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "services/web/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
     "services/web/node_modules/assertion-error": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
@@ -45890,17 +45840,6 @@
         "node": ">=6"
       }
     },
-    "services/web/node_modules/duplexify": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
-      "integrity": "sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==",
-      "dependencies": {
-        "end-of-stream": "^1.4.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1",
-        "stream-shift": "^1.0.0"
-      }
-    },
     "services/web/node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -46258,26 +46197,6 @@
         "stack-trace": "0.0.10"
       }
     },
-    "services/web/node_modules/schema-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "services/web/node_modules/semver": {
       "version": "7.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
@@ -46420,41 +46339,6 @@
         "node": ">= 6"
       }
     },
-    "services/web/node_modules/terser-webpack-plugin": {
-      "version": "5.3.11",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
-      "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
-        "terser": "^5.31.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
     "services/web/node_modules/tinyrainbow": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",

From ee8e1915aba06d5e1913cdbb29e8eff40b0ce785 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:33:51 +0100
Subject: [PATCH 242/274] Merge pull request #27183 from
 overleaf/dp-file-tree-open-state

Persist rail tab isOpen state

GitOrigin-RevId: f1cbaa80fecd10953e9be61a993d69bd2c3c7915
---
 .../js/features/ide-redesign/contexts/rail-context.tsx   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
index 16d06edad4..47d30f8cee 100644
--- a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
+++ b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
@@ -1,5 +1,6 @@
 import { sendSearchEvent } from '@/features/event-tracking/search-events'
 import useEventListener from '@/shared/hooks/use-event-listener'
+import usePersistedState from '@/shared/hooks/use-persisted-state'
 import { isMac } from '@/shared/utils/os'
 import {
   createContext,
@@ -44,7 +45,7 @@ const RailContext = createContext<
 >(undefined)
 
 export const RailProvider: FC<React.PropsWithChildren> = ({ children }) => {
-  const [isOpen, setIsOpen] = useState(true)
+  const [isOpen, setIsOpen] = usePersistedState('rail-is-open', true)
   const [resizing, setResizing] = useState(false)
   const [activeModal, setActiveModalInternal] = useState<RailModalKey | null>(
     null
@@ -58,15 +59,15 @@ export const RailProvider: FC<React.PropsWithChildren> = ({ children }) => {
 
   const togglePane = useCallback(() => {
     setIsOpen(value => !value)
-  }, [])
+  }, [setIsOpen])
 
   const handlePaneExpand = useCallback(() => {
     setIsOpen(true)
-  }, [])
+  }, [setIsOpen])
 
   const handlePaneCollapse = useCallback(() => {
     setIsOpen(false)
-  }, [])
+  }, [setIsOpen])
 
   // NOTE: The file tree **MUST** be the first tab to be opened
   //       since it is responsible for opening the initial document.

From 63ca134fc515fe01877bf522a95df31d7a603c31 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:33:55 +0100
Subject: [PATCH 243/274] Merge pull request #27182 from
 overleaf/dp-file-outline-spacing

Fix nesting of file outline

GitOrigin-RevId: b18e5eca9bdfb2c01c244e3843d0ae38041a7378
---
 .../frontend/stylesheets/bootstrap-5/pages/editor/outline.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss
index 9d78455f61..f915f16994 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/outline.scss
@@ -111,7 +111,7 @@
   }
 
   .outline-item-no-children {
-    padding-left: 0;
+    padding-left: 26px;
   }
 
   .outline-item-link {

From 97eceb9c58d3aad7828a5afb7860d383e9c162af Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:34:06 +0100
Subject: [PATCH 244/274] Merge pull request #27174 from
 overleaf/dp-subscription-settings

Add subscription option to settings modal

GitOrigin-RevId: 5f38db41c1d4f5727d56e2d0a4e0740e83114f15
---
 ...alSymbolsRoundedUnfilledPartialSlice.woff2 | Bin 5168 -> 5300 bytes
 .../material-symbols/unfilled-symbols.mjs     |   1 +
 .../components/settings/settings-modal.tsx    |   6 ++++++
 3 files changed, 7 insertions(+)

diff --git a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2 b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedUnfilledPartialSlice.woff2
index 260d4c367026d78dbd1a1eba997a33c6c2030afb..34f72414102f6e5f55915f7a1239accb71c875bd 100644
GIT binary patch
literal 5300
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
G8~^~6E-YgJ

literal 5168
zcmV-06wm8-Pew8T0RR9102D9)4gdfE04o>(029~%0RR9100000000000000000000
z0000SixdW6KT}jeRAK;wG!Y02yL__^3v>VhHUcCAbOay;g$@TG3<n!QB{LHAA(`q-
zjB!JM{QC3n2M_#jt3Q{v;5s6>PGR(b%D$|0_eJ$zS39rE|NG6}xe!+7LU?T<c_woH
zD>g8B$!fB@*}BjCLhHz?L~0_0e0DzE^l#rtEx|t3995ySnuVrL9^IUZXQtFWY#uge
zwai4RGg0*cJndiF3~&c96O)OZ(t*u7LU*}uvi~<%WgC|WghRV;g<j((Kb4wI{jPxw
zrfUd0iwz5y&H}L`a6sKzU^o;C!QDFtB<v}7LZ~}r&N!xPqku0FQ#eB!V{(jk^L-Em
zkfchCvcgJhY=FJTw)6MGMq@;Kg`mM6yY7s2l9zTGCZMRBkvw}8un=lYLU~d-Q5h)f
zh(E>6Y(bAg(St}5R4K7A0X=$D>7(Fc;JaTwqD@FZ1&5T|eqm}fUqzLah(wYhPjfA&
zGGG&yp-q7)EE>dga1R_4F-h_wc7>1ym_Z{&-~dkL!jx%vht{Rf6zQ@c-J-OaM;B6~
z#w0d6Ei+36q}+z5a1e=l5ba5YDWpIX_TaNo2%9>|n0Sg}uhPWBLdBq}3($#}z%oqi
zK22t*(?iFB1i-T1uwp#XpkyAk8wr&N!<`Tjp;mEB+t?3(Y?mr?X;NhY61W_d3sa{v
zCk7T>x-8(u3T5n)*fc5ACuR`pgf2`(g<9b#8;ei`(B-#YL7|92kpxZZH0V<zrcH?=
z*-Oxf5!0uwYOE?6ixJ?G1UroxYJ|Ax5~}ska7i;mULw1QXowCCNl{=%3Q?!4wrCRS
z98g1h^yw0-L0F=PkT0~&3=!SJbz&B1OAjEv#S|}#n?;>>*@dNWQIHr|Fm07K5f<r_
zr3zCjjA4*N*Cx;)*C(Z8LMqzA&aJTuGk7F1(e+<Bha?MnprX;FLshMOlT4wduysvb
zwkXpi6A=XrBW8w*Q7Kv60t!K6YQ{CH^e78Uj&!uHz~-<NXc+9oYNi;sfQ^S1V&x2V
zexN5wG2{?w(ulmT3`iLo60s1jT0GPvh{rlWOA%SJ)T3kup}0VcbA}*_ceRb<`op+=
z=y{At4{3S0h)IP)N^%Takx8N03JL)=pg|)%CYt)NI1`;!4|-ClLV=!mUU|bEt-SWy
zEAueHpLc4(=wi_7Y~EwHM}1g*SP$rg34m4<-$ex$Kv`+kHP*Q023KBh*%gF9?7h#t
zgN1@}z|OnO7pfmr#>3z=r6NpmCMfr#8UjV6?hG%bsT4{fSJ6>GeN9~aN!f;F&<O}w
zkgeI3eK_c2@$s%7KlJgBpRD=GHlMEh>5iX1`RVhY-T2w#pZ)rI{)=tCc;U<4zdU~E
z5BDC<8=f#ceR%%xrs18#yNB-&|C@DYquF0(|NVN6A2#@Ly&n(y@x0#_|Lwp(?;MSk
z1h@BX*`2}14Cxw9Z{UIVy{bRE4|E+MMgMZ@=<U%%qX$P1!1Ptq8%(!h>YB;NCNG*?
zcXGvvJtx+g2*!Ua-dbFJ&bf2WDVY9M;2-55=nwoI{5Aa@{N?<VpYmSwI$kb+r@YI#
z%elfiH2E%=>mqpa-VIh`9aclV0612BF%y#lX#^Rjm^5R{(Fg|@-8%;(u7zr;Tt+6w
zbX()<=olz2YALLt_lGmoNRAr0NQw&a2@}>p3?Kxss7F(-u&un8psA{=mXo%f%*2ju
z=lrxxnx-bDly=%pr_=UM@^7x1wgby@HK|QV>B(HqmuY#5ux)p&5WqvqWImq{ikhJ(
zvbOEnt}Ug^){{x;c~eulH({7|CX;cTq_b8#-JXy|2_L$t$;89%y_D*7x2|_(I&#@;
z*6haa%+anK&2@F@nFH8qc9cuSJG4T<C_+iEcwd4_y#~l8V$i~`6LKL@qf`-}Q%zT-
z1OtAm>o-A_4eHg1BI<ai6@kMEfxCbRv4PAYld2i)ioFKFQpuUL<kbifb%ccjIA)3e
z7J9uDWE=g~KP@5>7i2`efDjSdw}yT`mbvOxDSUZ*olsbTmvd{0>$gFs)JuqH-Iw*g
z1WkU0rvC-Wh|eE1YZ;Q25*#YS*HTqbN>C|Pkl&`!dzq>RDh-P>QW}AB?oeE+7aYV_
zt+S850%wV2f<*nQm!|b(?TEFa`4b7tN>ajR-fEfoIocdU7_hRW9M^{XpAhl-&f3@O
zo<UfC@~wRHJ+5Q9HyF3W)qLEP?ll&?m7E(*0LaNak5>`>W!nkI2@zu!3zn#h99+ss
z1y=knBXjyxj|}}70FXF&>X8xSS5jmINpLjrvjM9MmS3Uae?bVGQ8tX^(UBRIH7#yr
zMoKU(Fa1s^kj>{%<5#c5G8cIk3xw?`d51E`F9yO6{XCCl&W$`P5cUv3ro+j<(Eno{
zT8h{7WPNwlQ1Wv{*pu&pH3*fudJJB^fl8cSK@%uJ^cgSIkQ)yl1Ylp)JkzwHjk0pX
zO$XT1hv3v``=fZ&xTNC$0J0#kFAV)y!<rjCB+X*hwHE!n+??yxYsw~BN6jis*&^pR
zu1Vf9y4$Gd1uZ9&M?E_a<mRgA$9W!4f}F@*j#j9*WU+vpcTlguWnjSf?PGi&Tn5K@
zaXDkPPdl6Fn#lB-9}FG;De>`sSNFaIF#NA-aIi0kBIScu>}LIf*Pzr+Itv0`!GfWC
zvm)$*fTYFT@F%Sv+3u!-@rw5^X!5%=m5=@)ig<nJKw#ZzXat0;V9j3swXuS_GYE(h
z$N6GQODc8NMNtG&Yv=XtP*{U*B=fOvJ7MU6Jp@*Ak<2$1A5_hW`Dr#-d`^oj@Hocj
zag2UwWBQc$8eT15%-v`bRT07&PXzbUBOKnblxB8mN}M+mS~gtD%%Vya?5RM45)_}i
zw|Q`x@}KWN+uTq#KI>8kbS4DurH5C);>vUV|GLkgGG&D!cdM~)UkZhF{|n+sS@9Y<
zcjeRF@`LRD+oOqo)qh(w(YGdmvHIB_9?KDIJIkN!;&F2cj9IsY<K3<Q)^NPboh;`r
zeY}$ewXXLc`%(LVbHJUP1v#^x?`Mtlv`g9h$zFG_Gd4xU^g6bW*ITFfTLa@^I>1;t
zMvY8aEIp&hIA5Cl4F?T9BddMCdu3q*=N2j(FN57Rf##MBZ>ms522-k1NL%!j{{^8z
zeqrqA{%?BT{At(n{9497sj!llr}NSF4Xu{8WQM}hxw=RupIU734tnP(=ca?2@kIP5
z$q$DdS~e8V)M37W!FSJqLub-dGc1Wthkm==-hxSzBq)jH<scNbYe<%u+r)GQ$~|aR
zwvn)h>p=%Yxk*$^6*E-LDhP(A!!<<D7=$&+LwG+iNBFSEGN?h=dkjzX^F7fHdbB``
z$LTf&HGBlOYnY*r(rwD1mje0ZfYi?KCFG7-n)$h)jOvQ2w9JyisId5vBEO2`LrKFy
zrfItS!&f6CCsWH2t=1_-DmT$$j*3btINn*3B!hS2u!FpcqfQ_8Zo?h@qZ{v`ecS2Q
z9;{*&hv<+wLPu~IhYdA2-K}_g6^9fDt|5pZi}pt=N^k#n_k%IFWRfiV(DSl>{`%P0
z|3C9~`R&S!KmPRg;7_kq9&XE=uq7i6_%V=$cTF(@!w76;tmX&lrYrxM#`G>^p(}Ow
zJ5SgH5+g7qe|rQY>dwk;EdzJmIDUJ<0+S_qB1eJ4Vydq;1Z|7TF^xx)4yt3UUQU{f
z5g0mxZ*d1$Zvg>ylIN50OfJKSxfnHL2DQDQs~jJO%U!7%GyKkn8XJuL{-O{SVV^6`
z9Uqh_vYVQ+;pcX>AXD^u&W7V~PJc^JTDXwW85z;eDZmqkk8?O5b~*L%F4#Zk`GP+c
z0KhLy+nKH!SEef_s?vk$RGr6E$3PFmTOG2UwGbm8D&X?u$hibAiXQ`jusc$Wz&c-<
zqca`#Tgsc8Lcb`Qf@nIZNkIiQ(sWahf@(Z(*GMUXnjDQgl9ju6S5B9!@cZT|<I>Fv
zQ06X6Q{k4q5g!!0Yfr>f6#K7@RtihW0<$b%6qUiR;3ePwJLj}?SW@Ij=SbVIqA91l
z_cm^R3+{NRGH_MA6e-Gb+7&E^_8o`QaxB_^ffZVoLwm`7t+s!Kwr`Zln|kk{WtfHd
zpm;V?W^6FlSkaeEx3I8a)Z&BUbXIs-x<$I$+@etO$<bUwD|=(<=B;*zq_i2rm>$T&
zf9ech!j&X<&R$SV7lCPa4sy7q7RlwD&4L}vtZ1)0L#DEpR7AZqK^AT-b+xy5E!~*S
z#Yny_D%*6Pi;VIl<CjZr5{Q%X>h3LXTt=1;LAhtcibOqr37GSyH=i7qN15!!R8q*o
znUIB6D9bHbVxAz#!j56p&BQs=vF%jgTs21U7J_Q*e+N7F{2V$I<{X?D<1I=|yq2f@
zz^_#^`#NU-A#R!7A~>8&Ng;M2$Swjj&g8ML-NpY2i0C*9S-7nV@U$6Zo}g#aSL)#$
zK4}+z0A;zjIR7Y@!nN0-M~)nmmIeSgAjEXY1nIw3<t(dmRA5mY<BtW1%0iLT#Oc$y
z8Ae7k$6Oj?Ze-+~d*%$0fP`R#@q2IyoOt6^QBLHQmrq)r2M&QDhF*W#V?TP7O0dHs
zqwZiajpbxC$hQJxcdLj$6703u0hCG_vQS2`)VH#r`*i^9m9Vwkw*C<gr%<I}oi@&B
z3t31jmBcBV4Yn1LIMBmDE#B*LK3LoPf`Em;56L8LvWT9-kU}!0I3R%(l4KgK1JX3t
z`7UnuJ0!+_k~oJuR-daa17}@Cj0cRDN1lZK5+DoxZge=P2Dn&<J^9k0pT#0qBi2QT
z2hsThArP0GzN6DM)QJusCK7nO1OmwU$`~EfwM_#&OQ5Dv9s|vWLl*vcq)?P<*3v?p
zDmg{8w6y<RMbc11mfYE-(;<bdU$4_~rl&+<Ob0Ue89)!?<wET^_u*~j++V~UzCHKh
zgbU@}r6!7&CEPp9@8Kcoh^)^)TpDDd2C@z6wj2*LR_i0nWAi&Y^0ya@jV#wYll)Y-
zvAz>ZN+vi5@pT)!8G_LReQxwha$SFKzf=|xF7pYG@Ch3;HZ;-!IEXk=^vjSezccIo
zhpwEQ&`^V`L11t({JR9eL+(uz%<(}J=?<Sb%ZJZPT;wIG2XxlvW@hHrx&x`_-*3+!
z###Dw&}gF1907IXA8i2XD9jua;Z&R^#p5HXY_T|-ijTz8q{R_VV}zMk4(Lb(CnpDQ
zw@eTNMpsiStS?yyAYM-MCDlCh{SD^K&z{*Ey9cgS+3DWkg&nb`mi#^(J6-l}ZG*G{
zQm{d)2{U3e4L(&9;{`~v5V!{!!)=6b+VIL*=)*kF{eMMZ)0P}=%jEgf)zkg9c|2rX
z+!%2DZ-obm(%^{L7l{7&v>53@ehHs=Eh8%?C^#!3;~Kq}ks9I~km{GQhd(s4_g%X4
zlg7k_Nu%9)`!3nkkY2M-cAiG8_}PTuLK{}yF|yaTEH1P<cH#B$ahoc2i71H*6D!2#
z6m<Gb=z-%$wtl?4P`~)`V#_Jfx$maFN%g6lditEf@n+0J??`Fs&rc<R<2{&Hzv@Zq
z@c^Njd*s-c!;F^}#ErJ*Z@Omr59zdd7Gyq9dL_}X$f8u$X5_J%>CLzLro<E4I|t76
zm|BX@^Y-9)v4fXG5nn`kQK0BfqfVNpJB>PNaJ={^>2T)NUvKB`sZVf|Z$fq#+wdfV
za=z_HZ81szsNKfr{S`sVKL0cGi$6<A&%eO&CEihFxG<M5^#~`e<oHnY@|V-wb#DLV
z^z!1D^ILUp{pI{TW%QoD1)YU^`bWp_?pxGZyr&l&ui#UupW*43Mp3?LnVyyUKD=5E
zA3Nxil{M@g&4c50iWeo-b#p9xhY@>6cy>f|bWUj49i{9?wx!zN`r%W}TmQ^yQ4}ji
zTvAt0ulf7hSNn{M`gF_R=+cuqGfYJK%_VRBe9@4rSg07a8gTVw!9B<{#i`!1SwHSc
ztH<-Ji{2CCR(6ajV@6nfsF^tBP@fvrk<laW8M&EjX}VQ5)RW(n5!q3nI_ZF$$(wJe
zqW%h#k`dC7za+QcfcMD9ZYZ7;tdVOgg7QtlCOJ7JD0=LMq79XM$Y<77pniL&D&swV
z+^AX_yvYVD9yLzW-imj0;$~dEI&AM@NqRVVbYHy+xQm$z2JdRdE*Q4C({Y|;E@^dl
zkx8SfzhAQ^Yx}Q9*7NaQQKQyT&JuU)?5pV#{hy+pcU@EB=S-Rc5^}?0vI_eAR}26E
zz<`?VTlqub)W4-#p}#2$2JlAW)6r+XjBP)AQ~rzmO!$oOHDEXfRyhPP_&1gCLHRH8
z--OSUFuQhy@IgF@2k|Tx12>C{Q3ALhOlBGSgOJU|{}=)6_yY&5bPkbY&c#kjm!Ukw
zxXaKWctQdUFd0hlK%yd}gNZ}fNNBzCYv6e3CzVujb6H|G?Mxtq$m}eDCK20N2r<6y
zOoGN?X9bvIyptkg5zUD2KRg6F6HtYhE`YH|0EGj@1m;l^^U4S{r~^oa49(ymffRYD
zL@laOgI1)W5v{02IkUb9Sr_g`B@)mK2`W&Dc+@)GOOXNzT17Kz`6kUm7dVtb=1tjx
zOvuoN25zhvL<UUV9ht6PjkeH`pc%Pk)t1PRp#h@7{9OmZ55dR_5=9FVMaiOQP$CoF
z4?Tqhq#+Fnpd`0An@iIAV;~zkmP-)>5caq}@P`NqQKbykkh-BFBqJFye_|0LM9l${
emLUQ}C0b;__BnbCU7J?cL=C=^kdNI+&H(_Ync)rq

diff --git a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
index da5a97585c..09862b2d5f 100644
--- a/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
+++ b/services/web/frontend/fonts/material-symbols/unfilled-symbols.mjs
@@ -4,6 +4,7 @@
 // You may need to hard reload your browser window to see the changes.
 
 export default /** @type {const} */ ([
+  'account_balance',
   'auto_delete',
   'book_5',
   'brush',
diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx b/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx
index 8da0045f2b..c4461a669d 100644
--- a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx
@@ -43,6 +43,12 @@ const SettingsModal = () => {
         icon: 'settings',
         href: '/user/settings',
       },
+      {
+        key: 'subscription',
+        title: t('subscription'),
+        icon: 'account_balance',
+        href: '/user/subscription',
+      },
     ],
     [t]
   )

From be4a11484fb1654d9be161dee99ddd18f5e2802b Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:34:15 +0100
Subject: [PATCH 245/274] Merge pull request #27172 from
 overleaf/dp-file-menu-settings

Add settings option to file menu

GitOrigin-RevId: a5ad0cecad5b7896185a8b9c91364c7904961438
---
 .../js/features/ide-redesign/components/rail.tsx   | 14 ++++++++++++++
 .../ide-redesign/components/toolbar/menu-bar.tsx   |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index 0c8d49202d..1f9bb0b0aa 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -45,6 +45,7 @@ import { useFeatureFlag } from '@/shared/context/split-test-context'
 import { useSurveyUrl } from '../hooks/use-survey-url'
 import { useProjectContext } from '@/shared/context/project-context'
 import usePreviousValue from '@/shared/hooks/use-previous-value'
+import { useCommandProvider } from '@/features/ide-react/hooks/use-command-provider'
 
 type RailElement = {
   icon: AvailableUnfilledIcon
@@ -185,6 +186,19 @@ export const RailLayout = () => {
     [setLeftMenuShown, t, sendEvent]
   )
 
+  useCommandProvider(
+    () => [
+      {
+        id: 'open-settings',
+        handler: () => {
+          setLeftMenuShown(true)
+        },
+        label: t('settings'),
+      },
+    ],
+    [t, setLeftMenuShown]
+  )
+
   const onTabSelect = useCallback(
     (key: string | null) => {
       if (key === selectedTab) {
diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx
index d2593d7d07..acb737b33b 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/menu-bar.tsx
@@ -72,6 +72,10 @@ export const ToolbarMenuBar = () => {
         id: 'file-download',
         children: ['download-as-source-zip', 'download-pdf'],
       },
+      {
+        id: 'settings',
+        children: ['open-settings'],
+      },
     ],
     []
   )

From ec2ab62f4df6cf82a119054cc1fd58b7b9d4a846 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:34:24 +0100
Subject: [PATCH 246/274] Merge pull request #27171 from
 overleaf/dp-make-a-copy

Update copy of copy project option

GitOrigin-RevId: 3d1cc544f3945f55600f0daf1021b07de9d207bc
---
 .../ide-redesign/components/toolbar/duplicate-project.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/toolbar/duplicate-project.tsx b/services/web/frontend/js/features/ide-redesign/components/toolbar/duplicate-project.tsx
index 74f868cc91..1cfa4581b7 100644
--- a/services/web/frontend/js/features/ide-redesign/components/toolbar/duplicate-project.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/toolbar/duplicate-project.tsx
@@ -36,7 +36,7 @@ export const DuplicateProject = () => {
   return (
     <>
       <OLDropdownMenuItem onClick={handleShowModal}>
-        {t('copy')}
+        {t('make_a_copy')}
       </OLDropdownMenuItem>
       <EditorCloneProjectModalWrapper
         show={showModal}

From b0776da02c4e4f15ac833435779503db099f6b75 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:34:30 +0100
Subject: [PATCH 247/274] Merge pull request #27119 from
 overleaf/dp-select-error-text

Make error log header text selectable

GitOrigin-RevId: f3844d20bb11abf32ee053da763531c39d63a543
---
 .../web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
index c830fa7eef..4f2d4146bf 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/logs.scss
@@ -90,6 +90,7 @@
       border-radius: var(--border-radius-base);
       padding: var(--spacing-02) var(--spacing-03) var(--spacing-02) 0;
       overflow: hidden;
+      user-select: text;
 
       &:hover {
         cursor: pointer;

From 2e82852ed0bf370146c45e05eb00fddd9caa03a0 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:34:39 +0100
Subject: [PATCH 248/274] Merge pull request #27125 from
 overleaf/ae-extension-exports

Add CodeMirror history-related exports to `UNSTABLE_editor:extensions` event

GitOrigin-RevId: 015a19f8b97075ee441dda1d42e19d7f81804ed7
---
 .../js/features/source-editor/extensions/bundle.ts   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/services/web/frontend/js/features/source-editor/extensions/bundle.ts b/services/web/frontend/js/features/source-editor/extensions/bundle.ts
index 1a57ba829b..a11839105d 100644
--- a/services/web/frontend/js/features/source-editor/extensions/bundle.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/bundle.ts
@@ -1,5 +1,6 @@
 import { syntaxTree } from '@codemirror/language'
 import {
+  ChangeSet,
   EditorSelection,
   Prec,
   StateEffect,
@@ -13,9 +14,16 @@ import {
   ViewPlugin,
   WidgetType,
 } from '@codemirror/view'
+import {
+  undo,
+  redo,
+  invertedEffects,
+  isolateHistory,
+} from '@codemirror/commands'
 import { CodeMirror, Vim, getCM } from '@replit/codemirror-vim'
 
 export default {
+  ChangeSet,
   Decoration,
   EditorSelection,
   EditorView,
@@ -27,6 +35,10 @@ export default {
   hoverTooltip,
   keymap,
   syntaxTree,
+  undo,
+  redo,
+  invertedEffects,
+  isolateHistory,
 }
 
 export const CodeMirrorVim = {

From 5208ad39ec7c764107c742f5db100bc4903e5cb2 Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Thu, 17 Jul 2025 11:02:12 +0100
Subject: [PATCH 249/274] Merge pull request #27173 from
 overleaf/bg-filestore-migration-remove-backups

remove backup code from back_fill_file_hash script and tests

GitOrigin-RevId: 364eefc47670e6e7f2314de810ea259b609ff976
---
 .../storage/scripts/back_fill_file_hash.mjs   | 301 ++----------------
 .../js/storage/back_fill_file_hash.test.mjs   | 229 +------------
 2 files changed, 41 insertions(+), 489 deletions(-)

diff --git a/services/history-v1/storage/scripts/back_fill_file_hash.mjs b/services/history-v1/storage/scripts/back_fill_file_hash.mjs
index 5a590e347a..0ccadaf5a9 100644
--- a/services/history-v1/storage/scripts/back_fill_file_hash.mjs
+++ b/services/history-v1/storage/scripts/back_fill_file_hash.mjs
@@ -1,28 +1,20 @@
 // @ts-check
-import Crypto from 'node:crypto'
 import Events from 'node:events'
 import fs from 'node:fs'
 import Path from 'node:path'
 import { performance } from 'node:perf_hooks'
 import Stream from 'node:stream'
-import zLib from 'node:zlib'
 import { setTimeout } from 'node:timers/promises'
-import { Binary, ObjectId } from 'mongodb'
+import { ObjectId } from 'mongodb'
 import pLimit from 'p-limit'
 import logger from '@overleaf/logger'
 import {
   batchedUpdate,
   objectIdFromInput,
   renderObjectId,
-  READ_PREFERENCE_SECONDARY,
 } from '@overleaf/mongo-utils/batchedUpdate.js'
 import OError from '@overleaf/o-error'
-import {
-  AlreadyWrittenError,
-  NoKEKMatchedError,
-  NotFoundError,
-} from '@overleaf/object-persistor/src/Errors.js'
-import { backupPersistor, projectBlobsBucket } from '../lib/backupPersistor.mjs'
+import { NotFoundError } from '@overleaf/object-persistor/src/Errors.js'
 import {
   BlobStore,
   GLOBAL_BLOBS,
@@ -30,9 +22,8 @@ import {
   getProjectBlobsBatch,
   getStringLengthOfFile,
   makeBlobForFile,
-  makeProjectKey,
 } from '../lib/blob_store/index.js'
-import { backedUpBlobs as backedUpBlobsCollection, db } from '../lib/mongodb.js'
+import { db } from '../lib/mongodb.js'
 import commandLineArgs from 'command-line-args'
 import readline from 'node:readline'
 
@@ -88,7 +79,7 @@ ObjectId.cacheHexString = true
  */
 
 /**
- * @return {{PROJECT_IDS_FROM: string, PROCESS_HASHED_FILES: boolean, LOGGING_IDENTIFIER: string, BATCH_RANGE_START: string, PROCESS_BLOBS: boolean, BATCH_RANGE_END: string, PROCESS_NON_DELETED_PROJECTS: boolean, PROCESS_DELETED_PROJECTS: boolean, COLLECT_BACKED_UP_BLOBS: boolean}}
+ * @return {{PROJECT_IDS_FROM: string, PROCESS_HASHED_FILES: boolean, LOGGING_IDENTIFIER: string, BATCH_RANGE_START: string, PROCESS_BLOBS: boolean, BATCH_RANGE_END: string, PROCESS_NON_DELETED_PROJECTS: boolean, PROCESS_DELETED_PROJECTS: boolean}}
  */
 function parseArgs() {
   const PUBLIC_LAUNCH_DATE = new Date('2012-01-01T00:00:00Z')
@@ -98,7 +89,6 @@ function parseArgs() {
     { name: 'processHashedFiles', type: String, defaultValue: 'false' },
     { name: 'processBlobs', type: String, defaultValue: 'true' },
     { name: 'projectIdsFrom', type: String, defaultValue: '' },
-    { name: 'collectBackedUpBlobs', type: String, defaultValue: 'true' },
     {
       name: 'BATCH_RANGE_START',
       type: String,
@@ -130,7 +120,6 @@ function parseArgs() {
     PROCESS_DELETED_PROJECTS: boolVal('processDeletedProjects'),
     PROCESS_BLOBS: boolVal('processBlobs'),
     PROCESS_HASHED_FILES: boolVal('processHashedFiles'),
-    COLLECT_BACKED_UP_BLOBS: boolVal('collectBackedUpBlobs'),
     BATCH_RANGE_START,
     BATCH_RANGE_END,
     LOGGING_IDENTIFIER: args['LOGGING_IDENTIFIER'] || BATCH_RANGE_START,
@@ -143,7 +132,6 @@ const {
   PROCESS_DELETED_PROJECTS,
   PROCESS_BLOBS,
   PROCESS_HASHED_FILES,
-  COLLECT_BACKED_UP_BLOBS,
   BATCH_RANGE_START,
   BATCH_RANGE_END,
   LOGGING_IDENTIFIER,
@@ -232,7 +220,6 @@ async function processConcurrently(array, fn) {
 const STATS = {
   projects: 0,
   blobs: 0,
-  backedUpBlobs: 0,
   filesWithHash: 0,
   filesWithoutHash: 0,
   filesDuplicated: 0,
@@ -246,14 +233,8 @@ const STATS = {
   projectHardDeleted: 0,
   fileHardDeleted: 0,
   mongoUpdates: 0,
-  deduplicatedWriteToAWSLocalCount: 0,
-  deduplicatedWriteToAWSLocalEgress: 0,
-  deduplicatedWriteToAWSRemoteCount: 0,
-  deduplicatedWriteToAWSRemoteEgress: 0,
   readFromGCSCount: 0,
   readFromGCSIngress: 0,
-  writeToAWSCount: 0,
-  writeToAWSEgress: 0,
   writeToGCSCount: 0,
   writeToGCSEgress: 0,
 }
@@ -275,7 +256,7 @@ function toMiBPerSecond(v, ms) {
 /**
  * @param {any} stats
  * @param {number} ms
- * @return {{writeToAWSThroughputMiBPerSecond: number, readFromGCSThroughputMiBPerSecond: number}}
+ * @return {{readFromGCSThroughputMiBPerSecond: number}}
  */
 function bandwidthStats(stats, ms) {
   return {
@@ -283,10 +264,6 @@ function bandwidthStats(stats, ms) {
       stats.readFromGCSIngress,
       ms
     ),
-    writeToAWSThroughputMiBPerSecond: toMiBPerSecond(
-      stats.writeToAWSEgress,
-      ms
-    ),
   }
 }
 
@@ -382,9 +359,6 @@ async function processFile(entry, filePath) {
           throw err // disable retries for not found in filestore bucket case
         }
       }
-      if (err instanceof NoKEKMatchedError) {
-        throw err // disable retries when upload to S3 will fail again
-      }
       STATS.filesRetries++
       const {
         ctx: { projectId },
@@ -413,37 +387,14 @@ async function processFileOnce(entry, filePath) {
     ctx: { projectId, historyId },
     fileId,
   } = entry
-  const blobStore = new BlobStore(historyId)
-  if (entry.blob) {
-    const { blob } = entry
-    const hash = blob.getHash()
-    if (entry.ctx.hasBackedUpBlob(hash)) {
-      STATS.deduplicatedWriteToAWSLocalCount++
-      STATS.deduplicatedWriteToAWSLocalEgress += estimateBlobSize(blob)
-      return hash
-    }
-    entry.ctx.recordPendingBlob(hash)
-    STATS.readFromGCSCount++
-    const src = await blobStore.getStream(hash)
-    const dst = fs.createWriteStream(filePath, {
-      highWaterMark: STREAM_HIGH_WATER_MARK,
-    })
-    try {
-      await Stream.promises.pipeline(src, dst)
-    } finally {
-      STATS.readFromGCSIngress += dst.bytesWritten
-    }
-    await uploadBlobToAWS(entry, blob, filePath)
-    return hash
-  }
-  if (entry.hash && entry.ctx.hasBackedUpBlob(entry.hash)) {
-    STATS.deduplicatedWriteToAWSLocalCount++
-    const blob = entry.ctx.getCachedHistoryBlob(entry.hash)
-    // blob might not exist on re-run with --PROCESS_BLOBS=false
-    if (blob) STATS.deduplicatedWriteToAWSLocalEgress += estimateBlobSize(blob)
+  if (entry.hash && entry.ctx.hasCompletedBlob(entry.hash)) {
+    // We can enter this case for two identical files in the same project,
+    // one with hash, the other without. When the one without hash gets
+    // processed first, we can skip downloading the other one we already
+    // know the hash of.
     return entry.hash
   }
-
+  const blobStore = new BlobStore(historyId)
   STATS.readFromGCSCount++
   // make a fetch request to filestore itself
   const src = await fetchFromFilestore(projectId, fileId)
@@ -469,16 +420,14 @@ async function processFileOnce(entry, filePath) {
     STATS.globalBlobsEgress += estimateBlobSize(blob)
     return hash
   }
-  if (entry.ctx.hasBackedUpBlob(hash)) {
-    STATS.deduplicatedWriteToAWSLocalCount++
-    STATS.deduplicatedWriteToAWSLocalEgress += estimateBlobSize(blob)
+  if (entry.ctx.hasCompletedBlob(hash)) {
     return hash
   }
   entry.ctx.recordPendingBlob(hash)
 
   try {
     await uploadBlobToGCS(blobStore, entry, blob, hash, filePath)
-    await uploadBlobToAWS(entry, blob, filePath)
+    entry.ctx.recordCompletedBlob(hash) // mark upload as completed
   } catch (err) {
     entry.ctx.recordFailedBlob(hash)
     throw err
@@ -515,76 +464,6 @@ async function uploadBlobToGCS(blobStore, entry, blob, hash, filePath) {
 
 const GZ_SUFFIX = '.gz'
 
-/**
- * @param {QueueEntry} entry
- * @param {Blob} blob
- * @param {string} filePath
- * @return {Promise<void>}
- */
-async function uploadBlobToAWS(entry, blob, filePath) {
-  const { historyId } = entry.ctx
-  let backupSource
-  let contentEncoding
-  const md5 = Crypto.createHash('md5')
-  let size
-  if (blob.getStringLength()) {
-    const filePathCompressed = filePath + GZ_SUFFIX
-    backupSource = filePathCompressed
-    contentEncoding = 'gzip'
-    size = 0
-    await Stream.promises.pipeline(
-      fs.createReadStream(filePath, { highWaterMark: STREAM_HIGH_WATER_MARK }),
-      zLib.createGzip(),
-      async function* (source) {
-        for await (const chunk of source) {
-          size += chunk.byteLength
-          md5.update(chunk)
-          yield chunk
-        }
-      },
-      fs.createWriteStream(filePathCompressed, {
-        highWaterMark: STREAM_HIGH_WATER_MARK,
-      })
-    )
-  } else {
-    backupSource = filePath
-    size = blob.getByteLength()
-    await Stream.promises.pipeline(
-      fs.createReadStream(filePath, { highWaterMark: STREAM_HIGH_WATER_MARK }),
-      md5
-    )
-  }
-  const backendKeyPath = makeProjectKey(historyId, blob.getHash())
-  const persistor = await entry.ctx.getCachedPersistor(backendKeyPath)
-  try {
-    STATS.writeToAWSCount++
-    await persistor.sendStream(
-      projectBlobsBucket,
-      backendKeyPath,
-      fs.createReadStream(backupSource, {
-        highWaterMark: STREAM_HIGH_WATER_MARK,
-      }),
-      {
-        contentEncoding,
-        contentType: 'application/octet-stream',
-        contentLength: size,
-        sourceMd5: md5.digest('hex'),
-        ifNoneMatch: '*', // de-duplicate write (we pay for the request, but avoid egress)
-      }
-    )
-    STATS.writeToAWSEgress += size
-  } catch (err) {
-    if (err instanceof AlreadyWrittenError) {
-      STATS.deduplicatedWriteToAWSRemoteCount++
-      STATS.deduplicatedWriteToAWSRemoteEgress += size
-    } else {
-      STATS.writeToAWSEgress += size
-      throw err
-    }
-  }
-  entry.ctx.recordBackedUpBlob(blob.getHash())
-}
-
 /**
  * @param {Array<QueueEntry>} files
  * @return {Promise<void>}
@@ -670,23 +549,19 @@ async function queueNextBatch(batch, prefix = 'rootFolder.0') {
  * @return {Promise<void>}
  */
 async function processBatch(batch, prefix = 'rootFolder.0') {
-  const [{ nBlobs, blobs }, { nBackedUpBlobs, backedUpBlobs }] =
-    await Promise.all([collectProjectBlobs(batch), collectBackedUpBlobs(batch)])
-  const files = Array.from(findFileInBatch(batch, prefix, blobs, backedUpBlobs))
+  const { nBlobs, blobs } = await collectProjectBlobs(batch)
+  const files = Array.from(findFileInBatch(batch, prefix, blobs))
   STATS.projects += batch.length
   STATS.blobs += nBlobs
-  STATS.backedUpBlobs += nBackedUpBlobs
 
   // GC
   batch.length = 0
   blobs.clear()
-  backedUpBlobs.clear()
 
   // The files are currently ordered by project-id.
-  // Order them by file-id ASC then blobs ASC to
-  // - process files before blobs
-  // - avoid head-of-line blocking from many project-files waiting on the generation of the projects DEK (round trip to AWS)
-  // - bonus: increase chance of de-duplicating write to AWS
+  // Order them by file-id ASC then hash ASC to
+  // increase the hit rate on the "already processed
+  // hash for project" checks.
   files.sort(
     /**
      * @param {QueueEntry} a
@@ -903,32 +778,14 @@ function* findFiles(ctx, folder, path, isInputLoop = false) {
  * @param {Array<Project>} projects
  * @param {string} prefix
  * @param {Map<string,Array<Blob>>} blobs
- * @param {Map<string,Array<string>>} backedUpBlobs
  * @return Generator<QueueEntry>
  */
-function* findFileInBatch(projects, prefix, blobs, backedUpBlobs) {
+function* findFileInBatch(projects, prefix, blobs) {
   for (const project of projects) {
     const projectIdS = project._id.toString()
     const historyIdS = project.overleaf.history.id.toString()
     const projectBlobs = blobs.get(historyIdS) || []
-    const projectBackedUpBlobs = new Set(backedUpBlobs.get(projectIdS) || [])
-    const ctx = new ProjectContext(
-      project._id,
-      historyIdS,
-      projectBlobs,
-      projectBackedUpBlobs
-    )
-    for (const blob of projectBlobs) {
-      if (projectBackedUpBlobs.has(blob.getHash())) continue
-      ctx.remainingQueueEntries++
-      yield {
-        ctx,
-        cacheKey: blob.getHash(),
-        path: MONGO_PATH_SKIP_WRITE_HASH_TO_FILE_TREE,
-        blob,
-        hash: blob.getHash(),
-      }
-    }
+    const ctx = new ProjectContext(project._id, historyIdS, projectBlobs)
     try {
       yield* findFiles(ctx, project.rootFolder?.[0], prefix, true)
     } catch (err) {
@@ -951,42 +808,11 @@ async function collectProjectBlobs(batch) {
   return await getProjectBlobsBatch(batch.map(p => p.overleaf.history.id))
 }
 
-/**
- * @param {Array<Project>} projects
- * @return {Promise<{nBackedUpBlobs:number,backedUpBlobs:Map<string,Array<string>>}>}
- */
-async function collectBackedUpBlobs(projects) {
-  let nBackedUpBlobs = 0
-  const backedUpBlobs = new Map()
-  if (!COLLECT_BACKED_UP_BLOBS) return { nBackedUpBlobs, backedUpBlobs }
-
-  const cursor = backedUpBlobsCollection.find(
-    { _id: { $in: projects.map(p => p._id) } },
-    {
-      readPreference: READ_PREFERENCE_SECONDARY,
-      sort: { _id: 1 },
-    }
-  )
-  for await (const record of cursor) {
-    const blobs = record.blobs.map(b => b.toString('hex'))
-    backedUpBlobs.set(record._id.toString(), blobs)
-    nBackedUpBlobs += blobs.length
-  }
-  return { nBackedUpBlobs, backedUpBlobs }
-}
-
-const BATCH_HASH_WRITES = 1_000
 const BATCH_FILE_UPDATES = 100
 
 const MONGO_PATH_SKIP_WRITE_HASH_TO_FILE_TREE = 'skip-write-to-file-tree'
 
 class ProjectContext {
-  /** @type {Promise<CachedPerProjectEncryptedS3Persistor> | null} */
-  #cachedPersistorPromise = null
-
-  /** @type {Set<string>} */
-  #backedUpBlobs
-
   /** @type {Map<string, Blob>} */
   #historyBlobs
 
@@ -1000,12 +826,10 @@ class ProjectContext {
    * @param {ObjectId} projectId
    * @param {string} historyId
    * @param {Array<Blob>} blobs
-   * @param {Set<string>} backedUpBlobs
    */
-  constructor(projectId, historyId, blobs, backedUpBlobs) {
+  constructor(projectId, historyId, blobs) {
     this.projectId = projectId
     this.historyId = historyId
-    this.#backedUpBlobs = backedUpBlobs
     this.#historyBlobs = new Map(blobs.map(b => [b.getHash(), b]))
   }
 
@@ -1034,75 +858,17 @@ class ProjectContext {
     return false
   }
 
-  /**
-   * @param {string} key
-   * @return {Promise<CachedPerProjectEncryptedS3Persistor>}
-   */
-  getCachedPersistor(key) {
-    if (!this.#cachedPersistorPromise) {
-      // Fetch DEK once, but only if needed -- upon the first use
-      this.#cachedPersistorPromise = this.#getCachedPersistorWithRetries(key)
-    }
-    return this.#cachedPersistorPromise
-  }
-
-  /**
-   * @param {string} key
-   * @return {Promise<CachedPerProjectEncryptedS3Persistor>}
-   */
-  async #getCachedPersistorWithRetries(key) {
-    // Optimization: Skip GET on DEK in case no blobs are marked as backed up yet.
-    let tryGenerateDEKFirst = this.#backedUpBlobs.size === 0
-    for (let attempt = 0; attempt < RETRIES; attempt++) {
-      try {
-        if (tryGenerateDEKFirst) {
-          try {
-            return await backupPersistor.generateDataEncryptionKey(
-              projectBlobsBucket,
-              key
-            )
-          } catch (err) {
-            if (err instanceof AlreadyWrittenError) {
-              tryGenerateDEKFirst = false
-              // fall back to GET below
-            } else {
-              throw err
-            }
-          }
-        }
-        return await backupPersistor.forProject(projectBlobsBucket, key)
-      } catch (err) {
-        if (gracefulShutdownInitiated) throw err
-        if (err instanceof NoKEKMatchedError) {
-          throw err
-        } else {
-          logger.warn(
-            { err, projectId: this.projectId, attempt },
-            'failed to get DEK, trying again'
-          )
-          const jitter = Math.random() * RETRY_DELAY_MS
-          await setTimeout(RETRY_DELAY_MS + jitter)
-        }
-      }
-    }
-    return await backupPersistor.forProject(projectBlobsBucket, key)
-  }
-
   async flushMongoQueuesIfNeeded() {
     if (this.remainingQueueEntries === 0) {
       await this.flushMongoQueues()
     }
 
-    if (this.#completedBlobs.size > BATCH_HASH_WRITES) {
-      await this.#storeBackedUpBlobs()
-    }
     if (this.#pendingFileWrites.length > BATCH_FILE_UPDATES) {
       await this.#storeFileHashes()
     }
   }
 
   async flushMongoQueues() {
-    await this.#storeBackedUpBlobs()
     await this.#storeFileHashes()
   }
 
@@ -1111,20 +877,6 @@ class ProjectContext {
   /** @type {Set<string>} */
   #completedBlobs = new Set()
 
-  async #storeBackedUpBlobs() {
-    if (this.#completedBlobs.size === 0) return
-    const blobs = Array.from(this.#completedBlobs).map(
-      hash => new Binary(Buffer.from(hash, 'hex'))
-    )
-    this.#completedBlobs.clear()
-    STATS.mongoUpdates++
-    await backedUpBlobsCollection.updateOne(
-      { _id: this.projectId },
-      { $addToSet: { blobs: { $each: blobs } } },
-      { upsert: true }
-    )
-  }
-
   /**
    * @param {string} hash
    */
@@ -1142,8 +894,7 @@ class ProjectContext {
   /**
    * @param {string} hash
    */
-  recordBackedUpBlob(hash) {
-    this.#backedUpBlobs.add(hash)
+  recordCompletedBlob(hash) {
     this.#completedBlobs.add(hash)
     this.#pendingBlobs.delete(hash)
   }
@@ -1152,12 +903,8 @@ class ProjectContext {
    * @param {string} hash
    * @return {boolean}
    */
-  hasBackedUpBlob(hash) {
-    return (
-      this.#pendingBlobs.has(hash) ||
-      this.#completedBlobs.has(hash) ||
-      this.#backedUpBlobs.has(hash)
-    )
+  hasCompletedBlob(hash) {
+    return this.#pendingBlobs.has(hash) || this.#completedBlobs.has(hash)
   }
 
   /** @type {Array<QueueEntry>} */
diff --git a/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs b/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs
index 8f861d3934..62b0b1de25 100644
--- a/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs
+++ b/services/history-v1/test/acceptance/js/storage/back_fill_file_hash.test.mjs
@@ -4,23 +4,17 @@ import Stream from 'node:stream'
 import { setTimeout } from 'node:timers/promises'
 import { promisify } from 'node:util'
 import { ObjectId, Binary } from 'mongodb'
-import {
-  db,
-  backedUpBlobs,
-  globalBlobs,
-} from '../../../../storage/lib/mongodb.js'
+import { db, globalBlobs } from '../../../../storage/lib/mongodb.js'
 import cleanup from './support/cleanup.js'
 import testProjects from '../api/support/test_projects.js'
 import { execFile } from 'node:child_process'
 import chai, { expect } from 'chai'
 import chaiExclude from 'chai-exclude'
-import config from 'config'
 import { WritableBuffer } from '@overleaf/stream-utils'
 import {
   backupPersistor,
   projectBlobsBucket,
 } from '../../../../storage/lib/backupPersistor.mjs'
-import projectKey from '../../../../storage/lib/project_key.js'
 import {
   BlobStore,
   makeProjectKey,
@@ -31,9 +25,6 @@ import express from 'express'
 chai.use(chaiExclude)
 const TIMEOUT = 20 * 1_000
 
-const { deksBucket } = config.get('backupStore')
-const { tieringStorageClass } = config.get('backupPersistor')
-
 const projectsCollection = db.collection('projects')
 const deletedProjectsCollection = db.collection('deletedProjects')
 
@@ -117,17 +108,6 @@ function binaryForGitBlobHash(gitBlobHash) {
   return new Binary(Buffer.from(gitBlobHash, 'hex'))
 }
 
-async function listS3Bucket(bucket, wantStorageClass) {
-  const client = backupPersistor._getClientForBucket(bucket)
-  const response = await client.listObjectsV2({ Bucket: bucket }).promise()
-
-  for (const object of response.Contents || []) {
-    expect(object).to.have.property('StorageClass', wantStorageClass)
-  }
-
-  return (response.Contents || []).map(item => item.Key || '')
-}
-
 function objectIdFromTime(timestamp) {
   return ObjectId.createFromTime(new Date(timestamp).getTime() / 1000)
 }
@@ -591,11 +571,7 @@ describe('back_fill_file_hash script', function () {
     expect((await fs.promises.readdir('/tmp')).join(';')).to.not.match(
       /back_fill_file_hash/
     )
-    const extraStatsKeys = [
-      'eventLoop',
-      'readFromGCSThroughputMiBPerSecond',
-      'writeToAWSThroughputMiBPerSecond',
-    ]
+    const extraStatsKeys = ['eventLoop', 'readFromGCSThroughputMiBPerSecond']
     const stats = JSON.parse(
       result.stderr
         .split('\n')
@@ -610,7 +586,6 @@ describe('back_fill_file_hash script', function () {
     delete stats.time
     if (shouldHaveWritten) {
       expect(stats.readFromGCSThroughputMiBPerSecond).to.be.greaterThan(0)
-      expect(stats.writeToAWSThroughputMiBPerSecond).to.be.greaterThan(0)
     }
     for (const key of extraStatsKeys) {
       delete stats[key]
@@ -856,109 +831,6 @@ describe('back_fill_file_hash script', function () {
           },
         },
       ])
-      expect(
-        (await backedUpBlobs.find({}, { sort: { _id: 1 } }).toArray()).map(
-          entry => {
-            // blobs are pushed unordered into mongo. Sort the list for consistency.
-            entry.blobs.sort()
-            return entry
-          }
-        )
-      ).to.deep.equal([
-        {
-          _id: projectId0,
-          blobs: [
-            binaryForGitBlobHash(gitBlobHash(fileId0)),
-            binaryForGitBlobHash(hashFile7),
-            binaryForGitBlobHash(hashTextBlob0),
-          ].sort(),
-        },
-        {
-          _id: projectId1,
-          blobs: [
-            binaryForGitBlobHash(gitBlobHash(fileId1)),
-            binaryForGitBlobHash(hashTextBlob1),
-          ].sort(),
-        },
-        {
-          _id: projectId2,
-          blobs: [binaryForGitBlobHash(hashTextBlob2)]
-            .concat(
-              processHashedFiles
-                ? [binaryForGitBlobHash(gitBlobHash(fileId2))]
-                : []
-            )
-            .sort(),
-        },
-        {
-          _id: projectIdDeleted0,
-          blobs: [binaryForGitBlobHash(gitBlobHash(fileId4))].sort(),
-        },
-        {
-          _id: projectId3,
-          blobs: [binaryForGitBlobHash(gitBlobHash(fileId3))].sort(),
-        },
-        ...(processHashedFiles
-          ? [
-              {
-                _id: projectIdDeleted1,
-                blobs: [binaryForGitBlobHash(gitBlobHash(fileId5))].sort(),
-              },
-            ]
-          : []),
-        {
-          _id: projectIdBadFileTree0,
-          blobs: [binaryForGitBlobHash(hashTextBlob3)].sort(),
-        },
-        {
-          _id: projectIdBadFileTree3,
-          blobs: [binaryForGitBlobHash(gitBlobHash(fileId9))].sort(),
-        },
-      ])
-    })
-    it('should have backed up all the files', async function () {
-      expect(tieringStorageClass).to.exist
-      const blobs = await listS3Bucket(projectBlobsBucket, tieringStorageClass)
-      expect(blobs.sort()).to.deep.equal(
-        Array.from(
-          new Set(
-            writtenBlobs
-              .map(({ historyId, fileId, hash }) =>
-                makeProjectKey(historyId, hash || gitBlobHash(fileId))
-              )
-              .sort()
-          )
-        )
-      )
-      for (let { historyId, fileId, hash, content } of writtenBlobs) {
-        hash = hash || gitBlobHash(fileId.toString())
-        const s = await backupPersistor.getObjectStream(
-          projectBlobsBucket,
-          makeProjectKey(historyId, hash),
-          { autoGunzip: true }
-        )
-        const buf = new WritableBuffer()
-        await Stream.promises.pipeline(s, buf)
-        expect(gitBlobHashBuffer(buf.getContents())).to.equal(hash)
-        if (content) {
-          expect(buf.getContents()).to.deep.equal(content)
-        } else {
-          const id = buf.getContents().toString('utf-8')
-          expect(id).to.equal(fileId.toString())
-          // double check we are not comparing 'undefined' or '[object Object]' above
-          expect(id).to.match(/^[a-f0-9]{24}$/)
-        }
-      }
-      const deks = await listS3Bucket(deksBucket, 'STANDARD')
-      expect(deks.sort()).to.deep.equal(
-        Array.from(
-          new Set(
-            writtenBlobs.map(
-              ({ historyId }) => projectKey.format(historyId) + '/dek'
-            )
-          )
-        ).sort()
-      )
     })
     it('should have written the back filled files to history v1', async function () {
       for (const { historyId, hash, fileId, content } of writtenBlobs) {
@@ -991,14 +863,13 @@ describe('back_fill_file_hash script', function () {
         // We still need to iterate over all the projects and blobs.
         projects: 10,
         blobs: 10,
-        backedUpBlobs: 10,
+
         badFileTrees: 4,
       }
       if (processHashedFiles) {
         stats = sumStats(stats, {
           ...STATS_ALL_ZERO,
           blobs: 2,
-          backedUpBlobs: 2,
         })
       }
       expect(rerun.stats).deep.equal(stats)
@@ -1024,7 +895,6 @@ describe('back_fill_file_hash script', function () {
   const STATS_ALL_ZERO = {
     projects: 0,
     blobs: 0,
-    backedUpBlobs: 0,
     filesWithHash: 0,
     filesWithoutHash: 0,
     filesDuplicated: 0,
@@ -1038,21 +908,14 @@ describe('back_fill_file_hash script', function () {
     fileHardDeleted: 0,
     badFileTrees: 0,
     mongoUpdates: 0,
-    deduplicatedWriteToAWSLocalCount: 0,
-    deduplicatedWriteToAWSLocalEgress: 0,
-    deduplicatedWriteToAWSRemoteCount: 0,
-    deduplicatedWriteToAWSRemoteEgress: 0,
     readFromGCSCount: 0,
     readFromGCSIngress: 0,
-    writeToAWSCount: 0,
-    writeToAWSEgress: 0,
     writeToGCSCount: 0,
     writeToGCSEgress: 0,
   }
   const STATS_UP_TO_PROJECT1 = {
     projects: 2,
     blobs: 2,
-    backedUpBlobs: 0,
     filesWithHash: 0,
     filesWithoutHash: 5,
     filesDuplicated: 1,
@@ -1065,22 +928,15 @@ describe('back_fill_file_hash script', function () {
     projectHardDeleted: 0,
     fileHardDeleted: 0,
     badFileTrees: 0,
-    mongoUpdates: 4,
-    deduplicatedWriteToAWSLocalCount: 0,
-    deduplicatedWriteToAWSLocalEgress: 0,
-    deduplicatedWriteToAWSRemoteCount: 0,
-    deduplicatedWriteToAWSRemoteEgress: 0,
-    readFromGCSCount: 6,
-    readFromGCSIngress: 4000086,
-    writeToAWSCount: 5,
-    writeToAWSEgress: 4026,
+    mongoUpdates: 2, // 4-2 blobs written to backedUpBlobs collection
+    readFromGCSCount: 4,
+    readFromGCSIngress: 4000072,
     writeToGCSCount: 3,
     writeToGCSEgress: 4000048,
   }
   const STATS_UP_FROM_PROJECT1_ONWARD = {
     projects: 8,
     blobs: 2,
-    backedUpBlobs: 0,
     filesWithHash: 0,
     filesWithoutHash: 4,
     filesDuplicated: 0,
@@ -1093,26 +949,18 @@ describe('back_fill_file_hash script', function () {
     projectHardDeleted: 0,
     fileHardDeleted: 0,
     badFileTrees: 4,
-    mongoUpdates: 8,
-    deduplicatedWriteToAWSLocalCount: 1,
-    deduplicatedWriteToAWSLocalEgress: 30,
-    deduplicatedWriteToAWSRemoteCount: 0,
-    deduplicatedWriteToAWSRemoteEgress: 0,
-    readFromGCSCount: 6,
-    readFromGCSIngress: 110,
-    writeToAWSCount: 5,
-    writeToAWSEgress: 143,
+    mongoUpdates: 3, // previously 5 blobs written to backedUpBlobs collection
+    readFromGCSCount: 4,
+    readFromGCSIngress: 96,
     writeToGCSCount: 3,
     writeToGCSEgress: 72,
   }
   const STATS_FILES_HASHED_EXTRA = {
     ...STATS_ALL_ZERO,
     filesWithHash: 2,
-    mongoUpdates: 2,
+    mongoUpdates: 0, // previously 2 blobs written to backedUpBlobs collection
     readFromGCSCount: 2,
     readFromGCSIngress: 48,
-    writeToAWSCount: 2,
-    writeToAWSEgress: 60,
     writeToGCSCount: 2,
     writeToGCSEgress: 48,
   }
@@ -1144,8 +992,6 @@ describe('back_fill_file_hash script', function () {
           ...STATS_ALL_ZERO,
           filesFailed: 1,
           readFromGCSIngress: -24,
-          writeToAWSCount: -1,
-          writeToAWSEgress: -28,
           writeToGCSCount: -1,
           writeToGCSEgress: -24,
         })
@@ -1269,13 +1115,14 @@ describe('back_fill_file_hash script', function () {
     before('run script with hashed files', async function () {
       output2 = await runScript(['--processHashedFiles=true'], {})
     })
-    it('should print stats', function () {
+    it('should print stats for the first run without hashed files', function () {
       expect(output1.stats).deep.equal(STATS_ALL)
+    })
+    it('should print stats for the hashed files run', function () {
       expect(output2.stats).deep.equal({
         ...STATS_FILES_HASHED_EXTRA,
         projects: 10,
         blobs: 10,
-        backedUpBlobs: 10,
         badFileTrees: 4,
       })
     })
@@ -1322,9 +1169,7 @@ describe('back_fill_file_hash script', function () {
           ...STATS_FILES_HASHED_EXTRA,
           readFromGCSCount: 3,
           readFromGCSIngress: 72,
-          deduplicatedWriteToAWSLocalCount: 1,
-          deduplicatedWriteToAWSLocalEgress: 30,
-          mongoUpdates: 1,
+          mongoUpdates: 0,
           filesWithHash: 3,
         })
       )
@@ -1354,48 +1199,6 @@ describe('back_fill_file_hash script', function () {
       expect(output.stats).deep.equal(
         sumStats(STATS_ALL, {
           ...STATS_ALL_ZERO,
-          // one remote deduplicate
-          deduplicatedWriteToAWSRemoteCount: 1,
-          deduplicatedWriteToAWSRemoteEgress: 28,
-          writeToAWSEgress: -28, // subtract skipped egress
-        })
-      )
-    })
-    commonAssertions()
-  })
-
-  describe('with something in the bucket and marked as processed', function () {
-    before('prepare environment', prepareEnvironment)
-    before('create a file in s3', async function () {
-      await backupPersistor.sendStream(
-        projectBlobsBucket,
-        makeProjectKey(historyId0, hashTextBlob0),
-        Stream.Readable.from([contentTextBlob0]),
-        { contentLength: contentTextBlob0.byteLength }
-      )
-      await backedUpBlobs.insertMany([
-        {
-          _id: projectId0,
-          blobs: [binaryForGitBlobHash(hashTextBlob0)],
-        },
-      ])
-    })
-    let output
-    before('run script', async function () {
-      output = await runScript([], {
-        CONCURRENCY: '1',
-      })
-    })
-
-    it('should print stats', function () {
-      expect(output.stats).deep.equal(
-        sumStats(STATS_ALL, {
-          ...STATS_ALL_ZERO,
-          backedUpBlobs: 1,
-          writeToAWSCount: -1,
-          writeToAWSEgress: -27,
-          readFromGCSCount: -1,
-          readFromGCSIngress: -7,
         })
       )
     })
@@ -1418,8 +1221,10 @@ describe('back_fill_file_hash script', function () {
       })
     })
 
-    it('should print stats', function () {
+    it('should print stats for part 0', function () {
       expect(outputPart0.stats).to.deep.equal(STATS_UP_TO_PROJECT1)
+    })
+    it('should print stats for part 1', function () {
       expect(outputPart1.stats).to.deep.equal(STATS_UP_FROM_PROJECT1_ONWARD)
     })
     commonAssertions()

From 98af0e3d826fe47420624c993113adc206eed79c Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Thu, 17 Jul 2025 12:53:55 +0200
Subject: [PATCH 250/274] [web] In tests, update email confirmation to use the
 6-digits flow (#27069)

* Rename `sendExistingSecondaryEmailConfirmationCode` to `sendExistingEmailConfirmationCode`

* Deduplicate error handling into `throwIfErrorResponse`

* Update `userHelper.confirmEmail` to use the 6-digits flow

GitOrigin-RevId: 91bdf7b185407b58520ca6b2aa1a7c71bdd23bc8
---
 .../src/Features/User/UserEmailsController.js |   6 +-
 services/web/app/src/router.mjs               |   2 +-
 .../acceptance/src/helpers/UserHelper.mjs     | 115 ++++++------------
 .../src/User/UserEmailsControllerTests.js     |  10 +-
 4 files changed, 48 insertions(+), 85 deletions(-)

diff --git a/services/web/app/src/Features/User/UserEmailsController.js b/services/web/app/src/Features/User/UserEmailsController.js
index e4ad7423af..2f9be5427e 100644
--- a/services/web/app/src/Features/User/UserEmailsController.js
+++ b/services/web/app/src/Features/User/UserEmailsController.js
@@ -141,7 +141,7 @@ async function sendReconfirmation(req, res) {
   res.sendStatus(204)
 }
 
-async function sendExistingSecondaryEmailConfirmationCode(req, res) {
+async function sendExistingEmailConfirmationCode(req, res) {
   const userId = SessionManager.getLoggedInUserId(req.session)
   const email = EmailHelper.parseEmail(req.body.email)
   if (!email) {
@@ -715,8 +715,8 @@ const UserEmailsController = {
 
   sendReconfirmation: expressify(sendReconfirmation),
 
-  sendExistingSecondaryEmailConfirmationCode: expressify(
-    sendExistingSecondaryEmailConfirmationCode
+  sendExistingEmailConfirmationCode: expressify(
+    sendExistingEmailConfirmationCode
   ),
 
   addSecondaryEmailPage: expressify(addSecondaryEmailPage),
diff --git a/services/web/app/src/router.mjs b/services/web/app/src/router.mjs
index 7851a4a66f..e727fa7bc5 100644
--- a/services/web/app/src/router.mjs
+++ b/services/web/app/src/router.mjs
@@ -345,7 +345,7 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
     '/user/emails/send-confirmation-code',
     AuthenticationController.requireLogin(),
     RateLimiterMiddleware.rateLimit(rateLimiters.sendConfirmation),
-    UserEmailsController.sendExistingSecondaryEmailConfirmationCode
+    UserEmailsController.sendExistingEmailConfirmationCode
   )
 
   webRouter.post(
diff --git a/services/web/test/acceptance/src/helpers/UserHelper.mjs b/services/web/test/acceptance/src/helpers/UserHelper.mjs
index cfeafed47c..951dccaf2b 100644
--- a/services/web/test/acceptance/src/helpers/UserHelper.mjs
+++ b/services/web/test/acceptance/src/helpers/UserHelper.mjs
@@ -7,7 +7,6 @@ import UserGetter from '../../../../app/src/Features/User/UserGetter.js'
 import UserUpdater from '../../../../app/src/Features/User/UserUpdater.js'
 import moment from 'moment'
 import fetch from 'node-fetch'
-import { db } from '../../../../app/src/infrastructure/mongodb.js'
 import mongodb from 'mongodb-legacy'
 
 import { UserAuditLogEntry } from '../../../../app/src/models/UserAuditLogEntry.js'
@@ -19,11 +18,20 @@ import { RateLimiter } from '../../../../app/src/infrastructure/RateLimiter.js'
 const { ObjectId } = mongodb
 
 const rateLimiters = {
-  resendConfirmation: new RateLimiter('resend-confirmation'),
+  sendConfirmation: new RateLimiter('send-confirmation'),
 }
 
 let globalUserNum = Settings.test.counterInit
 
+const throwIfErrorResponse = async response => {
+  if (response.status < 200 || response.status >= 300) {
+    const body = await response.text()
+    throw new Error(
+      `request failed: status=${response.status} body=${JSON.stringify(body)}`
+    )
+  }
+}
+
 class UserHelper {
   /**
    * Create UserHelper
@@ -129,13 +137,7 @@ class UserHelper {
     // get csrf token from api and store
     const response = await this.fetch('/dev/csrf')
     const body = await response.text()
-    if (response.status !== 200) {
-      throw new Error(
-        `get csrf token failed: status=${response.status} body=${JSON.stringify(
-          body
-        )}`
-      )
-    }
+    await throwIfErrorResponse(response)
     this._csrfToken = body
   }
 
@@ -145,14 +147,7 @@ class UserHelper {
   async getSession() {
     const response = await this.fetch('/dev/session')
     const body = await response.text()
-
-    if (response.status !== 200) {
-      throw new Error(
-        `get session failed: status=${response.status} body=${JSON.stringify(
-          body
-        )}`
-      )
-    }
+    await throwIfErrorResponse(response)
     return JSON.parse(body)
   }
 
@@ -160,24 +155,22 @@ class UserHelper {
     const response = await this.fetch(
       `/dev/split_test/get_assignment?splitTestName=${splitTestName}`
     )
+    await throwIfErrorResponse(response)
     const body = await response.text()
-
-    if (response.status !== 200) {
-      throw new Error(
-        `get split test assignment failed: status=${response.status} body=${JSON.stringify(
-          body
-        )}`
-      )
-    }
     return JSON.parse(body)
   }
 
-  async getEmailConfirmationCode() {
+  /**
+   *
+   * @param {'pendingExistingEmail'|'pendingUserRegistration'}sessionKey
+   * @return {Promise<*>}
+   */
+  async getEmailConfirmationCode(sessionKey) {
     const session = await this.getSession()
 
-    const code = session.pendingUserRegistration?.confirmCode
+    const code = session[sessionKey]?.confirmCode
     if (!code) {
-      throw new Error('No confirmation code found in session')
+      throw new Error(`No confirmation code found in session (${sessionKey})`)
     }
     return code
   }
@@ -383,14 +376,8 @@ class UserHelper {
       body: JSON.stringify(userData),
       ...options,
     })
+    await throwIfErrorResponse(response)
     const body = await response.json()
-    if (response.status !== 200) {
-      throw new Error(
-        `register failed: status=${response.status} body=${JSON.stringify(
-          body
-        )}`
-      )
-    }
     if (body.message && body.message.type === 'error') {
       throw new Error(`register api error: ${body.message.text}`)
     }
@@ -400,7 +387,9 @@ class UserHelper {
       )
     }
 
-    const code = await userHelper.getEmailConfirmationCode()
+    const code = await userHelper.getEmailConfirmationCode(
+      'pendingUserRegistration'
+    )
 
     const confirmationResponse = await userHelper.fetch(
       '/registration/confirm-email',
@@ -446,14 +435,7 @@ class UserHelper {
       method: 'POST',
       body: new URLSearchParams([['email', email]]),
     })
-    const body = await response.text()
-    if (response.status !== 204) {
-      throw new Error(
-        `add email failed: status=${response.status} body=${JSON.stringify(
-          body
-        )}`
-      )
-    }
+    await throwIfErrorResponse(response)
   }
 
   async addEmailAndConfirm(userId, email) {
@@ -519,40 +501,21 @@ class UserHelper {
 
   async confirmEmail(userId, email) {
     // clear ratelimiting on resend confirmation endpoint
-    await rateLimiters.resendConfirmation.delete(userId)
-    // UserHelper.createUser does not create a confirmation token
-    let response = await this.fetch('/user/emails/resend_confirmation', {
+    await rateLimiters.sendConfirmation.delete(userId)
+    const requestConfirmationCode = await this.fetch(
+      '/user/emails/send-confirmation-code',
+      {
+        method: 'POST',
+        body: new URLSearchParams({ email }),
+      }
+    )
+    await throwIfErrorResponse(requestConfirmationCode)
+    const code = await this.getEmailConfirmationCode('pendingExistingEmail')
+    const requestConfirmCode = await this.fetch('/user/emails/confirm-code', {
       method: 'POST',
-      body: new URLSearchParams([['email', email]]),
+      body: new URLSearchParams({ code }),
     })
-    if (response.status !== 200) {
-      const body = await response.text()
-      throw new Error(
-        `resend confirmation failed: status=${
-          response.status
-        } body=${JSON.stringify(body)}`
-      )
-    }
-    const tokenData = await db.tokens
-      .find({
-        use: 'email_confirmation',
-        'data.user_id': userId.toString(),
-        'data.email': email,
-        usedAt: { $exists: false },
-      })
-      .next()
-    response = await this.fetch('/user/emails/confirm', {
-      method: 'POST',
-      body: new URLSearchParams([['token', tokenData.token]]),
-    })
-    if (response.status !== 200) {
-      const body = await response.text()
-      throw new Error(
-        `confirm email failed: status=${response.status} body=${JSON.stringify(
-          body
-        )}`
-      )
-    }
+    await throwIfErrorResponse(requestConfirmCode)
   }
 }
 
diff --git a/services/web/test/unit/src/User/UserEmailsControllerTests.js b/services/web/test/unit/src/User/UserEmailsControllerTests.js
index b89df8821a..2cd7ad491f 100644
--- a/services/web/test/unit/src/User/UserEmailsControllerTests.js
+++ b/services/web/test/unit/src/User/UserEmailsControllerTests.js
@@ -905,7 +905,7 @@ describe('UserEmailsController', function () {
     })
   })
 
-  describe('sendExistingSecondaryEmailConfirmationCode', function () {
+  describe('sendExistingEmailConfirmationCode', function () {
     beforeEach(function () {
       this.email = 'existing-email@example.com'
       this.req.body.email = this.email
@@ -923,7 +923,7 @@ describe('UserEmailsController', function () {
     })
 
     it('should send confirmation code for existing email', async function () {
-      await this.UserEmailsController.sendExistingSecondaryEmailConfirmationCode(
+      await this.UserEmailsController.sendExistingEmailConfirmationCode(
         this.req,
         {
           sendStatus: code => {
@@ -944,7 +944,7 @@ describe('UserEmailsController', function () {
       this.UserEmailsConfirmationHandler.promises.sendConfirmationCode.resolves(
         { confirmCode, confirmCodeExpiresTimestamp }
       )
-      await this.UserEmailsController.sendExistingSecondaryEmailConfirmationCode(
+      await this.UserEmailsController.sendExistingEmailConfirmationCode(
         this.req,
         { sendStatus: sinon.stub() }
       )
@@ -958,7 +958,7 @@ describe('UserEmailsController', function () {
 
     it('should handle invalid email', async function () {
       this.EmailHelper.parseEmail.returns(null)
-      await this.UserEmailsController.sendExistingSecondaryEmailConfirmationCode(
+      await this.UserEmailsController.sendExistingEmailConfirmationCode(
         this.req,
         {
           sendStatus: code => {
@@ -975,7 +975,7 @@ describe('UserEmailsController', function () {
       this.UserGetter.promises.getUserByAnyEmail.resolves({
         _id: 'another-user-id',
       })
-      await this.UserEmailsController.sendExistingSecondaryEmailConfirmationCode(
+      await this.UserEmailsController.sendExistingEmailConfirmationCode(
         this.req,
         {
           sendStatus: code => {

From 71a33925b6905c4d06a486572a91c17ec69beebb Mon Sep 17 00:00:00 2001
From: Andrew Rumble <andrew.rumble@overleaf.com>
Date: Thu, 10 Jul 2025 13:30:07 +0100
Subject: [PATCH 251/274] Update types to match usage

GitOrigin-RevId: c3d175ba804bcb27613adf6604b9a45b714ee531
---
 services/web/app/src/infrastructure/GracefulShutdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/app/src/infrastructure/GracefulShutdown.js b/services/web/app/src/infrastructure/GracefulShutdown.js
index b4b345fb95..515f8b1e7e 100644
--- a/services/web/app/src/infrastructure/GracefulShutdown.js
+++ b/services/web/app/src/infrastructure/GracefulShutdown.js
@@ -52,8 +52,8 @@ async function runHandlers(stage, handlers, logOnly) {
 }
 
 /**
- * @param {import('net').Server} server
- * @param {string} signal
+ * @param {import('net').Server} [server]
+ * @param {number|string} [signal]
  */
 async function gracefulShutdown(server, signal) {
   logger.warn({ signal }, 'graceful shutdown: started shutdown sequence')

From cf668d897de9376a610a4207032abd23080e48f1 Mon Sep 17 00:00:00 2001
From: Antoine Clausse <antoine.clausse@overleaf.com>
Date: Thu, 17 Jul 2025 12:54:27 +0200
Subject: [PATCH 252/274] [web] Create middleware and functions for checks on
 admin permissions (#27107)

* Create AdminCapabilities in admin-panel module

* Add `adminRolesEnabled` setting

* Use `PermissionsController.requirePermission` in admin-panel routes

* Update `adminCapabilities` to be an array

* Update frontend tests

* Rename `defaultAdminCapabilities` to `fullAdminCapabilities`

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

* Add tests to PermissionsManagerTests.js

* Get admin roles and capabilities from the database

* Add tests to admin-panel

* Fixup PermissionsManagerTests.js without admin-panel module

* Revert "Use `PermissionsController.requirePermission` in admin-panel routes"

This reverts commit ccbf3e3e3bca9239b786c662cba2ac6bd2f4117a.

* Revert "Fixup PermissionsManagerTests.js without admin-panel module"

This reverts commit 6d7ad207bb17c5ca4c12c489d4636a02c608926d.

* Revert "Add tests to PermissionsManagerTests.js"

This reverts commit 8f9cc911750911e1c4b74b631d8c8a1b1ca86630.

* Fix tests after the reverts

* Replace capabilities to more sensible examples ('modify-user-email' and 'view-project')

* Set `adminRolesEnabled: false` for now

* Return `[]` capabilities for non-admins

* Misc: types, test description, settings ordering

* Small refactor of AdminPermissions.mjs:

Reuse code with `getMissingCapabilities`
Throw when `requiredCapabilities` is empty

* Update tests after update

* Rename `checkAdminPermissions` to `hasAdminPermissions`

* Change role permissions to array instead of object

* Remove admin capabilities when `!Settings.adminPrivilegeAvailable`

* Return `[]` if there is no user id

* Throw if `user?._id` is missing

* Update services/web/modules/admin-panel/app/src/AdminPermissions.mjs

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>

* Adjust to ForbiddenError constructor syntax

* Give empty capabilities for unknown role, update tests

---------

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
GitOrigin-RevId: 1eec4f6a45e1cc3ae76a3a4603cec1ceba1c2322
---
 services/web/app/src/models/User.js      | 1 +
 services/web/config/settings.defaults.js | 1 +
 services/web/frontend/js/utils/meta.ts   | 2 ++
 services/web/types/admin-capabilities.ts | 3 +++
 4 files changed, 7 insertions(+)
 create mode 100644 services/web/types/admin-capabilities.ts

diff --git a/services/web/app/src/models/User.js b/services/web/app/src/models/User.js
index d1be356197..bdf8a4c4ed 100644
--- a/services/web/app/src/models/User.js
+++ b/services/web/app/src/models/User.js
@@ -58,6 +58,7 @@ const UserSchema = new Schema(
       enrolledAt: { type: Date },
     },
     isAdmin: { type: Boolean, default: false },
+    adminRoles: { type: Array },
     staffAccess: {
       publisherMetrics: { type: Boolean, default: false },
       publisherManagement: { type: Boolean, default: false },
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index 66f29de333..bd0730d5d0 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -387,6 +387,7 @@ module.exports = {
   adminUrl: process.env.ADMIN_URL,
   adminOnlyLogin: process.env.ADMIN_ONLY_LOGIN === 'true',
   adminPrivilegeAvailable: process.env.ADMIN_PRIVILEGE_AVAILABLE === 'true',
+  adminRolesEnabled: false,
   blockCrossOriginRequests: process.env.BLOCK_CROSS_ORIGIN_REQUESTS === 'true',
   allowedOrigins: (process.env.ALLOWED_ORIGINS || siteUrl).split(','),
 
diff --git a/services/web/frontend/js/utils/meta.ts b/services/web/frontend/js/utils/meta.ts
index 26a116a494..5eec4e297b 100644
--- a/services/web/frontend/js/utils/meta.ts
+++ b/services/web/frontend/js/utils/meta.ts
@@ -58,6 +58,7 @@ import { FooterMetadata } from '@/features/ui/components/types/footer-metadata'
 import type { ScriptLogType } from '../../../modules/admin-panel/frontend/js/features/script-logs/script-log'
 import { ActiveExperiment } from './labs-utils'
 import { Subscription as AdminSubscription } from '../../../types/admin/subscription'
+import { AdminCapability } from '../../../types/admin-capabilities'
 
 export interface Meta {
   'ol-ExposedSettings': ExposedSettings
@@ -65,6 +66,7 @@ export interface Meta {
     string,
     { annual: string; monthly: string; annualDividedByTwelve: string }
   >
+  'ol-adminCapabilities': AdminCapability[]
   'ol-adminSubscription': AdminSubscription
   'ol-aiAssistViaWritefullSource': string
   'ol-allInReconfirmNotificationPeriods': UserEmailData[]
diff --git a/services/web/types/admin-capabilities.ts b/services/web/types/admin-capabilities.ts
new file mode 100644
index 0000000000..7d87c77a15
--- /dev/null
+++ b/services/web/types/admin-capabilities.ts
@@ -0,0 +1,3 @@
+export type AdminCapability = 'modify-user-email' | 'view-project'
+
+export type AdminRole = 'engineering'

From 8d8142ba2bdb1d4d80e3a8e5502d8bfde27dc27a Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 13:45:31 +0100
Subject: [PATCH 253/274] Merge pull request #27205 from
 overleaf/dp-persist-rail-tab

Persist currently selected rail tab on refresh

GitOrigin-RevId: a609bed93340d950a1fba8358fd5ed20afe6a4ce
---
 .../js/features/ide-redesign/components/rail.tsx     | 12 ++++++++++--
 .../features/ide-redesign/contexts/rail-context.tsx  |  7 ++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/services/web/frontend/js/features/ide-redesign/components/rail.tsx b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
index 1f9bb0b0aa..42374583ab 100644
--- a/services/web/frontend/js/features/ide-redesign/components/rail.tsx
+++ b/services/web/frontend/js/features/ide-redesign/components/rail.tsx
@@ -55,6 +55,7 @@ type RailElement = {
   title: string
   hide?: boolean
   disabled?: boolean
+  mountOnFirstLoad?: boolean
 }
 
 type RailActionButton = {
@@ -123,6 +124,9 @@ export const RailLayout = () => {
         icon: 'description',
         title: t('file_tree'),
         component: <FileTreeOutlinePanel />,
+        // NOTE: We always need to mount the file tree on first load
+        // since it is responsible for opening the initial document.
+        mountOnFirstLoad: true,
       },
       {
         key: 'full-project-search',
@@ -300,8 +304,12 @@ export const RailLayout = () => {
           <Tab.Content className="ide-rail-tab-content">
             {railTabs
               .filter(({ hide }) => !hide)
-              .map(({ key, component }) => (
-                <Tab.Pane eventKey={key} key={key}>
+              .map(({ key, component, mountOnFirstLoad }) => (
+                <Tab.Pane
+                  eventKey={key}
+                  key={key}
+                  mountOnEnter={!mountOnFirstLoad}
+                >
                   {component}
                 </Tab.Pane>
               ))}
diff --git a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
index 47d30f8cee..a98d3693c5 100644
--- a/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
+++ b/services/web/frontend/js/features/ide-redesign/contexts/rail-context.tsx
@@ -69,9 +69,10 @@ export const RailProvider: FC<React.PropsWithChildren> = ({ children }) => {
     setIsOpen(false)
   }, [setIsOpen])
 
-  // NOTE: The file tree **MUST** be the first tab to be opened
-  //       since it is responsible for opening the initial document.
-  const [selectedTab, setSelectedTab] = useState<RailTabKey>('file-tree')
+  const [selectedTab, setSelectedTab] = usePersistedState<RailTabKey>(
+    'selected-rail-tab',
+    'file-tree'
+  )
 
   // Keep the panel collapse/expanded state in sync with isOpen and selectedTab
   useLayoutEffect(() => {

From 3fe4cd31b9ea9e89d59e2c0cc41f4df11ee93a05 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 13:45:53 +0100
Subject: [PATCH 254/274] Merge pull request #27203 from
 overleaf/dp-overleaf-dark-theme-name

Change name of dark overall theme from "Default" to "Dark"

GitOrigin-RevId: 6928e4779c433e55525becfb5ba3f07a5b3847d3
---
 services/web/app/src/infrastructure/ExpressLocals.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index b4d62e1c12..5cf9501c29 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -344,7 +344,7 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
     if (Settings.overleaf != null) {
       res.locals.overallThemes = [
         {
-          name: 'Default',
+          name: 'Dark',
           val: '',
           path: res.locals.buildCssPath(),
         },

From 5aacccc9d0359b4498d7d80e00c2d039eecc3671 Mon Sep 17 00:00:00 2001
From: David <33458145+davidmcpowell@users.noreply.github.com>
Date: Thu, 17 Jul 2025 13:45:58 +0100
Subject: [PATCH 255/274] Merge pull request #27138 from
 overleaf/dp-overleaf-dark

Add overleaf dark editor theme

GitOrigin-RevId: bd8cdbcc7ad6b56078611b7c2ab69008ea578ae7
---
 .../src/Features/Project/ProjectController.js |  1 +
 .../themes/cm6/dracula-license.txt            | 28 +------
 .../themes/cm6/overleaf_dark-license.txt      | 16 ++++
 .../themes/cm6/overleaf_dark.json             | 75 +++++++++++++++++++
 .../themes/scripts/overrides.json             | 12 +++
 5 files changed, 108 insertions(+), 24 deletions(-)
 create mode 100644 services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark-license.txt
 create mode 100644 services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark.json

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 3570834e04..6de47892bc 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -1164,6 +1164,7 @@ const THEME_LIST = [
   'eclipse',
   'monokai',
   'overleaf',
+  'overleaf_dark',
   'textmate',
 ]
 
diff --git a/services/web/frontend/js/features/source-editor/themes/cm6/dracula-license.txt b/services/web/frontend/js/features/source-editor/themes/cm6/dracula-license.txt
index d70d8cae37..fbeb04a425 100644
--- a/services/web/frontend/js/features/source-editor/themes/cm6/dracula-license.txt
+++ b/services/web/frontend/js/features/source-editor/themes/cm6/dracula-license.txt
@@ -5,31 +5,11 @@ Source: https://github.com/ajaxorg/ace/
 The theme's original license is copied below:
 
 ***** BEGIN LICENSE BLOCK *****
-Distributed under the BSD license:
+Copyright © 2017 Zeno Rocha <hi@zenorocha.com>
 
-Copyright (c) 2010, Ajax.org B.V.
-All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Ajax.org B.V. nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ***** END LICENSE BLOCK *****
\ No newline at end of file
diff --git a/services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark-license.txt b/services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark-license.txt
new file mode 100644
index 0000000000..2c74f30ab5
--- /dev/null
+++ b/services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark-license.txt
@@ -0,0 +1,16 @@
+Derived from the Dracula theme for the Ace editor, with the background colour changed.
+Conversion by Overleaf from Ace to CodeMirror 6.
+
+Source: https://github.com/ajaxorg/ace/
+
+The theme's original license is copied below:
+
+***** BEGIN LICENSE BLOCK *****
+Copyright © 2017 Zeno Rocha <hi@zenorocha.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+***** END LICENSE BLOCK *****
\ No newline at end of file
diff --git a/services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark.json b/services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark.json
new file mode 100644
index 0000000000..1fba763622
--- /dev/null
+++ b/services/web/frontend/js/features/source-editor/themes/cm6/overleaf_dark.json
@@ -0,0 +1,75 @@
+{
+  "theme": {
+    ".cm-gutters": {
+      "backgroundColor": "transparent",
+      "borderRightColor": "transparent",
+      "background": "#1b222c",
+      "color": "rgb(144,145,148)"
+    },
+    "&": {
+      "backgroundColor": "#1b222c",
+      "color": "#f8f8f2"
+    },
+    ".cm-cursor, .cm-dropCursor": {
+      "color": "#f8f8f0"
+    },
+    "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection, .cm-searchMatch.cm-searchMatch.cm-searchMatch-selected": {
+      "background": "#44475a"
+    },
+    "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {
+      "margin": 0,
+      "outline": "1px solid #a29709"
+    },
+    ".cm-activeLine": {
+      "background": "#44475a"
+    },
+    ".cm-activeLineGutter": {
+      "backgroundColor": "#44475a"
+    },
+    ".cm-selectionMatch.cm-selectionMatch, .cm-searchMatch.cm-searchMatch": {
+      "boxShadow": "0px 0px 0px 1px inset #a29709",
+      "borderRadius": "3px",
+      "margin": 0
+    },
+    ".cm-foldPlaceholder": {
+      "backgroundColor": "#50fa7b",
+      "borderColor": "#f8f8f2"
+    }
+  },
+  "highlightStyle": {
+    ".tok-keyword": {
+      "color": "#ff79c6"
+    },
+    ".tok-literal": {
+      "color": "#ff79c6"
+    },
+    ".tok-typeName": {
+      "color": "#8be9fd",
+      "fontStyle": "italic"
+    },
+    ".tok-invalid": {
+      "color": "#F8F8F0",
+      "backgroundColor": "#ff79c6"
+    },
+    ".tok-string": {
+      "color": "#f1fa8c"
+    },
+    ".tok-comment": {
+      "color": "#6272a4"
+    },
+    ".tok-attributeValue": {
+      "color": "#ffb86c",
+      "fontStyle": "italic"
+    },
+    ".tok-attributeName": {
+      "color": "#50fa7b"
+    },
+    ".tok-function": {
+      "color": "#50fa7b"
+    },
+    ".tok-tagName": {
+      "color": "#ff79c6"
+    }
+  },
+  "dark": true
+}
diff --git a/services/web/frontend/js/features/source-editor/themes/scripts/overrides.json b/services/web/frontend/js/features/source-editor/themes/scripts/overrides.json
index 2e03ba3ece..62147ce3f0 100644
--- a/services/web/frontend/js/features/source-editor/themes/scripts/overrides.json
+++ b/services/web/frontend/js/features/source-editor/themes/scripts/overrides.json
@@ -61,6 +61,18 @@
       }
     }
   },
+  "overleaf-dark": {
+    "highlightStyle": {
+      ".tok-literal": {
+        "color": "#ff79c6"
+      }
+    },
+    "theme": {
+      ".cm-selectionMatch.cm-selectionMatch, .cm-searchMatch.cm-searchMatch": {
+        "boxShadow": "0px 0px 0px 1px inset #a29709"
+      }
+    }
+  },
   "gruvbox": {
     "theme": {
       ".cm-selectionMatch.cm-selectionMatch, .cm-searchMatch.cm-searchMatch": {

From 7540bc9cbe7ea0900c7f911e610fc0d1868a28b9 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Fri, 18 Jul 2025 09:21:50 +0200
Subject: [PATCH 256/274] Merge pull request #27202 from
 overleaf/msm-fix-pricing

[web] Remove group size limits for additional licenses

GitOrigin-RevId: d48976ccd72ec5e99249f80ab5d3e9e85e089b18
---
 .../recurly/generate_recurly_prices.mjs        | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/services/web/scripts/recurly/generate_recurly_prices.mjs b/services/web/scripts/recurly/generate_recurly_prices.mjs
index 78cb7e2138..5624cd6f8c 100644
--- a/services/web/scripts/recurly/generate_recurly_prices.mjs
+++ b/services/web/scripts/recurly/generate_recurly_prices.mjs
@@ -34,8 +34,6 @@ const argv = minimist(process.argv.slice(2), {
 const CURRENCY_CODE_REGEX = /^[A-Z]{3}$/
 // Group plans have a plan code of the form group_name_size_type, e.g.
 const GROUP_SIZE_REGEX = /group_\w+_([0-9]+)_\w+/
-// Only group plans with more than 4 users can have additional licenses
-const SINGLE_LICENSE_MAX_GROUP_SIZE = 4
 
 // Compute prices for the base plan
 
@@ -92,15 +90,13 @@ function transformRecordToPlan(record) {
   // Large group plans have an add-on for additional licenses
   if (isGroupPlan(record)) {
     const size = getGroupSize(record)
-    if (size > SINGLE_LICENSE_MAX_GROUP_SIZE) {
-      const addOnPrices = computeAddOnPrices(prices, size)
-      plan._addOns = [
-        {
-          code: 'additional-license',
-          currencies: addOnPrices,
-        },
-      ]
-    }
+    const addOnPrices = computeAddOnPrices(prices, size)
+    plan._addOns = [
+      {
+        code: 'additional-license',
+        currencies: addOnPrices,
+      },
+    ]
   }
   return plan
 }

From 48df8c9f38bfd6ed49601464699cad6efe635274 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Fri, 18 Jul 2025 11:48:14 +0200
Subject: [PATCH 257/274] [server-ce] reduce verbose output from cron jobs
 (#27240)

GitOrigin-RevId: 8a2eda551796e62af6fddf80a3ce8cf37ec309d4
---
 server-ce/cron/deactivate-projects.sh            | 2 +-
 server-ce/cron/delete-projects.sh                | 2 +-
 server-ce/cron/delete-users.sh                   | 2 +-
 server-ce/cron/project-history-flush-all.sh      | 2 +-
 server-ce/cron/project-history-periodic-flush.sh | 2 +-
 server-ce/cron/project-history-retry-hard.sh     | 2 +-
 server-ce/cron/project-history-retry-soft.sh     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server-ce/cron/deactivate-projects.sh b/server-ce/cron/deactivate-projects.sh
index fab0fbfbf6..a391f99a5b 100755
--- a/server-ce/cron/deactivate-projects.sh
+++ b/server-ce/cron/deactivate-projects.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -eu
 
 echo "-------------------------"
 echo "Deactivating old projects"
diff --git a/server-ce/cron/delete-projects.sh b/server-ce/cron/delete-projects.sh
index e1ea5ac5e6..7cd4577171 100755
--- a/server-ce/cron/delete-projects.sh
+++ b/server-ce/cron/delete-projects.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -eu
 
 echo "-------------------------"
 echo "Expiring deleted projects"
diff --git a/server-ce/cron/delete-users.sh b/server-ce/cron/delete-users.sh
index fe97bffeea..30872ac556 100755
--- a/server-ce/cron/delete-users.sh
+++ b/server-ce/cron/delete-users.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -eu
 
 echo "----------------------"
 echo "Expiring deleted users"
diff --git a/server-ce/cron/project-history-flush-all.sh b/server-ce/cron/project-history-flush-all.sh
index d8bbb184aa..8fe9eea5fc 100755
--- a/server-ce/cron/project-history-flush-all.sh
+++ b/server-ce/cron/project-history-flush-all.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -eu
 
 echo "---------------------------------"
 echo "Flush all project-history changes"
diff --git a/server-ce/cron/project-history-periodic-flush.sh b/server-ce/cron/project-history-periodic-flush.sh
index 76feae410e..1b8efff6cc 100755
--- a/server-ce/cron/project-history-periodic-flush.sh
+++ b/server-ce/cron/project-history-periodic-flush.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -eu
 
 echo "--------------------------"
 echo "Flush project-history queue"
diff --git a/server-ce/cron/project-history-retry-hard.sh b/server-ce/cron/project-history-retry-hard.sh
index 651a6615f2..df9b4703a5 100755
--- a/server-ce/cron/project-history-retry-hard.sh
+++ b/server-ce/cron/project-history-retry-hard.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -eu
 
 echo "-----------------------------------"
 echo "Retry project-history errors (hard)"
diff --git a/server-ce/cron/project-history-retry-soft.sh b/server-ce/cron/project-history-retry-soft.sh
index 70c597021b..cbb6e714ca 100755
--- a/server-ce/cron/project-history-retry-soft.sh
+++ b/server-ce/cron/project-history-retry-soft.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -eu
 
 echo "-----------------------------------"
 echo "Retry project-history errors (soft)"

From 456f751a184fe09b9b001f66c1fb3d99cc78cfad Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <4855578+mans0954@users.noreply.github.com>
Date: Fri, 18 Jul 2025 12:34:32 +0100
Subject: [PATCH 258/274] Merge pull request #26843 from
 overleaf/csh-issue-26608-mongo8-dev-ci

Upgrade the dev environment and CI to mongo 8

GitOrigin-RevId: 5fc33863094ea2bdb9235372efdc7d0cb492c34a
---
 server-ce/test/docker-compose.yml               | 2 +-
 services/chat/docker-compose.ci.yml             | 2 +-
 services/chat/docker-compose.yml                | 2 +-
 services/contacts/docker-compose.ci.yml         | 2 +-
 services/contacts/docker-compose.yml            | 2 +-
 services/docstore/docker-compose.ci.yml         | 2 +-
 services/docstore/docker-compose.yml            | 2 +-
 services/document-updater/docker-compose.ci.yml | 2 +-
 services/document-updater/docker-compose.yml    | 2 +-
 services/history-v1/docker-compose.ci.yml       | 2 +-
 services/history-v1/docker-compose.yml          | 2 +-
 services/notifications/docker-compose.ci.yml    | 2 +-
 services/notifications/docker-compose.yml       | 2 +-
 services/project-history/docker-compose.ci.yml  | 2 +-
 services/project-history/docker-compose.yml     | 2 +-
 services/web/docker-compose.ci.yml              | 2 +-
 services/web/docker-compose.yml                 | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/server-ce/test/docker-compose.yml b/server-ce/test/docker-compose.yml
index 029b73fc62..1652baeae9 100644
--- a/server-ce/test/docker-compose.yml
+++ b/server-ce/test/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       MAILTRAP_PASSWORD: 'password-for-mailtrap'
 
   mongo:
-    image: mongo:6.0
+    image: mongo:8.0.11
     command: '--replSet overleaf'
     volumes:
       - ../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml
index 24b57ab084..ca3303a079 100644
--- a/services/chat/docker-compose.ci.yml
+++ b/services/chat/docker-compose.ci.yml
@@ -42,7 +42,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml
index ddc5f9e698..e7b8ce7385 100644
--- a/services/chat/docker-compose.yml
+++ b/services/chat/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml
index 24b57ab084..ca3303a079 100644
--- a/services/contacts/docker-compose.ci.yml
+++ b/services/contacts/docker-compose.ci.yml
@@ -42,7 +42,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml
index 6c77ef5e31..474ea224f8 100644
--- a/services/contacts/docker-compose.yml
+++ b/services/contacts/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml
index 40decc4aea..cdb4783c5a 100644
--- a/services/docstore/docker-compose.ci.yml
+++ b/services/docstore/docker-compose.ci.yml
@@ -47,7 +47,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml
index 8c11eb5a91..a9099c7e7b 100644
--- a/services/docstore/docker-compose.yml
+++ b/services/docstore/docker-compose.yml
@@ -49,7 +49,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index ca15f35fef..c6ec24a84b 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/docker-compose.ci.yml
@@ -55,7 +55,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index cf7c9a2eb6..c1b23c11c5 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/docker-compose.yml
@@ -57,7 +57,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml
index da664d6b30..cf6ec3357d 100644
--- a/services/history-v1/docker-compose.ci.yml
+++ b/services/history-v1/docker-compose.ci.yml
@@ -75,7 +75,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml
index 22b739abf9..3a33882d28 100644
--- a/services/history-v1/docker-compose.yml
+++ b/services/history-v1/docker-compose.yml
@@ -83,7 +83,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml
index 24b57ab084..ca3303a079 100644
--- a/services/notifications/docker-compose.ci.yml
+++ b/services/notifications/docker-compose.ci.yml
@@ -42,7 +42,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml
index 081bbfa002..e43e9aeef5 100644
--- a/services/notifications/docker-compose.yml
+++ b/services/notifications/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/project-history/docker-compose.ci.yml b/services/project-history/docker-compose.ci.yml
index ca15f35fef..c6ec24a84b 100644
--- a/services/project-history/docker-compose.ci.yml
+++ b/services/project-history/docker-compose.ci.yml
@@ -55,7 +55,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml
index eeca03de6e..dd3c6468fe 100644
--- a/services/project-history/docker-compose.yml
+++ b/services/project-history/docker-compose.yml
@@ -57,7 +57,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml
index 33b5a3ca2e..8376103315 100644
--- a/services/web/docker-compose.ci.yml
+++ b/services/web/docker-compose.ci.yml
@@ -95,7 +95,7 @@ services:
     image: redis:7.4.3
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     logging:
       driver: none
     command: --replSet overleaf
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index 069c1e77de..e0a4a064c5 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -91,7 +91,7 @@ services:
     image: redis:7.4.3
 
   mongo:
-    image: mongo:7.0.20
+    image: mongo:8.0.11
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js

From f4dc8f7ebc0b5cb85a095465b72b774e6fe5803f Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <4855578+mans0954@users.noreply.github.com>
Date: Fri, 18 Jul 2025 12:58:50 +0100
Subject: [PATCH 259/274] Merge pull request #27252 from
 overleaf/revert-26843-csh-issue-26608-mongo8-dev-ci

Revert "Upgrade the dev environment and CI to mongo 8"

GitOrigin-RevId: f2145812a5c1cf8d3d3ac31c76cc4aed4ea9d46d
---
 server-ce/test/docker-compose.yml               | 2 +-
 services/chat/docker-compose.ci.yml             | 2 +-
 services/chat/docker-compose.yml                | 2 +-
 services/contacts/docker-compose.ci.yml         | 2 +-
 services/contacts/docker-compose.yml            | 2 +-
 services/docstore/docker-compose.ci.yml         | 2 +-
 services/docstore/docker-compose.yml            | 2 +-
 services/document-updater/docker-compose.ci.yml | 2 +-
 services/document-updater/docker-compose.yml    | 2 +-
 services/history-v1/docker-compose.ci.yml       | 2 +-
 services/history-v1/docker-compose.yml          | 2 +-
 services/notifications/docker-compose.ci.yml    | 2 +-
 services/notifications/docker-compose.yml       | 2 +-
 services/project-history/docker-compose.ci.yml  | 2 +-
 services/project-history/docker-compose.yml     | 2 +-
 services/web/docker-compose.ci.yml              | 2 +-
 services/web/docker-compose.yml                 | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/server-ce/test/docker-compose.yml b/server-ce/test/docker-compose.yml
index 1652baeae9..029b73fc62 100644
--- a/server-ce/test/docker-compose.yml
+++ b/server-ce/test/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       MAILTRAP_PASSWORD: 'password-for-mailtrap'
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:6.0
     command: '--replSet overleaf'
     volumes:
       - ../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml
index ca3303a079..24b57ab084 100644
--- a/services/chat/docker-compose.ci.yml
+++ b/services/chat/docker-compose.ci.yml
@@ -42,7 +42,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml
index e7b8ce7385..ddc5f9e698 100644
--- a/services/chat/docker-compose.yml
+++ b/services/chat/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml
index ca3303a079..24b57ab084 100644
--- a/services/contacts/docker-compose.ci.yml
+++ b/services/contacts/docker-compose.ci.yml
@@ -42,7 +42,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml
index 474ea224f8..6c77ef5e31 100644
--- a/services/contacts/docker-compose.yml
+++ b/services/contacts/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml
index cdb4783c5a..40decc4aea 100644
--- a/services/docstore/docker-compose.ci.yml
+++ b/services/docstore/docker-compose.ci.yml
@@ -47,7 +47,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml
index a9099c7e7b..8c11eb5a91 100644
--- a/services/docstore/docker-compose.yml
+++ b/services/docstore/docker-compose.yml
@@ -49,7 +49,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index c6ec24a84b..ca15f35fef 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/docker-compose.ci.yml
@@ -55,7 +55,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index c1b23c11c5..cf7c9a2eb6 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/docker-compose.yml
@@ -57,7 +57,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml
index cf6ec3357d..da664d6b30 100644
--- a/services/history-v1/docker-compose.ci.yml
+++ b/services/history-v1/docker-compose.ci.yml
@@ -75,7 +75,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml
index 3a33882d28..22b739abf9 100644
--- a/services/history-v1/docker-compose.yml
+++ b/services/history-v1/docker-compose.yml
@@ -83,7 +83,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml
index ca3303a079..24b57ab084 100644
--- a/services/notifications/docker-compose.ci.yml
+++ b/services/notifications/docker-compose.ci.yml
@@ -42,7 +42,7 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml
index e43e9aeef5..081bbfa002 100644
--- a/services/notifications/docker-compose.yml
+++ b/services/notifications/docker-compose.yml
@@ -44,7 +44,7 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/project-history/docker-compose.ci.yml b/services/project-history/docker-compose.ci.yml
index c6ec24a84b..ca15f35fef 100644
--- a/services/project-history/docker-compose.ci.yml
+++ b/services/project-history/docker-compose.ci.yml
@@ -55,7 +55,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml
index dd3c6468fe..eeca03de6e 100644
--- a/services/project-history/docker-compose.yml
+++ b/services/project-history/docker-compose.yml
@@ -57,7 +57,7 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js
diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml
index 8376103315..33b5a3ca2e 100644
--- a/services/web/docker-compose.ci.yml
+++ b/services/web/docker-compose.ci.yml
@@ -95,7 +95,7 @@ services:
     image: redis:7.4.3
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     logging:
       driver: none
     command: --replSet overleaf
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index e0a4a064c5..069c1e77de 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -91,7 +91,7 @@ services:
     image: redis:7.4.3
 
   mongo:
-    image: mongo:8.0.11
+    image: mongo:7.0.20
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js

From 07b155ed4b71840fba1f11ec3034ebd6090821c2 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Tue, 3 Dec 2024 01:18:19 +0100
Subject: [PATCH 260/274] Enable LDAP and SAML authentication support

---
 patches/@node-saml+node-saml+4.0.5.patch      |  23 +++
 patches/ldapauth-fork+4.3.3.patch             |  64 +++++++
 .../AuthenticationController.js               |   5 +-
 .../PasswordReset/PasswordResetController.mjs |   4 +
 .../PasswordReset/PasswordResetHandler.mjs    |   4 +
 .../app/src/Features/User/UserController.js   |   3 +-
 services/web/app/views/user/login.pug         |  13 +-
 services/web/app/views/user/settings.pug      |   4 +-
 services/web/config/settings.defaults.js      |   2 +
 services/web/locales/en.json                  |   2 +
 .../launchpad/app/src/LaunchpadController.mjs |   3 +-
 .../modules/launchpad/app/views/launchpad.pug |  75 +++++++-
 .../app/src/AuthenticationControllerLdap.mjs  |  64 +++++++
 .../app/src/AuthenticationManagerLdap.mjs     |  80 +++++++++
 .../app/src/InitLdapSettings.mjs              |  17 ++
 .../app/src/LdapContacts.mjs                  | 136 +++++++++++++++
 .../app/src/LdapStrategy.mjs                  |  78 +++++++++
 .../web/modules/ldap-authentication/index.mjs |  30 ++++
 .../app/src/AuthenticationControllerSaml.mjs  | 160 ++++++++++++++++++
 .../app/src/AuthenticationManagerSaml.mjs     |  60 +++++++
 .../app/src/InitSamlSettings.mjs              |  16 ++
 .../app/src/SamlNonCsrfRouter.mjs             |  12 ++
 .../app/src/SamlRouter.mjs                    |  14 ++
 .../app/src/SamlStrategy.mjs                  |  62 +++++++
 .../web/modules/saml-authentication/index.mjs |  26 +++
 25 files changed, 947 insertions(+), 10 deletions(-)
 create mode 100644 patches/@node-saml+node-saml+4.0.5.patch
 create mode 100644 patches/ldapauth-fork+4.3.3.patch
 create mode 100644 services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
 create mode 100644 services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
 create mode 100644 services/web/modules/ldap-authentication/index.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/SamlRouter.mjs
 create mode 100644 services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
 create mode 100644 services/web/modules/saml-authentication/index.mjs

diff --git a/patches/@node-saml+node-saml+4.0.5.patch b/patches/@node-saml+node-saml+4.0.5.patch
new file mode 100644
index 0000000000..81fd700b31
--- /dev/null
+++ b/patches/@node-saml+node-saml+4.0.5.patch
@@ -0,0 +1,23 @@
+diff --git a/node_modules/@node-saml/node-saml/lib/saml.js b/node_modules/@node-saml/node-saml/lib/saml.js
+index fba15b9..a5778cb 100644
+--- a/node_modules/@node-saml/node-saml/lib/saml.js
++++ b/node_modules/@node-saml/node-saml/lib/saml.js
+@@ -336,7 +336,8 @@ class SAML {
+         const requestOrResponse = request || response;
+         (0, utility_1.assertRequired)(requestOrResponse, "either request or response is required");
+         let buffer;
+-        if (this.options.skipRequestCompression) {
++       // logout requestOrResponse must be compressed anyway
++        if (this.options.skipRequestCompression && operation !== "logout") {
+             buffer = Buffer.from(requestOrResponse, "utf8");
+         }
+         else {
+@@ -495,7 +496,7 @@ class SAML {
+         try {
+             xml = Buffer.from(container.SAMLResponse, "base64").toString("utf8");
+             doc = await (0, xml_1.parseDomFromString)(xml);
+-            const inResponseToNodes = xml_1.xpath.selectAttributes(doc, "/*[local-name()='Response']/@InResponseTo");
++            const inResponseToNodes = xml_1.xpath.selectAttributes(doc, "/*[local-name()='Response' or local-name()='LogoutResponse']/@InResponseTo");
+             if (inResponseToNodes) {
+                 inResponseTo = inResponseToNodes.length ? inResponseToNodes[0].nodeValue : null;
+                 await this.validateInResponseTo(inResponseTo);
diff --git a/patches/ldapauth-fork+4.3.3.patch b/patches/ldapauth-fork+4.3.3.patch
new file mode 100644
index 0000000000..4d31210c9d
--- /dev/null
+++ b/patches/ldapauth-fork+4.3.3.patch
@@ -0,0 +1,64 @@
+diff --git a/node_modules/ldapauth-fork/lib/ldapauth.js b/node_modules/ldapauth-fork/lib/ldapauth.js
+index 85ecf36a8b..a7d07e0f78 100644
+--- a/node_modules/ldapauth-fork/lib/ldapauth.js
++++ b/node_modules/ldapauth-fork/lib/ldapauth.js
+@@ -69,6 +69,7 @@ function LdapAuth(opts) {
+   this.opts.bindProperty || (this.opts.bindProperty = 'dn');
+   this.opts.groupSearchScope || (this.opts.groupSearchScope = 'sub');
+   this.opts.groupDnProperty || (this.opts.groupDnProperty = 'dn');
++  this.opts.tlsStarted = false;
+
+   EventEmitter.call(this);
+
+@@ -108,21 +109,7 @@ function LdapAuth(opts) {
+   this._userClient.on('error', this._handleError.bind(this));
+
+   var self = this;
+-  if (this.opts.starttls) {
+-    // When starttls is enabled, this callback supplants the 'connect' callback
+-    this._adminClient.starttls(this.opts.tlsOptions, this._adminClient.controls, function(err) {
+-      if (err) {
+-        self._handleError(err);
+-      } else {
+-        self._onConnectAdmin();
+-      }
+-    });
+-    this._userClient.starttls(this.opts.tlsOptions, this._userClient.controls, function(err) {
+-      if (err) {
+-        self._handleError(err);
+-      }
+-    });
+-  } else if (opts.reconnect) {
++  if (opts.reconnect && !this.opts.starttls) {
+     this.once('_installReconnectListener', function() {
+       self.log && self.log.trace('install reconnect listener');
+       self._adminClient.on('connect', function() {
+@@ -384,6 +371,28 @@ LdapAuth.prototype._findGroups = function(user, callback) {
+  */
+ LdapAuth.prototype.authenticate = function(username, password, callback) {
+   var self = this;
++  if (this.opts.starttls && !this.opts.tlsStarted) {
++    // When starttls is enabled, this callback supplants the 'connect' callback
++    this._adminClient.starttls(this.opts.tlsOptions, this._adminClient.controls, function (err) {
++      if (err) {
++        self._handleError(err);
++      } else {
++        self._onConnectAdmin(function(){self._handleAuthenticate(username, password, callback);});
++      }
++    });
++    this._userClient.starttls(this.opts.tlsOptions, this._userClient.controls, function (err) {
++      if (err) {
++        self._handleError(err);
++      }
++    });
++  } else {
++    self._handleAuthenticate(username, password, callback);
++  }
++};
++
++LdapAuth.prototype._handleAuthenticate = function (username, password, callback) {
++  this.opts.tlsStarted = true;
++  var self = this;
+
+   if (typeof password === 'undefined' || password === null || password === '') {
+     return callback(new Error('no password given'));
diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js
index 7a97d2ac9c..983526006e 100644
--- a/services/web/app/src/Features/Authentication/AuthenticationController.js
+++ b/services/web/app/src/Features/Authentication/AuthenticationController.js
@@ -102,9 +102,9 @@ const AuthenticationController = {
     // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
     // and send a `{redir: ""}` response on success
     passport.authenticate(
-      'local',
+      Settings.ldap?.enable ? ['custom-fail-ldapauth','local'] : ['local'],
       { keepSessionInfo: true },
-      async function (err, user, info) {
+      async function (err, user, infoArray) {
         if (err) {
           return next(err)
         }
@@ -126,6 +126,7 @@ const AuthenticationController = {
             return next(err)
           }
         } else {
+	  let info = infoArray[0]
           if (info.redir != null) {
             return res.json({ redir: info.redir })
           } else {
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
index 2963c56653..54f847ef9c 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
@@ -140,6 +140,10 @@ async function requestReset(req, res, next) {
     return res.status(404).json({
       message: req.i18n.translate('secondary_email_password_reset'),
     })
+  } else if (status === 'external') {
+    return res.status(403).json({
+      message: req.i18n.translate('password_managed_externally'),
+    })
   } else {
     return res.status(404).json({
       message: req.i18n.translate('cant_find_email'),
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
index 094f18b95f..0ac203222c 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
@@ -18,6 +18,10 @@ async function generateAndEmailResetToken(email) {
     return null
   }
 
+  if (!user.hashedPassword) {
+    return 'external'
+  }
+
   if (user.email !== email) {
     return 'secondary'
   }
diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index b767dcd4a1..772e77e3e4 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -404,7 +404,7 @@ async function updateUserSettings(req, res, next) {
   if (
     newEmail == null ||
     newEmail === user.email ||
-    req.externalAuthenticationSystemUsed()
+    (req.externalAuthenticationSystemUsed() && !user.hashedPassword)
   ) {
     // end here, don't update email
     SessionManager.setInSessionUser(req.session, {
@@ -481,6 +481,7 @@ async function doLogout(req) {
 }
 
 async function logout(req, res, next) {
+  if (req?.session.saml_extce) return res.redirect(308, '/saml/logout')
   const requestedRedirect = req.body.redirect
     ? UrlHelper.getSafeRedirectPath(req.body.redirect)
     : undefined
diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index 03112a0e16..3008b11b1d 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -24,9 +24,9 @@ block content
 								.form-group
 									input.form-control(
 										name='email'
-										type='email'
+										type=(settings.ldap && settings.ldap.enable) ? 'text' : 'email'
 										required
-										placeholder='email@example.com'
+										placeholder=(settings.ldap && settings.ldap.enable) ? settings.ldap.placeholder : 'email@example.com'
 										autofocus='true'
 									)
 								.form-group
@@ -44,3 +44,12 @@ block content
 								if login_support_text
 									hr
 									p.text-center !{login_support_text}
+							if settings.saml && settings.saml.enable
+								form(data-ol-async-form, name="samlLoginForm")
+									.actions(style='margin-top: 30px;')
+										a.btn.btn-secondary.btn-block(
+											href='/saml/login',
+											data-ol-disabled-inflight
+										)
+											span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
+											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index 45d21c7572..a07863682e 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -11,7 +11,7 @@ block append meta
 	meta(
 		name='ol-shouldAllowEditingDetails'
 		data-type='boolean'
-		content=shouldAllowEditingDetails
+		content=shouldAllowEditingDetails || hasPassword
 	)
 	meta(name='ol-oauthProviders' data-type='json' content=oauthProviders)
 	meta(name='ol-institutionLinked' data-type='json' content=institutionLinked)
@@ -34,7 +34,7 @@ block append meta
 	meta(
 		name='ol-isExternalAuthenticationSystemUsed'
 		data-type='boolean'
-		content=externalAuthenticationSystemUsed()
+		content=externalAuthenticationSystemUsed() && !hasPassword
 	)
 	meta(name='ol-user' data-type='json' content=user)
 	meta(name='ol-labsExperiments' data-type='json' content=labsExperiments)
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index bd0730d5d0..3c42fa477d 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -1030,6 +1030,8 @@ module.exports = {
     'launchpad',
     'server-ce-scripts',
     'user-activate',
+    'ldap-authentication',
+    'saml-authentication',
   ],
   viewIncludes: {},
 
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index adfb33d8f8..4b51bd2152 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -163,6 +163,7 @@
   "already_have_sl_account": "Already have an __appName__ account?",
   "also": "Also",
   "alternatively_create_new_institution_account": "Alternatively, you can create a <b>new account</b> with your institution email (<b>__email__</b>) by clicking <b>__clickText__</b>.",
+  "alternatively_create_local_admin_account": "Alternatively, you can create __appName__ local admin account.",
   "an_email_has_already_been_sent_to": "An email has already been sent to <0>__email__</0>. Please wait and try again later.",
   "an_error_occured_while_restoring_project": "An error occured while restoring the project",
   "an_error_occurred_when_verifying_the_coupon_code": "An error occurred when verifying the coupon code",
@@ -1250,6 +1251,7 @@
   "loading_prices": "loading prices",
   "loading_recent_github_commits": "Loading recent commits",
   "loading_writefull": "Loading Writefull",
+  "local_account": "Local account",
   "log_entry_description": "Log entry with level: __level__",
   "log_entry_maximum_entries": "Maximum log entries limit hit",
   "log_entry_maximum_entries_enable_stop_on_first_error": "Try to fix the first error and recompile. Often one error causes many later error messages. You can <0>Enable “Stop on first error”</0> to focus on fixing errors. We recommend fixing errors as soon as possible; letting them accumulate may lead to hard-to-debug and fatal errors. <1>Learn more</1>",
diff --git a/services/web/modules/launchpad/app/src/LaunchpadController.mjs b/services/web/modules/launchpad/app/src/LaunchpadController.mjs
index b626e0176e..49dd9ea9cb 100644
--- a/services/web/modules/launchpad/app/src/LaunchpadController.mjs
+++ b/services/web/modules/launchpad/app/src/LaunchpadController.mjs
@@ -154,7 +154,8 @@ function registerExternalAuthAdmin(authMethod) {
       await User.updateOne(
         { _id: user._id },
         {
-          $set: { isAdmin: true, emails: [{ email, reversedHostname }] },
+          $set: { isAdmin: true, emails: [{ email, reversedHostname, 'confirmedAt' : Date.now() }] },
+          $unset: { 'hashedPassword': "" }, // external-auth user must not have a hashedPassword
         }
       ).exec()
     } catch (err) {
diff --git a/services/web/modules/launchpad/app/views/launchpad.pug b/services/web/modules/launchpad/app/views/launchpad.pug
index ff917eeb74..2c0382e71e 100644
--- a/services/web/modules/launchpad/app/views/launchpad.pug
+++ b/services/web/modules/launchpad/app/views/launchpad.pug
@@ -29,7 +29,7 @@ block vars
 
 block append meta
 	meta(name='ol-adminUserExists' data-type='boolean' content=adminUserExists)
-	meta(name='ol-ideJsPath' content=buildJsPath('ide.js'))
+	meta(name='ol-ideJsPath' content=buildJsPath('ide-detached.js'))
 
 block content
 	script(
@@ -122,6 +122,42 @@ block content
 															span(data-ol-inflight='idle') #{translate("register")}
 															span(hidden data-ol-inflight='pending') #{translate("registering")}…
 
+												h3 #{translate('local_account')}
+												p
+													| #{translate('alternatively_create_local_admin_account')}
+
+												form(
+													data-ol-async-form
+													data-ol-register-admin
+													action='/launchpad/register_admin'
+													method='POST'
+												)
+													input(name='_csrf', type='hidden', value=csrfToken)
+													+formMessages()
+													.form-group
+														label(for='email') #{translate("email")}
+														input.form-control(
+															type='email'
+															name='email'
+															placeholder='email@example.com'
+															autocomplete='username'
+															required
+															autofocus='true'
+														)
+													.form-group
+														label(for='password') #{translate("password")}
+														input.form-control#passwordField(
+															type='password'
+															name='password'
+															placeholder='********'
+															autocomplete='new-password'
+															required
+														)
+													.actions
+														button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+															span(data-ol-inflight="idle") #{translate("register")}
+															span(hidden data-ol-inflight="pending") #{translate("registering")}…
+
 											// Saml Form
 											if authMethod === 'saml'
 												h3 #{translate('saml')}
@@ -140,12 +176,47 @@ block content
 														label(for='email') #{translate("email")}
 														input.form-control(
 															name='email'
-															type='email'
 															placeholder='email@example.com'
 															autocomplete='username'
 															required
 															autofocus='true'
 														)
+													.actions
+														button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
+															span(data-ol-inflight="idle") #{translate("register")}
+															span(hidden data-ol-inflight="pending") #{translate("registering")}…
+
+												h3 #{translate('local_account')}
+												p
+													| #{translate('alternatively_create_local_admin_account')}
+
+												form(
+													data-ol-async-form
+													data-ol-register-admin
+													action='/launchpad/register_admin'
+													method='POST'
+												)
+													input(name='_csrf', type='hidden', value=csrfToken)
+													+formMessages()
+													.form-group
+														label(for='email') #{translate("email")}
+														input.form-control(
+															type='email'
+															name='email'
+															placeholder='email@example.com'
+															autocomplete='username'
+															required
+															autofocus='true'
+														)
+													.form-group
+														label(for='password') #{translate("password")}
+														input.form-control#passwordField(
+															type='password'
+															name='password'
+															placeholder='********'
+															autocomplete='new-password'
+															required
+														)
 													.actions
 														button.btn-primary.btn(type='submit' data-ol-disabled-inflight)
 															span(data-ol-inflight='idle') #{translate("register")}
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs b/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
new file mode 100644
index 0000000000..64fa4f5a96
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
@@ -0,0 +1,64 @@
+import logger from '@overleaf/logger'
+import LoginRateLimiter from '../../../../app/src/Features/Security/LoginRateLimiter.js'
+import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
+import AuthenticationManagerLdap from './AuthenticationManagerLdap.mjs'
+
+const AuthenticationControllerLdap = {
+  async doPassportLdapLogin(req, ldapUser, done) {
+    let user, info
+    try {
+      ;({ user, info } = await AuthenticationControllerLdap._doPassportLdapLogin(
+        req,
+        ldapUser
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportLdapLogin(req, ldapUser) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'LDAP password login', fromKnownDevice },
+    }
+
+    let user, isPasswordReused
+    try {
+      user = await AuthenticationManagerLdap.promises.findOrCreateLdapUser(ldapUser, auditLog)
+    } catch (error) {
+      return {
+        user: false,
+        info: handleAuthenticateErrors(error, req),
+      }
+    }
+    if (user && AuthenticationController.captchaRequiredForLogin(req, user)) {
+      return {
+        user: false,
+        info: {
+          text: req.i18n.translate('cannot_verify_user_not_robot'),
+          type: 'error',
+          errorReason: 'cannot_verify_user_not_robot',
+          status: 400,
+        },
+      }
+    } else if (user) {
+      // async actions
+      return { user, info: undefined }
+    } else { //something wrong
+      logger.debug({ email : ldapUser.mail }, 'failed LDAP log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          status: 500,
+        },
+      }
+    }
+  },
+}
+
+export const {
+  doPassportLdapLogin,
+} = AuthenticationControllerLdap
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs b/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
new file mode 100644
index 0000000000..1371f76d52
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
@@ -0,0 +1,80 @@
+import Settings from '@overleaf/settings'
+import { callbackify } from '@overleaf/promise-utils'
+import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
+import { User } from '../../../../app/src/models/User.js'
+
+const AuthenticationManagerLdap = {
+  splitFullName(fullName) {
+    fullName = fullName.trim();
+    let lastSpaceIndex = fullName.lastIndexOf(' ');
+    let firstNames = fullName.substring(0, lastSpaceIndex).trim();
+    let lastName = fullName.substring(lastSpaceIndex + 1).trim();
+    return [firstNames, lastName];
+  },
+  async findOrCreateLdapUser(profile, auditLog) {
+    //user is already authenticated in Ldap
+    const {
+      attEmail,
+      attFirstName,
+      attLastName,
+      attName,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+    } = Settings.ldap
+
+    const email = Array.isArray(profile[attEmail])
+                    ? profile[attEmail][0].toLowerCase()
+                    : profile[attEmail].toLowerCase()
+    let nameParts = ["",""]
+    if ((!attFirstName || !attLastName) && attName) {
+      nameParts = this.splitFullName(profile[attName] || "")
+    }
+    const firstName = attFirstName ? (profile[attFirstName] || "") : nameParts[0]
+    let   lastName  = attLastName  ? (profile[attLastName]  || "") : nameParts[1]
+    if (!firstName && !lastName) lastName = email
+    let isAdmin = false
+    if( attAdmin && valAdmin ) {
+      isAdmin = (profile._groups?.length > 0) ||
+                (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
+                                                    profile[attAdmin] === valAdmin)
+    }
+    let user = await User.findOne({ 'email': email }).exec()
+    if( !user ) {
+      user = await UserCreator.promises.createNewUser(
+        {
+          email: email,
+          first_name: firstName,
+          last_name: lastName,
+          isAdmin: isAdmin,
+          holdingAccount: false,
+        }
+      )
+      await User.updateOne(
+        { _id: user._id },
+        { $set : { 'emails.0.confirmedAt' : Date.now() } }
+      ).exec() //email of ldap user is confirmed
+    }
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if( attAdmin && valAdmin ) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
+      {}
+    ).exec()
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+}
+
+export default {
+  findOrCreateLdapUser: callbackify(AuthenticationManagerLdap.findOrCreateLdapUser),
+  promises: AuthenticationManagerLdap,
+}
+export const {
+  splitFullName,
+} = AuthenticationManagerLdap
diff --git a/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs b/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
new file mode 100644
index 0000000000..e7f312fc11
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
@@ -0,0 +1,17 @@
+import Settings from '@overleaf/settings'
+
+function initLdapSettings() {
+  Settings.ldap = {
+    enable: true,
+    placeholder:  process.env.OVERLEAF_LDAP_PLACEHOLDER || 'Username',
+    attEmail:     process.env.OVERLEAF_LDAP_EMAIL_ATT || 'mail',
+    attFirstName: process.env.OVERLEAF_LDAP_FIRST_NAME_ATT,
+    attLastName:  process.env.OVERLEAF_LDAP_LAST_NAME_ATT,
+    attName:      process.env.OVERLEAF_LDAP_NAME_ATT,
+    attAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT,
+    valAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT_VALUE,
+    updateUserDetailsOnLogin: String(process.env.OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN ).toLowerCase() === 'true',
+  }
+}
+
+export default initLdapSettings
diff --git a/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs b/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
new file mode 100644
index 0000000000..c4093b8684
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
@@ -0,0 +1,136 @@
+import Settings from '@overleaf/settings'
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import ldapjs from 'ldapauth-fork/node_modules/ldapjs/lib/index.js'
+import UserGetter from '../../../../app/src/Features/User/UserGetter.js'
+import { splitFullName } from './AuthenticationManagerLdap.mjs'
+
+async function fetchLdapContacts(userId, contacts) {
+  if (!Settings.ldap?.enable || !process.env.OVERLEAF_LDAP_CONTACTS_FILTER) {
+    return []
+  }
+
+  const ldapOpts = passport._strategy('custom-fail-ldapauth').options.server
+  const { attEmail, attFirstName = "", attLastName = "", attName = "" } = Settings.ldap
+  const {
+    url,
+    timeout,
+    connectTimeout,
+    tlsOptions,
+    starttls,
+    bindDN,
+    bindCredentials,
+  } = ldapOpts
+  const searchBase = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_BASE || ldapOpts.searchBase
+  const searchScope = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_SCOPE || 'sub'
+  const ldapConfig = { url, timeout, connectTimeout, tlsOptions }
+
+  let ldapUsers
+  const client = ldapjs.createClient(ldapConfig)
+  try {
+    if (starttls) {
+      await _upgradeToTLS(client, tlsOptions)
+    }
+    await _bindLdap(client, bindDN, bindCredentials)
+
+    const filter = await _formContactsSearchFilter(client, ldapOpts, userId, process.env.OVERLEAF_LDAP_CONTACTS_FILTER)
+    const searchOptions = { scope: searchScope, attributes: [attEmail, attFirstName, attLastName, attName], filter }
+
+    ldapUsers = await _searchLdap(client, searchBase, searchOptions)
+  } catch (err) {
+    logger.warn({ err }, 'error in fetchLdapContacts')
+    return []
+  } finally {
+    client.unbind()
+  }
+
+  const newLdapContacts = ldapUsers.reduce((acc, ldapUser) => {
+    const email = Array.isArray(ldapUser[attEmail])
+                    ? ldapUser[attEmail][0]?.toLowerCase()
+                    : ldapUser[attEmail]?.toLowerCase()
+    if (!email) return acc
+    if (!contacts.some(contact => contact.email === email)) {
+      let nameParts = ["",""]
+      if ((!attFirstName || !attLastName) && attName) {
+        nameParts = splitFullName(ldapUser[attName] || "")
+      }
+      const firstName = attFirstName ? (ldapUser[attFirstName] || "") : nameParts[0]
+      const lastName  = attLastName  ? (ldapUser[attLastName]  || "") : nameParts[1]
+      acc.push({
+        first_name: firstName,
+        last_name: lastName,
+        email: email,
+        type: 'user',
+      })
+    }
+    return acc
+  }, [])
+
+  return newLdapContacts.sort((a, b) =>
+    a.last_name.localeCompare(b.last_name) ||
+    a.first_name.localeCompare(a.first_name) ||
+    a.email.localeCompare(b.email)
+  )
+}
+
+function _upgradeToTLS(client, tlsOptions) {
+  return new Promise((resolve, reject) => {
+    client.on('error', error => reject(new Error(`LDAP client error: ${error}`)))
+    client.on('connect', () => {
+      client.starttls(tlsOptions, null, error => {
+        if (error) {
+          reject(new Error(`StartTLS error: ${error}`))
+        } else {
+          resolve()
+        }
+      })
+    })
+  })
+}
+
+function _bindLdap(client, bindDN, bindCredentials) {
+  return new Promise((resolve, reject) => {
+    client.bind(bindDN, bindCredentials, error => {
+      if (error) {
+        reject(error)
+      } else {
+        resolve()
+      }
+    })
+  })
+}
+
+function _searchLdap(client, baseDN, options) {
+  return new Promise((resolve, reject) => {
+    const searchEntries = []
+    client.search(baseDN, options, (error, res) => {
+      if (error) {
+        reject(error)
+      } else {
+        res.on('searchEntry', entry => searchEntries.push(entry.object))
+        res.on('error', reject)
+        res.on('end', () => resolve(searchEntries))
+      }
+    })
+  })
+}
+
+async function _formContactsSearchFilter(client, ldapOpts, userId, contactsFilter) {
+  const searchProperty = process.env.OVERLEAF_LDAP_CONTACTS_PROPERTY
+  if (!searchProperty) {
+    return contactsFilter
+  }
+  const email = await UserGetter.promises.getUserEmail(userId)
+  const searchOptions = {
+    scope: ldapOpts.searchScope,
+    attributes: [searchProperty],
+    filter: `(${Settings.ldap.attEmail}=${email})`,
+  }
+  const searchBase = ldapOpts.searchBase
+  const ldapUser = (await _searchLdap(client, searchBase, searchOptions))[0]
+  const searchPropertyValue = ldapUser ? ldapUser[searchProperty]
+                                       : process.env.OVERLEAF_LDAP_CONTACTS_NON_LDAP_VALUE || 'IMATCHNOTHING'
+  return contactsFilter.replace(/{{userProperty}}/g, searchPropertyValue)
+}
+
+export default fetchLdapContacts
diff --git a/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs b/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
new file mode 100644
index 0000000000..b07dc3f3bd
--- /dev/null
+++ b/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
@@ -0,0 +1,78 @@
+import fs from 'fs'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { doPassportLdapLogin } from './AuthenticationControllerLdap.mjs'
+import { Strategy as LdapStrategy } from 'passport-ldapauth'
+
+function _readFilesContentFromEnv(envVar) {
+// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
+  if (!envVar) return undefined
+  try {
+    const parsedFileNames = JSON.parse(envVar)
+    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
+  } catch (error) {
+    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
+      return fs.readFileSync(envVar, 'utf8')
+    } else {
+      throw error
+    }
+  }
+}
+
+//  custom responses on authentication failure
+class CustomFailLdapStrategy extends LdapStrategy {
+  constructor(options, validate) {
+    super(options, validate);
+    this.name = 'custom-fail-ldapauth'
+  }
+  authenticate(req, options) {
+    const defaultFail = this.fail.bind(this)
+    this.fail = function(info, status) {
+      info.type = 'error'
+      info.key = 'invalid-password-retry-or-reset'
+      info.status = 401
+      return defaultFail(info, status)
+    }.bind(this)
+    super.authenticate(req, options)
+  }
+}
+
+const ldapServerOpts = {
+  url: process.env.OVERLEAF_LDAP_URL,
+  bindDN: process.env.OVERLEAF_LDAP_BIND_DN || "",
+  bindCredentials: process.env.OVERLEAF_LDAP_BIND_CREDENTIALS || "",
+  bindProperty: process.env.OVERLEAF_LDAP_BIND_PROPERTY,
+  searchBase: process.env.OVERLEAF_LDAP_SEARCH_BASE,
+  searchFilter: process.env.OVERLEAF_LDAP_SEARCH_FILTER,
+  searchScope: process.env.OVERLEAF_LDAP_SEARCH_SCOPE || 'sub',
+  searchAttributes: JSON.parse(process.env.OVERLEAF_LDAP_SEARCH_ATTRIBUTES || '[]'),
+  groupSearchBase: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_BASE,
+  groupSearchFilter: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_FILTER,
+  groupSearchScope: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_SCOPE || 'sub',
+  groupSearchAttributes: ["dn"],
+  groupDnProperty: process.env.OVERLEAF_LDAP_ADMIN_DN_PROPERTY,
+  cache: String(process.env.OVERLEAF_LDAP_CACHE).toLowerCase() === 'true',
+  timeout: process.env.OVERLEAF_LDAP_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_TIMEOUT) : undefined,
+  connectTimeout: process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT) : undefined,
+  starttls: String(process.env.OVERLEAF_LDAP_STARTTLS).toLowerCase() === 'true',
+  tlsOptions: {
+    ca: _readFilesContentFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_CA_PATH),
+    rejectUnauthorized: String(process.env.OVERLEAF_LDAP_TLS_OPTS_REJECT_UNAUTH).toLowerCase() === 'true',
+  }
+}
+
+function addLdapStrategy(passport) {
+  passport.use(
+    new CustomFailLdapStrategy(
+      {
+        server: ldapServerOpts,
+        passReqToCallback: true,
+        usernameField: 'email',
+        passwordField: 'password',
+      },
+      doPassportLdapLogin
+    )
+  )
+}
+
+export default addLdapStrategy
diff --git a/services/web/modules/ldap-authentication/index.mjs b/services/web/modules/ldap-authentication/index.mjs
new file mode 100644
index 0000000000..f56d7ffee0
--- /dev/null
+++ b/services/web/modules/ldap-authentication/index.mjs
@@ -0,0 +1,30 @@
+import initLdapSettings from './app/src/InitLdapSettings.mjs'
+import addLdapStrategy from './app/src/LdapStrategy.mjs'
+import fetchLdapContacts from './app/src/LdapContacts.mjs'
+
+let ldapModule = {};
+if (process.env.EXTERNAL_AUTH === 'ldap') {
+  initLdapSettings()
+  ldapModule = {
+    name: 'ldap-authentication',
+    hooks: {
+      passportSetup: function (passport, callback) {
+        try {
+          addLdapStrategy(passport)
+          callback(null)
+        } catch (error) {
+          callback(error)
+        }
+      },
+      getContacts: async function (userId, contacts, callback) {
+        try {
+          const newLdapContacts = await fetchLdapContacts(userId, contacts)
+          callback(null, newLdapContacts)
+        } catch (error) {
+          callback(error)
+        }
+      },
+    }
+  }
+}
+export default ldapModule
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs b/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
new file mode 100644
index 0000000000..f5db3f738d
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
@@ -0,0 +1,160 @@
+import Settings from '@overleaf/settings'
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
+import AuthenticationManagerSaml from './AuthenticationManagerSaml.mjs'
+import UserController from '../../../../app/src/Features/User/UserController.js'
+import UserSessionsManager from '../../../../app/src/Features/User/UserSessionsManager.js'
+import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { xmlResponse } from '../../../../app/src/infrastructure/Response.js'
+
+const AuthenticationControllerSaml = {
+  passportSamlAuthWithIdP(req, res, next) {
+    if ( passport._strategy('saml')._saml.options.authnRequestBinding === 'HTTP-POST') {
+      const csp = res.getHeader('Content-Security-Policy')
+      if (csp) {
+        res.setHeader(
+          'Content-Security-Policy',
+          csp.replace(/(?:^|\s)(default-src|form-action)[^;]*;?/g, '')
+        )
+      }
+    }
+    passport.authenticate('saml')(req, res, next)
+  },
+  passportSamlLogin(req, res, next) {
+    // This function is middleware which wraps the passport.authenticate middleware,
+    // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
+    // and send a `{redir: ""}` response on success
+    passport.authenticate(
+      'saml',
+      { keepSessionInfo: true },
+      async function (err, user, info) {
+        if (err) {
+          return next(err)
+        }
+        if (user) {
+          // `user` is either a user object or false
+          AuthenticationController.setAuditInfo(req, {
+            method: 'SAML login',
+          })
+          try {
+            await AuthenticationController.promises.finishLogin(user, req, res)
+          } catch (err) {
+            return next(err)
+          }
+        } else {
+          if (info.redir != null) {
+            return res.json({ redir: info.redir })
+          } else {
+            res.status(info.status || 200)
+            delete info.status
+            const body = { message: info }
+            const { errorReason } = info
+            if (errorReason) {
+              body.errorReason = errorReason
+              delete info.errorReason
+            }
+            return res.json(body)
+          }
+        }
+      }
+    )(req, res, next)
+  },
+  async doPassportSamlLogin(req, profile, done) {
+    let user, info
+    try {
+      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogin(
+        req,
+        profile
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportSamlLogin(req, profile) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'SAML login', fromKnownDevice },
+    }
+
+    let user
+    try {
+      user = await AuthenticationManagerSaml.promises.findOrCreateSamlUser(profile, auditLog)
+    } catch (error) {
+      return {
+        user: false,
+        info: handleAuthenticateErrors(error, req),
+      }
+    }
+    if (user) {
+      req.session.saml_extce = {nameID : profile.nameID, sessionIndex : profile.sessionIndex}
+      return { user, info: undefined }
+    } else { //something wrong
+      logger.debug({ email : profile.mail }, 'failed SAML log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Unknown error',
+          status: 500,
+        },
+      }
+    }
+  },
+  async passportSamlSPLogout(req, res, next) {
+    passport._strategy('saml').logout(req, async (err, url) => {
+      if (err) logger.error({ err }, 'can not generate logout url')
+      await UserController.promises.doLogout(req)
+      res.redirect(url)
+    })
+  },
+  passportSamlIdPLogout(req, res, next) {
+    passport.authenticate('saml')(req, res, (err) => {
+      if (err) return next(err)
+      res.redirect('/login');
+    })
+  },
+  async doPassportSamlLogout(req, profile, done) {
+    let user, info
+    try {
+      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogout(
+        req,
+        profile
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportSamlLogout(req, profile) {
+    if (req?.session?.saml_extce?.nameID === profile.nameID &&
+        req?.session?.saml_extce?.sessionIndex === profile.sessionIndex) {
+      profile = req.user
+    }
+    await UserSessionsManager.promises.untrackSession(req.user, req.sessionID).catch(err => {
+      logger.warn({ err, userId: req.user._id }, 'failed to untrack session')
+    })
+    return { user: profile, info: undefined }
+  },
+  passportSamlMetadata(req, res) {
+    const samlStratery = passport._strategy('saml')
+    res.setHeader('Content-Disposition', `attachment; filename="${samlStratery._saml.options.issuer}-meta.xml"`)
+    xmlResponse(res,
+      samlStratery.generateServiceProviderMetadata(
+        samlStratery._saml.options.decryptionCert,
+        samlStratery._saml.options.signingCert
+      )
+    )
+  },
+}
+export const {
+  passportSamlAuthWithIdP,
+  passportSamlLogin,
+  passportSamlSPLogout,
+  passportSamlIdPLogout,
+  doPassportSamlLogin,
+  doPassportSamlLogout,
+  passportSamlMetadata,
+} = AuthenticationControllerSaml
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs b/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
new file mode 100644
index 0000000000..47d97f3019
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
@@ -0,0 +1,60 @@
+import Settings from '@overleaf/settings'
+import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
+import { User } from '../../../../app/src/models/User.js'
+
+const AuthenticationManagerSaml = {
+  async findOrCreateSamlUser(profile, auditLog) {
+    const {
+      attEmail,
+      attFirstName,
+      attLastName,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+    } = Settings.saml
+    const email = Array.isArray(profile[attEmail])
+                    ? profile[attEmail][0].toLowerCase()
+                    : profile[attEmail].toLowerCase()
+    const firstName = attFirstName ? profile[attFirstName] : ""
+    const lastName  = attLastName  ? profile[attLastName] : email
+    let isAdmin = false
+    if( attAdmin && valAdmin ) {
+      isAdmin = (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
+                                                    profile[attAdmin] === valAdmin)
+    }
+    let user = await User.findOne({ 'email': email }).exec()
+    if( !user ) {
+      user = await UserCreator.promises.createNewUser(
+        {
+          email: email,
+          first_name: firstName,
+          last_name: lastName,
+          isAdmin: isAdmin,
+          holdingAccount: false,
+        }
+      )
+      await User.updateOne(
+        { _id: user._id },
+        { $set : { 'emails.0.confirmedAt' : Date.now() } }
+      ).exec() //email of saml user is confirmed
+    }
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if( attAdmin && valAdmin ) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
+      {}
+    ).exec()
+
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+}
+
+export default {
+  promises: AuthenticationManagerSaml,
+}
diff --git a/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs b/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
new file mode 100644
index 0000000000..441f9033af
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
@@ -0,0 +1,16 @@
+import Settings from '@overleaf/settings'
+
+function initSamlSettings() {
+  Settings.saml = {
+    enable: true,
+    identityServiceName: process.env.OVERLEAF_SAML_IDENTITY_SERVICE_NAME || 'Login with SAML IdP',
+    attEmail:     process.env.OVERLEAF_SAML_EMAIL_FIELD || 'nameID',
+    attFirstName: process.env.OVERLEAF_SAML_FIRST_NAME_FIELD || 'givenName',
+    attLastName:  process.env.OVERLEAF_SAML_LAST_NAME_FIELD || 'lastName',
+    attAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD,
+    valAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD_VALUE,
+    updateUserDetailsOnLogin: String(process.env.OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN).toLowerCase() === 'true',
+  }
+}
+
+export default initSamlSettings
diff --git a/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
new file mode 100644
index 0000000000..65b42c92ae
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
@@ -0,0 +1,12 @@
+import logger from '@overleaf/logger'
+import { passportSamlLogin, passportSamlIdPLogout } from './AuthenticationControllerSaml.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML NonCsrfRouter')
+    webRouter.get('/saml/login/callback', passportSamlLogin)
+    webRouter.post('/saml/login/callback', passportSamlLogin)
+    webRouter.get('/saml/logout/callback', passportSamlIdPLogout)
+    webRouter.post('/saml/logout/callback', passportSamlIdPLogout)
+  },
+}
diff --git a/services/web/modules/saml-authentication/app/src/SamlRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
new file mode 100644
index 0000000000..9ee3677901
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
@@ -0,0 +1,14 @@
+import logger from '@overleaf/logger'
+import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
+import { passportSamlAuthWithIdP, passportSamlSPLogout, passportSamlMetadata} from './AuthenticationControllerSaml.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML router')
+    webRouter.get('/saml/login', passportSamlAuthWithIdP)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/login')
+    webRouter.post('/saml/logout', AuthenticationController.requireLogin(), passportSamlSPLogout)
+    webRouter.get('/saml/meta', passportSamlMetadata)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/meta')
+  },
+}
diff --git a/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs b/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
new file mode 100644
index 0000000000..3a16459f98
--- /dev/null
+++ b/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
@@ -0,0 +1,62 @@
+import fs from 'fs'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { doPassportSamlLogin, doPassportSamlLogout } from './AuthenticationControllerSaml.mjs'
+import { Strategy as SamlStrategy } from '@node-saml/passport-saml'
+
+function _readFilesContentFromEnv(envVar) {
+// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
+  if (!envVar) return undefined
+  try {
+    const parsedFileNames = JSON.parse(envVar)
+    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
+  } catch (error) {
+    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
+      return fs.readFileSync(envVar, 'utf8')
+    } else {
+      throw error
+    }
+  }
+}
+
+const samlOptions = {
+  entryPoint: process.env.OVERLEAF_SAML_ENTRYPOINT,
+  callbackUrl: process.env.OVERLEAF_SAML_CALLBACK_URL,
+  issuer: process.env.OVERLEAF_SAML_ISSUER,
+  audience: process.env.OVERLEAF_SAML_AUDIENCE,
+  cert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_IDP_CERT),
+  signingCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PUBLIC_CERT),
+  privateKey:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PRIVATE_KEY),
+  decryptionCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_CERT),
+  decryptionPvk:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_PVK),
+  signatureAlgorithm: process.env.OVERLEAF_SAML_SIGNATURE_ALGORITHM,
+  additionalParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_PARAMS || '{}'),
+  additionalAuthorizeParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_AUTHORIZE_PARAMS || '{}'),
+  identifierFormat: process.env.OVERLEAF_SAML_IDENTIFIER_FORMAT,
+  acceptedClockSkewMs: process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS ? Number(process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS) : undefined,
+  attributeConsumingServiceIndex: process.env.OVERLEAF_SAML_ATTRIBUTE_CONSUMING_SERVICE_INDEX,
+  authnContext: process.env.OVERLEAF_SAML_AUTHN_CONTEXT ? JSON.parse(process.env.OVERLEAF_SAML_AUTHN_CONTEXT) : undefined,
+  forceAuthn: String(process.env.OVERLEAF_SAML_FORCE_AUTHN).toLowerCase() === 'true',
+  disableRequestedAuthnContext: String(process.env.OVERLEAF_SAML_DISABLE_REQUESTED_AUTHN_CONTEXT).toLowerCase() === 'true',
+  skipRequestCompression: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING === 'HTTP-POST',  // compression should be skipped iff authnRequestBinding is POST
+  authnRequestBinding: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING,
+  validateInResponseTo: process.env.OVERLEAF_SAML_VALIDATE_IN_RESPONSE_TO,
+  requestIdExpirationPeriodMs: process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS ? Number(process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS) : undefined,
+//  cacheProvider: process.env.OVERLEAF_SAML_CACHE_PROVIDER,
+  logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
+  logoutCallbackUrl: process.env.OVERLEAF_SAML_LOGOUT_CALLBACK_URL,
+  additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
+  passReqToCallback: true,
+}
+
+function addSamlStrategy(passport) {
+  passport.use(
+    new SamlStrategy(
+      samlOptions,
+      doPassportSamlLogin,
+      doPassportSamlLogout
+    )
+  )
+}
+
+export default addSamlStrategy
diff --git a/services/web/modules/saml-authentication/index.mjs b/services/web/modules/saml-authentication/index.mjs
new file mode 100644
index 0000000000..35ea70283f
--- /dev/null
+++ b/services/web/modules/saml-authentication/index.mjs
@@ -0,0 +1,26 @@
+import initSamlSettings from './app/src/InitSamlSettings.mjs'
+import addSamlStrategy from './app/src/SamlStrategy.mjs'
+import SamlRouter from './app/src/SamlRouter.mjs'
+import SamlNonCsrfRouter from './app/src/SamlNonCsrfRouter.mjs'
+
+let samlModule = {};
+
+if (process.env.EXTERNAL_AUTH === 'saml') {
+  initSamlSettings()
+  samlModule = {
+    name: 'saml-authentication',
+    hooks: {
+      passportSetup: function (passport, callback) {
+        try {
+          addSamlStrategy(passport)
+          callback(null)
+        } catch (error) {
+          callback(error)
+        }
+      },
+    },
+    router: SamlRouter,
+    nonCsrfRouter: SamlNonCsrfRouter,
+  }
+}
+export default samlModule

From 764ff813bdda581728c6ad3707b967913532e362 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Tue, 17 Dec 2024 18:36:18 +0100
Subject: [PATCH 261/274] Refactor authentication code; add OIDC support

---
 .../AuthenticationController.js               |   6 +-
 .../PasswordReset/PasswordResetController.mjs |   4 -
 .../PasswordReset/PasswordResetHandler.mjs    |   5 +-
 .../app/src/Features/User/UserController.js   |   3 +-
 .../src/Features/User/UserPagesController.mjs |   6 +-
 .../app/src/infrastructure/ExpressLocals.js   |   4 +-
 services/web/app/src/router.mjs               |   4 +-
 services/web/app/views/user/login.pug         |   9 +
 services/web/app/views/user/passwordReset.pug |   2 +-
 services/web/app/views/user/settings.pug      |   4 +-
 services/web/config/settings.defaults.js      |  19 +-
 .../web/frontend/extracted-translations.json  |   1 +
 .../settings/components/linking-section.tsx   |   3 +-
 .../components/linking/sso-widget.tsx         |   4 +-
 .../settings/components/password-section.tsx  |   6 +-
 .../frontend/js/shared/svgs/openid-logo.jsx   |  27 +++
 services/web/locales/en.json                  |   2 +
 .../app/src/LDAPAuthenticationController.mjs  | 112 ++++++++++++
 .../app/src/LDAPAuthenticationManager.mjs}    |  36 ++--
 .../ldap/app/src/LDAPContacts.mjs             | 120 ++++++++++++
 .../ldap/app/src/LDAPModuleManager.mjs        | 112 ++++++++++++
 .../ldap/app/src/LDAPRouter.mjs               |  19 ++
 .../web/modules/authentication/ldap/index.mjs |  17 ++
 .../web/modules/authentication/logout.mjs     |  18 ++
 .../app/src/OIDCAuthenticationController.mjs  | 171 ++++++++++++++++++
 .../app/src/OIDCAuthenticationManager.mjs     |  94 ++++++++++
 .../oidc/app/src/OIDCModuleManager.mjs        |  82 +++++++++
 .../oidc/app/src/OIDCRouter.mjs               |  15 ++
 .../web/modules/authentication/oidc/index.mjs |  16 ++
 .../app/src/SAMLAuthenticationController.mjs} |  66 +++----
 .../app/src/SAMLAuthenticationManager.mjs     |  85 +++++++++
 .../saml/app/src/SAMLModuleManager.mjs        | 100 ++++++++++
 .../saml/app/src/SAMLNonCsrfRouter.mjs        |  11 ++
 .../saml/app/src/SAMLRouter.mjs               |  16 ++
 .../web/modules/authentication/saml/index.mjs |  18 ++
 services/web/modules/authentication/utils.mjs |  42 +++++
 .../app/src/AuthenticationControllerLdap.mjs  |  64 -------
 .../app/src/InitLdapSettings.mjs              |  17 --
 .../app/src/LdapContacts.mjs                  | 136 --------------
 .../app/src/LdapStrategy.mjs                  |  78 --------
 .../web/modules/ldap-authentication/index.mjs |  30 ---
 .../app/src/AuthenticationManagerSaml.mjs     |  60 ------
 .../app/src/InitSamlSettings.mjs              |  16 --
 .../app/src/SamlNonCsrfRouter.mjs             |  12 --
 .../app/src/SamlRouter.mjs                    |  14 --
 .../app/src/SamlStrategy.mjs                  |  62 -------
 .../web/modules/saml-authentication/index.mjs |  26 ---
 services/web/package.json                     |   1 +
 48 files changed, 1169 insertions(+), 606 deletions(-)
 create mode 100644 services/web/frontend/js/shared/svgs/openid-logo.jsx
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs
 rename services/web/modules/{ldap-authentication/app/src/AuthenticationManagerLdap.mjs => authentication/ldap/app/src/LDAPAuthenticationManager.mjs} (67%)
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
 create mode 100644 services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
 create mode 100644 services/web/modules/authentication/ldap/index.mjs
 create mode 100644 services/web/modules/authentication/logout.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
 create mode 100644 services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
 create mode 100644 services/web/modules/authentication/oidc/index.mjs
 rename services/web/modules/{saml-authentication/app/src/AuthenticationControllerSaml.mjs => authentication/saml/app/src/SAMLAuthenticationController.mjs} (65%)
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs
 create mode 100644 services/web/modules/authentication/saml/app/src/SAMLRouter.mjs
 create mode 100644 services/web/modules/authentication/saml/index.mjs
 create mode 100644 services/web/modules/authentication/utils.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
 delete mode 100644 services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
 delete mode 100644 services/web/modules/ldap-authentication/index.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/SamlRouter.mjs
 delete mode 100644 services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
 delete mode 100644 services/web/modules/saml-authentication/index.mjs

diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js
index 983526006e..baba8aacee 100644
--- a/services/web/app/src/Features/Authentication/AuthenticationController.js
+++ b/services/web/app/src/Features/Authentication/AuthenticationController.js
@@ -82,6 +82,7 @@ const AuthenticationController = {
       analyticsId: user.analyticsId || user._id,
       alphaProgram: user.alphaProgram || undefined, // only store if set
       betaProgram: user.betaProgram || undefined, // only store if set
+      externalAuth: user.externalAuth || false,
     }
     if (user.isAdmin) {
       lightUser.isAdmin = true
@@ -102,9 +103,9 @@ const AuthenticationController = {
     // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
     // and send a `{redir: ""}` response on success
     passport.authenticate(
-      Settings.ldap?.enable ? ['custom-fail-ldapauth','local'] : ['local'],
+      'local',
       { keepSessionInfo: true },
-      async function (err, user, infoArray) {
+      async function (err, user, info) {
         if (err) {
           return next(err)
         }
@@ -126,7 +127,6 @@ const AuthenticationController = {
             return next(err)
           }
         } else {
-	  let info = infoArray[0]
           if (info.redir != null) {
             return res.json({ redir: info.redir })
           } else {
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
index 54f847ef9c..2963c56653 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetController.mjs
@@ -140,10 +140,6 @@ async function requestReset(req, res, next) {
     return res.status(404).json({
       message: req.i18n.translate('secondary_email_password_reset'),
     })
-  } else if (status === 'external') {
-    return res.status(403).json({
-      message: req.i18n.translate('password_managed_externally'),
-    })
   } else {
     return res.status(404).json({
       message: req.i18n.translate('cant_find_email'),
diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
index 0ac203222c..2c1aefe6a6 100644
--- a/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
+++ b/services/web/app/src/Features/PasswordReset/PasswordResetHandler.mjs
@@ -18,10 +18,6 @@ async function generateAndEmailResetToken(email) {
     return null
   }
 
-  if (!user.hashedPassword) {
-    return 'external'
-  }
-
   if (user.email !== email) {
     return 'secondary'
   }
@@ -76,6 +72,7 @@ async function getUserForPasswordResetToken(token) {
     'overleaf.id': 1,
     email: 1,
     must_reconfirm: 1,
+    hashedPassword: 1,
   })
 
   await assertUserPermissions(user, ['change-password'])
diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index 772e77e3e4..b767dcd4a1 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -404,7 +404,7 @@ async function updateUserSettings(req, res, next) {
   if (
     newEmail == null ||
     newEmail === user.email ||
-    (req.externalAuthenticationSystemUsed() && !user.hashedPassword)
+    req.externalAuthenticationSystemUsed()
   ) {
     // end here, don't update email
     SessionManager.setInSessionUser(req.session, {
@@ -481,7 +481,6 @@ async function doLogout(req) {
 }
 
 async function logout(req, res, next) {
-  if (req?.session.saml_extce) return res.redirect(308, '/saml/logout')
   const requestedRedirect = req.body.redirect
     ? UrlHelper.getSafeRedirectPath(req.body.redirect)
     : undefined
diff --git a/services/web/app/src/Features/User/UserPagesController.mjs b/services/web/app/src/Features/User/UserPagesController.mjs
index 8b5263c37d..c7ad5b30f4 100644
--- a/services/web/app/src/Features/User/UserPagesController.mjs
+++ b/services/web/app/src/Features/User/UserPagesController.mjs
@@ -52,10 +52,8 @@ async function settingsPage(req, res) {
   const reconfirmedViaSAML = _.get(req.session, ['saml', 'reconfirmed'])
   delete req.session.saml
   let shouldAllowEditingDetails = true
-  if (Settings.ldap && Settings.ldap.updateUserDetailsOnLogin) {
-    shouldAllowEditingDetails = false
-  }
-  if (Settings.saml && Settings.saml.updateUserDetailsOnLogin) {
+  const externalAuth = req.user.externalAuth
+  if (externalAuth && Settings[externalAuth].updateUserDetailsOnLogin) {
     shouldAllowEditingDetails = false
   }
   const oauthProviders = Settings.oauthProviders || {}
diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index 5cf9501c29..26364cdc5c 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -107,9 +107,9 @@ module.exports = function (webRouter, privateApiRouter, publicApiRouter) {
 
   webRouter.use(function (req, res, next) {
     req.externalAuthenticationSystemUsed =
-      Features.externalAuthenticationSystemUsed
+      () => !!req?.user?.externalAuth
     res.locals.externalAuthenticationSystemUsed =
-      Features.externalAuthenticationSystemUsed
+      () => !!req?.user?.externalAuth
     req.hasFeature = res.locals.hasFeature = Features.hasFeature
     next()
   })
diff --git a/services/web/app/src/router.mjs b/services/web/app/src/router.mjs
index e727fa7bc5..af855242cb 100644
--- a/services/web/app/src/router.mjs
+++ b/services/web/app/src/router.mjs
@@ -217,6 +217,8 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
     CaptchaMiddleware.canSkipCaptcha
   )
 
+  await Modules.applyRouter(webRouter, privateApiRouter, publicApiRouter)
+
   webRouter.get('/login', UserPagesController.loginPage)
   AuthenticationController.addEndpointToLoginWhitelist('/login')
 
@@ -285,8 +287,6 @@ async function initialize(webRouter, privateApiRouter, publicApiRouter) {
   TokenAccessRouter.apply(webRouter)
   HistoryRouter.apply(webRouter, privateApiRouter)
 
-  await Modules.applyRouter(webRouter, privateApiRouter, publicApiRouter)
-
   if (Settings.enableSubscriptions) {
     webRouter.get(
       '/user/bonus',
diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index 3008b11b1d..97ef72476d 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -53,3 +53,12 @@ block content
 										)
 											span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
 											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
+							if settings.oidc && settings.oidc.enable
+								form(data-ol-async-form, name="oidcLoginForm")
+									.actions(style='margin-top: 30px;')
+										a.btn.btn-secondary.btn-block(
+											href='/oidc/login',
+											data-ol-disabled-inflight
+										)
+											span(data-ol-inflight="idle") #{settings.oidc.identityServiceName}
+											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug
index f498baff23..b6cd42c840 100644
--- a/services/web/app/views/user/passwordReset.pug
+++ b/services/web/app/views/user/passwordReset.pug
@@ -50,7 +50,7 @@ block content
 						+notification({ariaLive: 'assertive', type: 'error', className: 'mb-3', content: translate(error)})
 
 					div(data-ol-custom-form-message='no-password-allowed-due-to-sso' hidden)
-						+notification({ariaLive: 'polite', type: 'error', className: 'mb-3', content: translate('you_cant_reset_password_due_to_sso', {}, [{name: 'a', attrs: {href: '/sso-login'}}])})
+						+notification({ariaLive: 'polite', type: 'error', className: 'mb-3', content: translate('you_cant_reset_password_due_to_ldap_or_sso')})
 					input(name='_csrf' type='hidden' value=csrfToken)
 					.form-group.mb-3
 						label.form-label(for='email') #{translate("email")}
diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index a07863682e..45d21c7572 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -11,7 +11,7 @@ block append meta
 	meta(
 		name='ol-shouldAllowEditingDetails'
 		data-type='boolean'
-		content=shouldAllowEditingDetails || hasPassword
+		content=shouldAllowEditingDetails
 	)
 	meta(name='ol-oauthProviders' data-type='json' content=oauthProviders)
 	meta(name='ol-institutionLinked' data-type='json' content=institutionLinked)
@@ -34,7 +34,7 @@ block append meta
 	meta(
 		name='ol-isExternalAuthenticationSystemUsed'
 		data-type='boolean'
-		content=externalAuthenticationSystemUsed() && !hasPassword
+		content=externalAuthenticationSystemUsed()
 	)
 	meta(name='ol-user' data-type='json' content=user)
 	meta(name='ol-labsExperiments' data-type='json' content=labsExperiments)
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index 3c42fa477d..4747988838 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -1030,8 +1030,9 @@ module.exports = {
     'launchpad',
     'server-ce-scripts',
     'user-activate',
-    'ldap-authentication',
-    'saml-authentication',
+    'authentication/ldap',
+    'authentication/saml',
+    'authentication/oidc',
   ],
   viewIncludes: {},
 
@@ -1058,6 +1059,20 @@ module.exports = {
   managedUsers: {
     enabled: false,
   },
+
+  oauthProviders: {
+    ...(process.env.EXTERNAL_AUTH && process.env.EXTERNAL_AUTH.includes('oidc') && {
+      [process.env.OVERLEAF_OIDC_PROVIDER_ID || 'oidc']: {
+        name: process.env.OVERLEAF_OIDC_PROVIDER_NAME || 'OIDC Provider',
+        descriptionKey: process.env.OVERLEAF_OIDC_PROVIDER_DESCRIPTION,
+        descriptionOptions: { link: process.env.OVERLEAF_OIDC_PROVIDER_INFO_LINK },
+        hideWhenNotLinked: process.env.OVERLEAF_OIDC_PROVIDER_HIDE_NOT_LINKED ?
+          process.env.OVERLEAF_OIDC_PROVIDER_HIDE_NOT_LINKED.toLowerCase() === 'true' : undefined,
+        linkPath: '/oidc/login',
+      },
+    }),
+  },
+
 }
 
 module.exports.mergeWith = function (overrides) {
diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json
index ef2a9c6a2c..bc67bede51 100644
--- a/services/web/frontend/extracted-translations.json
+++ b/services/web/frontend/extracted-translations.json
@@ -2140,6 +2140,7 @@
   "you_can_select_or_invite_collaborator": "",
   "you_can_select_or_invite_collaborator_plural": "",
   "you_can_still_use_your_premium_features": "",
+  "you_cant_add_or_change_password_due_to_ldap_or_sso": "",
   "you_cant_add_or_change_password_due_to_sso": "",
   "you_cant_join_this_group_subscription": "",
   "you_dont_have_any_add_ons_on_your_account": "",
diff --git a/services/web/frontend/js/features/settings/components/linking-section.tsx b/services/web/frontend/js/features/settings/components/linking-section.tsx
index a198cb1328..411d38e650 100644
--- a/services/web/frontend/js/features/settings/components/linking-section.tsx
+++ b/services/web/frontend/js/features/settings/components/linking-section.tsx
@@ -204,7 +204,8 @@ function SSOLinkingWidgetContainer({
   const { t } = useTranslation()
   const { unlink } = useSSOContext()
 
-  let description = ''
+  let description = subscription.provider.descriptionKey ||
+    `${t('login_with_service', { service: subscription.provider.name, })}.`
   switch (subscription.providerId) {
     case 'collabratec':
       description = t('linked_collabratec_description')
diff --git a/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx b/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx
index 800a7540ae..bb767d984c 100644
--- a/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx
+++ b/services/web/frontend/js/features/settings/components/linking/sso-widget.tsx
@@ -4,6 +4,7 @@ import { FetchError } from '../../../../infrastructure/fetch-json'
 import IEEELogo from '../../../../shared/svgs/ieee-logo'
 import GoogleLogo from '../../../../shared/svgs/google-logo'
 import OrcidLogo from '../../../../shared/svgs/orcid-logo'
+import OpenIDLogo from '../../../../shared/svgs/openid-logo'
 import LinkingStatus from './status'
 import OLButton from '@/features/ui/components/ol/ol-button'
 import OLModal, {
@@ -17,6 +18,7 @@ const providerLogos: { readonly [p: string]: JSX.Element } = {
   collabratec: <IEEELogo />,
   google: <GoogleLogo />,
   orcid: <OrcidLogo />,
+  oidc: <OpenIDLogo />,
 }
 
 type SSOLinkingWidgetProps = {
@@ -66,7 +68,7 @@ export function SSOLinkingWidget({
 
   return (
     <div className="settings-widget-container">
-      <div>{providerLogos[providerId]}</div>
+      <div>{providerLogos[providerId] || providerLogos['oidc']}</div>
       <div className="description-container">
         <div className="title-row">
           <h4 id={providerId}>{title}</h4>
diff --git a/services/web/frontend/js/features/settings/components/password-section.tsx b/services/web/frontend/js/features/settings/components/password-section.tsx
index 739636e998..c09ad50562 100644
--- a/services/web/frontend/js/features/settings/components/password-section.tsx
+++ b/services/web/frontend/js/features/settings/components/password-section.tsx
@@ -39,11 +39,7 @@ function CanOnlyLogInThroughSSO() {
   return (
     <p>
       <Trans
-        i18nKey="you_cant_add_or_change_password_due_to_sso"
-        components={[
-          // eslint-disable-next-line react/jsx-key, jsx-a11y/anchor-has-content
-          <a href="/learn/how-to/Logging_in_with_Group_single_sign-on" />,
-        ]}
+        i18nKey="you_cant_add_or_change_password_due_to_ldap_or_sso"
       />
     </p>
   )
diff --git a/services/web/frontend/js/shared/svgs/openid-logo.jsx b/services/web/frontend/js/shared/svgs/openid-logo.jsx
new file mode 100644
index 0000000000..3de933820b
--- /dev/null
+++ b/services/web/frontend/js/shared/svgs/openid-logo.jsx
@@ -0,0 +1,27 @@
+function OpenIDLogo() {
+  return (
+    <svg
+      width="40"
+      height="40"
+      viewBox="0 0 40 40"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect width="40" height="40" fill="white" />
+      <path
+        d="M18.185415 36.042565 23.298193 32.35627 23.060446 3.090316 18.185415 6.8918455Z"
+        fill="#ff8e00"
+      />
+      <path
+        d="M18.246064 36.042565C-0.37463741 32.997945 -1.0248032 15.054095 18.13083 11.143396l0.05944 3.322396 c -13.3672163 2.225847 -11.6629563 14.187201 0 15.92785l0.05944 3.127104Z"
+        fill="#626262"
+      />
+      <path
+        d="M23.219348 14.720521c2.279219 0.01577 4.262468 1.057732 6.237225 2.117891l-2.917255 2.176115h9.317022l0.05701 -6.371868 -2.917255 2.176115C30.03396 13.32315 27.308358 11.530342 23.169615 11.496378Z"
+        fill="#626262"
+      />
+    </svg>
+  )
+}
+
+export default OpenIDLogo
+
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 4b51bd2152..ca118ed322 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -2697,8 +2697,10 @@
   "you_can_select_or_invite_collaborator": "You can select or invite __count__ collaborator on your current plan. Upgrade to add more editors or reviewers.",
   "you_can_select_or_invite_collaborator_plural": "You can select or invite __count__ collaborators on your current plan. Upgrade to add more editors or reviewers.",
   "you_can_still_use_your_premium_features": "You can still use your premium features until the pause becomes active.",
+  "you_cant_add_or_change_password_due_to_ldap_or_sso": "You can’t add or change your password because your group or organization uses LDAP or SSO.",
   "you_cant_add_or_change_password_due_to_sso": "You can’t add or change your password because your group or organization uses <0>single sign-on (SSO)</0>.",
   "you_cant_join_this_group_subscription": "You can’t join this group subscription",
+  "you_cant_reset_password_due_to_ldap_or_sso": "You can’t reset your password because your group or organization uses LDAP or SSO. Contact your system administrator.",
   "you_cant_reset_password_due_to_sso": "You can’t reset your password because your group or organization uses SSO. <0>Log in with SSO</0>.",
   "you_dont_have_any_add_ons_on_your_account": "You don’t have any add-ons on your account.",
   "you_dont_have_any_repositories": "You don’t have any repositories",
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs
new file mode 100644
index 0000000000..1a3ed01d3c
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationController.mjs
@@ -0,0 +1,112 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import EmailHelper from '../../../../../app/src/Features/Helpers/EmailHelper.js'
+import { handleAuthenticateErrors } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import LDAPAuthenticationManager from './LDAPAuthenticationManager.mjs'
+
+const LDAPAuthenticationController = {
+  passportLogin(req, res, next) {
+    // This function is middleware which wraps the passport.authenticate middleware,
+    // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
+    // and send a `{redir: ""}` response on success
+    passport.authenticate(
+      'ldapauth',
+      { keepSessionInfo: true },
+      async function (err, user, info, status) {
+        if (err) { //we cannot be here as long as errors are treated as fails
+          return next(err)
+        }
+        if (user) {
+          // `user` is either a user object or false
+          AuthenticationController.setAuditInfo(req, {
+            method: 'LDAP password login',
+          })
+
+          try {
+            await AuthenticationController.promises.finishLogin(user, req, res)
+	    res.status(200)
+	    return
+          } catch (err) {
+            return next(err)
+          }
+        } else {
+          if (status != 401) {
+            logger.warn(status, 'LDAP: ' + info.message)
+          }
+          if (EmailHelper.parseEmail(req.body.email)) return next() //Try local authentication
+          if (info.redir != null) {
+            return res.json({ redir: info.redir })
+          } else {
+            res.status(status || info.status || 401)
+            delete info.status
+            info.type = 'error'
+            info.key = 'invalid-password-retry-or-reset'
+            const body = { message: info }
+            const { errorReason } = info
+            if (errorReason) {
+              body.errorReason = errorReason
+              delete info.errorReason
+            }
+            return res.json(body)
+          }
+        }
+      }
+    )(req, res, next)
+  },
+  async doPassportLogin(req, profile, done) {
+    let user, info
+    try {
+      ;({ user, info } = await LDAPAuthenticationController._doPassportLogin(
+        req,
+        profile
+      ))
+    } catch (error) {
+      return done(error)
+    }
+    return done(undefined, user, info)
+  },
+  async _doPassportLogin(req, profile) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'LDAP password login', fromKnownDevice },
+    }
+
+    let user, isPasswordReused
+    try {
+      user = await LDAPAuthenticationManager.promises.findOrCreateUser(profile, auditLog)
+    } catch (error) {
+      return {
+        user: false,
+        info: handleAuthenticateErrors(error, req),
+      }
+    }
+    if (user && AuthenticationController.captchaRequiredForLogin(req, user)) {
+      return {
+        user: false,
+        info: {
+          text: req.i18n.translate('cannot_verify_user_not_robot'),
+          type: 'error',
+          errorReason: 'cannot_verify_user_not_robot',
+          status: 400,
+        },
+      }
+    } else if (user) {
+      user.externalAuth = 'ldap'
+      return { user, info: undefined }
+    } else { //we cannot be here, something is terribly wrong
+      logger.debug({ email : profile.mail }, 'failed LDAP log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Unknown error',
+          status: 500,
+        },
+      }
+    }
+  },
+}
+
+export default LDAPAuthenticationController
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
similarity index 67%
rename from services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
rename to services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
index 1371f76d52..66943e82a3 100644
--- a/services/web/modules/ldap-authentication/app/src/AuthenticationManagerLdap.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
@@ -1,18 +1,13 @@
 import Settings from '@overleaf/settings'
 import { callbackify } from '@overleaf/promise-utils'
-import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
-import { User } from '../../../../app/src/models/User.js'
+import UserCreator from '../../../../../app/src/Features/User/UserCreator.js'
+import { ParallelLoginError } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { User } from '../../../../../app/src/models/User.js'
+import { splitFullName } from '../../../utils.mjs'
 
-const AuthenticationManagerLdap = {
-  splitFullName(fullName) {
-    fullName = fullName.trim();
-    let lastSpaceIndex = fullName.lastIndexOf(' ');
-    let firstNames = fullName.substring(0, lastSpaceIndex).trim();
-    let lastName = fullName.substring(lastSpaceIndex + 1).trim();
-    return [firstNames, lastName];
-  },
-  async findOrCreateLdapUser(profile, auditLog) {
-    //user is already authenticated in Ldap
+const LDAPAuthenticationManager = {
+  async findOrCreateUser(profile, auditLog) {
+    //user is already authenticated in LDAP
     const {
       attEmail,
       attFirstName,
@@ -28,7 +23,7 @@ const AuthenticationManagerLdap = {
                     : profile[attEmail].toLowerCase()
     let nameParts = ["",""]
     if ((!attFirstName || !attLastName) && attName) {
-      nameParts = this.splitFullName(profile[attName] || "")
+      nameParts = splitFullName(profile[attName] || "")
     }
     const firstName = attFirstName ? (profile[attFirstName] || "") : nameParts[0]
     let   lastName  = attLastName  ? (profile[attLastName]  || "") : nameParts[1]
@@ -40,6 +35,7 @@ const AuthenticationManagerLdap = {
                                                     profile[attAdmin] === valAdmin)
     }
     let user = await User.findOne({ 'email': email }).exec()
+
     if( !user ) {
       user = await UserCreator.promises.createNewUser(
         {
@@ -61,8 +57,12 @@ const AuthenticationManagerLdap = {
       userDetails.isAdmin = isAdmin
     }
     const result = await User.updateOne(
-      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
-      {}
+      { _id: user._id, loginEpoch: user.loginEpoch },
+      {
+        $inc: { loginEpoch: 1 },
+        $set: userDetails,
+        $unset: { hashedPassword: "" },
+      }
     ).exec()
     if (result.modifiedCount !== 1) {
       throw new ParallelLoginError()
@@ -72,9 +72,5 @@ const AuthenticationManagerLdap = {
 }
 
 export default {
-  findOrCreateLdapUser: callbackify(AuthenticationManagerLdap.findOrCreateLdapUser),
-  promises: AuthenticationManagerLdap,
+  promises: LDAPAuthenticationManager,
 }
-export const {
-  splitFullName,
-} = AuthenticationManagerLdap
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs b/services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs
new file mode 100644
index 0000000000..4557b4a4e4
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPContacts.mjs
@@ -0,0 +1,120 @@
+import Settings from '@overleaf/settings'
+import logger from '@overleaf/logger'
+import { promisify } from 'util'
+import passport from 'passport'
+import ldapjs from 'ldapauth-fork/node_modules/ldapjs/lib/index.js'
+import UserGetter from '../../../../../app/src/Features/User/UserGetter.js'
+import { splitFullName } from '../../../utils.mjs'
+
+function _searchLDAP(client, baseDN, options) {
+  return new Promise((resolve, reject) => {
+    const searchEntries = []
+    client.search(baseDN, options, (error, res) => {
+      if (error) {
+        reject(error)
+      } else {
+        res.on('searchEntry', entry => searchEntries.push(entry.object))
+        res.on('error', reject)
+        res.on('end', () => resolve(searchEntries))
+      }
+    })
+  })
+}
+
+async function fetchLDAPContacts(userId, contacts) {
+  if (!Settings.ldap?.enable || !process.env.OVERLEAF_LDAP_CONTACTS_FILTER) {
+    return []
+  }
+
+  const ldapOptions = passport._strategy('ldapauth').options.server
+  const { attEmail, attFirstName = "", attLastName = "", attName = "" } = Settings.ldap
+  const {
+    url,
+    timeout,
+    connectTimeout,
+    tlsOptions,
+    starttls,
+    bindDN,
+    bindCredentials
+  } = ldapOptions
+  const searchBase = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_BASE || ldapOptions.searchBase
+  const searchScope = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_SCOPE || 'sub'
+  const ldapConfig = { url, timeout, connectTimeout, tlsOptions }
+
+  let ldapUsers
+  let client
+
+  try {
+    await new Promise((resolve, reject) => {
+      client = ldapjs.createClient(ldapConfig)
+      client.on('error', (error) => { reject(error) })
+      client.on('connectTimeout', (error) => { reject(error) })
+      client.on('connect', () => { resolve() })
+    })
+
+    if (starttls) {
+      const starttlsAsync = promisify(client.starttls).bind(client)
+      await starttlsAsync(tlsOptions, null)
+    }
+    const bindAsync = promisify(client.bind).bind(client)
+    await bindAsync(bindDN, bindCredentials)
+
+    async function createContactsSearchFilter(client, ldapOptions, userId, contactsFilter) {
+      const searchProperty = process.env.OVERLEAF_LDAP_CONTACTS_PROPERTY
+      if (!searchProperty) {
+        return contactsFilter
+      }
+      const email = await UserGetter.promises.getUserEmail(userId)
+      const searchOptions = {
+        scope: ldapOptions.searchScope,
+        attributes: [searchProperty],
+        filter: `(${Settings.ldap.attEmail}=${email})`
+      }
+      const searchBase = ldapOptions.searchBase
+      const ldapUser = (await _searchLDAP(client, searchBase, searchOptions))[0]
+      const searchPropertyValue = ldapUser ? ldapUser[searchProperty]
+                                           : process.env.OVERLEAF_LDAP_CONTACTS_NON_LDAP_VALUE || 'IMATCHNOTHING'
+      return contactsFilter.replace(/{{userProperty}}/g, searchPropertyValue)
+    }
+
+    const filter = await createContactsSearchFilter(client, ldapOptions, userId, process.env.OVERLEAF_LDAP_CONTACTS_FILTER)
+    const searchOptions = { scope: searchScope, attributes: [attEmail, attFirstName, attLastName, attName], filter }
+
+    ldapUsers = await _searchLDAP(client, searchBase, searchOptions)
+  } catch (error) {
+    logger.warn({ error }, 'Error in fetchLDAPContacts')
+    return []
+  } finally {
+    client?.unbind()
+  }
+
+  const newLDAPContacts = ldapUsers.reduce((acc, ldapUser) => {
+    const email = Array.isArray(ldapUser[attEmail])
+                    ? ldapUser[attEmail][0]?.toLowerCase()
+                    : ldapUser[attEmail]?.toLowerCase()
+    if (!email) return acc
+    if (!contacts.some(contact => contact.email === email)) {
+      let nameParts = ["", ""]
+      if ((!attFirstName || !attLastName) && attName) {
+        nameParts = splitFullName(ldapUser[attName] || "")
+      }
+      const firstName = attFirstName ? (ldapUser[attFirstName] || "") : nameParts[0]
+      const lastName  = attLastName  ? (ldapUser[attLastName]  || "") : nameParts[1]
+      acc.push({
+        first_name: firstName,
+        last_name: lastName,
+        email: email,
+        type: 'user'
+      })
+    }
+    return acc
+  }, [])
+
+  return newLDAPContacts.sort((a, b) =>
+    a.last_name.localeCompare(b.last_name) ||
+    a.first_name.localeCompare(b.first_name) ||
+    a.email.localeCompare(b.email)
+  )
+}
+
+export default fetchLDAPContacts
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
new file mode 100644
index 0000000000..846ca9b158
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
@@ -0,0 +1,112 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import { Strategy as LDAPStrategy } from 'passport-ldapauth'
+import Settings from '@overleaf/settings'
+import PermissionsManager from '../../../../../app/src/Features/Authorization/PermissionsManager.js'
+import { readFilesContentFromEnv, numFromEnv, boolFromEnv } from '../../../utils.mjs'
+import LDAPAuthenticationController from './LDAPAuthenticationController.mjs'
+import fetchLDAPContacts from './LDAPContacts.mjs'
+
+const LDAPModuleManager = {
+  initSettings() {
+    Settings.ldap = {
+      enable: true,
+      placeholder:  process.env.OVERLEAF_LDAP_PLACEHOLDER || 'Username',
+      attEmail:     process.env.OVERLEAF_LDAP_EMAIL_ATT || 'mail',
+      attFirstName: process.env.OVERLEAF_LDAP_FIRST_NAME_ATT,
+      attLastName:  process.env.OVERLEAF_LDAP_LAST_NAME_ATT,
+      attName:      process.env.OVERLEAF_LDAP_NAME_ATT,
+      attAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT,
+      valAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT_VALUE,
+      updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN),
+    }
+  },
+  passportSetup(passport, callback) {
+    const ldapOptions = {
+      url: process.env.OVERLEAF_LDAP_URL,
+      bindDN: process.env.OVERLEAF_LDAP_BIND_DN || "",
+      bindCredentials: process.env.OVERLEAF_LDAP_BIND_CREDENTIALS || "",
+      bindProperty: process.env.OVERLEAF_LDAP_BIND_PROPERTY,
+      searchBase: process.env.OVERLEAF_LDAP_SEARCH_BASE,
+      searchFilter: process.env.OVERLEAF_LDAP_SEARCH_FILTER,
+      searchScope: process.env.OVERLEAF_LDAP_SEARCH_SCOPE || 'sub',
+      searchAttributes: JSON.parse(process.env.OVERLEAF_LDAP_SEARCH_ATTRIBUTES || '[]'),
+      groupSearchBase: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_BASE,
+      groupSearchFilter: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_FILTER,
+      groupSearchScope: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_SCOPE || 'sub',
+      groupSearchAttributes: ["dn"],
+      groupDnProperty: process.env.OVERLEAF_LDAP_ADMIN_DN_PROPERTY,
+      cache: boolFromEnv(process.env.OVERLEAF_LDAP_CACHE),
+      timeout: numFromEnv(process.env.OVERLEAF_LDAP_TIMEOUT),
+      connectTimeout: numFromEnv(process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT),
+      starttls: boolFromEnv(process.env.OVERLEAF_LDAP_STARTTLS),
+      tlsOptions: {
+        ca: readFilesContentFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_CA_PATH),
+        rejectUnauthorized: boolFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_REJECT_UNAUTH),
+      }
+    }
+    try {
+      passport.use(
+        new LDAPStrategy(
+          {
+            server: ldapOptions,
+            passReqToCallback: true,
+            usernameField: 'email',
+            passwordField: 'password',
+            handleErrorsAsFailures: true,
+          },
+          LDAPAuthenticationController.doPassportLogin
+        )
+      )
+      callback(null)
+    } catch (error) {
+      callback(error)
+    }
+  },
+
+  async getContacts(userId, contacts, callback) {
+    try {
+      const newContacts = await fetchLDAPContacts(userId, contacts)
+      callback(null, newContacts)
+    } catch (error) {
+      callback(error)
+    }
+  },
+
+  initPolicy() {
+    try {
+      PermissionsManager.registerCapability('change-password', { default : true })
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+    const ldapPolicyValidator = async ({ user, subscription }) => {
+// If user is not logged in, user.externalAuth is undefined,
+// in this case allow to change password if the user has a hashedPassword
+      return user.externalAuth === 'ldap' || (user.externalAuth === undefined && !user.hashedPassword)
+    }
+    try {
+    PermissionsManager.registerPolicy(
+      'ldapPolicy',
+      { 'change-password' : false },
+      { validator: ldapPolicyValidator }
+    )
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+  },
+  async getGroupPolicyForUser(user, callback) {
+    try {
+      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
+        user,
+        groupPolicy : { 'ldapPolicy' : true },
+        subscription : null
+      })
+      let groupPolicy = Object.fromEntries(userValidationMap)
+      callback(null,  {'groupPolicy' : groupPolicy })
+    } catch (error) {
+      callback(error)
+    }
+  },
+}
+
+export default LDAPModuleManager
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
new file mode 100644
index 0000000000..44d9d373d2
--- /dev/null
+++ b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
@@ -0,0 +1,19 @@
+import logger from '@overleaf/logger'
+import RateLimiterMiddleware from '../../../../../app/src/Features/Security/RateLimiterMiddleware.js'
+import CaptchaMiddleware from '../../../../../app/src/Features/Captcha/CaptchaMiddleware.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import { overleafLoginRateLimiter } from '../../../../../app/src/infrastructure/RateLimiter.js'
+import LDAPAuthenticationController from './LDAPAuthenticationController.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init LDAP router')
+    webRouter.post('/login',
+      RateLimiterMiddleware.rateLimit(overleafLoginRateLimiter), // rate limit IP (20 / 60s)
+      RateLimiterMiddleware.loginRateLimitEmail, // rate limit email (10 / 120s)
+      CaptchaMiddleware.validateCaptcha('login'),
+      LDAPAuthenticationController.passportLogin,
+      AuthenticationController.passportLogin,
+    )
+  },
+}
diff --git a/services/web/modules/authentication/ldap/index.mjs b/services/web/modules/authentication/ldap/index.mjs
new file mode 100644
index 0000000000..244a8db8e7
--- /dev/null
+++ b/services/web/modules/authentication/ldap/index.mjs
@@ -0,0 +1,17 @@
+let ldapModule = {}
+if (process.env.EXTERNAL_AUTH.includes('ldap')) {
+  const { default: LDAPModuleManager } = await import('./app/src/LDAPModuleManager.mjs')
+  const { default: router } = await import('./app/src/LDAPRouter.mjs')
+  LDAPModuleManager.initSettings()
+  LDAPModuleManager.initPolicy()
+  ldapModule = {
+    name: 'ldap-authentication',
+    hooks: {
+      passportSetup: LDAPModuleManager.passportSetup,
+      getContacts: LDAPModuleManager.getContacts,
+      getGroupPolicyForUser: LDAPModuleManager.getGroupPolicyForUser,
+    },
+    router: router,
+  }
+}
+export default ldapModule
diff --git a/services/web/modules/authentication/logout.mjs b/services/web/modules/authentication/logout.mjs
new file mode 100644
index 0000000000..4163cf536d
--- /dev/null
+++ b/services/web/modules/authentication/logout.mjs
@@ -0,0 +1,18 @@
+let SAMLAuthenticationController 
+if (process.env.EXTERNAL_AUTH.includes('saml')) {
+  SAMLAuthenticationController = await import('./saml/app/src/SAMLAuthenticationController.mjs')
+}
+let OIDCAuthenticationController 
+if (process.env.EXTERNAL_AUTH.includes('oidc')) {
+  OIDCAuthenticationController = await import('./oidc/app/src/OIDCAuthenticationController.mjs')
+}
+export default async function logout(req, res, next) {
+  switch(req.user.externalAuth) {
+    case 'saml':
+      return SAMLAuthenticationController.default.passportLogout(req, res, next)
+    case 'oidc':
+      return OIDCAuthenticationController.default.passportLogout(req, res, next)
+    default: 
+      next()
+  }
+}
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
new file mode 100644
index 0000000000..42c01e712f
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
@@ -0,0 +1,171 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import ThirdPartyIdentityManager from '../../../../../app/src/Features/User/ThirdPartyIdentityManager.js'
+import OIDCAuthenticationManager from './OIDCAuthenticationManager.mjs'
+import { acceptsJson } from '../../../../../app/src/infrastructure/RequestContentTypeDetection.js'
+
+const OIDCAuthenticationController = {
+  passportLogin(req, res, next) {
+    req.session.intent = req.query.intent
+    passport.authenticate('openidconnect')(req, res, next)
+  },
+  passportLoginCallback(req, res, next) {
+    passport.authenticate(
+      'openidconnect',
+      { keepSessionInfo: true },
+      async function (err, user, info) {
+        if (err) {
+          return next(err)
+        }
+        if(req.session.intent === 'link') {
+          delete req.session.intent
+// After linking, log out from the OIDC provider and redirect back to '/user/settings'.
+// Keycloak supports this; Authentik does not (yet).
+          const logoutUrl = process.env.OVERLEAF_OIDC_LOGOUT_URL
+          const redirectUri = `${Settings.siteUrl.replace(/\/+$/, '')}/user/settings`
+          return res.redirect(`${logoutUrl}?id_token_hint=${info.idToken}&post_logout_redirect_uri=${encodeURIComponent(redirectUri)}`)
+	}
+        if (user) {
+          req.session.idToken = info.idToken
+          user.externalAuth = 'oidc'
+          // `user` is either a user object or false
+          AuthenticationController.setAuditInfo(req, {
+            method: 'OIDC login',
+          })
+          try {
+            await AuthenticationController.promises.finishLogin(user, req, res)
+          } catch (err) {
+            return next(err)
+          }
+        } else {
+          if (info.redir != null) {
+            return res.json({ redir: info.redir })
+          } else {
+            res.status(info.status || 401)
+            delete info.status
+            const body = { message: info }
+            return res.json(body)
+          }
+        }
+      }
+    )(req, res, next)
+  },
+  async doPassportLogin(req, issuer, profile, context, idToken, accessToken, refreshToken, done) {
+    let user, info
+    try {
+      if(req.session.intent === 'link') {
+        ;({ user, info } = await OIDCAuthenticationController._doLink(
+          req,
+          profile
+        ))
+      } else {
+        ;({ user, info } = await OIDCAuthenticationController._doLogin(
+          req,
+          profile
+        ))
+      }
+    } catch (error) {
+      return done(error)
+    }
+    if (user) {
+      info = {
+        ...(info || {}),
+        idToken: idToken
+      }
+    }
+    return done(null, user, info)
+  },
+  async _doLogin(req, profile) {
+    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
+    const auditLog = {
+      ipAddress: req.ip,
+      info: { method: 'OIDC login', fromKnownDevice },
+    }
+
+    let user
+    try {
+      user = await OIDCAuthenticationManager.promises.findOrCreateUser(profile, auditLog)
+    } catch (error) {
+      logger.debug({ email : profile.emails[0].value }, `OIDC login failed: ${error}`)
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: error.message,
+          status: 401,
+        },
+      }
+    }
+    if (user) {
+      return { user, info: undefined }
+    } else { // we cannot be here, something is terribly wrong
+      logger.debug({ email : profile.emails[0].value }, 'failed OIDC log in')
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Unknown error',
+          status: 500,
+        },
+      }
+    }
+  },
+  async _doLink(req, profile) {
+    const { user: { _id: userId }, ip } = req
+    try {
+      const auditLog = {
+        ipAddress: ip,
+        initiatorId: userId,
+      }
+      await OIDCAuthenticationManager.promises.linkAccount(userId, profile, auditLog)
+    } catch (error) {
+      logger.error(error.info, error.message)
+      return {
+        user: true,
+        info: {
+          type: 'error',
+          text: error.message,
+          status: 200,
+        },
+      }
+    }
+    return { user: true, info: undefined }
+  },
+  async unlinkAccount(req, res, next) {
+    try {
+      const { user: { _id: userId }, body: { providerId }, ip } = req
+      const auditLog = {
+        ipAddress: ip,
+        initiatorId: userId,
+      }
+      await ThirdPartyIdentityManager.promises.unlink(userId, providerId, auditLog)
+      return res.status(200).end()
+    } catch (error) {
+      logger.error(error.info, error.message)
+      return {
+        user: false,
+        info: {
+          type: 'error',
+          text: 'Can not unlink account',
+          status: 200,
+	}
+      }
+    }
+  },
+  async passportLogout(req, res, next) {
+// TODO: instead of storing idToken in session, use refreshToken to obtain a new idToken?
+    const idTokenHint = req.session.idToken
+    await UserController.promises.doLogout(req)
+    const logoutUrl = process.env.OVERLEAF_OIDC_LOGOUT_URL
+    const redirectUri = Settings.siteUrl
+    res.redirect(`${logoutUrl}?id_token_hint=${idTokenHint}&post_logout_redirect_uri=${encodeURIComponent(redirectUri)}`)
+  },
+  passportLogoutCallback(req, res, next) {
+    const redirectUri = Settings.siteUrl
+    res.redirect(redirectUri)
+  },
+}
+export default OIDCAuthenticationController
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
new file mode 100644
index 0000000000..56ec2e5455
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -0,0 +1,94 @@
+import Settings from '@overleaf/settings'
+import UserCreator from '../../../../../app/src/Features/User/UserCreator.js'
+import ThirdPartyIdentityManager from '../../../../../app/src/Features/User/ThirdPartyIdentityManager.js'
+import { ParallelLoginError } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { User } from '../../../../../app/src/models/User.js'
+
+const OIDCAuthenticationManager = {
+  async findOrCreateUser(profile, auditLog) {
+    const {
+      attUserId,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+      providerId,
+    } = Settings.oidc
+    const oidcUserId = profile[attUserId]
+    const email = profile.emails[0].value
+    const firstName = profile.name?.givenName || ""
+    const lastName  = profile.name?.familyName || ""
+    let isAdmin = false
+    if (attAdmin && valAdmin) {
+      if (attAdmin === 'email') {
+        isAdmin = (email === valAdmin)
+      } else {
+        isAdmin = (profile[attAdmin] === valAdmin)
+      }
+    }
+    const oidcUserData = null // Possibly it can be used later
+    let user
+    try {
+      user = await ThirdPartyIdentityManager.promises.login(providerId, oidcUserId, oidcUserData)
+    } catch {
+// A user with the specified OIDC ID and provider ID is not found. Search for a user with the given email.
+// If no user exists with this email, create a new user and link the OIDC account to it.
+// If a user exists but no account from the specified OIDC provider is linked to this user, link the OIDC account to this user.
+// If an account from the specified provider is already linked to this user, unlink it, and link the OIDC account to this user.
+// (Is it safe? Concider: If an account from the specified provider is already linked to this user, throw an error)
+      user = await User.findOne({ 'email': email }).exec()
+      if (!user) {
+        user = await UserCreator.promises.createNewUser(
+          {
+            email: email,
+            first_name: firstName,
+            last_name: lastName,
+            isAdmin: isAdmin,
+            holdingAccount: false,
+          }
+        )
+      }
+//    const alreadyLinked = user.thirdPartyIdentifiers.some(item => item.providerId === providerId)
+//    if (!alreadyLinked) {
+        auditLog.initiatorId = user._id
+        await ThirdPartyIdentityManager.promises.link(user._id, providerId, oidcUserId, oidcUserData, auditLog)
+        await User.updateOne(
+          { _id: user._id },
+          { $set : {
+             'emails.0.confirmedAt': Date.now(), //email of external user is confirmed
+            },
+          }
+        ).exec()
+//    } else {
+//      throw new Error(`Overleaf user ${user.email} is already linked to another ${providerId} user`)
+//    }
+    }
+
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if (attAdmin && valAdmin) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
+      {}
+    ).exec()
+
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+  async linkAccount(userId, profile, auditLog) {
+    const {
+      attUserId,
+      providerId,
+    } = Settings.oidc
+    const oidcUserId = profile[attUserId]
+    const oidcUserData = null // Possibly it can be used later
+    await ThirdPartyIdentityManager.promises.link(userId, providerId, oidcUserId, oidcUserData, auditLog)
+  },
+}
+
+export default {
+  promises: OIDCAuthenticationManager,
+}
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
new file mode 100644
index 0000000000..3a2e6e2780
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -0,0 +1,82 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { readFilesContentFromEnv, numFromEnv, boolFromEnv } from '../../../utils.mjs'
+import PermissionsManager from '../../../../../app/src/Features/Authorization/PermissionsManager.js'
+import OIDCAuthenticationController from './OIDCAuthenticationController.mjs'
+import { Strategy as OIDCStrategy } from 'passport-openidconnect'
+
+const OIDCModuleManager = {
+  initSettings() {
+    let providerId = process.env.OVERLEAF_OIDC_PROVIDER_ID || 'oidc'
+    Settings.oidc = {
+      enable: true,
+      providerId:   providerId,
+      identityServiceName: process.env.OVERLEAF_OIDC_IDENTITY_SERVICE_NAME || `Log in with ${Settings.oauthProviders[providerId].name}`,
+      attUserId:    process.env.OVERLEAF_OIDC_USER_ID_FIELD || 'id',
+      attAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD,
+      valAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD_VALUE,
+      updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_OIDC_UPDATE_USER_DETAILS_ON_LOGIN),
+    }
+  },
+  passportSetup(passport, callback) {
+    const oidcOptions = {
+      issuer: process.env.OVERLEAF_OIDC_ISSUER,
+      authorizationURL: process.env.OVERLEAF_OIDC_AUTHORIZATION_URL,
+      tokenURL: process.env.OVERLEAF_OIDC_TOKEN_URL,
+      userInfoURL: process.env.OVERLEAF_OIDC_USER_INFO_URL,
+      clientID: process.env.OVERLEAF_OIDC_CLIENT_ID,
+      clientSecret: process.env.OVERLEAF_OIDC_CLIENT_SECRET,
+      callbackURL: `${Settings.siteUrl.replace(/\/+$/, '')}/oidc/login/callback`,
+      scope: process.env.OVERLEAF_OIDC_SCOPE || 'openid profile email',
+      passReqToCallback: true,
+    }
+    try {
+      passport.use(
+        new OIDCStrategy(
+          oidcOptions,
+          OIDCAuthenticationController.doPassportLogin
+        )
+      )
+      callback(null)
+    } catch (error) {
+      callback(error)
+    }
+  },
+  initPolicy() {
+    try {
+      PermissionsManager.registerCapability('change-password', { default : true })
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+    const oidcPolicyValidator = async ({ user, subscription }) => {
+// If user is not logged in, user.externalAuth is undefined,
+// in this case allow to change password if the user has a hashedPassword
+      return user.externalAuth === 'oidc' || (user.externalAuth === undefined && !user.hashedPassword)
+    }
+    try {
+    PermissionsManager.registerPolicy(
+      'oidcPolicy',
+      { 'change-password' : false },
+      { validator: oidcPolicyValidator }
+    )
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+  },
+  async getGroupPolicyForUser(user, callback) {
+    try {
+      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
+        user,
+        groupPolicy : { 'oidcPolicy' : true },
+        subscription : null
+      })
+      let groupPolicy = Object.fromEntries(userValidationMap)
+      callback(null,  {'groupPolicy' : groupPolicy })
+    } catch (error) {
+      callback(error)
+    }
+  },
+}
+
+export default OIDCModuleManager
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
new file mode 100644
index 0000000000..519fa5043a
--- /dev/null
+++ b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
@@ -0,0 +1,15 @@
+import logger from '@overleaf/logger'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import OIDCAuthenticationController from './OIDCAuthenticationController.mjs'
+import logout from '../../../logout.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init OIDC router')
+    webRouter.get('/oidc/login', OIDCAuthenticationController.passportLogin)
+    webRouter.get('/oidc/login/callback', OIDCAuthenticationController.passportLoginCallback)
+    webRouter.get('/oidc/logout/callback', OIDCAuthenticationController.passportLogoutCallback)
+    webRouter.post('/user/oauth-unlink', OIDCAuthenticationController.unlinkAccount)
+    webRouter.post('/logout', logout, UserController.logout)
+  },
+}
diff --git a/services/web/modules/authentication/oidc/index.mjs b/services/web/modules/authentication/oidc/index.mjs
new file mode 100644
index 0000000000..51d9e0d483
--- /dev/null
+++ b/services/web/modules/authentication/oidc/index.mjs
@@ -0,0 +1,16 @@
+let oidcModule = {}
+if (process.env.EXTERNAL_AUTH.includes('oidc')) {
+  const { default: OIDCModuleManager } = await import('./app/src/OIDCModuleManager.mjs')
+  const { default: router } = await import('./app/src/OIDCRouter.mjs')
+  OIDCModuleManager.initSettings()
+  OIDCModuleManager.initPolicy()
+  oidcModule = {
+    name: 'oidc-authentication',
+    hooks: {
+      passportSetup: OIDCModuleManager.passportSetup,
+      getGroupPolicyForUser: OIDCModuleManager.getGroupPolicyForUser,
+    },
+    router: router,
+  }
+}
+export default oidcModule
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
similarity index 65%
rename from services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
rename to services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
index f5db3f738d..ac0e5398b2 100644
--- a/services/web/modules/saml-authentication/app/src/AuthenticationControllerSaml.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
@@ -1,15 +1,16 @@
 import Settings from '@overleaf/settings'
 import logger from '@overleaf/logger'
 import passport from 'passport'
-import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
-import AuthenticationManagerSaml from './AuthenticationManagerSaml.mjs'
-import UserController from '../../../../app/src/Features/User/UserController.js'
-import UserSessionsManager from '../../../../app/src/Features/User/UserSessionsManager.js'
-import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
-import { xmlResponse } from '../../../../app/src/infrastructure/Response.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import SAMLAuthenticationManager from './SAMLAuthenticationManager.mjs'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import UserSessionsManager from '../../../../../app/src/Features/User/UserSessionsManager.js'
+import { handleAuthenticateErrors } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import { xmlResponse } from '../../../../../app/src/infrastructure/Response.js'
+import { readFilesContentFromEnv } from '../../../utils.mjs'
 
-const AuthenticationControllerSaml = {
-  passportSamlAuthWithIdP(req, res, next) {
+const SAMLAuthenticationController = {
+  passportLogin(req, res, next) {
     if ( passport._strategy('saml')._saml.options.authnRequestBinding === 'HTTP-POST') {
       const csp = res.getHeader('Content-Security-Policy')
       if (csp) {
@@ -21,7 +22,7 @@ const AuthenticationControllerSaml = {
     }
     passport.authenticate('saml')(req, res, next)
   },
-  passportSamlLogin(req, res, next) {
+  passportLoginCallback(req, res, next) {
     // This function is middleware which wraps the passport.authenticate middleware,
     // so we can send back our custom `{message: {text: "", type: ""}}` responses on failure,
     // and send a `{redir: ""}` response on success
@@ -46,24 +47,19 @@ const AuthenticationControllerSaml = {
           if (info.redir != null) {
             return res.json({ redir: info.redir })
           } else {
-            res.status(info.status || 200)
+            res.status(info.status || 401)
             delete info.status
             const body = { message: info }
-            const { errorReason } = info
-            if (errorReason) {
-              body.errorReason = errorReason
-              delete info.errorReason
-            }
             return res.json(body)
           }
         }
       }
     )(req, res, next)
   },
-  async doPassportSamlLogin(req, profile, done) {
+  async doPassportLogin(req, profile, done) {
     let user, info
     try {
-      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogin(
+      ;({ user, info } = await SAMLAuthenticationController._doPassportLogin(
         req,
         profile
       ))
@@ -72,7 +68,7 @@ const AuthenticationControllerSaml = {
     }
     return done(undefined, user, info)
   },
-  async _doPassportSamlLogin(req, profile) {
+  async _doPassportLogin(req, profile) {
     const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
     const auditLog = {
       ipAddress: req.ip,
@@ -81,7 +77,7 @@ const AuthenticationControllerSaml = {
 
     let user
     try {
-      user = await AuthenticationManagerSaml.promises.findOrCreateSamlUser(profile, auditLog)
+      user = await SAMLAuthenticationManager.promises.findOrCreateUser(profile, auditLog)
     } catch (error) {
       return {
         user: false,
@@ -89,9 +85,10 @@ const AuthenticationControllerSaml = {
       }
     }
     if (user) {
+      user.externalAuth = 'saml'
       req.session.saml_extce = {nameID : profile.nameID, sessionIndex : profile.sessionIndex}
       return { user, info: undefined }
-    } else { //something wrong
+    } else { // we cannot be here, something is terribly wrong
       logger.debug({ email : profile.mail }, 'failed SAML log in')
       return {
         user: false,
@@ -103,23 +100,24 @@ const AuthenticationControllerSaml = {
       }
     }
   },
-  async passportSamlSPLogout(req, res, next) {
+  async passportLogout(req, res, next) {
     passport._strategy('saml').logout(req, async (err, url) => {
-      if (err) logger.error({ err }, 'can not generate logout url')
       await UserController.promises.doLogout(req)
+      if (err) return next(err)
       res.redirect(url)
     })
   },
-  passportSamlIdPLogout(req, res, next) {
+  passportLogoutCallback(req, res, next) {
+//TODO: is it possible to close the editor?
     passport.authenticate('saml')(req, res, (err) => {
       if (err) return next(err)
       res.redirect('/login');
     })
   },
-  async doPassportSamlLogout(req, profile, done) {
+  async doPassportLogout(req, profile, done) {
     let user, info
     try {
-      ;({ user, info } = await AuthenticationControllerSaml._doPassportSamlLogout(
+      ;({ user, info } = await SAMLAuthenticationController._doPassportLogout(
         req,
         profile
       ))
@@ -128,7 +126,7 @@ const AuthenticationControllerSaml = {
     }
     return done(undefined, user, info)
   },
-  async _doPassportSamlLogout(req, profile) {
+  async _doPassportLogout(req, profile) {
     if (req?.session?.saml_extce?.nameID === profile.nameID &&
         req?.session?.saml_extce?.sessionIndex === profile.sessionIndex) {
       profile = req.user
@@ -138,23 +136,15 @@ const AuthenticationControllerSaml = {
     })
     return { user: profile, info: undefined }
   },
-  passportSamlMetadata(req, res) {
+  getSPMetadata(req, res) {
     const samlStratery = passport._strategy('saml')
     res.setHeader('Content-Disposition', `attachment; filename="${samlStratery._saml.options.issuer}-meta.xml"`)
     xmlResponse(res,
       samlStratery.generateServiceProviderMetadata(
-        samlStratery._saml.options.decryptionCert,
-        samlStratery._saml.options.signingCert
+        readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_CERT),
+        readFilesContentFromEnv(process.env.OVERLEAF_SAML_PUBLIC_CERT)
       )
     )
   },
 }
-export const {
-  passportSamlAuthWithIdP,
-  passportSamlLogin,
-  passportSamlSPLogout,
-  passportSamlIdPLogout,
-  doPassportSamlLogin,
-  doPassportSamlLogout,
-  passportSamlMetadata,
-} = AuthenticationControllerSaml
+export default SAMLAuthenticationController
diff --git a/services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs
new file mode 100644
index 0000000000..80c4e30ea7
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationManager.mjs
@@ -0,0 +1,85 @@
+import Settings from '@overleaf/settings'
+import UserCreator from '../../../../../app/src/Features/User/UserCreator.js'
+import { ParallelLoginError } from '../../../../../app/src/Features/Authentication/AuthenticationErrors.js'
+import SAMLIdentityManager from '../../../../../app/src/Features/User/SAMLIdentityManager.js'
+import { User } from '../../../../../app/src/models/User.js'
+
+const SAMLAuthenticationManager = {
+  async findOrCreateUser(profile, auditLog) {
+    const {
+      attUserId,
+      attEmail,
+      attFirstName,
+      attLastName,
+      attAdmin,
+      valAdmin,
+      updateUserDetailsOnLogin,
+    } = Settings.saml
+    const externalUserId = profile[attUserId]
+    const email = Array.isArray(profile[attEmail])
+                    ? profile[attEmail][0].toLowerCase()
+                    : profile[attEmail].toLowerCase()
+    const firstName = attFirstName ? profile[attFirstName] : ""
+    const lastName  = attLastName  ? profile[attLastName] : email
+    let isAdmin = false
+    if (attAdmin && valAdmin) {
+      isAdmin = (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
+                                                    profile[attAdmin] === valAdmin)
+    }
+    const providerId = '1' // for now, only one fixed IdP is supported
+// We search for a SAML user, and if none is found, we search for a user with the given email. If a user is found,
+// we update the user to be a SAML user, otherwise, we create a new SAML user with the given email. In the case of
+// multiple SAML IdPs, one would have to do something similar, or possibly report an error like
+// 'the email is associated with the wrong IdP'
+    let user = await SAMLIdentityManager.getUser(providerId, externalUserId, attUserId)
+    if (!user) {
+      user = await User.findOne({ 'email': email }).exec()
+      if (!user) {
+        user = await UserCreator.promises.createNewUser(
+          {
+            email: email,
+            first_name: firstName,
+            last_name: lastName,
+            isAdmin: isAdmin,
+            holdingAccount: false,
+            samlIdentifiers: [{ providerId: providerId }],
+          }
+        )
+      }
+      // cannot use SAMLIdentityManager.linkAccounts because affilations service is not there
+      await User.updateOne(
+        { _id: user._id },
+        {
+          $set : {
+           'emails.0.confirmedAt': Date.now(), //email of saml user is confirmed
+           'emails.0.samlProviderId': providerId,
+           'samlIdentifiers.0.providerId': providerId,
+           'samlIdentifiers.0.externalUserId': externalUserId,
+           'samlIdentifiers.0.userIdAttribute': attUserId,
+          },
+        }
+      ).exec()
+    }
+    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
+    if (attAdmin && valAdmin) {
+      user.isAdmin = isAdmin
+      userDetails.isAdmin = isAdmin
+    }
+    const result = await User.updateOne(
+      { _id: user._id, loginEpoch: user.loginEpoch },
+      {
+        $inc: { loginEpoch: 1 },
+        $set: userDetails,
+        $unset: { hashedPassword: "" },
+      },
+    ).exec()
+    if (result.modifiedCount !== 1) {
+      throw new ParallelLoginError()
+    }
+    return user
+  },
+}
+
+export default {
+  promises: SAMLAuthenticationManager,
+}
diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
new file mode 100644
index 0000000000..c7efdef214
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
@@ -0,0 +1,100 @@
+import logger from '@overleaf/logger'
+import passport from 'passport'
+import Settings from '@overleaf/settings'
+import { readFilesContentFromEnv, numFromEnv, boolFromEnv } from '../../../utils.mjs'
+import PermissionsManager from '../../../../../app/src/Features/Authorization/PermissionsManager.js'
+import SAMLAuthenticationController from './SAMLAuthenticationController.mjs'
+import { Strategy as SAMLStrategy } from '@node-saml/passport-saml'
+
+const SAMLModuleManager = {
+  initSettings() {
+  Settings.saml = {
+    enable: true,
+    identityServiceName: process.env.OVERLEAF_SAML_IDENTITY_SERVICE_NAME || 'Log in with SAML IdP',
+    attUserId:    process.env.OVERLEAF_SAML_USER_ID_FIELD || 'nameID',
+    attEmail:     process.env.OVERLEAF_SAML_EMAIL_FIELD || 'nameID',
+    attFirstName: process.env.OVERLEAF_SAML_FIRST_NAME_FIELD || 'givenName',
+    attLastName:  process.env.OVERLEAF_SAML_LAST_NAME_FIELD || 'lastName',
+    attAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD,
+    valAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD_VALUE,
+    updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN),
+  }
+},
+  passportSetup(passport, callback) {
+    const samlOptions = {
+      entryPoint: process.env.OVERLEAF_SAML_ENTRYPOINT,
+      callbackUrl: `${Settings.siteUrl.replace(/\/+$/, '')}/saml/login/callback`,
+      issuer: process.env.OVERLEAF_SAML_ISSUER,
+      audience: process.env.OVERLEAF_SAML_AUDIENCE,
+      cert: readFilesContentFromEnv(process.env.OVERLEAF_SAML_IDP_CERT),
+      privateKey:  readFilesContentFromEnv(process.env.OVERLEAF_SAML_PRIVATE_KEY),
+      decryptionPvk:  readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_PVK),
+      signatureAlgorithm: process.env.OVERLEAF_SAML_SIGNATURE_ALGORITHM,
+      additionalParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_PARAMS || '{}'),
+      additionalAuthorizeParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_AUTHORIZE_PARAMS || '{}'),
+      identifierFormat: process.env.OVERLEAF_SAML_IDENTIFIER_FORMAT,
+      acceptedClockSkewMs: numFromEnv(process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS),
+      attributeConsumingServiceIndex: process.env.OVERLEAF_SAML_ATTRIBUTE_CONSUMING_SERVICE_INDEX,
+      authnContext: process.env.OVERLEAF_SAML_AUTHN_CONTEXT ? JSON.parse(process.env.OVERLEAF_SAML_AUTHN_CONTEXT) : undefined,
+      forceAuthn: boolFromEnv(process.env.OVERLEAF_SAML_FORCE_AUTHN),
+      disableRequestedAuthnContext: boolFromEnv(process.env.OVERLEAF_SAML_DISABLE_REQUESTED_AUTHN_CONTEXT),
+      skipRequestCompression: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING === 'HTTP-POST',  // compression should be skipped iff authnRequestBinding is POST
+      authnRequestBinding: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING,
+      validateInResponseTo: process.env.OVERLEAF_SAML_VALIDATE_IN_RESPONSE_TO,
+      requestIdExpirationPeriodMs: numFromEnv(process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS),
+      // cacheProvider: process.env.OVERLEAF_SAML_CACHE_PROVIDER,
+      logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
+      logoutCallbackUrl: `${Settings.siteUrl.replace(/\/+$/, '')}/saml/logout/callback`,
+      additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
+      passReqToCallback: true,
+    }
+    try {
+      passport.use(
+        new SAMLStrategy(
+          samlOptions,
+          SAMLAuthenticationController.doPassportLogin,
+          SAMLAuthenticationController.doPassportLogout
+        )
+      )
+      callback(null)
+    } catch (error) {
+      callback(error)
+    }
+  },
+  initPolicy() {
+    try {
+      PermissionsManager.registerCapability('change-password', { default : true })
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+    const samlPolicyValidator = async ({ user, subscription }) => {
+// If user is not logged in, user.externalAuth is undefined,
+// in this case allow to change password if the user has a hashedPassword
+      return user.externalAuth === 'saml' || (user.externalAuth === undefined && !user.hashedPassword)
+    }
+    try {
+    PermissionsManager.registerPolicy(
+      'samlPolicy',
+      { 'change-password' : false },
+      { validator: samlPolicyValidator }
+    )
+    } catch (error) {
+      logger.info({}, error.message)
+    }
+  },
+  async getGroupPolicyForUser(user, callback) {
+    try {
+      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
+        user,
+        groupPolicy : { 'samlPolicy' : true },
+        subscription : null
+      })
+      let groupPolicy = Object.fromEntries(userValidationMap)
+      callback(null,  {'groupPolicy' : groupPolicy })
+    } catch (error) {
+      callback(error)
+    }
+  },
+}
+
+export default SAMLModuleManager
diff --git a/services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs b/services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs
new file mode 100644
index 0000000000..c0d617b299
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLNonCsrfRouter.mjs
@@ -0,0 +1,11 @@
+import logger from '@overleaf/logger'
+import SAMLAuthenticationController from './SAMLAuthenticationController.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML NonCsrfRouter')
+    webRouter.post('/saml/login/callback', SAMLAuthenticationController.passportLoginCallback)
+    webRouter.get ('/saml/logout/callback', SAMLAuthenticationController.passportLogoutCallback)
+    webRouter.post('/saml/logout/callback', SAMLAuthenticationController.passportLogoutCallback)
+  },
+}
diff --git a/services/web/modules/authentication/saml/app/src/SAMLRouter.mjs b/services/web/modules/authentication/saml/app/src/SAMLRouter.mjs
new file mode 100644
index 0000000000..3cd6e56e2d
--- /dev/null
+++ b/services/web/modules/authentication/saml/app/src/SAMLRouter.mjs
@@ -0,0 +1,16 @@
+import logger from '@overleaf/logger'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
+import UserController from '../../../../../app/src/Features/User/UserController.js'
+import SAMLAuthenticationController from './SAMLAuthenticationController.mjs'
+import logout from '../../../logout.mjs'
+
+export default {
+  apply(webRouter) {
+    logger.debug({}, 'Init SAML router')
+    webRouter.get('/saml/login', SAMLAuthenticationController.passportLogin)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/login')
+    webRouter.get('/saml/meta', SAMLAuthenticationController.getSPMetadata)
+    AuthenticationController.addEndpointToLoginWhitelist('/saml/meta')
+    webRouter.post('/logout', logout, UserController.logout)
+  },
+}
diff --git a/services/web/modules/authentication/saml/index.mjs b/services/web/modules/authentication/saml/index.mjs
new file mode 100644
index 0000000000..2d6ee5706c
--- /dev/null
+++ b/services/web/modules/authentication/saml/index.mjs
@@ -0,0 +1,18 @@
+let samlModule = {}
+if (process.env.EXTERNAL_AUTH.includes('saml')) {
+  const { default: SAMLModuleManager } = await import('./app/src/SAMLModuleManager.mjs')
+  const { default: router } = await import('./app/src/SAMLRouter.mjs')
+  const { default: nonCsrfRouter } = await import('./app/src/SAMLNonCsrfRouter.mjs')
+  SAMLModuleManager.initSettings()
+  SAMLModuleManager.initPolicy()
+  samlModule = {
+    name: 'saml-authentication',
+    hooks: {
+      passportSetup: SAMLModuleManager.passportSetup,
+      getGroupPolicyForUser: SAMLModuleManager.getGroupPolicyForUser,
+    },
+    router: router,
+    nonCsrfRouter: nonCsrfRouter,
+  }
+}
+export default samlModule
diff --git a/services/web/modules/authentication/utils.mjs b/services/web/modules/authentication/utils.mjs
new file mode 100644
index 0000000000..468dae32b1
--- /dev/null
+++ b/services/web/modules/authentication/utils.mjs
@@ -0,0 +1,42 @@
+import fs from 'fs'
+function readFilesContentFromEnv(envVar) {
+// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
+  if (!envVar) return undefined
+  try {
+    const parsedFileNames = JSON.parse(envVar)
+    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
+  } catch (error) {
+    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
+      return fs.readFileSync(envVar, 'utf8')
+    } else {
+      throw error
+    }
+  }
+}
+function numFromEnv(env) {
+  return env ? Number(env) : undefined
+}
+function boolFromEnv(env) {
+  if (env === undefined || env === null) return undefined
+  if (typeof env === "string") {
+    const envLower = env.toLowerCase()
+    if (envLower === 'true') return true
+    if (envLower === 'false') return false
+  }
+  throw new Error("Invalid value for boolean envirionment variable")
+}
+
+function splitFullName(fullName) {
+  fullName = fullName.trim();
+  let lastSpaceIndex = fullName.lastIndexOf(' ');
+  let firstNames = fullName.substring(0, lastSpaceIndex).trim();
+  let lastName = fullName.substring(lastSpaceIndex + 1).trim();
+  return [firstNames, lastName];
+}
+
+export {
+  readFilesContentFromEnv,
+  numFromEnv,
+  boolFromEnv,
+  splitFullName,
+}
diff --git a/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs b/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
deleted file mode 100644
index 64fa4f5a96..0000000000
--- a/services/web/modules/ldap-authentication/app/src/AuthenticationControllerLdap.mjs
+++ /dev/null
@@ -1,64 +0,0 @@
-import logger from '@overleaf/logger'
-import LoginRateLimiter from '../../../../app/src/Features/Security/LoginRateLimiter.js'
-import { handleAuthenticateErrors } from '../../../../app/src/Features/Authentication/AuthenticationErrors.js'
-import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
-import AuthenticationManagerLdap from './AuthenticationManagerLdap.mjs'
-
-const AuthenticationControllerLdap = {
-  async doPassportLdapLogin(req, ldapUser, done) {
-    let user, info
-    try {
-      ;({ user, info } = await AuthenticationControllerLdap._doPassportLdapLogin(
-        req,
-        ldapUser
-      ))
-    } catch (error) {
-      return done(error)
-    }
-    return done(undefined, user, info)
-  },
-  async _doPassportLdapLogin(req, ldapUser) {
-    const { fromKnownDevice } = AuthenticationController.getAuditInfo(req)
-    const auditLog = {
-      ipAddress: req.ip,
-      info: { method: 'LDAP password login', fromKnownDevice },
-    }
-
-    let user, isPasswordReused
-    try {
-      user = await AuthenticationManagerLdap.promises.findOrCreateLdapUser(ldapUser, auditLog)
-    } catch (error) {
-      return {
-        user: false,
-        info: handleAuthenticateErrors(error, req),
-      }
-    }
-    if (user && AuthenticationController.captchaRequiredForLogin(req, user)) {
-      return {
-        user: false,
-        info: {
-          text: req.i18n.translate('cannot_verify_user_not_robot'),
-          type: 'error',
-          errorReason: 'cannot_verify_user_not_robot',
-          status: 400,
-        },
-      }
-    } else if (user) {
-      // async actions
-      return { user, info: undefined }
-    } else { //something wrong
-      logger.debug({ email : ldapUser.mail }, 'failed LDAP log in')
-      return {
-        user: false,
-        info: {
-          type: 'error',
-          status: 500,
-        },
-      }
-    }
-  },
-}
-
-export const {
-  doPassportLdapLogin,
-} = AuthenticationControllerLdap
diff --git a/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs b/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
deleted file mode 100644
index e7f312fc11..0000000000
--- a/services/web/modules/ldap-authentication/app/src/InitLdapSettings.mjs
+++ /dev/null
@@ -1,17 +0,0 @@
-import Settings from '@overleaf/settings'
-
-function initLdapSettings() {
-  Settings.ldap = {
-    enable: true,
-    placeholder:  process.env.OVERLEAF_LDAP_PLACEHOLDER || 'Username',
-    attEmail:     process.env.OVERLEAF_LDAP_EMAIL_ATT || 'mail',
-    attFirstName: process.env.OVERLEAF_LDAP_FIRST_NAME_ATT,
-    attLastName:  process.env.OVERLEAF_LDAP_LAST_NAME_ATT,
-    attName:      process.env.OVERLEAF_LDAP_NAME_ATT,
-    attAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT,
-    valAdmin:     process.env.OVERLEAF_LDAP_IS_ADMIN_ATT_VALUE,
-    updateUserDetailsOnLogin: String(process.env.OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN ).toLowerCase() === 'true',
-  }
-}
-
-export default initLdapSettings
diff --git a/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs b/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
deleted file mode 100644
index c4093b8684..0000000000
--- a/services/web/modules/ldap-authentication/app/src/LdapContacts.mjs
+++ /dev/null
@@ -1,136 +0,0 @@
-import Settings from '@overleaf/settings'
-import logger from '@overleaf/logger'
-import passport from 'passport'
-import ldapjs from 'ldapauth-fork/node_modules/ldapjs/lib/index.js'
-import UserGetter from '../../../../app/src/Features/User/UserGetter.js'
-import { splitFullName } from './AuthenticationManagerLdap.mjs'
-
-async function fetchLdapContacts(userId, contacts) {
-  if (!Settings.ldap?.enable || !process.env.OVERLEAF_LDAP_CONTACTS_FILTER) {
-    return []
-  }
-
-  const ldapOpts = passport._strategy('custom-fail-ldapauth').options.server
-  const { attEmail, attFirstName = "", attLastName = "", attName = "" } = Settings.ldap
-  const {
-    url,
-    timeout,
-    connectTimeout,
-    tlsOptions,
-    starttls,
-    bindDN,
-    bindCredentials,
-  } = ldapOpts
-  const searchBase = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_BASE || ldapOpts.searchBase
-  const searchScope = process.env.OVERLEAF_LDAP_CONTACTS_SEARCH_SCOPE || 'sub'
-  const ldapConfig = { url, timeout, connectTimeout, tlsOptions }
-
-  let ldapUsers
-  const client = ldapjs.createClient(ldapConfig)
-  try {
-    if (starttls) {
-      await _upgradeToTLS(client, tlsOptions)
-    }
-    await _bindLdap(client, bindDN, bindCredentials)
-
-    const filter = await _formContactsSearchFilter(client, ldapOpts, userId, process.env.OVERLEAF_LDAP_CONTACTS_FILTER)
-    const searchOptions = { scope: searchScope, attributes: [attEmail, attFirstName, attLastName, attName], filter }
-
-    ldapUsers = await _searchLdap(client, searchBase, searchOptions)
-  } catch (err) {
-    logger.warn({ err }, 'error in fetchLdapContacts')
-    return []
-  } finally {
-    client.unbind()
-  }
-
-  const newLdapContacts = ldapUsers.reduce((acc, ldapUser) => {
-    const email = Array.isArray(ldapUser[attEmail])
-                    ? ldapUser[attEmail][0]?.toLowerCase()
-                    : ldapUser[attEmail]?.toLowerCase()
-    if (!email) return acc
-    if (!contacts.some(contact => contact.email === email)) {
-      let nameParts = ["",""]
-      if ((!attFirstName || !attLastName) && attName) {
-        nameParts = splitFullName(ldapUser[attName] || "")
-      }
-      const firstName = attFirstName ? (ldapUser[attFirstName] || "") : nameParts[0]
-      const lastName  = attLastName  ? (ldapUser[attLastName]  || "") : nameParts[1]
-      acc.push({
-        first_name: firstName,
-        last_name: lastName,
-        email: email,
-        type: 'user',
-      })
-    }
-    return acc
-  }, [])
-
-  return newLdapContacts.sort((a, b) =>
-    a.last_name.localeCompare(b.last_name) ||
-    a.first_name.localeCompare(a.first_name) ||
-    a.email.localeCompare(b.email)
-  )
-}
-
-function _upgradeToTLS(client, tlsOptions) {
-  return new Promise((resolve, reject) => {
-    client.on('error', error => reject(new Error(`LDAP client error: ${error}`)))
-    client.on('connect', () => {
-      client.starttls(tlsOptions, null, error => {
-        if (error) {
-          reject(new Error(`StartTLS error: ${error}`))
-        } else {
-          resolve()
-        }
-      })
-    })
-  })
-}
-
-function _bindLdap(client, bindDN, bindCredentials) {
-  return new Promise((resolve, reject) => {
-    client.bind(bindDN, bindCredentials, error => {
-      if (error) {
-        reject(error)
-      } else {
-        resolve()
-      }
-    })
-  })
-}
-
-function _searchLdap(client, baseDN, options) {
-  return new Promise((resolve, reject) => {
-    const searchEntries = []
-    client.search(baseDN, options, (error, res) => {
-      if (error) {
-        reject(error)
-      } else {
-        res.on('searchEntry', entry => searchEntries.push(entry.object))
-        res.on('error', reject)
-        res.on('end', () => resolve(searchEntries))
-      }
-    })
-  })
-}
-
-async function _formContactsSearchFilter(client, ldapOpts, userId, contactsFilter) {
-  const searchProperty = process.env.OVERLEAF_LDAP_CONTACTS_PROPERTY
-  if (!searchProperty) {
-    return contactsFilter
-  }
-  const email = await UserGetter.promises.getUserEmail(userId)
-  const searchOptions = {
-    scope: ldapOpts.searchScope,
-    attributes: [searchProperty],
-    filter: `(${Settings.ldap.attEmail}=${email})`,
-  }
-  const searchBase = ldapOpts.searchBase
-  const ldapUser = (await _searchLdap(client, searchBase, searchOptions))[0]
-  const searchPropertyValue = ldapUser ? ldapUser[searchProperty]
-                                       : process.env.OVERLEAF_LDAP_CONTACTS_NON_LDAP_VALUE || 'IMATCHNOTHING'
-  return contactsFilter.replace(/{{userProperty}}/g, searchPropertyValue)
-}
-
-export default fetchLdapContacts
diff --git a/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs b/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
deleted file mode 100644
index b07dc3f3bd..0000000000
--- a/services/web/modules/ldap-authentication/app/src/LdapStrategy.mjs
+++ /dev/null
@@ -1,78 +0,0 @@
-import fs from 'fs'
-import passport from 'passport'
-import Settings from '@overleaf/settings'
-import { doPassportLdapLogin } from './AuthenticationControllerLdap.mjs'
-import { Strategy as LdapStrategy } from 'passport-ldapauth'
-
-function _readFilesContentFromEnv(envVar) {
-// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
-  if (!envVar) return undefined
-  try {
-    const parsedFileNames = JSON.parse(envVar)
-    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
-  } catch (error) {
-    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
-      return fs.readFileSync(envVar, 'utf8')
-    } else {
-      throw error
-    }
-  }
-}
-
-//  custom responses on authentication failure
-class CustomFailLdapStrategy extends LdapStrategy {
-  constructor(options, validate) {
-    super(options, validate);
-    this.name = 'custom-fail-ldapauth'
-  }
-  authenticate(req, options) {
-    const defaultFail = this.fail.bind(this)
-    this.fail = function(info, status) {
-      info.type = 'error'
-      info.key = 'invalid-password-retry-or-reset'
-      info.status = 401
-      return defaultFail(info, status)
-    }.bind(this)
-    super.authenticate(req, options)
-  }
-}
-
-const ldapServerOpts = {
-  url: process.env.OVERLEAF_LDAP_URL,
-  bindDN: process.env.OVERLEAF_LDAP_BIND_DN || "",
-  bindCredentials: process.env.OVERLEAF_LDAP_BIND_CREDENTIALS || "",
-  bindProperty: process.env.OVERLEAF_LDAP_BIND_PROPERTY,
-  searchBase: process.env.OVERLEAF_LDAP_SEARCH_BASE,
-  searchFilter: process.env.OVERLEAF_LDAP_SEARCH_FILTER,
-  searchScope: process.env.OVERLEAF_LDAP_SEARCH_SCOPE || 'sub',
-  searchAttributes: JSON.parse(process.env.OVERLEAF_LDAP_SEARCH_ATTRIBUTES || '[]'),
-  groupSearchBase: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_BASE,
-  groupSearchFilter: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_FILTER,
-  groupSearchScope: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_SCOPE || 'sub',
-  groupSearchAttributes: ["dn"],
-  groupDnProperty: process.env.OVERLEAF_LDAP_ADMIN_DN_PROPERTY,
-  cache: String(process.env.OVERLEAF_LDAP_CACHE).toLowerCase() === 'true',
-  timeout: process.env.OVERLEAF_LDAP_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_TIMEOUT) : undefined,
-  connectTimeout: process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT ? Number(process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT) : undefined,
-  starttls: String(process.env.OVERLEAF_LDAP_STARTTLS).toLowerCase() === 'true',
-  tlsOptions: {
-    ca: _readFilesContentFromEnv(process.env.OVERLEAF_LDAP_TLS_OPTS_CA_PATH),
-    rejectUnauthorized: String(process.env.OVERLEAF_LDAP_TLS_OPTS_REJECT_UNAUTH).toLowerCase() === 'true',
-  }
-}
-
-function addLdapStrategy(passport) {
-  passport.use(
-    new CustomFailLdapStrategy(
-      {
-        server: ldapServerOpts,
-        passReqToCallback: true,
-        usernameField: 'email',
-        passwordField: 'password',
-      },
-      doPassportLdapLogin
-    )
-  )
-}
-
-export default addLdapStrategy
diff --git a/services/web/modules/ldap-authentication/index.mjs b/services/web/modules/ldap-authentication/index.mjs
deleted file mode 100644
index f56d7ffee0..0000000000
--- a/services/web/modules/ldap-authentication/index.mjs
+++ /dev/null
@@ -1,30 +0,0 @@
-import initLdapSettings from './app/src/InitLdapSettings.mjs'
-import addLdapStrategy from './app/src/LdapStrategy.mjs'
-import fetchLdapContacts from './app/src/LdapContacts.mjs'
-
-let ldapModule = {};
-if (process.env.EXTERNAL_AUTH === 'ldap') {
-  initLdapSettings()
-  ldapModule = {
-    name: 'ldap-authentication',
-    hooks: {
-      passportSetup: function (passport, callback) {
-        try {
-          addLdapStrategy(passport)
-          callback(null)
-        } catch (error) {
-          callback(error)
-        }
-      },
-      getContacts: async function (userId, contacts, callback) {
-        try {
-          const newLdapContacts = await fetchLdapContacts(userId, contacts)
-          callback(null, newLdapContacts)
-        } catch (error) {
-          callback(error)
-        }
-      },
-    }
-  }
-}
-export default ldapModule
diff --git a/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs b/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
deleted file mode 100644
index 47d97f3019..0000000000
--- a/services/web/modules/saml-authentication/app/src/AuthenticationManagerSaml.mjs
+++ /dev/null
@@ -1,60 +0,0 @@
-import Settings from '@overleaf/settings'
-import UserCreator from '../../../../app/src/Features/User/UserCreator.js'
-import { User } from '../../../../app/src/models/User.js'
-
-const AuthenticationManagerSaml = {
-  async findOrCreateSamlUser(profile, auditLog) {
-    const {
-      attEmail,
-      attFirstName,
-      attLastName,
-      attAdmin,
-      valAdmin,
-      updateUserDetailsOnLogin,
-    } = Settings.saml
-    const email = Array.isArray(profile[attEmail])
-                    ? profile[attEmail][0].toLowerCase()
-                    : profile[attEmail].toLowerCase()
-    const firstName = attFirstName ? profile[attFirstName] : ""
-    const lastName  = attLastName  ? profile[attLastName] : email
-    let isAdmin = false
-    if( attAdmin && valAdmin ) {
-      isAdmin = (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
-                                                    profile[attAdmin] === valAdmin)
-    }
-    let user = await User.findOne({ 'email': email }).exec()
-    if( !user ) {
-      user = await UserCreator.promises.createNewUser(
-        {
-          email: email,
-          first_name: firstName,
-          last_name: lastName,
-          isAdmin: isAdmin,
-          holdingAccount: false,
-        }
-      )
-      await User.updateOne(
-        { _id: user._id },
-        { $set : { 'emails.0.confirmedAt' : Date.now() } }
-      ).exec() //email of saml user is confirmed
-    }
-    let userDetails = updateUserDetailsOnLogin ? { first_name : firstName, last_name: lastName } : {}
-    if( attAdmin && valAdmin ) {
-      user.isAdmin = isAdmin
-      userDetails.isAdmin = isAdmin
-    }
-    const result = await User.updateOne(
-      { _id: user._id, loginEpoch: user.loginEpoch }, { $inc: { loginEpoch: 1 }, $set: userDetails },
-      {}
-    ).exec()
-
-    if (result.modifiedCount !== 1) {
-      throw new ParallelLoginError()
-    }
-    return user
-  },
-}
-
-export default {
-  promises: AuthenticationManagerSaml,
-}
diff --git a/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs b/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
deleted file mode 100644
index 441f9033af..0000000000
--- a/services/web/modules/saml-authentication/app/src/InitSamlSettings.mjs
+++ /dev/null
@@ -1,16 +0,0 @@
-import Settings from '@overleaf/settings'
-
-function initSamlSettings() {
-  Settings.saml = {
-    enable: true,
-    identityServiceName: process.env.OVERLEAF_SAML_IDENTITY_SERVICE_NAME || 'Login with SAML IdP',
-    attEmail:     process.env.OVERLEAF_SAML_EMAIL_FIELD || 'nameID',
-    attFirstName: process.env.OVERLEAF_SAML_FIRST_NAME_FIELD || 'givenName',
-    attLastName:  process.env.OVERLEAF_SAML_LAST_NAME_FIELD || 'lastName',
-    attAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD,
-    valAdmin:     process.env.OVERLEAF_SAML_IS_ADMIN_FIELD_VALUE,
-    updateUserDetailsOnLogin: String(process.env.OVERLEAF_SAML_UPDATE_USER_DETAILS_ON_LOGIN).toLowerCase() === 'true',
-  }
-}
-
-export default initSamlSettings
diff --git a/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
deleted file mode 100644
index 65b42c92ae..0000000000
--- a/services/web/modules/saml-authentication/app/src/SamlNonCsrfRouter.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import logger from '@overleaf/logger'
-import { passportSamlLogin, passportSamlIdPLogout } from './AuthenticationControllerSaml.mjs'
-
-export default {
-  apply(webRouter) {
-    logger.debug({}, 'Init SAML NonCsrfRouter')
-    webRouter.get('/saml/login/callback', passportSamlLogin)
-    webRouter.post('/saml/login/callback', passportSamlLogin)
-    webRouter.get('/saml/logout/callback', passportSamlIdPLogout)
-    webRouter.post('/saml/logout/callback', passportSamlIdPLogout)
-  },
-}
diff --git a/services/web/modules/saml-authentication/app/src/SamlRouter.mjs b/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
deleted file mode 100644
index 9ee3677901..0000000000
--- a/services/web/modules/saml-authentication/app/src/SamlRouter.mjs
+++ /dev/null
@@ -1,14 +0,0 @@
-import logger from '@overleaf/logger'
-import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
-import { passportSamlAuthWithIdP, passportSamlSPLogout, passportSamlMetadata} from './AuthenticationControllerSaml.mjs'
-
-export default {
-  apply(webRouter) {
-    logger.debug({}, 'Init SAML router')
-    webRouter.get('/saml/login', passportSamlAuthWithIdP)
-    AuthenticationController.addEndpointToLoginWhitelist('/saml/login')
-    webRouter.post('/saml/logout', AuthenticationController.requireLogin(), passportSamlSPLogout)
-    webRouter.get('/saml/meta', passportSamlMetadata)
-    AuthenticationController.addEndpointToLoginWhitelist('/saml/meta')
-  },
-}
diff --git a/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs b/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
deleted file mode 100644
index 3a16459f98..0000000000
--- a/services/web/modules/saml-authentication/app/src/SamlStrategy.mjs
+++ /dev/null
@@ -1,62 +0,0 @@
-import fs from 'fs'
-import passport from 'passport'
-import Settings from '@overleaf/settings'
-import { doPassportSamlLogin, doPassportSamlLogout } from './AuthenticationControllerSaml.mjs'
-import { Strategy as SamlStrategy } from '@node-saml/passport-saml'
-
-function _readFilesContentFromEnv(envVar) {
-// envVar is either a file name: 'file.pem', or string with array: '["file.pem", "file2.pem"]'
-  if (!envVar) return undefined
-  try {
-    const parsedFileNames = JSON.parse(envVar)
-    return parsedFileNames.map(filename => fs.readFileSync(filename, 'utf8'))
-  } catch (error) {
-    if (error instanceof SyntaxError) { // failed to parse, envVar must be a file name
-      return fs.readFileSync(envVar, 'utf8')
-    } else {
-      throw error
-    }
-  }
-}
-
-const samlOptions = {
-  entryPoint: process.env.OVERLEAF_SAML_ENTRYPOINT,
-  callbackUrl: process.env.OVERLEAF_SAML_CALLBACK_URL,
-  issuer: process.env.OVERLEAF_SAML_ISSUER,
-  audience: process.env.OVERLEAF_SAML_AUDIENCE,
-  cert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_IDP_CERT),
-  signingCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PUBLIC_CERT),
-  privateKey:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_PRIVATE_KEY),
-  decryptionCert: _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_CERT),
-  decryptionPvk:  _readFilesContentFromEnv(process.env.OVERLEAF_SAML_DECRYPTION_PVK),
-  signatureAlgorithm: process.env.OVERLEAF_SAML_SIGNATURE_ALGORITHM,
-  additionalParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_PARAMS || '{}'),
-  additionalAuthorizeParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_AUTHORIZE_PARAMS || '{}'),
-  identifierFormat: process.env.OVERLEAF_SAML_IDENTIFIER_FORMAT,
-  acceptedClockSkewMs: process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS ? Number(process.env.OVERLEAF_SAML_ACCEPTED_CLOCK_SKEW_MS) : undefined,
-  attributeConsumingServiceIndex: process.env.OVERLEAF_SAML_ATTRIBUTE_CONSUMING_SERVICE_INDEX,
-  authnContext: process.env.OVERLEAF_SAML_AUTHN_CONTEXT ? JSON.parse(process.env.OVERLEAF_SAML_AUTHN_CONTEXT) : undefined,
-  forceAuthn: String(process.env.OVERLEAF_SAML_FORCE_AUTHN).toLowerCase() === 'true',
-  disableRequestedAuthnContext: String(process.env.OVERLEAF_SAML_DISABLE_REQUESTED_AUTHN_CONTEXT).toLowerCase() === 'true',
-  skipRequestCompression: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING === 'HTTP-POST',  // compression should be skipped iff authnRequestBinding is POST
-  authnRequestBinding: process.env.OVERLEAF_SAML_AUTHN_REQUEST_BINDING,
-  validateInResponseTo: process.env.OVERLEAF_SAML_VALIDATE_IN_RESPONSE_TO,
-  requestIdExpirationPeriodMs: process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS ? Number(process.env.OVERLEAF_SAML_REQUEST_ID_EXPIRATION_PERIOD_MS) : undefined,
-//  cacheProvider: process.env.OVERLEAF_SAML_CACHE_PROVIDER,
-  logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
-  logoutCallbackUrl: process.env.OVERLEAF_SAML_LOGOUT_CALLBACK_URL,
-  additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
-  passReqToCallback: true,
-}
-
-function addSamlStrategy(passport) {
-  passport.use(
-    new SamlStrategy(
-      samlOptions,
-      doPassportSamlLogin,
-      doPassportSamlLogout
-    )
-  )
-}
-
-export default addSamlStrategy
diff --git a/services/web/modules/saml-authentication/index.mjs b/services/web/modules/saml-authentication/index.mjs
deleted file mode 100644
index 35ea70283f..0000000000
--- a/services/web/modules/saml-authentication/index.mjs
+++ /dev/null
@@ -1,26 +0,0 @@
-import initSamlSettings from './app/src/InitSamlSettings.mjs'
-import addSamlStrategy from './app/src/SamlStrategy.mjs'
-import SamlRouter from './app/src/SamlRouter.mjs'
-import SamlNonCsrfRouter from './app/src/SamlNonCsrfRouter.mjs'
-
-let samlModule = {};
-
-if (process.env.EXTERNAL_AUTH === 'saml') {
-  initSamlSettings()
-  samlModule = {
-    name: 'saml-authentication',
-    hooks: {
-      passportSetup: function (passport, callback) {
-        try {
-          addSamlStrategy(passport)
-          callback(null)
-        } catch (error) {
-          callback(error)
-        }
-      },
-    },
-    router: SamlRouter,
-    nonCsrfRouter: SamlNonCsrfRouter,
-  }
-}
-export default samlModule
diff --git a/services/web/package.json b/services/web/package.json
index b0cee1af06..7fccc9e500 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -162,6 +162,7 @@
     "passport-ldapauth": "^2.1.4",
     "passport-local": "^1.0.0",
     "passport-oauth2": "^1.5.0",
+    "passport-openidconnect": "^0.1.2",
     "passport-orcid": "0.0.4",
     "pug": "^3.0.3",
     "pug-runtime": "^3.0.1",

From 28b875a5efd3c30d4bde0a0d80fed24b75b9b3fa Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 27 Jan 2025 04:58:23 +0100
Subject: [PATCH 262/274] Re-export `doLogout` (was removed from exports in
 commit b9fb636).

---
 services/web/app/src/Features/User/UserController.js            | 1 +
 .../oidc/app/src/OIDCAuthenticationController.mjs               | 2 +-
 .../saml/app/src/SAMLAuthenticationController.mjs               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js
index b767dcd4a1..cabab8c891 100644
--- a/services/web/app/src/Features/User/UserController.js
+++ b/services/web/app/src/Features/User/UserController.js
@@ -518,4 +518,5 @@ module.exports = {
   expireDeletedUsersAfterDuration: expressify(expireDeletedUsersAfterDuration),
   ensureAffiliationMiddleware: expressify(ensureAffiliationMiddleware),
   ensureAffiliation,
+  doLogout,
 }
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
index 42c01e712f..0b8dc501e0 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
@@ -158,7 +158,7 @@ const OIDCAuthenticationController = {
   async passportLogout(req, res, next) {
 // TODO: instead of storing idToken in session, use refreshToken to obtain a new idToken?
     const idTokenHint = req.session.idToken
-    await UserController.promises.doLogout(req)
+    await UserController.doLogout(req)
     const logoutUrl = process.env.OVERLEAF_OIDC_LOGOUT_URL
     const redirectUri = Settings.siteUrl
     res.redirect(`${logoutUrl}?id_token_hint=${idTokenHint}&post_logout_redirect_uri=${encodeURIComponent(redirectUri)}`)
diff --git a/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
index ac0e5398b2..3ed834608f 100644
--- a/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLAuthenticationController.mjs
@@ -102,7 +102,7 @@ const SAMLAuthenticationController = {
   },
   async passportLogout(req, res, next) {
     passport._strategy('saml').logout(req, async (err, url) => {
-      await UserController.promises.doLogout(req)
+      await UserController.doLogout(req)
       if (err) return next(err)
       res.redirect(url)
     })

From 0257f74221cd77f59f5e91c29eb3e20393e9b5dd Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Thu, 6 Feb 2025 12:12:03 +0100
Subject: [PATCH 263/274] Add ENV variables to control SAML signature
 validation

---
 .../modules/authentication/saml/app/src/SAMLModuleManager.mjs   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
index c7efdef214..29e9ae52cd 100644
--- a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
@@ -46,6 +46,8 @@ const SAMLModuleManager = {
       logoutUrl: process.env.OVERLEAF_SAML_LOGOUT_URL,
       logoutCallbackUrl: `${Settings.siteUrl.replace(/\/+$/, '')}/saml/logout/callback`,
       additionalLogoutParams: JSON.parse(process.env.OVERLEAF_SAML_ADDITIONAL_LOGOUT_PARAMS || '{}'),
+      wantAssertionsSigned: boolFromEnv(process.env.OVERLEAF_SAML_WANT_ASSERTIONS_SIGNED),
+      wantAuthnResponseSigned: boolFromEnv(process.env.OVERLEAF_SAML_WANT_AUTHN_RESPONSE_SIGNED),
       passReqToCallback: true,
     }
     try {

From 1e0095fae630d3625c19d0872d5ea4bf453e3ebe Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Sat, 22 Feb 2025 03:26:25 +0100
Subject: [PATCH 264/274] Whitelist /oidc/login endpoint, fixes #21

---
 .../web/modules/authentication/oidc/app/src/OIDCRouter.mjs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
index 519fa5043a..0857e41889 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCRouter.mjs
@@ -1,5 +1,6 @@
 import logger from '@overleaf/logger'
 import UserController from '../../../../../app/src/Features/User/UserController.js'
+import AuthenticationController from '../../../../../app/src/Features/Authentication/AuthenticationController.js'
 import OIDCAuthenticationController from './OIDCAuthenticationController.mjs'
 import logout from '../../../logout.mjs'
 
@@ -7,7 +8,9 @@ export default {
   apply(webRouter) {
     logger.debug({}, 'Init OIDC router')
     webRouter.get('/oidc/login', OIDCAuthenticationController.passportLogin)
+    AuthenticationController.addEndpointToLoginWhitelist('/oidc/login')
     webRouter.get('/oidc/login/callback', OIDCAuthenticationController.passportLoginCallback)
+    AuthenticationController.addEndpointToLoginWhitelist('/oidc/login/callback')
     webRouter.get('/oidc/logout/callback', OIDCAuthenticationController.passportLogoutCallback)
     webRouter.post('/user/oauth-unlink', OIDCAuthenticationController.unlinkAccount)
     webRouter.post('/logout', logout, UserController.logout)

From 57fe609cae2046659889212648f09d1443c99e69 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 10 Mar 2025 05:55:01 +0100
Subject: [PATCH 265/274] See upstream commit 42ee56e

---
 services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
index 44d9d373d2..d2bbb35236 100644
--- a/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPRouter.mjs
@@ -10,7 +10,7 @@ export default {
     logger.debug({}, 'Init LDAP router')
     webRouter.post('/login',
       RateLimiterMiddleware.rateLimit(overleafLoginRateLimiter), // rate limit IP (20 / 60s)
-      RateLimiterMiddleware.loginRateLimitEmail, // rate limit email (10 / 120s)
+      RateLimiterMiddleware.loginRateLimitEmail(), // rate limit email (10 / 120s)
       CaptchaMiddleware.validateCaptcha('login'),
       LDAPAuthenticationController.passportLogin,
       AuthenticationController.passportLogin,

From a458a108a40fab9ef2b0e7a10d63408c06d48c39 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 10 Mar 2025 06:37:50 +0100
Subject: [PATCH 266/274] Make OVERLEAF_OIDC_USER_ID_FIELD support 'email' as a
 value

---
 .../authentication/oidc/app/src/OIDCAuthenticationManager.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
index 56ec2e5455..5295ce63d0 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -13,8 +13,8 @@ const OIDCAuthenticationManager = {
       updateUserDetailsOnLogin,
       providerId,
     } = Settings.oidc
-    const oidcUserId = profile[attUserId]
     const email = profile.emails[0].value
+    const oidcUserId = (attUserId === 'email') ? email : profile[attUserId]
     const firstName = profile.name?.givenName || ""
     const lastName  = profile.name?.familyName || ""
     let isAdmin = false
@@ -83,7 +83,7 @@ const OIDCAuthenticationManager = {
       attUserId,
       providerId,
     } = Settings.oidc
-    const oidcUserId = profile[attUserId]
+    const oidcUserId = (attUserId === 'email') ? profile.emails[0].value : profile[attUserId]
     const oidcUserData = null // Possibly it can be used later
     await ThirdPartyIdentityManager.promises.link(userId, providerId, oidcUserId, oidcUserData, auditLog)
   },

From ef3bd6f4bbd52c70bcfc9b9753687938046b0228 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Fri, 4 Apr 2025 15:14:14 +0200
Subject: [PATCH 267/274] Allow EXTERNAL_AUTH to be undefined, fixes #26

---
 services/web/modules/authentication/ldap/index.mjs | 2 +-
 services/web/modules/authentication/oidc/index.mjs | 2 +-
 services/web/modules/authentication/saml/index.mjs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/web/modules/authentication/ldap/index.mjs b/services/web/modules/authentication/ldap/index.mjs
index 244a8db8e7..94743a6611 100644
--- a/services/web/modules/authentication/ldap/index.mjs
+++ b/services/web/modules/authentication/ldap/index.mjs
@@ -1,5 +1,5 @@
 let ldapModule = {}
-if (process.env.EXTERNAL_AUTH.includes('ldap')) {
+if (process.env.EXTERNAL_AUTH?.includes('ldap')) {
   const { default: LDAPModuleManager } = await import('./app/src/LDAPModuleManager.mjs')
   const { default: router } = await import('./app/src/LDAPRouter.mjs')
   LDAPModuleManager.initSettings()
diff --git a/services/web/modules/authentication/oidc/index.mjs b/services/web/modules/authentication/oidc/index.mjs
index 51d9e0d483..f10ff64c82 100644
--- a/services/web/modules/authentication/oidc/index.mjs
+++ b/services/web/modules/authentication/oidc/index.mjs
@@ -1,5 +1,5 @@
 let oidcModule = {}
-if (process.env.EXTERNAL_AUTH.includes('oidc')) {
+if (process.env.EXTERNAL_AUTH?.includes('oidc')) {
   const { default: OIDCModuleManager } = await import('./app/src/OIDCModuleManager.mjs')
   const { default: router } = await import('./app/src/OIDCRouter.mjs')
   OIDCModuleManager.initSettings()
diff --git a/services/web/modules/authentication/saml/index.mjs b/services/web/modules/authentication/saml/index.mjs
index 2d6ee5706c..36f0281637 100644
--- a/services/web/modules/authentication/saml/index.mjs
+++ b/services/web/modules/authentication/saml/index.mjs
@@ -1,5 +1,5 @@
 let samlModule = {}
-if (process.env.EXTERNAL_AUTH.includes('saml')) {
+if (process.env.EXTERNAL_AUTH?.includes('saml')) {
   const { default: SAMLModuleManager } = await import('./app/src/SAMLModuleManager.mjs')
   const { default: router } = await import('./app/src/SAMLRouter.mjs')
   const { default: nonCsrfRouter } = await import('./app/src/SAMLNonCsrfRouter.mjs')

From 25ae1b00251459931f330e4ee9319b372988c508 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Fri, 23 May 2025 16:00:40 +0200
Subject: [PATCH 268/274] Fix login page

---
 services/web/app/views/user/login.pug | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug
index 97ef72476d..907e45dbb7 100644
--- a/services/web/app/views/user/login.pug
+++ b/services/web/app/views/user/login.pug
@@ -45,20 +45,20 @@ block content
 									hr
 									p.text-center !{login_support_text}
 							if settings.saml && settings.saml.enable
-								form(data-ol-async-form, name="samlLoginForm")
-									.actions(style='margin-top: 30px;')
-										a.btn.btn-secondary.btn-block(
-											href='/saml/login',
-											data-ol-disabled-inflight
-										)
-											span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
-											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
+								.actions(style='margin-top: 30px;')
+									a.button.btn-secondary.btn(
+									href='/saml/login',
+										style="width: 100%;"
+										data-ol-disabled-inflight
+									)
+										span(data-ol-inflight="idle") #{settings.saml.identityServiceName}
+										span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
 							if settings.oidc && settings.oidc.enable
-								form(data-ol-async-form, name="oidcLoginForm")
-									.actions(style='margin-top: 30px;')
-										a.btn.btn-secondary.btn-block(
-											href='/oidc/login',
-											data-ol-disabled-inflight
-										)
-											span(data-ol-inflight="idle") #{settings.oidc.identityServiceName}
-											span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
+								.actions(style='margin-top: 30px;')
+									a.button.btn-secondary.btn(
+										href='/oidc/login',
+										style="width: 100%;"
+										data-ol-disabled-inflight
+									)
+										span(data-ol-inflight="idle") #{settings.oidc.identityServiceName}
+										span(hidden data-ol-inflight="pending") #{translate("logging_in")}…

From c080f03ea3c259acc56df14172418459d5a75c0f Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 16 Jun 2025 13:39:16 +0200
Subject: [PATCH 269/274] Avoid DEP0174 by removing async from callback-based
 getGroupPolicyForUser

---
 .../ldap/app/src/LDAPModuleManager.mjs        | 20 +++++++++----------
 .../oidc/app/src/OIDCModuleManager.mjs        | 20 +++++++++----------
 .../saml/app/src/SAMLModuleManager.mjs        | 19 +++++++++---------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
index 846ca9b158..64afd02b0c 100644
--- a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
@@ -94,18 +94,18 @@ const LDAPModuleManager = {
       logger.info({}, error.message)
     }
   },
-  async getGroupPolicyForUser(user, callback) {
-    try {
-      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
-        user,
-        groupPolicy : { 'ldapPolicy' : true },
-        subscription : null
-      })
+
+  getGroupPolicyForUser(user, callback) {
+    PermissionsManager.promises.getUserValidationStatus({
+      user,
+      groupPolicy : { 'ldapPolicy' : true },
+      subscription : null
+    }).then(userValidationMap => {
       let groupPolicy = Object.fromEntries(userValidationMap)
-      callback(null,  {'groupPolicy' : groupPolicy })
-    } catch (error) {
+      callback(null, { groupPolicy })
+    }).catch(error => {
       callback(error)
-    }
+    })
   },
 }
 
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
index 3a2e6e2780..ec734ced19 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -64,18 +64,18 @@ const OIDCModuleManager = {
       logger.info({}, error.message)
     }
   },
-  async getGroupPolicyForUser(user, callback) {
-    try {
-      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
-        user,
-        groupPolicy : { 'oidcPolicy' : true },
-        subscription : null
-      })
+
+  getGroupPolicyForUser(user, callback) {
+    PermissionsManager.promises.getUserValidationStatus({
+      user,
+      groupPolicy : { 'oidcPolicy' : true },
+      subscription : null
+    }).then(userValidationMap => {
       let groupPolicy = Object.fromEntries(userValidationMap)
-      callback(null,  {'groupPolicy' : groupPolicy })
-    } catch (error) {
+      callback(null, { groupPolicy })
+    }).catch(error => {
       callback(error)
-    }
+    })
   },
 }
 
diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
index 29e9ae52cd..67545f7fc9 100644
--- a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
@@ -84,18 +84,17 @@ const SAMLModuleManager = {
       logger.info({}, error.message)
     }
   },
-  async getGroupPolicyForUser(user, callback) {
-    try {
-      const userValidationMap = await PermissionsManager.promises.getUserValidationStatus({
-        user,
-        groupPolicy : { 'samlPolicy' : true },
-        subscription : null
-      })
+  getGroupPolicyForUser(user, callback) {
+    PermissionsManager.promises.getUserValidationStatus({
+      user,
+      groupPolicy : { 'samlPolicy' : true },
+      subscription : null
+    }).then(userValidationMap => {
       let groupPolicy = Object.fromEntries(userValidationMap)
-      callback(null,  {'groupPolicy' : groupPolicy })
-    } catch (error) {
+      callback(null, { groupPolicy })
+    }).catch(error => {
       callback(error)
-    }
+    })
   },
 }
 

From ff1021259e3c472e40dee45e4f3c8fa6647e6d48 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Tue, 24 Jun 2025 00:51:45 +0200
Subject: [PATCH 270/274] Introduce an environment variable to control user
 creation in OIDC authentication, closes #47

---
 services/web/app/src/infrastructure/Features.js    |  2 +-
 .../oidc/app/src/OIDCAuthenticationController.mjs  | 14 +++++++-------
 .../oidc/app/src/OIDCAuthenticationManager.mjs     |  3 +++
 .../oidc/app/src/OIDCModuleManager.mjs             |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/services/web/app/src/infrastructure/Features.js b/services/web/app/src/infrastructure/Features.js
index aaf51103b9..3264c323cd 100644
--- a/services/web/app/src/infrastructure/Features.js
+++ b/services/web/app/src/infrastructure/Features.js
@@ -56,7 +56,7 @@ const Features = {
       case 'registration-page':
         return (
           !Features.externalAuthenticationSystemUsed() ||
-          Boolean(Settings.overleaf)
+          Boolean(Settings.overleaf) || Settings.oidc?.disableJITAccountCreation
         )
       case 'registration':
         return Boolean(Settings.overleaf)
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
index 0b8dc501e0..f8bbd32c29 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
@@ -42,7 +42,8 @@ const OIDCAuthenticationController = {
           }
         } else {
           if (info.redir != null) {
-            return res.json({ redir: info.redir })
+            await UserController.doLogout(req)
+            return res.redirect(info.redir)
           } else {
             res.status(info.status || 401)
             delete info.status
@@ -95,20 +96,19 @@ const OIDCAuthenticationController = {
         info: {
           type: 'error',
           text: error.message,
-          status: 401,
+          status: 500,
         },
       }
     }
     if (user) {
       return { user, info: undefined }
-    } else { // we cannot be here, something is terribly wrong
-      logger.debug({ email : profile.emails[0].value }, 'failed OIDC log in')
+    } else { // user account is not created
+      logger.debug({ email : profile.emails[0].value }, 'OIDC users JIT account creation is off')
       return {
         user: false,
         info: {
-          type: 'error',
-          text: 'Unknown error',
-          status: 500,
+          redir: '/register',
+          status: 401,
         },
       }
     }
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
index 5295ce63d0..3082558e39 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -37,6 +37,9 @@ const OIDCAuthenticationManager = {
 // (Is it safe? Concider: If an account from the specified provider is already linked to this user, throw an error)
       user = await User.findOne({ 'email': email }).exec()
       if (!user) {
+        if (Settings.oidc.disableJITAccountCreation) {
+          return null
+        }
         user = await UserCreator.promises.createNewUser(
           {
             email: email,
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
index ec734ced19..debb5c8c5d 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -17,6 +17,7 @@ const OIDCModuleManager = {
       attAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD,
       valAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD_VALUE,
       updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_OIDC_UPDATE_USER_DETAILS_ON_LOGIN),
+      disableJITAccountCreation: boolFromEnv(process.env.OVERLEAF_OIDC_DISABLE_JIT_ACCOUNT_CREATION),
     }
   },
   passportSetup(passport, callback) {

From a96c67c1cc4d0cb023d793df036c42404c0b2e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Syn=C3=A9sio=20Neto?= <synesio.neto@outlook.com>
Date: Mon, 21 Jul 2025 15:51:13 -0300
Subject: [PATCH 271/274] Introduce an environment variable to allow JIT OIDC
 users creation based on their email address domain.

---
 .../oidc/app/src/OIDCAuthenticationManager.mjs             | 7 +++++++
 .../authentication/oidc/app/src/OIDCModuleManager.mjs      | 1 +
 2 files changed, 8 insertions(+)

diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
index 3082558e39..5d703b9711 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -37,6 +37,13 @@ const OIDCAuthenticationManager = {
 // (Is it safe? Concider: If an account from the specified provider is already linked to this user, throw an error)
       user = await User.findOne({ 'email': email }).exec()
       if (!user) {
+        let allowedDomains = Settings.oidc.allowedOIDCEmailDomains;
+          allowedDomains = allowedDomains.split(',').map(d => d.trim()); // Make sure it's an array
+          const domain = email.split('@')[1];
+
+          if (!allowedDomains.includes(domain)) {
+            return null;
+          }
         if (Settings.oidc.disableJITAccountCreation) {
           return null
         }
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
index debb5c8c5d..b9f68f3ff8 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -16,6 +16,7 @@ const OIDCModuleManager = {
       attUserId:    process.env.OVERLEAF_OIDC_USER_ID_FIELD || 'id',
       attAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD,
       valAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD_VALUE,
+      allowedOIDCEmailDomains:     process.env.OVERLEAF_OIDC_ALLOWED_EMAIL_DOMAINS,
       updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_OIDC_UPDATE_USER_DETAILS_ON_LOGIN),
       disableJITAccountCreation: boolFromEnv(process.env.OVERLEAF_OIDC_DISABLE_JIT_ACCOUNT_CREATION),
     }

From 09288ba9ebe0f4efc0224c0c6d328b0ea745ea9d Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Tue, 22 Jul 2025 05:30:08 +0200
Subject: [PATCH 272/274] Remove OVERLEAF_OIDC_DISABLE_JIT_ACCOUNT_CREATION in
 favor of OVERLEAF_OIDC_ALLOWED_EMAIL_DOMAINS

---
 .../web/app/src/infrastructure/Features.js    |  2 +-
 .../app/src/OIDCAuthenticationController.mjs  |  2 +-
 .../app/src/OIDCAuthenticationManager.mjs     | 22 +++++++++++--------
 .../oidc/app/src/OIDCModuleManager.mjs        |  5 +++--
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/services/web/app/src/infrastructure/Features.js b/services/web/app/src/infrastructure/Features.js
index 3264c323cd..5d3c873c2a 100644
--- a/services/web/app/src/infrastructure/Features.js
+++ b/services/web/app/src/infrastructure/Features.js
@@ -56,7 +56,7 @@ const Features = {
       case 'registration-page':
         return (
           !Features.externalAuthenticationSystemUsed() ||
-          Boolean(Settings.overleaf) || Settings.oidc?.disableJITAccountCreation
+          Boolean(Settings.overleaf) || Settings.oidc?.allowedOIDCEmailDomains
         )
       case 'registration':
         return Boolean(Settings.overleaf)
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
index f8bbd32c29..9365c9ea73 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationController.mjs
@@ -103,7 +103,7 @@ const OIDCAuthenticationController = {
     if (user) {
       return { user, info: undefined }
     } else { // user account is not created
-      logger.debug({ email : profile.emails[0].value }, 'OIDC users JIT account creation is off')
+      logger.debug({ email : profile.emails[0].value }, 'OIDC JIT account creation is not allowed for this email')
       return {
         user: false,
         info: {
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
index 5d703b9711..9d3c1becc9 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCAuthenticationManager.mjs
@@ -31,20 +31,24 @@ const OIDCAuthenticationManager = {
       user = await ThirdPartyIdentityManager.promises.login(providerId, oidcUserId, oidcUserData)
     } catch {
 // A user with the specified OIDC ID and provider ID is not found. Search for a user with the given email.
-// If no user exists with this email, create a new user and link the OIDC account to it.
+// If no user exists with this email, create a new user and link the OIDC account to it (provided this is allowed by allowedOIDCEmailDomains).
 // If a user exists but no account from the specified OIDC provider is linked to this user, link the OIDC account to this user.
 // If an account from the specified provider is already linked to this user, unlink it, and link the OIDC account to this user.
 // (Is it safe? Concider: If an account from the specified provider is already linked to this user, throw an error)
       user = await User.findOne({ 'email': email }).exec()
       if (!user) {
-        let allowedDomains = Settings.oidc.allowedOIDCEmailDomains;
-          allowedDomains = allowedDomains.split(',').map(d => d.trim()); // Make sure it's an array
-          const domain = email.split('@')[1];
-
-          if (!allowedDomains.includes(domain)) {
-            return null;
-          }
-        if (Settings.oidc.disableJITAccountCreation) {
+        const allowedDomains = Settings.oidc.allowedOIDCEmailDomains
+        if (
+          allowedDomains &&
+          !allowedDomains.some(pattern => {
+            const domain = email.split('@')[1]
+            if (pattern.startsWith('*.')) {
+              const base = pattern.slice(2)
+              return domain.endsWith(`.${base}`)
+            }
+            return domain === pattern
+          })
+        ) {
           return null
         }
         user = await UserCreator.promises.createNewUser(
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
index b9f68f3ff8..d57cde49da 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -16,9 +16,10 @@ const OIDCModuleManager = {
       attUserId:    process.env.OVERLEAF_OIDC_USER_ID_FIELD || 'id',
       attAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD,
       valAdmin:     process.env.OVERLEAF_OIDC_IS_ADMIN_FIELD_VALUE,
-      allowedOIDCEmailDomains:     process.env.OVERLEAF_OIDC_ALLOWED_EMAIL_DOMAINS,
       updateUserDetailsOnLogin: boolFromEnv(process.env.OVERLEAF_OIDC_UPDATE_USER_DETAILS_ON_LOGIN),
-      disableJITAccountCreation: boolFromEnv(process.env.OVERLEAF_OIDC_DISABLE_JIT_ACCOUNT_CREATION),
+      allowedOIDCEmailDomains: process.env.OVERLEAF_OIDC_ALLOWED_EMAIL_DOMAINS === undefined
+        ? null
+        : process.env.OVERLEAF_OIDC_ALLOWED_EMAIL_DOMAINS.split(',').map(s => s.trim()).filter(Boolean),
     }
   },
   passportSetup(passport, callback) {

From 8a99d7b86ade092bb373299466d3f60efdcd77ac Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Wed, 16 Jul 2025 09:16:36 +0200
Subject: [PATCH 273/274] Set `use-ai` capability to false

---
 .../modules/authentication/ldap/app/src/LDAPModuleManager.mjs    | 1 +
 .../modules/authentication/oidc/app/src/OIDCModuleManager.mjs    | 1 +
 .../modules/authentication/saml/app/src/SAMLModuleManager.mjs    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
index 64afd02b0c..2e915b23ce 100644
--- a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
@@ -76,6 +76,7 @@ const LDAPModuleManager = {
   initPolicy() {
     try {
       PermissionsManager.registerCapability('change-password', { default : true })
+      PermissionsManager.registerCapability('use-ai', { default : false })
     } catch (error) {
       logger.info({}, error.message)
     }
diff --git a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
index d57cde49da..7a36c0fbd0 100644
--- a/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
+++ b/services/web/modules/authentication/oidc/app/src/OIDCModuleManager.mjs
@@ -49,6 +49,7 @@ const OIDCModuleManager = {
   initPolicy() {
     try {
       PermissionsManager.registerCapability('change-password', { default : true })
+      PermissionsManager.registerCapability('use-ai', { default : false })
     } catch (error) {
       logger.info({}, error.message)
     }
diff --git a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
index 67545f7fc9..fba235de3d 100644
--- a/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
+++ b/services/web/modules/authentication/saml/app/src/SAMLModuleManager.mjs
@@ -66,6 +66,7 @@ const SAMLModuleManager = {
   initPolicy() {
     try {
       PermissionsManager.registerCapability('change-password', { default : true })
+      PermissionsManager.registerCapability('use-ai', { default : false })
     } catch (error) {
       logger.info({}, error.message)
     }

From d32eb2b4491eba9fa030bc1dccad9f3fe676d7f5 Mon Sep 17 00:00:00 2001
From: yu-i-i <kla9555@gmail.com>
Date: Mon, 21 Jul 2025 18:40:25 +0200
Subject: [PATCH 274/274] Remove LDAP admin check via group search in
 ldap-passport

---
 .../ldap/app/src/LDAPAuthenticationManager.mjs               | 5 ++---
 .../authentication/ldap/app/src/LDAPModuleManager.mjs        | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
index 66943e82a3..6a35b77566 100644
--- a/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPAuthenticationManager.mjs
@@ -30,9 +30,8 @@ const LDAPAuthenticationManager = {
     if (!firstName && !lastName) lastName = email
     let isAdmin = false
     if( attAdmin && valAdmin ) {
-      isAdmin = (profile._groups?.length > 0) ||
-                (Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
-                                                    profile[attAdmin] === valAdmin)
+      isAdmin = Array.isArray(profile[attAdmin]) ? profile[attAdmin].includes(valAdmin) :
+                                                   profile[attAdmin] === valAdmin
     }
     let user = await User.findOne({ 'email': email }).exec()
 
diff --git a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
index 2e915b23ce..643342430a 100644
--- a/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
+++ b/services/web/modules/authentication/ldap/app/src/LDAPModuleManager.mjs
@@ -31,11 +31,6 @@ const LDAPModuleManager = {
       searchFilter: process.env.OVERLEAF_LDAP_SEARCH_FILTER,
       searchScope: process.env.OVERLEAF_LDAP_SEARCH_SCOPE || 'sub',
       searchAttributes: JSON.parse(process.env.OVERLEAF_LDAP_SEARCH_ATTRIBUTES || '[]'),
-      groupSearchBase: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_BASE,
-      groupSearchFilter: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_FILTER,
-      groupSearchScope: process.env.OVERLEAF_LDAP_ADMIN_SEARCH_SCOPE || 'sub',
-      groupSearchAttributes: ["dn"],
-      groupDnProperty: process.env.OVERLEAF_LDAP_ADMIN_DN_PROPERTY,
       cache: boolFromEnv(process.env.OVERLEAF_LDAP_CACHE),
       timeout: numFromEnv(process.env.OVERLEAF_LDAP_TIMEOUT),
       connectTimeout: numFromEnv(process.env.OVERLEAF_LDAP_CONNECT_TIMEOUT),