@budibase/server 2.1.32-alpha.7 → 2.1.32

package/dist/api/routes/cloud.js

@@ -1,37 +1,11 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/cloud"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const controller = require("../controllers/cloud");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const router = new Router();
 router
-    .get("/api/cloud/export", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.exportApps)
+    .get("/api/cloud/export", authorized(BUILDER), controller.exportApps)
     // has to be public, only run if apps don't exist
     .post("/api/cloud/import", controller.importApps)
     .get("/api/cloud/import/complete", controller.hasBeenImported);

package/dist/api/routes/component.js

@@ -1,34 +1,8 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/component"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
-router.get("/api/:appId/components/definitions", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetchAppComponentDefinitions);
+const Router = require("@koa/router");
+const controller = require("../controllers/component");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const router = new Router();
+router.get("/api/:appId/components/definitions", authorized(BUILDER), controller.fetchAppComponentDefinitions);
 module.exports = router;

package/dist/api/routes/datasource.js

@@ -1,42 +1,16 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const datasourceController = __importStar(require("../controllers/datasource"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const validators_1 = require("./utils/validators");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const datasourceController = require("../controllers/datasource");
+const authorized = require("../../middleware/authorized");
+const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
+const { datasourceValidator, datasourceQueryValidator, } = require("./utils/validators");
+const router = new Router();
 router
-    .get("/api/datasources", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.fetch)
-    .get("/api/datasources/:datasourceId", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), datasourceController.find)
-    .put("/api/datasources/:datasourceId", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), datasourceController.update)
-    .post("/api/datasources/query", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), (0, validators_1.datasourceQueryValidator)(), datasourceController.query)
-    .post("/api/datasources/:datasourceId/schema", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.buildSchemaFromDb)
-    .post("/api/datasources", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.datasourceValidator)(), datasourceController.save)
-    .delete("/api/datasources/:datasourceId/:revId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.destroy);
+    .get("/api/datasources", authorized(BUILDER), datasourceController.fetch)
+    .get("/api/datasources/:datasourceId", authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceController.find)
+    .put("/api/datasources/:datasourceId", authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceController.update)
+    .post("/api/datasources/query", authorized(PermissionTypes.TABLE, PermissionLevels.READ), datasourceQueryValidator(), datasourceController.query)
+    .post("/api/datasources/:datasourceId/schema", authorized(BUILDER), datasourceController.buildSchemaFromDb)
+    .post("/api/datasources", authorized(BUILDER), datasourceValidator(), datasourceController.save)
+    .delete("/api/datasources/:datasourceId/:revId", authorized(BUILDER), datasourceController.destroy);
 module.exports = router;

package/dist/api/routes/deploy.js

@@ -1,37 +1,11 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/deploy"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const controller = require("../controllers/deploy");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const router = new Router();
 router
-    .get("/api/deployments", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetchDeployments)
-    .get("/api/deploy/:deploymentId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deploymentProgress)
-    .post("/api/deploy", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deployApp);
+    .get("/api/deployments", authorized(BUILDER), controller.fetchDeployments)
+    .get("/api/deploy/:deploymentId", authorized(BUILDER), controller.deploymentProgress)
+    .post("/api/deploy", authorized(BUILDER), controller.deployApp);
 module.exports = router;

package/dist/api/routes/dev.js

@@ -1,48 +1,22 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/dev"));
-const environment_1 = __importDefault(require("../../environment"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const controller = require("../controllers/dev");
+const env = require("../../environment");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const router = new Router();
 function redirectPath(path) {
     router
         .get(`/api/${path}/:devPath(.*)`, controller.buildRedirectGet(path))
         .post(`/api/${path}/:devPath(.*)`, controller.buildRedirectPost(path))
         .delete(`/api/${path}/:devPath(.*)`, controller.buildRedirectDelete(path));
 }
-if (environment_1.default.isDev() || environment_1.default.isTest()) {
+if (env.isDev() || env.isTest()) {
     redirectPath("global");
     redirectPath("system");
 }
 router
-    .get("/api/dev/version", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.getBudibaseVersion)
-    .delete("/api/dev/:appId/lock", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.clearLock)
-    .post("/api/dev/:appId/revert", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.revert);
+    .get("/api/dev/version", authorized(BUILDER), controller.getBudibaseVersion)
+    .delete("/api/dev/:appId/lock", authorized(BUILDER), controller.clearLock)
+    .post("/api/dev/:appId/revert", authorized(BUILDER), controller.revert);
 module.exports = router;

package/dist/api/routes/integration.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const integration_1 = __importDefault(require("../controllers/integration"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const controller = require("../controllers/integration");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const router = new Router();
 router
-    .get("/api/integrations", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), integration_1.default.fetch)
-    .get("/api/integrations/:type", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), integration_1.default.find);
+    .get("/api/integrations", authorized(BUILDER), controller.fetch)
+    .get("/api/integrations/:type", authorized(BUILDER), controller.find);
 module.exports = router;

package/dist/api/routes/layout.js

@@ -1,36 +1,10 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const controller = __importStar(require("../controllers/layout"));
-const router = new router_1.default();
+const Router = require("@koa/router");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const controller = require("../controllers/layout");
+const router = new Router();
 router
-    .post("/api/layouts", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.save)
-    .delete("/api/layouts/:layoutId/:layoutRev", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.destroy);
+    .post("/api/layouts", authorized(BUILDER), controller.save)
+    .delete("/api/layouts/:layoutId/:layoutRev", authorized(BUILDER), controller.destroy);
 module.exports = router;

package/dist/api/routes/metadata.js

@@ -1,39 +1,13 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/metadata"));
-const appInfo_1 = require("../../middleware/appInfo");
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const controller = require("../controllers/metadata");
+const { middleware: appInfoMiddleware, AppType, } = require("../../middleware/appInfo");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const router = new Router();
 router
-    .post("/api/metadata/:type/:entityId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, appInfo_1.middleware)({ appType: appInfo_1.AppType.DEV }), controller.saveMetadata)
-    .delete("/api/metadata/:type/:entityId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, appInfo_1.middleware)({ appType: appInfo_1.AppType.DEV }), controller.deleteMetadata)
-    .get("/api/metadata/type", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, appInfo_1.middleware)({ appType: appInfo_1.AppType.DEV }), controller.getTypes)
-    .get("/api/metadata/:type/:entityId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, appInfo_1.middleware)({ appType: appInfo_1.AppType.DEV }), controller.getMetadata);
+    .post("/api/metadata/:type/:entityId", authorized(BUILDER), appInfoMiddleware({ appType: AppType.DEV }), controller.saveMetadata)
+    .delete("/api/metadata/:type/:entityId", authorized(BUILDER), appInfoMiddleware({ appType: AppType.DEV }), controller.deleteMetadata)
+    .get("/api/metadata/type", authorized(BUILDER), appInfoMiddleware({ appType: AppType.DEV }), controller.getTypes)
+    .get("/api/metadata/:type/:entityId", authorized(BUILDER), appInfoMiddleware({ appType: AppType.DEV }), controller.getMetadata);
 module.exports = router;

package/dist/api/routes/migrations.js

@@ -1,35 +1,9 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const migrationsController = __importStar(require("../controllers/migrations"));
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const migrationsController = require("../controllers/migrations");
+const router = new Router();
+const { internalApi } = require("@budibase/backend-core/auth");
 router
-    .post("/api/migrations/run", backend_core_1.auth.internalApi, migrationsController.migrate)
-    .get("/api/migrations/definitions", backend_core_1.auth.internalApi, migrationsController.fetchDefinitions);
+    .post("/api/migrations/run", internalApi, migrationsController.migrate)
+    .get("/api/migrations/definitions", internalApi, migrationsController.fetchDefinitions);
 module.exports = router;

package/dist/api/routes/permission.js

@@ -1,43 +1,17 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/permission"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const validators_1 = require("./utils/validators");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const controller = require("../controllers/permission");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const { permissionValidator } = require("./utils/validators");
+const router = new Router();
 router
-    .get("/api/permission/builtin", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetchBuiltin)
-    .get("/api/permission/levels", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetchLevels)
-    .get("/api/permission", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetch)
-    .get("/api/permission/:resourceId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.getResourcePerms)
+    .get("/api/permission/builtin", authorized(BUILDER), controller.fetchBuiltin)
+    .get("/api/permission/levels", authorized(BUILDER), controller.fetchLevels)
+    .get("/api/permission", authorized(BUILDER), controller.fetch)
+    .get("/api/permission/:resourceId", authorized(BUILDER), controller.getResourcePerms)
     // adding a specific role/level for the resource overrides the underlying access control
-    .post("/api/permission/:roleId/:resourceId/:level", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.permissionValidator)(), controller.addPermission)
+    .post("/api/permission/:roleId/:resourceId/:level", authorized(BUILDER), permissionValidator(), controller.addPermission)
     // deleting the level defaults it back the underlying access control for the resource
-    .delete("/api/permission/:roleId/:resourceId/:level", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.permissionValidator)(), controller.removePermission);
+    .delete("/api/permission/:roleId/:resourceId/:level", authorized(BUILDER), permissionValidator(), controller.removePermission);
 module.exports = router;

package/dist/api/routes/plugin.js

@@ -29,11 +29,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const router_1 = __importDefault(require("@koa/router"));
 const controller = __importStar(require("../controllers/plugin"));
 const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
+const permissions_1 = require("@budibase/backend-core/permissions");
 const router = new router_1.default();
 router
-    .post("/api/plugin/upload", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.upload)
-    .post("/api/plugin", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.create)
-    .get("/api/plugin", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetch)
-    .delete("/api/plugin/:pluginId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.destroy);
+    .post("/api/plugin/upload", (0, authorized_1.default)(permissions_1.BUILDER), controller.upload)
+    .post("/api/plugin", (0, authorized_1.default)(permissions_1.BUILDER), controller.create)
+    .get("/api/plugin", (0, authorized_1.default)(permissions_1.BUILDER), controller.fetch)
+    .delete("/api/plugin/:pluginId", (0, authorized_1.default)(permissions_1.BUILDER), controller.destroy);
 exports.default = router;

package/dist/api/routes/public/index.js

@@ -17,7 +17,7 @@ const environment_1 = __importDefault(require("../../../environment"));
 // below imports don't have declaration files
 const Router = require("@koa/router");
 const { RateLimit, Stores } = require("koa2-ratelimit");
-const { PermissionLevel, PermissionType, } = require("@budibase/backend-core/permissions");
+const { PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const { getRedisOptions } = require("@budibase/backend-core/redis").utils;
 const PREFIX = "/api/public/v1";
 // allow a lot more requests when in test
@@ -91,7 +91,7 @@ function applyRoutes(endpoints, permType, resource, subResource) {
         ? (0, resourceId_1.paramSubResource)(resource, subResource)
         : (0, resourceId_1.paramResource)(resource);
     const publicApiMiddleware = (0, publicApi_1.default)({
-        requiresAppId: permType !== PermissionType.APP && permType !== PermissionType.USER,
+        requiresAppId: permType !== PermissionTypes.APP && permType !== PermissionTypes.USER,
     });
     addMiddleware(endpoints.read, publicApiMiddleware);
     addMiddleware(endpoints.write, publicApiMiddleware);
@@ -99,20 +99,20 @@ function applyRoutes(endpoints, permType, resource, subResource) {
     addMiddleware(endpoints.read, paramMiddleware);
     addMiddleware(endpoints.write, paramMiddleware);
     // add the authorization middleware, using the correct perm type
-    addMiddleware(endpoints.read, (0, authorized_1.default)(permType, PermissionLevel.READ));
-    addMiddleware(endpoints.write, (0, authorized_1.default)(permType, PermissionLevel.WRITE));
+    addMiddleware(endpoints.read, (0, authorized_1.default)(permType, PermissionLevels.READ));
+    addMiddleware(endpoints.write, (0, authorized_1.default)(permType, PermissionLevels.WRITE));
     // add the output mapper middleware
     addMiddleware(endpoints.read, mapper_1.default, { output: true });
     addMiddleware(endpoints.write, mapper_1.default, { output: true });
     addToRouter(endpoints.read);
     addToRouter(endpoints.write);
 }
-applyRoutes(applications_1.default, PermissionType.APP, "appId");
-applyRoutes(tables_1.default, PermissionType.TABLE, "tableId");
-applyRoutes(users_1.default, PermissionType.USER, "userId");
-applyRoutes(queries_1.default, PermissionType.QUERY, "queryId");
+applyRoutes(applications_1.default, PermissionTypes.APP, "appId");
+applyRoutes(tables_1.default, PermissionTypes.TABLE, "tableId");
+applyRoutes(users_1.default, PermissionTypes.USER, "userId");
+applyRoutes(queries_1.default, PermissionTypes.QUERY, "queryId");
 // needs to be applied last for routing purposes, don't override other endpoints
-applyRoutes(rows_1.default, PermissionType.TABLE, "tableId", "rowId");
+applyRoutes(rows_1.default, PermissionTypes.TABLE, "tableId", "rowId");
 exports.default = publicRouter;
 const shutdown = () => {
     if (rateLimitStore) {

package/dist/api/routes/query.js

@@ -1,46 +1,19 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const router_1 = __importDefault(require("@koa/router"));
-const queryController = __importStar(require("../controllers/query"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const resourceId_1 = require("../../middleware/resourceId");
-const validation_1 = require("../controllers/query/validation");
-const { BUILDER, PermissionType, PermissionLevel } = backend_core_1.permissions;
-const router = new router_1.default();
+const Router = require("@koa/router");
+const queryController = require("../controllers/query");
+const authorized = require("../../middleware/authorized");
+const { PermissionLevels, PermissionTypes, BUILDER, } = require("@budibase/backend-core/permissions");
+const { bodyResource, bodySubResource, paramResource, } = require("../../middleware/resourceId");
+const { generateQueryPreviewValidation, generateQueryValidation, } = require("../controllers/query/validation");
+const router = new Router();
 router
-    .get("/api/queries", (0, authorized_1.default)(BUILDER), queryController.fetch)
-    .post("/api/queries", (0, resourceId_1.bodySubResource)("datasourceId", "_id"), (0, authorized_1.default)(BUILDER), (0, validation_1.generateQueryValidation)(), queryController.save)
-    .post("/api/queries/import", (0, authorized_1.default)(BUILDER), queryController.import)
-    .post("/api/queries/preview", (0, resourceId_1.bodyResource)("datasourceId"), (0, authorized_1.default)(BUILDER), (0, validation_1.generateQueryPreviewValidation)(), queryController.preview)
-    .get("/api/queries/:queryId", (0, resourceId_1.paramResource)("queryId"), (0, authorized_1.default)(PermissionType.QUERY, PermissionLevel.READ), queryController.find)
+    .get("/api/queries", authorized(BUILDER), queryController.fetch)
+    .post("/api/queries", bodySubResource("datasourceId", "_id"), authorized(BUILDER), generateQueryValidation(), queryController.save)
+    .post("/api/queries/import", authorized(BUILDER), queryController.import)
+    .post("/api/queries/preview", bodyResource("datasourceId"), authorized(BUILDER), generateQueryPreviewValidation(), queryController.preview)
+    .get("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.READ), queryController.find)
     // DEPRECATED - use new query endpoint for future work
-    .post("/api/queries/:queryId", (0, resourceId_1.paramResource)("queryId"), (0, authorized_1.default)(PermissionType.QUERY, PermissionLevel.WRITE), queryController.executeV1)
-    .delete("/api/queries/:queryId/:revId", (0, resourceId_1.paramResource)("queryId"), (0, authorized_1.default)(BUILDER), queryController.destroy)
-    .post("/api/v2/queries/:queryId", (0, resourceId_1.paramResource)("queryId"), (0, authorized_1.default)(PermissionType.QUERY, PermissionLevel.WRITE), queryController.executeV2);
+    .post("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.executeV1)
+    .post("/api/v2/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.executeV2)
+    .delete("/api/queries/:queryId/:revId", paramResource("queryId"), authorized(BUILDER), queryController.destroy);
 module.exports = router;