@budibase/server 2.3.18-alpha.9 → 2.3.19

package/dist/api/controllers/automation.js

@@ -85,13 +85,9 @@ function create(ctx) {
         automation.appId = ctx.appId;
         // call through to update if already exists
         if (automation._id && automation._rev) {
-            yield update(ctx);
-            return;
-        }
-        // Respect existing IDs if recreating a deleted automation
-        if (!automation._id) {
-            automation._id = (0, utils_1.generateAutomationID)();
+            return update(ctx);
         }
+        automation._id = (0, utils_1.generateAutomationID)();
         automation.type = "automation";
         automation = cleanAutomationInputs(automation);
         automation = yield (0, utils_2.checkForWebhooks)({
@@ -141,11 +137,6 @@ function update(ctx) {
         const db = backend_core_1.context.getAppDB();
         let automation = ctx.request.body;
         automation.appId = ctx.appId;
-        // Call through to create if it doesn't exist
-        if (!automation._id || !automation._rev) {
-            yield create(ctx);
-            return;
-        }
         const oldAutomation = yield db.get(automation._id);
         automation = cleanAutomationInputs(automation);
         automation = yield (0, utils_2.checkForWebhooks)({

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

@@ -184,8 +184,6 @@ function preview(ctx) {
                     schemaFields[key] = fieldType;
                 }
             }
-            // remove configuration before sending event
-            delete datasource.config;
             yield backend_core_1.events.query.previewed(datasource, query);
             ctx.body = {
                 rows,

package/dist/api/controllers/row/ExternalRequest.js

@@ -439,7 +439,7 @@ class ExternalRequest {
                     isOneSide(field)) {
                     continue;
                 }
-                const isMany = field.relationshipType === types_1.RelationshipTypes.MANY_TO_MANY;
+                const isMany = field.relationshipType === constants_1.RelationshipTypes.MANY_TO_MANY;
                 const tableId = isMany ? field.through : field.tableId;
                 const { tableName: relatedTableName } = (0, utils_3.breakExternalTableId)(tableId);
                 // @ts-ignore
@@ -609,9 +609,7 @@ class ExternalRequest {
                 },
                 resource: {
                     // have to specify the fields to avoid column overlap (for SQL)
-                    fields: isSql
-                        ? this.buildFields(table, config.includeSqlRelationships)
-                        : [],
+                    fields: isSql ? this.buildFields(table) : [],
                 },
                 filters,
                 sort,

package/dist/api/controllers/row/external.js

@@ -86,7 +86,6 @@ function patch(ctx) {
         return handleRequest(types_1.Operation.UPDATE, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
             row: inputs,
-            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         });
     });
 }
@@ -97,7 +96,6 @@ function save(ctx) {
         const tableId = ctx.params.tableId;
         return handleRequest(types_1.Operation.CREATE, tableId, {
             row: inputs,
-            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         });
     });
 }
@@ -115,9 +113,7 @@ exports.fetchView = fetchView;
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = ctx.params.tableId;
-        return handleRequest(types_1.Operation.READ, tableId, {
-            includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
-        });
+        return handleRequest(types_1.Operation.READ, tableId);
     });
 }
 exports.fetch = fetch;
@@ -127,7 +123,6 @@ function find(ctx) {
         const tableId = ctx.params.tableId;
         const response = (yield handleRequest(types_1.Operation.READ, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
-            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         }));
         return response ? response[0] : response;
     });
@@ -139,7 +134,6 @@ function destroy(ctx) {
         const id = ctx.request.body._id;
         const { row } = (yield handleRequest(types_1.Operation.DELETE, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
-            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         }));
         return { response: { ok: true }, row };
     });
@@ -153,7 +147,6 @@ function bulkDestroy(ctx) {
         for (let row of rows) {
             promises.push(handleRequest(types_1.Operation.DELETE, tableId, {
                 id: (0, utils_1.breakRowIdField)(row._id),
-                includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
             }));
         }
         const responses = (yield Promise.all(promises));
@@ -196,7 +189,6 @@ function search(ctx) {
                 filters: query,
                 sort,
                 paginate: paginateObj,
-                includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
             }));
             let hasNextPage = false;
             if (paginate && rows.length === limit) {
@@ -207,7 +199,6 @@ function search(ctx) {
                         limit: 1,
                         page: bookmark * limit + 1,
                     },
-                    includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
                 }));
                 hasNextPage = nextRows.length > 0;
             }
@@ -296,7 +287,6 @@ function fetchEnrichedRow(ctx) {
         const response = (yield handleRequest(types_1.Operation.READ, tableId, {
             id,
             datasource,
-            includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
         }));
         const table = tables[tableName];
         const row = response[0];
@@ -322,7 +312,6 @@ function fetchEnrichedRow(ctx) {
                         [primaryLink]: linkedIds,
                     },
                 },
-                includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
             });
         }
         return row;

package/dist/api/controllers/table/external.js

@@ -75,12 +75,12 @@ function getDatasourceId(table) {
     return (0, utils_1.breakExternalTableId)(table._id).datasourceId;
 }
 function otherRelationshipType(type) {
-    if (type === types_1.RelationshipTypes.MANY_TO_MANY) {
-        return types_1.RelationshipTypes.MANY_TO_MANY;
+    if (type === constants_1.RelationshipTypes.MANY_TO_MANY) {
+        return constants_1.RelationshipTypes.MANY_TO_MANY;
     }
-    return type === types_1.RelationshipTypes.ONE_TO_MANY
-        ? types_1.RelationshipTypes.MANY_TO_ONE
-        : types_1.RelationshipTypes.ONE_TO_MANY;
+    return type === constants_1.RelationshipTypes.ONE_TO_MANY
+        ? constants_1.RelationshipTypes.MANY_TO_ONE
+        : constants_1.RelationshipTypes.ONE_TO_MANY;
 }
 function generateManyLinkSchema(datasource, column, table, relatedTable) {
     if (!table.primary || !relatedTable.primary) {
@@ -116,7 +116,7 @@ function generateLinkSchema(column, table, relatedTable, type) {
     if (!table.primary || !relatedTable.primary) {
         throw new Error("Unable to generate link schema, no primary keys");
     }
-    const isOneSide = type === types_1.RelationshipTypes.ONE_TO_MANY;
+    const isOneSide = type === constants_1.RelationshipTypes.ONE_TO_MANY;
     const primary = isOneSide ? relatedTable.primary[0] : table.primary[0];
     // generate a foreign key
     const foreignKey = (0, utils_2.generateForeignKey)(column, relatedTable);
@@ -186,7 +186,7 @@ function save(ctx) {
             }
             const relatedColumnName = schema.fieldName;
             const relationType = schema.relationshipType;
-            if (relationType === types_1.RelationshipTypes.MANY_TO_MANY) {
+            if (relationType === constants_1.RelationshipTypes.MANY_TO_MANY) {
                 const junctionTable = generateManyLinkSchema(datasource, schema, table, relatedTable);
                 if (tables[junctionTable.name]) {
                     throw "Junction table already exists, cannot create another relationship.";
@@ -195,7 +195,7 @@ function save(ctx) {
                 extraTablesToUpdate.push(junctionTable);
             }
             else {
-                const fkTable = relationType === types_1.RelationshipTypes.ONE_TO_MANY ? table : relatedTable;
+                const fkTable = relationType === constants_1.RelationshipTypes.ONE_TO_MANY ? table : relatedTable;
                 const foreignKey = generateLinkSchema(schema, table, relatedTable, relationType);
                 fkTable.schema[foreignKey] = (0, utils_2.foreignKeyStructure)(foreignKey);
                 if (fkTable.constrained == null) {

package/dist/api/index.js

@@ -27,7 +27,6 @@ const compress = require("koa-compress");
 exports.router = new router_1.default();
 exports.router.get("/health", ctx => (ctx.status = 200));
 exports.router.get("/version", ctx => (ctx.body = package_json_1.default.version));
-exports.router.use(backend_core_1.middleware.errorHandling);
 exports.router
     .use(compress({
     threshold: 2048,
@@ -61,6 +60,27 @@ exports.router
     // @ts-ignore
     .use(currentapp_1.default)
     .use(backend_core_1.auth.auditLog);
+// error handling middleware
+exports.router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        yield next();
+    }
+    catch (err) {
+        ctx.status = err.status || err.statusCode || 500;
+        const error = backend_core_1.errors.getPublicError(err);
+        ctx.body = {
+            message: err.message,
+            status: ctx.status,
+            validationErrors: err.validation,
+            error,
+        };
+        ctx.log.error(err);
+        // unauthorised errors don't provide a useful trace
+        if (!environment_1.default.isTest()) {
+            console.trace(err);
+        }
+    }
+}));
 // authenticated routes
 for (let route of routes_1.mainRoutes) {
     exports.router.use(route.routes());

package/dist/api/routes/automation.js

@@ -40,7 +40,7 @@ router
     .get("/api/automations/definitions/list", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.getDefinitionList)
     .get("/api/automations", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetch)
     .get("/api/automations/:id", (0, resourceId_1.paramResource)("id"), (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.find)
-    .put("/api/automations", (0, resourceId_1.bodyResource)("_id"), (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.automationValidator)(false), controller.update)
+    .put("/api/automations", (0, resourceId_1.bodyResource)("_id"), (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.automationValidator)(true), controller.update)
     .post("/api/automations", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.automationValidator)(false), controller.create)
     .post("/api/automations/logs/search", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.logSearch)
     .delete("/api/automations/logs", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.clearLogError)

package/dist/api/routes/public/tests/utils.js

@@ -0,0 +1,33 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateMakeRequest = void 0;
+const utilities_1 = require("../../../../utilities");
+function generateMakeRequest(apiKey, setup) {
+    const request = setup.getRequest();
+    const config = setup.getConfig();
+    return (method, endpoint, body, intAppId = config.getAppId()) => __awaiter(this, void 0, void 0, function* () {
+        const extraHeaders = {
+            "x-budibase-api-key": apiKey,
+        };
+        if (intAppId) {
+            extraHeaders["x-budibase-app-id"] = intAppId;
+        }
+        const req = request[method]((0, utilities_1.checkSlashesInUrl)(`/api/public/v1/${endpoint}`)).set(config.defaultHeaders(extraHeaders));
+        if (body) {
+            req.send(body);
+        }
+        const res = yield req;
+        expect(res.body).toBeDefined();
+        return res;
+    });
+}
+exports.generateMakeRequest = generateMakeRequest;

package/dist/app.js

@@ -35,12 +35,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-if (process.env.DD_APM_ENABLED) {
-    require("./ddApm");
-}
-if (process.env.ELASTIC_APM_ENABLED) {
-    require("./elasticApm");
-}
 // need to load environment first
 const environment_1 = __importDefault(require("./environment"));
 // enable APM if configured
@@ -105,7 +99,7 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     console.log("Server Closed");
     yield automations.shutdown();
     yield redis.shutdown();
-    backend_core_1.events.shutdown();
+    yield backend_core_1.events.shutdown();
     yield threads_1.Thread.shutdown();
     api.shutdown();
     if (!environment_1.default.isTest()) {

package/dist/constants/index.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_AUTOMATION_RECURRING_ERRORS = exports.ObjectStoreBuckets = exports.AutomationErrors = exports.BuildSchemaErrors = exports.InvalidColumns = exports.MetadataTypes = exports.BaseQueryVerbs = exports.OBJ_STORE_DIRECTORY = exports.AutoFieldDefaultNames = exports.AutoFieldSubTypes = exports.USERS_TABLE_SCHEMA = exports.SortDirection = exports.DatasourceAuthTypes = exports.DataSourceOperation = exports.AuthTypes = exports.FormulaTypes = exports.SwitchableTypes = exports.CanSwitchTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = exports.RelationshipTypes = exports.FieldTypes = void 0;
+exports.MAX_AUTOMATION_RECURRING_ERRORS = exports.ObjectStoreBuckets = exports.AutomationErrors = exports.BuildSchemaErrors = exports.InvalidColumns = exports.MetadataTypes = exports.BaseQueryVerbs = exports.OBJ_STORE_DIRECTORY = exports.AutoFieldDefaultNames = exports.AutoFieldSubTypes = exports.USERS_TABLE_SCHEMA = exports.SortDirection = exports.DatasourceAuthTypes = exports.DataSourceOperation = exports.AuthTypes = exports.FormulaTypes = exports.RelationshipTypes = exports.SwitchableTypes = exports.CanSwitchTypes = exports.FieldTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = void 0;
 const backend_core_1 = require("@budibase/backend-core");
-var types_1 = require("@budibase/types");
-Object.defineProperty(exports, "FieldTypes", { enumerable: true, get: function () { return types_1.FieldType; } });
-Object.defineProperty(exports, "RelationshipTypes", { enumerable: true, get: function () { return types_1.RelationshipTypes; } });
 var FilterTypes;
 (function (FilterTypes) {
     FilterTypes["STRING"] = "string";
@@ -26,6 +23,23 @@ exports.NoEmptyFilterStrings = [
     FilterTypes.CONTAINS,
     FilterTypes.NOT_CONTAINS,
 ];
+var FieldTypes;
+(function (FieldTypes) {
+    FieldTypes["STRING"] = "string";
+    FieldTypes["BARCODEQR"] = "barcodeqr";
+    FieldTypes["LONGFORM"] = "longform";
+    FieldTypes["OPTIONS"] = "options";
+    FieldTypes["NUMBER"] = "number";
+    FieldTypes["BOOLEAN"] = "boolean";
+    FieldTypes["ARRAY"] = "array";
+    FieldTypes["DATETIME"] = "datetime";
+    FieldTypes["ATTACHMENT"] = "attachment";
+    FieldTypes["LINK"] = "link";
+    FieldTypes["FORMULA"] = "formula";
+    FieldTypes["AUTO"] = "auto";
+    FieldTypes["JSON"] = "json";
+    FieldTypes["INTERNAL"] = "internal";
+})(FieldTypes = exports.FieldTypes || (exports.FieldTypes = {}));
 exports.CanSwitchTypes = [
     [exports.FieldTypes.JSON, exports.FieldTypes.ARRAY],
     [
@@ -37,6 +51,12 @@ exports.CanSwitchTypes = [
     [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ];
 exports.SwitchableTypes = exports.CanSwitchTypes.reduce((prev, current) => prev ? prev.concat(current) : current);
+var RelationshipTypes;
+(function (RelationshipTypes) {
+    RelationshipTypes["ONE_TO_MANY"] = "one-to-many";
+    RelationshipTypes["MANY_TO_ONE"] = "many-to-one";
+    RelationshipTypes["MANY_TO_MANY"] = "many-to-many";
+})(RelationshipTypes = exports.RelationshipTypes || (exports.RelationshipTypes = {}));
 var FormulaTypes;
 (function (FormulaTypes) {
     FormulaTypes["STATIC"] = "static";

package/dist/db/defaultData/datasource_bb_default.js

@@ -13,7 +13,6 @@ const employeeImport_1 = require("./employeeImport");
 const jobsImport_1 = require("./jobsImport");
 const expensesImport_1 = require("./expensesImport");
 const backend_core_1 = require("@budibase/backend-core");
-const types_1 = require("@budibase/types");
 exports.DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs";
 exports.DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory";
 exports.DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses";
@@ -261,7 +260,7 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
             name: "Employee Level",
             sortable: false,
         }, "Badge Photo": {
-            type: constants_1.FieldTypes.ATTACHMENT,
+            type: "attachment",
             constraints: {
                 type: constants_1.FieldTypes.ARRAY,
                 presence: false,
@@ -276,7 +275,7 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
             },
             fieldName: "Assigned",
             name: "Jobs",
-            relationshipType: types_1.RelationshipTypes.MANY_TO_MANY,
+            relationshipType: constants_1.RelationshipTypes.MANY_TO_MANY,
             tableId: exports.DEFAULT_JOBS_TABLE_ID,
         }, "Start Date": {
             type: constants_1.FieldTypes.DATETIME,
@@ -420,10 +419,10 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = {
             type: constants_1.FieldTypes.LINK,
             tableId: exports.DEFAULT_EMPLOYEE_TABLE_ID,
             fieldName: "Jobs",
-            relationshipType: types_1.RelationshipTypes.MANY_TO_MANY,
+            relationshipType: constants_1.RelationshipTypes.MANY_TO_MANY,
             // sortable: true,
         }, "Works End": {
-            type: constants_1.FieldTypes.DATETIME,
+            type: "datetime",
             constraints: {
                 type: "string",
                 length: {},
@@ -436,7 +435,7 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = {
             name: "Works End",
             ignoreTimezones: true,
         }, "Updated Price": {
-            type: constants_1.FieldTypes.NUMBER,
+            type: "number",
             constraints: {
                 type: "number",
                 presence: false,

package/dist/db/linkedRows/LinkController.js

@@ -18,7 +18,6 @@ const node_1 = __importDefault(require("@sentry/node"));
 const constants_1 = require("../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 const LinkDocument_1 = __importDefault(require("./LinkDocument"));
-const types_1 = require("@budibase/types");
 class LinkController {
     constructor({ tableId, row, table, oldTable }) {
         this._db = backend_core_1.context.getAppDB();
@@ -125,17 +124,17 @@ class LinkController {
      */
     handleRelationshipType(linkerField, linkedField) {
         if (!linkerField.relationshipType ||
-            linkerField.relationshipType === types_1.RelationshipTypes.MANY_TO_MANY) {
-            linkedField.relationshipType = types_1.RelationshipTypes.MANY_TO_MANY;
+            linkerField.relationshipType === constants_1.RelationshipTypes.MANY_TO_MANY) {
+            linkedField.relationshipType = constants_1.RelationshipTypes.MANY_TO_MANY;
             // make sure by default all are many to many (if not specified)
-            linkerField.relationshipType = types_1.RelationshipTypes.MANY_TO_MANY;
+            linkerField.relationshipType = constants_1.RelationshipTypes.MANY_TO_MANY;
         }
-        else if (linkerField.relationshipType === types_1.RelationshipTypes.MANY_TO_ONE) {
+        else if (linkerField.relationshipType === constants_1.RelationshipTypes.MANY_TO_ONE) {
             // Ensure that the other side of the relationship is locked to one record
-            linkedField.relationshipType = types_1.RelationshipTypes.ONE_TO_MANY;
+            linkedField.relationshipType = constants_1.RelationshipTypes.ONE_TO_MANY;
         }
-        else if (linkerField.relationshipType === types_1.RelationshipTypes.ONE_TO_MANY) {
-            linkedField.relationshipType = types_1.RelationshipTypes.MANY_TO_ONE;
+        else if (linkerField.relationshipType === constants_1.RelationshipTypes.ONE_TO_MANY) {
+            linkedField.relationshipType = constants_1.RelationshipTypes.MANY_TO_ONE;
         }
         return { linkerField, linkedField };
     }
@@ -179,7 +178,7 @@ class LinkController {
                     }
                     // iterate through the link IDs in the row field, see if any don't exist already
                     for (let linkId of rowField) {
-                        if ((linkedSchema === null || linkedSchema === void 0 ? void 0 : linkedSchema.relationshipType) === types_1.RelationshipTypes.ONE_TO_MANY) {
+                        if ((linkedSchema === null || linkedSchema === void 0 ? void 0 : linkedSchema.relationshipType) === constants_1.RelationshipTypes.ONE_TO_MANY) {
                             let links = (yield (0, linkUtils_1.getLinkDocuments)({
                                 tableId: field.tableId,
                                 rowId: linkId,

package/dist/integrations/base/sql.js

@@ -90,9 +90,6 @@ function parseFilters(filters) {
 function generateSelectStatement(json, knex) {
     var _a;
     const { resource, meta } = json;
-    if (!resource) {
-        return "*";
-    }
     const schema = (_a = meta === null || meta === void 0 ? void 0 : meta.table) === null || _a === void 0 ? void 0 : _a.schema;
     return resource.fields.map(field => {
         const fieldNames = field.split(/\./g);
@@ -382,9 +379,7 @@ class InternalBuilder {
             return query.insert(parsedBody);
         }
         else {
-            return query
-                .insert(parsedBody)
-                .returning(generateSelectStatement(json, knex));
+            return query.insert(parsedBody).returning("*");
         }
     }
     bulkCreate(knex, json) {
@@ -463,9 +458,7 @@ class InternalBuilder {
             return query.update(parsedBody);
         }
         else {
-            return query
-                .update(parsedBody)
-                .returning(generateSelectStatement(json, knex));
+            return query.update(parsedBody).returning("*");
         }
     }
     delete(knex, json, opts) {
@@ -480,7 +473,7 @@ class InternalBuilder {
             return query.delete();
         }
         else {
-            return query.delete().returning(generateSelectStatement(json, knex));
+            return query.delete().returning("*");
         }
     }
 }

package/dist/middleware/authorized.js

@@ -66,6 +66,9 @@ exports.default = (permType, permLevel = null, opts = { schema: false }) => (ctx
     if (!ctx.user) {
         return ctx.throw(403, "No user info found");
     }
+    // check general builder stuff, this middleware is a good way
+    // to find API endpoints which are builder focused
+    yield (0, builder_1.default)(ctx, permType);
     // get the resource roles
     let resourceRoles = [];
     let otherLevelRoles = [];
@@ -89,11 +92,6 @@ exports.default = (permType, permLevel = null, opts = { schema: false }) => (ctx
     if (!ctx.isAuthenticated) {
         return ctx.throw(403, "Session not authenticated");
     }
-    // check general builder stuff, this middleware is a good way
-    // to find API endpoints which are builder focused
-    if (permType === backend_core_1.permissions.PermissionType.BUILDER) {
-        yield (0, builder_1.default)(ctx);
-    }
     try {
         // check authorized
         yield checkAuthorized(ctx, resourceRoles, permType, permLevel);

package/dist/middleware/builder.js

@@ -61,17 +61,14 @@ function updateAppUpdatedAt(ctx) {
         }));
     });
 }
-function builder(ctx) {
+function builder(ctx, permType) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         // this only functions within an app context
         if (!appId) {
             return;
         }
-        // check authenticated
-        if (!ctx.isAuthenticated) {
-            return ctx.throw(403, "Session not authenticated");
-        }
+        const isBuilderApi = permType === backend_core_1.permissions.PermissionType.BUILDER;
         const referer = ctx.headers["referer"];
         const overviewPath = "/builder/portal/overview/";
         const overviewContext = !referer ? false : referer.includes(overviewPath);
@@ -81,7 +78,7 @@ function builder(ctx) {
         const hasAppId = !referer ? false : referer.includes(appId);
         const editingApp = referer ? hasAppId : false;
         // check this is a builder call and editing
-        if (!editingApp) {
+        if (!isBuilderApi || !editingApp) {
             return;
         }
         // check locks

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.3.18-alpha.8",
+    "version": "2.3.18",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -14,7 +14,7 @@
         "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
         "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
         "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
-        "test": "bash scripts/test.sh",
+        "test": "jest --coverage --maxWorkers=2",
         "test:watch": "jest --watch",
         "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
         "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.3.18-alpha.8",
-        "@budibase/client": "2.3.18-alpha.8",
-        "@budibase/pro": "2.3.18-alpha.8",
-        "@budibase/string-templates": "2.3.18-alpha.8",
-        "@budibase/types": "2.3.18-alpha.8",
+        "@budibase/backend-core": "^2.3.18",
+        "@budibase/client": "^2.3.18",
+        "@budibase/pro": "2.3.18",
+        "@budibase/string-templates": "^2.3.18",
+        "@budibase/types": "^2.3.18",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -64,7 +64,6 @@
         "chokidar": "3.5.3",
         "csvtojson": "2.0.10",
         "curlconverter": "3.21.0",
-        "dd-trace": "3.13.2",
         "dotenv": "8.2.0",
         "download": "8.0.0",
         "elastic-apm-node": "3.38.0",
@@ -126,7 +125,6 @@
         "@jest/test-sequencer": "24.9.0",
         "@swc/core": "^1.3.25",
         "@swc/jest": "^0.2.24",
-        "@trendyol/jest-testcontainers": "^2.1.1",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",
         "@types/global-agent": "2.1.1",
@@ -142,7 +140,6 @@
         "@types/pouchdb": "6.4.0",
         "@types/redis": "4.0.11",
         "@types/server-destroy": "1.0.1",
-        "@types/supertest": "2.0.12",
         "@types/tar": "6.1.3",
         "@typescript-eslint/parser": "5.45.0",
         "apidoc": "0.50.4",
@@ -154,14 +151,13 @@
         "is-wsl": "2.2.0",
         "jest": "28.1.1",
         "jest-openapi": "0.14.2",
-        "jest-serial-runner": "^1.2.1",
         "nodemon": "2.0.15",
         "openapi-types": "9.3.1",
         "openapi-typescript": "5.2.0",
         "path-to-regexp": "6.2.0",
         "prettier": "2.5.1",
         "rimraf": "3.0.2",
-        "supertest": "6.2.2",
+        "supertest": "4.0.2",
         "swagger-jsdoc": "6.1.0",
         "timekeeper": "2.2.0",
         "ts-jest": "28.0.4",

package/dist/sdk/app/backups/exports.js

@@ -45,18 +45,12 @@ function tarFilesToTmp(tmpDir, files) {
  */
 function exportDB(dbName, opts = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const exportOpts = {
-            filter: opts === null || opts === void 0 ? void 0 : opts.filter,
-            batch_size: 1000,
-            batch_limit: 5,
-            style: "main_only",
-        };
         return backend_core_1.db.doWithDB(dbName, (db) => __awaiter(this, void 0, void 0, function* () {
             // Write the dump to file if required
             if (opts === null || opts === void 0 ? void 0 : opts.exportPath) {
                 const path = opts === null || opts === void 0 ? void 0 : opts.exportPath;
                 const writeStream = fs_1.default.createWriteStream(path);
-                yield db.dump(writeStream, exportOpts);
+                yield db.dump(writeStream, { filter: opts === null || opts === void 0 ? void 0 : opts.filter });
                 return path;
             }
             else {
@@ -66,7 +60,7 @@ function exportDB(dbName, opts = {}) {
                 memStream.on("data", (chunk) => {
                     appString += chunk.toString();
                 });
-                yield db.dump(memStream, exportOpts);
+                yield db.dump(memStream, { filter: opts === null || opts === void 0 ? void 0 : opts.filter });
                 return appString;
             }
         }));

package/dist/sdk/app/datasources/datasources.js

@@ -89,9 +89,6 @@ function removeSecrets(datasources) {
         const definitions = yield (0, integrations_1.getDefinitions)();
         for (let datasource of datasources) {
             const schema = definitions[datasource.source];
-            if (!schema) {
-                continue;
-            }
             if (datasource.config) {
                 // strip secrets from response, so they don't show in the network request
                 if (datasource.config.auth) {