@budibase/server 2.5.6-alpha.9 → 2.5.6

package/dist/sdk/users/utils.js

@@ -34,10 +34,6 @@ 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);
     }
@@ -57,9 +53,10 @@ function syncGlobalUsers() {
     return __awaiter(this, void 0, void 0, function* () {
         // sync user metadata
         const db = backend_core_1.context.getAppDB();
-        const resp = yield Promise.all([(0, global_1.getGlobalUsers)(), rawUserMetadata()]);
-        const users = resp[0];
-        const metadata = resp[1];
+        const [users, metadata] = yield Promise.all([
+            (0, global_1.getGlobalUsers)(),
+            rawUserMetadata(),
+        ]);
         const toWrite = [];
         for (let user of users) {
             const combined = combineMetadataAndUser(user, metadata);
@@ -67,20 +64,6 @@ 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,15 +44,17 @@ 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 = __importStar(require("./events"));
+const events_1 = __importDefault(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);
@@ -77,10 +79,8 @@ function initPro() {
     });
 }
 function shutdown(server) {
-    if (server) {
-        server.close();
-        server.destroy();
-    }
+    server.close();
+    server.destroy();
 }
 function startup(app, server) {
     var _a;
@@ -96,7 +96,6 @@ 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()) {
@@ -105,33 +104,10 @@ function startup(app, server) {
             }
             catch (e) {
                 backend_core_1.logging.logAlert("Error performing migrations. Exiting.", e);
-                shutdown(server);
+                shutdown();
             }
         }
-        // monitor plugin directory if required
-        if (environment_1.default.SELF_HOSTED &&
-            !environment_1.default.MULTI_TENANCY &&
-            environment_1.default.PLUGINS_DIR &&
-            fs_1.default.existsSync(environment_1.default.PLUGINS_DIR)) {
-            (0, watch_1.watch)();
-        }
-        // check for version updates
-        yield backend_core_1.installation.checkInstallVersion();
-        // 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) {
-            // 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 &&
@@ -149,10 +125,31 @@ function startup(app, server) {
                 }
                 catch (e) {
                     backend_core_1.logging.logAlert("Error creating initial admin user. Exiting.", e);
-                    shutdown(server);
+                    shutdown();
                 }
             }
         }
+        // monitor plugin directory if required
+        if (environment_1.default.SELF_HOSTED &&
+            !environment_1.default.MULTI_TENANCY &&
+            environment_1.default.PLUGINS_DIR &&
+            fs_1.default.existsSync(environment_1.default.PLUGINS_DIR)) {
+            (0, watch_1.watch)();
+        }
+        // check for version updates
+        yield backend_core_1.installation.checkInstallVersion();
+        // 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) {
+            // bring routes online as final step once everything ready
+            yield initRoutes(app);
+        }
     });
 }
 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.BUILTIN_ACTION_DEFINITIONS.FILTER.stepId;
-const LOOP_STEP_ID = actions.BUILTIN_ACTION_DEFINITIONS.LOOP.stepId;
+const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
+const LOOP_STEP_ID = actions.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 (!binding) {
-        return 0;
+    if (!loopStep || !binding) {
+        return 1;
     }
     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 0;
+    return 1;
 }
 /**
  * The automation orchestrator is a class responsible for executing automations.
@@ -372,17 +372,6 @@ 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) {