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

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());
     });
 };
-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");
+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 PermissionUpdateType = {
     REMOVE: "remove",
     ADD: "add",
 };
-const SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS;
+const SUPPORTED_LEVELS = security_1.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(getRoleParams(null, {
+        const body = yield db.allDocs((0, utils_1.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 = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         const remove = updateType === PermissionUpdateType.REMOVE;
-        const isABuiltin = isBuiltin(roleId);
-        const dbRoleId = getDBRoleID(roleId);
+        const isABuiltin = backend_core_1.roles.isBuiltin(roleId);
+        const dbRoleId = backend_core_1.roles.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 = getBuiltinRoles()[roleId];
-            builtin._id = getDBRoleID(builtin._id);
+            const builtin = backend_core_1.roles.getBuiltinRoles()[roleId];
+            builtin._id = backend_core_1.roles.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 }, updateType
             // the general UI for this, rather than needing to show everywhere it is used)
             if ((role._id !== dbRoleId || remove) &&
                 rolePermissions[resourceId].indexOf(level) !== -1) {
-                removeFromArray(rolePermissions[resourceId], level);
+                (0, utilities_1.removeFromArray)(rolePermissions[resourceId], level);
                 updated = true;
             }
             // handle the adding, we're on the correct role, at it to this
@@ -77,33 +77,38 @@ function updatePermissionOnRole(appId, { roleId, resourceId, level }, updateType
             }
         }
         const response = yield db.bulkDocs(docUpdates);
-        return response.map(resp => {
-            resp._id = getExternalRoleID(resp.id);
+        return response.map((resp) => {
+            resp._id = backend_core_1.roles.getExternalRoleID(resp.id);
             delete resp.id;
             return resp;
         });
     });
 }
-exports.fetchBuiltin = function (ctx) {
-    ctx.body = Object.values(getBuiltinPermissions());
-};
-exports.fetchLevels = function (ctx) {
+function fetchBuiltin(ctx) {
+    ctx.body = Object.values(backend_core_1.permissions.getBuiltinPermissions());
+}
+exports.fetchBuiltin = fetchBuiltin;
+function fetchLevels(ctx) {
     // for now only provide the read/write perms externally
     ctx.body = SUPPORTED_LEVELS;
-};
-exports.fetch = function (ctx) {
+}
+exports.fetchLevels = fetchLevels;
+function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        const roles = yield getAllDBRoles(db);
+        const db = backend_core_1.context.getAppDB();
+        const dbRoles = yield getAllDBRoles(db);
         let permissions = {};
         // create an object with structure role ID -> resource ID -> level
-        for (let role of roles) {
+        for (let role of dbRoles) {
             if (!role.permissions) {
                 continue;
             }
-            const roleId = getExternalRoleID(role._id);
+            const roleId = backend_core_1.roles.getExternalRoleID(role._id);
+            if (!roleId) {
+                ctx.throw(400, "Unable to retrieve role");
+            }
             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;
@@ -112,42 +117,46 @@ exports.fetch = function (ctx) {
         // apply the base permissions
         const finalPermissions = {};
         for (let [resource, permission] of Object.entries(permissions)) {
-            const basePerms = getBasePermissions(resource);
+            const basePerms = (0, security_1.getBasePermissions)(resource);
             finalPermissions[resource] = Object.assign(basePerms, permission);
         }
         ctx.body = finalPermissions;
     });
-};
-exports.getResourcePerms = function (ctx) {
+}
+exports.fetch = fetch;
+function getResourcePerms(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const resourceId = ctx.params.resourceId;
-        const db = getAppDB();
-        const body = yield db.allDocs(getRoleParams(null, {
+        const db = backend_core_1.context.getAppDB();
+        const body = yield db.allDocs((0, utils_1.getRoleParams)(null, {
             include_docs: true,
         }));
-        const roles = body.rows.map(row => row.doc);
+        const rolesList = 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 roles) {
-                const rolePerms = checkForRoleResourceArray(role.permissions, resourceId);
+            for (let role of rolesList) {
+                const rolePerms = backend_core_1.roles.checkForRoleResourceArray(role.permissions, resourceId);
                 if (rolePerms &&
                     rolePerms[resourceId] &&
                     rolePerms[resourceId].indexOf(level) !== -1) {
-                    permissions[level] = getExternalRoleID(role._id);
+                    permissions[level] = backend_core_1.roles.getExternalRoleID(role._id);
                 }
             }
         }
-        ctx.body = Object.assign(getBasePermissions(resourceId), permissions);
+        ctx.body = Object.assign((0, security_1.getBasePermissions)(resourceId), permissions);
     });
-};
-exports.addPermission = function (ctx) {
+}
+exports.getResourcePerms = getResourcePerms;
+function addPermission(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.body = yield updatePermissionOnRole(ctx.appId, ctx.params, PermissionUpdateType.ADD);
     });
-};
-exports.removePermission = function (ctx) {
+}
+exports.addPermission = addPermission;
+function removePermission(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.body = yield updatePermissionOnRole(ctx.appId, ctx.params, PermissionUpdateType.REMOVE);
     });
-};
+}
+exports.removePermission = removePermission;

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

@@ -14,17 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processUploadedPlugin = exports.destroy = exports.fetch = exports.create = exports.upload = exports.getPlugins = void 0;
 const uploaders_1 = require("./uploaders");
-const tenancy_1 = require("@budibase/backend-core/tenancy");
-const plugins_1 = require("@budibase/backend-core/plugins");
+const backend_core_1 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
 const websocket_1 = require("../../../websocket");
-const backend_core_1 = require("@budibase/backend-core");
+const backend_core_2 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, tenancy_1.getGlobalDB)();
-        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
+        const db = backend_core_1.tenancy.getGlobalDB();
+        const response = yield db.allDocs(backend_core_2.db.getPluginParams(null, {
             include_docs: true,
         }));
         const plugins = response.rows.map((row) => row.doc);
@@ -88,7 +87,7 @@ function create(ctx) {
                     directory = directoryUrl;
                     break;
             }
-            (0, plugins_1.validate)(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
+            backend_core_1.plugins.validate(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
             // Only allow components in cloud
             if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
                 throw new Error("Only component plugins are supported outside of self-host");
@@ -131,7 +130,7 @@ function processUploadedPlugin(plugin, source) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const { metadata, directory } = yield (0, uploaders_1.fileUpload)(plugin);
-        (0, plugins_1.validate)(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
+        backend_core_1.plugins.validate(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
         // Only allow components in cloud
         if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
             throw new Error("Only component plugins are supported outside of self-host");

package/dist/api/controllers/public/tables.js

@@ -1,4 +1,27 @@
 "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) {
@@ -8,13 +31,10 @@ 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.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
 const utils_1 = require("./utils");
-const table_1 = __importDefault(require("../table"));
+const controller = __importStar(require("../table"));
 function fixTable(table, params) {
     if (!params || !table) {
         return table;
@@ -30,7 +50,7 @@ function fixTable(table, params) {
 function search(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
         const { name } = ctx.request.body;
-        yield table_1.default.fetch(ctx);
+        yield controller.fetch(ctx);
         ctx.body = (0, utils_1.search)(ctx.body, name);
         yield next();
     });
@@ -38,14 +58,14 @@ function search(ctx, next) {
 exports.search = search;
 function create(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield table_1.default.save(ctx);
+        yield controller.save(ctx);
         yield next();
     });
 }
 exports.create = create;
 function read(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield table_1.default.find(ctx);
+        yield controller.find(ctx);
         yield next();
     });
 }
@@ -53,14 +73,14 @@ exports.read = read;
 function update(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.request.body = yield (0, utils_1.addRev)(fixTable(ctx.request.body, ctx.params), ctx.params.tableId);
-        yield table_1.default.save(ctx);
+        yield controller.save(ctx);
         yield next();
     });
 }
 exports.update = update;
 function destroy(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield table_1.default.destroy(ctx);
+        yield controller.destroy(ctx);
         ctx.body = ctx.table;
         yield next();
     });

package/dist/api/controllers/query/import/index.js

@@ -16,7 +16,6 @@ const openapi2_1 = require("./sources/openapi2");
 const openapi3_1 = require("./sources/openapi3");
 const curl_1 = require("./sources/curl");
 // @ts-ignore
-const context_1 = require("@budibase/backend-core/context");
 const backend_core_1 = require("@budibase/backend-core");
 class RestImporter {
     constructor(data) {
@@ -51,7 +50,7 @@ class RestImporter {
                 return query;
             });
             // persist queries
-            const db = (0, context_1.getAppDB)();
+            const db = backend_core_1.context.getAppDB();
             const response = yield db.bulkDocs(queries);
             // create index to seperate queries and errors
             const queryIndex = queries.reduce((acc, query) => {

package/dist/api/controllers/query/validation.js

@@ -1,45 +1,53 @@
 "use strict";
-const { joiValidator } = require("@budibase/backend-core/auth");
-const Joi = require("joi");
-const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("");
-exports.queryValidation = () => {
-    return Joi.object({
-        _id: Joi.string(),
-        _rev: Joi.string(),
-        name: Joi.string().required(),
-        fields: Joi.object().required(),
-        datasourceId: Joi.string().required(),
-        readable: Joi.boolean(),
-        parameters: Joi.array().items(Joi.object({
-            name: Joi.string(),
-            default: Joi.string().allow(""),
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateQueryPreviewValidation = exports.generateQueryValidation = exports.queryValidation = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const joi_1 = __importDefault(require("joi"));
+const OPTIONAL_STRING = joi_1.default.string().optional().allow(null).allow("");
+function queryValidation() {
+    return joi_1.default.object({
+        _id: joi_1.default.string(),
+        _rev: joi_1.default.string(),
+        name: joi_1.default.string().required(),
+        fields: joi_1.default.object().required(),
+        datasourceId: joi_1.default.string().required(),
+        readable: joi_1.default.boolean(),
+        parameters: joi_1.default.array().items(joi_1.default.object({
+            name: joi_1.default.string(),
+            default: joi_1.default.string().allow(""),
         })),
-        queryVerb: Joi.string().allow().required(),
-        extra: Joi.object().optional(),
-        schema: Joi.object({}).required().unknown(true),
+        queryVerb: joi_1.default.string().allow().required(),
+        extra: joi_1.default.object().optional(),
+        schema: joi_1.default.object({}).required().unknown(true),
         transformer: OPTIONAL_STRING,
-        flags: Joi.object().optional(),
+        flags: joi_1.default.object().optional(),
     }).unknown(true);
-};
-exports.generateQueryValidation = () => {
+}
+exports.queryValidation = queryValidation;
+function generateQueryValidation() {
     // prettier-ignore
-    return joiValidator.body(exports.queryValidation());
-};
-exports.generateQueryPreviewValidation = () => {
+    return backend_core_1.auth.joiValidator.body(queryValidation());
+}
+exports.generateQueryValidation = generateQueryValidation;
+function generateQueryPreviewValidation() {
     // prettier-ignore
-    return joiValidator.body(Joi.object({
+    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
-        readable: Joi.boolean().optional(),
-        fields: Joi.object().required(),
-        queryVerb: Joi.string().required(),
+        readable: joi_1.default.boolean().optional(),
+        fields: joi_1.default.object().required(),
+        queryVerb: joi_1.default.string().required(),
         name: OPTIONAL_STRING,
-        flags: Joi.object().optional(),
-        schema: Joi.object().optional(),
-        extra: Joi.object().optional(),
-        datasourceId: Joi.string().required(),
+        flags: joi_1.default.object().optional(),
+        schema: joi_1.default.object().optional(),
+        extra: joi_1.default.object().optional(),
+        datasourceId: joi_1.default.string().required(),
         transformer: OPTIONAL_STRING,
-        parameters: Joi.object({}).required().unknown(true),
+        parameters: joi_1.default.object({}).required().unknown(true),
         queryId: OPTIONAL_STRING,
     }).unknown(true));
-};
+}
+exports.generateQueryPreviewValidation = generateQueryPreviewValidation;

package/dist/api/controllers/role.js

@@ -8,17 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { Role, getRole, isBuiltin, getAllRoles, } = require("@budibase/backend-core/roles");
-const { generateRoleID, getUserMetadataParams, InternalTables, } = require("../../db/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
-const { events } = require("@budibase/backend-core");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.destroy = exports.save = exports.find = exports.fetch = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../../db/utils");
 const UpdateRolesOptions = {
     CREATED: "created",
     REMOVED: "removed",
 };
 function updateRolesOnUserTable(db, roleId, updateOption) {
     return __awaiter(this, void 0, void 0, function* () {
-        const table = yield db.get(InternalTables.USER_METADATA);
+        const table = yield db.get(utils_1.InternalTables.USER_METADATA);
         const schema = table.schema;
         const remove = updateOption === UpdateRolesOptions.REMOVED;
         let updated = false;
@@ -41,57 +41,58 @@ function updateRolesOnUserTable(db, roleId, updateOption) {
         }
     });
 }
-exports.fetch = function (ctx) {
+function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield getAllRoles();
+        ctx.body = yield backend_core_1.roles.getAllRoles();
     });
-};
-exports.find = function (ctx) {
+}
+exports.fetch = fetch;
+function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield getRole(ctx.params.roleId);
+        ctx.body = yield backend_core_1.roles.getRole(ctx.params.roleId);
     });
-};
-exports.save = function (ctx) {
+}
+exports.find = find;
+function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         let { _id, name, inherits, permissionId } = ctx.request.body;
         let isCreate = false;
         if (!_id) {
-            _id = generateRoleID();
+            _id = (0, utils_1.generateRoleID)();
             isCreate = true;
         }
-        else if (isBuiltin(_id)) {
+        else if (backend_core_1.roles.isBuiltin(_id)) {
             ctx.throw(400, "Cannot update builtin roles.");
         }
-        const role = new Role(_id, name)
-            .addPermission(permissionId)
-            .addInheritance(inherits);
+        const role = new backend_core_1.roles.Role(_id, name, permissionId).addInheritance(inherits);
         if (ctx.request.body._rev) {
             role._rev = ctx.request.body._rev;
         }
         const result = yield db.put(role);
         if (isCreate) {
-            yield events.role.created(role);
+            yield backend_core_1.events.role.created(role);
         }
         else {
-            yield events.role.updated(role);
+            yield backend_core_1.events.role.updated(role);
         }
         yield updateRolesOnUserTable(db, _id, UpdateRolesOptions.CREATED);
         role._rev = result.rev;
         ctx.body = role;
         ctx.message = `Role '${role.name}' created successfully.`;
     });
-};
-exports.destroy = function (ctx) {
+}
+exports.save = save;
+function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         const roleId = ctx.params.roleId;
         const role = yield db.get(roleId);
-        if (isBuiltin(roleId)) {
+        if (backend_core_1.roles.isBuiltin(roleId)) {
             ctx.throw(400, "Cannot delete builtin role.");
         }
         // first check no users actively attached to role
-        const users = (yield db.allDocs(getUserMetadataParams(null, {
+        const users = (yield db.allDocs((0, utils_1.getUserMetadataParams)(undefined, {
             include_docs: true,
         }))).rows.map(row => row.doc);
         const usersWithRole = users.filter(user => user.roleId === roleId);
@@ -99,9 +100,10 @@ exports.destroy = function (ctx) {
             ctx.throw(400, "Cannot delete role when it is in use.");
         }
         yield db.remove(roleId, ctx.params.rev);
-        yield events.role.deleted(role);
+        yield backend_core_1.events.role.deleted(role);
         yield updateRolesOnUserTable(db, ctx.params.roleId, UpdateRolesOptions.REMOVED);
         ctx.message = `Role ${ctx.params.roleId} deleted successfully`;
         ctx.status = 200;
     });
-};
+}
+exports.destroy = destroy;