@budibase/server 2.1.32-alpha.8 → 2.1.33

package/dist/api/routes/utils/validators.js

@@ -1,222 +1,207 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.applicationValidator = exports.automationValidator = exports.screenValidator = exports.permissionValidator = exports.roleValidator = exports.webhookValidator = exports.datasourceQueryValidator = exports.externalSearchValidator = exports.internalSearchValidator = exports.datasourceValidator = exports.nameValidator = exports.tableValidator = void 0;
-const backend_core_1 = require("@budibase/backend-core");
-const constants_1 = require("../../../constants");
-const types_1 = require("@budibase/types");
-const joi_1 = __importDefault(require("joi"));
-const OPTIONAL_STRING = joi_1.default.string().optional().allow(null).allow("");
-const OPTIONAL_NUMBER = joi_1.default.number().optional().allow(null);
-const OPTIONAL_BOOLEAN = joi_1.default.boolean().optional().allow(null);
+const { joiValidator } = require("@budibase/backend-core/auth");
+const { DataSourceOperation } = require("../../../constants");
+const { BUILTIN_PERMISSION_IDS, PermissionLevels, } = require("@budibase/backend-core/permissions");
+const { WebhookActionType } = require("@budibase/types");
+const Joi = require("joi");
+const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("");
+const OPTIONAL_NUMBER = Joi.number().optional().allow(null);
+const OPTIONAL_BOOLEAN = Joi.boolean().optional().allow(null);
 const APP_NAME_REGEX = /^[\w\s]+$/;
-function tableValidator() {
+exports.tableValidator = () => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
+    return joiValidator.body(Joi.object({
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
         type: OPTIONAL_STRING.valid("table", "internal", "external"),
         primaryDisplay: OPTIONAL_STRING,
-        schema: joi_1.default.object().required(),
-        name: joi_1.default.string().required(),
-        views: joi_1.default.object(),
-        dataImport: joi_1.default.object(),
+        schema: Joi.object().required(),
+        name: Joi.string().required(),
+        views: Joi.object(),
+        dataImport: Joi.object(),
     }).unknown(true));
-}
-exports.tableValidator = tableValidator;
-function nameValidator() {
+};
+exports.nameValidator = () => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
+    return joiValidator.body(Joi.object({
         name: OPTIONAL_STRING,
     }));
-}
-exports.nameValidator = nameValidator;
-function datasourceValidator() {
+};
+exports.datasourceValidator = () => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
-        _id: joi_1.default.string(),
-        _rev: joi_1.default.string(),
+    return joiValidator.body(Joi.object({
+        _id: Joi.string(),
+        _rev: Joi.string(),
         type: OPTIONAL_STRING.allow("datasource_plus"),
-        relationships: joi_1.default.array().items(joi_1.default.object({
-            from: joi_1.default.string().required(),
-            to: joi_1.default.string().required(),
-            cardinality: joi_1.default.valid("1:N", "1:1", "N:N").required()
+        relationships: Joi.array().items(Joi.object({
+            from: Joi.string().required(),
+            to: Joi.string().required(),
+            cardinality: Joi.valid("1:N", "1:1", "N:N").required()
         })),
     }).unknown(true));
-}
-exports.datasourceValidator = datasourceValidator;
+};
 function filterObject() {
     // prettier-ignore
-    return joi_1.default.object({
-        string: joi_1.default.object().optional(),
-        fuzzy: joi_1.default.object().optional(),
-        range: joi_1.default.object().optional(),
-        equal: joi_1.default.object().optional(),
-        notEqual: joi_1.default.object().optional(),
-        empty: joi_1.default.object().optional(),
-        notEmpty: joi_1.default.object().optional(),
-        oneOf: joi_1.default.object().optional(),
-        contains: joi_1.default.object().optional(),
-        notContains: joi_1.default.object().optional(),
-        allOr: joi_1.default.boolean().optional(),
+    return Joi.object({
+        string: Joi.object().optional(),
+        fuzzy: Joi.object().optional(),
+        range: Joi.object().optional(),
+        equal: Joi.object().optional(),
+        notEqual: Joi.object().optional(),
+        empty: Joi.object().optional(),
+        notEmpty: Joi.object().optional(),
+        oneOf: Joi.object().optional(),
+        contains: Joi.object().optional(),
+        notContains: Joi.object().optional(),
+        allOr: Joi.boolean().optional(),
     }).unknown(true);
 }
-function internalSearchValidator() {
+exports.internalSearchValidator = () => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
+    return joiValidator.body(Joi.object({
         tableId: OPTIONAL_STRING,
         query: filterObject(),
         limit: OPTIONAL_NUMBER,
         sort: OPTIONAL_STRING,
         sortOrder: OPTIONAL_STRING,
         sortType: OPTIONAL_STRING,
-        paginate: joi_1.default.boolean(),
-        bookmark: joi_1.default.alternatives().try(OPTIONAL_STRING, OPTIONAL_NUMBER).optional(),
+        paginate: Joi.boolean(),
+        bookmark: Joi.alternatives().try(OPTIONAL_STRING, OPTIONAL_NUMBER).optional(),
     }));
-}
-exports.internalSearchValidator = internalSearchValidator;
-function externalSearchValidator() {
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
+};
+exports.externalSearchValidator = () => {
+    return joiValidator.body(Joi.object({
         query: filterObject(),
-        paginate: joi_1.default.boolean().optional(),
-        bookmark: joi_1.default.alternatives()
+        paginate: Joi.boolean().optional(),
+        bookmark: Joi.alternatives()
             .try(OPTIONAL_STRING, OPTIONAL_NUMBER)
             .optional(),
         limit: OPTIONAL_NUMBER,
-        sort: joi_1.default.object({
-            column: joi_1.default.string(),
+        sort: Joi.object({
+            column: Joi.string(),
             order: OPTIONAL_STRING.valid("ascending", "descending"),
             type: OPTIONAL_STRING.valid("string", "number"),
         }).optional(),
     }));
-}
-exports.externalSearchValidator = externalSearchValidator;
-function datasourceQueryValidator() {
+};
+exports.datasourceQueryValidator = () => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
-        endpoint: joi_1.default.object({
-            datasourceId: joi_1.default.string().required(),
-            operation: joi_1.default.string().required().valid(...Object.values(constants_1.DataSourceOperation)),
-            entityId: joi_1.default.string().required(),
+    return joiValidator.body(Joi.object({
+        endpoint: Joi.object({
+            datasourceId: Joi.string().required(),
+            operation: Joi.string().required().valid(...Object.values(DataSourceOperation)),
+            entityId: Joi.string().required(),
         }).required(),
-        resource: joi_1.default.object({
-            fields: joi_1.default.array().items(joi_1.default.string()).optional(),
+        resource: Joi.object({
+            fields: Joi.array().items(Joi.string()).optional(),
         }).optional(),
-        body: joi_1.default.object().optional(),
-        sort: joi_1.default.object().optional(),
+        body: Joi.object().optional(),
+        sort: Joi.object().optional(),
         filters: filterObject().optional(),
-        paginate: joi_1.default.object({
-            page: joi_1.default.string().alphanum().optional(),
-            limit: joi_1.default.number().optional(),
+        paginate: Joi.object({
+            page: Joi.string().alphanum().optional(),
+            limit: Joi.number().optional(),
         }).optional(),
     }));
-}
-exports.datasourceQueryValidator = datasourceQueryValidator;
-function webhookValidator() {
+};
+exports.webhookValidator = () => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
-        live: joi_1.default.bool(),
+    return joiValidator.body(Joi.object({
+        live: Joi.bool(),
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
-        name: joi_1.default.string().required(),
-        bodySchema: joi_1.default.object().optional(),
-        action: joi_1.default.object({
-            type: joi_1.default.string().required().valid(types_1.WebhookActionType.AUTOMATION),
-            target: joi_1.default.string().required(),
+        name: Joi.string().required(),
+        bodySchema: Joi.object().optional(),
+        action: Joi.object({
+            type: Joi.string().required().valid(WebhookActionType.AUTOMATION),
+            target: Joi.string().required(),
         }).required(),
     }).unknown(true));
-}
-exports.webhookValidator = webhookValidator;
-function roleValidator() {
-    const permLevelArray = Object.values(backend_core_1.permissions.PermissionLevel);
+};
+exports.roleValidator = () => {
+    const permLevelArray = Object.values(PermissionLevels);
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
+    return joiValidator.body(Joi.object({
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
-        name: joi_1.default.string().required(),
+        name: Joi.string().required(),
         // this is the base permission ID (for now a built in)
-        permissionId: joi_1.default.string().valid(...Object.values(backend_core_1.permissions.BuiltinPermissionID)).required(),
-        permissions: joi_1.default.object()
-            .pattern(/.*/, [joi_1.default.string().valid(...permLevelArray)])
+        permissionId: Joi.string().valid(...Object.values(BUILTIN_PERMISSION_IDS)).required(),
+        permissions: Joi.object()
+            .pattern(/.*/, [Joi.string().valid(...permLevelArray)])
             .optional(),
         inherits: OPTIONAL_STRING,
     }).unknown(true));
-}
-exports.roleValidator = roleValidator;
-function permissionValidator() {
-    const permLevelArray = Object.values(backend_core_1.permissions.PermissionLevel);
+};
+exports.permissionValidator = () => {
+    const permLevelArray = Object.values(PermissionLevels);
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.params(joi_1.default.object({
-        level: joi_1.default.string().valid(...permLevelArray).required(),
-        resourceId: joi_1.default.string(),
-        roleId: joi_1.default.string(),
+    return joiValidator.params(Joi.object({
+        level: Joi.string().valid(...permLevelArray).required(),
+        resourceId: Joi.string(),
+        roleId: Joi.string(),
     }).unknown(true));
-}
-exports.permissionValidator = permissionValidator;
-function screenValidator() {
+};
+exports.screenValidator = () => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
-        name: joi_1.default.string().required(),
+    return joiValidator.body(Joi.object({
+        name: Joi.string().required(),
         showNavigation: OPTIONAL_BOOLEAN,
         width: OPTIONAL_STRING,
-        routing: joi_1.default.object({
-            route: joi_1.default.string().required(),
-            roleId: joi_1.default.string().required().allow(""),
+        routing: Joi.object({
+            route: Joi.string().required(),
+            roleId: Joi.string().required().allow(""),
             homeScreen: OPTIONAL_BOOLEAN,
         }).required().unknown(true),
-        props: joi_1.default.object({
-            _id: joi_1.default.string().required(),
-            _component: joi_1.default.string().required(),
-            _children: joi_1.default.array().required(),
-            _styles: joi_1.default.object().required(),
+        props: Joi.object({
+            _id: Joi.string().required(),
+            _component: Joi.string().required(),
+            _children: Joi.array().required(),
+            _styles: Joi.object().required(),
             type: OPTIONAL_STRING,
             table: OPTIONAL_STRING,
             layoutId: OPTIONAL_STRING,
         }).required().unknown(true),
     }).unknown(true));
-}
-exports.screenValidator = screenValidator;
+};
 function generateStepSchema(allowStepTypes) {
     // prettier-ignore
-    return joi_1.default.object({
-        stepId: joi_1.default.string().required(),
-        id: joi_1.default.string().required(),
-        description: joi_1.default.string().required(),
-        name: joi_1.default.string().required(),
-        tagline: joi_1.default.string().required(),
-        icon: joi_1.default.string().required(),
-        params: joi_1.default.object(),
-        args: joi_1.default.object(),
-        type: joi_1.default.string().required().valid(...allowStepTypes),
+    return Joi.object({
+        stepId: Joi.string().required(),
+        id: Joi.string().required(),
+        description: Joi.string().required(),
+        name: Joi.string().required(),
+        tagline: Joi.string().required(),
+        icon: Joi.string().required(),
+        params: Joi.object(),
+        args: Joi.object(),
+        type: Joi.string().required().valid(...allowStepTypes),
     }).unknown(true);
 }
-function automationValidator(existing = false) {
+exports.automationValidator = (existing = false) => {
     // prettier-ignore
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
-        _id: existing ? joi_1.default.string().required() : OPTIONAL_STRING,
-        _rev: existing ? joi_1.default.string().required() : OPTIONAL_STRING,
-        name: joi_1.default.string().required(),
-        type: joi_1.default.string().valid("automation").required(),
-        definition: joi_1.default.object({
-            steps: joi_1.default.array().required().items(generateStepSchema(["ACTION", "LOGIC"])),
+    return joiValidator.body(Joi.object({
+        _id: existing ? Joi.string().required() : OPTIONAL_STRING,
+        _rev: existing ? Joi.string().required() : OPTIONAL_STRING,
+        name: Joi.string().required(),
+        type: Joi.string().valid("automation").required(),
+        definition: Joi.object({
+            steps: Joi.array().required().items(generateStepSchema(["ACTION", "LOGIC"])),
             trigger: generateStepSchema(["TRIGGER"]).allow(null),
         }).required().unknown(true),
     }).unknown(true));
-}
-exports.automationValidator = automationValidator;
-function applicationValidator(opts = { isCreate: true }) {
+};
+exports.applicationValidator = (opts = { isCreate: true }) => {
     // prettier-ignore
     const base = {
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
         url: OPTIONAL_STRING,
-        template: joi_1.default.object({
+        template: Joi.object({
             templateString: OPTIONAL_STRING,
         })
     };
-    const appNameValidator = joi_1.default.string()
+    const appNameValidator = Joi.string()
         .pattern(new RegExp(APP_NAME_REGEX))
         .error(new Error("App name must be letters, numbers and spaces only"));
     if (opts.isCreate) {
@@ -225,14 +210,13 @@ function applicationValidator(opts = { isCreate: true }) {
     else {
         base.name = appNameValidator.optional();
     }
-    return backend_core_1.auth.joiValidator.body(joi_1.default.object({
+    return joiValidator.body(Joi.object({
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
         name: appNameValidator,
         url: OPTIONAL_STRING,
-        template: joi_1.default.object({
+        template: Joi.object({
             templateString: OPTIONAL_STRING,
         }).unknown(true),
     }).unknown(true));
-}
-exports.applicationValidator = applicationValidator;
+};

package/dist/api/routes/view.js

@@ -1,41 +1,15 @@
 "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 viewController = __importStar(require("../controllers/view"));
-const rowController = __importStar(require("../controllers/row"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const resourceId_1 = require("../../middleware/resourceId");
-const backend_core_1 = require("@budibase/backend-core");
-const router = new router_1.default();
+const Router = require("@koa/router");
+const viewController = require("../controllers/view");
+const rowController = require("../controllers/row");
+const authorized = require("../../middleware/authorized");
+const { paramResource } = require("../../middleware/resourceId");
+const { BUILDER, PermissionTypes, PermissionLevels, } = require("@budibase/backend-core/permissions");
+const router = new Router();
 router
-    .get("/api/views/export", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), viewController.exportView)
-    .get("/api/views/:viewName", (0, resourceId_1.paramResource)("viewName"), (0, authorized_1.default)(backend_core_1.permissions.PermissionType.VIEW, backend_core_1.permissions.PermissionLevel.READ), rowController.fetchView)
-    .get("/api/views", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), viewController.fetch)
-    .delete("/api/views/:viewName", (0, resourceId_1.paramResource)("viewName"), (0, authorized_1.default)(backend_core_1.permissions.BUILDER), viewController.destroy)
-    .post("/api/views", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), viewController.save);
+    .get("/api/views/export", authorized(BUILDER), viewController.exportView)
+    .get("/api/views/:viewName", paramResource("viewName"), authorized(PermissionTypes.VIEW, PermissionLevels.READ), rowController.fetchView)
+    .get("/api/views", authorized(BUILDER), viewController.fetch)
+    .delete("/api/views/:viewName", paramResource("viewName"), authorized(BUILDER), viewController.destroy)
+    .post("/api/views", authorized(BUILDER), viewController.save);
 module.exports = router;

package/dist/api/routes/webhook.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const router_1 = __importDefault(require("@koa/router"));
 const controller = __importStar(require("../controllers/webhook"));
 const authorized_1 = __importDefault(require("../../middleware/authorized"));
@@ -39,4 +40,4 @@ router
     .post("/api/webhooks/schema/:instance/:id", (0, authorized_1.default)(BUILDER), controller.buildSchema)
     // this shouldn't have authorisation, right now its always public
     .post("/api/webhooks/trigger/:instance/:id", controller.trigger);
-module.exports = router;
+exports.default = router;

package/dist/app.js

@@ -53,8 +53,9 @@ const http = require("http");
 const api = require("./api");
 const automations = require("./automations/index");
 const Sentry = require("@sentry/node");
+const { logAlert } = require("@budibase/backend-core/logging");
 const { Thread } = require("./threads");
-const redis = __importStar(require("./utilities/redis"));
+const redis_1 = __importDefault(require("./utilities/redis"));
 const backend_core_1 = require("@budibase/backend-core");
 const websocket_1 = require("./websocket");
 const startup_1 = require("./startup");
@@ -92,7 +93,7 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     shuttingDown = true;
     console.log("Server Closed");
     yield automations.shutdown();
-    yield redis.shutdown();
+    yield redis_1.default.shutdown();
     yield backend_core_1.events.shutdown();
     yield Thread.shutdown();
     api.shutdown();
@@ -114,7 +115,7 @@ process.on("uncaughtException", err => {
         return;
     }
     errCode = -1;
-    backend_core_1.logging.logAlert("Uncaught exception.", err);
+    logAlert("Uncaught exception.", err);
     shutdown();
 });
 process.on("SIGTERM", () => {

package/dist/automations/tests/utilities/index.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const TestConfig = require("../../../tests/utilities/TestConfiguration");
-const { context } = require("@budibase/backend-core");
+const { TENANT_ID } = require("../../../tests/utilities/structures");
+const { doInTenant } = require("@budibase/backend-core/tenancy");
 const actions = require("../../actions");
 const emitter = require("../../../events/index");
 const env = require("../../../environment");
@@ -39,27 +40,17 @@ exports.runInProd = (fn) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.runStep = function runStep(stepId, inputs) {
     return __awaiter(this, void 0, void 0, function* () {
-        function run() {
-            return __awaiter(this, void 0, void 0, function* () {
-                let step = yield actions.getAction(stepId);
-                expect(step).toBeDefined();
-                return step({
-                    inputs,
-                    appId: config ? config.getAppId() : null,
-                    // don't really need an API key, mocked out usage quota, not being tested here
-                    apiKey: exports.apiKey,
-                    emitter,
-                });
+        return doInTenant(TENANT_ID, () => __awaiter(this, void 0, void 0, function* () {
+            let step = yield actions.getAction(stepId);
+            expect(step).toBeDefined();
+            return step({
+                inputs,
+                appId: config ? config.getAppId() : null,
+                // don't really need an API key, mocked out usage quota, not being tested here
+                apiKey: exports.apiKey,
+                emitter,
             });
-        }
-        if (config === null || config === void 0 ? void 0 : config.appId) {
-            return context.doInContext(config === null || config === void 0 ? void 0 : config.appId, () => __awaiter(this, void 0, void 0, function* () {
-                return run();
-            }));
-        }
-        else {
-            return run();
-        }
+        }));
     });
 };
 exports.apiKey = "test";

package/dist/automations/triggers.js

@@ -18,7 +18,8 @@ const { automationQueue } = require("./bullboard");
 const { checkTestFlag } = require("../utilities/redis");
 const utils = require("./utils");
 const env = require("../environment");
-const { context, db: dbCore } = require("@budibase/backend-core");
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
+const { getAllApps } = require("@budibase/backend-core/db");
 const TRIGGER_DEFINITIONS = definitions;
 const JOB_OPTS = {
     removeOnComplete: true,
@@ -26,7 +27,7 @@ const JOB_OPTS = {
 };
 function getAllAutomations() {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB();
+        const db = getAppDB();
         let automations = yield db.allDocs(getAutomationParams(null, { include_docs: true }));
         return automations.rows.map(row => row.doc);
     });
@@ -36,7 +37,7 @@ function queueRelevantRowAutomations(event, eventType) {
         if (event.appId == null) {
             throw `No appId specified for ${eventType} - check event emitters.`;
         }
-        context.doInAppContext(event.appId, () => __awaiter(this, void 0, void 0, function* () {
+        doInAppContext(event.appId, () => __awaiter(this, void 0, void 0, function* () {
             let automations = yield getAllAutomations();
             // filter down to the correct event type
             automations = automations.filter(automation => {
@@ -121,9 +122,9 @@ exports.rebootTrigger = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     // iterate through all production apps, find the reboot crons
     // and trigger events for them
-    const appIds = yield dbCore.getAllApps({ dev: false, idsOnly: true });
+    const appIds = yield getAllApps({ dev: false, idsOnly: true });
     for (let prodAppId of appIds) {
-        yield context.doInAppContext(prodAppId, () => __awaiter(void 0, void 0, void 0, function* () {
+        yield doInAppContext(prodAppId, () => __awaiter(void 0, void 0, void 0, function* () {
             let automations = yield getAllAutomations();
             let rebootEvents = [];
             for (let automation of automations) {

package/dist/automations/utils.js

@@ -19,9 +19,11 @@ const bullboard_1 = require("./bullboard");
 const newid_1 = __importDefault(require("../db/newid"));
 const utilities_1 = require("../utilities");
 const constants_1 = require("../constants");
-const backend_core_1 = require("@budibase/backend-core");
+const db_1 = require("@budibase/backend-core/db");
 const utils_1 = require("../db/utils");
 const fp_1 = require("lodash/fp");
+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");
 const sdk_1 = __importDefault(require("../sdk"));
@@ -111,7 +113,7 @@ function disableCronById(jobId) {
 exports.disableCronById = disableCronById;
 function clearMetadata() {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getProdAppDB();
+        const db = (0, context_1.getProdAppDB)();
         const automationMetadata = (yield db.allDocs((0, utils_1.getAutomationMetadataParams)({
             include_docs: true,
         }))).rows.map((row) => row.doc);
@@ -156,7 +158,7 @@ function enableCronTrigger(appId, automation) {
             // can't use getAppDB here as this is likely to be called from dev app,
             // but this call could be for dev app or prod app, need to just use what
             // was passed in
-            yield backend_core_1.db.doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
+            yield (0, db_1.doWithDB)(appId, (db) => __awaiter(this, void 0, void 0, function* () {
                 const response = yield db.put(automation);
                 automation._id = response.id;
                 automation._rev = response.rev;
@@ -176,10 +178,7 @@ exports.enableCronTrigger = enableCronTrigger;
  */
 function checkForWebhooks({ oldAuto, newAuto }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = backend_core_1.context.getAppId();
-        if (!appId) {
-            throw new Error("Unable to check webhooks - no app ID in context.");
-        }
+        const appId = (0, context_1.getAppId)();
         const oldTrigger = oldAuto ? oldAuto.definition.trigger : null;
         const newTrigger = newAuto ? newAuto.definition.trigger : null;
         const triggerChanged = oldTrigger && newTrigger && oldTrigger.id !== newTrigger.id;
@@ -193,7 +192,7 @@ function checkForWebhooks({ oldAuto, newAuto }) {
             (!isWebhookTrigger(newAuto) || triggerChanged) &&
             oldTrigger.webhookId) {
             try {
-                let db = backend_core_1.context.getAppDB();
+                let db = (0, context_1.getAppDB)();
                 // need to get the webhook to get the rev
                 const webhook = yield db.get(oldTrigger.webhookId);
                 // might be updating - reset the inputs to remove the URLs
@@ -216,7 +215,7 @@ function checkForWebhooks({ oldAuto, newAuto }) {
             // the app ID has to be development for this endpoint
             // it can only be used when building the app
             // but the trigger endpoint will always be used in production
-            const prodAppId = backend_core_1.db.getProdAppID(appId);
+            const prodAppId = (0, db_1.getProdAppID)(appId);
             newTrigger.inputs = {
                 schemaUrl: `api/webhooks/schema/${appId}/${id}`,
                 triggerUrl: `api/webhooks/trigger/${prodAppId}/${id}`,

package/dist/constants/index.js

@@ -1,5 +1,7 @@
 "use strict";
-const { objectStore, roles, constants } = require("@budibase/backend-core");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { UserStatus } = require("@budibase/backend-core/constants");
+const { objectStore } = require("@budibase/backend-core");
 const FilterTypes = {
     STRING: "string",
     FUZZY: "fuzzy",
@@ -124,7 +126,7 @@ exports.USERS_TABLE_SCHEMA = {
             constraints: {
                 type: exports.FieldTypes.STRING,
                 presence: false,
-                inclusion: Object.values(roles.BUILTIN_ROLE_IDS),
+                inclusion: Object.values(BUILTIN_ROLE_IDS),
             },
         },
         status: {
@@ -134,7 +136,7 @@ exports.USERS_TABLE_SCHEMA = {
             constraints: {
                 type: exports.FieldTypes.STRING,
                 presence: false,
-                inclusion: Object.values(constants.UserStatus),
+                inclusion: Object.values(UserStatus),
             },
         },
     },