@budibase/server 1.0.119 → 1.0.122

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.119",
+  "version": "1.0.122",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.119",
-    "@budibase/client": "^1.0.119",
-    "@budibase/string-templates": "^1.0.119",
+    "@budibase/backend-core": "^1.0.122",
+    "@budibase/client": "^1.0.122",
+    "@budibase/string-templates": "^1.0.122",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -174,5 +174,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "3427c72c21063a09d5c5ae89c47d710b69ea2845"
+  "gitHead": "6676007bcdbd7eed9d7f2ac384979364a8268697"
 }

package/src/integrations/googlesheets.ts

@@ -16,6 +16,7 @@ module GoogleSheetsModule {
   const { getGlobalDB } = require("@budibase/backend-core/tenancy")
   const { getScopedConfig } = require("@budibase/backend-core/db")
   const { Configs } = require("@budibase/backend-core/constants")
+  const fetch = require("node-fetch")
 
   interface GoogleSheetsConfig {
     spreadsheetId: string
@@ -28,6 +29,16 @@ module GoogleSheetsModule {
     refreshToken: string
   }
 
+  interface AuthTokenRequest {
+    client_id: string
+    client_secret: string
+    refresh_token: string
+  }
+
+  interface AuthTokenResponse {
+    access_token: string
+  }
+
   const SCHEMA: Integration = {
     plus: true,
     auth: {
@@ -40,6 +51,7 @@ module GoogleSheetsModule {
     friendlyName: "Google Sheets",
     datasource: {
       spreadsheetId: {
+        display: "Google Sheet URL",
         type: DatasourceFieldTypes.STRING,
         required: true,
       },
@@ -135,6 +147,30 @@ module GoogleSheetsModule {
       return parts.length > 5 ? parts[5] : spreadsheetId
     }
 
+    async fetchAccessToken(
+      payload: AuthTokenRequest
+    ): Promise<AuthTokenResponse> {
+      const response = await fetch(
+        "https://www.googleapis.com/oauth2/v4/token",
+        {
+          method: "POST",
+          body: JSON.stringify({
+            ...payload,
+            grant_type: "refresh_token",
+          }),
+          headers: {
+            "Content-Type": "application/json",
+          },
+        }
+      )
+
+      if (response.status !== 200) {
+        throw new Error("Error authenticating with google sheets.")
+      }
+
+      return response.json()
+    }
+
     async connect() {
       try {
         // Initialise oAuth client
@@ -154,14 +190,18 @@ module GoogleSheetsModule {
           clientId: googleConfig.clientID,
           clientSecret: googleConfig.clientSecret,
         })
-        oauthClient.on("tokens", tokens => {
-          oauthClient.setCredentials({
-            refresh_token: googleConfig.refreshToken,
-            access_token: tokens.access_token,
-          })
+
+        const tokenResponse = await this.fetchAccessToken({
+          client_id: googleConfig.clientID,
+          client_secret: googleConfig.clientSecret,
+          refresh_token: this.config.auth.refreshToken,
+        })
+
+        oauthClient.setCredentials({
+          refresh_token: this.config.auth.refreshToken,
+          access_token: tokenResponse.access_token,
         })
-        oauthClient.credentials.access_token = this.config.auth.accessToken
-        oauthClient.credentials.refresh_token = this.config.auth.refreshToken
+
         this.client.useOAuth2Client(oauthClient)
         await this.client.loadInfo()
       } catch (err) {