From 51c63d72589b44bc4d27b2e120e71242cdf8f191 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Fri, 10 Mar 2023 15:19:46 +0000 Subject: [PATCH] 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. --- packages/worker/src/api/controllers/global/configs.ts | 2 +- packages/worker/src/api/routes/global/tests/configs.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 02459855c2..4f4575074b 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -287,7 +287,7 @@ export async function publicSettings( // google const googleConfig = await configs.getGoogleConfig() - const preActivated = googleConfig?.activated == null + const preActivated = googleConfig && googleConfig.activated == null const google = preActivated || !!googleConfig?.activated const _googleCallbackUrl = await googleCallbackUrl(googleConfig) diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts index 892fe8a67b..1abe575b02 100644 --- a/packages/worker/src/api/routes/global/tests/configs.spec.ts +++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts @@ -288,7 +288,7 @@ describe("configs", () => { company: "Budibase", logoUrl: "", analyticsEnabled: false, - google: true, + google: false, googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`, isSSOEnforced: false, oidc: false,