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

Disable google auth if no config found (#9983) 

* Fix for #9937 - Google config was pre-activated always, even if no google config had been created.

* Fixing test case.
This commit is contained in:
Michael Drury 2023-03-10 15:19:46 +00:00 committed by GitHub
parent 90c20206b3
commit 51c63d7258
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/worker/src/api/controllers/global/configs.ts
View File

@ -287,7 +287,7 @@ export async function publicSettings(
// google // google
const googleConfig = await configs.getGoogleConfig() const googleConfig = await configs.getGoogleConfig()
const preActivated = googleConfig?.activated == null const preActivated = googleConfig && googleConfig.activated == null
const google = preActivated || !!googleConfig?.activated const google = preActivated || !!googleConfig?.activated
const _googleCallbackUrl = await googleCallbackUrl(googleConfig) const _googleCallbackUrl = await googleCallbackUrl(googleConfig)

2
packages/worker/src/api/routes/global/tests/configs.spec.ts
View File

@ -288,7 +288,7 @@ describe("configs", () => {
company: "Budibase", company: "Budibase",
logoUrl: "", logoUrl: "",
analyticsEnabled: false, analyticsEnabled: false,
google: true, google: false,
googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`, googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`,
isSSOEnforced: false, isSSOEnforced: false,
oidc: false, oidc: false,