@budibase/server 2.1.32-alpha.7 → 2.1.32

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

@@ -14,9 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
 const Deployment_1 = __importDefault(require("./Deployment"));
-const backend_core_1 = require("@budibase/backend-core");
+const db_1 = require("@budibase/backend-core/db");
 const utils_1 = require("../../../db/utils");
 const utils_2 = require("../../../automations/utils");
+const cache_1 = require("@budibase/backend-core/cache");
+const context_1 = require("@budibase/backend-core/context");
+const backend_core_1 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 // the max time we can wait for an invalidation to complete before considering it failed
@@ -46,7 +49,7 @@ function checkAllDeployments(deployments) {
 function storeDeploymentHistory(deployment) {
     return __awaiter(this, void 0, void 0, function* () {
         const deploymentJSON = deployment.getJSON();
-        const db = backend_core_1.context.getAppDB();
+        const db = (0, context_1.getAppDB)();
         let deploymentDoc;
         try {
             // theres only one deployment doc per app database
@@ -67,7 +70,7 @@ function storeDeploymentHistory(deployment) {
 }
 function initDeployedApp(prodAppId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getProdAppDB();
+        const db = (0, context_1.getProdAppDB)();
         console.log("Reading automation docs");
         const automations = (yield db.allDocs((0, utils_1.getAutomationParams)(null, {
             include_docs: true,
@@ -90,9 +93,9 @@ function deployApp(deployment, userId) {
     return __awaiter(this, void 0, void 0, function* () {
         let replication;
         try {
-            const appId = backend_core_1.context.getAppId();
-            const devAppId = backend_core_1.db.getDevelopmentAppID(appId);
-            const productionAppId = backend_core_1.db.getProdAppID(appId);
+            const appId = (0, context_1.getAppId)();
+            const devAppId = (0, db_1.getDevelopmentAppID)(appId);
+            const productionAppId = (0, db_1.getProdAppID)(appId);
             // don't try this if feature isn't allowed, will error
             if (yield pro_1.backups.isEnabled()) {
                 // trigger backup initially
@@ -104,8 +107,8 @@ function deployApp(deployment, userId) {
                 source: devAppId,
                 target: productionAppId,
             };
-            replication = new backend_core_1.db.Replication(config);
-            const devDb = backend_core_1.context.getDevAppDB();
+            replication = new db_1.Replication(config);
+            const devDb = (0, context_1.getDevAppDB)();
             console.log("Compacting development DB");
             yield devDb.compact();
             console.log("Replication object created");
@@ -113,7 +116,7 @@ function deployApp(deployment, userId) {
             console.log("replication complete.. replacing app meta doc");
             // app metadata is excluded as it is likely to be in conflict
             // replicate the app metadata document manually
-            const db = backend_core_1.context.getProdAppDB();
+            const db = (0, context_1.getProdAppDB)();
             const appDoc = yield devDb.get(utils_1.DocumentType.APP_METADATA);
             try {
                 const prodAppDoc = yield db.get(utils_1.DocumentType.APP_METADATA);
@@ -129,7 +132,7 @@ function deployApp(deployment, userId) {
             // remove automation errors if they exist
             delete appDoc.automationErrors;
             yield db.put(appDoc);
-            yield backend_core_1.cache.app.invalidateAppMetadata(productionAppId);
+            yield cache_1.app.invalidateAppMetadata(productionAppId);
             console.log("New app doc written successfully.");
             yield initDeployedApp(productionAppId);
             console.log("Deployed app initialised, setting deployment to successful");
@@ -152,7 +155,7 @@ function deployApp(deployment, userId) {
 function fetchDeployments(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = backend_core_1.context.getAppDB();
+            const db = (0, context_1.getAppDB)();
             const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
             const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
             if (updated) {
@@ -169,7 +172,7 @@ exports.fetchDeployments = fetchDeployments;
 function deploymentProgress(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = backend_core_1.context.getAppDB();
+            const db = (0, context_1.getAppDB)();
             const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
             ctx.body = deploymentDoc[ctx.params.deploymentId];
         }
@@ -181,7 +184,7 @@ function deploymentProgress(ctx) {
 exports.deploymentProgress = deploymentProgress;
 const isFirstDeploy = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const db = backend_core_1.context.getProdAppDB();
+        const db = (0, context_1.getProdAppDB)();
         yield db.get(utils_1.DocumentType.APP_METADATA);
     }
     catch (e) {

package/dist/api/controllers/dev.js

@@ -8,27 +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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBudibaseVersion = exports.revert = exports.clearLock = exports.buildRedirectDelete = exports.buildRedirectPost = exports.buildRedirectGet = void 0;
-const node_fetch_1 = __importDefault(require("node-fetch"));
-const environment_1 = __importDefault(require("../../environment"));
-const utilities_1 = require("../../utilities");
-const workerRequests_1 = require("../../utilities/workerRequests");
-const redis_1 = require("../../utilities/redis");
-const utils_1 = require("../../db/utils");
-const backend_core_1 = require("@budibase/backend-core");
-const backend_core_2 = require("@budibase/backend-core");
+const fetch = require("node-fetch");
+const env = require("../../environment");
+const { checkSlashesInUrl } = require("../../utilities");
+const { request } = require("../../utilities/workerRequests");
+const { clearLock } = require("../../utilities/redis");
+const { Replication, getProdAppID } = require("@budibase/backend-core/db");
+const { DocumentType } = require("../../db/utils");
+const { app: appCache } = require("@budibase/backend-core/cache");
+const { getProdAppDB, getAppDB } = require("@budibase/backend-core/context");
+const { events } = require("@budibase/backend-core");
 function redirect(ctx, method, path = "global") {
     return __awaiter(this, void 0, void 0, function* () {
         const { devPath } = ctx.params;
         const queryString = ctx.originalUrl.split("?")[1] || "";
-        const response = yield (0, node_fetch_1.default)((0, utilities_1.checkSlashesInUrl)(`${environment_1.default.WORKER_URL}/api/${path}/${devPath}?${queryString}`), (0, workerRequests_1.request)(ctx, {
+        const response = yield fetch(checkSlashesInUrl(`${env.WORKER_URL}/api/${path}/${devPath}?${queryString}`), request(ctx, {
             method,
             body: ctx.request.body,
-        }));
+        }, true));
         if (response.status !== 200) {
             const err = yield response.text();
             ctx.throw(400, err);
@@ -51,96 +48,84 @@ function redirect(ctx, method, path = "global") {
         ctx.cookies;
     });
 }
-function buildRedirectGet(path) {
-    return (ctx) => __awaiter(this, void 0, void 0, function* () {
+exports.buildRedirectGet = path => {
+    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         yield redirect(ctx, "GET", path);
     });
-}
-exports.buildRedirectGet = buildRedirectGet;
-function buildRedirectPost(path) {
-    return (ctx) => __awaiter(this, void 0, void 0, function* () {
+};
+exports.buildRedirectPost = path => {
+    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         yield redirect(ctx, "POST", path);
     });
-}
-exports.buildRedirectPost = buildRedirectPost;
-function buildRedirectDelete(path) {
-    return (ctx) => __awaiter(this, void 0, void 0, function* () {
+};
+exports.buildRedirectDelete = path => {
+    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         yield redirect(ctx, "DELETE", path);
     });
-}
-exports.buildRedirectDelete = buildRedirectDelete;
-function clearLock(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { appId } = ctx.params;
-        try {
-            yield (0, redis_1.clearLock)(appId, ctx.user);
+};
+exports.clearLock = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const { appId } = ctx.params;
+    try {
+        yield clearLock(appId, ctx.user);
+    }
+    catch (err) {
+        ctx.throw(400, `Unable to remove lock. ${err}`);
+    }
+    ctx.body = {
+        message: "Lock released successfully.",
+    };
+});
+exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const { appId } = ctx.params;
+    const productionAppId = getProdAppID(appId);
+    // App must have been deployed first
+    try {
+        const db = getProdAppDB({ skip_setup: true });
+        const info = yield db.info();
+        if (info.error) {
+            throw info.error;
         }
-        catch (err) {
-            ctx.throw(400, `Unable to remove lock. ${err}`);
+        const deploymentDoc = yield db.get(DocumentType.DEPLOYMENTS);
+        if (!deploymentDoc.history ||
+            Object.keys(deploymentDoc.history).length === 0) {
+            throw new Error("No deployments for app");
         }
-        ctx.body = {
-            message: "Lock released successfully.",
-        };
+    }
+    catch (err) {
+        return ctx.throw(400, "App has not yet been deployed");
+    }
+    const replication = new Replication({
+        source: productionAppId,
+        target: appId,
     });
-}
-exports.clearLock = clearLock;
-function revert(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { appId } = ctx.params;
-        const productionAppId = backend_core_2.db.getProdAppID(appId);
-        // App must have been deployed first
-        try {
-            const db = backend_core_1.context.getProdAppDB({ skip_setup: true });
-            const exists = yield db.exists();
-            if (!exists) {
-                throw new Error("App must be deployed to be reverted.");
-            }
-            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
-            if (!deploymentDoc.history ||
-                Object.keys(deploymentDoc.history).length === 0) {
-                throw new Error("No deployments for app");
-            }
-        }
-        catch (err) {
-            return ctx.throw(400, "App has not yet been deployed");
-        }
-        const replication = new backend_core_2.db.Replication({
-            source: productionAppId,
-            target: appId,
-        });
-        try {
-            if (environment_1.default.COUCH_DB_URL) {
-                // in-memory db stalls on rollback
-                yield replication.rollback();
-            }
-            // update appID in reverted app to be dev version again
-            const db = backend_core_1.context.getAppDB();
-            const appDoc = yield db.get(utils_1.DocumentType.APP_METADATA);
-            appDoc.appId = appId;
-            appDoc.instance._id = appId;
-            yield db.put(appDoc);
-            yield backend_core_2.cache.app.invalidateAppMetadata(appId);
-            ctx.body = {
-                message: "Reverted changes successfully.",
-            };
-            yield backend_core_2.events.app.reverted(appDoc);
-        }
-        catch (err) {
-            ctx.throw(400, `Unable to revert. ${err}`);
+    try {
+        if (env.COUCH_DB_URL) {
+            // in-memory db stalls on rollback
+            yield replication.rollback();
         }
-        finally {
-            yield replication.close();
-        }
-    });
-}
-exports.revert = revert;
-function getBudibaseVersion(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const version = require("../../../package.json").version;
+        // update appID in reverted app to be dev version again
+        const db = getAppDB();
+        const appDoc = yield db.get(DocumentType.APP_METADATA);
+        appDoc.appId = appId;
+        appDoc.instance._id = appId;
+        yield db.put(appDoc);
+        yield appCache.invalidateAppMetadata(appId);
         ctx.body = {
-            version,
+            message: "Reverted changes successfully.",
         };
-        yield backend_core_2.events.installation.versionChecked(version);
-    });
-}
-exports.getBudibaseVersion = getBudibaseVersion;
+        yield events.app.reverted(appDoc);
+    }
+    catch (err) {
+        ctx.throw(400, `Unable to revert. ${err}`);
+    }
+    finally {
+        yield replication.close();
+    }
+});
+exports.getBudibaseVersion = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const version = require("../../../package.json").version;
+    ctx.body = {
+        version,
+    };
+    yield events.installation.versionChecked(version);
+});

package/dist/api/controllers/layout.js

@@ -8,42 +8,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroy = exports.save = void 0;
-const layouts_1 = require("../../constants/layouts");
-const utils_1 = require("../../db/utils");
-const backend_core_1 = require("@budibase/backend-core");
-function save(ctx) {
+const { EMPTY_LAYOUT } = require("../../constants/layouts");
+const { generateLayoutID, getScreenParams } = require("../../db/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
+const { events } = require("@budibase/backend-core");
+exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         let layout = ctx.request.body;
         if (!layout.props) {
-            layout = Object.assign(Object.assign({}, layouts_1.EMPTY_LAYOUT), layout);
+            layout = Object.assign(Object.assign({}, EMPTY_LAYOUT), layout);
             layout.props._instanceName = layout.name;
         }
-        layout._id = layout._id || (0, utils_1.generateLayoutID)();
+        layout._id = layout._id || generateLayoutID();
         const response = yield db.put(layout);
-        yield backend_core_1.events.layout.created(layout);
+        yield events.layout.created(layout);
         layout._rev = response.rev;
         ctx.body = layout;
         ctx.status = 200;
     });
-}
-exports.save = save;
-function destroy(ctx) {
+};
+exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const layoutId = ctx.params.layoutId, layoutRev = ctx.params.layoutRev;
-        const layoutsUsedByScreens = (yield db.allDocs((0, utils_1.getScreenParams)(null, {
+        const layoutsUsedByScreens = (yield db.allDocs(getScreenParams(null, {
             include_docs: true,
         }))).rows.map(element => element.doc.layoutId);
         if (layoutsUsedByScreens.includes(layoutId)) {
             ctx.throw(400, "Cannot delete a layout that's being used by a screen");
         }
         yield db.remove(layoutId, layoutRev);
-        yield backend_core_1.events.layout.deleted(layoutId);
+        yield events.layout.deleted(layoutId);
         ctx.body = { message: "Layout deleted successfully" };
         ctx.status = 200;
     });
-}
-exports.destroy = destroy;
+};

package/dist/api/controllers/metadata.js

@@ -8,56 +8,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMetadata = exports.deleteMetadata = exports.saveMetadata = exports.getTypes = void 0;
-const constants_1 = require("../../constants");
-const utils_1 = require("../../db/utils");
-const utilities_1 = require("../../utilities");
-const backend_core_1 = require("@budibase/backend-core");
-function getTypes(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = {
-            types: constants_1.MetadataTypes,
-        };
-    });
-}
-exports.getTypes = getTypes;
-function saveMetadata(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { type, entityId } = ctx.params;
-        if (type === constants_1.MetadataTypes.AUTOMATION_TEST_HISTORY) {
-            ctx.throw(400, "Cannot save automation history type");
+const { MetadataTypes } = require("../../constants");
+const { generateMetadataID } = require("../../db/utils");
+const { saveEntityMetadata, deleteEntityMetadata } = require("../../utilities");
+const { getAppDB } = require("@budibase/backend-core/context");
+exports.getTypes = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    ctx.body = {
+        types: MetadataTypes,
+    };
+});
+exports.saveMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const { type, entityId } = ctx.params;
+    if (type === MetadataTypes.AUTOMATION_TEST_HISTORY) {
+        ctx.throw(400, "Cannot save automation history type");
+    }
+    ctx.body = yield saveEntityMetadata(type, entityId, ctx.request.body);
+});
+exports.deleteMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const { type, entityId } = ctx.params;
+    yield deleteEntityMetadata(type, entityId);
+    ctx.body = {
+        message: "Metadata deleted successfully",
+    };
+});
+exports.getMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const { type, entityId } = ctx.params;
+    const db = getAppDB();
+    const id = generateMetadataID(type, entityId);
+    try {
+        ctx.body = yield db.get(id);
+    }
+    catch (err) {
+        if (err.status === 404) {
+            ctx.body = {};
         }
-        ctx.body = yield (0, utilities_1.saveEntityMetadata)(type, entityId, ctx.request.body);
-    });
-}
-exports.saveMetadata = saveMetadata;
-function deleteMetadata(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { type, entityId } = ctx.params;
-        yield (0, utilities_1.deleteEntityMetadata)(type, entityId);
-        ctx.body = {
-            message: "Metadata deleted successfully",
-        };
-    });
-}
-exports.deleteMetadata = deleteMetadata;
-function getMetadata(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { type, entityId } = ctx.params;
-        const db = backend_core_1.context.getAppDB();
-        const id = (0, utils_1.generateMetadataID)(type, entityId);
-        try {
-            ctx.body = yield db.get(id);
+        else {
+            ctx.throw(err.status, err);
         }
-        catch (err) {
-            if (err.status === 404) {
-                ctx.body = {};
-            }
-            else {
-                ctx.throw(err.status, err);
-            }
-        }
-    });
-}
-exports.getMetadata = getMetadata;
+    }
+});

package/dist/api/controllers/permission.js

@@ -8,38 +8,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removePermission = exports.addPermission = exports.getResourcePerms = exports.fetch = exports.fetchLevels = exports.fetchBuiltin = void 0;
-const backend_core_1 = require("@budibase/backend-core");
-const utils_1 = require("../../db/utils");
-const security_1 = require("../../utilities/security");
-const utilities_1 = require("../../utilities");
+const { getBuiltinPermissions } = require("@budibase/backend-core/permissions");
+const { isBuiltin, getDBRoleID, getExternalRoleID, getBuiltinRoles, checkForRoleResourceArray, } = require("@budibase/backend-core/roles");
+const { getRoleParams } = require("../../db/utils");
+const { CURRENTLY_SUPPORTED_LEVELS, getBasePermissions, } = require("../../utilities/security");
+const { removeFromArray } = require("../../utilities");
+const { getAppDB } = require("@budibase/backend-core/context");
 const PermissionUpdateType = {
     REMOVE: "remove",
     ADD: "add",
 };
-const SUPPORTED_LEVELS = security_1.CURRENTLY_SUPPORTED_LEVELS;
+const SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS;
 // utility function to stop this repetition - permissions always stored under roles
 function getAllDBRoles(db) {
     return __awaiter(this, void 0, void 0, function* () {
-        const body = yield db.allDocs((0, utils_1.getRoleParams)(null, {
+        const body = yield db.allDocs(getRoleParams(null, {
             include_docs: true,
         }));
         return body.rows.map(row => row.doc);
     });
 }
-function updatePermissionOnRole(appId, { roleId, resourceId, level, }, updateType) {
+function updatePermissionOnRole(appId, { roleId, resourceId, level }, updateType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const remove = updateType === PermissionUpdateType.REMOVE;
-        const isABuiltin = backend_core_1.roles.isBuiltin(roleId);
-        const dbRoleId = backend_core_1.roles.getDBRoleID(roleId);
+        const isABuiltin = isBuiltin(roleId);
+        const dbRoleId = getDBRoleID(roleId);
         const dbRoles = yield getAllDBRoles(db);
         const docUpdates = [];
         // the permission is for a built in, make sure it exists
         if (isABuiltin && !dbRoles.some(role => role._id === dbRoleId)) {
-            const builtin = backend_core_1.roles.getBuiltinRoles()[roleId];
-            builtin._id = backend_core_1.roles.getDBRoleID(builtin._id);
+            const builtin = getBuiltinRoles()[roleId];
+            builtin._id = getDBRoleID(builtin._id);
             dbRoles.push(builtin);
         }
         // now try to find any roles which need updated, e.g. removing the
@@ -61,7 +61,7 @@ function updatePermissionOnRole(appId, { roleId, resourceId, level, }, updateTyp
             // the general UI for this, rather than needing to show everywhere it is used)
             if ((role._id !== dbRoleId || remove) &&
                 rolePermissions[resourceId].indexOf(level) !== -1) {
-                (0, utilities_1.removeFromArray)(rolePermissions[resourceId], level);
+                removeFromArray(rolePermissions[resourceId], level);
                 updated = true;
             }
             // handle the adding, we're on the correct role, at it to this
@@ -77,38 +77,33 @@ function updatePermissionOnRole(appId, { roleId, resourceId, level, }, updateTyp
             }
         }
         const response = yield db.bulkDocs(docUpdates);
-        return response.map((resp) => {
-            resp._id = backend_core_1.roles.getExternalRoleID(resp.id);
+        return response.map(resp => {
+            resp._id = getExternalRoleID(resp.id);
             delete resp.id;
             return resp;
         });
     });
 }
-function fetchBuiltin(ctx) {
-    ctx.body = Object.values(backend_core_1.permissions.getBuiltinPermissions());
-}
-exports.fetchBuiltin = fetchBuiltin;
-function fetchLevels(ctx) {
+exports.fetchBuiltin = function (ctx) {
+    ctx.body = Object.values(getBuiltinPermissions());
+};
+exports.fetchLevels = function (ctx) {
     // for now only provide the read/write perms externally
     ctx.body = SUPPORTED_LEVELS;
-}
-exports.fetchLevels = fetchLevels;
-function fetch(ctx) {
+};
+exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const dbRoles = yield getAllDBRoles(db);
+        const db = getAppDB();
+        const roles = yield getAllDBRoles(db);
         let permissions = {};
         // create an object with structure role ID -> resource ID -> level
-        for (let role of dbRoles) {
+        for (let role of roles) {
             if (!role.permissions) {
                 continue;
             }
-            const roleId = backend_core_1.roles.getExternalRoleID(role._id);
-            if (!roleId) {
-                ctx.throw(400, "Unable to retrieve role");
-            }
+            const roleId = getExternalRoleID(role._id);
             for (let [resource, levelArr] of Object.entries(role.permissions)) {
-                const levels = Array.isArray(levelArr) ? levelArr : [levelArr];
+                const levels = Array.isArray(levelArr) ? [levelArr] : levelArr;
                 const perms = {};
                 levels.forEach(level => (perms[level] = roleId));
                 permissions[resource] = perms;
@@ -117,46 +112,42 @@ function fetch(ctx) {
         // apply the base permissions
         const finalPermissions = {};
         for (let [resource, permission] of Object.entries(permissions)) {
-            const basePerms = (0, security_1.getBasePermissions)(resource);
+            const basePerms = getBasePermissions(resource);
             finalPermissions[resource] = Object.assign(basePerms, permission);
         }
         ctx.body = finalPermissions;
     });
-}
-exports.fetch = fetch;
-function getResourcePerms(ctx) {
+};
+exports.getResourcePerms = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const resourceId = ctx.params.resourceId;
-        const db = backend_core_1.context.getAppDB();
-        const body = yield db.allDocs((0, utils_1.getRoleParams)(null, {
+        const db = getAppDB();
+        const body = yield db.allDocs(getRoleParams(null, {
             include_docs: true,
         }));
-        const rolesList = body.rows.map(row => row.doc);
+        const roles = body.rows.map(row => row.doc);
         let permissions = {};
         for (let level of SUPPORTED_LEVELS) {
             // update the various roleIds in the resource permissions
-            for (let role of rolesList) {
-                const rolePerms = backend_core_1.roles.checkForRoleResourceArray(role.permissions, resourceId);
+            for (let role of roles) {
+                const rolePerms = checkForRoleResourceArray(role.permissions, resourceId);
                 if (rolePerms &&
                     rolePerms[resourceId] &&
                     rolePerms[resourceId].indexOf(level) !== -1) {
-                    permissions[level] = backend_core_1.roles.getExternalRoleID(role._id);
+                    permissions[level] = getExternalRoleID(role._id);
                 }
             }
         }
-        ctx.body = Object.assign((0, security_1.getBasePermissions)(resourceId), permissions);
+        ctx.body = Object.assign(getBasePermissions(resourceId), permissions);
     });
-}
-exports.getResourcePerms = getResourcePerms;
-function addPermission(ctx) {
+};
+exports.addPermission = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.body = yield updatePermissionOnRole(ctx.appId, ctx.params, PermissionUpdateType.ADD);
     });
-}
-exports.addPermission = addPermission;
-function removePermission(ctx) {
+};
+exports.removePermission = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.body = yield updatePermissionOnRole(ctx.appId, ctx.params, PermissionUpdateType.REMOVE);
     });
-}
-exports.removePermission = removePermission;
+};