@budibase/server 2.5.6-alpha.1 → 2.5.6-alpha.2

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.1fe52b59.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.80d32454.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.841e62d8.css">
 </head>
 

package/dist/api/controllers/user.js

@@ -12,95 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFlags = exports.setFlag = exports.findMetadata = exports.destroyMetadata = exports.updateMetadata = exports.updateSelfMetadata = exports.fetchMetadata = exports.syncUser = void 0;
+exports.getFlags = exports.setFlag = exports.findMetadata = exports.destroyMetadata = exports.updateMetadata = exports.updateSelfMetadata = exports.fetchMetadata = void 0;
 const utils_1 = require("../../db/utils");
 const utils_2 = require("../../db/utils");
 const global_1 = require("../../utilities/global");
 const users_1 = require("../../utilities/users");
 const backend_core_1 = require("@budibase/backend-core");
 const sdk_1 = __importDefault(require("../../sdk"));
-function syncUser(ctx) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        let deleting = false, user;
-        const userId = ctx.params.id;
-        const previousUser = (_a = ctx.request.body) === null || _a === void 0 ? void 0 : _a.previousUser;
-        try {
-            user = (yield (0, global_1.getRawGlobalUser)(userId));
-        }
-        catch (err) {
-            if (err && err.status === 404) {
-                user = {};
-                deleting = true;
-            }
-            else {
-                throw err;
-            }
-        }
-        let previousApps = previousUser
-            ? Object.keys(previousUser.roles).map(appId => appId)
-            : [];
-        const roles = deleting ? {} : user.roles;
-        // remove props which aren't useful to metadata
-        delete user.password;
-        delete user.forceResetPassword;
-        delete user.roles;
-        // run through all production appIDs in the users roles
-        let prodAppIds;
-        // if they are a builder then get all production app IDs
-        if ((user.builder && user.builder.global) || deleting) {
-            prodAppIds = yield backend_core_1.db.getProdAppIDs();
-        }
-        else {
-            prodAppIds = Object.entries(roles)
-                .filter(entry => entry[1] !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC)
-                .map(([appId]) => appId);
-        }
-        for (let prodAppId of new Set([...prodAppIds, ...previousApps])) {
-            const roleId = roles[prodAppId];
-            const deleteFromApp = !roleId;
-            const devAppId = backend_core_1.db.getDevelopmentAppID(prodAppId);
-            for (let appId of [prodAppId, devAppId]) {
-                if (!(yield backend_core_1.db.dbExists(appId))) {
-                    continue;
-                }
-                yield backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-                    const db = backend_core_1.context.getAppDB();
-                    const metadataId = (0, utils_1.generateUserMetadataID)(userId);
-                    let metadata;
-                    try {
-                        metadata = yield db.get(metadataId);
-                    }
-                    catch (err) {
-                        if (deleteFromApp) {
-                            return;
-                        }
-                        metadata = {
-                            tableId: utils_2.InternalTables.USER_METADATA,
-                        };
-                    }
-                    if (deleteFromApp) {
-                        yield db.remove(metadata);
-                        return;
-                    }
-                    // assign the roleId for the metadata doc
-                    if (roleId) {
-                        metadata.roleId = roleId;
-                    }
-                    let combined = sdk_1.default.users.combineMetadataAndUser(user, metadata);
-                    // if its null then there was no updates required
-                    if (combined) {
-                        yield db.put(combined);
-                    }
-                }));
-            }
-        }
-        ctx.body = {
-            message: "User synced.",
-        };
-    });
-}
-exports.syncUser = syncUser;
 function fetchMetadata(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const global = yield (0, global_1.getGlobalUsers)();

package/dist/api/routes/user.js

@@ -38,7 +38,6 @@ router
     .put("/api/users/metadata", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.updateMetadata)
     .post("/api/users/metadata/self", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.updateSelfMetadata)
     .delete("/api/users/metadata/:id", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.destroyMetadata)
-    .post("/api/users/metadata/sync/:id", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.syncUser)
     .post("/api/users/flags", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.WRITE), controller.setFlag)
     .get("/api/users/flags", (0, authorized_1.default)(PermissionType.USER, PermissionLevel.READ), controller.getFlags);
 exports.default = router;

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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.5.6-alpha.0",
+    "version": "2.5.6-alpha.1",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -45,12 +45,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.5.5-alpha.4",
-        "@budibase/client": "2.5.5-alpha.4",
-        "@budibase/pro": "2.5.5-alpha.4",
-        "@budibase/shared-core": "2.5.5-alpha.4",
-        "@budibase/string-templates": "2.5.5-alpha.4",
-        "@budibase/types": "2.5.5-alpha.4",
+        "@budibase/backend-core": "2.5.6-alpha.1",
+        "@budibase/client": "2.5.6-alpha.1",
+        "@budibase/pro": "2.5.6-alpha.1",
+        "@budibase/shared-core": "2.5.6-alpha.1",
+        "@budibase/string-templates": "2.5.6-alpha.1",
+        "@budibase/types": "2.5.6-alpha.1",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

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/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,7 +44,7 @@ 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"));
@@ -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()) {