@budibase/server 2.2.4-alpha.1 → 2.2.5

package/dist/automations/tests/utilities/index.js

@@ -0,0 +1,81 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.actions = exports.apiKey = exports.runStep = exports.runInProd = exports.afterAll = exports.getConfig = void 0;
+const TestConfiguration_1 = __importDefault(require("../../../tests/utilities/TestConfiguration"));
+const backend_core_1 = require("@budibase/backend-core");
+const actions_1 = require("../../actions");
+const index_1 = __importDefault(require("../../../events/index"));
+const environment_1 = __importDefault(require("../../../environment"));
+let config;
+function getConfig() {
+    if (!config) {
+        config = new TestConfiguration_1.default(false);
+    }
+    return config;
+}
+exports.getConfig = getConfig;
+function afterAll() {
+    config.end();
+}
+exports.afterAll = afterAll;
+function runInProd(fn) {
+    return __awaiter(this, void 0, void 0, function* () {
+        environment_1.default._set("NODE_ENV", "production");
+        let error;
+        try {
+            yield fn();
+        }
+        catch (err) {
+            error = err;
+        }
+        environment_1.default._set("NODE_ENV", "jest");
+        if (error) {
+            throw error;
+        }
+    });
+}
+exports.runInProd = runInProd;
+function runStep(stepId, inputs) {
+    return __awaiter(this, void 0, void 0, function* () {
+        function run() {
+            return __awaiter(this, void 0, void 0, function* () {
+                let step = yield (0, actions_1.getAction)(stepId);
+                expect(step).toBeDefined();
+                if (!step) {
+                    throw new Error("No step found");
+                }
+                return step({
+                    context: {},
+                    inputs,
+                    appId: config ? config.getAppId() : null,
+                    // don't really need an API key, mocked out usage quota, not being tested here
+                    apiKey: exports.apiKey,
+                    emitter: index_1.default,
+                });
+            });
+        }
+        if (config === null || config === void 0 ? void 0 : config.appId) {
+            return backend_core_1.context.doInContext(config === null || config === void 0 ? void 0 : config.appId, () => __awaiter(this, void 0, void 0, function* () {
+                return run();
+            }));
+        }
+        else {
+            return run();
+        }
+    });
+}
+exports.runStep = runStep;
+exports.apiKey = "test";
+exports.actions = actions_1.ACTION_DEFINITIONS;

package/dist/environment.js

@@ -69,6 +69,7 @@ const environment = {
     // flags
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
+    DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
     DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
@@ -100,16 +101,11 @@ if (isDev() && module.exports.DISABLE_THREADING == null) {
     environment._set("DISABLE_THREADING", "1");
 }
 // clean up any environment variable edge cases
-for (let [key, value] of Object.entries(environment)) {
+for (let [key, value] of Object.entries(module.exports)) {
     // handle the edge case of "0" to disable an environment variable
     if (value === "0") {
         // @ts-ignore
         environment[key] = 0;
     }
-    // handle the edge case of "false" to disable an environment variable
-    if (value === "false") {
-        // @ts-ignore
-        environment[key] = 0;
-    }
 }
 module.exports = environment;

package/dist/integrations/index.js

@@ -95,6 +95,7 @@ function getDefinitions() {
 }
 exports.getDefinitions = getDefinitions;
 function getIntegration(integration) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
@@ -104,7 +105,7 @@ function getIntegration(integration) {
             for (let plugin of plugins) {
                 if (plugin.name === integration) {
                     // need to use commonJS require due to its dynamic runtime nature
-                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin);
+                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin.name, plugin.jsUrl, (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash);
                     if (retrieved.integration) {
                         return retrieved.integration;
                     }

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

@@ -29,15 +29,15 @@ const backfill = (globalDb, timestamp) => __awaiter(void 0, void 0, void 0, func
             yield backend_core_1.events.email.SMTPCreated(timestamp);
         }
         if ((0, types_1.isGoogleConfig)(config)) {
-            yield backend_core_1.events.auth.SSOCreated(types_1.ConfigType.GOOGLE, timestamp);
+            yield backend_core_1.events.auth.SSOCreated("google", timestamp);
             if (config.config.activated) {
-                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.GOOGLE, timestamp);
+                yield backend_core_1.events.auth.SSOActivated("google", timestamp);
             }
         }
         if ((0, types_1.isOIDCConfig)(config)) {
-            yield backend_core_1.events.auth.SSOCreated(types_1.ConfigType.OIDC, timestamp);
+            yield backend_core_1.events.auth.SSOCreated("oidc", timestamp);
             if (config.config.configs[0].activated) {
-                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.OIDC, timestamp);
+                yield backend_core_1.events.auth.SSOActivated("oidc", timestamp);
             }
         }
         if ((0, types_1.isSettingsConfig)(config)) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.4-alpha.0",
+    "version": "2.2.4",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.2.4-alpha.0",
-        "@budibase/client": "2.2.4-alpha.0",
-        "@budibase/pro": "2.2.3",
-        "@budibase/string-templates": "2.2.4-alpha.0",
-        "@budibase/types": "2.2.4-alpha.0",
+        "@budibase/backend-core": "^2.2.4",
+        "@budibase/client": "^2.2.4",
+        "@budibase/pro": "2.2.4",
+        "@budibase/string-templates": "^2.2.4",
+        "@budibase/types": "^2.2.4",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -130,15 +130,13 @@
         "@types/ioredis": "4.28.10",
         "@types/jest": "27.5.1",
         "@types/koa": "2.13.4",
-        "@types/koa__router": "8.0.8",
+        "@types/koa__router": "8.0.11",
         "@types/lodash": "4.14.180",
         "@types/node": "14.18.20",
         "@types/node-fetch": "2.6.1",
         "@types/oracledb": "5.2.2",
         "@types/pouchdb": "6.4.0",
         "@types/redis": "4.0.11",
-        "@types/server-destroy": "1.0.1",
-        "@types/tar": "6.1.3",
         "@typescript-eslint/parser": "5.45.0",
         "apidoc": "0.50.4",
         "babel-jest": "27.5.1",

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

@@ -56,14 +56,18 @@ function updateAttachmentColumns(prodAppId, db) {
                         continue;
                     }
                     row[column] = row[column].map((attachment) => {
-                        // Key looks like: appId/attachments/file.csv
-                        const urlParts = attachment.key.split("/");
+                        // URL looks like: /prod-budi-app-assets/appId/attachments/file.csv
+                        const urlParts = attachment.url.split("/");
+                        // drop the first empty element
+                        urlParts.shift();
+                        // get the prefix
+                        const prefix = urlParts.shift();
                         // remove the app ID
                         urlParts.shift();
                         // add new app ID
                         urlParts.unshift(prodAppId);
                         const key = urlParts.join("/");
-                        return Object.assign(Object.assign({}, attachment), { key, url: "" });
+                        return Object.assign(Object.assign({}, attachment), { key, url: `/${prefix}/${key}` });
                     });
                 }
             }