@budibase/server 2.5.5 → 2.5.6-alpha.10

package/dist/automations/steps/zapier.js

@@ -19,7 +19,7 @@ const types_1 = require("@budibase/types");
 exports.definition = {
     name: "Zapier Webhook",
     stepId: types_1.AutomationActionStepId.zapier,
-    type: "ACTION",
+    type: types_1.AutomationStepType.ACTION,
     internal: false,
     description: "Trigger a Zapier Zap via webhooks",
     tagline: "Trigger a Zapier Zap",
@@ -29,27 +29,27 @@ exports.definition = {
         inputs: {
             properties: {
                 url: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Webhook URL",
                 },
                 value1: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Payload Value 1",
                 },
                 value2: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Payload Value 2",
                 },
                 value3: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Payload Value 3",
                 },
                 value4: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Payload Value 4",
                 },
                 value5: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     title: "Payload Value 5",
                 },
             },
@@ -58,11 +58,11 @@ exports.definition = {
         outputs: {
             properties: {
                 httpStatus: {
-                    type: "number",
+                    type: types_1.AutomationIOType.NUMBER,
                     description: "The HTTP status code of the request",
                 },
                 response: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "The response from Zapier",
                 },
             },

package/dist/automations/triggerInfo/app.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 fields: {
-                    type: "object",
-                    customType: "triggerSchema",
+                    type: types_1.AutomationIOType.OBJECT,
+                    customType: types_1.AutomationCustomIOType.TRIGGER_SCHEMA,
                     title: "Fields",
                 },
             },
@@ -24,13 +24,13 @@ exports.definition = {
         outputs: {
             properties: {
                 fields: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     description: "Fields submitted from the app frontend",
-                    customType: "triggerSchema",
+                    customType: types_1.AutomationCustomIOType.TRIGGER_SCHEMA,
                 },
             },
             required: ["fields"],
         },
     },
-    type: "TRIGGER",
+    type: types_1.AutomationStepType.TRIGGER,
 };

package/dist/automations/triggerInfo/cron.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 cron: {
-                    type: "string",
-                    customType: "cron",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.CRON,
                     title: "Expression",
                 },
             },
@@ -24,12 +24,12 @@ exports.definition = {
         outputs: {
             properties: {
                 timestamp: {
-                    type: "number",
+                    type: types_1.AutomationIOType.NUMBER,
                     description: "Timestamp the cron was executed",
                 },
             },
             required: ["timestamp"],
         },
     },
-    type: "TRIGGER",
+    type: types_1.AutomationStepType.TRIGGER,
 };

package/dist/automations/triggerInfo/rowDeleted.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 tableId: {
-                    type: "string",
-                    customType: "table",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.TABLE,
                     title: "Table",
                 },
             },
@@ -24,13 +24,13 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: "object",
-                    customType: "row",
+                    type: types_1.AutomationIOType.OBJECT,
+                    customType: types_1.AutomationCustomIOType.ROW,
                     description: "The row that was deleted",
                 },
             },
             required: ["row"],
         },
     },
-    type: "TRIGGER",
+    type: types_1.AutomationStepType.TRIGGER,
 };

package/dist/automations/triggerInfo/rowSaved.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 tableId: {
-                    type: "string",
-                    customType: "table",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.TABLE,
                     title: "Table",
                 },
             },
@@ -24,21 +24,21 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: "object",
-                    customType: "row",
+                    type: types_1.AutomationIOType.OBJECT,
+                    customType: types_1.AutomationCustomIOType.ROW,
                     description: "The new row that was created",
                 },
                 id: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "Row ID - can be used for updating",
                 },
                 revision: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "Revision of row",
                 },
             },
             required: ["row", "id"],
         },
     },
-    type: "TRIGGER",
+    type: types_1.AutomationStepType.TRIGGER,
 };

package/dist/automations/triggerInfo/rowUpdated.js

@@ -14,8 +14,8 @@ exports.definition = {
         inputs: {
             properties: {
                 tableId: {
-                    type: "string",
-                    customType: "table",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.TABLE,
                     title: "Table",
                 },
             },
@@ -24,21 +24,21 @@ exports.definition = {
         outputs: {
             properties: {
                 row: {
-                    type: "object",
-                    customType: "row",
+                    type: types_1.AutomationIOType.OBJECT,
+                    customType: types_1.AutomationCustomIOType.ROW,
                     description: "The row that was updated",
                 },
                 id: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "Row ID - can be used for updating",
                 },
                 revision: {
-                    type: "string",
+                    type: types_1.AutomationIOType.STRING,
                     description: "Revision of row",
                 },
             },
             required: ["row", "id"],
         },
     },
-    type: "TRIGGER",
+    type: types_1.AutomationStepType.TRIGGER,
 };

package/dist/automations/triggerInfo/webhook.js

@@ -14,13 +14,13 @@ exports.definition = {
         inputs: {
             properties: {
                 schemaUrl: {
-                    type: "string",
-                    customType: "webhookUrl",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.WEBHOOK_URL,
                     title: "Schema URL",
                 },
                 triggerUrl: {
-                    type: "string",
-                    customType: "webhookUrl",
+                    type: types_1.AutomationIOType.STRING,
+                    customType: types_1.AutomationCustomIOType.WEBHOOK_URL,
                     title: "Trigger URL",
                 },
             },
@@ -29,12 +29,12 @@ exports.definition = {
         outputs: {
             properties: {
                 body: {
-                    type: "object",
+                    type: types_1.AutomationIOType.OBJECT,
                     description: "Body of the request which hit the webhook",
                 },
             },
             required: ["body"],
         },
     },
-    type: "TRIGGER",
+    type: types_1.AutomationStepType.TRIGGER,
 };

package/dist/environment.js

@@ -54,7 +54,6 @@ const environment = {
     // minor
     SALT_ROUNDS: process.env.SALT_ROUNDS,
     LOGGER: process.env.LOGGER,
-    LOG_LEVEL: process.env.LOG_LEVEL,
     ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
     AUTOMATION_MAX_ITERATIONS: parseIntSafe(process.env.AUTOMATION_MAX_ITERATIONS) || 200,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,

package/dist/events/docUpdates/index.js

@@ -0,0 +1,17 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./processors"), exports);

package/dist/events/docUpdates/processors.js

@@ -0,0 +1,18 @@
+"use strict";
+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 syncUsers_1 = __importDefault(require("./syncUsers"));
+const backend_core_1 = require("@budibase/backend-core");
+let started = false;
+function init(updateCb) {
+    if (started) {
+        return;
+    }
+    const processors = [(0, syncUsers_1.default)(updateCb)];
+    backend_core_1.docUpdates.init(processors);
+    started = true;
+}
+exports.init = init;

package/dist/events/docUpdates/syncUsers.js

@@ -0,0 +1,49 @@
+"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 });
+const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
+const types_1 = require("@budibase/types");
+const sync_1 = require("../../sdk/app/applications/sync");
+function process(updateCb) {
+    const processor = (update) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        try {
+            const docId = update.id;
+            const isGroup = docId.startsWith(backend_core_1.constants.DocumentType.GROUP);
+            let userIds;
+            if (isGroup) {
+                const group = yield pro_1.sdk.groups.get(docId);
+                userIds = ((_a = group.users) === null || _a === void 0 ? void 0 : _a.map(user => user._id)) || [];
+            }
+            else {
+                userIds = [docId];
+            }
+            if (userIds.length > 0) {
+                yield (0, sync_1.syncUsersToAllApps)(userIds);
+            }
+            if (updateCb) {
+                updateCb(docId);
+            }
+        }
+        catch (err) {
+            // if something not found - no changes to perform
+            if ((err === null || err === void 0 ? void 0 : err.status) === 404) {
+                return;
+            }
+            else {
+                backend_core_1.logging.logAlert("Failed to perform user/group app sync", err);
+            }
+        }
+    });
+    return { events: types_1.UserGroupSyncEvents, processor };
+}
+exports.default = process;

package/dist/events/index.js

@@ -3,6 +3,9 @@ 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 BudibaseEmitter_1 = __importDefault(require("./BudibaseEmitter"));
 const emitter = new BudibaseEmitter_1.default();
+var docUpdates_1 = require("./docUpdates");
+Object.defineProperty(exports, "init", { enumerable: true, get: function () { return docUpdates_1.init; } });
 exports.default = emitter;

package/dist/integrations/index.js

@@ -29,11 +29,11 @@ const firebase_1 = __importDefault(require("./firebase"));
 const redis_1 = __importDefault(require("./redis"));
 const snowflake_1 = __importDefault(require("./snowflake"));
 const oracle_1 = __importDefault(require("./oracle"));
-const plugin_1 = require("../api/controllers/plugin");
 const types_1 = require("@budibase/types");
 const fileSystem_1 = require("../utilities/fileSystem");
 const environment_1 = __importDefault(require("../environment"));
 const lodash_1 = require("lodash");
+const sdk_1 = __importDefault(require("../sdk"));
 const DEFINITIONS = {
     [types_1.SourceName.POSTGRES]: postgres_1.default.schema,
     [types_1.SourceName.DYNAMODB]: dynamodb_1.default.schema,
@@ -91,7 +91,7 @@ function getDefinitions() {
     return __awaiter(this, void 0, void 0, function* () {
         const pluginSchemas = {};
         if (environment_1.default.SELF_HOSTED) {
-            const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
+            const plugins = yield sdk_1.default.plugins.fetch(types_1.PluginType.DATASOURCE);
             // extract the actual schema from each custom
             for (let plugin of plugins) {
                 const sourceId = plugin.name;
@@ -111,7 +111,7 @@ function getIntegration(integration) {
             return INTEGRATIONS[integration];
         }
         if (environment_1.default.SELF_HOSTED) {
-            const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
+            const plugins = yield sdk_1.default.plugins.fetch(types_1.PluginType.DATASOURCE);
             for (let plugin of plugins) {
                 if (plugin.name === integration) {
                     // need to use commonJS require due to its dynamic runtime nature

package/dist/integrations/microsoftSqlServer.js

@@ -206,8 +206,11 @@ class SqlServerIntegration extends sql_1.default {
                     if (typeof name !== "string") {
                         continue;
                     }
-                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find(col => col === name), name: name, constraints: {
-                            presence: requiredColumns.find(col => col === name),
+                    const hasDefault = def.COLUMN_DEFAULT;
+                    const isAuto = !!autoColumns.find(col => col === name);
+                    const required = !!requiredColumns.find(col => col === name);
+                    schema[name] = Object.assign(Object.assign({ autocolumn: isAuto, name: name, constraints: {
+                            presence: required && !isAuto && !hasDefault,
                         } }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
                 }
                 tables[tableName] = {

package/dist/integrations/mysql.js

@@ -186,12 +186,14 @@ class MySQLIntegration extends sql_1.default {
                         if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) {
                             primaryKeys.push(columnName);
                         }
-                        const constraints = {
-                            presence: column.Null !== "YES",
-                        };
+                        const hasDefault = column.Default != null;
                         const isAuto = typeof column.Extra === "string" &&
                             (column.Extra === "auto_increment" ||
                                 column.Extra.toLowerCase().includes("generated"));
+                        const required = column.Null !== "YES";
+                        const constraints = {
+                            presence: required && !isAuto && !hasDefault,
+                        };
                         schema[columnName] = Object.assign(Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type)), { externalType: column.Type });
                     }
                     if (!tables[tableName]) {

package/dist/integrations/postgres.js

@@ -227,13 +227,15 @@ class PostgresIntegration extends sql_1.default {
                     const identity = !!(column.identity_generation ||
                         column.identity_start ||
                         column.identity_increment);
-                    const constraints = {
-                        presence: column.is_nullable === "NO",
-                    };
-                    const hasDefault = typeof column.column_default === "string" &&
+                    const hasDefault = column.column_default != null;
+                    const hasNextVal = typeof column.column_default === "string" &&
                         column.column_default.startsWith("nextval");
                     const isGenerated = column.is_generated && column.is_generated !== "NEVER";
-                    const isAuto = hasDefault || identity || isGenerated;
+                    const isAuto = hasNextVal || identity || isGenerated;
+                    const required = column.is_nullable === "NO";
+                    const constraints = {
+                        presence: required && !hasDefault && !isGenerated,
+                    };
                     tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName, constraints }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
                 }
                 const final = (0, utils_1.finaliseExternalTables)(tables, entities);

package/dist/integrations/redis.js

@@ -38,6 +38,12 @@ const SCHEMA = {
             type: "password",
             required: false,
         },
+        db: {
+            type: "number",
+            required: false,
+            display: "DB",
+            default: 0,
+        },
     },
     query: {
         create: {
@@ -90,6 +96,7 @@ class RedisIntegration {
             port: this.config.port,
             username: this.config.username,
             password: this.config.password,
+            db: this.config.db,
         });
     }
     disconnect() {

package/dist/integrations/rest.js

@@ -166,6 +166,10 @@ class RestIntegration {
                     }
                     raw = rawXml;
                 }
+                else if (contentType.includes("application/pdf")) {
+                    data = yield response.arrayBuffer(); // Save PDF as ArrayBuffer
+                    raw = Buffer.from(data);
+                }
                 else {
                     data = yield response.text();
                     raw = data;

package/dist/migrations/functions/usageQuotas/syncApps.js

@@ -19,7 +19,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
     const appCount = devApps ? devApps.length : 0;
     // sync app count
     const tenantId = backend_core_1.tenancy.getTenantId();
-    console.log(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
+    console.log(`Syncing app count: ${appCount}`);
     yield pro_1.quotas.setUsage(appCount, types_1.StaticQuotaName.APPS, types_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

package/dist/migrations/functions/usageQuotas/syncRows.js

@@ -27,8 +27,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
         rowCount += rows.length;
     });
     // sync row count
-    const tenantId = backend_core_1.tenancy.getTenantId();
-    console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
+    console.log(`Syncing row count: ${rowCount}`);
     yield pro_1.quotas.setUsagePerApp(counts, types_1.StaticQuotaName.ROWS, types_1.QuotaUsageType.STATIC);
 });
 exports.run = run;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.5.4",
+    "version": "2.5.6-alpha.6",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -26,6 +26,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",
+        "dev:built": "yarn run dev:stack:up && yarn run run:docker",
         "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",
@@ -44,12 +45,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.5.4",
-        "@budibase/client": "^2.5.4",
-        "@budibase/pro": "2.5.4",
-        "@budibase/shared-core": "^2.5.4",
-        "@budibase/string-templates": "^2.5.4",
-        "@budibase/types": "^2.5.4",
+        "@budibase/backend-core": "2.5.6-alpha.6",
+        "@budibase/client": "2.5.6-alpha.6",
+        "@budibase/pro": "2.5.6-alpha.6",
+        "@budibase/shared-core": "2.5.6-alpha.6",
+        "@budibase/string-templates": "2.5.6-alpha.6",
+        "@budibase/types": "2.5.6-alpha.6",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -64,6 +65,7 @@
         "bull": "4.10.1",
         "chmodr": "1.2.0",
         "chokidar": "3.5.3",
+        "cookies": "0.8.0",
         "csvtojson": "2.0.10",
         "curlconverter": "3.21.0",
         "dd-trace": "3.13.2",
@@ -85,7 +87,6 @@
         "koa-body": "4.2.0",
         "koa-compress": "4.0.1",
         "koa-connect": "2.1.0",
-        "koa-pino-logger": "3.0.0",
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
@@ -99,7 +100,6 @@
         "node-fetch": "2.6.7",
         "open": "8.4.0",
         "pg": "8.5.1",
-        "pino-pretty": "4.0.0",
         "posthog-node": "1.3.0",
         "pouchdb": "7.3.0",
         "pouchdb-adapter-memory": "7.2.2",
@@ -109,18 +109,17 @@
         "redis": "4",
         "server-destroy": "1.0.1",
         "snowflake-promise": "^4.5.0",
-        "socket.io": "^4.5.1",
+        "socket.io": "4.6.1",
         "svelte": "3.49.0",
         "swagger-parser": "10.0.3",
         "tar": "6.1.11",
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",
-        "vm2": "^3.9.15",
+        "vm2": "3.9.16",
         "worker-farm": "1.7.0",
-        "xml2js": "0.4.23",
-        "yargs": "13.2.4",
-        "zlib": "1.0.5"
+        "xml2js": "0.5.0",
+        "yargs": "13.2.4"
     },
     "devDependencies": {
         "@babel/core": "7.17.4",
@@ -149,7 +148,7 @@
         "@types/tar": "6.1.3",
         "@typescript-eslint/parser": "5.45.0",
         "apidoc": "0.50.4",
-        "babel-jest": "27.5.1",
+        "babel-jest": "29.5.0",
         "copyfiles": "2.4.1",
         "docker-compose": "0.23.17",
         "eslint": "6.8.0",
@@ -157,6 +156,7 @@
         "is-wsl": "2.2.0",
         "jest": "29.5.0",
         "jest-openapi": "0.14.2",
+        "jest-runner": "29.5.0",
         "jest-serial-runner": "^1.2.1",
         "nodemon": "2.0.15",
         "openapi-types": "9.3.1",