@budibase/server 1.0.118 → 1.0.121

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -301,7 +301,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Sat Apr 23 2022 12:12:56 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 13:58:44 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -118,7 +118,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Sat Apr 23 2022 12:12:56 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 13:58:44 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/users.js.html

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Sat Apr 23 2022 12:12:56 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 13:58:44 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -481,7 +481,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Sat Apr 23 2022 12:12:56 GMT+0000 (Coordinated Universal Time)
+                at Mon Apr 25 2022 13:58:44 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/dist/api/controllers/row/ExternalRequest.js

@@ -277,7 +277,7 @@ var External;
         squashRelationshipColumns(table, row, relationships) {
             for (let relationship of relationships) {
                 const linkedTable = this.tables[relationship.tableName];
-                if (!linkedTable) {
+                if (!linkedTable || !row[relationship.column]) {
                     continue;
                 }
                 const display = linkedTable.primaryDisplay;

package/dist/integrations/googlesheets.js

@@ -23,6 +23,7 @@ var 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");
     const SCHEMA = {
         plus: true,
         auth: {
@@ -34,6 +35,7 @@ var GoogleSheetsModule;
         friendlyName: "Google Sheets",
         datasource: {
             spreadsheetId: {
+                display: "Google Sheet URL",
                 type: datasource_1.DatasourceFieldTypes.STRING,
                 required: true,
             },
@@ -119,6 +121,21 @@ var GoogleSheetsModule;
             const parts = spreadsheetId.split("/");
             return parts.length > 5 ? parts[5] : spreadsheetId;
         }
+        fetchAccessToken(payload) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const response = yield fetch("https://www.googleapis.com/oauth2/v4/token", {
+                    method: "POST",
+                    body: JSON.stringify(Object.assign(Object.assign({}, 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();
+            });
+        }
         connect() {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
@@ -137,14 +154,15 @@ var GoogleSheetsModule;
                         clientId: googleConfig.clientID,
                         clientSecret: googleConfig.clientSecret,
                     });
-                    oauthClient.on("tokens", tokens => {
-                        oauthClient.setCredentials({
-                            refresh_token: googleConfig.refreshToken,
-                            access_token: tokens.access_token,
-                        });
+                    const tokenResponse = yield 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);
                     yield this.client.loadInfo();
                 }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.117",
+    "version": "1.0.120",
     "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.117",
-        "@budibase/client": "^1.0.117",
-        "@budibase/string-templates": "^1.0.117",
+        "@budibase/backend-core": "^1.0.120",
+        "@budibase/client": "^1.0.120",
+        "@budibase/string-templates": "^1.0.120",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",