@budibase/backend-core 2.11.44 → 2.12.0

package/dist/index.js

@@ -9983,7 +9983,8 @@ var UserDB = class _UserDB {
       }
     }
     const change = dbUser ? 0 : 1;
-    return _UserDB.quotas.addUsers(change, async () => {
+    const creatorsChange = isCreator2(dbUser) !== isCreator2(user) ? 1 : 0;
+    return _UserDB.quotas.addUsers(change, creatorsChange, async () => {
       await validateUniqueUser(email, tenantId);
       let builtUser = await _UserDB.buildUser(user, opts, tenantId, dbUser);
       if (opts.currentUserId && opts.currentUserId === dbUser?._id) {
@@ -10027,6 +10028,7 @@ var UserDB = class _UserDB {
     const tenantId = getTenantId();
     let usersToSave = [];
     let newUsers = [];
+    let newCreators = [];
     const emails = newUsersRequested.map((user) => user.email);
     const existingEmails = await searchExistingEmails(emails);
     const unsuccessful = [];
@@ -10042,49 +10044,56 @@ var UserDB = class _UserDB {
       }
       newUser.userGroups = groups;
       newUsers.push(newUser);
+      if (isCreator2(newUser)) {
+        newCreators.push(newUser);
+      }
     }
     const account = await getAccountByTenantId(tenantId);
-    return _UserDB.quotas.addUsers(newUsers.length, async () => {
-      newUsers.forEach((user) => {
-        usersToSave.push(
-          _UserDB.buildUser(
-            user,
-            {
-              hashPassword: true,
-              requirePassword: user.requirePassword
-            },
-            tenantId,
-            void 0,
-            // no dbUser
-            account
-          )
-        );
-      });
-      const usersToBulkSave = await Promise.all(usersToSave);
-      await bulkUpdateGlobalUsers(usersToBulkSave);
-      for (const user of usersToBulkSave) {
-        await users_exports.addUser(tenantId, user._id, user.email);
-        await handleSaveEvents(user, void 0);
-      }
-      const saved = usersToBulkSave.map((user) => {
+    return _UserDB.quotas.addUsers(
+      newUsers.length,
+      newCreators.length,
+      async () => {
+        newUsers.forEach((user) => {
+          usersToSave.push(
+            _UserDB.buildUser(
+              user,
+              {
+                hashPassword: true,
+                requirePassword: user.requirePassword
+              },
+              tenantId,
+              void 0,
+              // no dbUser
+              account
+            )
+          );
+        });
+        const usersToBulkSave = await Promise.all(usersToSave);
+        await bulkUpdateGlobalUsers(usersToBulkSave);
+        for (const user of usersToBulkSave) {
+          await users_exports.addUser(tenantId, user._id, user.email);
+          await handleSaveEvents(user, void 0);
+        }
+        const saved = usersToBulkSave.map((user) => {
+          return {
+            _id: user._id,
+            email: user.email
+          };
+        });
+        if (Array.isArray(saved) && groups) {
+          const groupPromises = [];
+          const createdUserIds = saved.map((user) => user._id);
+          for (let groupId of groups) {
+            groupPromises.push(_UserDB.groups.addUsers(groupId, createdUserIds));
+          }
+          await Promise.all(groupPromises);
+        }
         return {
-          _id: user._id,
-          email: user.email
+          successful: saved,
+          unsuccessful
         };
-      });
-      if (Array.isArray(saved) && groups) {
-        const groupPromises = [];
-        const createdUserIds = saved.map((user) => user._id);
-        for (let groupId of groups) {
-          groupPromises.push(_UserDB.groups.addUsers(groupId, createdUserIds));
-        }
-        await Promise.all(groupPromises);
       }
-      return {
-        successful: saved,
-        unsuccessful
-      };
-    });
+    );
   }
   static async bulkDelete(userIds) {
     const db = getGlobalDB();
@@ -10115,10 +10124,11 @@ var UserDB = class _UserDB {
       _deleted: true
     }));
     const dbResponse = await bulkUpdateGlobalUsers(toDelete);
-    await _UserDB.quotas.removeUsers(toDelete.length);
+    const creatorsToDelete = usersToDelete.filter(isCreator2);
     for (let user of usersToDelete) {
       await bulkDeleteProcessing(user);
     }
+    await _UserDB.quotas.removeUsers(toDelete.length, creatorsToDelete.length);
     const userIndex = {};
     usersToDelete.reduce((prev, current) => {
       prev[current._id] = current;
@@ -10155,7 +10165,8 @@ var UserDB = class _UserDB {
     }
     await users_exports.removeUser(dbUser);
     await db.remove(userId, dbUser._rev);
-    await _UserDB.quotas.removeUsers(1);
+    const creatorsToDelete = isCreator2(dbUser) ? 1 : 0;
+    await _UserDB.quotas.removeUsers(1, creatorsToDelete);
     await handleDeleteEvents(dbUser);
     await user_exports.invalidateUser(userId);
     await invalidateSessions(userId, { reason: "deletion" });
@@ -10361,8 +10372,8 @@ var Writethrough = class {
     this.db = db;
     this.writeRateMs = writeRateMs;
   }
-  async put(doc) {
-    return put(this.db, doc, this.writeRateMs);
+  async put(doc, writeRateMs = this.writeRateMs) {
+    return put(this.db, doc, writeRateMs);
   }
   async get(id) {
     return get3(this.db, id);
@@ -10978,7 +10989,9 @@ async function roleToNumber(id) {
   if (isBuiltin(id)) {
     return builtinRoleToNumber(id);
   }
-  const hierarchy = await getUserRoleHierarchy(id);
+  const hierarchy = await getUserRoleHierarchy(id, {
+    defaultPublic: true
+  });
   for (let role of hierarchy) {
     if (isBuiltin(role?.inherits)) {
       return builtinRoleToNumber(role.inherits) + 1;
@@ -11022,11 +11035,11 @@ async function getRole(roleId, opts) {
   }
   return role;
 }
-async function getAllUserRoles(userRoleId) {
+async function getAllUserRoles(userRoleId, opts) {
   if (userRoleId === BUILTIN_IDS.ADMIN) {
     return getAllRoles();
   }
-  let currentRole = await getRole(userRoleId);
+  let currentRole = await getRole(userRoleId, opts);
   let roles = currentRole ? [currentRole] : [];
   let roleIds = [userRoleId];
   while (currentRole && currentRole.inherits && roleIds.indexOf(currentRole.inherits) === -1) {
@@ -11042,8 +11055,8 @@ async function getUserRoleIdHierarchy(userRoleId) {
   const roles = await getUserRoleHierarchy(userRoleId);
   return roles.map((role) => role._id);
 }
-async function getUserRoleHierarchy(userRoleId) {
-  return getAllUserRoles(userRoleId);
+async function getUserRoleHierarchy(userRoleId, opts) {
+  return getAllUserRoles(userRoleId, opts);
 }
 function checkForRoleResourceArray(rolePerms, resourceId) {
   if (rolePerms && !Array.isArray(rolePerms[resourceId])) {