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

Mark google activated by default for old configs

This commit is contained in:
Rory Powell 2021-07-23 14:40:22 +01:00
parent af28a7ed6b
commit b5c12e6265
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/worker/src/api/controllers/admin/configs.js
View File

@ -150,14 +150,24 @@ 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) {