MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10056 from StarZeus/BUDI-9344 

Configuration for Google Auth and OIDC Redirect URLs #9892
This commit is contained in:
Martin McKeaveney 2023-03-22 07:03:32 +00:00 committed by GitHub
parent 2fc361a838 a46a33877b
commit 4b24eadb92
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/worker/src/api/controllers/global/auth.ts
View File

@ -204,13 +204,16 @@ export const googleCallback = async (ctx: any, next: any) => {
return passport.authenticate( return passport.authenticate(
strategy, strategy,
{ successRedirect: "/", failureRedirect: "/error" }, {
successRedirect: env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT,
failureRedirect: env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT,
},
async (err: any, user: SSOUser, info: any) => { async (err: any, user: SSOUser, info: any) => {
await passportCallback(ctx, user, err, info) await passportCallback(ctx, user, err, info)
await context.identity.doInUserContext(user, ctx, async () => { await context.identity.doInUserContext(user, ctx, async () => {
await events.auth.login("google-internal", user.email) await events.auth.login("google-internal", user.email)
}) })
ctx.redirect("/") ctx.redirect(env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT)
} }
)(ctx, next) )(ctx, next)
} }
@ -269,13 +272,16 @@ export const oidcCallback = async (ctx: any, next: any) => {
return passport.authenticate( return passport.authenticate(
strategy, strategy,
{ successRedirect: "/", failureRedirect: "/error" }, {
successRedirect: env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT,
failureRedirect: env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT,
},
async (err: any, user: SSOUser, info: any) => { async (err: any, user: SSOUser, info: any) => {
await passportCallback(ctx, user, err, info) await passportCallback(ctx, user, err, info)
await context.identity.doInUserContext(user, ctx, async () => { await context.identity.doInUserContext(user, ctx, async () => {
await events.auth.login("oidc", user.email) await events.auth.login("oidc", user.email)
}) })
ctx.redirect("/") ctx.redirect(env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT)
} }
)(ctx, next) )(ctx, next)
} }

9
packages/worker/src/environment.ts
View File

@ -66,6 +66,15 @@ const environment = {
* Mock the email service in use - links to ethereal hosted emails are logged instead. * Mock the email service in use - links to ethereal hosted emails are logged instead.
*/ */
ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE, ENABLE_EMAIL_TEST_MODE: process.env.ENABLE_EMAIL_TEST_MODE,
PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT:
process.env.PASSPORT_GOOGLEAUTH_SUCCESS_REDIRECT || "/",
PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT:
process.env.PASSPORT_GOOGLEAUTH_FAILURE_REDIRECT || "/error",
PASSPORT_OIDCAUTH_SUCCESS_REDIRECT:
process.env.PASSPORT_OIDCAUTH_SUCCESS_REDIRECT || "/",
PASSPORT_OIDCAUTH_FAILURE_REDIRECT:
process.env.PASSPORT_OIDCAUTH_FAILURE_REDIRECT || "/error",
_set(key: any, value: any) { _set(key: any, value: any) {
process.env[key] = value process.env[key] = value
// @ts-ignore // @ts-ignore