From 4a28fa22b17a19d9dcc91ec05d5ee19ce67943e3 Mon Sep 17 00:00:00 2001 From: Alex Fuchs Date: Fri, 5 Jan 2024 15:10:42 +0100 Subject: [PATCH 1/2] Added check for active OAuth to login route --- ldap-overleaf-sl/sharelatex_diff/router.js.diff | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ldap-overleaf-sl/sharelatex_diff/router.js.diff b/ldap-overleaf-sl/sharelatex_diff/router.js.diff index 0077d06..002249a 100644 --- a/ldap-overleaf-sl/sharelatex_diff/router.js.diff +++ b/ldap-overleaf-sl/sharelatex_diff/router.js.diff @@ -1,4 +1,16 @@ -259a260,268 +217c217,225 +< webRouter.get('/login', UserPagesController.loginPage) +--- +> // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +> if (process.env.OAUTH2_ENABLED === 'true') { +> webRouter.get('/login', function (req, res, next) { +> res.redirect('/oauth/redirect') +> }) +> } else { +> webRouter.get('/login', UserPagesController.loginPage) +> } +> // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +259a268,276 > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > if (process.env.OAUTH2_ENABLED === 'true') { > webRouter.get('/oauth/redirect', AuthenticationController.oauth2Redirect) From c8e1633dec6874533f370acd750ee42302a248ff Mon Sep 17 00:00:00 2001 From: Alex Fuchs Date: Fri, 5 Jan 2024 15:42:08 +0100 Subject: [PATCH 2/2] remove errant newline --- ldap-overleaf-sl/sharelatex_diff/router.js.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldap-overleaf-sl/sharelatex_diff/router.js.diff b/ldap-overleaf-sl/sharelatex_diff/router.js.diff index 002249a..7973471 100644 --- a/ldap-overleaf-sl/sharelatex_diff/router.js.diff +++ b/ldap-overleaf-sl/sharelatex_diff/router.js.diff @@ -10,7 +10,7 @@ > webRouter.get('/login', UserPagesController.loginPage) > } > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -259a268,276 +259a268,275 > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > if (process.env.OAUTH2_ENABLED === 'true') { > webRouter.get('/oauth/redirect', AuthenticationController.oauth2Redirect) @@ -19,4 +19,4 @@ > AuthenticationController.addEndpointToLoginWhitelist('/oauth/callback') > } > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -> +