Merge pull request #2072 from Budibase/fix/google-button

Mark google activated by default for old configs

packages/server/src/api/routes/tests/misc.spec.js

@@ -31,7 +31,13 @@ describe("run misc tests", () => {
   describe("/version", () => {
     it("should confirm version", async () => {
       const res = await request.get("/version").expect(200)
-      expect(res.text.split(".").length).toEqual(3)
+      const text = res.text
+      if (text.includes("alpha")) {
+        expect(text.split(".").length).toEqual(4)
+      } else {
+        expect(text.split(".").length).toEqual(3)
+      }
+      
     })
   })
 

packages/worker/src/api/controllers/admin/configs.js

@@ -149,16 +149,16 @@ exports.publicSettings = async function (ctx) {
       config = publicConfig
     }
 
-    config.config.google = !googleConfig
+    // google button flag
-      ? !!googleConfig
+    const googleActivated =
-      : !googleConfig.config.activated
+      googleConfig.config.activated == undefined || // activated by default for configs pre-activated flag
-      ? false
+      googleConfig.config.activated
-      : true
+    config.config.google = !googleConfig ? false : googleActivated
-    config.config.oidc = !oidcConfig
+
-      ? !!oidcConfig
+    // oidc button flag
-      : !oidcConfig.config.configs[0].activated
+    const oidcActivated = !oidcConfig.config.configs[0].activated
-      ? false
+    config.config.oidc = !oidcConfig ? false : oidcActivated
-      : true
+
     ctx.body = config
   } catch (err) {
     ctx.throw(err.status, err)