@budibase/server 1.1.32-alpha.0 → 1.1.32-alpha.3

package/dist/utilities/global.js

@@ -18,6 +18,7 @@ const env = require("../environment");
 const { getAppId } = require("@budibase/backend-core/context");
 const { groups } = require("@budibase/pro");
 exports.updateAppRole = (user, { appId } = {}) => {
+    var _a, _b;
     appId = appId || getAppId();
     if (!user || !user.roles) {
         return user;
@@ -35,18 +36,19 @@ exports.updateAppRole = (user, { appId } = {}) => {
     if (!user.roleId && user.builder && user.builder.global) {
         user.roleId = BUILTIN_ROLE_IDS.ADMIN;
     }
-    else if (!user.roleId) {
+    else if (!user.roleId && !((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
         user.roleId = BUILTIN_ROLE_IDS.PUBLIC;
     }
+    else if ((_b = user === null || user === void 0 ? void 0 : user.userGroups) === null || _b === void 0 ? void 0 : _b.length) {
+        user.roleId = null;
+    }
     delete user.roles;
     return user;
 };
 function checkGroupRoles(user, { appId } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!user.roleId) {
-            let roleId = yield groups.getGroupRoleId(user, appId);
-            user.roleId = roleId;
-        }
+        let roleId = yield groups.getGroupRoleId(user, appId);
+        user.roleId = roleId;
         return user;
     });
 }
@@ -57,7 +59,7 @@ function processUser(user, { appId } = {}) {
             delete user.password;
         }
         user = yield exports.updateAppRole(user, { appId });
-        if ((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length) {
+        if (!user.roleId && ((_a = user === null || user === void 0 ? void 0 : user.userGroups) === null || _a === void 0 ? void 0 : _a.length)) {
             user = yield checkGroupRoles(user, { appId });
         }
         return user;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.1.32-alpha.0",
+  "version": "1.1.32-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.1.32-alpha.0",
-    "@budibase/client": "1.1.32-alpha.0",
-    "@budibase/pro": "1.1.31",
-    "@budibase/string-templates": "1.1.32-alpha.0",
-    "@budibase/types": "1.1.32-alpha.0",
+    "@budibase/backend-core": "1.1.32-alpha.3",
+    "@budibase/client": "1.1.32-alpha.3",
+    "@budibase/pro": "1.1.32-alpha.2",
+    "@budibase/string-templates": "1.1.32-alpha.3",
+    "@budibase/types": "1.1.32-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "54294e978f6c67961aa1c3fab5e310ada0769cd6"
+  "gitHead": "1b7322e51adc38e71f59caa2daf057304df07771"
 }

package/src/utilities/global.js

@@ -32,8 +32,10 @@ exports.updateAppRole = (user, { appId } = {}) => {
   // if a role wasn't found then either set as admin (builder) or public (everyone else)
   if (!user.roleId && user.builder && user.builder.global) {
     user.roleId = BUILTIN_ROLE_IDS.ADMIN
-  } else if (!user.roleId) {
+  } else if (!user.roleId && !user?.userGroups?.length) {
     user.roleId = BUILTIN_ROLE_IDS.PUBLIC
+  } else if (user?.userGroups?.length) {
+    user.roleId = null
   }
 
   delete user.roles
@@ -41,10 +43,8 @@ exports.updateAppRole = (user, { appId } = {}) => {
 }
 
 async function checkGroupRoles(user, { appId } = {}) {
-  if (!user.roleId) {
-    let roleId = await groups.getGroupRoleId(user, appId)
-    user.roleId = roleId
-  }
+  let roleId = await groups.getGroupRoleId(user, appId)
+  user.roleId = roleId
 
   return user
 }
@@ -54,7 +54,7 @@ async function processUser(user, { appId } = {}) {
     delete user.password
   }
   user = await exports.updateAppRole(user, { appId })
-  if (user?.userGroups?.length) {
+  if (!user.roleId && user?.userGroups?.length) {
     user = await checkGroupRoles(user, { appId })
   }