@budibase/server 2.1.43-alpha.6 → 2.1.44

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -36,8 +36,10 @@ exports.runInProd = exports.testAutomation = exports.getDB = exports.checkPermis
 const rowController = __importStar(require("../../../controllers/row"));
 const appController = __importStar(require("../../../controllers/application"));
 const utils_1 = require("../../../../db/utils");
-const backend_core_1 = require("@budibase/backend-core");
+const roles_1 = require("@budibase/backend-core/roles");
+const tenancy_1 = require("@budibase/backend-core/tenancy");
 const structures_1 = require("../../../../tests/utilities/structures");
+const context_1 = require("@budibase/backend-core/context");
 const env = __importStar(require("../../../../environment"));
 class Request {
     constructor(appId, params) {
@@ -47,7 +49,7 @@ class Request {
     }
 }
 function runRequest(appId, controlFunc, request) {
-    return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+    return (0, context_1.doInAppContext)(appId, () => __awaiter(this, void 0, void 0, function* () {
         return controlFunc(request);
     }));
 }
@@ -58,7 +60,7 @@ const getAllTableRows = (config) => __awaiter(void 0, void 0, void 0, function*
 });
 exports.getAllTableRows = getAllTableRows;
 const clearAllApps = (tenantId = structures_1.TENANT_ID) => __awaiter(void 0, void 0, void 0, function* () {
-    yield backend_core_1.tenancy.doInTenant(tenantId, () => __awaiter(void 0, void 0, void 0, function* () {
+    yield (0, tenancy_1.doInTenant)(tenantId, () => __awaiter(void 0, void 0, void 0, function* () {
         const req = { query: { status: utils_1.AppStatus.DEV }, user: { tenantId } };
         yield appController.fetch(req);
         const apps = req.body;
@@ -76,7 +78,7 @@ exports.clearAllApps = clearAllApps;
 const clearAllAutomations = (config) => __awaiter(void 0, void 0, void 0, function* () {
     const automations = yield config.getAllAutomations();
     for (let auto of automations) {
-        yield backend_core_1.context.doInAppContext(config.appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        yield (0, context_1.doInAppContext)(config.appId, () => __awaiter(void 0, void 0, void 0, function* () {
             yield config.deleteAutomation(auto);
         }));
     }
@@ -119,7 +121,7 @@ const checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRol
         .set(passHeader)
         .expect(200);
     let failHeader;
-    if (failRole === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+    if (failRole === roles_1.BUILTIN_ROLE_IDS.PUBLIC) {
         failHeader = config.publicHeaders({ prodApp: true });
     }
     else {
@@ -136,7 +138,7 @@ const checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRol
 });
 exports.checkPermissionsEndpoint = checkPermissionsEndpoint;
 const getDB = () => {
-    return backend_core_1.context.getAppDB();
+    return (0, context_1.getAppDB)();
 };
 exports.getDB = getDB;
 const testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/api/routes/tests/utilities/index.js

@@ -1,27 +1,4 @@
 "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) {
@@ -31,14 +8,9 @@ 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.switchToSelfHosted = exports.getConfig = exports.getRequest = exports.afterAll = exports.beforeAll = exports.delay = exports.structures = void 0;
-const TestConfiguration_1 = __importDefault(require("../../../../tests/utilities/TestConfiguration"));
-const environment_1 = __importDefault(require("../../../../environment"));
-exports.structures = __importStar(require("../../../../tests/utilities/structures"));
+const TestConfig = require("../../../../tests/utilities/TestConfiguration");
+const structures = require("../../../../tests/utilities/structures");
+const env = require("../../../../environment");
 function user() {
     return {
         _id: "user",
@@ -75,57 +47,48 @@ jest.mock("../../../../utilities/workerRequests", () => ({
     }),
     removeAppFromUserRoles: jest.fn(),
 }));
-function delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-exports.delay = delay;
+exports.delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 let request, config;
-function beforeAll() {
-    config = new TestConfiguration_1.default();
+exports.beforeAll = () => {
+    config = new TestConfig();
     request = config.getRequest();
-}
-exports.beforeAll = beforeAll;
-function afterAll() {
+};
+exports.afterAll = () => {
     if (config) {
         config.end();
     }
     // clear app files
     request = null;
     config = null;
-}
-exports.afterAll = afterAll;
-function getRequest() {
+};
+exports.getRequest = () => {
     if (!request) {
         exports.beforeAll();
     }
     return request;
-}
-exports.getRequest = getRequest;
-function getConfig() {
+};
+exports.getConfig = () => {
     if (!config) {
         exports.beforeAll();
     }
     return config;
-}
-exports.getConfig = getConfig;
-function switchToSelfHosted(func) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // self hosted stops any attempts to Dynamo
-        environment_1.default._set("NODE_ENV", "production");
-        environment_1.default._set("SELF_HOSTED", true);
-        let error;
-        try {
-            yield func();
-        }
-        catch (err) {
-            error = err;
-        }
-        environment_1.default._set("NODE_ENV", "jest");
-        environment_1.default._set("SELF_HOSTED", false);
-        // don't throw error until after reset
-        if (error) {
-            throw error;
-        }
-    });
-}
-exports.switchToSelfHosted = switchToSelfHosted;
+};
+exports.switchToSelfHosted = (func) => __awaiter(void 0, void 0, void 0, function* () {
+    // self hosted stops any attempts to Dynamo
+    env._set("NODE_ENV", "production");
+    env._set("SELF_HOSTED", true);
+    let error;
+    try {
+        yield func();
+    }
+    catch (err) {
+        error = err;
+    }
+    env._set("NODE_ENV", "jest");
+    env._set("SELF_HOSTED", false);
+    // don't throw error until after reset
+    if (error) {
+        throw error;
+    }
+});
+exports.structures = structures;

package/dist/api/routes/user.js

@@ -1,43 +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 controller = __importStar(require("../controllers/user"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const backend_core_1 = require("@budibase/backend-core");
-const { PermissionType, PermissionLevel } = backend_core_1.permissions;
-const router = new router_1.default();
+const Router = require("@koa/router");
+const controller = require("../controllers/user");
+const authorized = require("../../middleware/authorized");
+const { PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
+const router = new Router();
 router
-    .get("/api/users/metadata", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.READ), controller.fetchMetadata)
-    .get("/api/users/metadata/:id", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.READ), controller.findMetadata)
-    .put("/api/users/metadata", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.updateMetadata)
-    .post("/api/users/metadata/self", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.updateSelfMetadata)
-    .delete("/api/users/metadata/:id", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.destroyMetadata)
-    .post("/api/users/metadata/sync/:id", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.syncUser)
-    .post("/api/users/flags", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.setFlag)
-    .get("/api/users/flags", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.READ), controller.getFlags);
+    .get("/api/users/metadata", authorized(PermissionTypes.USER, PermissionLevels.READ), controller.fetchMetadata)
+    .get("/api/users/metadata/:id", authorized(PermissionTypes.USER, PermissionLevels.READ), controller.findMetadata)
+    .put("/api/users/metadata", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.updateMetadata)
+    .post("/api/users/metadata/self", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.updateSelfMetadata)
+    .delete("/api/users/metadata/:id", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.destroyMetadata)
+    .post("/api/users/metadata/sync/:id", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.syncUser)
+    .post("/api/users/flags", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.setFlag)
+    .get("/api/users/flags", authorized(PermissionTypes.USER, PermissionLevels.READ), controller.getFlags);
 module.exports = router;

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;
+};