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.
2023-03-10 15:19:46 +00:00 · 2023-03-10 15:19:46 +00:00 · 51c63d7258
parent 90c20206b3
commit 51c63d7258
2 changed files with 2 additions and 2 deletions
--- 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)

--- 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,