@budibase/backend-core 2.10.15 → 2.10.16-alpha.1

package/dist/index.js

@@ -5695,6 +5695,7 @@ var bustCache = performExport("bustCache");
 var user_exports = {};
 __export(user_exports, {
   getUser: () => getUser,
+  getUsers: () => getUsers,
   invalidateUser: () => invalidateUser
 });
 init_init();
@@ -10020,6 +10021,27 @@ async function populateFromDB2(userId, tenantId) {
   }
   return user;
 }
+async function populateUsersFromDB(userIds) {
+  const getUsersResponse = await UserDB.bulkGet(userIds);
+  const notFoundIds = userIds.filter((uid, i) => !getUsersResponse[i]);
+  const users = getUsersResponse.filter((x) => x);
+  await Promise.all(
+    users.map(async (user) => {
+      user.budibaseAccess = true;
+      if (!environment_default.SELF_HOSTED && !environment_default.DISABLE_ACCOUNT_PORTAL) {
+        const account = await getAccount(user.email);
+        if (account) {
+          user.account = account;
+          user.accountPortalAccess = true;
+        }
+      }
+    })
+  );
+  if (notFoundIds.length) {
+    return { users, notFoundIds };
+  }
+  return { users };
+}
 async function getUser(userId, tenantId, populateUser) {
   if (!populateUser) {
     populateUser = populateFromDB2;
@@ -10053,6 +10075,22 @@ async function getUser(userId, tenantId, populateUser) {
   }
   return user;
 }
+async function getUsers(userIds) {
+  const client = await getUserClient();
+  let usersFromCache = await client.bulkGet(userIds);
+  const missingUsersFromCache = userIds.filter((uid) => !usersFromCache[uid]);
+  const users = Object.values(usersFromCache);
+  let notFoundIds;
+  if (missingUsersFromCache.length) {
+    const usersFromDb = await populateUsersFromDB(missingUsersFromCache);
+    notFoundIds = usersFromDb.notFoundIds;
+    for (const userToCache of usersFromDb.users) {
+      await client.store(userToCache._id, userToCache, EXPIRY_SECONDS3);
+    }
+    users.push(...usersFromDb.users);
+  }
+  return { users, notFoundIds };
+}
 async function invalidateUser(userId) {
   const client = await getUserClient();
   await client.delete(userId);
@@ -10523,12 +10561,14 @@ __export(roles_exports, {
   RoleIDVersion: () => RoleIDVersion,
   builtinRoleToNumber: () => builtinRoleToNumber,
   checkForRoleResourceArray: () => checkForRoleResourceArray,
+  getAllRoleIds: () => getAllRoleIds,
   getAllRoles: () => getAllRoles,
   getBuiltinRoles: () => getBuiltinRoles,
   getDBRoleID: () => getDBRoleID,
   getExternalRoleID: () => getExternalRoleID,
   getRole: () => getRole,
   getUserRoleHierarchy: () => getUserRoleHierarchy,
+  getUserRoleIdHierarchy: () => getUserRoleIdHierarchy,
   isBuiltin: () => isBuiltin,
   lowerBuiltinRoleID: () => lowerBuiltinRoleID,
   roleToNumber: () => roleToNumber
@@ -10552,9 +10592,9 @@ __export(permissions_exports, {
   levelToNumber: () => levelToNumber
 });
 init_src();
-init_src();
 var import_flatten = __toESM(require("lodash/flatten"));
 var import_cloneDeep = __toESM(require("lodash/fp/cloneDeep"));
+init_src();
 var Permission = class {
   constructor(type, level) {
     this.type = type;
@@ -10613,7 +10653,8 @@ var BUILTIN_PERMISSIONS = {
     name: "Read only",
     permissions: [
       new Permission("query" /* QUERY */, "read" /* READ */),
-      new Permission("table" /* TABLE */, "read" /* READ */)
+      new Permission("table" /* TABLE */, "read" /* READ */),
+      new Permission("app" /* APP */, "read" /* READ */)
     ]
   },
   WRITE: {
@@ -10623,7 +10664,8 @@ var BUILTIN_PERMISSIONS = {
       new Permission("query" /* QUERY */, "write" /* WRITE */),
       new Permission("table" /* TABLE */, "write" /* WRITE */),
       new Permission("automation" /* AUTOMATION */, "execute" /* EXECUTE */),
-      new Permission("legacy_view" /* LEGACY_VIEW */, "read" /* READ */)
+      new Permission("legacy_view" /* LEGACY_VIEW */, "read" /* READ */),
+      new Permission("app" /* APP */, "read" /* READ */)
     ]
   },
   POWER: {
@@ -10634,7 +10676,8 @@ var BUILTIN_PERMISSIONS = {
       new Permission("user" /* USER */, "read" /* READ */),
       new Permission("automation" /* AUTOMATION */, "execute" /* EXECUTE */),
       new Permission("webhook" /* WEBHOOK */, "read" /* READ */),
-      new Permission("legacy_view" /* LEGACY_VIEW */, "read" /* READ */)
+      new Permission("legacy_view" /* LEGACY_VIEW */, "read" /* READ */),
+      new Permission("app" /* APP */, "read" /* READ */)
     ]
   },
   ADMIN: {
@@ -10646,7 +10689,8 @@ var BUILTIN_PERMISSIONS = {
       new Permission("automation" /* AUTOMATION */, "admin" /* ADMIN */),
       new Permission("webhook" /* WEBHOOK */, "read" /* READ */),
       new Permission("query" /* QUERY */, "admin" /* ADMIN */),
-      new Permission("legacy_view" /* LEGACY_VIEW */, "read" /* READ */)
+      new Permission("legacy_view" /* LEGACY_VIEW */, "read" /* READ */),
+      new Permission("app" /* APP */, "read" /* READ */)
     ]
   }
 };
@@ -10832,9 +10876,12 @@ async function getAllUserRoles(userRoleId) {
   }
   return roles;
 }
-async function getUserRoleHierarchy(userRoleId, opts = { idOnly: true }) {
-  const roles = await getAllUserRoles(userRoleId);
-  return opts.idOnly ? roles.map((role) => role._id) : roles;
+async function getUserRoleIdHierarchy(userRoleId) {
+  const roles = await getUserRoleHierarchy(userRoleId);
+  return roles.map((role) => role._id);
+}
+async function getUserRoleHierarchy(userRoleId) {
+  return getAllUserRoles(userRoleId);
 }
 function checkForRoleResourceArray(rolePerms, resourceId) {
   if (rolePerms && !Array.isArray(rolePerms[resourceId])) {
@@ -10846,6 +10893,10 @@ function checkForRoleResourceArray(rolePerms, resourceId) {
   }
   return rolePerms;
 }
+async function getAllRoleIds(appId) {
+  const roles = await getAllRoles(appId);
+  return roles.map((role) => role._id);
+}
 async function getAllRoles(appId) {
   if (appId) {
     return doWithDB(appId, internal);
@@ -10908,9 +10959,7 @@ var AccessController = class {
     }
     let roleIds = userRoleId ? this.userHierarchies[userRoleId] : null;
     if (!roleIds && userRoleId) {
-      roleIds = await getUserRoleHierarchy(userRoleId, {
-        idOnly: true
-      });
+      roleIds = await getUserRoleIdHierarchy(userRoleId);
       this.userHierarchies[userRoleId] = roleIds;
     }
     return roleIds?.indexOf(tryingRoleId) !== -1;