From b94e1791e0e2fd15df66cf81892e03c9c05d37c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Thu, 20 Feb 2020 11:08:08 -0500 Subject: [PATCH] Merge pull request #2617 from overleaf/ho-open-site-for-admins allow site to be accessible to admins when closed GitOrigin-RevId: 71bdf329ce2a4e41533b2a65f45190277ea72dbb --- services/web/app/src/infrastructure/Server.js | 5 +++++ services/web/app/views/project/list.pug | 3 +++ 2 files changed, 8 insertions(+) diff --git a/services/web/app/src/infrastructure/Server.js b/services/web/app/src/infrastructure/Server.js index eb5e271c8d..324f71cc71 100644 --- a/services/web/app/src/infrastructure/Server.js +++ b/services/web/app/src/infrastructure/Server.js @@ -182,6 +182,11 @@ if (app.get('env') === 'production') { webRouter.use(function(req, res, next) { if (Settings.siteIsOpen) { next() + } else if ( + AuthenticationController.getSessionUser(req) && + AuthenticationController.getSessionUser(req).isAdmin + ) { + next() } else { res.status(503) res.render('general/closed', { title: 'maintenance' }) diff --git a/services/web/app/views/project/list.pug b/services/web/app/views/project/list.pug index 57a893f131..3ff4e764b1 100644 --- a/services/web/app/views/project/list.pug +++ b/services/web/app/views/project/list.pug @@ -23,6 +23,9 @@ block content - if(typeof(suppressSystemMessages) == "undefined") script. window.systemMessages = !{StringHelper.stringifyJsonForScript(systemMessages)}; + - if(settings.siteIsOpen == false && getSessionUser() && getSessionUser().isAdmin) + script. + window.systemMessages.push({content: "SITE IS CLOSED TO PUBLIC. OPEN ONLY FOR SITE ADMINS", _id:"siteclosed"}) .system-messages( ng-cloak