Add oauth enable flag

This commit is contained in:
yzx9 2023-11-24 14:41:49 +08:00
parent a30419ea5a
commit b1d9cedddb
6 changed files with 14 additions and 7 deletions

View File

@ -132,6 +132,7 @@ LDAP_CONTACTS: 'true'
GitHub: GitHub:
``` ```
OAUTH2_ENABLED: "true"
OAUTH2_CLIENT_ID: YOUR_CLIENT_ID OAUTH2_CLIENT_ID: YOUR_CLIENT_ID
OAUTH2_CLIENT_SECRET: YOUR_CLIENT_SECRET OAUTH2_CLIENT_SECRET: YOUR_CLIENT_SECRET
OAUTH2_SCOPE: YOUR_SCOPE OAUTH2_SCOPE: YOUR_SCOPE

View File

@ -82,6 +82,7 @@ services:
LDAP_CONTACTS: "false" LDAP_CONTACTS: "false"
## OAuth2 Settings ## OAuth2 Settings
# OAUTH2_ENABLED: "true"
# OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID # OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID
# OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET # OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET
# OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE # OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE

View File

@ -163,6 +163,7 @@ services:
LDAP_CONTACTS: "false" LDAP_CONTACTS: "false"
## OAuth2 Settings ## OAuth2 Settings
# OAUTH2_ENABLED: "true"
# OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID # OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID
# OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET # OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET
# OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE # OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE

View File

@ -80,6 +80,7 @@ services:
LDAP_CONTACTS: "false" LDAP_CONTACTS: "false"
## OAuth2 Settings ## OAuth2 Settings
# OAUTH2_ENABLED: "true"
# OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID # OAUTH2_CLIENT_ID: YOUR_OAUTH2_CLIENT_ID
# OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET # OAUTH2_CLIENT_SECRET: YOUR_OAUTH2_CLIENT_SECRET
# OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE # OAUTH2_SCOPE: YOUR_OAUTH2_SCOPE

View File

@ -47,7 +47,8 @@ block content
span(hidden data-ol-inflight="pending") #{translate("logging_in")}… span(hidden data-ol-inflight="pending") #{translate("logging_in")}…
a.pull-right(href='/user/password/reset') #{translate("forgot_your_password")}? a.pull-right(href='/user/password/reset') #{translate("forgot_your_password")}?
//- >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> //- >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
.form-group.text-center(style="padding-top: 10px") if process.env.OAUTH2_ENABLED === 'true'
a.btn-block.login-btn(href="/oauth/redirect" style='padding-left: 0px') .form-group.text-center(style="padding-top: 10px")
| Log in via OAuth a.btn-block.login-btn(href="/oauth/redirect" style='padding-left: 0px')
| Log in via OAuth2
//- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< //- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

View File

@ -264,10 +264,12 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) {
} }
// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
webRouter.get('/oauth/redirect', AuthenticationController.oauth2Redirect) if (process.env.OAUTH2_ENABLED === 'true') {
webRouter.get('/oauth/callback', AuthenticationController.oauth2Callback) webRouter.get('/oauth/redirect', AuthenticationController.oauth2Redirect)
AuthenticationController.addEndpointToLoginWhitelist('/oauth/redirect') webRouter.get('/oauth/callback', AuthenticationController.oauth2Callback)
AuthenticationController.addEndpointToLoginWhitelist('/oauth/callback') AuthenticationController.addEndpointToLoginWhitelist('/oauth/redirect')
AuthenticationController.addEndpointToLoginWhitelist('/oauth/callback')
}
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
EditorRouter.apply(webRouter, privateApiRouter) EditorRouter.apply(webRouter, privateApiRouter)