From 096672098214e389d467a4aae6cfb2c8a56fe0d4 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Thu, 10 Feb 2022 10:28:46 +0100
Subject: [PATCH] use google env variable for client secret and ID, update helm
 chart to pass variables to worker

---
 charts/budibase/Chart.yaml                    |  4 +--
 .../templates/worker-service-deployment.yaml  |  4 +++
 packages/backend-core/src/environment.js      |  2 ++
 .../middleware/passport/datasource/google.js  | 26 ++++++++-----------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/charts/budibase/Chart.yaml b/charts/budibase/Chart.yaml
index 8c9d44f201..830c1b9f1d 100644
--- a/charts/budibase/Chart.yaml
+++ b/charts/budibase/Chart.yaml
@@ -11,8 +11,8 @@ sources:
   - https://github.com/Budibase/budibase
   - https://budibase.com
 type: application
-version: 0.2.5
-appVersion: 1.0.25
+version: 0.2.6
+appVersion: 1.0.47
 dependencies:
   - name: couchdb
     version: 3.3.4
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 8b6f5564ad..b6c757cb9f 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -111,6 +111,10 @@ spec:
           value: {{ .Values.globals.smtp.from | quote }}
         - name: APPS_URL
           value: http://app-service:{{ .Values.services.apps.port }}
+        - name: GOOGLE_CLIENT_ID
+          value: {{ .Values.globals.google.clientId | quote }}
+        - name: GOOGLE_CLIENT_SECRET
+          value: {{ .Values.globals.google.secret | quote }}
         image: budibase/worker:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
         name: bbworker
diff --git a/packages/backend-core/src/environment.js b/packages/backend-core/src/environment.js
index c26ad1c199..d112ad8599 100644
--- a/packages/backend-core/src/environment.js
+++ b/packages/backend-core/src/environment.js
@@ -11,6 +11,8 @@ module.exports = {
   COUCH_DB_URL: process.env.COUCH_DB_URL,
   COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
   COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
+  GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
+  GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.js b/packages/backend-core/src/middleware/passport/datasource/google.js
index dfa3c647a0..c7553cee50 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.js
+++ b/packages/backend-core/src/middleware/passport/datasource/google.js
@@ -1,20 +1,17 @@
-const { getScopedConfig } = require("../../../db/utils")
-const { getGlobalDB } = require("../../../tenancy")
 const google = require("../google")
-const { Configs, Cookies } = require("../../../constants")
+const { Cookies } = require("../../../constants")
 const { clearCookie, getCookie } = require("../../../utils")
 const { getDB } = require("../../../db")
 const environment = require("../../../environment")
 
 async function preAuth(passport, ctx, next) {
-  const db = getGlobalDB()
   // get the relevant config
-  const config = await getScopedConfig(db, {
-    type: Configs.GOOGLE,
-    workspace: ctx.query.workspace,
-  })
+  const googleConfig = {
+    clientID: environment.GOOGLE_CLIENT_ID,
+    clientSecret: environment.GOOGLE_CLIENT_SECRET,
+  }
   let callbackUrl = `${environment.PLATFORM_URL}/api/global/auth/datasource/google/callback`
-  const strategy = await google.strategyFactory(config, callbackUrl)
+  const strategy = await google.strategyFactory(googleConfig, callbackUrl)
 
   if (!ctx.query.appId || !ctx.query.datasourceId) {
     ctx.throw(400, "appId and datasourceId query params not present.")
@@ -28,12 +25,11 @@ async function preAuth(passport, ctx, next) {
 }
 
 async function postAuth(passport, ctx, next) {
-  const db = getGlobalDB()
-
-  const config = await getScopedConfig(db, {
-    type: Configs.GOOGLE,
-    workspace: ctx.query.workspace,
-  })
+  // get the relevant config
+  const config = {
+    clientID: environment.GOOGLE_CLIENT_ID,
+    clientSecret: environment.GOOGLE_CLIENT_SECRET,
+  }
 
   let callbackUrl = `${environment.PLATFORM_URL}/api/global/auth/datasource/google/callback`
   const strategy = await google.strategyFactory(