@budibase/server 2.1.46-alpha.5 → 2.1.46-alpha.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.1.46-alpha.5",
+  "version": "2.1.46-alpha.6",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.1.46-alpha.5",
-    "@budibase/client": "2.1.46-alpha.5",
-    "@budibase/pro": "2.1.46-alpha.4",
-    "@budibase/string-templates": "2.1.46-alpha.5",
-    "@budibase/types": "2.1.46-alpha.5",
+    "@budibase/backend-core": "2.1.46-alpha.6",
+    "@budibase/client": "2.1.46-alpha.6",
+    "@budibase/pro": "2.1.46-alpha.5",
+    "@budibase/string-templates": "2.1.46-alpha.6",
+    "@budibase/types": "2.1.46-alpha.6",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -165,5 +165,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "0f4f64effdceb1519ff9e2cbacb6734b3e81dd84"
+  "gitHead": "694c0013a8e7380f5c8953a2be61a515e5fbf820"
 }

package/tsconfig.build.json

@@ -19,6 +19,8 @@
     "node_modules",
     "dist",
     "src/tests",
+    "src/api/routes/tests/utilities",
+    "src/automations/tests/utilities",
     "**/*.spec.ts",
     "**/*.spec.js"
   ]

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

@@ -1,167 +0,0 @@
-"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

@@ -1,131 +0,0 @@
-"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) {
-        beforeAll();
-    }
-    return request;
-}
-exports.getRequest = getRequest;
-function getConfig() {
-    if (!config) {
-        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/tests/utilities/index.js

@@ -1,81 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.actions = exports.apiKey = exports.runStep = exports.runInProd = exports.afterAll = exports.getConfig = void 0;
-const TestConfiguration_1 = __importDefault(require("../../../tests/utilities/TestConfiguration"));
-const backend_core_1 = require("@budibase/backend-core");
-const actions_1 = require("../../actions");
-const index_1 = __importDefault(require("../../../events/index"));
-const environment_1 = __importDefault(require("../../../environment"));
-let config;
-function getConfig() {
-    if (!config) {
-        config = new TestConfiguration_1.default(false);
-    }
-    return config;
-}
-exports.getConfig = getConfig;
-function afterAll() {
-    config.end();
-}
-exports.afterAll = afterAll;
-function runInProd(fn) {
-    return __awaiter(this, void 0, void 0, function* () {
-        environment_1.default._set("NODE_ENV", "production");
-        let error;
-        try {
-            yield fn();
-        }
-        catch (err) {
-            error = err;
-        }
-        environment_1.default._set("NODE_ENV", "jest");
-        if (error) {
-            throw error;
-        }
-    });
-}
-exports.runInProd = runInProd;
-function runStep(stepId, inputs, stepContext) {
-    return __awaiter(this, void 0, void 0, function* () {
-        function run() {
-            return __awaiter(this, void 0, void 0, function* () {
-                let step = yield (0, actions_1.getAction)(stepId);
-                expect(step).toBeDefined();
-                if (!step) {
-                    throw new Error("No step found");
-                }
-                return step({
-                    context: stepContext || {},
-                    inputs,
-                    appId: config ? config.getAppId() : null,
-                    // don't really need an API key, mocked out usage quota, not being tested here
-                    apiKey: exports.apiKey,
-                    emitter: index_1.default,
-                });
-            });
-        }
-        if (config === null || config === void 0 ? void 0 : config.appId) {
-            return backend_core_1.context.doInContext(config === null || config === void 0 ? void 0 : config.appId, () => __awaiter(this, void 0, void 0, function* () {
-                return run();
-            }));
-        }
-        else {
-            return run();
-        }
-    });
-}
-exports.runStep = runStep;
-exports.apiKey = "test";
-exports.actions = actions_1.ACTION_DEFINITIONS;