@budibase/server 2.1.32-alpha.1 → 2.1.32-alpha.10

package/dist/db/utils.js

@@ -17,7 +17,7 @@ exports.SearchIndexes = {
 };
 exports.BudibaseInternalDB = {
     _id: "bb_internal",
-    type: "budibase",
+    type: backend_core_1.db.BUDIBASE_DATASOURCE_TYPE,
     name: "Budibase DB",
     source: "BUDIBASE",
     config: {},

package/dist/db/views/staticViews.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getAppDB } = require("@budibase/backend-core/context");
+const { context } = require("@budibase/backend-core");
 const { DocumentType, SEPARATOR, ViewName, SearchIndexes } = require("../utils");
 const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR;
 /**************************************************
@@ -28,7 +28,7 @@ const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR;
  * so it may be slow.
  */
 exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = context.getAppDB();
     const designDoc = yield db.get("_design/database");
     const view = {
         map: function (doc) {
@@ -58,7 +58,7 @@ exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
     yield db.put(designDoc);
 });
 exports.createRoutingView = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = context.getAppDB();
     const designDoc = yield db.get("_design/database");
     const view = {
         // if using variables in a map function need to inject them before use
@@ -76,7 +76,7 @@ exports.createRoutingView = () => __awaiter(void 0, void 0, void 0, function* ()
 });
 function searchIndex(indexName, fnString) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = context.getAppDB();
         const designDoc = yield db.get("_design/database");
         designDoc.indexes = {
             [indexName]: {

package/dist/integrations/index.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIntegration = exports.getDefinitions = void 0;
 const postgres_1 = __importDefault(require("./postgres"));
 const dynamodb_1 = __importDefault(require("./dynamodb"));
 const mongodb_1 = __importDefault(require("./mongodb"));
@@ -75,8 +76,8 @@ if (process.arch &&
     DEFINITIONS[types_1.SourceName.ORACLE] = oracle_1.default.schema;
     INTEGRATIONS[types_1.SourceName.ORACLE] = oracle_1.default.integration;
 }
-module.exports = {
-    getDefinitions: () => __awaiter(void 0, void 0, void 0, function* () {
+function getDefinitions() {
+    return __awaiter(this, void 0, void 0, function* () {
         const pluginSchemas = {};
         if (environment.SELF_HOSTED) {
             const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
@@ -90,9 +91,12 @@ module.exports = {
             }
         }
         return Object.assign(Object.assign({}, cloneDeep(DEFINITIONS)), pluginSchemas);
-    }),
-    getIntegration: (integration) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+    });
+}
+exports.getDefinitions = getDefinitions;
+function getIntegration(integration) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
         }
@@ -112,5 +116,10 @@ module.exports = {
             }
         }
         throw new Error("No datasource implementation found.");
-    }),
+    });
+}
+exports.getIntegration = getIntegration;
+exports.default = {
+    getDefinitions,
+    getIntegration,
 };

package/dist/middleware/authorized.js

@@ -8,16 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const roles_1 = require("@budibase/backend-core/roles");
-const { PermissionType, PermissionLevel, doesHaveBasePermission, } = require("@budibase/backend-core/permissions");
-const builderMiddleware = require("./builder");
-const { isWebhookEndpoint } = require("./utils");
-const { buildCsrfMiddleware } = require("@budibase/backend-core/auth");
-const { getAppId } = require("@budibase/backend-core/context");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const backend_core_1 = require("@budibase/backend-core");
+const builder_1 = __importDefault(require("./builder"));
+const utils_1 = require("./utils");
 function hasResource(ctx) {
     return ctx.resourceId != null;
 }
-const csrf = buildCsrfMiddleware();
+const csrf = backend_core_1.auth.buildCsrfMiddleware();
 /**
  * Apply authorization to the requested resource:
  * - If this is a builder resource the user must be a builder.
@@ -27,7 +27,7 @@ const csrf = buildCsrfMiddleware();
 const checkAuthorized = (ctx, resourceRoles, permType, permLevel) => __awaiter(void 0, void 0, void 0, function* () {
     // check if this is a builder api and the user is not a builder
     const isBuilder = ctx.user && ctx.user.builder && ctx.user.builder.global;
-    const isBuilderApi = permType === PermissionType.BUILDER;
+    const isBuilderApi = permType === backend_core_1.permissions.PermissionType.BUILDER;
     if (isBuilderApi && !isBuilder) {
         return ctx.throw(403, "Not Authorized");
     }
@@ -38,8 +38,8 @@ const checkAuthorized = (ctx, resourceRoles, permType, permLevel) => __awaiter(v
 });
 const checkAuthorizedResource = (ctx, resourceRoles, permType, permLevel) => __awaiter(void 0, void 0, void 0, function* () {
     // get the user's roles
-    const roleId = ctx.roleId || roles_1.BUILTIN_ROLE_IDS.PUBLIC;
-    const userRoles = (yield (0, roles_1.getUserRoleHierarchy)(roleId, {
+    const roleId = ctx.roleId || backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
+    const userRoles = (yield backend_core_1.roles.getUserRoleHierarchy(roleId, {
         idOnly: false,
     }));
     const permError = "User does not have permission";
@@ -52,14 +52,14 @@ const checkAuthorizedResource = (ctx, resourceRoles, permType, permLevel) => __a
         }
         // fallback to the base permissions when no resource roles are found
     }
-    else if (!doesHaveBasePermission(permType, permLevel, userRoles)) {
+    else if (!backend_core_1.permissions.doesHaveBasePermission(permType, permLevel, userRoles)) {
         ctx.throw(403, permError);
     }
 });
 module.exports = (permType, permLevel = null, opts = { schema: false }) => (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // webhooks don't need authentication, each webhook unique
     // also internal requests (between services) don't need authorized
-    if (isWebhookEndpoint(ctx) || ctx.internal) {
+    if ((0, utils_1.isWebhookEndpoint)(ctx) || ctx.internal) {
         return next();
     }
     if (!ctx.user) {
@@ -67,23 +67,24 @@ module.exports = (permType, permLevel = null, opts = { schema: false }) => (ctx,
     }
     // check general builder stuff, this middleware is a good way
     // to find API endpoints which are builder focused
-    yield builderMiddleware(ctx, permType);
+    yield (0, builder_1.default)(ctx, permType);
     // get the resource roles
     let resourceRoles = [];
     let otherLevelRoles = [];
-    const otherLevel = permLevel === PermissionLevel.READ
-        ? PermissionLevel.WRITE
-        : PermissionLevel.READ;
-    const appId = getAppId();
+    const otherLevel = permLevel === backend_core_1.permissions.PermissionLevel.READ
+        ? backend_core_1.permissions.PermissionLevel.WRITE
+        : backend_core_1.permissions.PermissionLevel.READ;
+    const appId = backend_core_1.context.getAppId();
     if (appId && hasResource(ctx)) {
-        resourceRoles = yield (0, roles_1.getRequiredResourceRole)(permLevel, ctx);
+        resourceRoles = yield backend_core_1.roles.getRequiredResourceRole(permLevel, ctx);
         if (opts && opts.schema) {
-            otherLevelRoles = yield (0, roles_1.getRequiredResourceRole)(otherLevel, ctx);
+            otherLevelRoles = yield backend_core_1.roles.getRequiredResourceRole(otherLevel, ctx);
         }
     }
     // if the resource is public, proceed
-    if (resourceRoles.includes(roles_1.BUILTIN_ROLE_IDS.PUBLIC) ||
-        (otherLevelRoles && otherLevelRoles.includes(roles_1.BUILTIN_ROLE_IDS.PUBLIC))) {
+    if (resourceRoles.includes(backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) ||
+        (otherLevelRoles &&
+            otherLevelRoles.includes(backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC))) {
         return next();
     }
     // check authenticated

package/dist/migrations/functions/appUrls.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const { DocumentType } = require("@budibase/backend-core/db");
+const backend_core_1 = require("@budibase/backend-core");
 const application_1 = require("../../api/controllers/application");
 /**
  * Date:
@@ -22,7 +22,7 @@ const application_1 = require("../../api/controllers/application");
 const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata;
     try {
-        metadata = yield appDb.get(DocumentType.APP_METADATA);
+        metadata = yield appDb.get(backend_core_1.db.DocumentType.APP_METADATA);
     }
     catch (e) {
         // sometimes the metadata document doesn't exist

package/dist/migrations/functions/usageQuotas/syncApps.js

@@ -10,16 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const tenancy_1 = require("@budibase/backend-core/tenancy");
-const db_1 = require("@budibase/backend-core/db");
+const backend_core_1 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     // get app count
-    const devApps = yield (0, db_1.getAllApps)({ dev: true });
+    const devApps = yield backend_core_1.db.getAllApps({ dev: true });
     const appCount = devApps ? devApps.length : 0;
     // sync app count
-    const tenantId = (0, tenancy_1.getTenantId)();
+    const tenantId = backend_core_1.tenancy.getTenantId();
     console.log(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
     yield pro_1.quotas.setUsage(appCount, types_1.StaticQuotaName.APPS, types_1.QuotaUsageType.STATIC);
 });

package/dist/migrations/functions/usageQuotas/syncRows.js

@@ -10,14 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const tenancy_1 = require("@budibase/backend-core/tenancy");
-const db_1 = require("@budibase/backend-core/db");
+const backend_core_1 = require("@budibase/backend-core");
 const rows_1 = require("../../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const run = () => __awaiter(void 0, void 0, void 0, function* () {
     // get all rows in all apps
-    const allApps = (yield (0, db_1.getAllApps)({ all: true }));
+    const allApps = (yield backend_core_1.db.getAllApps({ all: true }));
     const appIds = allApps ? allApps.map((app) => app.appId) : [];
     const { appRows } = yield (0, rows_1.getUniqueRows)(appIds);
     // get the counts per app
@@ -28,7 +27,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
         rowCount += rows.length;
     });
     // sync row count
-    const tenantId = (0, tenancy_1.getTenantId)();
+    const tenantId = backend_core_1.tenancy.getTenantId();
     console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
     yield pro_1.quotas.setUsagePerApp(counts, types_1.StaticQuotaName.ROWS, types_1.QuotaUsageType.STATIC);
 });

package/dist/migrations/functions/userEmailViewCasing.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const { createNewUserEmailView } = require("@budibase/backend-core/db");
+const backend_core_1 = require("@budibase/backend-core");
 /**
  * Date:
  * October 2021
@@ -18,7 +18,7 @@ const { createNewUserEmailView } = require("@budibase/backend-core/db");
  * Description:
  * Recreate the user email view to include latest changes i.e. lower casing the email address
  */
-const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
-    yield createNewUserEmailView(db);
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    yield backend_core_1.db.createNewUserEmailView();
 });
 exports.run = run;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.1.32-alpha.0",
+    "version": "2.1.32-alpha.9",
     "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.32-alpha.0",
-        "@budibase/client": "2.1.32-alpha.0",
-        "@budibase/pro": "2.1.31",
-        "@budibase/string-templates": "2.1.32-alpha.0",
-        "@budibase/types": "2.1.32-alpha.0",
+        "@budibase/backend-core": "2.1.32-alpha.9",
+        "@budibase/client": "2.1.32-alpha.9",
+        "@budibase/pro": "2.1.32-alpha.9",
+        "@budibase/string-templates": "2.1.32-alpha.9",
+        "@budibase/types": "2.1.32-alpha.9",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/sdk/app/backups/exports.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamExportApp = exports.exportMultipleApps = exports.exportApp = exports.exportDB = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const budibaseDir_1 = require("../../../utilities/budibaseDir");
-const utilities_1 = require("../../../utilities/fileSystem/utilities");
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const constants_1 = require("../../../constants");
 const utils_1 = require("../../../db/utils");
@@ -89,7 +88,7 @@ function exportApp(appId, config) {
         // export bucket contents
         let tmpPath;
         if (!environment_1.default.isTest()) {
-            tmpPath = yield (0, utilities_1.retrieveDirectory)(constants_1.ObjectStoreBuckets.APPS, appPath);
+            tmpPath = yield backend_core_1.objectStore.retrieveDirectory(constants_1.ObjectStoreBuckets.APPS, appPath);
         }
         else {
             tmpPath = (0, fileSystem_1.createTempFolder)(uuid());

package/dist/sdk/app/backups/imports.js

@@ -17,7 +17,6 @@ const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
 const budibaseDir_1 = require("../../../utilities/budibaseDir");
 const constants_1 = require("./constants");
-const utilities_1 = require("../../../utilities/fileSystem/utilities");
 const fileSystem_1 = require("../../../utilities/fileSystem");
 const constants_2 = require("../../../constants");
 const path_1 = require("path");
@@ -161,10 +160,10 @@ function importApp(appId, db, template) {
                     }
                     filename = (0, path_1.join)(prodAppId, filename);
                     if (fs_1.default.lstatSync(path).isDirectory()) {
-                        promises.push((0, utilities_1.uploadDirectory)(constants_2.ObjectStoreBuckets.APPS, path, filename));
+                        promises.push(backend_core_1.objectStore.uploadDirectory(constants_2.ObjectStoreBuckets.APPS, path, filename));
                     }
                     else {
-                        promises.push((0, utilities_1.upload)({
+                        promises.push(backend_core_1.objectStore.upload({
                             bucket: constants_2.ObjectStoreBuckets.APPS,
                             path,
                             filename,

package/dist/sdk/app/tables/index.js

@@ -20,7 +20,7 @@ function getAllInternalTables(db) {
         const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
             include_docs: true,
         }));
-        return internalTables.rows.map((tableDoc) => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: utils_1.BudibaseInternalDB._id })));
+        return internalTables.rows.map((tableDoc) => (Object.assign(Object.assign({}, tableDoc.doc), { type: "internal", sourceId: tableDoc.doc.sourceId || utils_1.BudibaseInternalDB._id })));
     });
 }
 function getAllExternalTables(datasourceId) {

package/dist/startup.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startup = void 0;
 const env = __importStar(require("./environment"));
-const redis_1 = __importDefault(require("./utilities/redis"));
+const redis = __importStar(require("./utilities/redis"));
 const workerRequests_1 = require("./utilities/workerRequests");
 const backend_core_1 = require("@budibase/backend-core");
 const fs_1 = __importDefault(require("fs"));
@@ -48,7 +48,7 @@ const events_1 = __importDefault(require("./events"));
 const migrations = __importStar(require("./migrations"));
 const bullboard_1 = __importDefault(require("./automations/bullboard"));
 const pro = __importStar(require("@budibase/pro"));
-const api_1 = __importDefault(require("./api"));
+const api = __importStar(require("./api"));
 const sdk_1 = __importDefault(require("./sdk"));
 const pino = require("koa-pino-logger");
 let STARTUP_RAN = false;
@@ -62,7 +62,7 @@ function initRoutes(app) {
         app.context.eventEmitter = events_1.default;
         app.context.auth = {};
         // api routes
-        app.use(api_1.default.router.routes());
+        app.use(api.router.routes());
     });
 }
 function initPro() {
@@ -95,7 +95,7 @@ function startup(app, server) {
         }
         events_1.default.emitPort(env.PORT);
         fileSystem_1.default.init();
-        yield redis_1.default.init();
+        yield redis.init();
         // run migrations on startup if not done via http
         // not recommended in a clustered environment
         if (!env.HTTP_MIGRATIONS && !env.isTest()) {

package/dist/tests/utilities/TestConfiguration.js

@@ -9,21 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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 { constants, tenancy, sessions, cache, context, db: dbCore, encryption, auth, roles, } = require("@budibase/backend-core");
 const controllers = require("./controllers");
 const supertest = require("supertest");
 const { cleanup } = require("../../utilities/fileSystem");
-const { Cookie, Header } = 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";
@@ -75,7 +67,7 @@ class TestConfiguration {
             if (!appId) {
                 appId = this.appId;
             }
-            return doInTenant(TENANT_ID, () => {
+            return tenancy.doInTenant(TENANT_ID, () => {
                 // check if already in a context
                 if (context.getAppId() == null && appId !== null) {
                     return context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
@@ -139,7 +131,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 doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+            return tenancy.doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
                 let existing;
                 try {
                     existing = yield db.get(id);
@@ -149,7 +141,7 @@ class TestConfiguration {
                 }
                 const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID, firstName,
                     lastName });
-                yield createASession(id, {
+                yield sessions.createASession(id, {
                     sessionId: "sessionid",
                     tenantId: TENANT_ID,
                     csrfToken: CSRF_TOKEN,
@@ -183,7 +175,7 @@ class TestConfiguration {
                 admin,
                 roles,
             });
-            yield userCache.invalidateUser(globalId);
+            yield cache.user.invalidateUser(globalId);
             return Object.assign(Object.assign({}, resp), { globalId });
         });
     }
@@ -196,19 +188,19 @@ class TestConfiguration {
                     throw "Server has not been opened, cannot login.";
                 }
                 // make sure the user exists in the global DB
-                if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
+                if (roleId !== roles.BUILTIN_ROLE_IDS.PUBLIC) {
                     yield this.globalUser({
                         id: userId,
                         builder,
                         roles: { [this.prodAppId]: roleId },
                     });
                 }
-                yield createASession(userId, {
+                yield sessions.createASession(userId, {
                     sessionId: "sessionid",
                     tenantId: TENANT_ID,
                 });
                 // have to fake this
-                const auth = {
+                const authObj = {
                     userId,
                     sessionId: "sessionid",
                     tenantId: TENANT_ID,
@@ -217,39 +209,39 @@ class TestConfiguration {
                     roleId: roleId,
                     appId,
                 };
-                const authToken = jwt.sign(auth, env.JWT_SECRET);
-                const appToken = jwt.sign(app, env.JWT_SECRET);
+                const authToken = auth.jwt.sign(authObj, env.JWT_SECRET);
+                const appToken = auth.jwt.sign(app, env.JWT_SECRET);
                 // returning necessary request headers
-                yield userCache.invalidateUser(userId);
+                yield cache.user.invalidateUser(userId);
                 return {
                     Accept: "application/json",
                     Cookie: [
-                        `${Cookie.Auth}=${authToken}`,
-                        `${Cookie.CurrentApp}=${appToken}`,
+                        `${constants.Cookie.Auth}=${authToken}`,
+                        `${constants.Cookie.CurrentApp}=${appToken}`,
                     ],
-                    [Header.APP_ID]: appId,
+                    [constants.Header.APP_ID]: appId,
                 };
             }));
         });
     }
     defaultHeaders(extras = {}) {
-        const auth = {
+        const authObj = {
             userId: GLOBAL_USER_ID,
             sessionId: "sessionid",
             tenantId: TENANT_ID,
         };
         const app = {
-            roleId: BUILTIN_ROLE_IDS.ADMIN,
+            roleId: roles.BUILTIN_ROLE_IDS.ADMIN,
             appId: this.appId,
         };
-        const authToken = jwt.sign(auth, env.JWT_SECRET);
-        const appToken = jwt.sign(app, env.JWT_SECRET);
+        const authToken = auth.jwt.sign(authObj, env.JWT_SECRET);
+        const appToken = auth.jwt.sign(app, env.JWT_SECRET);
         const headers = Object.assign({ Accept: "application/json", Cookie: [
-                `${Cookie.Auth}=${authToken}`,
-                `${Cookie.CurrentApp}=${appToken}`,
-            ], [Header.CSRF_TOKEN]: CSRF_TOKEN }, extras);
+                `${constants.Cookie.Auth}=${authToken}`,
+                `${constants.Cookie.CurrentApp}=${appToken}`,
+            ], [constants.Header.CSRF_TOKEN]: CSRF_TOKEN }, extras);
         if (this.appId) {
-            headers[Header.APP_ID] = this.appId;
+            headers[constants.Header.APP_ID] = this.appId;
         }
         return headers;
     }
@@ -259,11 +251,11 @@ class TestConfiguration {
             Accept: "application/json",
         };
         if (appId) {
-            headers[Header.APP_ID] = appId;
+            headers[constants.Header.APP_ID] = appId;
         }
         return headers;
     }
-    roleHeaders({ email = EMAIL, roleId = BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
+    roleHeaders({ email = EMAIL, roleId = roles.BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.login({ email, roleId, builder, prodApp });
         });
@@ -271,8 +263,8 @@ class TestConfiguration {
     // API
     generateApiKey(userId = GLOBAL_USER_ID) {
         return __awaiter(this, void 0, void 0, function* () {
-            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
-                const id = generateDevInfoID(userId);
+            return tenancy.doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+                const id = dbCore.generateDevInfoID(userId);
                 let devInfo;
                 try {
                     devInfo = yield db.get(id);
@@ -280,7 +272,7 @@ class TestConfiguration {
                 catch (err) {
                     devInfo = { _id: id, userId };
                 }
-                devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
+                devInfo.apiKey = encryption.encrypt(`${TENANT_ID}${dbCore.SEPARATOR}${newid()}`);
                 yield db.put(devInfo);
                 return devInfo.apiKey;
             }));

package/dist/tests/utilities/structures.js

@@ -1,6 +1,5 @@
 "use strict";
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { BuiltinPermissionID } = require("@budibase/backend-core/permissions");
+const { roles, permissions } = require("@budibase/backend-core");
 const { createHomeScreen } = require("../../constants/screens");
 const { EMPTY_LAYOUT } = require("../../constants/layouts");
 const { cloneDeep } = require("lodash/fp");
@@ -100,8 +99,8 @@ exports.basicLinkedRow = (tableId, linkedRowId, linkField = "link") => {
 exports.basicRole = () => {
     return {
         name: "NewRole",
-        inherits: BUILTIN_ROLE_IDS.BASIC,
-        permissionId: BuiltinPermissionID.READ_ONLY,
+        inherits: roles.BUILTIN_ROLE_IDS.BASIC,
+        permissionId: permissions.BuiltinPermissionID.READ_ONLY,
     };
 };
 exports.basicDatasource = () => {