@budibase/server 2.3.19 → 2.3.21-alpha.0

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",
+    "version": "2.3.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 --maxWorkers=2",
+        "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",
-        "@budibase/client": "^2.3.18",
-        "@budibase/pro": "2.3.18",
-        "@budibase/string-templates": "^2.3.18",
-        "@budibase/types": "^2.3.18",
+        "@budibase/backend-core": "^2.3.20",
+        "@budibase/client": "^2.3.20",
+        "@budibase/pro": "2.3.20",
+        "@budibase/string-templates": "^2.3.20",
+        "@budibase/types": "^2.3.20",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -64,6 +64,7 @@
         "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",
@@ -86,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",
@@ -125,6 +127,7 @@
         "@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",
@@ -140,6 +143,7 @@
         "@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",
@@ -151,13 +155,14 @@
         "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": "4.0.2",
+        "supertest": "6.2.2",
         "swagger-jsdoc": "6.1.0",
         "timekeeper": "2.2.0",
         "ts-jest": "28.0.4",

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GLOBAL_DB_EXPORT_FILE = exports.DB_EXPORT_FILE = void 0;
+exports.STATIC_APP_FILES = exports.GLOBAL_DB_EXPORT_FILE = exports.DB_EXPORT_FILE = void 0;
 exports.DB_EXPORT_FILE = "db.txt";
 exports.GLOBAL_DB_EXPORT_FILE = "global.txt";
+exports.STATIC_APP_FILES = ["manifest.json", "budibase-client.js"];

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

@@ -45,12 +45,18 @@ 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, { filter: opts === null || opts === void 0 ? void 0 : opts.filter });
+                yield db.dump(writeStream, exportOpts);
                 return path;
             }
             else {
@@ -60,7 +66,7 @@ function exportDB(dbName, opts = {}) {
                 memStream.on("data", (chunk) => {
                     appString += chunk.toString();
                 });
-                yield db.dump(memStream, { filter: opts === null || opts === void 0 ? void 0 : opts.filter });
+                yield db.dump(memStream, exportOpts);
                 return appString;
             }
         }));
@@ -86,12 +92,19 @@ function exportApp(appId, config) {
         const prodAppId = backend_core_1.db.getProdAppID(appId);
         const appPath = `${prodAppId}/`;
         // export bucket contents
-        let tmpPath;
+        let tmpPath = (0, fileSystem_1.createTempFolder)(uuid());
         if (!environment_1.default.isTest()) {
-            tmpPath = yield backend_core_1.objectStore.retrieveDirectory(constants_1.ObjectStoreBuckets.APPS, appPath);
-        }
-        else {
-            tmpPath = (0, fileSystem_1.createTempFolder)(uuid());
+            // write just the static files
+            if (config === null || config === void 0 ? void 0 : config.excludeRows) {
+                for (let path of constants_2.STATIC_APP_FILES) {
+                    const contents = yield backend_core_1.objectStore.retrieve(constants_1.ObjectStoreBuckets.APPS, (0, path_1.join)(appPath, path));
+                    fs_1.default.writeFileSync((0, path_1.join)(tmpPath, path), contents);
+                }
+            }
+            // get all of the files
+            else {
+                tmpPath = yield backend_core_1.objectStore.retrieveDirectory(constants_1.ObjectStoreBuckets.APPS, appPath);
+            }
         }
         const downloadedPath = (0, path_1.join)(tmpPath, appPath);
         if (fs_1.default.existsSync(downloadedPath)) {

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

@@ -89,6 +89,9 @@ 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) {

package/dist/sdk/app/rows/attachments.js

@@ -18,13 +18,13 @@ exports.FIND_LIMIT = 25;
 function generateAttachmentFindParams(tableId, attachmentCols, bookmark) {
     const params = {
         selector: {
+            $or: attachmentCols.map(col => ({ [col]: { $exists: true } })),
             _id: {
                 $regex: `^${utils_1.DocumentType.ROW}${utils_1.SEPARATOR}${tableId}`,
             },
         },
         limit: exports.FIND_LIMIT,
     };
-    attachmentCols.forEach(col => (params.selector[col] = { $exists: true }));
     if (bookmark) {
         params.bookmark = bookmark;
     }

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