@budibase/backend-core 2.33.11 → 2.33.13

package/dist/index.js

@@ -69702,7 +69702,7 @@ function getBuiltinRole(roleId) {
 function builtinRoleToNumber(id) {
   const builtins = getBuiltinRoles();
   const MAX = Object.values(builtins).length + 1;
-  if (id === BUILTIN_IDS.ADMIN || id === BUILTIN_IDS.BUILDER) {
+  if (compareRoleIds(id, BUILTIN_IDS.ADMIN) || compareRoleIds(id, BUILTIN_IDS.BUILDER)) {
     return MAX;
   }
   let role = builtins[id], count = 0;
@@ -69732,7 +69732,9 @@ async function roleToNumber(id) {
     }
     if (Array.isArray(role.inherits)) {
       const highestBuiltin = role.inherits.map((roleId) => {
-        const foundRole = hierarchy.find((role2) => role2._id === roleId);
+        const foundRole = hierarchy.find(
+          (role2) => compareRoleIds(role2._id, roleId)
+        );
         if (foundRole) {
           return findNumber(foundRole) + 1;
         }
@@ -69809,7 +69811,7 @@ async function saveRoles(roles) {
 }
 async function getAllUserRoles(userRoleId, opts) {
   const allRoles = await getAllRoles();
-  if (userRoleId === BUILTIN_IDS.ADMIN) {
+  if (compareRoleIds(userRoleId, BUILTIN_IDS.ADMIN)) {
     return allRoles;
   }
   const foundRole = findRole(userRoleId, allRoles, opts);
@@ -69884,14 +69886,19 @@ async function getAllRoles(appId) {
     for (let builtinRoleId of externalBuiltinRoles) {
       const builtinRole = builtinRoles[builtinRoleId];
       const dbBuiltin = roles.filter(
-        (dbRole) => getExternalRoleID(dbRole._id, dbRole.version) === builtinRoleId
+        (dbRole) => compareRoleIds(dbRole._id, builtinRoleId)
       )[0];
       if (dbBuiltin == null) {
         roles.push(builtinRole || builtinRoles.BASIC);
       } else {
         roles = roles.filter((role) => role._id !== dbBuiltin._id);
-        dbBuiltin._id = getExternalRoleID(dbBuiltin._id, dbBuiltin.version);
-        roles.push(Object.assign(builtinRole, dbBuiltin));
+        dbBuiltin._id = getExternalRoleID(builtinRole._id, dbBuiltin.version);
+        roles.push({
+          ...builtinRole,
+          ...dbBuiltin,
+          name: builtinRole.name,
+          _id: getExternalRoleID(builtinRole._id, builtinRole.version)
+        });
       }
     }
     for (let role of roles) {
@@ -69922,7 +69929,7 @@ var AccessController = class {
     this.userHierarchies = {};
   }
   async hasAccess(tryingRoleId, userRoleId) {
-    if (tryingRoleId == null || tryingRoleId === "" || tryingRoleId === userRoleId || tryingRoleId === BUILTIN_IDS.BUILDER || userRoleId === BUILTIN_IDS.BUILDER) {
+    if (tryingRoleId == null || tryingRoleId === "" || compareRoleIds(tryingRoleId, BUILTIN_IDS.BUILDER) || compareRoleIds(userRoleId, tryingRoleId) || compareRoleIds(userRoleId, BUILTIN_IDS.BUILDER)) {
       return true;
     }
     let roleIds = userRoleId ? this.userHierarchies[userRoleId] : null;