@budibase/server 2.1.32-alpha.4 → 2.1.32-alpha.6

package/dist/utilities/security.js

@@ -1,53 +1,57 @@
 "use strict";
-const { PermissionLevel, PermissionType, getBuiltinPermissionByID, isPermissionLevelHigherThanRead, } = require("@budibase/backend-core/permissions");
-const { lowerBuiltinRoleID, getBuiltinRoles, } = require("@budibase/backend-core/roles");
-const { DocumentType } = require("../db/utils");
-const CURRENTLY_SUPPORTED_LEVELS = [
-    PermissionLevel.WRITE,
-    PermissionLevel.READ,
-    PermissionLevel.EXECUTE,
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBasePermissions = exports.getPermissionType = exports.CURRENTLY_SUPPORTED_LEVELS = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../db/utils");
+exports.CURRENTLY_SUPPORTED_LEVELS = [
+    backend_core_1.permissions.PermissionLevel.WRITE,
+    backend_core_1.permissions.PermissionLevel.READ,
+    backend_core_1.permissions.PermissionLevel.EXECUTE,
 ];
-exports.getPermissionType = resourceId => {
-    const docType = Object.values(DocumentType).filter(docType => resourceId.startsWith(docType))[0];
+function getPermissionType(resourceId) {
+    const docType = Object.values(utils_1.DocumentType).filter(docType => resourceId.startsWith(docType))[0];
     switch (docType) {
-        case DocumentType.TABLE:
-        case DocumentType.ROW:
-            return PermissionType.TABLE;
-        case DocumentType.AUTOMATION:
-            return PermissionType.AUTOMATION;
-        case DocumentType.WEBHOOK:
-            return PermissionType.WEBHOOK;
-        case DocumentType.QUERY:
-        case DocumentType.DATASOURCE:
-            return PermissionType.QUERY;
+        case utils_1.DocumentType.TABLE:
+        case utils_1.DocumentType.ROW:
+            return backend_core_1.permissions.PermissionType.TABLE;
+        case utils_1.DocumentType.AUTOMATION:
+            return backend_core_1.permissions.PermissionType.AUTOMATION;
+        case utils_1.DocumentType.WEBHOOK:
+            return backend_core_1.permissions.PermissionType.WEBHOOK;
+        case utils_1.DocumentType.QUERY:
+        case utils_1.DocumentType.DATASOURCE:
+            return backend_core_1.permissions.PermissionType.QUERY;
         default:
             // views don't have an ID, will end up here
-            return PermissionType.VIEW;
+            return backend_core_1.permissions.PermissionType.VIEW;
     }
-};
+}
+exports.getPermissionType = getPermissionType;
 /**
  *  works out the basic permissions based on builtin roles for a resource, using its ID
- * @param resourceId
- * @returns {{}}
  */
-exports.getBasePermissions = resourceId => {
-    const type = exports.getPermissionType(resourceId);
-    const permissions = {};
-    for (let [roleId, role] of Object.entries(getBuiltinRoles())) {
+function getBasePermissions(resourceId) {
+    const type = getPermissionType(resourceId);
+    const basePermissions = {};
+    for (let [roleId, role] of Object.entries(backend_core_1.roles.getBuiltinRoles())) {
         if (!role.permissionId) {
             continue;
         }
-        const perms = getBuiltinPermissionByID(role.permissionId);
+        const perms = backend_core_1.permissions.getBuiltinPermissionByID(role.permissionId);
+        if (!perms) {
+            continue;
+        }
         const typedPermission = perms.permissions.find(perm => perm.type === type);
         if (typedPermission &&
-            CURRENTLY_SUPPORTED_LEVELS.indexOf(typedPermission.level) !== -1) {
+            exports.CURRENTLY_SUPPORTED_LEVELS.indexOf(typedPermission.level) !== -1) {
             const level = typedPermission.level;
-            permissions[level] = lowerBuiltinRoleID(permissions[level], roleId);
-            if (isPermissionLevelHigherThanRead(level)) {
-                permissions[PermissionLevel.READ] = lowerBuiltinRoleID(permissions[PermissionLevel.READ], roleId);
+            basePermissions[level] = backend_core_1.roles.lowerBuiltinRoleID(basePermissions[level], roleId);
+            if (backend_core_1.permissions.isPermissionLevelHigherThanRead(level)) {
+                basePermissions[backend_core_1.permissions.PermissionLevel.READ] =
+                    backend_core_1.roles.lowerBuiltinRoleID(basePermissions[backend_core_1.permissions.PermissionLevel.READ], roleId);
             }
         }
     }
-    return permissions;
-};
-exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS;
+    return basePermissions;
+}
+exports.getBasePermissions = getBasePermissions;

package/dist/utilities/usageQuota/rows.js

@@ -8,19 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getRowParams, USER_METDATA_PREFIX } = require("../../db/utils");
-const { isDevAppID, getDevelopmentAppID, getProdAppID, doWithDB, } = require("@budibase/backend-core/db");
-const ROW_EXCLUSIONS = [USER_METDATA_PREFIX];
-const getAppPairs = appIds => {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUniqueRows = void 0;
+const utils_1 = require("../../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const ROW_EXCLUSIONS = [utils_1.USER_METDATA_PREFIX];
+function getAppPairs(appIds) {
     // collect the app ids into dev / prod pairs
     // keyed by the dev app id
     const pairs = {};
     for (let appId of appIds) {
-        const devId = getDevelopmentAppID(appId);
+        const devId = backend_core_1.db.getDevelopmentAppID(appId);
         if (!pairs[devId]) {
             pairs[devId] = {};
         }
-        if (isDevAppID(appId)) {
+        if (backend_core_1.db.isDevAppID(appId)) {
             pairs[devId].devId = appId;
         }
         else {
@@ -28,54 +30,59 @@ const getAppPairs = appIds => {
         }
     }
     return pairs;
-};
-const getAppRows = (appId) => __awaiter(void 0, void 0, void 0, function* () {
-    // need to specify the app ID, as this is used for different apps in one call
-    return doWithDB(appId, (db) => __awaiter(void 0, void 0, void 0, function* () {
-        const response = yield db.allDocs(getRowParams(null, null, {
-            include_docs: false,
-        }));
-        return response.rows
-            .map(r => r.id)
-            .filter(id => {
-            for (let exclusion of ROW_EXCLUSIONS) {
-                if (id.startsWith(exclusion)) {
-                    return false;
+}
+function getAppRows(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // need to specify the app ID, as this is used for different apps in one call
+        return backend_core_1.db.doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
+            const response = yield db.allDocs((0, utils_1.getRowParams)(null, null, {
+                include_docs: false,
+            }));
+            return response.rows
+                .map(r => r.id)
+                .filter(id => {
+                for (let exclusion of ROW_EXCLUSIONS) {
+                    if (id.startsWith(exclusion)) {
+                        return false;
+                    }
                 }
-            }
-            return true;
-        });
-    }));
-});
+                return true;
+            });
+        }));
+    });
+}
 /**
  * Return a set of all rows in the given app ids.
  * The returned rows will be unique on a per dev/prod app basis.
  * Rows duplicates may exist across apps due to data import so they are not filtered out.
  */
-exports.getUniqueRows = (appIds) => __awaiter(void 0, void 0, void 0, function* () {
-    let uniqueRows = [], rowsByApp = {};
-    const pairs = getAppPairs(appIds);
-    for (let pair of Object.values(pairs)) {
-        let appRows = [];
-        for (let appId of [pair.devId, pair.prodId]) {
-            if (!appId) {
-                continue;
-            }
-            try {
-                appRows = appRows.concat(yield getAppRows(appId));
-            }
-            catch (e) {
-                console.error(e);
-                // don't error out if we can't count the app rows, just continue
+function getUniqueRows(appIds) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let uniqueRows = [], rowsByApp = {};
+        const pairs = getAppPairs(appIds);
+        for (let pair of Object.values(pairs)) {
+            let appRows = [];
+            for (let appId of [pair.devId, pair.prodId]) {
+                if (!appId) {
+                    continue;
+                }
+                try {
+                    appRows = appRows.concat(yield getAppRows(appId));
+                }
+                catch (e) {
+                    console.error(e);
+                    // don't error out if we can't count the app rows, just continue
+                }
             }
+            // ensure uniqueness on a per app pair basis
+            // this can't be done on all rows because app import results in
+            // duplicate row ids across apps
+            // the array pre-concat is important to avoid stack overflow
+            const prodId = backend_core_1.db.getProdAppID((pair.devId || pair.prodId));
+            rowsByApp[prodId] = [...new Set(appRows)];
+            uniqueRows = uniqueRows.concat(rowsByApp[prodId]);
         }
-        // ensure uniqueness on a per app pair basis
-        // this can't be done on all rows because app import results in
-        // duplicate row ids across apps
-        // the array pre-concat is important to avoid stack overflow
-        const prodId = getProdAppID(pair.devId || pair.prodId);
-        rowsByApp[prodId] = [...new Set(appRows)];
-        uniqueRows = uniqueRows.concat(rowsByApp[prodId]);
-    }
-    return { rows: uniqueRows, appRows: rowsByApp };
-});
+        return { rows: uniqueRows, appRows: rowsByApp };
+    });
+}
+exports.getUniqueRows = getUniqueRows;

package/dist/utilities/users.js

@@ -8,31 +8,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { InternalTables } = require("../db/utils");
-const { getGlobalUser } = require("../utilities/global");
-const { getAppDB } = require("@budibase/backend-core/context");
-const { getProdAppID } = require("@budibase/backend-core/db");
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-exports.getFullUser = (ctx, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const global = yield getGlobalUser(userId);
-    let metadata = {};
-    // always prefer the user metadata _id and _rev
-    delete global._id;
-    delete global._rev;
-    try {
-        // this will throw an error if the db doesn't exist, or there is no appId
-        const db = getAppDB();
-        metadata = yield db.get(userId);
-    }
-    catch (err) {
-        // it is fine if there is no user metadata yet
-    }
-    delete metadata.csrfToken;
-    return Object.assign(Object.assign(Object.assign({}, metadata), global), { roleId: global.roleId || BUILTIN_ROLE_IDS.PUBLIC, tableId: InternalTables.USER_METADATA, 
-        // make sure the ID is always a local ID, not a global one
-        _id: userId });
-});
-exports.publicApiUserFix = ctx => {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.publicApiUserFix = exports.getFullUser = void 0;
+const utils_1 = require("../db/utils");
+const global_1 = require("./global");
+const backend_core_1 = require("@budibase/backend-core");
+function getFullUser(ctx, userId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const global = yield (0, global_1.getGlobalUser)(userId);
+        let metadata = {};
+        // always prefer the user metadata _id and _rev
+        delete global._id;
+        delete global._rev;
+        try {
+            // this will throw an error if the db doesn't exist, or there is no appId
+            const db = backend_core_1.context.getAppDB();
+            metadata = yield db.get(userId);
+        }
+        catch (err) {
+            // it is fine if there is no user metadata yet
+        }
+        delete metadata.csrfToken;
+        return Object.assign(Object.assign(Object.assign({}, metadata), global), { roleId: global.roleId || backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC, tableId: utils_1.InternalTables.USER_METADATA, 
+            // make sure the ID is always a local ID, not a global one
+            _id: userId });
+    });
+}
+exports.getFullUser = getFullUser;
+function publicApiUserFix(ctx) {
     if (!ctx.request.body) {
         return ctx;
     }
@@ -45,10 +48,10 @@ exports.publicApiUserFix = ctx => {
     else {
         const newRoles = {};
         for (let [appId, role] of Object.entries(ctx.request.body.roles)) {
-            // @ts-ignore
-            newRoles[getProdAppID(appId)] = role;
+            newRoles[backend_core_1.db.getProdAppID(appId)] = role;
         }
         ctx.request.body.roles = newRoles;
     }
     return ctx;
-};
+}
+exports.publicApiUserFix = publicApiUserFix;

package/dist/utilities/workerRequests.js

@@ -8,21 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const fetch = require("node-fetch");
-const env = require("../environment");
-const { checkSlashesInUrl } = require("./index");
-const { getProdAppID } = require("@budibase/backend-core/db");
-const { updateAppRole } = require("./global");
-const { Header } = require("@budibase/backend-core/constants");
-const { getTenantId, isTenantIdSet } = require("@budibase/backend-core/tenancy");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateApiKey = exports.getChecklist = exports.createAdminUser = exports.readGlobalUser = exports.deleteGlobalUser = exports.saveGlobalUser = exports.allGlobalUsers = exports.removeAppFromUserRoles = exports.getGlobalSelf = exports.sendSmtpEmail = exports.request = void 0;
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const environment_1 = __importDefault(require("../environment"));
+const index_1 = require("./index");
+const backend_core_1 = require("@budibase/backend-core");
+const global_1 = require("./global");
 function request(ctx, request) {
     if (!request.headers) {
         request.headers = {};
     }
     if (!ctx) {
-        request.headers[Header.API_KEY] = env.INTERNAL_API_KEY;
-        if (isTenantIdSet()) {
-            request.headers[Header.TENANT_ID] = getTenantId();
+        request.headers[backend_core_1.constants.Header.API_KEY] = environment_1.default.INTERNAL_API_KEY;
+        if (backend_core_1.tenancy.isTenantIdSet()) {
+            request.headers[backend_core_1.constants.Header.TENANT_ID] = backend_core_1.tenancy.getTenantId();
         }
     }
     if (request.body && Object.keys(request.body).length > 0) {
@@ -40,6 +43,7 @@ function request(ctx, request) {
     }
     return request;
 }
+exports.request = request;
 function checkResponse(response, errorMsg, { ctx } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         if (response.status !== 200) {
@@ -61,76 +65,105 @@ function checkResponse(response, errorMsg, { ctx } = {}) {
         return response.json();
     });
 }
-exports.request = request;
 // have to pass in the tenant ID as this could be coming from an automation
-exports.sendSmtpEmail = (to, from, subject, contents, cc, bcc, automation) => __awaiter(void 0, void 0, void 0, function* () {
-    // tenant ID will be set in header
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/email/send`), request(null, {
-        method: "POST",
-        body: {
-            email: to,
-            from,
-            contents,
-            subject,
-            cc,
-            bcc,
-            purpose: "custom",
-            automation,
-        },
-    }));
-    return checkResponse(response, "send email");
-});
-exports.getGlobalSelf = (ctx, appId = null) => __awaiter(void 0, void 0, void 0, function* () {
-    const endpoint = `/api/global/self`;
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + endpoint), 
-    // we don't want to use API key when getting self
-    request(ctx, { method: "GET" }));
-    let json = yield checkResponse(response, "get self globally", { ctx });
-    if (appId) {
-        json = updateAppRole(json);
-    }
-    return json;
-});
-exports.removeAppFromUserRoles = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const prodAppId = getProdAppID(appId);
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/roles/${prodAppId}`), request(ctx, {
-        method: "DELETE",
-    }));
-    return checkResponse(response, "remove app role");
-});
-exports.allGlobalUsers = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/users"), 
-    // we don't want to use API key when getting self
-    request(ctx, { method: "GET" }));
-    return checkResponse(response, "get users", { ctx });
-});
-exports.saveGlobalUser = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/users"), 
-    // we don't want to use API key when getting self
-    request(ctx, { method: "POST", body: ctx.request.body }));
-    return checkResponse(response, "save user", { ctx });
-});
-exports.deleteGlobalUser = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
-    // we don't want to use API key when getting self
-    request(ctx, { method: "DELETE" }));
-    return checkResponse(response, "delete user", { ctx, body: ctx.request.body });
-});
-exports.readGlobalUser = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
-    // we don't want to use API key when getting self
-    request(ctx, { method: "GET" }));
-    return checkResponse(response, "get user", { ctx });
-});
-exports.createAdminUser = (email, password, tenantId) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/users/init"), request(null, { method: "POST", body: { email, password, tenantId } }));
-    return checkResponse(response, "create admin user");
-});
-exports.getChecklist = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/configs/checklist"), request(null, { method: "GET" }));
-    return checkResponse(response, "get checklist");
-});
-exports.generateApiKey = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/self/api_key"), request(null, { method: "POST", body: { userId } }));
-    return checkResponse(response, "generate API key");
-});
+function sendSmtpEmail(to, from, subject, contents, cc, bcc, automation) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // tenant ID will be set in header
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/email/send`), request(undefined, {
+            method: "POST",
+            body: {
+                email: to,
+                from,
+                contents,
+                subject,
+                cc,
+                bcc,
+                purpose: "custom",
+                automation,
+            },
+        }));
+        return checkResponse(response, "send email");
+    });
+}
+exports.sendSmtpEmail = sendSmtpEmail;
+function getGlobalSelf(ctx, appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const endpoint = `/api/global/self`;
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + endpoint), 
+        // we don't want to use API key when getting self
+        request(ctx, { method: "GET" }));
+        let json = yield checkResponse(response, "get self globally", { ctx });
+        if (appId) {
+            json = (0, global_1.updateAppRole)(json);
+        }
+        return json;
+    });
+}
+exports.getGlobalSelf = getGlobalSelf;
+function removeAppFromUserRoles(ctx, appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prodAppId = backend_core_1.db.getProdAppID(appId);
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/roles/${prodAppId}`), request(ctx, {
+            method: "DELETE",
+        }));
+        return checkResponse(response, "remove app role");
+    });
+}
+exports.removeAppFromUserRoles = removeAppFromUserRoles;
+function allGlobalUsers(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/users"), 
+        // we don't want to use API key when getting self
+        request(ctx, { method: "GET" }));
+        return checkResponse(response, "get users", { ctx });
+    });
+}
+exports.allGlobalUsers = allGlobalUsers;
+function saveGlobalUser(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/users"), 
+        // we don't want to use API key when getting self
+        request(ctx, { method: "POST", body: ctx.request.body }));
+        return checkResponse(response, "save user", { ctx });
+    });
+}
+exports.saveGlobalUser = saveGlobalUser;
+function deleteGlobalUser(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
+        // we don't want to use API key when getting self
+        request(ctx, { method: "DELETE" }));
+        return checkResponse(response, "delete user", { ctx });
+    });
+}
+exports.deleteGlobalUser = deleteGlobalUser;
+function readGlobalUser(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + `/api/global/users/${ctx.params.userId}`), 
+        // we don't want to use API key when getting self
+        request(ctx, { method: "GET" }));
+        return checkResponse(response, "get user", { ctx });
+    });
+}
+exports.readGlobalUser = readGlobalUser;
+function createAdminUser(email, password, tenantId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/users/init"), request(undefined, { method: "POST", body: { email, password, tenantId } }));
+        return checkResponse(response, "create admin user");
+    });
+}
+exports.createAdminUser = createAdminUser;
+function getChecklist() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/configs/checklist"), request(undefined, { method: "GET" }));
+        return checkResponse(response, "get checklist");
+    });
+}
+exports.getChecklist = getChecklist;
+function generateApiKey(userId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const response = yield (0, node_fetch_1.default)((0, index_1.checkSlashesInUrl)(environment_1.default.WORKER_URL + "/api/global/self/api_key"), request(undefined, { method: "POST", body: { userId } }));
+        return checkResponse(response, "generate API key");
+    });
+}
+exports.generateApiKey = generateApiKey;

package/dist/watch.js

@@ -41,7 +41,6 @@ const env = __importStar(require("./environment"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
-const constants_1 = require("@budibase/backend-core/constants");
 const plugin_1 = require("./api/controllers/plugin");
 function watch() {
     const watchPath = path_1.default.join(env.PLUGINS_DIR, "./**/*.tar.gz");
@@ -60,7 +59,7 @@ function watch() {
         if (!(path === null || path === void 0 ? void 0 : path.endsWith(".tar.gz")) || !fs_1.default.existsSync(path)) {
             return;
         }
-        yield backend_core_1.tenancy.doInTenant(constants_1.DEFAULT_TENANT_ID, () => __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.tenancy.doInTenant(backend_core_1.constants.DEFAULT_TENANT_ID, () => __awaiter(this, void 0, void 0, function* () {
             try {
                 const split = path.split("/");
                 const name = split[split.length - 1];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.1.32-alpha.4",
+  "version": "2.1.32-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.32-alpha.4",
-    "@budibase/client": "2.1.32-alpha.4",
-    "@budibase/pro": "2.1.32-alpha.3",
-    "@budibase/string-templates": "2.1.32-alpha.4",
-    "@budibase/types": "2.1.32-alpha.4",
+    "@budibase/backend-core": "2.1.32-alpha.6",
+    "@budibase/client": "2.1.32-alpha.6",
+    "@budibase/pro": "2.1.32-alpha.5",
+    "@budibase/string-templates": "2.1.32-alpha.6",
+    "@budibase/types": "2.1.32-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": "e8ebef0a915f25d6e9908a38c2b141196d53613f"
+  "gitHead": "7d4f4bba2d41e5821c5234d0dc536872a5b3e242"
 }

package/scripts/exportAppTemplate.js

@@ -3,7 +3,7 @@ const yargs = require("yargs")
 const fs = require("fs")
 const { join } = require("path")
 require("../src/db").init()
-const { doWithDB } = require("@budibase/backend-core/db")
+const { db: dbCore } = require("@budibase/backend-core")
 // load environment
 const env = require("../src/environment")
 const {
@@ -48,7 +48,7 @@ yargs
       const writeStream = fs.createWriteStream(join(exportPath, "dump.text"))
       // perform couch dump
 
-      await doWithDB(appId, async db => {
+      await dbCore.doWithDB(appId, async db => {
         return db.dump(writeStream, {
           filter: doc =>
             !(