@budibase/server 1.0.98-alpha.8 → 1.0.100

package/dist/api/controllers/integration.js

@@ -8,25 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { cloneDeep } = require("lodash");
 const { definitions } = require("../../integrations");
-const { getTenantId } = require("@budibase/backend-core/tenancy");
-const { SourceNames } = require("../../definitions/datasource");
-const googlesheets = require("../../integrations/googlesheets");
-const env = require("../../environment");
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.status = 200;
-        const defs = cloneDeep(definitions);
-        // for google sheets integration google verification
-        if (env.EXCLUDE_QUOTAS_TENANTS) {
-            const excludedTenants = env.EXCLUDE_QUOTAS_TENANTS.split(",");
-            const tenantId = getTenantId();
-            if (excludedTenants.includes(tenantId)) {
-                defs[SourceNames.GOOGLE_SHEETS] = googlesheets.schema;
-            }
-        }
-        ctx.body = defs;
+        ctx.body = definitions;
     });
 };
 exports.find = function (ctx) {

package/dist/api/controllers/permission.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getBuiltinPermissions } = require("@budibase/backend-core/permissions");
-const { isBuiltin, getDBRoleID, getExternalRoleID, getBuiltinRoles, } = require("@budibase/backend-core/roles");
+const { isBuiltin, getDBRoleID, getExternalRoleID, getBuiltinRoles, checkForRoleResourceArray, } = require("@budibase/backend-core/roles");
 const { getRoleParams } = require("../../db/utils");
 const { CURRENTLY_SUPPORTED_LEVELS, getBasePermissions, } = require("../../utilities/security");
 const { removeFromArray } = require("../../utilities");
@@ -130,11 +130,10 @@ exports.getResourcePerms = function (ctx) {
         for (let level of SUPPORTED_LEVELS) {
             // update the various roleIds in the resource permissions
             for (let role of roles) {
-                const rolePerms = role.permissions;
+                const rolePerms = checkForRoleResourceArray(role.permissions, resourceId);
                 if (rolePerms &&
                     rolePerms[resourceId] &&
-                    (rolePerms[resourceId] === level ||
-                        rolePerms[resourceId].indexOf(level) !== -1)) {
+                    rolePerms[resourceId].indexOf(level) !== -1) {
                     permissions[level] = getExternalRoleID(role._id);
                 }
             }

package/dist/api/controllers/query/import/index.js

@@ -13,7 +13,6 @@ exports.RestImporter = void 0;
 const validation_1 = require("../validation");
 const utils_1 = require("../../../../db/utils");
 const openapi2_1 = require("./sources/openapi2");
-const openapi3_1 = require("./sources/openapi3");
 const curl_1 = require("./sources/curl");
 // @ts-ignore
 const context_1 = require("@budibase/backend-core/context");
@@ -72,7 +71,7 @@ class RestImporter {
             };
         });
         this.data = data;
-        this.sources = [new openapi2_1.OpenAPI2(), new openapi3_1.OpenAPI3(), new curl_1.Curl()];
+        this.sources = [new openapi2_1.OpenAPI2(), new curl_1.Curl()];
     }
 }
 exports.RestImporter = RestImporter;

package/dist/api/controllers/query/import/sources/base/index.js

@@ -17,18 +17,7 @@ class ImportSource {
             const transformer = "return data";
             const schema = {};
             path = this.processPath(path);
-            if (url) {
-                if (typeof url === "string") {
-                    path = `${url}/${path}`;
-                }
-                else {
-                    let href = url.href;
-                    if (href.endsWith("/")) {
-                        href = href.slice(0, -1);
-                    }
-                    path = `${href}/${path}`;
-                }
-            }
+            path = `${url.origin}/${path}`;
             queryString = this.processQuery(queryString);
             const requestBody = JSON.stringify(body, null, 2);
             const query = {

package/dist/api/controllers/query/import/sources/curl.js

@@ -79,7 +79,7 @@ class Curl extends base_1.ImportSource {
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
             const url = this.getUrl();
             const name = url.pathname;
-            const path = url.origin + url.pathname;
+            const path = url.pathname;
             const method = this.curl.method;
             const queryString = url.search;
             const headers = this.curl.headers;
@@ -88,7 +88,7 @@ class Curl extends base_1.ImportSource {
             if (cookieHeader) {
                 headers["Cookie"] = cookieHeader;
             }
-            const query = this.constructQuery(datasourceId, name, method, path, undefined, queryString, headers, [], requestBody);
+            const query = this.constructQuery(datasourceId, name, method, path, url, queryString, headers, [], requestBody);
             return [query];
         });
     }

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

@@ -91,8 +91,7 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const isUserTable = tableId === InternalTables.USER_METADATA;
     let oldRow;
     try {
-        let dbTable = yield db.get(tableId);
-        oldRow = yield outputProcessing(dbTable, yield findRow(ctx, tableId, inputs._id));
+        oldRow = yield db.get(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/bbtel", controller.isEnabled)
-    .post("/api/bbtel/ping", controller.endUserPing);
+    .get("/api/analytics", controller.isEnabled)
+    .post("/api/analytics/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,7 +50,6 @@ 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,8 +38,6 @@ 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,8 +34,11 @@ function parse(input) {
     if (typeof input !== "string") {
         return input;
     }
-    if (input === MAX_ISO_DATE || input === MIN_ISO_DATE) {
-        return null;
+    if (input === MAX_ISO_DATE) {
+        return new Date(8640000000000000);
+    }
+    if (input === MIN_ISO_DATE) {
+        return new Date(-8640000000000000);
     }
     if (utils_1.isIsoDateString(input)) {
         return new Date(input);
@@ -124,21 +127,11 @@ class InternalBuilder {
         }
         if (filters.range) {
             iterate(filters.range, (key, value) => {
-                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);
+                if (!value.high || !value.low) {
+                    return;
                 }
+                const fnc = allOr ? "orWhereBetween" : "whereBetween";
+                query = query[fnc](key, [value.low, value.high]);
             });
         }
         if (filters.equal) {

package/dist/integrations/dynamodb.js

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

package/dist/integrations/googlesheets.js

@@ -8,16 +8,12 @@ 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");
@@ -124,25 +120,13 @@ var GoogleSheetsModule;
                 try {
                     // Initialise oAuth client
                     const db = getGlobalDB();
-                    let googleConfig = yield getScopedConfig(db, {
+                    const 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,7 +11,6 @@ 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 = {
@@ -26,7 +25,6 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
-    [SourceNames.FIREBASE]: firebase.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -40,8 +38,6 @@ 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")) {
@@ -51,6 +47,7 @@ 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,7 +10,6 @@ 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",
@@ -149,7 +148,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 = lodash_1.get(data, pagination.responseParam);
+                    nextCursor = data === null || data === void 0 ? void 0 : 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.98-alpha.7",
+    "version": "1.0.99",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -68,13 +68,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.98-alpha.7",
-        "@budibase/client": "^1.0.98-alpha.7",
-        "@budibase/string-templates": "^1.0.98-alpha.7",
+        "@budibase/backend-core": "^1.0.99",
+        "@budibase/client": "^1.0.99",
+        "@budibase/string-templates": "^1.0.99",
         "@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",
@@ -146,7 +145,6 @@
         "@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",
@@ -155,7 +153,6 @@
         "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",