@budibase/server 2.1.22-alpha.6 → 2.1.22-alpha.7

package/dist/middleware/currentapp.js

@@ -8,27 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getAppIdFromCtx, setCookie, getCookie, clearCookie, } = require("@budibase/backend-core/utils");
-const { Cookies, Headers } = require("@budibase/backend-core/constants");
-const { getRole } = require("@budibase/backend-core/roles");
-const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { generateUserMetadataID, isDevAppID } = require("../db/utils");
-const { dbExists } = require("@budibase/backend-core/db");
-const { isUserInAppTenant } = require("@budibase/backend-core/tenancy");
-const { getCachedSelf } = require("../utilities/global");
-const env = require("../environment");
-const { isWebhookEndpoint } = require("./utils");
-const { doInAppContext } = require("@budibase/backend-core/context");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../db/utils");
+const global_1 = require("../utilities/global");
+const environment_1 = __importDefault(require("../environment"));
+const utils_2 = require("./utils");
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // try to get the appID from the request
-    let requestAppId = yield getAppIdFromCtx(ctx);
+    let requestAppId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
     // get app cookie if it exists
-    let appCookie = null;
+    let appCookie;
     try {
-        appCookie = getCookie(ctx, Cookies.CurrentApp);
+        appCookie = backend_core_1.utils.getCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
     }
     catch (err) {
-        clearCookie(ctx, Cookies.CurrentApp);
+        backend_core_1.utils.clearCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
     }
     if (!appCookie && !requestAppId) {
         return next();
@@ -36,46 +33,49 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // check the app exists referenced in cookie
     if (appCookie) {
         const appId = appCookie.appId;
-        const exists = yield dbExists(appId);
+        const exists = yield backend_core_1.db.dbExists(appId);
         if (!exists) {
-            clearCookie(ctx, Cookies.CurrentApp);
+            backend_core_1.utils.clearCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
             return next();
         }
         // if the request app ID wasn't set, update it with the cookie
         requestAppId = requestAppId || appId;
     }
     // deny access to application preview
-    if (!env.isTest()) {
-        if (isDevAppID(requestAppId) &&
-            !isWebhookEndpoint(ctx) &&
+    if (!environment_1.default.isTest()) {
+        if ((0, utils_1.isDevAppID)(requestAppId) &&
+            !(0, utils_2.isWebhookEndpoint)(ctx) &&
             (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
-            clearCookie(ctx, Cookies.CurrentApp);
+            backend_core_1.utils.clearCookie(ctx, backend_core_1.constants.Cookie.CurrentApp);
             return ctx.redirect("/");
         }
     }
-    let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;
+    let appId, roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
     if (!ctx.user) {
         // not logged in, try to set a cookie for public apps
         appId = requestAppId;
     }
     else if (requestAppId != null) {
         // Different App ID means cookie needs reset, or if the same public user has logged in
-        const globalUser = yield getCachedSelf(ctx, requestAppId);
+        const globalUser = yield (0, global_1.getCachedSelf)(ctx, requestAppId);
         appId = requestAppId;
         // retrieving global user gets the right role
         roleId = globalUser.roleId || roleId;
         // Allow builders to specify their role via a header
         const isBuilder = globalUser && globalUser.builder && globalUser.builder.global;
-        const isDevApp = appId && isDevAppID(appId);
-        const roleHeader = ctx.request && ctx.request.headers[Headers.PREVIEW_ROLE];
+        const isDevApp = appId && (0, utils_1.isDevAppID)(appId);
+        const roleHeader = ctx.request &&
+            ctx.request.headers[backend_core_1.constants.Header.PREVIEW_ROLE];
         if (isBuilder && isDevApp && roleHeader) {
             // Ensure the role is valid by ensuring a definition exists
             try {
-                yield getRole(roleHeader);
-                roleId = roleHeader;
-                // Delete admin and builder flags so that the specified role is honoured
-                delete ctx.user.builder;
-                delete ctx.user.admin;
+                if (roleHeader) {
+                    yield backend_core_1.roles.getRole(roleHeader);
+                    roleId = roleHeader;
+                    // Delete admin and builder flags so that the specified role is honoured
+                    delete ctx.user.builder;
+                    delete ctx.user.admin;
+                }
             }
             catch (error) {
                 // Swallow error and do nothing
@@ -86,38 +86,40 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         return next();
     }
-    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+    return backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         let skipCookie = false;
         // if the user not in the right tenant then make sure they have no permissions
         // need to judge this only based on the request app ID,
-        if (env.MULTI_TENANCY &&
+        if (environment_1.default.MULTI_TENANCY &&
             ctx.user &&
             requestAppId &&
-            !isUserInAppTenant(requestAppId, ctx.user)) {
+            !backend_core_1.tenancy.isUserInAppTenant(requestAppId, ctx.user)) {
             // don't error, simply remove the users rights (they are a public user)
             delete ctx.user.builder;
             delete ctx.user.admin;
             delete ctx.user.roles;
             ctx.isAuthenticated = false;
-            roleId = BUILTIN_ROLE_IDS.PUBLIC;
+            roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
             skipCookie = true;
         }
         ctx.appId = appId;
         if (roleId) {
             ctx.roleId = roleId;
             const globalId = ctx.user ? ctx.user._id : undefined;
-            const userId = ctx.user ? generateUserMetadataID(ctx.user._id) : null;
+            const userId = ctx.user
+                ? (0, utils_1.generateUserMetadataID)(ctx.user._id)
+                : undefined;
             ctx.user = Object.assign(Object.assign({}, ctx.user), { 
                 // override userID with metadata one
                 _id: userId, userId,
                 globalId,
-                roleId, role: yield getRole(roleId) });
+                roleId, role: yield backend_core_1.roles.getRole(roleId) });
         }
         if ((requestAppId !== appId ||
             appCookie == null ||
             appCookie.appId !== requestAppId) &&
             !skipCookie) {
-            setCookie(ctx, { appId }, Cookies.CurrentApp);
+            backend_core_1.utils.setCookie(ctx, { appId }, backend_core_1.constants.Cookie.CurrentApp);
         }
         return next();
     }));

package/dist/middleware/joi-validator.js

@@ -1,5 +1,10 @@
 "use strict";
-const Joi = require("joi");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.params = exports.body = void 0;
+const joi_1 = __importDefault(require("joi"));
 function validate(schema, property) {
     // Return a Koa middleware function
     return (ctx, next) => {
@@ -10,14 +15,14 @@ function validate(schema, property) {
         if (ctx[property] != null) {
             params = ctx[property];
         }
-        else if (ctx.request[property] != null) {
-            params = ctx.request[property];
+        else if (ctx.request.get(property) != null) {
+            params = ctx.request.get(property);
         }
         // not all schemas have the append property e.g. array schemas
-        if (schema.append) {
+        if ("append" in schema && schema.append) {
             schema = schema.append({
-                createdAt: Joi.any().optional(),
-                updatedAt: Joi.any().optional(),
+                createdAt: joi_1.default.any().optional(),
+                updatedAt: joi_1.default.any().optional(),
             });
         }
         const { error } = schema.validate(params);
@@ -28,9 +33,11 @@ function validate(schema, property) {
         return next();
     };
 }
-module.exports.body = schema => {
+function body(schema) {
     return validate(schema, "body");
-};
-module.exports.params = schema => {
+}
+exports.body = body;
+function params(schema) {
     return validate(schema, "params");
-};
+}
+exports.params = params;

package/dist/middleware/publicApi.js

@@ -8,16 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { Headers } = require("@budibase/backend-core/constants");
-const { getAppIdFromCtx } = require("@budibase/backend-core/utils");
+const backend_core_1 = require("@budibase/backend-core");
 module.exports = function ({ requiresAppId } = {}) {
     return (ctx, next) => __awaiter(this, void 0, void 0, function* () {
-        const appId = yield getAppIdFromCtx(ctx);
+        const appId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
         if (requiresAppId && !appId) {
-            ctx.throw(400, `Invalid app ID provided, please check the ${Headers.APP_ID} header.`);
+            ctx.throw(400, `Invalid app ID provided, please check the ${backend_core_1.constants.Header.APP_ID} header.`);
         }
-        if (!ctx.headers[Headers.API_KEY]) {
-            ctx.throw(400, `Invalid API key provided, please check the ${Headers.API_KEY} header.`);
+        if (!ctx.headers[backend_core_1.constants.Header.API_KEY]) {
+            ctx.throw(400, `Invalid API key provided, please check the ${backend_core_1.constants.Header.API_KEY} header.`);
         }
         return next();
     });

package/dist/middleware/resourceId.js

@@ -1,4 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bodySubResource = exports.bodyResource = exports.paramSubResource = exports.paramResource = exports.ResourceIdGetter = void 0;
 class ResourceIdGetter {
     constructor(ctxProperty) {
         this.parameter = ctxProperty;
@@ -17,6 +19,7 @@ class ResourceIdGetter {
     build() {
         const parameter = this.parameter, main = this.main, sub = this.sub;
         return (ctx, next) => {
+            // @ts-ignore
             const request = ctx.request[parameter] || ctx[parameter];
             if (request == null) {
                 return next();
@@ -31,22 +34,26 @@ class ResourceIdGetter {
         };
     }
 }
-module.exports.ResourceIdGetter = ResourceIdGetter;
-module.exports.paramResource = main => {
+exports.ResourceIdGetter = ResourceIdGetter;
+function paramResource(main) {
     return new ResourceIdGetter("params").mainResource(main).build();
-};
-module.exports.paramSubResource = (main, sub) => {
+}
+exports.paramResource = paramResource;
+function paramSubResource(main, sub) {
     return new ResourceIdGetter("params")
         .mainResource(main)
         .subResource(sub)
         .build();
-};
-module.exports.bodyResource = main => {
+}
+exports.paramSubResource = paramSubResource;
+function bodyResource(main) {
     return new ResourceIdGetter("body").mainResource(main).build();
-};
-module.exports.bodySubResource = (main, sub) => {
+}
+exports.bodyResource = bodyResource;
+function bodySubResource(main, sub) {
     return new ResourceIdGetter("body")
         .mainResource(main)
         .subResource(sub)
         .build();
-};
+}
+exports.bodySubResource = bodySubResource;

package/dist/middleware/selfhost.js

@@ -8,11 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const env = require("../environment");
-// if added as a middleware will stop requests unless builder is in self host mode
-// or cloud is in self host
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const environment_1 = __importDefault(require("../environment"));
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (env.SELF_HOSTED) {
+    if (environment_1.default.SELF_HOSTED) {
         yield next();
         return;
     }

package/dist/middleware/utils.js

@@ -1,5 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isWebhookEndpoint = void 0;
 const WEBHOOK_ENDPOINTS = new RegExp(["webhooks/trigger", "webhooks/schema"].join("|"));
-exports.isWebhookEndpoint = ctx => {
+function isWebhookEndpoint(ctx) {
     return WEBHOOK_ENDPOINTS.test(ctx.request.url);
-};
+}
+exports.isWebhookEndpoint = isWebhookEndpoint;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.1.22-alpha.5",
+    "version": "2.1.22-alpha.6",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.1.22-alpha.5",
-        "@budibase/client": "2.1.22-alpha.5",
-        "@budibase/pro": "2.1.22-alpha.5",
-        "@budibase/string-templates": "2.1.22-alpha.5",
-        "@budibase/types": "2.1.22-alpha.5",
+        "@budibase/backend-core": "2.1.22-alpha.6",
+        "@budibase/client": "2.1.22-alpha.6",
+        "@budibase/pro": "2.1.22-alpha.6",
+        "@budibase/string-templates": "2.1.22-alpha.6",
+        "@budibase/types": "2.1.22-alpha.6",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/sdk/app/tables/index.js

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const context_1 = require("@budibase/backend-core/context");
+const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
 const utils_2 = require("../../../integrations/utils");
 function getAllInternalTables(db) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!db) {
-            db = (0, context_1.getAppDB)();
+            db = backend_core_1.context.getAppDB();
         }
         const internalTables = yield db.allDocs((0, utils_1.getTableParams)(null, {
             include_docs: true,
@@ -25,7 +25,7 @@ function getAllInternalTables(db) {
 }
 function getAllExternalTables(datasourceId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, context_1.getAppDB)();
+        const db = backend_core_1.context.getAppDB();
         const datasource = yield db.get(datasourceId);
         if (!datasource || !datasource.entities) {
             throw "Datasource is not configured fully.";
@@ -41,7 +41,7 @@ function getExternalTable(datasourceId, tableName) {
 }
 function getTable(tableId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, context_1.getAppDB)();
+        const db = backend_core_1.context.getAppDB();
         if ((0, utils_2.isExternalTable)(tableId)) {
             let { datasourceId, tableName } = (0, utils_2.breakExternalTableId)(tableId);
             const datasource = yield db.get(datasourceId);

package/dist/tests/utilities/TestConfiguration.js

@@ -15,7 +15,7 @@ const { basicTable, basicRow, basicRole, basicAutomation, basicDatasource, basic
 const controllers = require("./controllers");
 const supertest = require("supertest");
 const { cleanup } = require("../../utilities/fileSystem");
-const { Cookies, Headers } = require("@budibase/backend-core/constants");
+const { Cookie, Header } = require("@budibase/backend-core/constants");
 const { jwt } = require("@budibase/backend-core/auth");
 const { doInTenant, doWithGlobalDB } = require("@budibase/backend-core/tenancy");
 const { createASession } = require("@budibase/backend-core/sessions");
@@ -224,10 +224,10 @@ class TestConfiguration {
                 return {
                     Accept: "application/json",
                     Cookie: [
-                        `${Cookies.Auth}=${authToken}`,
-                        `${Cookies.CurrentApp}=${appToken}`,
+                        `${Cookie.Auth}=${authToken}`,
+                        `${Cookie.CurrentApp}=${appToken}`,
                     ],
-                    [Headers.APP_ID]: appId,
+                    [Header.APP_ID]: appId,
                 };
             }));
         });
@@ -245,11 +245,11 @@ class TestConfiguration {
         const authToken = jwt.sign(auth, env.JWT_SECRET);
         const appToken = jwt.sign(app, env.JWT_SECRET);
         const headers = Object.assign({ Accept: "application/json", Cookie: [
-                `${Cookies.Auth}=${authToken}`,
-                `${Cookies.CurrentApp}=${appToken}`,
-            ], [Headers.CSRF_TOKEN]: CSRF_TOKEN }, extras);
+                `${Cookie.Auth}=${authToken}`,
+                `${Cookie.CurrentApp}=${appToken}`,
+            ], [Header.CSRF_TOKEN]: CSRF_TOKEN }, extras);
         if (this.appId) {
-            headers[Headers.APP_ID] = this.appId;
+            headers[Header.APP_ID] = this.appId;
         }
         return headers;
     }
@@ -259,7 +259,7 @@ class TestConfiguration {
             Accept: "application/json",
         };
         if (appId) {
-            headers[Headers.APP_ID] = appId;
+            headers[Header.APP_ID] = appId;
         }
         return headers;
     }

package/dist/tests/utilities/structures.js

@@ -1,6 +1,6 @@
 "use strict";
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
-const { BUILTIN_PERMISSION_IDS } = require("@budibase/backend-core/permissions");
+const { BuiltinPermissionID } = require("@budibase/backend-core/permissions");
 const { createHomeScreen } = require("../../constants/screens");
 const { EMPTY_LAYOUT } = require("../../constants/layouts");
 const { cloneDeep } = require("lodash/fp");
@@ -101,7 +101,7 @@ exports.basicRole = () => {
     return {
         name: "NewRole",
         inherits: BUILTIN_ROLE_IDS.BASIC,
-        permissionId: BUILTIN_PERMISSION_IDS.READ_ONLY,
+        permissionId: BuiltinPermissionID.READ_ONLY,
     };
 };
 exports.basicDatasource = () => {