@budibase/backend-core 2.21.2 → 2.21.3

package/dist/index.js

@@ -60005,14 +60005,13 @@ var roles_exports = {};
 __export(roles_exports, {
   AccessController: () => AccessController,
   BUILTIN_ROLE_IDS: () => BUILTIN_ROLE_IDS,
-  BUILTIN_ROLE_ID_ARRAY: () => BUILTIN_ROLE_ID_ARRAY,
-  BUILTIN_ROLE_NAME_ARRAY: () => BUILTIN_ROLE_NAME_ARRAY,
   Role: () => Role,
   RoleIDVersion: () => RoleIDVersion,
   builtinRoleToNumber: () => builtinRoleToNumber,
   checkForRoleResourceArray: () => checkForRoleResourceArray,
   getAllRoleIds: () => getAllRoleIds,
   getAllRoles: () => getAllRoles,
+  getBuiltinRole: () => getBuiltinRole,
   getBuiltinRoles: () => getBuiltinRoles,
   getDBRoleID: () => getDBRoleID,
   getExternalRoleID: () => getExternalRoleID,
@@ -60231,14 +60230,17 @@ var BUILTIN_ROLES = {
 function getBuiltinRoles() {
   return (0, import_cloneDeep2.default)(BUILTIN_ROLES);
 }
-var BUILTIN_ROLE_ID_ARRAY = Object.values(BUILTIN_ROLES).map(
-  (role) => role._id
-);
-var BUILTIN_ROLE_NAME_ARRAY = Object.values(BUILTIN_ROLES).map(
-  (role) => role.name
-);
 function isBuiltin(role) {
-  return BUILTIN_ROLE_ID_ARRAY.some((builtin) => role?.includes(builtin));
+  return getBuiltinRole(role) !== void 0;
+}
+function getBuiltinRole(roleId) {
+  const role = Object.values(BUILTIN_ROLES).find(
+    (role2) => roleId.includes(role2._id)
+  );
+  if (!role) {
+    return void 0;
+  }
+  return (0, import_cloneDeep2.default)(role);
 }
 function builtinRoleToNumber(id) {
   if (!id) {
@@ -60267,7 +60269,7 @@ async function roleToNumber(id) {
     defaultPublic: true
   });
   for (let role of hierarchy) {
-    if (isBuiltin(role?.inherits)) {
+    if (role?.inherits && isBuiltin(role.inherits)) {
       return builtinRoleToNumber(role.inherits) + 1;
     }
   }
@@ -60283,27 +60285,20 @@ function lowerBuiltinRoleID(roleId1, roleId2) {
   return builtinRoleToNumber(roleId1) > builtinRoleToNumber(roleId2) ? roleId2 : roleId1;
 }
 async function getRole(roleId, opts) {
-  if (!roleId) {
-    return void 0;
-  }
-  let role = {};
-  if (isBuiltin(roleId)) {
-    role = (0, import_cloneDeep2.default)(
-      Object.values(BUILTIN_ROLES).find((role2) => role2._id === roleId)
-    );
-  } else {
+  let role = getBuiltinRole(roleId);
+  if (!role) {
     roleId = prefixRoleID(roleId);
   }
   try {
     const db = getAppDB();
     const dbRole = await db.get(getDBRoleID(roleId));
-    role = Object.assign(role, dbRole);
+    role = Object.assign(role || {}, dbRole);
     role._id = getExternalRoleID(role._id, role.version);
   } catch (err) {
     if (!isBuiltin(roleId) && opts?.defaultPublic) {
       return (0, import_cloneDeep2.default)(BUILTIN_ROLES.PUBLIC);
     }
-    if (Object.keys(role).length === 0) {
+    if (!role || Object.keys(role).length === 0) {
       throw err;
     }
   }