@budibase/backend-core 2.11.41 → 2.11.43

package/dist/index.js

@@ -1753,11 +1753,11 @@ function getPackageJsonFields() {
     const content = (0, import_fs.readFileSync)(packageJsonFile, "utf-8");
     const parsedContent = JSON.parse(content);
     return {
-      VERSION: parsedContent.version,
+      VERSION: process.env.BUDIBASE_VERSION || parsedContent.version,
       SERVICE_NAME: parsedContent.name
     };
   } catch {
-    return { VERSION: "", SERVICE_NAME: "" };
+    return { VERSION: process.env.BUDIBASE_VERSION || "", SERVICE_NAME: "" };
   }
 }
 function isWorker() {
@@ -9955,8 +9955,7 @@ var UserDB = class _UserDB {
       }
     }
     const change = dbUser ? 0 : 1;
-    const creatorsChange = isCreator2(dbUser) !== isCreator2(user) ? 1 : 0;
-    return _UserDB.quotas.addUsers(change, creatorsChange, async () => {
+    return _UserDB.quotas.addUsers(change, async () => {
       await validateUniqueUser(email, tenantId);
       let builtUser = await _UserDB.buildUser(user, opts, tenantId, dbUser);
       if (opts.currentUserId && opts.currentUserId === dbUser?._id) {
@@ -10000,7 +9999,6 @@ 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 = [];
@@ -10016,56 +10014,49 @@ 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,
-      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 _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 {
-          successful: saved,
-          unsuccessful
+          _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 {
+        successful: saved,
+        unsuccessful
+      };
+    });
   }
   static async bulkDelete(userIds) {
     const db = getGlobalDB();
@@ -10096,11 +10087,10 @@ var UserDB = class _UserDB {
       _deleted: true
     }));
     const dbResponse = await bulkUpdateGlobalUsers(toDelete);
-    const creatorsToDelete = usersToDelete.filter(isCreator2);
+    await _UserDB.quotas.removeUsers(toDelete.length);
     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;
@@ -10137,8 +10127,7 @@ var UserDB = class _UserDB {
     }
     await users_exports.removeUser(dbUser);
     await db.remove(userId, dbUser._rev);
-    const creatorsToDelete = isCreator2(dbUser) ? 1 : 0;
-    await _UserDB.quotas.removeUsers(1, creatorsToDelete);
+    await _UserDB.quotas.removeUsers(1);
     await handleDeleteEvents(dbUser);
     await user_exports.invalidateUser(userId);
     await invalidateSessions(userId, { reason: "deletion" });
@@ -10344,8 +10333,8 @@ var Writethrough = class {
     this.db = db;
     this.writeRateMs = writeRateMs;
   }
-  async put(doc, writeRateMs = this.writeRateMs) {
-    return put(this.db, doc, writeRateMs);
+  async put(doc) {
+    return put(this.db, doc, this.writeRateMs);
   }
   async get(id) {
     return get3(this.db, id);