@budibase/server 2.3.18-alpha.2 → 2.3.18-alpha.21

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

@@ -64,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)) {
@@ -80,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();

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/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/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;
@@ -117,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);
@@ -382,9 +382,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 +461,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) {

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* () {

package/dist/migrations/tests/helpers.js

@@ -57,7 +57,7 @@ const saveSmtpConfig = (globalDb) => __awaiter(void 0, void 0, void 0, function*
 });
 exports.saveSmtpConfig = saveSmtpConfig;
 const saveConfig = (config, globalDb) => __awaiter(void 0, void 0, void 0, function* () {
-    config._id = backend_core_1.db.generateConfigID({ type: config.type });
+    config._id = backend_core_1.configs.generateConfigID(config.type);
     let response;
     try {
         response = yield globalDb.get(config._id);

package/dist/migrations/tests/structures.js

@@ -8,7 +8,7 @@ const oidc = (conf) => {
         type: types_1.ConfigType.OIDC,
         config: {
             configs: [
-                Object.assign({ configUrl: "http://someconfigurl", clientID: "clientId", clientSecret: "clientSecret", logo: "Microsoft", name: "Active Directory", uuid: backend_core_1.utils.newid(), activated: true }, conf),
+                Object.assign({ configUrl: "http://someconfigurl", clientID: "clientId", clientSecret: "clientSecret", logo: "Microsoft", name: "Active Directory", uuid: backend_core_1.utils.newid(), activated: true, scopes: [] }, conf),
             ],
         },
     };

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.3.18-alpha.1",
+    "version": "2.3.18-alpha.20",
     "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": "jest --coverage --runInBand",
+        "test": "bash scripts/test.sh",
         "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",
@@ -25,7 +25,7 @@
         "dev:stack:down": "node scripts/dev/manage.js down",
         "dev:stack:nuke": "node scripts/dev/manage.js nuke",
         "dev:builder": "yarn run dev:stack:up && nodemon",
-        "specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
+        "specs": "ts-node specs/generate.ts && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
         "initialise": "node scripts/initialise.js",
         "env:multi:enable": "node scripts/multiTenancy.js enable",
         "env:multi:disable": "node scripts/multiTenancy.js disable",
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.3.18-alpha.1",
-        "@budibase/client": "2.3.18-alpha.1",
-        "@budibase/pro": "2.3.18-alpha.1",
-        "@budibase/string-templates": "2.3.18-alpha.1",
-        "@budibase/types": "2.3.18-alpha.1",
+        "@budibase/backend-core": "2.3.18-alpha.20",
+        "@budibase/client": "2.3.18-alpha.20",
+        "@budibase/pro": "2.3.18-alpha.20",
+        "@budibase/string-templates": "2.3.18-alpha.20",
+        "@budibase/types": "2.3.18-alpha.20",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -87,6 +87,7 @@
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
+        "koa-useragent": "^4.1.0",
         "koa2-ratelimit": "1.1.1",
         "lodash": "4.17.21",
         "memorystream": "0.3.1",

package/dist/startup.js

@@ -141,6 +141,9 @@ function startup(app, server) {
         // get the references to the queue promises, don't await as
         // they will never end, unless the processing stops
         let queuePromises = [];
+        // configure events to use the pro audit log write
+        // can't integrate directly into backend-core due to cyclic issues
+        queuePromises.push(backend_core_1.events.processors.init(pro.sdk.auditLogs.write));
         queuePromises.push(automations.init());
         queuePromises.push(initPro());
         if (app) {