CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-29 16:51:33 +13:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2073 from Budibase/fix/google-button

Browse source 
Mark google activated by default for old configs
This commit is contained in:
Rory Powell 2021-07-23 14:56:44 +01:00 committed by GitHub
commit 0073b554d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/worker/src/api/controllers/admin/configs.js
View file

@ -150,14 +150,22 @@ exports.publicSettings = async function (ctx) {
}
// google button flag
const googleActivated =
googleConfig.config.activated == undefined || // activated by default for configs pre-activated flag
googleConfig.config.activated
config.config.google = !googleConfig ? false : googleActivated
if (googleConfig && googleConfig.config) {
const googleActivated =
googleConfig.config.activated == undefined || // activated by default for configs pre-activated flag
googleConfig.config.activated
config.config.google = googleActivated
} else {
config.config.google = false
}
// oidc button flag
const oidcActivated = !oidcConfig.config.configs[0].activated
config.config.oidc = !oidcConfig ? false : oidcActivated
if (oidcConfig && oidcConfig.config) {
const oidcActivated = oidcConfig.config.configs[0].activated
config.config.oidc = oidcActivated
} else {
config.config.oidc = false
}
ctx.body = config
} catch (err) {