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

Default public config.config when missing

This commit is contained in:
Rory Powell 2021-07-15 16:50:57 +01:00
parent 833e3cb3bf
commit 25fdde6d21
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ exports.publicOidc = async function (ctx) {
exports.publicSettings = async function (ctx) { exports.publicSettings = async function (ctx) {
const db = new CouchDB(GLOBAL_DB) const db = new CouchDB(GLOBAL_DB)
let config = {}
try { try {
// Find the config with the most granular scope based on context // Find the config with the most granular scope based on context
const publicConfig = await getScopedFullConfig(db, { const publicConfig = await getScopedFullConfig(db, {
@ -140,20 +140,19 @@ exports.publicSettings = async function (ctx) {
type: Configs.OIDC, type: Configs.OIDC,
}) })
// Slightly complex logic here to deal with the fact that let config = {}
// oidc / google might be enabled but org name etc (publicConfig) might not if (!publicConfig) {
if (publicConfig && !!googleConfig && !!oidcConfig) { config = {
ctx.body = publicConfig config: {},
} else if (!publicConfig && !!googleConfig && !!oidcConfig) {
ctx.body = {}
} else {
if (publicConfig) {
config.config = publicConfig.config
} }
} else {
config = publicConfig
}
config.config.oidc = !!oidcConfig config.config.oidc = !!oidcConfig
config.config.google = !!googleConfig config.config.google = !!googleConfig
ctx.body = config ctx.body = config
}
} catch (err) { } catch (err) {
ctx.throw(err.status, err) ctx.throw(err.status, err)
} }