@budibase/server 1.0.219 → 1.0.220-alpha.2

package/dist/api/controllers/application.js

@@ -33,7 +33,8 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const user_1 = require("./user");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const utils_2 = require("../../automations/utils");
-const { getAppDB, getProdAppDB, updateAppId, } = require("@budibase/backend-core/context");
+const logging_1 = require("../../automations/logging");
+const { getAppDB, getProdAppDB, updateAppId, doInAppContext, } = require("@budibase/backend-core/context");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
@@ -159,7 +160,7 @@ const fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             }
         }
     }
-    ctx.body = apps;
+    ctx.body = yield (0, logging_1.checkAppMetadata)(apps);
 });
 exports.fetch = fetch;
 const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
@@ -189,7 +190,7 @@ const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         application,
         screens,
         layouts,
-        clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version, ctx),
+        clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version),
     };
 });
 exports.fetchAppPackage = fetchAppPackage;
@@ -486,19 +487,21 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.sync = sync;
 const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
-    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
-    const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
-    if (appPackage._rev !== application._rev) {
-        newAppPackage._rev = application._rev;
-    }
-    // the locked by property is attached by server but generated from
-    // Redis, shouldn't ever store it
-    delete newAppPackage.lockedBy;
-    yield db.put(newAppPackage);
-    // remove any cached metadata, so that it will be updated
-    yield appCache.invalidateAppMetadata(appId);
-    return newAppPackage;
+    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        const db = getAppDB();
+        const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+        const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
+        if (appPackage._rev !== application._rev) {
+            newAppPackage._rev = application._rev;
+        }
+        // the locked by property is attached by server but generated from
+        // Redis, shouldn't ever store it
+        delete newAppPackage.lockedBy;
+        yield db.put(newAppPackage);
+        // remove any cached metadata, so that it will be updated
+        yield appCache.invalidateAppMetadata(appId);
+        return newAppPackage;
+    }));
 });
 const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();

package/dist/api/controllers/automation.js

@@ -10,13 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const actions = require("../../automations/actions");
 const triggers = require("../../automations/triggers");
-const { getAutomationParams, generateAutomationID } = require("../../db/utils");
+const { getAutomationParams, generateAutomationID, DocumentTypes, } = require("../../db/utils");
 const { checkForWebhooks, updateTestHistory, removeDeprecated, } = require("../../automations/utils");
 const { deleteEntityMetadata } = require("../../utilities");
 const { MetadataTypes } = require("../../constants");
 const { setTestFlag, clearTestFlag } = require("../../utilities/redis");
-const { getAppDB } = require("@budibase/backend-core/context");
+const { getAppDB, getProdAppDB, doInAppContext, } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
+const { app } = require("@budibase/backend-core/cache");
+const { automations } = require("@budibase/pro");
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS);
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS);
 /*************************
@@ -162,6 +164,30 @@ exports.destroy = function (ctx) {
         yield events.automation.deleted(oldAutomation);
     });
 };
+exports.logSearch = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        ctx.body = yield automations.logs.logSearch(ctx.request.body);
+    });
+};
+exports.clearLogError = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { automationId, appId } = ctx.request.body;
+        yield doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+            const db = getProdAppDB();
+            const metadata = yield db.get(DocumentTypes.APP_METADATA);
+            if (!automationId) {
+                delete metadata.automationErrors;
+            }
+            else if (metadata.automationErrors &&
+                metadata.automationErrors[automationId]) {
+                delete metadata.automationErrors[automationId];
+            }
+            yield db.put(metadata);
+            yield app.invalidateAppMetadata(metadata.appId, metadata);
+            ctx.body = { message: `Error logs cleared.` };
+        }));
+    });
+};
 exports.getActionList = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.body = ACTION_DEFS;

package/dist/api/controllers/backup.js

@@ -13,11 +13,12 @@ const { events, context } = require("@budibase/backend-core");
 const { DocumentTypes } = require("../../db/utils");
 exports.exportAppDump = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { appId } = ctx.query;
+        let { appId, excludeRows } = ctx.query;
         const appName = decodeURI(ctx.query.appname);
+        excludeRows = excludeRows === "true";
         const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`;
         ctx.attachment(backupIdentifier);
-        ctx.body = yield streamBackup(appId);
+        ctx.body = yield streamBackup(appId, excludeRows);
         yield context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
             const appDb = context.getAppDB();
             const app = yield appDb.get(DocumentTypes.APP_METADATA);

package/dist/api/controllers/dev.js

@@ -13,8 +13,8 @@ const env = require("../../environment");
 const { checkSlashesInUrl } = require("../../utilities");
 const { request } = require("../../utilities/workerRequests");
 const { clearLock } = require("../../utilities/redis");
-const { Replication, getProdAppID, dangerousGetDB, } = require("@budibase/backend-core/db");
-const { DocumentTypes, getRowParams } = require("../../db/utils");
+const { Replication, getProdAppID } = require("@budibase/backend-core/db");
+const { DocumentTypes } = require("../../db/utils");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const { getProdAppDB, getAppDB } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
@@ -129,41 +129,3 @@ exports.getBudibaseVersion = (ctx) => __awaiter(void 0, void 0, void 0, function
     };
     yield events.installation.versionChecked(version);
 });
-// TODO: remove as part of beta program
-exports.checkBetaAccess = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    // go to the cloud platform if running self hosted
-    if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
-        let baseUrl = "";
-        if (env.ACCOUNT_PORTAL_URL) {
-            baseUrl = env.ACCOUNT_PORTAL_URL.replace("account.", "");
-        }
-        else {
-            baseUrl = "https://budibase.app";
-        }
-        const response = yield fetch(`${baseUrl}/api/beta/access?email=${ctx.query.email}`);
-        const json = yield response.json();
-        ctx.body = json;
-        return;
-    }
-    const userToCheck = ctx.query.email;
-    const BETA_USERS_DB = "app_bb_f9b77d06b9db4e3ca185476ab87a2364";
-    const BETA_USERS_TABLE = "ta_8c2c6df1c03f49cfb6340e85e066dd15";
-    try {
-        const db = dangerousGetDB(BETA_USERS_DB);
-        const betaUsers = (yield db.allDocs(getRowParams(BETA_USERS_TABLE, null, {
-            include_docs: true,
-        }))).rows.map(row => row.doc);
-        let access = false;
-        for (let betaUser of betaUsers) {
-            if (betaUser["Email address"].trim() === userToCheck) {
-                access = true;
-                break;
-            }
-        }
-        ctx.body = { access };
-    }
-    catch (err) {
-        console.error(err);
-        ctx.body = { access: false };
-    }
-});

package/dist/api/controllers/public/applications.js

@@ -84,7 +84,7 @@ function read(ctx, next) {
 exports.read = read;
 function update(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.request.body = fixAppID(ctx.request.body, ctx.params);
+        ctx.request.body = yield (0, utils_1.addRev)(fixAppID(ctx.request.body, ctx.params));
         updateAppId(ctx.params.appId);
         yield controller.update(ctx);
         yield setResponseApp(ctx);

package/dist/api/controllers/public/utils.js

@@ -12,14 +12,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.search = exports.addRev = void 0;
 const { getAppDB } = require("@budibase/backend-core/context");
 const utils_1 = require("../../../integrations/utils");
+const utils_2 = require("../../../db/utils");
 function addRev(body, tableId) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!body._id || (tableId && (0, utils_1.isExternalTable)(tableId))) {
             return body;
         }
+        let id = body._id;
+        if (body._id.startsWith(utils_2.APP_PREFIX)) {
+            id = utils_2.DocumentTypes.APP_METADATA;
+        }
         const db = getAppDB();
-        const dbDoc = yield db.get(body._id);
+        const dbDoc = yield db.get(id);
         body._rev = dbDoc._rev;
+        // update ID in case it is an app ID
+        body._id = id;
         return body;
     });
 }

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

@@ -20,6 +20,8 @@ const environment_1 = require("../../../environment");
 const context_1 = require("@budibase/backend-core/context");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
+const utils_3 = require("@budibase/backend-core/utils");
+const constants_2 = require("@budibase/backend-core/constants");
 const Runner = new threads_1.Thread(threads_1.ThreadType.QUERY, {
     timeoutMs: environment_1.QUERY_THREAD_TIMEOUT || 10000,
 });
@@ -111,6 +113,19 @@ function find(ctx) {
     });
 }
 exports.find = find;
+//Required to discern between OIDC OAuth config entries
+function getOAuthConfigCookieId(ctx) {
+    if (ctx.user.providerType === constants_2.Configs.OIDC) {
+        return (0, utils_3.getCookie)(ctx, constants_2.Cookies.OIDC_CONFIG);
+    }
+}
+function getAuthConfig(ctx) {
+    const authCookie = (0, utils_3.getCookie)(ctx, constants_2.Cookies.Auth);
+    let authConfigCtx = {};
+    authConfigCtx["configId"] = getOAuthConfigCookieId(ctx);
+    authConfigCtx["sessionId"] = authCookie ? authCookie.sessionId : null;
+    return authConfigCtx;
+}
 function preview(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, context_1.getAppDB)();
@@ -119,6 +134,7 @@ function preview(ctx) {
         // preview may not have a queryId as it hasn't been saved, but if it does
         // this stops dynamic variables from calling the same query
         const { fields, parameters, queryVerb, transformer, queryId } = query;
+        const authConfigCtx = getAuthConfig(ctx);
         try {
             const runFn = () => Runner.run({
                 appId: ctx.appId,
@@ -128,6 +144,10 @@ function preview(ctx) {
                 parameters,
                 transformer,
                 queryId,
+                ctx: {
+                    user: ctx.user,
+                    auth: Object.assign({}, authConfigCtx),
+                },
             });
             const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn);
             yield backend_core_1.events.query.previewed(datasource, query);
@@ -144,11 +164,15 @@ function preview(ctx) {
     });
 }
 exports.preview = preview;
-function execute(ctx, opts = { rowsOnly: false }) {
+function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, context_1.getAppDB)();
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
+        let authConfigCtx = {};
+        if (!opts.isAutomation) {
+            authConfigCtx = getAuthConfig(ctx);
+        }
         const enrichedParameters = ctx.request.body.parameters || {};
         // make sure parameters are fully enriched with defaults
         if (query && query.parameters) {
@@ -169,6 +193,10 @@ function execute(ctx, opts = { rowsOnly: false }) {
                 parameters: enrichedParameters,
                 transformer: query.transformer,
                 queryId: ctx.params.queryId,
+                ctx: {
+                    user: ctx.user,
+                    auth: Object.assign({}, authConfigCtx),
+                },
             });
             const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn);
             if (opts && opts.rowsOnly) {
@@ -189,9 +217,9 @@ function executeV1(ctx) {
     });
 }
 exports.executeV1 = executeV1;
-function executeV2(ctx) {
+function executeV2(ctx, { isAutomation } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        return execute(ctx, { rowsOnly: false });
+        return execute(ctx, { rowsOnly: false, isAutomation });
     });
 }
 exports.executeV2 = executeV2;

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

@@ -155,29 +155,41 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
     return { valid: true };
 });
 exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId);
+    const { datasourceId } = breakExternalTableId(ctx.params.tableId);
     const db = getAppDB();
-    let format = ctx.query.format;
+    const format = ctx.query.format;
+    const { columns } = ctx.request.body;
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         ctx.throw(400, "Datasource has not been configured for plus API.");
     }
-    const tables = datasource.entities;
-    const table = tables[tableName];
     ctx.request.body = {
         query: {
             oneOf: {
-                [table.primaryDisplay]: ctx.request.body.rows.map(id => breakRowIdField(id)[0]),
+                _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]),
             },
         },
     };
     let result = yield exports.search(ctx);
-    let headers = Object.keys(result.rows[0]);
+    let rows = [];
+    // Filter data to only specified columns if required
+    if (columns && columns.length) {
+        for (let i = 0; i < result.rows.length; i++) {
+            rows[i] = {};
+            for (let column of columns) {
+                rows[i][column] = result.rows[i][column];
+            }
+        }
+    }
+    else {
+        rows = result.rows;
+    }
+    let headers = Object.keys(rows[0]);
     const exporter = exporters[format];
     const filename = `export.${format}`;
     // send down the file
     ctx.attachment(filename);
-    return apiFileReturn(exporter(headers, result.rows));
+    return apiFileReturn(exporter(headers, rows));
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const id = ctx.params.rowId;

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

@@ -18,7 +18,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {} }, base);
+        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -96,6 +96,10 @@ class QueryBuilder {
         this.query.notEmpty[key] = value;
         return this;
     }
+    addOneOf(key, value) {
+        this.query.oneOf[key] = value;
+        return this;
+    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -123,8 +127,21 @@ class QueryBuilder {
     }
     buildSearchQuery() {
         const builder = this;
-        let query = "*:*";
+        let allOr = this.query && this.query.allOr;
+        let query = allOr ? "" : "*:*";
         const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true };
+        let tableId;
+        if (this.query.equal.tableId) {
+            tableId = this.query.equal.tableId;
+            delete this.query.equal.tableId;
+        }
+        const equal = (key, value) => {
+            // 0 evaluates to false, which means we would return all rows if we don't check it
+            if (!value && value !== 0) {
+                return null;
+            }
+            return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
+        };
         function build(structure, queryFn) {
             for (let [key, value] of Object.entries(structure)) {
                 key = builder.preprocess(key.replace(/ /g, "_"), {
@@ -134,7 +151,10 @@ class QueryBuilder {
                 if (expression == null) {
                     continue;
                 }
-                query += ` AND ${expression}`;
+                if (query.length > 0) {
+                    query += ` ${allOr ? "OR" : "AND"} `;
+                }
+                query += expression;
             }
         }
         // Construct the actual lucene search query string from JSON structure
@@ -179,13 +199,7 @@ class QueryBuilder {
             });
         }
         if (this.query.equal) {
-            build(this.query.equal, (key, value) => {
-                // 0 evaluates to false, which means we would return all rows if we don't check it
-                if (!value && value !== 0) {
-                    return null;
-                }
-                return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
-            });
+            build(this.query.equal, equal);
         }
         if (this.query.notEqual) {
             build(this.query.notEqual, (key, value) => {
@@ -201,6 +215,29 @@ class QueryBuilder {
         if (this.query.notEmpty) {
             build(this.query.notEmpty, key => `${key}:["" TO *]`);
         }
+        if (this.query.oneOf) {
+            build(this.query.oneOf, (key, value) => {
+                if (!Array.isArray(value)) {
+                    if (typeof value === "string") {
+                        value = value.split(",");
+                    }
+                    else {
+                        return "";
+                    }
+                }
+                let orStatement = `${builder.preprocess(value[0], allPreProcessingOpts)}`;
+                for (let i = 1; i < value.length; i++) {
+                    orStatement += ` OR ${builder.preprocess(value[i], allPreProcessingOpts)}`;
+                }
+                return `${key}:(${orStatement})`;
+            });
+        }
+        // make sure table ID is always added as an AND
+        if (tableId) {
+            query = `(${query})`;
+            allOr = false;
+            build({ tableId }, equal);
+        }
         return query;
     }
     buildSearchBody() {

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

@@ -70,6 +70,9 @@ exports.validate = ({ tableId, row, table }) => __awaiter(void 0, void 0, void 0
         // Validate.js doesn't seem to handle array
         if (type === FieldTypes.ARRAY && row[fieldName]) {
             if (row[fieldName].length) {
+                if (!Array.isArray(row[fieldName])) {
+                    row[fieldName] = row[fieldName].split(",");
+                }
                 row[fieldName].map(val => {
                     if (!constraints.inclusion.includes(val) &&
                         constraints.inclusion.length !== 0) {

package/dist/api/controllers/static/index.js

@@ -69,11 +69,7 @@ exports.toggleBetaUiFeature = function (ctx) {
 };
 exports.serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        // Temporary: New Design UI
-        const designUiCookie = ctx.cookies.get("beta:design_ui");
-        // TODO: get this from the tmp Dir that we downloaded from MinIO
-        const uiPath = designUiCookie ? "new_design_ui" : "builder";
-        let builderPath = resolve(TOP_LEVEL_PATH, uiPath);
+        const builderPath = resolve(TOP_LEVEL_PATH, "builder");
         yield send(ctx, ctx.file, { root: builderPath });
         if (!ctx.file.includes("assets/")) {
             yield events.serve.servedBuilder();

package/dist/api/index.js

@@ -69,7 +69,10 @@ router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
             error,
         };
         ctx.log.error(err);
-        console.trace(err);
+        // unauthorised errors don't provide a useful trace
+        if (!env.isTest()) {
+            console.trace(err);
+        }
     }
 }));
 // authenticated routes

package/dist/api/routes/automation.js

@@ -15,6 +15,8 @@ router
     .get("/api/automations/:id", paramResource("id"), authorized(BUILDER), controller.find)
     .put("/api/automations", bodyResource("_id"), authorized(BUILDER), automationValidator(true), controller.update)
     .post("/api/automations", authorized(BUILDER), automationValidator(false), controller.create)
+    .post("/api/automations/logs/search", authorized(BUILDER), controller.logSearch)
+    .delete("/api/automations/logs", authorized(BUILDER), controller.clearLogError)
     .delete("/api/automations/:id/:rev", paramResource("id"), authorized(BUILDER), controller.destroy)
     .post("/api/automations/:id/trigger", appInfoMiddleware({ appType: AppType.PROD }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.trigger)
     .post("/api/automations/:id/test", appInfoMiddleware({ appType: AppType.DEV }), paramResource("id"), authorized(PermissionTypes.AUTOMATION, PermissionLevels.EXECUTE), controller.test);

package/dist/api/routes/dev.js

@@ -18,6 +18,5 @@ if (env.isDev() || env.isTest()) {
 router
     .get("/api/dev/version", authorized(BUILDER), controller.getBudibaseVersion)
     .delete("/api/dev/:appId/lock", authorized(BUILDER), controller.clearLock)
-    .post("/api/dev/:appId/revert", authorized(BUILDER), controller.revert)
-    .get("/api/beta/access", controller.checkBetaAccess);
+    .post("/api/dev/:appId/revert", authorized(BUILDER), controller.revert);
 module.exports = router;

package/dist/api/routes/public/rows.js

@@ -144,6 +144,11 @@ read.push(new Endpoint_1.default("get", "/tables/:tableId/rows/:rowId", rows_1.d
  *               query:
  *                 type: object
  *                 properties:
+ *                   allOr:
+ *                     type: boolean
+ *                     description: Specifies that a row should be returned if it satisfies
+ *                       any of the specified options, rather than requiring it to fulfill all
+ *                       the search parameters. This defaults to false, meaning AND logic will be used.
  *                   string:
  *                     type: object
  *                     example:
@@ -161,9 +166,9 @@ read.push(new Endpoint_1.default("get", "/tables/:tableId/rows/:rowId", rows_1.d
  *                   range:
  *                     type: object
  *                     description: Searches within a range, the format of this must be
- *                       columnName -> [low, high].
+ *                       in the format of an object with a "low" and "high" property.
  *                     example:
- *                       columnName1: [10, 20]
+ *                       columnName1: { low: 10, high: 20 }
  *                   equal:
  *                     type: object
  *                     description: Searches for rows that have a column value that is

package/dist/api/routes/utils/validators.js

@@ -51,6 +51,7 @@ function filterObject() {
         oneOf: Joi.object().optional(),
         contains: Joi.object().optional(),
         notContains: Joi.object().optional(),
+        allOr: Joi.boolean().optional(),
     }).unknown(true);
 }
 exports.internalSearchValidator = () => {

package/dist/app.js

@@ -54,6 +54,7 @@ const { Thread } = require("./threads");
 const redis_1 = __importDefault(require("./utilities/redis"));
 const migrations = __importStar(require("./migrations"));
 const backend_core_1 = require("@budibase/backend-core");
+const workerRequests_1 = require("./utilities/workerRequests");
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -112,6 +113,7 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     }
 }));
 module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     console.log(`Budibase running on ${JSON.stringify(server.address())}`);
     env._set("PORT", server.address().port);
     eventEmitter.emitPort(env.PORT);
@@ -128,6 +130,24 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
             shutdown();
         }
     }
+    // check and create admin user if required
+    if (env.SELF_HOSTED &&
+        !env.MULTI_TENANCY &&
+        env.BB_ADMIN_USER_EMAIL &&
+        env.BB_ADMIN_USER_PASSWORD) {
+        const checklist = yield (0, workerRequests_1.getChecklist)();
+        if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
+            try {
+                const tenantId = backend_core_1.tenancy.getTenantId();
+                yield (0, workerRequests_1.createAdminUser)(env.BB_ADMIN_USER_EMAIL, env.BB_ADMIN_USER_PASSWORD, tenantId);
+                console.log("Admin account automatically created for", env.BB_ADMIN_USER_EMAIL);
+            }
+            catch (e) {
+                logAlert("Error creating initial admin user. Exiting.", e);
+                shutdown();
+            }
+        }
+    }
     // check for version updates
     yield backend_core_1.installation.checkInstallVersion();
     // done last - this will never complete

package/dist/automations/automationUtils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getTable } = require("../api/controllers/table/utils");
-const { findHBSBlocks } = require("@budibase/string-templates");
+const { findHBSBlocks, decodeJSBinding, isJSBinding, encodeJSBinding, } = require("@budibase/string-templates");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -81,11 +81,23 @@ exports.getError = err => {
     return typeof err !== "string" ? err.toString() : err;
 };
 exports.substituteLoopStep = (hbsString, substitute) => {
-    let blocks = findHBSBlocks(hbsString);
+    let blocks = [];
+    let checkForJS = isJSBinding(hbsString);
+    if (checkForJS) {
+        hbsString = decodeJSBinding(hbsString);
+        blocks.push(hbsString);
+    }
+    else {
+        blocks = findHBSBlocks(hbsString);
+    }
     for (let block of blocks) {
-        let oldBlock = block;
         block = block.replace(/loop/, substitute);
-        hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block);
+        if (checkForJS) {
+            hbsString = encodeJSBinding(block);
+        }
+        else {
+            hbsString = block;
+        }
     }
     return hbsString;
 };