Merge pull request #7210 from overleaf/jpa-switch-to-admin

[web] add a button for switching to the admin domain from www.

GitOrigin-RevId: 7e14b9c1415ef6cad5f369d77530599bac3148e7
This commit is contained in:
Jakob Ackermann
2022-04-05 12:19:00 +00:00
committed by Copybot
parent c8866bbda0
commit 4d18dcb377
6 changed files with 18 additions and 7 deletions
@@ -8,12 +8,12 @@ const SessionManager = require('../Authentication/SessionManager')
const TokenAccessHandler = require('../TokenAccess/TokenAccessHandler')
const { expressify } = require('../../util/promises')
const {
shouldRedirectToAdminDomain,
canRedirectToAdminDomain,
} = require('../Helpers/AdminAuthorizationHelper')
const { getSafeAdminDomainRedirect } = require('../Helpers/UrlHelper')
function handleAdminDomainRedirect(req, res) {
if (shouldRedirectToAdminDomain(SessionManager.getSessionUser(req.session))) {
if (canRedirectToAdminDomain(SessionManager.getSessionUser(req.session))) {
logger.warn({ req }, 'redirecting admin user to admin domain')
res.redirect(getSafeAdminDomainRedirect(req.originalUrl))
return true
@@ -2,7 +2,7 @@ const Settings = require('@overleaf/settings')
module.exports = {
hasAdminAccess,
shouldRedirectToAdminDomain,
canRedirectToAdminDomain,
}
function hasAdminAccess(user) {
@@ -11,7 +11,7 @@ function hasAdminAccess(user) {
return Boolean(user.isAdmin)
}
function shouldRedirectToAdminDomain(user) {
function canRedirectToAdminDomain(user) {
if (Settings.adminPrivilegeAvailable) return false
if (!Settings.adminUrl) return false
if (!user) return false