@budibase/backend-core 2.33.3 → 2.33.5

package/dist/index.js

@@ -67267,32 +67267,13 @@ __export(tenancy_exports, {
   addTenantToUrl: () => addTenantToUrl,
   getTenantDB: () => getTenantDB,
   getTenantIDFromCtx: () => getTenantIDFromCtx,
-  getTenantInfo: () => getTenantInfo,
-  isUserInAppTenant: () => isUserInAppTenant,
-  saveTenantInfo: () => saveTenantInfo
+  isUserInAppTenant: () => isUserInAppTenant
 });
 
 // src/tenancy/db.ts
 function getTenantDB(tenantId) {
   return getDB(getGlobalDBName(tenantId));
 }
-async function saveTenantInfo(tenantInfo) {
-  const db = getTenantDB(tenantInfo.tenantId);
-  return db.put({
-    _id: "tenant_info",
-    ...tenantInfo
-  });
-}
-async function getTenantInfo(tenantId) {
-  try {
-    const db = getTenantDB(tenantId);
-    const tenantInfo = await db.get("tenant_info");
-    delete tenantInfo.owner.password;
-    return tenantInfo;
-  } catch {
-    return void 0;
-  }
-}
 
 // src/tenancy/tenancy.ts
 function addTenantToUrl(url) {
@@ -69124,8 +69105,9 @@ __export(users_exports3, {
   bulkUpdateGlobalUsers: () => bulkUpdateGlobalUsers,
   cleanseUserObject: () => cleanseUserObject,
   doesUserExist: () => doesUserExist,
-  getAccountHolderFromUserIds: () => getAccountHolderFromUserIds,
+  getAccountHolderFromUsers: () => getAccountHolderFromUsers,
   getAllUserIds: () => getAllUserIds,
+  getAllUsers: () => getAllUsers,
   getById: () => getById,
   getCreatorCount: () => getCreatorCount,
   getExistingAccounts: () => getExistingAccounts,
@@ -69157,7 +69139,7 @@ __export(users_exports3, {
 // src/users/utils.ts
 var utils_exports6 = {};
 __export(utils_exports6, {
-  getAccountHolderFromUserIds: () => getAccountHolderFromUserIds,
+  getAccountHolderFromUsers: () => getAccountHolderFromUsers,
   hasAdminPermissions: () => hasAdminPermissions2,
   hasAppBuilderPermissions: () => hasAppBuilderPermissions2,
   hasBuilderPermissions: () => hasBuilderPermissions2,
@@ -69720,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;
@@ -69750,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;
         }
@@ -69827,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);
@@ -69902,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) {
@@ -69940,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;
@@ -70042,17 +70031,14 @@ async function validateUniqueUser(email, tenantId) {
     }
   }
 }
-async function getAccountHolderFromUserIds(userIds) {
+async function getAccountHolderFromUsers(users) {
   if (!environment_default.SELF_HOSTED && !environment_default.DISABLE_ACCOUNT_PORTAL) {
-    const tenantId = getTenantId();
-    const account = await getAccountByTenantId(tenantId);
-    if (!account) {
-      throw new Error(`Account not found for tenantId=${tenantId}`);
-    }
-    const budibaseUserId = account.budibaseUserId;
-    if (userIds.includes(budibaseUserId)) {
-      return account;
-    }
+    const accountMetadata = await getExistingAccounts(
+      users.map((user) => user.email)
+    );
+    return users.find(
+      (user) => accountMetadata.map((metadata) => metadata.email).includes(user.email)
+    );
   }
 }
 
@@ -70999,8 +70985,9 @@ var identifyUser = async (user, account, timestamp) => {
   if (isSSOUser(user)) {
     providerType = user.providerType;
   }
-  const accountHolder = account?.budibaseUserId === user._id || false;
-  const verified2 = account && account?.budibaseUserId === user._id ? account.verified : false;
+  const accountHolder = await getExistingAccounts([user.email]);
+  const isAccountHolder = accountHolder.length > 0;
+  const verified2 = !!account && isAccountHolder && account.verified;
   const installationId = await getInstallationId();
   const hosting = account ? account.hosting : getHostingFromEnv();
   const environment2 = getDeploymentEnvironment();
@@ -71011,7 +70998,7 @@ var identifyUser = async (user, account, timestamp) => {
     installationId,
     tenantId,
     verified: verified2,
-    accountHolder,
+    accountHolder: isAccountHolder,
     providerType,
     builder,
     admin,
@@ -71030,8 +71017,9 @@ var identifyAccount = async (account) => {
   const installationId = await getInstallationId();
   const environment2 = getDeploymentEnvironment();
   if (isCloudAccount(account)) {
-    if (account.budibaseUserId) {
-      id = account.budibaseUserId;
+    const user = await getGlobalUserByEmail(account.email);
+    if (user?._id) {
+      id = user._id;
     }
   }
   const identity = {
@@ -73016,24 +73004,24 @@ var UserDB = class _UserDB {
       }
     );
   }
-  static async bulkDelete(userIds) {
+  static async bulkDelete(users) {
     const db = getGlobalDB();
     const response = {
       successful: [],
       unsuccessful: []
     };
-    const account = await getAccountHolderFromUserIds(userIds);
-    if (account) {
-      userIds = userIds.filter((u) => u !== account.budibaseUserId);
+    const accountHolder = await getAccountHolderFromUsers(users);
+    if (accountHolder) {
+      users = users.filter((u) => u.userId !== accountHolder.userId);
       response.unsuccessful.push({
-        _id: account.budibaseUserId,
-        email: account.email,
+        _id: accountHolder.userId,
+        email: accountHolder.email,
         reason: "Account holder cannot be deleted"
       });
     }
     const allDocsResponse = await db.allDocs({
       include_docs: true,
-      keys: userIds
+      keys: users.map((u) => u.userId)
     });
     const usersToDelete = allDocsResponse.rows.map((user) => {
       return user.doc;
@@ -73180,6 +73168,16 @@ async function getAllUserIds() {
   });
   return response.rows.map((row) => row.id);
 }
+async function getAllUsers() {
+  const db = getGlobalDB();
+  const startKey = `${"us" /* USER */}${SEPARATOR}`;
+  const response = await db.allDocs({
+    startkey: startKey,
+    endkey: `${startKey}${UNICODE_MAX}`,
+    include_docs: true
+  });
+  return response.rows.map((row) => row.doc);
+}
 async function bulkUpdateGlobalUsers(users) {
   const db = getGlobalDB();
   return await db.bulkDocs(users);