@budibase/server 2.2.12-alpha.17 → 2.2.12-alpha.19

package/dist/api/controllers/user.js

@@ -20,11 +20,13 @@ 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);
+            user = (yield (0, global_1.getRawGlobalUser)(userId));
         }
         catch (err) {
             if (err && err.status === 404) {
@@ -35,6 +37,9 @@ function syncUser(ctx) {
                 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;
@@ -51,8 +56,9 @@ function syncUser(ctx) {
                 .filter(entry => entry[1] !== backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC)
                 .map(([appId]) => appId);
         }
-        for (let prodAppId of prodAppIds) {
+        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))) {
@@ -66,20 +72,22 @@ function syncUser(ctx) {
                         metadata = yield db.get(metadataId);
                     }
                     catch (err) {
-                        if (deleting) {
+                        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 = !deleting
-                        ? sdk_1.default.users.combineMetadataAndUser(user, metadata)
-                        : Object.assign(Object.assign({}, metadata), { status: backend_core_1.constants.UserStatus.INACTIVE, metadata: backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC });
+                    let combined = sdk_1.default.users.combineMetadataAndUser(user, metadata);
                     // if its null then there was no updates required
                     if (combined) {
                         yield db.put(combined);

package/dist/middleware/currentapp.js

@@ -18,6 +18,7 @@ const global_1 = require("../utilities/global");
 const environment_1 = __importDefault(require("../environment"));
 const utils_2 = require("./utils");
 exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     // try to get the appID from the request
     let requestAppId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
     // get app cookie if it exists
@@ -52,7 +53,7 @@ exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* ()
         }
     }
     let appId, roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
-    if (!ctx.user) {
+    if (!((_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id)) {
         // not logged in, try to set a cookie for public apps
         appId = requestAppId;
     }
@@ -88,11 +89,12 @@ exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* ()
         return next();
     }
     return backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        var _b;
         let skipCookie = false;
         // if the user not in the right tenant then make sure they have no permissions
         // need to judge this only based on the request app ID,
         if (environment_1.default.MULTI_TENANCY &&
-            ctx.user &&
+            ((_b = ctx.user) === null || _b === void 0 ? void 0 : _b._id) &&
             requestAppId &&
             !backend_core_1.tenancy.isUserInAppTenant(requestAppId, ctx.user)) {
             // don't error, simply remove the users rights (they are a public user)

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.12-alpha.16",
+    "version": "2.2.12-alpha.18",
     "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.12-alpha.16",
-        "@budibase/client": "2.2.12-alpha.16",
-        "@budibase/pro": "2.2.12-alpha.16",
-        "@budibase/string-templates": "2.2.12-alpha.16",
-        "@budibase/types": "2.2.12-alpha.16",
+        "@budibase/backend-core": "2.2.12-alpha.18",
+        "@budibase/client": "2.2.12-alpha.18",
+        "@budibase/pro": "2.2.12-alpha.18",
+        "@budibase/string-templates": "2.2.12-alpha.18",
+        "@budibase/types": "2.2.12-alpha.18",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",