@budibase/server 2.1.40-alpha.6 → 2.1.42

package/dist/tests/utilities/TestConfiguration.js

@@ -1,27 +1,4 @@
 "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) {
@@ -31,20 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const db_1 = require("../../db");
-(0, db_1.init)();
-const environment_1 = __importDefault(require("../../environment"));
-const structures_1 = require("./structures");
-const backend_core_1 = require("@budibase/backend-core");
-const controllers = __importStar(require("./controllers"));
-const fileSystem_1 = require("../../utilities/fileSystem");
-const newid_1 = __importDefault(require("../../db/newid"));
-const utils_1 = require("../../db/utils");
-const startup_1 = require("../../startup");
+require("../../db").init();
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const env = require("../../environment");
+const { basicTable, basicRow, basicRole, basicAutomation, basicDatasource, basicQuery, basicScreen, basicLayout, basicWebhook, TENANT_ID, } = require("./structures");
+const controllers = require("./controllers");
 const supertest = require("supertest");
+const { cleanup } = require("../../utilities/fileSystem");
+const { Cookies, Headers } = require("@budibase/backend-core/constants");
+const { jwt } = require("@budibase/backend-core/auth");
+const { doInTenant, doWithGlobalDB } = require("@budibase/backend-core/tenancy");
+const { createASession } = require("@budibase/backend-core/sessions");
+const { user: userCache } = require("@budibase/backend-core/cache");
+const newid = require("../../db/newid");
+const context = require("@budibase/backend-core/context");
+const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db");
+const { encrypt } = require("@budibase/backend-core/encryption");
+const { DocumentType, generateUserMetadataID } = require("../../db/utils");
+const { startup } = require("../../startup");
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 const FIRSTNAME = "Barbara";
@@ -54,7 +35,7 @@ class TestConfiguration {
     constructor(openServer = true) {
         if (openServer) {
             // use a random port because it doesn't matter
-            environment_1.default.PORT = "0";
+            env.PORT = 0;
             this.server = require("../../app");
             // we need the request for logging in, involves cookies, hard to fake
             this.request = supertest(this.server);
@@ -94,10 +75,10 @@ class TestConfiguration {
             if (!appId) {
                 appId = this.appId;
             }
-            return backend_core_1.tenancy.doInTenant(structures_1.TENANT_ID, () => {
+            return doInTenant(TENANT_ID, () => {
                 // check if already in a context
-                if (backend_core_1.context.getAppId() == null && appId !== null) {
-                    return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+                if (context.getAppId() == null && appId !== null) {
+                    return context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
                         return task();
                     }));
                 }
@@ -109,14 +90,14 @@ class TestConfiguration {
     }
     // SETUP /  TEARDOWN
     // use a new id as the name to avoid name collisions
-    init(appName = (0, newid_1.default)()) {
+    init(appName = newid()) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.started) {
-                yield (0, startup_1.startup)();
+                yield startup();
             }
             this.user = yield this.globalUser();
             this.globalUserId = this.user._id;
-            this.userMetadataId = (0, utils_1.generateUserMetadataID)(this.globalUserId);
+            this.userMetadataId = generateUserMetadataID(this.globalUserId);
             return this.createApp(appName);
         });
     }
@@ -127,9 +108,7 @@ class TestConfiguration {
         if (this.server) {
             this.server.close();
         }
-        if (this.allApps) {
-            (0, fileSystem_1.cleanup)(this.allApps.map(app => app.appId));
-        }
+        cleanup(this.allApps.map(app => app.appId));
     }
     // UTILS
     _req(body, params, controlFunc) {
@@ -140,8 +119,8 @@ class TestConfiguration {
             request.appId = appId;
             // fake cookies, we don't need them
             request.cookies = { set: () => { }, get: () => { } };
-            request.config = { jwtSecret: environment_1.default.JWT_SECRET };
-            request.user = { appId, tenantId: structures_1.TENANT_ID };
+            request.config = { jwtSecret: env.JWT_SECRET };
+            request.user = { appId, tenantId: TENANT_ID };
             request.query = {};
             request.request = {
                 body,
@@ -158,7 +137,7 @@ class TestConfiguration {
     // USER / AUTH
     globalUser({ id = GLOBAL_USER_ID, firstName = FIRSTNAME, lastName = LASTNAME, builder = true, admin = false, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            return backend_core_1.tenancy.doWithGlobalDB(structures_1.TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
                 let existing;
                 try {
                     existing = yield db.get(id);
@@ -166,11 +145,11 @@ class TestConfiguration {
                 catch (err) {
                     existing = { email };
                 }
-                const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: structures_1.TENANT_ID, firstName,
+                const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID, firstName,
                     lastName });
-                yield backend_core_1.sessions.createASession(id, {
+                yield createASession(id, {
                     sessionId: "sessionid",
-                    tenantId: structures_1.TENANT_ID,
+                    tenantId: TENANT_ID,
                     csrfToken: CSRF_TOKEN,
                 });
                 if (builder) {
@@ -202,73 +181,73 @@ class TestConfiguration {
                 admin,
                 roles,
             });
-            yield backend_core_1.cache.user.invalidateUser(globalId);
+            yield userCache.invalidateUser(globalId);
             return Object.assign(Object.assign({}, resp), { globalId });
         });
     }
     login({ roleId, userId, builder, prodApp = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const appId = prodApp ? this.prodAppId : this.appId;
-            return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+            return context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
                 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 !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+                if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
                     yield this.globalUser({
                         id: userId,
                         builder,
                         roles: { [this.prodAppId]: roleId },
                     });
                 }
-                yield backend_core_1.sessions.createASession(userId, {
+                yield createASession(userId, {
                     sessionId: "sessionid",
-                    tenantId: structures_1.TENANT_ID,
+                    tenantId: TENANT_ID,
                 });
                 // have to fake this
-                const authObj = {
+                const auth = {
                     userId,
                     sessionId: "sessionid",
-                    tenantId: structures_1.TENANT_ID,
+                    tenantId: TENANT_ID,
                 };
                 const app = {
                     roleId: roleId,
                     appId,
                 };
-                const authToken = backend_core_1.auth.jwt.sign(authObj, environment_1.default.JWT_SECRET);
-                const appToken = backend_core_1.auth.jwt.sign(app, environment_1.default.JWT_SECRET);
+                const authToken = jwt.sign(auth, env.JWT_SECRET);
+                const appToken = jwt.sign(app, env.JWT_SECRET);
                 // returning necessary request headers
-                yield backend_core_1.cache.user.invalidateUser(userId);
+                yield userCache.invalidateUser(userId);
                 return {
                     Accept: "application/json",
                     Cookie: [
-                        `${backend_core_1.constants.Cookie.Auth}=${authToken}`,
-                        `${backend_core_1.constants.Cookie.CurrentApp}=${appToken}`,
+                        `${Cookies.Auth}=${authToken}`,
+                        `${Cookies.CurrentApp}=${appToken}`,
                     ],
-                    [backend_core_1.constants.Header.APP_ID]: appId,
+                    [Headers.APP_ID]: appId,
                 };
             }));
         });
     }
     defaultHeaders(extras = {}) {
-        const authObj = {
+        const auth = {
             userId: GLOBAL_USER_ID,
             sessionId: "sessionid",
-            tenantId: structures_1.TENANT_ID,
+            tenantId: TENANT_ID,
         };
         const app = {
-            roleId: backend_core_1.roles.BUILTIN_ROLE_IDS.ADMIN,
+            roleId: BUILTIN_ROLE_IDS.ADMIN,
             appId: this.appId,
         };
-        const authToken = backend_core_1.auth.jwt.sign(authObj, environment_1.default.JWT_SECRET);
-        const appToken = backend_core_1.auth.jwt.sign(app, environment_1.default.JWT_SECRET);
+        const authToken = jwt.sign(auth, env.JWT_SECRET);
+        const appToken = jwt.sign(app, env.JWT_SECRET);
         const headers = Object.assign({ Accept: "application/json", Cookie: [
-                `${backend_core_1.constants.Cookie.Auth}=${authToken}`,
-                `${backend_core_1.constants.Cookie.CurrentApp}=${appToken}`,
-            ], [backend_core_1.constants.Header.CSRF_TOKEN]: CSRF_TOKEN }, extras);
+                `${Cookies.Auth}=${authToken}`,
+                `${Cookies.CurrentApp}=${appToken}`,
+            ], [Headers.CSRF_TOKEN]: CSRF_TOKEN }, extras);
         if (this.appId) {
-            headers[backend_core_1.constants.Header.APP_ID] = this.appId;
+            headers[Headers.APP_ID] = this.appId;
         }
         return headers;
     }
@@ -278,11 +257,11 @@ class TestConfiguration {
             Accept: "application/json",
         };
         if (appId) {
-            headers[backend_core_1.constants.Header.APP_ID] = appId;
+            headers[Headers.APP_ID] = appId;
         }
         return headers;
     }
-    roleHeaders({ email = EMAIL, roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
+    roleHeaders({ email = EMAIL, roleId = BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.login({ email, roleId, builder, prodApp });
         });
@@ -290,8 +269,8 @@ class TestConfiguration {
     // API
     generateApiKey(userId = GLOBAL_USER_ID) {
         return __awaiter(this, void 0, void 0, function* () {
-            return backend_core_1.tenancy.doWithGlobalDB(structures_1.TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
-                const id = backend_core_1.db.generateDevInfoID(userId);
+            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+                const id = generateDevInfoID(userId);
                 let devInfo;
                 try {
                     devInfo = yield db.get(id);
@@ -299,7 +278,7 @@ class TestConfiguration {
                 catch (err) {
                     devInfo = { _id: id, userId };
                 }
-                devInfo.apiKey = backend_core_1.encryption.encrypt(`${structures_1.TENANT_ID}${backend_core_1.db.SEPARATOR}${(0, newid_1.default)()}`);
+                devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
                 yield db.put(devInfo);
                 return devInfo.apiKey;
             }));
@@ -311,12 +290,10 @@ class TestConfiguration {
             // create dev app
             // clear any old app
             this.appId = null;
-            // @ts-ignore
-            yield backend_core_1.context.updateAppId(null);
+            yield context.updateAppId(null);
             this.app = yield this._req({ name: appName }, null, controllers.app.create);
             this.appId = this.app.appId;
-            // @ts-ignore
-            yield backend_core_1.context.updateAppId(this.appId);
+            yield context.updateAppId(this.appId);
             // create production app
             this.prodApp = yield this.deploy();
             this.allApps.push(this.prodApp);
@@ -327,24 +304,23 @@ class TestConfiguration {
     deploy() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._req(null, null, controllers.deploy.deployApp);
-            // @ts-ignore
             const prodAppId = this.getAppId().replace("_dev", "");
             this.prodAppId = prodAppId;
-            return backend_core_1.context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
-                const db = backend_core_1.context.getProdAppDB();
-                return yield db.get(backend_core_1.db.DocumentType.APP_METADATA);
+            return context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
+                const db = context.getProdAppDB();
+                return yield db.get(DocumentType.APP_METADATA);
             }));
         });
     }
     // TABLE
-    updateTable(config) {
+    updateTable(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            config = config || (0, structures_1.basicTable)();
+            config = config || basicTable();
             this.table = yield this._req(config, null, controllers.table.save);
             return this.table;
         });
     }
-    createTable(config) {
+    createTable(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (config != null && config._id) {
                 delete config._id;
@@ -352,18 +328,18 @@ class TestConfiguration {
             return this.updateTable(config);
         });
     }
-    getTable(tableId) {
+    getTable(tableId = null) {
         return __awaiter(this, void 0, void 0, function* () {
             tableId = tableId || this.table._id;
             return this._req(null, { tableId }, controllers.table.find);
         });
     }
-    createLinkedTable(relationshipType, links = ["link"]) {
+    createLinkedTable(relationshipType = null, links = ["link"]) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.table) {
                 throw "Must have created a table first.";
             }
-            const tableConfig = (0, structures_1.basicTable)();
+            const tableConfig = basicTable();
             tableConfig.primaryDisplay = "name";
             for (let link of links) {
                 tableConfig.schema[link] = {
@@ -383,7 +359,7 @@ class TestConfiguration {
     }
     createAttachmentTable() {
         return __awaiter(this, void 0, void 0, function* () {
-            const table = (0, structures_1.basicTable)();
+            const table = basicTable();
             table.schema.attachment = {
                 type: "attachment",
             };
@@ -397,7 +373,7 @@ class TestConfiguration {
                 throw "Test requires table to be configured.";
             }
             const tableId = (config && config.tableId) || this.table._id;
-            config = config || (0, structures_1.basicRow)(tableId);
+            config = config || basicRow(tableId);
             return this._req(config, { tableId }, controllers.row.save);
         });
     }
@@ -415,9 +391,9 @@ class TestConfiguration {
         });
     }
     // ROLE
-    createRole(config) {
+    createRole(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            config = config || (0, structures_1.basicRole)();
+            config = config || basicRole();
             return this._req(config, null, controllers.role.save);
         });
     }
@@ -446,7 +422,7 @@ class TestConfiguration {
     // AUTOMATION
     createAutomation(config) {
         return __awaiter(this, void 0, void 0, function* () {
-            config = config || (0, structures_1.basicAutomation)();
+            config = config || basicAutomation();
             if (config._rev) {
                 delete config._rev;
             }
@@ -459,7 +435,7 @@ class TestConfiguration {
             return this._req(null, null, controllers.automation.fetch);
         });
     }
-    deleteAutomation(automation) {
+    deleteAutomation(automation = null) {
         return __awaiter(this, void 0, void 0, function* () {
             automation = automation || this.automation;
             if (!automation) {
@@ -468,19 +444,19 @@ class TestConfiguration {
             return this._req(null, { id: automation._id, rev: automation._rev }, controllers.automation.destroy);
         });
     }
-    createWebhook(config) {
+    createWebhook(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.automation) {
                 throw "Must create an automation before creating webhook.";
             }
-            config = config || (0, structures_1.basicWebhook)(this.automation._id);
+            config = config || basicWebhook(this.automation._id);
             return (yield this._req(config, null, controllers.webhook.save)).webhook;
         });
     }
     // DATASOURCE
-    createDatasource(config) {
+    createDatasource(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            config = config || (0, structures_1.basicDatasource)();
+            config = config || basicDatasource();
             const response = yield this._req(config, null, controllers.datasource.save);
             this.datasource = response.datasource;
             return this.datasource;
@@ -496,14 +472,14 @@ class TestConfiguration {
     restDatasource(cfg) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.createDatasource({
-                datasource: Object.assign(Object.assign({}, (0, structures_1.basicDatasource)().datasource), { source: "REST", config: cfg || {} }),
+                datasource: Object.assign(Object.assign({}, basicDatasource().datasource), { source: "REST", config: cfg || {} }),
             });
         });
     }
     dynamicVariableDatasource() {
         return __awaiter(this, void 0, void 0, function* () {
             let datasource = yield this.restDatasource();
-            const basedOnQuery = yield this.createQuery(Object.assign(Object.assign({}, (0, structures_1.basicQuery)(datasource._id)), { fields: {
+            const basedOnQuery = yield this.createQuery(Object.assign(Object.assign({}, basicQuery(datasource._id)), { fields: {
                     path: "www.google.com",
                 } }));
             datasource = yield this.updateDatasource(Object.assign(Object.assign({}, datasource), { config: {
@@ -535,26 +511,26 @@ class TestConfiguration {
                 .expect(200);
         });
     }
-    createQuery(config) {
+    createQuery(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.datasource && !config) {
                 throw "No datasource created for query.";
             }
-            config = config || (0, structures_1.basicQuery)(this.datasource._id);
+            config = config || basicQuery(this.datasource._id);
             return this._req(config, null, controllers.query.save);
         });
     }
     // SCREEN
-    createScreen(config) {
+    createScreen(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            config = config || (0, structures_1.basicScreen)();
+            config = config || basicScreen();
             return this._req(config, null, controllers.screen.save);
         });
     }
     // LAYOUT
-    createLayout(config) {
+    createLayout(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
-            config = config || (0, structures_1.basicLayout)();
+            config = config || basicLayout();
             return yield this._req(config, null, controllers.layout.save);
         });
     }

package/dist/tests/utilities/controllers.js

@@ -1,40 +1,17 @@
 "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;
+module.exports = {
+    table: require("../../api/controllers/table"),
+    row: require("../../api/controllers/row"),
+    role: require("../../api/controllers/role"),
+    perms: require("../../api/controllers/permission"),
+    view: require("../../api/controllers/view"),
+    app: require("../../api/controllers/application"),
+    user: require("../../api/controllers/user"),
+    automation: require("../../api/controllers/automation"),
+    datasource: require("../../api/controllers/datasource"),
+    query: require("../../api/controllers/query"),
+    screen: require("../../api/controllers/screen"),
+    webhook: require("../../api/controllers/webhook"),
+    layout: require("../../api/controllers/layout"),
+    deploy: require("../../api/controllers/deploy"),
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploy = exports.layout = exports.webhook = exports.screen = exports.query = exports.datasource = exports.automation = exports.user = exports.app = exports.view = exports.perms = exports.role = exports.row = exports.table = void 0;
-exports.table = __importStar(require("../../api/controllers/table"));
-exports.row = __importStar(require("../../api/controllers/row"));
-exports.role = __importStar(require("../../api/controllers/role"));
-exports.perms = __importStar(require("../../api/controllers/permission"));
-exports.view = __importStar(require("../../api/controllers/view"));
-exports.app = __importStar(require("../../api/controllers/application"));
-exports.user = __importStar(require("../../api/controllers/user"));
-exports.automation = __importStar(require("../../api/controllers/automation"));
-exports.datasource = __importStar(require("../../api/controllers/datasource"));
-exports.query = __importStar(require("../../api/controllers/query"));
-exports.screen = __importStar(require("../../api/controllers/screen"));
-exports.webhook = __importStar(require("../../api/controllers/webhook"));
-exports.layout = __importStar(require("../../api/controllers/layout"));
-exports.deploy = __importStar(require("../../api/controllers/deploy"));