@budibase/server 2.3.18-alpha.14 → 2.3.18-alpha.16

package/dist/integrations/googlesheets.js

@@ -8,14 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const google_auth_library_1 = require("google-auth-library");
 const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const google_spreadsheet_1 = require("google-spreadsheet");
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const backend_core_1 = require("@budibase/backend-core");
-const fetch = require("node-fetch");
 const SCHEMA = {
     plus: true,
     auth: {
@@ -116,7 +119,7 @@ class GoogleSheetsIntegration {
     }
     fetchAccessToken(payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield fetch("https://www.googleapis.com/oauth2/v4/token", {
+            const response = yield (0, node_fetch_1.default)("https://www.googleapis.com/oauth2/v4/token", {
                 method: "POST",
                 body: JSON.stringify(Object.assign(Object.assign({}, payload), { grant_type: "refresh_token" })),
                 headers: {
@@ -134,7 +137,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Initialise oAuth client
-                let googleConfig = yield backend_core_1.configs.getGoogleConfig();
+                let googleConfig = yield backend_core_1.configs.getGoogleDatasourceConfig();
                 if (!googleConfig) {
                     throw new backend_core_1.HTTPError("Google config not found", 400);
                 }
@@ -163,7 +166,7 @@ class GoogleSheetsIntegration {
     buildSchema(datasourceId) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.connect();
-            const sheets = yield this.client.sheetsByIndex;
+            const sheets = this.client.sheetsByIndex;
             const tables = {};
             for (let sheet of sheets) {
                 // must fetch rows to determine schema
@@ -244,7 +247,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[table.name];
+                const sheet = this.client.sheetsByTitle[table.name];
                 yield sheet.loadHeaderRow();
                 if (table._rename) {
                     const headers = [];
@@ -259,8 +262,12 @@ class GoogleSheetsIntegration {
                     yield sheet.setHeaderRow(headers);
                 }
                 else {
-                    let newField = Object.keys(table.schema).find(key => !sheet.headerValues.includes(key));
-                    yield sheet.setHeaderRow([...sheet.headerValues, newField]);
+                    const updatedHeaderValues = [...sheet.headerValues];
+                    const newField = Object.keys(table.schema).find(key => !sheet.headerValues.includes(key));
+                    if (newField) {
+                        updatedHeaderValues.push(newField);
+                    }
+                    yield sheet.setHeaderRow(updatedHeaderValues);
                 }
             }
             catch (err) {
@@ -273,7 +280,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheetToDelete = yield this.client.sheetsByTitle[sheet];
+                const sheetToDelete = this.client.sheetsByTitle[sheet];
                 return yield sheetToDelete.delete();
             }
             catch (err) {
@@ -286,7 +293,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[query.sheet];
+                const sheet = this.client.sheetsByTitle[query.sheet];
                 const rowToInsert = typeof query.row === "string" ? JSON.parse(query.row) : query.row;
                 const row = yield sheet.addRow(rowToInsert);
                 return [
@@ -303,7 +310,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[query.sheet];
+                const sheet = this.client.sheetsByTitle[query.sheet];
                 const rows = yield sheet.getRows();
                 const headerValues = sheet.headerValues;
                 const response = [];
@@ -322,7 +329,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[query.sheet];
+                const sheet = this.client.sheetsByTitle[query.sheet];
                 const rows = yield sheet.getRows();
                 const row = rows[query.rowIndex];
                 if (row) {
@@ -348,7 +355,7 @@ class GoogleSheetsIntegration {
     delete(query) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.connect();
-            const sheet = yield this.client.sheetsByTitle[query.sheet];
+            const sheet = this.client.sheetsByTitle[query.sheet];
             const rows = yield sheet.getRows();
             const row = rows[query.rowIndex];
             if (row) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.3.18-alpha.13",
+    "version": "2.3.18-alpha.15",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.3.18-alpha.13",
-        "@budibase/client": "2.3.18-alpha.13",
-        "@budibase/pro": "2.3.18-alpha.13",
-        "@budibase/string-templates": "2.3.18-alpha.13",
-        "@budibase/types": "2.3.18-alpha.13",
+        "@budibase/backend-core": "2.3.18-alpha.15",
+        "@budibase/client": "2.3.18-alpha.15",
+        "@budibase/pro": "2.3.18-alpha.15",
+        "@budibase/string-templates": "2.3.18-alpha.15",
+        "@budibase/types": "2.3.18-alpha.15",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -87,6 +87,7 @@
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
+        "koa-useragent": "^4.1.0",
         "koa2-ratelimit": "1.1.1",
         "lodash": "4.17.21",
         "memorystream": "0.3.1",

package/dist/startup.js

@@ -141,6 +141,9 @@ function startup(app, server) {
         // get the references to the queue promises, don't await as
         // they will never end, unless the processing stops
         let queuePromises = [];
+        // configure events to use the pro audit log write
+        // can't integrate directly into backend-core due to cyclic issues
+        queuePromises.push(backend_core_1.events.processors.init(pro.sdk.auditLogs.write));
         queuePromises.push(automations.init());
         queuePromises.push(initPro());
         if (app) {