@budibase/server 2.3.20 → 2.3.21-alpha.0

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

@@ -11,7 +11,7 @@ const read = [], write = [];
  * @openapi
  * /tables/{tableId}/rows:
  *   post:
- *     operationId: create
+ *     operationId: rowCreate
  *     summary: Create a row
  *     description: Creates a row within the specified table.
  *     tags:
@@ -45,7 +45,7 @@ write.push(new Endpoint_1.default("post", "/tables/:tableId/rows", rows_1.defaul
  * @openapi
  * /tables/{tableId}/rows/{rowId}:
  *   put:
- *     operationId: update
+ *     operationId: rowUpdate
  *     summary: Update a row
  *     description: Updates a row within the specified table.
  *     tags:
@@ -79,7 +79,7 @@ write.push(new Endpoint_1.default("put", "/tables/:tableId/rows/:rowId", rows_1.
  * @openapi
  * /tables/{tableId}/rows/{rowId}:
  *   delete:
- *     operationId: destroy
+ *     operationId: rowDestroy
  *     summary: Delete a row
  *     description: Deletes a row within the specified table.
  *     tags:
@@ -104,7 +104,7 @@ write.push(new Endpoint_1.default("delete", "/tables/:tableId/rows/:rowId", rows
  * @openapi
  * /tables/{tableId}/rows/{rowId}:
  *   get:
- *     operationId: getById
+ *     operationId: rowGetById
  *     summary: Retrieve a row
  *     description: This gets a single row, it will be enriched with the full related rows, rather than
  *       the squashed "primaryDisplay" format returned by the search endpoint.
@@ -130,7 +130,7 @@ read.push(new Endpoint_1.default("get", "/tables/:tableId/rows/:rowId", rows_1.d
  * @openapi
  * /tables/{tableId}/rows/search:
  *   post:
- *     operationId: search
+ *     operationId: rowSearch
  *     summary: Search for rows
  *     tags:
  *       - rows

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

@@ -11,7 +11,7 @@ const read = [], write = [];
  * @openapi
  * /tables:
  *   post:
- *     operationId: create
+ *     operationId: tableCreate
  *     summary: Create a table
  *     description: Create a table, this could be internal or external.
  *     tags:
@@ -43,7 +43,7 @@ write.push(new Endpoint_1.default("post", "/tables", tables_1.default.create).ad
  * @openapi
  * /tables/{tableId}:
  *   put:
- *     operationId: update
+ *     operationId: tableUpdate
  *     summary: Update a table
  *     description: Update a table, this could be internal or external.
  *     tags:
@@ -75,7 +75,7 @@ write.push(new Endpoint_1.default("put", "/tables/:tableId", tables_1.default.up
  * @openapi
  * /tables/{tableId}:
  *   delete:
- *     operationId: destroy
+ *     operationId: tableDestroy
  *     summary: Delete a table
  *     description: Delete a table, this could be internal or external.
  *     tags:
@@ -99,7 +99,7 @@ write.push(new Endpoint_1.default("delete", "/tables/:tableId", tables_1.default
  * @openapi
  * /tables/{tableId}:
  *   get:
- *     operationId: getById
+ *     operationId: tableGetById
  *     summary: Retrieve a table
  *     description: Lookup a table, this could be internal or external.
  *     tags:
@@ -123,7 +123,7 @@ read.push(new Endpoint_1.default("get", "/tables/:tableId", tables_1.default.rea
  * @openapi
  * /tables/search:
  *   post:
- *     operationId: search
+ *     operationId: tableSearch
  *     summary: Search for tables
  *     description: Based on table properties (currently only name) search for tables. This could be
  *       an internal or an external table.

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

@@ -11,7 +11,7 @@ const read = [], write = [];
  * @openapi
  * /users:
  *   post:
- *     operationId: create
+ *     operationId: userCreate
  *     summary: Create a user
  *     tags:
  *       - users
@@ -37,7 +37,7 @@ write.push(new Endpoint_1.default("post", "/users", users_1.default.create));
  * @openapi
  * /users/{userId}:
  *   put:
- *     operationId: update
+ *     operationId: userUpdate
  *     summary: Update a user
  *     tags:
  *       - users
@@ -65,7 +65,7 @@ write.push(new Endpoint_1.default("put", "/users/:userId", users_1.default.updat
  * @openapi
  * /users/{userId}:
  *   delete:
- *     operationId: destroy
+ *     operationId: userDestroy
  *     summary: Delete a user
  *     tags:
  *       - users
@@ -87,7 +87,7 @@ write.push(new Endpoint_1.default("delete", "/users/:userId", users_1.default.de
  * @openapi
  * /users/{userId}:
  *   get:
- *     operationId: getById
+ *     operationId: userGetById
  *     summary: Retrieve a user
  *     tags:
  *       - users
@@ -109,7 +109,7 @@ read.push(new Endpoint_1.default("get", "/users/:userId", users_1.default.read))
  * @openapi
  * /users/search:
  *   post:
- *     operationId: search
+ *     operationId: userSearch
  *     summary: Search for users
  *     description: Based on user properties (currently only name) search for users.
  *     tags:

package/dist/app.js

@@ -35,6 +35,12 @@ 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
@@ -58,6 +64,7 @@ const websocket_1 = require("./websocket");
 const startup_1 = require("./startup");
 const Sentry = require("@sentry/node");
 const destroyable = require("server-destroy");
+const { userAgent } = require("koa-useragent");
 const app = new koa_1.default();
 let mbNumber = parseInt(environment_1.default.HTTP_MB_LIMIT || "10");
 if (!mbNumber || isNaN(mbNumber)) {
@@ -74,6 +81,7 @@ app.use((0, koa_body_1.default)({
     parsedMethods: ["POST", "PUT", "PATCH", "DELETE"],
 }));
 app.use(backend_core_1.middleware.logging);
+app.use(userAgent);
 if (environment_1.default.isProd()) {
     environment_1.default._set("NODE_ENV", "production");
     Sentry.init();
@@ -99,7 +107,7 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     console.log("Server Closed");
     yield automations.shutdown();
     yield redis.shutdown();
-    yield backend_core_1.events.shutdown();
+    backend_core_1.events.shutdown();
     yield threads_1.Thread.shutdown();
     api.shutdown();
     if (!environment_1.default.isTest()) {

package/dist/constants/index.js

@@ -1,7 +1,10 @@
 "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.RelationshipTypes = exports.SwitchableTypes = exports.CanSwitchTypes = exports.FieldTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = 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.SwitchableTypes = exports.CanSwitchTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = exports.RelationshipTypes = exports.FieldTypes = 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";
@@ -23,23 +26,6 @@ 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],
     [
@@ -51,12 +37,6 @@ 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,6 +13,7 @@ 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";
@@ -260,7 +261,7 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
             name: "Employee Level",
             sortable: false,
         }, "Badge Photo": {
-            type: "attachment",
+            type: constants_1.FieldTypes.ATTACHMENT,
             constraints: {
                 type: constants_1.FieldTypes.ARRAY,
                 presence: false,
@@ -275,7 +276,7 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
             },
             fieldName: "Assigned",
             name: "Jobs",
-            relationshipType: constants_1.RelationshipTypes.MANY_TO_MANY,
+            relationshipType: types_1.RelationshipTypes.MANY_TO_MANY,
             tableId: exports.DEFAULT_JOBS_TABLE_ID,
         }, "Start Date": {
             type: constants_1.FieldTypes.DATETIME,
@@ -419,10 +420,10 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = {
             type: constants_1.FieldTypes.LINK,
             tableId: exports.DEFAULT_EMPLOYEE_TABLE_ID,
             fieldName: "Jobs",
-            relationshipType: constants_1.RelationshipTypes.MANY_TO_MANY,
+            relationshipType: types_1.RelationshipTypes.MANY_TO_MANY,
             // sortable: true,
         }, "Works End": {
-            type: "datetime",
+            type: constants_1.FieldTypes.DATETIME,
             constraints: {
                 type: "string",
                 length: {},
@@ -435,7 +436,7 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = {
             name: "Works End",
             ignoreTimezones: true,
         }, "Updated Price": {
-            type: "number",
+            type: constants_1.FieldTypes.NUMBER,
             constraints: {
                 type: "number",
                 presence: false,

package/dist/db/index.js

@@ -1,10 +1,33 @@
 "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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
-const backend_core_1 = require("@budibase/backend-core");
+const core = __importStar(require("@budibase/backend-core"));
 const environment_1 = __importDefault(require("../environment"));
 function init() {
     const dbConfig = {
@@ -15,6 +38,6 @@ function init() {
         dbConfig.inMemory = true;
         dbConfig.allDbs = true;
     }
-    (0, backend_core_1.init)({ db: dbConfig });
+    core.init({ db: dbConfig });
 }
 exports.init = init;

package/dist/db/linkedRows/LinkController.js

@@ -18,6 +18,7 @@ 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();
@@ -124,17 +125,17 @@ class LinkController {
      */
     handleRelationshipType(linkerField, linkedField) {
         if (!linkerField.relationshipType ||
-            linkerField.relationshipType === constants_1.RelationshipTypes.MANY_TO_MANY) {
-            linkedField.relationshipType = constants_1.RelationshipTypes.MANY_TO_MANY;
+            linkerField.relationshipType === types_1.RelationshipTypes.MANY_TO_MANY) {
+            linkedField.relationshipType = types_1.RelationshipTypes.MANY_TO_MANY;
             // make sure by default all are many to many (if not specified)
-            linkerField.relationshipType = constants_1.RelationshipTypes.MANY_TO_MANY;
+            linkerField.relationshipType = types_1.RelationshipTypes.MANY_TO_MANY;
         }
-        else if (linkerField.relationshipType === constants_1.RelationshipTypes.MANY_TO_ONE) {
+        else if (linkerField.relationshipType === types_1.RelationshipTypes.MANY_TO_ONE) {
             // Ensure that the other side of the relationship is locked to one record
-            linkedField.relationshipType = constants_1.RelationshipTypes.ONE_TO_MANY;
+            linkedField.relationshipType = types_1.RelationshipTypes.ONE_TO_MANY;
         }
-        else if (linkerField.relationshipType === constants_1.RelationshipTypes.ONE_TO_MANY) {
-            linkedField.relationshipType = constants_1.RelationshipTypes.MANY_TO_ONE;
+        else if (linkerField.relationshipType === types_1.RelationshipTypes.ONE_TO_MANY) {
+            linkedField.relationshipType = types_1.RelationshipTypes.MANY_TO_ONE;
         }
         return { linkerField, linkedField };
     }
@@ -178,7 +179,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) === constants_1.RelationshipTypes.ONE_TO_MANY) {
+                        if ((linkedSchema === null || linkedSchema === void 0 ? void 0 : linkedSchema.relationshipType) === types_1.RelationshipTypes.ONE_TO_MANY) {
                             let links = (yield (0, linkUtils_1.getLinkDocuments)({
                                 tableId: field.tableId,
                                 rowId: linkId,

package/dist/db/utils.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMemoryViewID = exports.getMetadataParams = exports.generateMetadataID = exports.generateUserFlagID = exports.getQueryParams = exports.getAutomationMetadataParams = exports.generateAutomationMetadataID = exports.generateQueryID = exports.getDatasourceParams = exports.generateDatasourceID = exports.getWebhookParams = exports.generateWebhookID = exports.getScreenParams = exports.generateScreenID = exports.getLayoutParams = exports.generateLayoutID = exports.getLinkParams = exports.generateLinkID = exports.generateAutomationID = exports.getAutomationParams = exports.getTableIDFromRowID = exports.generateTableID = exports.getTableParams = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.getUserMetadataParams = exports.generateRowID = exports.getRowParams = exports.getDocParams = exports.getQueryIndex = exports.getRoleParams = exports.generateRoleID = exports.generateDevAppID = exports.generateAppID = exports.UNICODE_MAX = exports.InternalTables = exports.ViewName = exports.TABLE_ROW_PREFIX = exports.LINK_USER_METADATA_PREFIX = exports.USER_METDATA_PREFIX = exports.isProdAppID = exports.isDevAppID = exports.APP_DEV_PREFIX = exports.APP_PREFIX = exports.DocumentType = exports.StaticDatabases = exports.SEPARATOR = exports.BudibaseInternalDB = exports.SearchIndexes = exports.AppStatus = void 0;
-exports.getMultiIDParams = exports.generatePluginID = exports.getMemoryViewParams = void 0;
+exports.getMemoryViewParams = exports.generateMemoryViewID = exports.getMetadataParams = exports.generateMetadataID = exports.generateUserFlagID = exports.getQueryParams = exports.getAutomationMetadataParams = exports.generateAutomationMetadataID = exports.generateQueryID = exports.getDatasourceParams = exports.generateDatasourceID = exports.getWebhookParams = exports.generateWebhookID = exports.getScreenParams = exports.generateScreenID = exports.getLayoutParams = exports.generateLayoutID = exports.getLinkParams = exports.generateLinkID = exports.generateAutomationID = exports.getAutomationParams = exports.getTableIDFromRowID = exports.generateTableID = exports.getTableParams = exports.getGlobalIDFromUserMetadataID = exports.generateUserMetadataID = exports.getUserMetadataParams = exports.generateRowID = exports.getRowParams = exports.getDocParams = exports.getQueryIndex = exports.getRoleParams = exports.generateRoleID = exports.generateDevAppID = exports.generateAppID = exports.UNICODE_MAX = exports.InternalTables = exports.ViewName = exports.TABLE_ROW_PREFIX = exports.LINK_USER_METADATA_PREFIX = exports.USER_METDATA_PREFIX = exports.isProdAppID = exports.isDevAppID = exports.APP_DEV_PREFIX = exports.APP_PREFIX = exports.DocumentType = exports.StaticDatabases = exports.SEPARATOR = exports.BudibaseInternalDB = exports.AppStatus = void 0;
+exports.getMultiIDParams = exports.generatePluginID = void 0;
 const newid_1 = __importDefault(require("./newid"));
 const backend_core_1 = require("@budibase/backend-core");
 exports.AppStatus = {
@@ -12,9 +12,6 @@ exports.AppStatus = {
     ALL: "all",
     DEPLOYED: "published",
 };
-exports.SearchIndexes = {
-    ROWS: "rows",
-};
 exports.BudibaseInternalDB = {
     _id: "bb_internal",
     type: backend_core_1.db.BUDIBASE_DATASOURCE_TYPE,

package/dist/db/views/staticViews.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAllSearchIndex = exports.createRoutingView = exports.createLinkView = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../utils");
+const types_1 = require("@budibase/types");
 const SCREEN_PREFIX = utils_1.DocumentType.SCREEN + utils_1.SEPARATOR;
 /**************************************************
  *                  INFORMATION                   *
@@ -99,7 +100,7 @@ function searchIndex(indexName, fnString) {
 }
 function createAllSearchIndex() {
     return __awaiter(this, void 0, void 0, function* () {
-        yield searchIndex(utils_1.SearchIndexes.ROWS, function (doc) {
+        yield searchIndex(types_1.SearchIndex.ROWS, function (doc) {
             function idx(input, prev) {
                 for (let key of Object.keys(input)) {
                     let idxKey = prev != null ? `${prev}.${key}` : key;

package/dist/ddApm.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const dd_trace_1 = __importDefault(require("dd-trace"));
+// enable APM if configured
+if (process.env.DD_APM_ENABLED) {
+    console.log("Starting dd-trace");
+    dd_trace_1.default.init();
+}

package/dist/elasticApm.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const elastic_apm_node_1 = __importDefault(require("elastic-apm-node"));
+// enable APM if configured
+if (process.env.ELASTIC_APM_ENABLED) {
+    console.log("Starting elastic-apm-node");
+    elastic_apm_node_1.default.start({
+        serviceName: process.env.SERVICE,
+        environment: process.env.BUDIBASE_ENVIRONMENT,
+    });
+}

package/dist/integrations/base/sql.js

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const knex_1 = require("knex");
 const types_1 = require("@budibase/types");
+const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../utils");
 const sqlTable_1 = __importDefault(require("./sqlTable"));
 const environment_1 = __importDefault(require("../../environment"));
-const utils_2 = require("./utils");
 const envLimit = environment_1.default.SQL_MAX_ROWS
     ? parseInt(environment_1.default.SQL_MAX_ROWS)
     : null;
@@ -90,6 +90,9 @@ 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);
@@ -114,7 +117,7 @@ class InternalBuilder {
     addFilters(query, filters, opts) {
         function iterate(structure, fn) {
             for (let [key, value] of Object.entries(structure)) {
-                const updatedKey = (0, utils_2.removeKeyNumbering)(key);
+                const updatedKey = backend_core_1.db.removeKeyNumbering(key);
                 const isRelationshipField = updatedKey.includes(".");
                 if (!opts.relationship && !isRelationshipField) {
                     fn(`${opts.tableName}.${updatedKey}`, value);
@@ -473,7 +476,7 @@ class InternalBuilder {
             return query.delete();
         }
         else {
-            return query.delete().returning("*");
+            return query.delete().returning(generateSelectStatement(json, knex));
         }
     }
 }

package/dist/integrations/googlesheets.js

@@ -17,9 +17,8 @@ const google_auth_library_1 = require("google-auth-library");
 const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const google_spreadsheet_1 = require("google-spreadsheet");
-const environment_1 = __importDefault(require("../environment"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const backend_core_1 = require("@budibase/backend-core");
-const fetch = require("node-fetch");
 const SCHEMA = {
     plus: true,
     auth: {
@@ -120,7 +119,7 @@ class GoogleSheetsIntegration {
     }
     fetchAccessToken(payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield fetch("https://www.googleapis.com/oauth2/v4/token", {
+            const response = yield (0, node_fetch_1.default)("https://www.googleapis.com/oauth2/v4/token", {
                 method: "POST",
                 body: JSON.stringify(Object.assign(Object.assign({}, payload), { grant_type: "refresh_token" })),
                 headers: {
@@ -138,15 +137,9 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Initialise oAuth client
-                const db = backend_core_1.tenancy.getGlobalDB();
-                let googleConfig = yield backend_core_1.db.getScopedConfig(db, {
-                    type: backend_core_1.constants.Config.GOOGLE,
-                });
+                let googleConfig = yield backend_core_1.configs.getGoogleDatasourceConfig();
                 if (!googleConfig) {
-                    googleConfig = {
-                        clientID: environment_1.default.GOOGLE_CLIENT_ID,
-                        clientSecret: environment_1.default.GOOGLE_CLIENT_SECRET,
-                    };
+                    throw new backend_core_1.HTTPError("Google config not found", 400);
                 }
                 const oauthClient = new google_auth_library_1.OAuth2Client({
                     clientId: googleConfig.clientID,
@@ -173,7 +166,7 @@ class GoogleSheetsIntegration {
     buildSchema(datasourceId) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.connect();
-            const sheets = yield this.client.sheetsByIndex;
+            const sheets = this.client.sheetsByIndex;
             const tables = {};
             for (let sheet of sheets) {
                 // must fetch rows to determine schema
@@ -254,7 +247,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[table.name];
+                const sheet = this.client.sheetsByTitle[table.name];
                 yield sheet.loadHeaderRow();
                 if (table._rename) {
                     const headers = [];
@@ -269,8 +262,12 @@ class GoogleSheetsIntegration {
                     yield sheet.setHeaderRow(headers);
                 }
                 else {
-                    let newField = Object.keys(table.schema).find(key => !sheet.headerValues.includes(key));
-                    yield sheet.setHeaderRow([...sheet.headerValues, newField]);
+                    const updatedHeaderValues = [...sheet.headerValues];
+                    const newField = Object.keys(table.schema).find(key => !sheet.headerValues.includes(key));
+                    if (newField) {
+                        updatedHeaderValues.push(newField);
+                    }
+                    yield sheet.setHeaderRow(updatedHeaderValues);
                 }
             }
             catch (err) {
@@ -283,7 +280,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheetToDelete = yield this.client.sheetsByTitle[sheet];
+                const sheetToDelete = this.client.sheetsByTitle[sheet];
                 return yield sheetToDelete.delete();
             }
             catch (err) {
@@ -296,7 +293,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[query.sheet];
+                const sheet = this.client.sheetsByTitle[query.sheet];
                 const rowToInsert = typeof query.row === "string" ? JSON.parse(query.row) : query.row;
                 const row = yield sheet.addRow(rowToInsert);
                 return [
@@ -313,7 +310,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[query.sheet];
+                const sheet = this.client.sheetsByTitle[query.sheet];
                 const rows = yield sheet.getRows();
                 const headerValues = sheet.headerValues;
                 const response = [];
@@ -332,7 +329,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                const sheet = yield this.client.sheetsByTitle[query.sheet];
+                const sheet = this.client.sheetsByTitle[query.sheet];
                 const rows = yield sheet.getRows();
                 const row = rows[query.rowIndex];
                 if (row) {
@@ -358,7 +355,7 @@ class GoogleSheetsIntegration {
     delete(query) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.connect();
-            const sheet = yield this.client.sheetsByTitle[query.sheet];
+            const sheet = this.client.sheetsByTitle[query.sheet];
             const rows = yield sheet.getRows();
             const row = rows[query.rowIndex];
             if (row) {

package/dist/middleware/authorized.js

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

package/dist/migrations/functions/backfill/global/configs.js

@@ -12,14 +12,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.backfill = void 0;
+exports.backfill = exports.getConfigParams = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("./../../../../environment"));
-const getConfigs = (globalDb) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield globalDb.allDocs(backend_core_1.db.getConfigParams({}, {
+const getConfigParams = () => {
+    return {
         include_docs: true,
-    }));
+        startkey: `${backend_core_1.DocumentType.CONFIG}${backend_core_1.SEPARATOR}`,
+        endkey: `${backend_core_1.DocumentType.CONFIG}${backend_core_1.SEPARATOR}${backend_core_1.UNICODE_MAX}`,
+    };
+};
+exports.getConfigParams = getConfigParams;
+const getConfigs = (globalDb) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield globalDb.allDocs((0, exports.getConfigParams)());
     return response.rows.map((row) => row.doc);
 });
 const backfill = (globalDb, timestamp) => __awaiter(void 0, void 0, void 0, function* () {