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

Merge pull request #2074 from Budibase/fix/oidc-fixes 

Fix/oidc fixes
This commit is contained in:
Rory Powell 2021-07-23 16:37:23 +01:00 committed by GitHub
parent 37862e807b 34035abac8
commit 6f70e5319d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builder/src/pages/builder/portal/manage/auth/index.svelte
View File

@ -217,6 +217,10 @@
} }
originalGoogleDoc = cloneDeep(googleDoc) originalGoogleDoc = cloneDeep(googleDoc)
} else { } else {
// default activated to true for older configs
if (googleDoc.config.activated === undefined) {
googleDoc.config.activated = true
}
originalGoogleDoc = cloneDeep(googleDoc) originalGoogleDoc = cloneDeep(googleDoc)
providers.google = googleDoc providers.google = googleDoc
} }

4
packages/worker/src/api/controllers/admin/auth.js
View File

@ -144,7 +144,9 @@ async function oidcStrategyFactory(ctx, configId) {
const chosenConfig = config.configs.filter(c => c.uuid === configId)[0] const chosenConfig = config.configs.filter(c => c.uuid === configId)[0]
const callbackUrl = `${ctx.protocol}://${ctx.host}/api/admin/auth/oidc/callback` // require https callback in production
const protocol = process.env.NODE_ENV === "production" ? "https" : "http"
const callbackUrl = `${protocol}://${ctx.host}/api/admin/auth/oidc/callback`
return oidc.strategyFactory(chosenConfig, callbackUrl) return oidc.strategyFactory(chosenConfig, callbackUrl)
} }