From b1d9cedddb9ec6aa39fb93c51284934cdbf94cbb Mon Sep 17 00:00:00 2001 From: yzx9 Date: Fri, 24 Nov 2023 14:41:49 +0800 Subject: [PATCH] Add oauth enable flag --- README.md | 1 + docker-compose.certbot.yml | 1 + docker-compose.traefik.yml | 1 + docker-compose.yml | 1 + ldap-overleaf-sl/sharelatex/login.pug | 7 ++++--- ldap-overleaf-sl/sharelatex/router.js | 10 ++++++---- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 913dfa3..6a5f80b 100644 --- a/README.md +++ b/README.md @@ -132,6 +132,7 @@ LDAP_CONTACTS: 'true' GitHub: ``` +OAUTH2_ENABLED: "true" OAUTH2_CLIENT_ID: YOUR_CLIENT_ID OAUTH2_CLIENT_SECRET: YOUR_CLIENT_SECRET OAUTH2_SCOPE: YOUR_SCOPE diff --git a/docker-compose.certbot.yml b/docker-compose.certbot.yml index d3317de..2737543 100644 --- a/docker-compose.certbot.yml +++ b/docker-compose.certbot.yml @@ -82,6 +82,7 @@ services: LDAP_CONTACTS: "false" ## OAuth2 Settings + # OAUTH2_ENABLED: "true" # OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID # OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET # OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index c9b81e2..62095ee 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -163,6 +163,7 @@ services: LDAP_CONTACTS: "false" ## OAuth2 Settings + # OAUTH2_ENABLED: "true" # OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID # OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET # OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE diff --git a/docker-compose.yml b/docker-compose.yml index 54d6e34..9b809a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,6 +80,7 @@ services: LDAP_CONTACTS: "false" ## OAuth2 Settings + # OAUTH2_ENABLED: "true" # OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID # OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET # OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE diff --git a/ldap-overleaf-sl/sharelatex/login.pug b/ldap-overleaf-sl/sharelatex/login.pug index 80f8010..f165d44 100644 --- a/ldap-overleaf-sl/sharelatex/login.pug +++ b/ldap-overleaf-sl/sharelatex/login.pug @@ -47,7 +47,8 @@ block content span(hidden data-ol-inflight="pending") #{translate("logging_in")}… a.pull-right(href='/user/password/reset') #{translate("forgot_your_password")}? //- >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - .form-group.text-center(style="padding-top: 10px") - a.btn-block.login-btn(href="/oauth/redirect" style='padding-left: 0px') - | Log in via OAuth + if process.env.OAUTH2_ENABLED === 'true' + .form-group.text-center(style="padding-top: 10px") + a.btn-block.login-btn(href="/oauth/redirect" style='padding-left: 0px') + | Log in via OAuth2 //- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< diff --git a/ldap-overleaf-sl/sharelatex/router.js b/ldap-overleaf-sl/sharelatex/router.js index 71c91f8..83033f4 100644 --- a/ldap-overleaf-sl/sharelatex/router.js +++ b/ldap-overleaf-sl/sharelatex/router.js @@ -264,10 +264,12 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) { } // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - webRouter.get('/oauth/redirect', AuthenticationController.oauth2Redirect) - webRouter.get('/oauth/callback', AuthenticationController.oauth2Callback) - AuthenticationController.addEndpointToLoginWhitelist('/oauth/redirect') - AuthenticationController.addEndpointToLoginWhitelist('/oauth/callback') + if (process.env.OAUTH2_ENABLED === 'true') { + webRouter.get('/oauth/redirect', AuthenticationController.oauth2Redirect) + webRouter.get('/oauth/callback', AuthenticationController.oauth2Callback) + AuthenticationController.addEndpointToLoginWhitelist('/oauth/redirect') + AuthenticationController.addEndpointToLoginWhitelist('/oauth/callback') + } // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< EditorRouter.apply(webRouter, privateApiRouter)