@budibase/server 2.5.5 → 2.5.6-alpha.10

package/dist/sdk/app/applications/sync.js

@@ -12,10 +12,108 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncApp = void 0;
+exports.syncApp = exports.syncUsersToAllApps = void 0;
 const environment_1 = __importDefault(require("../../../environment"));
 const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
 const __1 = __importDefault(require("../../"));
+const global_1 = require("../../../utilities/global");
+const utils_1 = require("../../../db/utils");
+function syncUsersToApp(appId, users, groups) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!(yield backend_core_1.db.dbExists(appId))) {
+            return;
+        }
+        yield backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+            const db = backend_core_1.context.getAppDB();
+            for (let user of users) {
+                let ctxUser = user;
+                let deletedUser = false;
+                const metadataId = (0, utils_1.generateUserMetadataID)(user._id);
+                if (user.deleted) {
+                    deletedUser = true;
+                }
+                // make sure role is correct
+                if (!deletedUser) {
+                    ctxUser = yield (0, global_1.processUser)(ctxUser, { appId, groups });
+                }
+                let roleId = ctxUser.roleId;
+                if (roleId === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+                    roleId = undefined;
+                }
+                let metadata;
+                try {
+                    metadata = yield db.get(metadataId);
+                }
+                catch (err) {
+                    if (err.status !== 404) {
+                        throw err;
+                    }
+                    // no metadata and user is to be deleted, can skip
+                    // no role - user isn't in app anyway
+                    if (!roleId) {
+                        continue;
+                    }
+                    else if (!deletedUser) {
+                        // doesn't exist yet, creating it
+                        metadata = {
+                            tableId: utils_1.InternalTables.USER_METADATA,
+                        };
+                    }
+                }
+                // the user doesn't exist, or doesn't have a role anymore
+                // get rid of their metadata
+                if (deletedUser || !roleId) {
+                    yield db.remove(metadata);
+                    continue;
+                }
+                // assign the roleId for the metadata doc
+                if (roleId) {
+                    metadata.roleId = roleId;
+                }
+                let combined = __1.default.users.combineMetadataAndUser(ctxUser, metadata);
+                // if no combined returned, there are no updates to make
+                if (combined) {
+                    yield db.put(combined);
+                }
+            }
+        }));
+    });
+}
+function syncUsersToAllApps(userIds) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // list of users, if one has been deleted it will be undefined in array
+        const users = (yield (0, global_1.getGlobalUsers)(userIds, {
+            noProcessing: true,
+        }));
+        const groups = yield pro_1.sdk.groups.fetch();
+        const finalUsers = [];
+        for (let userId of userIds) {
+            const user = users.find(user => user._id === userId);
+            if (!user) {
+                finalUsers.push({ _id: userId, deleted: true });
+            }
+            else {
+                finalUsers.push(user);
+            }
+        }
+        const devAppIds = yield backend_core_1.db.getDevAppIDs();
+        let promises = [];
+        for (let devAppId of devAppIds) {
+            const prodAppId = backend_core_1.db.getProdAppID(devAppId);
+            for (let appId of [prodAppId, devAppId]) {
+                promises.push(syncUsersToApp(appId, finalUsers, groups));
+            }
+        }
+        const resp = yield Promise.allSettled(promises);
+        const failed = resp.filter(promise => promise.status === "rejected");
+        if (failed.length > 0) {
+            const reasons = failed.map(fail => fail.reason);
+            backend_core_1.logging.logAlert("Failed to sync users to apps", reasons);
+        }
+    });
+}
+exports.syncUsersToAllApps = syncUsersToAllApps;
 function syncApp(appId, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         if (environment_1.default.DISABLE_AUTO_PROD_APP_SYNC) {
@@ -31,31 +129,27 @@ function syncApp(appId, opts) {
         // specific case, want to make sure setup is skipped
         const prodDb = backend_core_1.context.getProdAppDB({ skip_setup: true });
         const exists = yield prodDb.exists();
-        if (!exists) {
-            // the database doesn't exist. Don't replicate
-            return {
-                message: "App sync not required, app not deployed.",
-            };
-        }
-        const replication = new backend_core_1.db.Replication({
-            source: prodAppId,
-            target: appId,
-        });
         let error;
-        try {
-            const replOpts = replication.appReplicateOpts();
-            if (opts === null || opts === void 0 ? void 0 : opts.automationOnly) {
-                replOpts.filter = (doc) => doc._id.startsWith(backend_core_1.db.DocumentType.AUTOMATION);
+        if (exists) {
+            const replication = new backend_core_1.db.Replication({
+                source: prodAppId,
+                target: appId,
+            });
+            try {
+                const replOpts = replication.appReplicateOpts();
+                if (opts === null || opts === void 0 ? void 0 : opts.automationOnly) {
+                    replOpts.filter = (doc) => doc._id.startsWith(backend_core_1.db.DocumentType.AUTOMATION);
+                }
+                yield replication.replicate(replOpts);
+            }
+            catch (err) {
+                error = err;
+            }
+            finally {
+                yield replication.close();
             }
-            yield replication.replicate(replOpts);
-        }
-        catch (err) {
-            error = err;
-        }
-        finally {
-            yield replication.close();
         }
-        // sync the users
+        // sync the users - kept for safe keeping
         yield __1.default.users.syncGlobalUsers();
         if (error) {
             throw error;

package/dist/sdk/index.js

@@ -11,6 +11,7 @@ const datasources_1 = __importDefault(require("./app/datasources"));
 const queries_1 = __importDefault(require("./app/queries"));
 const rows_1 = __importDefault(require("./app/rows"));
 const users_1 = __importDefault(require("./users"));
+const plugins_1 = __importDefault(require("./plugins"));
 const sdk = {
     backups: backups_1.default,
     tables: tables_1.default,
@@ -20,6 +21,7 @@ const sdk = {
     users: users_1.default,
     datasources: datasources_1.default,
     queries: queries_1.default,
+    plugins: plugins_1.default,
 };
 // default export for TS
 exports.default = sdk;

package/dist/sdk/plugins/index.js

@@ -0,0 +1,27 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = __importStar(require("./plugins"));
+exports.default = Object.assign({}, plugins);

package/dist/sdk/plugins/plugins.js

@@ -0,0 +1,53 @@
+"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.processUploaded = exports.fetch = void 0;
+const types_1 = require("@budibase/types");
+const backend_core_1 = require("@budibase/backend-core");
+const file_1 = require("../../api/controllers/plugin/file");
+const environment_1 = __importDefault(require("../../environment"));
+const websockets_1 = require("../../websockets");
+const pro_1 = require("@budibase/pro");
+function fetch(type) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.tenancy.getGlobalDB();
+        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
+            include_docs: true,
+        }));
+        let plugins = response.rows.map((row) => row.doc);
+        plugins = backend_core_1.objectStore.enrichPluginURLs(plugins);
+        if (type) {
+            return plugins.filter((plugin) => { var _a; return ((_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.type) === type; });
+        }
+        else {
+            return plugins;
+        }
+    });
+}
+exports.fetch = fetch;
+function processUploaded(plugin, source) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const { metadata, directory } = yield (0, file_1.fileUpload)(plugin);
+        backend_core_1.plugins.validate(metadata === null || metadata === void 0 ? void 0 : metadata.schema);
+        // Only allow components in cloud
+        if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
+            throw new Error("Only component plugins are supported outside of self-host");
+        }
+        const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
+        websockets_1.clientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash });
+        return doc;
+    });
+}
+exports.processUploaded = processUploaded;

package/dist/sdk/users/utils.js

@@ -34,6 +34,10 @@ function combineMetadataAndUser(user, metadata) {
     if (found) {
         newDoc._rev = found._rev;
     }
+    // clear fields that shouldn't be in metadata
+    delete newDoc.password;
+    delete newDoc.forceResetPassword;
+    delete newDoc.roles;
     if (found == null || !(0, lodash_1.isEqual)(newDoc, found)) {
         return Object.assign(Object.assign({}, found), newDoc);
     }
@@ -53,10 +57,9 @@ function syncGlobalUsers() {
     return __awaiter(this, void 0, void 0, function* () {
         // sync user metadata
         const db = backend_core_1.context.getAppDB();
-        const [users, metadata] = yield Promise.all([
-            (0, global_1.getGlobalUsers)(),
-            rawUserMetadata(),
-        ]);
+        const resp = yield Promise.all([(0, global_1.getGlobalUsers)(), rawUserMetadata()]);
+        const users = resp[0];
+        const metadata = resp[1];
         const toWrite = [];
         for (let user of users) {
             const combined = combineMetadataAndUser(user, metadata);
@@ -64,6 +67,20 @@ function syncGlobalUsers() {
                 toWrite.push(combined);
             }
         }
+        let foundEmails = [];
+        for (let data of metadata) {
+            if (!data._id) {
+                continue;
+            }
+            const alreadyExisting = data.email && foundEmails.indexOf(data.email) !== -1;
+            const globalId = (0, utils_1.getGlobalIDFromUserMetadataID)(data._id);
+            if (!users.find(user => user._id === globalId) || alreadyExisting) {
+                toWrite.push(Object.assign(Object.assign({}, data), { _deleted: true }));
+            }
+            if (data.email) {
+                foundEmails.push(data.email);
+            }
+        }
         yield db.bulkDocs(toWrite);
     });
 }

package/dist/startup.js

@@ -44,17 +44,15 @@ const fs_1 = __importDefault(require("fs"));
 const watch_1 = require("./watch");
 const automations = __importStar(require("./automations"));
 const fileSystem = __importStar(require("./utilities/fileSystem"));
-const events_1 = __importDefault(require("./events"));
+const events_1 = __importStar(require("./events"));
 const migrations = __importStar(require("./migrations"));
 const bullboard = __importStar(require("./automations/bullboard"));
 const pro = __importStar(require("@budibase/pro"));
 const api = __importStar(require("./api"));
 const sdk_1 = __importDefault(require("./sdk"));
-const pino = require("koa-pino-logger");
 let STARTUP_RAN = false;
 function initRoutes(app) {
     return __awaiter(this, void 0, void 0, function* () {
-        app.use(pino(backend_core_1.logging.pinoSettings()));
         if (!environment_1.default.isTest()) {
             const plugin = yield bullboard.init();
             app.use(plugin);
@@ -79,8 +77,10 @@ function initPro() {
     });
 }
 function shutdown(server) {
-    server.close();
-    server.destroy();
+    if (server) {
+        server.close();
+        server.destroy();
+    }
 }
 function startup(app, server) {
     var _a;
@@ -96,6 +96,7 @@ function startup(app, server) {
         events_1.default.emitPort(environment_1.default.PORT);
         fileSystem.init();
         yield redis.init();
+        (0, events_1.init)();
         // run migrations on startup if not done via http
         // not recommended in a clustered environment
         if (!environment_1.default.HTTP_MIGRATIONS && !environment_1.default.isTest()) {
@@ -104,29 +105,7 @@ function startup(app, server) {
             }
             catch (e) {
                 backend_core_1.logging.logAlert("Error performing migrations. Exiting.", e);
-                shutdown();
-            }
-        }
-        // check and create admin user if required
-        if (environment_1.default.SELF_HOSTED &&
-            !environment_1.default.MULTI_TENANCY &&
-            environment_1.default.BB_ADMIN_USER_EMAIL &&
-            environment_1.default.BB_ADMIN_USER_PASSWORD) {
-            const checklist = yield (0, workerRequests_1.getChecklist)();
-            if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
-                try {
-                    const tenantId = backend_core_1.tenancy.getTenantId();
-                    const user = yield (0, workerRequests_1.createAdminUser)(environment_1.default.BB_ADMIN_USER_EMAIL, environment_1.default.BB_ADMIN_USER_PASSWORD, tenantId);
-                    // Need to set up an API key for automated integration tests
-                    if (environment_1.default.isTest()) {
-                        yield (0, workerRequests_1.generateApiKey)(user._id);
-                    }
-                    console.log("Admin account automatically created for", environment_1.default.BB_ADMIN_USER_EMAIL);
-                }
-                catch (e) {
-                    backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
-                    shutdown();
-                }
+                shutdown(server);
             }
         }
         // monitor plugin directory if required
@@ -150,6 +129,30 @@ function startup(app, server) {
             // bring routes online as final step once everything ready
             yield initRoutes(app);
         }
+        // check and create admin user if required
+        // this must be run after the api has been initialised due to
+        // the app user sync
+        if (environment_1.default.SELF_HOSTED &&
+            !environment_1.default.MULTI_TENANCY &&
+            environment_1.default.BB_ADMIN_USER_EMAIL &&
+            environment_1.default.BB_ADMIN_USER_PASSWORD) {
+            const checklist = yield (0, workerRequests_1.getChecklist)();
+            if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
+                try {
+                    const tenantId = backend_core_1.tenancy.getTenantId();
+                    const user = yield (0, workerRequests_1.createAdminUser)(environment_1.default.BB_ADMIN_USER_EMAIL, environment_1.default.BB_ADMIN_USER_PASSWORD, tenantId);
+                    // Need to set up an API key for automated integration tests
+                    if (environment_1.default.isTest()) {
+                        yield (0, workerRequests_1.generateApiKey)(user._id);
+                    }
+                    console.log("Admin account automatically created for", environment_1.default.BB_ADMIN_USER_EMAIL);
+                }
+                catch (e) {
+                    backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
+                    shutdown(server);
+                }
+            }
+        }
     });
 }
 exports.startup = startup;

package/dist/threads/automation.js

@@ -52,14 +52,14 @@ const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
 const sdkUtils = __importStar(require("../sdk/utils"));
 const environment_1 = __importDefault(require("../environment"));
-const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
-const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
+const FILTER_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.FILTER.stepId;
+const LOOP_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
 function getLoopIterations(loopStep, input) {
     const binding = automationUtils.typecastForLooping(loopStep, input);
-    if (!loopStep || !binding) {
-        return 1;
+    if (!binding) {
+        return 0;
     }
     if (Array.isArray(binding)) {
         return binding.length;
@@ -67,7 +67,7 @@ function getLoopIterations(loopStep, input) {
     if (typeof binding === "string") {
         return automationUtils.stringSplit(binding).length;
     }
-    return 1;
+    return 0;
 }
 /**
  * The automation orchestrator is a class responsible for executing automations.
@@ -372,6 +372,17 @@ class Orchestrator {
                         }
                     }
                 }
+                if (loopStep && iterations === 0) {
+                    loopStep = undefined;
+                    this.executionOutput.steps.splice(loopStepNumber + 1, 0, {
+                        id: step.id,
+                        stepId: step.stepId,
+                        outputs: { status: types_1.AutomationStatus.NO_ITERATIONS, success: true },
+                        inputs: {},
+                    });
+                    this._context.steps.splice(loopStepNumber, 1);
+                    iterations = 1;
+                }
                 // Delete the step after the loop step as it's irrelevant, since information is included
                 // in the loop step
                 if (wasLoopStep && !loopStep) {