@budibase/backend-core 2.33.3 → 2.33.4

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,
@@ -70042,17 +70024,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 +70978,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 +70991,7 @@ var identifyUser = async (user, account, timestamp) => {
     installationId,
     tenantId,
     verified: verified2,
-    accountHolder,
+    accountHolder: isAccountHolder,
     providerType,
     builder,
     admin,
@@ -71030,8 +71010,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 +72997,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 +73161,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);