Merge pull request #6614 from overleaf/jpa-msm-separate-admin-app

[misc] move admin capability from www. to admin. subdomain

GitOrigin-RevId: e0daeacf3c06b856ffb9fd35dce76e71f14e8459

services/web/modules/launchpad/app/src/LaunchpadController.js

@@ -25,6 +25,9 @@ const UserGetter = require('../../../../app/src/Features/User/UserGetter')
 const { User } = require('../../../../app/src/models/User')
 const AuthenticationController = require('../../../../app/src/Features/Authentication/AuthenticationController')
 const SessionManager = require('../../../../app/src/Features/Authentication/SessionManager')
+const {
+  hasAdminAccess,
+} = require('../../../../app/src/Features/Helpers/AdminAuthorizationHelper')
 
 module.exports = LaunchpadController = {
   _getAuthMethod() {
@@ -67,7 +70,7 @@ module.exports = LaunchpadController = {
             if (err != null) {
               return next(err)
             }
-            if (user && user.isAdmin) {
+            if (hasAdminAccess(user)) {
               return res.render(Path.resolve(__dirname, '../views/launchpad'), {
                 wsUrl: Settings.wsUrl,
                 adminUserExists,

services/web/modules/launchpad/test/unit/src/LaunchpadControllerTests.js

@@ -31,7 +31,9 @@ describe('LaunchpadController', function () {
     this.User = {}
     this.LaunchpadController = SandboxedModule.require(modulePath, {
       requires: {
-        '@overleaf/settings': (this.Settings = {}),
+        '@overleaf/settings': (this.Settings = {
+          adminPrivilegeAvailable: true,
+        }),
         '@overleaf/metrics': (this.Metrics = {}),
         '../../../../app/src/Features/User/UserRegistrationHandler':
           (this.UserRegistrationHandler = {}),