@budibase/server 1.0.98 → 1.0.101

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

@@ -91,7 +91,8 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const isUserTable = tableId === InternalTables.USER_METADATA;
     let oldRow;
     try {
-        oldRow = yield db.get(inputs._id);
+        let dbTable = yield db.get(tableId);
+        oldRow = yield outputProcessing(dbTable, yield findRow(ctx, tableId, inputs._id));
     }
     catch (err) {
         if (isUserTable) {

package/dist/api/routes/analytics.js

@@ -3,6 +3,6 @@ const Router = require("@koa/router");
 const controller = require("../controllers/analytics");
 const router = Router();
 router
-    .get("/api/analytics", controller.isEnabled)
-    .post("/api/analytics/ping", controller.endUserPing);
+    .get("/api/bbtel", controller.isEnabled)
+    .post("/api/bbtel/ping", controller.endUserPing);
 module.exports = router;

package/dist/api/routes/table.js

@@ -32,7 +32,7 @@ router
      *
      * @apiSuccess {object[]} body The response body will be the table that was found.
      */
-    .get("/api/tables/:tableId", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.READ), tableController.find)
+    .get("/api/tables/:tableId", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.READ, { schema: true }), tableController.find)
     /**
      * @api {post} /api/tables Save a table
      * @apiName Save a table

package/dist/automations/utils.js

@@ -25,10 +25,12 @@ const Runner = new Thread(ThreadType.AUTOMATION);
 exports.processEvent = (job) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         // need to actually await these so that an error can be captured properly
+        console.log(`${job.data.automation.appId} automation ${job.data.automation._id} running`);
         return yield Runner.run(job);
     }
     catch (err) {
-        console.error(`${job.data.automation.appId} automation ${job.data.automation._id} was unable to run - ${err}`);
+        const errJson = JSON.stringify(err);
+        console.error(`${job.data.automation.appId} automation ${job.data.automation._id} was unable to run - ${errJson}`);
         console.trace(err);
         return { err };
     }

package/dist/definitions/datasource.js

@@ -50,6 +50,7 @@ var SourceNames;
     SourceNames["REST"] = "REST";
     SourceNames["ORACLE"] = "ORACLE";
     SourceNames["GOOGLE_SHEETS"] = "GOOGLE_SHEETS";
+    SourceNames["FIREBASE"] = "FIREBASE";
 })(SourceNames = exports.SourceNames || (exports.SourceNames = {}));
 var IncludeRelationships;
 (function (IncludeRelationships) {

package/dist/environment.js

@@ -38,6 +38,8 @@ module.exports = {
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
     API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
+    GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
+    GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
     // environment
     NODE_ENV: process.env.NODE_ENV,
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,

package/dist/integrations/base/sql.js

@@ -34,11 +34,8 @@ function parse(input) {
     if (typeof input !== "string") {
         return input;
     }
-    if (input === MAX_ISO_DATE) {
-        return new Date(8640000000000000);
-    }
-    if (input === MIN_ISO_DATE) {
-        return new Date(-8640000000000000);
+    if (input === MAX_ISO_DATE || input === MIN_ISO_DATE) {
+        return null;
     }
     if (utils_1.isIsoDateString(input)) {
         return new Date(input);
@@ -127,11 +124,21 @@ class InternalBuilder {
         }
         if (filters.range) {
             iterate(filters.range, (key, value) => {
-                if (!value.high || !value.low) {
-                    return;
+                if (value.low && value.high) {
+                    // Use a between operator if we have 2 valid range values
+                    const fnc = allOr ? "orWhereBetween" : "whereBetween";
+                    query = query[fnc](key, [value.low, value.high]);
+                }
+                else if (value.low) {
+                    // Use just a single greater than operator if we only have a low
+                    const fnc = allOr ? "orWhere" : "where";
+                    query = query[fnc](key, ">", value.low);
+                }
+                else if (value.high) {
+                    // Use just a single less than operator if we only have a high
+                    const fnc = allOr ? "orWhere" : "where";
+                    query = query[fnc](key, "<", value.high);
                 }
-                const fnc = allOr ? "orWhereBetween" : "whereBetween";
-                query = query[fnc](key, [value.low, value.high]);
             });
         }
         if (filters.equal) {

package/dist/integrations/dynamodb.js

@@ -124,7 +124,9 @@ var DynamoModule;
     class DynamoDBIntegration {
         constructor(config) {
             this.config = config;
-            this.connect();
+            if (!this.config.endpoint) {
+                this.connect();
+            }
             let options = {
                 correctClockSkew: true,
                 endpoint: config.endpoint ? config.endpoint : undefined,

package/dist/integrations/firebase.js

@@ -0,0 +1,192 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const datasource_1 = require("../definitions/datasource");
+const firestore_1 = require("@google-cloud/firestore");
+var Firebase;
+(function (Firebase) {
+    const SCHEMA = {
+        docs: "https://firebase.google.com/docs/firestore/quickstart",
+        friendlyName: "Firestore",
+        description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
+        datasource: {
+            email: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            privateKey: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            projectId: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            serviceAccount: {
+                type: datasource_1.DatasourceFieldTypes.JSON,
+                required: false,
+            },
+        },
+        query: {
+            create: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+            read: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+            update: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+            delete: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+        },
+        extra: {
+            collection: {
+                displayName: "Collection",
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            filterField: {
+                displayName: "Filter field",
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: false,
+            },
+            filter: {
+                displayName: "Filter comparison",
+                type: datasource_1.DatasourceFieldTypes.LIST,
+                required: false,
+                data: {
+                    read: [
+                        "==",
+                        "<",
+                        "<=",
+                        "==",
+                        "!=",
+                        ">=",
+                        ">",
+                        "array-contains",
+                        "in",
+                        "not-in",
+                        "array-contains-any",
+                    ],
+                },
+            },
+            filterValue: {
+                displayName: "Filter value",
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: false,
+            },
+        },
+    };
+    class FirebaseIntegration {
+        constructor(config) {
+            this.config = config;
+            if (config.serviceAccount) {
+                const serviceAccount = JSON.parse(config.serviceAccount);
+                this.db = new firestore_1.Firestore({
+                    projectId: serviceAccount.project_id,
+                    credentials: {
+                        client_email: serviceAccount.client_email,
+                        private_key: serviceAccount.private_key,
+                    },
+                });
+            }
+            else {
+                this.db = new firestore_1.Firestore({
+                    projectId: config.projectId,
+                    credentials: {
+                        client_email: config.email,
+                        private_key: config.privateKey,
+                    },
+                });
+            }
+        }
+        create(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const documentReference = this.db
+                        .collection(query.extra.collection)
+                        .doc();
+                    yield documentReference.set(Object.assign(Object.assign({}, query.json), { id: documentReference.id }));
+                    const snapshot = yield documentReference.get();
+                    return snapshot.data();
+                }
+                catch (err) {
+                    console.error("Error writing to Firestore", err);
+                    throw err;
+                }
+            });
+        }
+        read(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let snapshot;
+                    const collectionRef = this.db.collection(query.extra.collection);
+                    if (query.extra.filterField &&
+                        query.extra.filter &&
+                        query.extra.filterValue) {
+                        snapshot = yield collectionRef
+                            .where(query.extra.filterField, query.extra.filter, query.extra.filterValue)
+                            .get();
+                    }
+                    else {
+                        snapshot = yield collectionRef.get();
+                    }
+                    const result = [];
+                    snapshot.forEach(doc => result.push(doc.data()));
+                    return result;
+                }
+                catch (err) {
+                    console.error("Error querying Firestore", err);
+                    throw err;
+                }
+            });
+        }
+        update(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.db
+                        .collection(query.extra.collection)
+                        .doc(query.json.id)
+                        .update(query.json);
+                    return (yield this.db
+                        .collection(query.extra.collection)
+                        .doc(query.json.id)
+                        .get()).data();
+                }
+                catch (err) {
+                    console.error("Error writing to firebase", err);
+                    throw err;
+                }
+            });
+        }
+        delete(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.db
+                        .collection(query.extra.collection)
+                        .doc(query.json.id)
+                        .delete();
+                    return true;
+                }
+                catch (err) {
+                    console.error("Error writing to mongodb", err);
+                    throw err;
+                }
+            });
+        }
+    }
+    module.exports = {
+        schema: SCHEMA,
+        integration: FirebaseIntegration,
+    };
+})(Firebase || (Firebase = {}));

package/dist/integrations/googlesheets.js

@@ -8,12 +8,16 @@ 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 datasource_1 = require("../definitions/datasource");
 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 environment_1 = __importDefault(require("../environment"));
 var GoogleSheetsModule;
 (function (GoogleSheetsModule) {
     const { getGlobalDB } = require("@budibase/backend-core/tenancy");
@@ -120,13 +124,25 @@ var GoogleSheetsModule;
                 try {
                     // Initialise oAuth client
                     const db = getGlobalDB();
-                    const googleConfig = yield getScopedConfig(db, {
+                    let googleConfig = yield getScopedConfig(db, {
                         type: Configs.GOOGLE,
                     });
+                    if (!googleConfig) {
+                        googleConfig = {
+                            clientID: environment_1.default.GOOGLE_CLIENT_ID,
+                            clientSecret: environment_1.default.GOOGLE_CLIENT_SECRET,
+                        };
+                    }
                     const oauthClient = new google_auth_library_1.OAuth2Client({
                         clientId: googleConfig.clientID,
                         clientSecret: googleConfig.clientSecret,
                     });
+                    oauthClient.on("tokens", tokens => {
+                        oauthClient.setCredentials({
+                            refresh_token: googleConfig.refreshToken,
+                            access_token: tokens.access_token,
+                        });
+                    });
                     oauthClient.credentials.access_token = this.config.auth.accessToken;
                     oauthClient.credentials.refresh_token = this.config.auth.refreshToken;
                     this.client.useOAuth2Client(oauthClient);

package/dist/integrations/index.js

@@ -11,6 +11,7 @@ const mysql = require("./mysql");
 const arangodb = require("./arangodb");
 const rest = require("./rest");
 const googlesheets = require("./googlesheets");
+const firebase = require("./firebase");
 const { SourceNames } = require("../definitions/datasource");
 const environment = require("../environment");
 const DEFINITIONS = {
@@ -25,6 +26,7 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
+    [SourceNames.FIREBASE]: firebase.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -38,6 +40,8 @@ const INTEGRATIONS = {
     [SourceNames.MYSQL]: mysql.integration,
     [SourceNames.ARANGODB]: arangodb.integration,
     [SourceNames.REST]: rest.integration,
+    [SourceNames.FIREBASE]: firebase.integration,
+    [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {
@@ -47,7 +51,6 @@ if (!(process.arch === "arm64" && process.platform === "darwin")) {
 }
 if (environment.SELF_HOSTED) {
     DEFINITIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.schema;
-    INTEGRATIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.integration;
 }
 module.exports = {
     definitions: DEFINITIONS,

package/dist/integrations/mysql.js

@@ -65,6 +65,19 @@ var MySQLModule;
             },
         },
     };
+    function bindingTypeCoerce(bindings) {
+        for (let i = 0; i < bindings.length; i++) {
+            const binding = bindings[i];
+            if (typeof binding !== "string") {
+                continue;
+            }
+            const matches = binding.match(/^\d*/g);
+            if (matches && matches[0] !== "" && !isNaN(Number(matches[0]))) {
+                bindings[i] = parseFloat(binding);
+            }
+        }
+        return bindings;
+    }
     class MySQLIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.MY_SQL);
@@ -99,7 +112,7 @@ var MySQLModule;
                         yield this.connect();
                     }
                     // Node MySQL is callback based, so we must wrap our call in a promise
-                    const response = yield this.client.query(query.sql, query.bindings || []);
+                    const response = yield this.client.query(query.sql, bindingTypeCoerce(query.bindings || []));
                     return response[0];
                 }
                 finally {

package/dist/integrations/rest.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const datasource_1 = require("../definitions/datasource");
+const lodash_1 = require("lodash");
 const BodyTypes = {
     NONE: "none",
     FORM_DATA: "form",
@@ -148,7 +149,7 @@ var RestModule;
                 // Check if a pagination cursor exists in the response
                 let nextCursor = null;
                 if (pagination === null || pagination === void 0 ? void 0 : pagination.responseParam) {
-                    nextCursor = data === null || data === void 0 ? void 0 : data[pagination.responseParam];
+                    nextCursor = lodash_1.get(data, pagination.responseParam);
                 }
                 return {
                     data,

package/dist/middleware/authorized.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getUserRoleHierarchy, getRequiredResourceRole, BUILTIN_ROLE_IDS, } = require("@budibase/backend-core/roles");
-const { PermissionTypes, doesHaveBasePermission, } = require("@budibase/backend-core/permissions");
+const { PermissionTypes, PermissionLevels, doesHaveBasePermission, } = require("@budibase/backend-core/permissions");
 const builderMiddleware = require("./builder");
 const { isWebhookEndpoint } = require("./utils");
 const { buildCsrfMiddleware } = require("@budibase/backend-core/auth");
@@ -57,7 +57,7 @@ const checkAuthorizedResource = (ctx, resourceRoles, permType, permLevel) => __a
     }
 });
 module.exports =
-    (permType, permLevel = null) => (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    (permType, permLevel = null, opts = { schema: false }) => (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         // webhooks don't need authentication, each webhook unique
         // also internal requests (between services) don't need authorized
         if (isWebhookEndpoint(ctx) || ctx.internal) {
@@ -70,22 +70,39 @@ module.exports =
         // to find API endpoints which are builder focused
         yield builderMiddleware(ctx, permType);
         // get the resource roles
-        let resourceRoles = [];
+        let resourceRoles = [], otherLevelRoles;
+        const otherLevel = permLevel === PermissionLevels.READ
+            ? PermissionLevels.WRITE
+            : PermissionLevels.READ;
         const appId = getAppId();
         if (appId && hasResource(ctx)) {
             resourceRoles = yield getRequiredResourceRole(permLevel, ctx);
+            if (opts && opts.schema) {
+                otherLevelRoles = yield getRequiredResourceRole(otherLevel, ctx);
+            }
         }
         // if the resource is public, proceed
-        const isPublicResource = resourceRoles.includes(BUILTIN_ROLE_IDS.PUBLIC);
-        if (isPublicResource) {
+        if (resourceRoles.includes(BUILTIN_ROLE_IDS.PUBLIC) ||
+            (otherLevelRoles && otherLevelRoles.includes(BUILTIN_ROLE_IDS.PUBLIC))) {
             return next();
         }
         // check authenticated
         if (!ctx.isAuthenticated) {
             return ctx.throw(403, "Session not authenticated");
         }
-        // check authorized
-        yield checkAuthorized(ctx, resourceRoles, permType, permLevel);
+        try {
+            // check authorized
+            yield checkAuthorized(ctx, resourceRoles, permType, permLevel);
+        }
+        catch (err) {
+            // this is a schema, check if
+            if (opts && opts.schema && permLevel) {
+                yield checkAuthorized(ctx, otherLevelRoles, permType, otherLevel);
+            }
+            else {
+                throw err;
+            }
+        }
         // csrf protection
         return csrf(ctx, next);
     });

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.97",
+    "version": "1.0.100",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -68,12 +68,13 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.97",
-        "@budibase/client": "^1.0.97",
-        "@budibase/string-templates": "^1.0.97",
+        "@budibase/backend-core": "^1.0.100",
+        "@budibase/client": "^1.0.100",
+        "@budibase/string-templates": "^1.0.100",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
+        "@google-cloud/firestore": "^5.0.2",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
         "@sentry/node": "^6.0.0",
@@ -145,6 +146,7 @@
         "@types/jest": "^26.0.23",
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",
+        "@types/lodash": "4.14.180",
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
         "@types/redis": "^4.0.11",
@@ -153,6 +155,7 @@
         "copyfiles": "^2.4.1",
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
+        "is-wsl": "^2.2.0",
         "jest": "^27.0.5",
         "jest-openapi": "^0.14.2",
         "nodemon": "^2.0.4",