@budibase/server 0.9.171 → 0.9.173-alpha.2

package/dist/automations/steps/queryRows.js

@@ -12,6 +12,7 @@ const rowController = require("../../api/controllers/row");
 const tableController = require("../../api/controllers/table");
 const { FieldTypes } = require("../../constants");
 const { buildCtx } = require("./utils");
+const automationUtils = require("../automationUtils");
 const SortOrders = {
     ASCENDING: "ascending",
     DESCENDING: "descending",
@@ -119,7 +120,7 @@ exports.run = function ({ inputs, appId }) {
         catch (err) {
             return {
                 success: false,
-                response: err,
+                response: automationUtils.getError(err),
             };
         }
     });

package/dist/automations/steps/sendSmtpEmail.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { sendSmtpEmail } = require("../../utilities/workerRequests");
+const automationUtils = require("../automationUtils");
 exports.definition = {
     description: "Send an email using SMTP",
     tagline: "Send SMTP email to {{inputs.to}}",
@@ -71,7 +72,7 @@ exports.run = function ({ inputs }) {
         catch (err) {
             return {
                 success: false,
-                response: err,
+                response: automationUtils.getError(err),
             };
         }
     });

package/dist/automations/steps/updateRow.js

@@ -73,6 +73,7 @@ exports.run = function ({ inputs, appId, emitter }) {
                 },
             };
         }
+        const tableId = inputs.row.tableId;
         // clear any falsy properties so that they aren't updated
         for (let propKey of Object.keys(inputs.row)) {
             if (!inputs.row[propKey] || inputs.row[propKey] === "") {
@@ -84,10 +85,13 @@ exports.run = function ({ inputs, appId, emitter }) {
             body: Object.assign(Object.assign({}, inputs.row), { _id: inputs.rowId }),
             params: {
                 rowId: inputs.rowId,
+                tableId: tableId,
             },
         });
         try {
-            inputs.row = yield automationUtils.cleanUpRowById(appId, inputs.rowId, inputs.row);
+            if (tableId) {
+                inputs.row = yield automationUtils.cleanUpRow(appId, tableId, inputs.row);
+            }
             yield rowController.patch(ctx);
             return {
                 row: ctx.body,
@@ -100,7 +104,7 @@ exports.run = function ({ inputs, appId, emitter }) {
         catch (err) {
             return {
                 success: false,
-                response: err,
+                response: automationUtils.getError(err),
             };
         }
     });

package/dist/automations/thread.js

@@ -19,6 +19,7 @@ const { doInTenant } = require("@budibase/auth/tenancy");
 const env = require("../environment");
 const usage = require("../utilities/usageQuota");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
+const STOPPED_STATUS = { success: false, status: "STOPPED" };
 /**
  * The automation orchestrator is a class responsible for executing automations.
  * It handles the context of the automation and makes sure each step gets the correct
@@ -77,7 +78,13 @@ class Orchestrator {
         return __awaiter(this, void 0, void 0, function* () {
             let automation = this._automation;
             const app = yield this.getApp();
+            let stopped = false;
             for (let step of automation.definition.steps) {
+                // execution stopped, record state for that
+                if (stopped) {
+                    this.updateExecutionOutput(step.id, step.stepId, {}, STOPPED_STATUS);
+                    continue;
+                }
                 let stepFn = yield this.getStepFunctionality(step.stepId);
                 step.inputs = yield processObject(step.inputs, this._context);
                 step.inputs = automationUtils.cleanInputValues(step.inputs, step.schema.inputs);
@@ -92,10 +99,14 @@ class Orchestrator {
                             context: this._context,
                         });
                     });
+                    this._context.steps.push(outputs);
+                    // if filter causes us to stop execution don't break the loop, set a var
+                    // so that we can finish iterating through the steps and record that it stopped
                     if (step.stepId === FILTER_STEP_ID && !outputs.success) {
-                        break;
+                        stopped = true;
+                        this.updateExecutionOutput(step.id, step.stepId, step.inputs, Object.assign(Object.assign({}, outputs), STOPPED_STATUS));
+                        continue;
                     }
-                    this._context.steps.push(outputs);
                     this.updateExecutionOutput(step.id, step.stepId, step.inputs, outputs);
                 }
                 catch (err) {
@@ -105,7 +116,7 @@ class Orchestrator {
             }
             // Increment quota for automation runs
             if (!env.SELF_HOSTED && !isDevAppID(this._appId)) {
-                usage.update(usage.Properties.AUTOMATION, 1);
+                yield usage.update(usage.Properties.AUTOMATION, 1);
             }
             return this.executionOutput;
         });

package/dist/constants/index.js

@@ -39,6 +39,7 @@ exports.FieldTypes = {
     FORMULA: "formula",
     AUTO: "auto",
     JSON: "json",
+    INTERNAL: "internal",
 };
 exports.RelationshipTypes = {
     ONE_TO_MANY: "one-to-many",

package/dist/db/linkedRows/index.js

@@ -69,7 +69,9 @@ function getFullLinkedDocs(ctx, appId, links) {
         const uniqueRowIds = [...new Set(linkedRowIds)];
         let dbRows = (yield db.allDocs(getMultiIDParams(uniqueRowIds))).rows.map(row => row.doc);
         // convert the unique db rows back to a full list of linked rows
-        const linked = linkedRowIds.map(id => dbRows.find(row => row._id === id));
+        const linked = linkedRowIds
+            .map(id => dbRows.find(row => row && row._id === id))
+            .filter(row => row != null);
         // need to handle users as specific cases
         let [users, other] = partition(linked, linkRow => linkRow._id.startsWith(USER_METDATA_PREFIX));
         users = yield getGlobalUsersFromMetadata(appId, users);
@@ -156,12 +158,13 @@ exports.attachFullLinkedDocs = (ctx, table, rows) => __awaiter(void 0, void 0, v
                 row[link.fieldName] = [];
             }
             const linkedRow = linked.find(row => row._id === link.id);
-            const linkedTableId = linkedRow.tableId || getRelatedTableForField(table, link.fieldName);
-            const linkedTable = yield getLinkedTable(db, linkedTableId, linkedTables);
-            if (!linkedRow || !linkedTable) {
-                continue;
+            if (linkedRow) {
+                const linkedTableId = linkedRow.tableId || getRelatedTableForField(table, link.fieldName);
+                const linkedTable = yield getLinkedTable(db, linkedTableId, linkedTables);
+                if (linkedTable) {
+                    row[link.fieldName].push(processFormulas(linkedTable, linkedRow));
+                }
             }
-            row[link.fieldName].push(processFormulas(linkedTable, linkedRow));
         }
     }
     return rows;

package/dist/integrations/base/sql.js

@@ -80,7 +80,7 @@ function addFilters(tableName, query, filters) {
     }
     return query;
 }
-function addRelationships(query, fromTable, relationships) {
+function addRelationships(knex, query, fields, fromTable, relationships) {
     if (!relationships) {
         return query;
     }
@@ -88,7 +88,7 @@ function addRelationships(query, fromTable, relationships) {
         const from = relationship.from, to = relationship.to, toTable = relationship.tableName;
         if (!relationship.through) {
             // @ts-ignore
-            query = query.leftJoin(toTable, `${fromTable}.${from}`, `${relationship.tableName}.${to}`);
+            query = query.leftJoin(toTable, `${fromTable}.${from}`, `${toTable}.${to}`);
         }
         else {
             const throughTable = relationship.through;
@@ -100,7 +100,7 @@ function addRelationships(query, fromTable, relationships) {
                 .leftJoin(toTable, `${toTable}.${toPrimary}`, `${throughTable}.${to}`);
         }
     }
-    return query;
+    return query.limit(BASE_LIMIT);
 }
 function buildCreate(knex, json, opts) {
     const { endpoint, body } = json;
@@ -165,7 +165,7 @@ function buildRead(knex, json, limit) {
         [tableName]: query,
     }).select(selectStatement);
     // handle joins
-    return addRelationships(preQuery, tableName, relationships);
+    return addRelationships(knex, preQuery, selectStatement, tableName, relationships);
 }
 function buildUpdate(knex, json, opts) {
     const { endpoint, body, filters } = json;

package/dist/integrations/mysql.js

@@ -13,7 +13,7 @@ const datasource_1 = require("../definitions/datasource");
 const utils_1 = require("./utils");
 var MySQLModule;
 (function (MySQLModule) {
-    const mysql = require("mysql");
+    const mysql = require("mysql2");
     const Sql = require("./base/sql");
     const { buildExternalTableId, convertType, copyExistingPropsOver, } = require("./utils");
     const { FieldTypes } = require("../constants");

package/dist/integrations/utils.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyExistingPropsOver = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertType = exports.breakRowIdField = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = void 0;
+exports.copyExistingPropsOver = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = void 0;
 const datasource_1 = require("../definitions/datasource");
 const { DocumentTypes, SEPARATOR } = require("../db/utils");
 const { FieldTypes } = require("../constants");
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`;
+const ROW_ID_REGEX = /^\[.*]$/g;
 function isExternalTable(tableId) {
     return tableId.includes(DocumentTypes.DATASOURCE);
 }
@@ -31,6 +32,21 @@ function generateRowIdField(keyProps = []) {
     return encodeURIComponent(JSON.stringify(keyProps).replace(/"/g, "'"));
 }
 exports.generateRowIdField = generateRowIdField;
+function isRowId(field) {
+    return (Array.isArray(field) ||
+        (typeof field === "string" && field.match(ROW_ID_REGEX) != null));
+}
+exports.isRowId = isRowId;
+function convertRowId(field) {
+    if (Array.isArray(field)) {
+        return field[0];
+    }
+    if (typeof field === "string" && field.match(ROW_ID_REGEX) != null) {
+        return field.substring(1, field.length - 1);
+    }
+    return field;
+}
+exports.convertRowId = convertRowId;
 // should always return an array
 function breakRowIdField(_id) {
     if (!_id) {

package/dist/middleware/currentapp.js

@@ -12,7 +12,7 @@ const { getAppId, setCookie, getCookie, clearCookie } = require("@budibase/auth"
 const { Cookies } = require("@budibase/auth").constants;
 const { getRole } = require("@budibase/auth/roles");
 const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
-const { generateUserMetadataID } = require("../db/utils");
+const { generateUserMetadataID, isDevAppID } = require("../db/utils");
 const { dbExists } = require("@budibase/auth/db");
 const { isUserInAppTenant } = require("@budibase/auth/tenancy");
 const { getCachedSelf } = require("../utilities/global");
@@ -43,6 +43,12 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         // if the request app ID wasn't set, update it with the cookie
         requestAppId = requestAppId || appId;
     }
+    // deny access to application preview
+    if (isDevAppID(requestAppId) &&
+        (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
+        clearCookie(ctx, Cookies.CurrentApp);
+        return ctx.redirect("/");
+    }
     let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;
     if (!ctx.user) {
         // not logged in, try to set a cookie for public apps
@@ -53,7 +59,7 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         const globalUser = yield getCachedSelf(ctx, requestAppId);
         appId = requestAppId;
         // retrieving global user gets the right role
-        roleId = globalUser.roleId || BUILTIN_ROLE_IDS.BASIC;
+        roleId = globalUser.roleId || roleId;
     }
     // nothing more to do
     if (!appId) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.170",
+    "version": "0.9.173-alpha.1",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,13 +68,13 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.170",
-        "@budibase/client": "^0.9.170",
-        "@budibase/string-templates": "^0.9.170",
+        "@budibase/auth": "^0.9.173-alpha.1",
+        "@budibase/client": "^0.9.173-alpha.1",
+        "@budibase/string-templates": "^0.9.173-alpha.1",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
-        "@sentry/node": "5.19.2",
+        "@sentry/node": "^6.0.0",
         "airtable": "0.10.1",
         "arangojs": "7.2.0",
         "aws-sdk": "^2.767.0",
@@ -103,7 +103,7 @@
         "memorystream": "^0.3.1",
         "mongodb": "3.6.3",
         "mssql": "6.2.3",
-        "mysql": "2.18.1",
+        "mysql2": "^2.3.1",
         "node-fetch": "2.6.0",
         "open": "7.3.0",
         "pg": "8.5.1",
@@ -119,6 +119,7 @@
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",
+        "vm2": "^3.9.3",
         "yargs": "13.2.4",
         "zlib": "1.0.5"
     },

package/dist/tests/utilities/TestConfiguration.js

@@ -24,7 +24,6 @@ const CouchDB = require("../../db");
 auth.init(CouchDB);
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
-const PASSWORD = "babs_password";
 class TestConfiguration {
     constructor(openServer = true) {
         if (openServer) {
@@ -62,7 +61,7 @@ class TestConfiguration {
             return request.body;
         });
     }
-    globalUser(id = GLOBAL_USER_ID, builder = true, roles) {
+    globalUser({ id = GLOBAL_USER_ID, builder = true, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const db = getGlobalDB(TENANT_ID);
             let existing;
@@ -70,13 +69,16 @@ class TestConfiguration {
                 existing = yield db.get(id);
             }
             catch (err) {
-                existing = {};
+                existing = { email };
             }
             const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID });
             yield createASession(id, { sessionId: "sessionid", tenantId: TENANT_ID });
             if (builder) {
                 user.builder = { global: true };
             }
+            else {
+                user.builder = { global: false };
+            }
             const resp = yield db.put(user);
             return Object.assign({ _rev: resp._rev }, user);
         });
@@ -120,28 +122,42 @@ class TestConfiguration {
         }
         return headers;
     }
-    publicHeaders() {
+    publicHeaders({ prodApp = true } = {}) {
+        const appId = prodApp ? this.prodAppId : this.appId;
         const headers = {
             Accept: "application/json",
         };
-        if (this.appId) {
-            headers[Headers.APP_ID] = this.appId;
+        if (appId) {
+            headers[Headers.APP_ID] = appId;
         }
         return headers;
     }
-    roleHeaders({ email = EMAIL, roleId = BUILTIN_ROLE_IDS.ADMIN, builder = false, }) {
+    roleHeaders({ email = EMAIL, roleId = BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.login(email, PASSWORD, { roleId, builder });
+            return this.login({ email, roleId, builder, prodApp });
         });
     }
     createApp(appName) {
         return __awaiter(this, void 0, void 0, function* () {
+            // create dev app
             this.app = yield this._req({ name: appName }, null, controllers.app.create);
             this.appId = this.app.appId;
+            // create production app
+            this.prodApp = yield this.deploy();
+            this.prodAppId = this.prodApp.appId;
+            this.allApps.push(this.prodApp);
             this.allApps.push(this.app);
             return this.app;
         });
     }
+    deploy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deployment = yield this._req(null, null, controllers.deploy.deployApp);
+            const prodAppId = deployment.appId.replace("_dev", "");
+            const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage);
+            return appPackage.application;
+        });
+    }
     updateTable(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicTable();
@@ -307,30 +323,29 @@ class TestConfiguration {
             return yield this._req(config, null, controllers.layout.save);
         });
     }
-    createUser(id = null) {
+    createUser(id = null, email = EMAIL) {
         return __awaiter(this, void 0, void 0, function* () {
             const globalId = !id ? `us_${Math.random()}` : `us_${id}`;
-            const resp = yield this.globalUser(globalId);
+            const resp = yield this.globalUser({ id: globalId, email });
             yield userCache.invalidateUser(globalId);
             return Object.assign(Object.assign({}, resp), { globalId });
         });
     }
-    login(email, password, { roleId, userId, builder } = {}) {
+    login({ roleId, userId, builder, prodApp = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
+            const appId = prodApp ? this.prodAppId : this.appId;
             userId = !userId ? `us_uuid1` : userId;
             if (!this.request) {
                 throw "Server has not been opened, cannot login.";
             }
             // make sure the user exists in the global DB
             if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
-                const appId = `app${this.getAppId().split("app_dev")[1]}`;
-                yield this.globalUser(userId, builder, {
-                    [appId]: roleId,
+                yield this.globalUser({
+                    userId,
+                    builder,
+                    roles: { [this.prodAppId]: roleId },
                 });
             }
-            if (!email || !password) {
-                yield this.createUser();
-            }
             yield createASession(userId, {
                 sessionId: "sessionid",
                 tenantId: TENANT_ID,
@@ -343,7 +358,7 @@ class TestConfiguration {
             };
             const app = {
                 roleId: roleId,
-                appId: this.appId,
+                appId,
             };
             const authToken = jwt.sign(auth, env.JWT_SECRET);
             const appToken = jwt.sign(app, env.JWT_SECRET);
@@ -355,7 +370,7 @@ class TestConfiguration {
                     `${Cookies.Auth}=${authToken}`,
                     `${Cookies.CurrentApp}=${appToken}`,
                 ],
-                [Headers.APP_ID]: this.appId,
+                [Headers.APP_ID]: appId,
             };
         });
     }

package/dist/tests/utilities/controllers.js

@@ -13,4 +13,5 @@ module.exports = {
     screen: require("../../api/controllers/screen"),
     webhook: require("../../api/controllers/webhook"),
     layout: require("../../api/controllers/layout"),
+    deploy: require("../../api/controllers/deploy"),
 };