@budibase/server 2.2.4-alpha.1 → 2.2.5

package/dist/api/controllers/application.js

@@ -24,13 +24,14 @@ const datasource_bb_default_1 = require("../../db/defaultData/datasource_bb_defa
 const workerRequests_1 = require("../../utilities/workerRequests");
 const utilities_1 = require("../../utilities");
 const redis_1 = require("../../utilities/redis");
-const fileSystem_2 = require("../../utilities/fileSystem");
+const clientLibrary_1 = require("../../utilities/fileSystem/clientLibrary");
 const utils_2 = require("../../automations/utils");
 const logging_1 = require("../../automations/logging");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const layouts_1 = require("../../constants/layouts");
+const plugins_1 = require("../../utilities/plugins");
 const sdk_1 = __importDefault(require("../../sdk"));
 // utility function, need to do away with this
 function getLayouts() {
@@ -163,25 +164,25 @@ function fetchAppDefinition(ctx) {
 }
 exports.fetchAppDefinition = fetchAppDefinition;
 function fetchAppPackage(ctx) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         let application = yield db.get(utils_1.DocumentType.APP_METADATA);
         const layouts = yield getLayouts();
         let screens = yield getScreens();
         // Enrich plugin URLs
-        application.usedPlugins = backend_core_1.objectStore.enrichPluginURLs(application.usedPlugins);
+        application.usedPlugins = (0, plugins_1.enrichPluginURLs)(application.usedPlugins);
         // Only filter screens if the user is not a builder
-        if (!(ctx.user.builder && ctx.user.builder.global)) {
+        if (!(((_a = ctx.user) === null || _a === void 0 ? void 0 : _a.builder) && ctx.user.builder.global)) {
             const userRoleId = getUserRoleId(ctx);
             const accessController = new backend_core_1.roles.AccessController();
             screens = yield accessController.checkScreensAccess(screens, userRoleId);
         }
-        const clientLibPath = backend_core_1.objectStore.clientLibraryUrl(ctx.params.appId, application.version);
         ctx.body = {
             application,
             screens,
             layouts,
-            clientLibPath,
+            clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version),
         };
     });
 }
@@ -324,7 +325,7 @@ function appPostCreate(ctx, app) {
                     if (err.code && err.code === backend_core_1.errors.codes.USAGE_LIMIT_EXCEEDED) {
                         // this import resulted in row usage exceeding the quota
                         // delete the app
-                        // skip pre and post-steps as no rows have been added to quotas yet
+                        // skip pre- and post-steps as no rows have been added to quotas yet
                         ctx.params.appId = app.appId;
                         yield destroyApp(ctx);
                     }
@@ -374,8 +375,8 @@ function updateClient(ctx) {
         const currentVersion = application.version;
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, fileSystem_2.backupClientLibrary)(ctx.params.appId);
-            yield (0, fileSystem_2.updateClientLibrary)(ctx.params.appId);
+            yield (0, clientLibrary_1.backupClientLibrary)(ctx.params.appId);
+            yield (0, clientLibrary_1.updateClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const updatedToVersion = package_json_1.default.version;
@@ -400,7 +401,7 @@ function revertClient(ctx) {
         }
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, fileSystem_2.revertClientLibrary)(ctx.params.appId);
+            yield (0, clientLibrary_1.revertClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const currentVersion = application.version;

package/dist/api/controllers/cloud.js

@@ -95,15 +95,11 @@ function importApps(ctx) {
         if (beenImported || !ctx.request.files || !ctx.request.files.importFile) {
             ctx.throw(400, "Import file is required and environment must be fresh to import apps.");
         }
-        const file = ctx.request.files.importFile;
-        if (Array.isArray(file)) {
-            ctx.throw(400, "Single file is required");
-        }
-        if (file.type !== "application/gzip") {
+        if (ctx.request.files.importFile.type !== "application/gzip") {
             ctx.throw(400, "Import file must be a gzipped tarball.");
         }
         // initially get all the app databases out of the tarball
-        const tmpPath = sdk_1.default.backups.untarFile(file);
+        const tmpPath = sdk_1.default.backups.untarFile(ctx.request.files.importFile);
         const globalDbImport = sdk_1.default.backups.getGlobalDBFile(tmpPath);
         const appNames = sdk_1.default.backups.getListOfAppsInMulti(tmpPath);
         const globalDb = backend_core_1.tenancy.getGlobalDB();

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

@@ -18,15 +18,15 @@ const backend_core_1 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
 const websocket_1 = require("../../../websocket");
+const backend_core_2 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.tenancy.getGlobalDB();
-        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
+        const response = yield db.allDocs(backend_core_2.db.getPluginParams(null, {
             include_docs: true,
         }));
-        let plugins = response.rows.map((row) => row.doc);
-        plugins = backend_core_1.objectStore.enrichPluginURLs(plugins);
+        const plugins = response.rows.map((row) => row.doc);
         if (type) {
             return plugins.filter((plugin) => { var _a; return ((_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.type) === type; });
         }
@@ -92,7 +92,7 @@ function create(ctx) {
             if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
                 throw new Error("Only component plugins are supported outside of self-host");
             }
-            const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
+            const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
             websocket_1.ClientAppSocket.emit("plugins-update", { name, hash: doc.hash });
             ctx.body = {
                 message: "Plugin uploaded successfully",
@@ -117,7 +117,7 @@ function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { pluginId } = ctx.params;
         try {
-            yield pro_1.sdk.plugins.deletePlugin(pluginId);
+            yield pro_1.plugins.deletePlugin(pluginId);
             ctx.body = { message: `Plugin ${ctx.params.pluginId} deleted.` };
         }
         catch (err) {
@@ -135,7 +135,7 @@ function processUploadedPlugin(plugin, source) {
         if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
             throw new Error("Only component plugins are supported outside of self-host");
         }
-        const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
+        const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
         websocket_1.ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash });
         return doc;
     });

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

@@ -27,6 +27,7 @@ const utils_2 = require("./utils");
 const constants_1 = require("../../../constants");
 const utils_3 = require("../../../integrations/utils");
 const string_templates_1 = require("@budibase/string-templates");
+// @ts-ignore
 const fp_1 = require("lodash/fp");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const backend_core_1 = require("@budibase/backend-core");

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

@@ -52,12 +52,12 @@ const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const constants_1 = require("../../../constants");
-const utils = __importStar(require("./utils"));
+const utils_2 = require("./utils");
 const internalSearch_1 = require("./internalSearch");
 const global_1 = require("../../../utilities/global");
 const inMemoryViews = __importStar(require("../../../db/inMemoryView"));
 const environment_1 = __importDefault(require("../../../environment"));
-const utils_2 = require("../view/utils");
+const utils_3 = require("../view/utils");
 const fp_1 = require("lodash/fp");
 const backend_core_1 = require("@budibase/backend-core");
 const staticFormula_1 = require("./staticFormula");
@@ -70,9 +70,9 @@ const CALCULATION_TYPES = {
 };
 function getView(db, viewName) {
     return __awaiter(this, void 0, void 0, function* () {
-        let mainGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromDesignDoc : utils_2.getFromMemoryDoc;
-        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromMemoryDoc : utils_2.getFromDesignDoc;
-        let migration = environment_1.default.SELF_HOSTED ? utils_2.migrateToDesignView : utils_2.migrateToInMemoryView;
+        let mainGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromDesignDoc : utils_3.getFromMemoryDoc;
+        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromMemoryDoc : utils_3.getFromDesignDoc;
+        let migration = environment_1.default.SELF_HOSTED ? utils_3.migrateToDesignView : utils_3.migrateToInMemoryView;
         let viewInfo, migrate = false;
         try {
             viewInfo = yield mainGetter(db, viewName);
@@ -121,7 +121,7 @@ function patch(ctx) {
         let oldRow;
         try {
             let dbTable = yield db.get(tableId);
-            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield utils.findRow(ctx, tableId, inputs._id));
+            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield (0, utils_2.findRow)(ctx, tableId, inputs._id));
         }
         catch (err) {
             if (isUserTable) {
@@ -145,7 +145,7 @@ function patch(ctx) {
         }
         // this returns the table and row incase they have been updated
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, combinedRow);
-        const validateResult = yield utils.validate({
+        const validateResult = yield (0, utils_2.validate)({
             row,
             table,
         });
@@ -185,7 +185,7 @@ function save(ctx) {
         // this returns the table and row incase they have been updated
         const dbTable = yield db.get(inputs.tableId);
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, inputs);
-        const validateResult = yield utils.validate({
+        const validateResult = yield (0, utils_2.validate)({
             row,
             table,
         });
@@ -274,7 +274,7 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.db.getDB(ctx.appId);
         const table = yield db.get(ctx.params.tableId);
-        let row = yield utils.findRow(ctx, ctx.params.tableId, ctx.params.rowId);
+        let row = yield (0, utils_2.findRow)(ctx, ctx.params.tableId, ctx.params.rowId);
         row = yield (0, rowProcessor_1.outputProcessing)(table, row);
         return row;
     });
@@ -386,7 +386,7 @@ function search(ctx) {
 exports.search = search;
 function validate(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        return utils.validate({
+        return (0, utils_2.validate)({
             tableId: ctx.params.tableId,
             row: ctx.request.body,
         });
@@ -436,7 +436,7 @@ function fetchEnrichedRow(ctx) {
         // need table to work out where links go in row
         let [table, row] = yield Promise.all([
             db.get(tableId),
-            utils.findRow(ctx, tableId, rowId),
+            (0, utils_2.findRow)(ctx, tableId, rowId),
         ]);
         // get the link docs
         const linkVals = (yield linkRows.getLinkDocuments({

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

@@ -153,7 +153,7 @@ function finaliseRow(table, row, { oldTable, updateFormula } = {
         enrichedRow = yield (0, rowProcessor_1.processFormulas)(table, enrichedRow, { dynamic: false });
         // this updates the related formulas in other rows based on the relations to this row
         if (updateFormula) {
-            yield updateRelatedFormula(table, enrichedRow);
+            yield exports.updateRelatedFormula(table, enrichedRow);
         }
         return { row: enrichedRow, table };
     });

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

@@ -10,14 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveBuilderPreview = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
+const plugins_1 = require("../../../utilities/plugins");
 require("svelte/register");
 const send = require("koa-send");
 const { resolve, join } = require("../../../utilities/centralPath");
 const uuid = require("uuid");
-const constants_1 = require("../../../constants");
+const { ObjectStoreBuckets } = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
+const { clientLibraryPath } = require("../../../utilities");
+const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentType } = require("../../../db/utils");
 const { context, objectStore, utils } = require("@budibase/backend-core");
 const AWS = require("aws-sdk");
@@ -35,7 +38,7 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         return {
             size: file.size,
             name: file.name,
-            url: objectStore.getAppFileUrl(s3Key),
+            url: attachmentsRelativeURL(response.Key),
             extension: [...file.name.split(".")].pop(),
             key: response.Key,
         };
@@ -82,8 +85,8 @@ const uploadFile = function (ctx) {
             const processedFileName = `${uuid.v4()}.${fileExtension}`;
             return prepareUpload({
                 file,
-                s3Key: `${context.getProdAppId()}/attachments/${processedFileName}`,
-                bucket: constants_1.ObjectStoreBuckets.APPS,
+                s3Key: `${ctx.appId}/attachments/${processedFileName}`,
+                bucket: ObjectStoreBuckets.APPS,
             });
         }));
         ctx.body = yield Promise.all(uploads);
@@ -92,7 +95,7 @@ const uploadFile = function (ctx) {
 exports.uploadFile = uploadFile;
 const deleteObjects = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield objectStore.deleteFiles(constants_1.ObjectStoreBuckets.APPS, ctx.request.body.keys);
+        ctx.body = yield objectStore.deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys);
     });
 };
 exports.deleteObjects = deleteObjects;
@@ -103,13 +106,13 @@ const serveApp = function (ctx) {
         let appId = context.getAppId();
         if (!env.isJest()) {
             const App = require("./templates/BudibaseApp.svelte").default;
-            const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins);
+            const plugins = (0, plugins_1.enrichPluginURLs)(appInfo.usedPlugins);
             const { head, html, css } = App.render({
                 metaImage: "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
                 title: appInfo.name,
                 production: env.isProd(),
                 appId,
-                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
+                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
                 usedPlugins: plugins,
             });
             const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
@@ -135,7 +138,7 @@ const serveBuilderPreview = function (ctx) {
             let appId = context.getAppId();
             const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`);
             ctx.body = yield processString(previewHbs, {
-                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
+                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
             });
         }
         else {

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -0,0 +1,167 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 });
+exports.runInProd = exports.testAutomation = exports.getDB = exports.checkPermissionsEndpoint = exports.checkBuilderEndpoint = exports.createRequest = exports.clearAllAutomations = exports.clearAllApps = exports.getAllTableRows = void 0;
+const rowController = __importStar(require("../../../controllers/row"));
+const appController = __importStar(require("../../../controllers/application"));
+const utils_1 = require("../../../../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const structures_1 = require("../../../../tests/utilities/structures");
+const env = __importStar(require("../../../../environment"));
+class Request {
+    constructor(appId, params) {
+        this.appId = appId;
+        this.params = params;
+        this.request = {};
+    }
+}
+function runRequest(appId, controlFunc, request) {
+    return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+        return controlFunc(request);
+    }));
+}
+const getAllTableRows = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    const req = new Request(config.appId, { tableId: config.table._id });
+    yield runRequest(config.appId, rowController.fetch, req);
+    return req.body;
+});
+exports.getAllTableRows = getAllTableRows;
+const clearAllApps = (tenantId = structures_1.TENANT_ID) => __awaiter(void 0, void 0, void 0, function* () {
+    yield backend_core_1.tenancy.doInTenant(tenantId, () => __awaiter(void 0, void 0, void 0, function* () {
+        const req = { query: { status: utils_1.AppStatus.DEV }, user: { tenantId } };
+        yield appController.fetch(req);
+        const apps = req.body;
+        if (!apps || apps.length <= 0) {
+            return;
+        }
+        for (let app of apps) {
+            const { appId } = app;
+            const req = new Request(null, { appId });
+            yield runRequest(appId, appController.destroy, req);
+        }
+    }));
+});
+exports.clearAllApps = clearAllApps;
+const clearAllAutomations = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    const automations = yield config.getAllAutomations();
+    for (let auto of automations) {
+        yield backend_core_1.context.doInAppContext(config.appId, () => __awaiter(void 0, void 0, void 0, function* () {
+            yield config.deleteAutomation(auto);
+        }));
+    }
+});
+exports.clearAllAutomations = clearAllAutomations;
+const createRequest = (request, method, url, body) => {
+    let req;
+    if (method === "POST")
+        req = request.post(url).send(body);
+    else if (method === "GET")
+        req = request.get(url);
+    else if (method === "DELETE")
+        req = request.delete(url);
+    else if (method === "PATCH")
+        req = request.patch(url).send(body);
+    else if (method === "PUT")
+        req = request.put(url).send(body);
+    return req;
+};
+exports.createRequest = createRequest;
+const checkBuilderEndpoint = ({ config, method, url, body, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const headers = yield config.login({
+        userId: "us_fail",
+        builder: false,
+        prodApp: true,
+    });
+    yield exports
+        .createRequest(config.request, method, url, body)
+        .set(headers)
+        .expect(403);
+});
+exports.checkBuilderEndpoint = checkBuilderEndpoint;
+const checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRole, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const passHeader = yield config.login({
+        roleId: passRole,
+        prodApp: true,
+    });
+    yield exports
+        .createRequest(config.request, method, url, body)
+        .set(passHeader)
+        .expect(200);
+    let failHeader;
+    if (failRole === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+        failHeader = config.publicHeaders({ prodApp: true });
+    }
+    else {
+        failHeader = yield config.login({
+            roleId: failRole,
+            builder: false,
+            prodApp: true,
+        });
+    }
+    yield exports
+        .createRequest(config.request, method, url, body)
+        .set(failHeader)
+        .expect(403);
+});
+exports.checkPermissionsEndpoint = checkPermissionsEndpoint;
+const getDB = () => {
+    return backend_core_1.context.getAppDB();
+};
+exports.getDB = getDB;
+const testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {
+    return runRequest(automation.appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        return yield config.request
+            .post(`/api/automations/${automation._id}/test`)
+            .send({
+            row: {
+                name: "Test",
+                description: "TEST",
+            },
+        })
+            .set(config.defaultHeaders())
+            .expect("Content-Type", /json/)
+            .expect(200);
+    }));
+});
+exports.testAutomation = testAutomation;
+const runInProd = (func) => __awaiter(void 0, void 0, void 0, function* () {
+    const nodeEnv = env.NODE_ENV;
+    const workerId = env.JEST_WORKER_ID;
+    env._set("NODE_ENV", "PRODUCTION");
+    env._set("JEST_WORKER_ID", null);
+    yield func();
+    env._set("NODE_ENV", nodeEnv);
+    env._set("JEST_WORKER_ID", workerId);
+});
+exports.runInProd = runInProd;

package/dist/api/routes/tests/utilities/index.js

@@ -0,0 +1,131 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.switchToSelfHosted = exports.getConfig = exports.getRequest = exports.afterAll = exports.beforeAll = exports.delay = exports.structures = void 0;
+const TestConfiguration_1 = __importDefault(require("../../../../tests/utilities/TestConfiguration"));
+const environment_1 = __importDefault(require("../../../../environment"));
+exports.structures = __importStar(require("../../../../tests/utilities/structures"));
+function user() {
+    return {
+        _id: "user",
+        _rev: "rev",
+        createdAt: Date.now(),
+        email: "test@test.com",
+        roles: {},
+        tenantId: "default",
+        status: "active",
+    };
+}
+jest.mock("../../../../utilities/workerRequests", () => ({
+    getGlobalUsers: jest.fn(() => {
+        return {
+            _id: "us_uuid1",
+        };
+    }),
+    getGlobalSelf: jest.fn(() => {
+        return {
+            _id: "us_uuid1",
+        };
+    }),
+    allGlobalUsers: jest.fn(() => {
+        return [user()];
+    }),
+    readGlobalUser: jest.fn(() => {
+        return user();
+    }),
+    saveGlobalUser: jest.fn(() => {
+        return { _id: "user", _rev: "rev" };
+    }),
+    deleteGlobalUser: jest.fn(() => {
+        return { message: "deleted user" };
+    }),
+    removeAppFromUserRoles: jest.fn(),
+}));
+function delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+exports.delay = delay;
+let request, config;
+function beforeAll() {
+    config = new TestConfiguration_1.default();
+    request = config.getRequest();
+}
+exports.beforeAll = beforeAll;
+function afterAll() {
+    if (config) {
+        config.end();
+    }
+    // clear app files
+    request = null;
+    config = null;
+}
+exports.afterAll = afterAll;
+function getRequest() {
+    if (!request) {
+        exports.beforeAll();
+    }
+    return request;
+}
+exports.getRequest = getRequest;
+function getConfig() {
+    if (!config) {
+        exports.beforeAll();
+    }
+    return config;
+}
+exports.getConfig = getConfig;
+function switchToSelfHosted(func) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // self hosted stops any attempts to Dynamo
+        environment_1.default._set("NODE_ENV", "production");
+        environment_1.default._set("SELF_HOSTED", true);
+        let error;
+        try {
+            yield func();
+        }
+        catch (err) {
+            error = err;
+        }
+        environment_1.default._set("NODE_ENV", "jest");
+        environment_1.default._set("SELF_HOSTED", false);
+        // don't throw error until after reset
+        if (error) {
+            throw error;
+        }
+    });
+}
+exports.switchToSelfHosted = switchToSelfHosted;

package/dist/automations/automationUtils.js

@@ -12,10 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typecastForLooping = exports.stringSplit = exports.substituteLoopStep = exports.getError = exports.cleanUpRow = exports.cleanInputValues = void 0;
+exports.stringSplit = exports.substituteLoopStep = exports.getError = exports.cleanUpRow = exports.cleanInputValues = void 0;
 const string_templates_1 = require("@budibase/string-templates");
 const sdk_1 = __importDefault(require("../sdk"));
-const automations_1 = require("../definitions/automations");
 /**
  * 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
@@ -133,27 +132,3 @@ function stringSplit(value) {
     return value;
 }
 exports.stringSplit = stringSplit;
-function typecastForLooping(loopStep, input) {
-    if (!input || !input.binding) {
-        return null;
-    }
-    try {
-        switch (loopStep.inputs.option) {
-            case automations_1.LoopStepType.ARRAY:
-                if (typeof input.binding === "string") {
-                    return JSON.parse(input.binding);
-                }
-                break;
-            case automations_1.LoopStepType.STRING:
-                if (Array.isArray(input.binding)) {
-                    return input.binding.join(",");
-                }
-                break;
-        }
-    }
-    catch (err) {
-        throw new Error("Unable to cast to correct type");
-    }
-    return input.binding;
-}
-exports.typecastForLooping = typecastForLooping;