@budibase/backend-core 2.11.37 → 2.11.39

package/dist/index.js

@@ -2141,8 +2141,8 @@ var init_pouchDB = __esm({
         import_pouchdb.default.adapter("writableStream", replicationStream.adapters.writableStream);
       }
       if (opts.find) {
-        const find = require("pouchdb-find");
-        import_pouchdb.default.plugin(find);
+        const find2 = require("pouchdb-find");
+        import_pouchdb.default.plugin(find2);
       }
       return import_pouchdb.default.defaults(POUCH_DB_DEFAULTS);
     };
@@ -2581,12 +2581,12 @@ function getAppId() {
     return foundId;
   }
 }
-function doInEnvironmentContext(values, task) {
-  if (!values) {
+function doInEnvironmentContext(values2, task) {
+  if (!values2) {
     throw new Error("Must supply environment variables.");
   }
   const updates = {
-    environmentVariables: values
+    environmentVariables: values2
   };
   return newContext(updates, task);
 }
@@ -3899,8 +3899,8 @@ var init_Replication = __esm({
     Replication = class {
       /**
        *
-       * @param {String} source - the DB you want to replicate or rollback to
-       * @param {String} target - the DB you want to replicate to, or rollback from
+       * @param source - the DB you want to replicate or rollback to
+       * @param target - the DB you want to replicate to, or rollback from
        */
       constructor({ source, target }) {
         this.source = getPouchDB(source);
@@ -3922,7 +3922,7 @@ var init_Replication = __esm({
       }
       /**
        * Two way replication operation, intended to be promise based.
-       * @param {Object} opts - PouchDB replication options
+       * @param opts - PouchDB replication options
        */
       sync(opts = {}) {
         this.replication = this.promisify(this.source.sync, opts);
@@ -3930,7 +3930,7 @@ var init_Replication = __esm({
       }
       /**
        * One way replication operation, intended to be promise based.
-       * @param {Object} opts - PouchDB replication options
+       * @param opts - PouchDB replication options
        */
       replicate(opts = {}) {
         this.replication = this.promisify(this.source.replicate.to, opts);
@@ -6254,6 +6254,7 @@ __export(users_exports3, {
   getAccountHolderFromUserIds: () => getAccountHolderFromUserIds,
   getAllUserIds: () => getAllUserIds,
   getById: () => getById,
+  getCreatorCount: () => getCreatorCount,
   getExistingAccounts: () => getExistingAccounts,
   getExistingPlatformUsers: () => getExistingPlatformUsers,
   getExistingTenantUsers: () => getExistingTenantUsers,
@@ -6267,6 +6268,7 @@ __export(users_exports3, {
   isAdmin: () => isAdmin2,
   isAdminOrBuilder: () => isAdminOrBuilder2,
   isBuilder: () => isBuilder2,
+  isCreator: () => isCreator2,
   isGlobalBuilder: () => isGlobalBuilder2,
   isSupportedUserSearch: () => isSupportedUserSearch,
   paginatedUsers: () => paginatedUsers,
@@ -6283,222 +6285,6 @@ init_db4();
 init_src();
 init_context2();
 init_context2();
-function removeUserPassword(users) {
-  if (Array.isArray(users)) {
-    return users.map((user) => {
-      if (user) {
-        delete user.password;
-        return user;
-      }
-    });
-  } else if (users) {
-    delete users.password;
-    return users;
-  }
-  return users;
-}
-var isSupportedUserSearch = (query) => {
-  const allowed = [
-    { op: "string" /* STRING */, key: "email" },
-    { op: "equal" /* EQUAL */, key: "_id" }
-  ];
-  for (let [key, operation] of Object.entries(query)) {
-    if (typeof operation !== "object") {
-      return false;
-    }
-    const fields = Object.keys(operation || {});
-    if (fields.length === 0) {
-      continue;
-    }
-    const allowedOperation = allowed.find(
-      (allow) => allow.op === key && fields.length === 1 && fields[0] === allow.key
-    );
-    if (!allowedOperation) {
-      return false;
-    }
-  }
-  return true;
-};
-var bulkGetGlobalUsersById = async (userIds, opts) => {
-  const db = getGlobalDB();
-  let users = (await db.allDocs({
-    keys: userIds,
-    include_docs: true
-  })).rows.map((row) => row.doc);
-  if (opts?.cleanup) {
-    users = removeUserPassword(users);
-  }
-  return users;
-};
-var getAllUserIds = async () => {
-  const db = getGlobalDB();
-  const startKey = `${"us" /* USER */}${SEPARATOR}`;
-  const response = await db.allDocs({
-    startkey: startKey,
-    endkey: `${startKey}${UNICODE_MAX}`
-  });
-  return response.rows.map((row) => row.id);
-};
-var bulkUpdateGlobalUsers = async (users) => {
-  const db = getGlobalDB();
-  return await db.bulkDocs(users);
-};
-async function getById(id, opts) {
-  const db = getGlobalDB();
-  let user = await db.get(id);
-  if (opts?.cleanup) {
-    user = removeUserPassword(user);
-  }
-  return user;
-}
-var getGlobalUserByEmail = async (email, opts) => {
-  if (email == null) {
-    throw "Must supply an email address to view";
-  }
-  const response = await queryGlobalView("by_email2" /* USER_BY_EMAIL */, {
-    key: email.toLowerCase(),
-    include_docs: true
-  });
-  if (Array.isArray(response)) {
-    throw new Error(`Multiple users found with email address: ${email}`);
-  }
-  let user = response;
-  if (opts?.cleanup) {
-    user = removeUserPassword(user);
-  }
-  return user;
-};
-var searchGlobalUsersByApp = async (appId, opts, getOpts) => {
-  if (typeof appId !== "string") {
-    throw new Error("Must provide a string based app ID");
-  }
-  const params2 = getUsersByAppParams(appId, {
-    include_docs: true
-  });
-  params2.startkey = opts && opts.startkey ? opts.startkey : params2.startkey;
-  let response = await queryGlobalView("by_app" /* USER_BY_APP */, params2);
-  if (!response) {
-    response = [];
-  }
-  let users = Array.isArray(response) ? response : [response];
-  if (getOpts?.cleanup) {
-    users = removeUserPassword(users);
-  }
-  return users;
-};
-var searchGlobalUsersByAppAccess = async (appId, opts) => {
-  const roleSelector = `roles.${appId}`;
-  let orQuery = [
-    {
-      "builder.global": true
-    },
-    {
-      "admin.global": true
-    }
-  ];
-  if (appId) {
-    const roleCheck = {
-      [roleSelector]: {
-        $exists: true
-      }
-    };
-    orQuery.push(roleCheck);
-  }
-  let searchOptions = {
-    selector: {
-      $or: orQuery,
-      _id: {
-        $regex: "^us_"
-      }
-    },
-    limit: opts?.limit || 50
-  };
-  const resp = await directCouchFind(getGlobalDBName(), searchOptions);
-  return resp?.rows;
-};
-var getGlobalUserByAppPage = (appId, user) => {
-  if (!user) {
-    return;
-  }
-  return generateAppUserID(getProdAppID(appId), user._id);
-};
-var searchGlobalUsersByEmail = async (email, opts, getOpts) => {
-  if (typeof email !== "string") {
-    throw new Error("Must provide a string to search by");
-  }
-  const lcEmail = email.toLowerCase();
-  const startkey = opts && opts.startkey ? opts.startkey : lcEmail;
-  let response = await queryGlobalView("by_email2" /* USER_BY_EMAIL */, {
-    ...opts,
-    startkey,
-    endkey: `${lcEmail}${UNICODE_MAX}`
-  });
-  if (!response) {
-    response = [];
-  }
-  let users = Array.isArray(response) ? response : [response];
-  if (getOpts?.cleanup) {
-    users = removeUserPassword(users);
-  }
-  return users;
-};
-var PAGE_LIMIT = 8;
-var paginatedUsers = async ({
-  bookmark,
-  query,
-  appId
-} = {}) => {
-  const db = getGlobalDB();
-  const opts = {
-    include_docs: true,
-    limit: PAGE_LIMIT + 1
-  };
-  if (bookmark) {
-    opts.startkey = bookmark;
-  }
-  let userList, property = "_id", getKey;
-  if (query?.equal?._id) {
-    userList = [await getById(query.equal._id)];
-  } else if (appId) {
-    userList = await searchGlobalUsersByApp(appId, opts);
-    getKey = (doc) => getGlobalUserByAppPage(appId, doc);
-  } else if (query?.string?.email) {
-    userList = await searchGlobalUsersByEmail(query?.string?.email, opts);
-    property = "email";
-  } else {
-    const response = await db.allDocs(getGlobalUserParams(null, opts));
-    userList = response.rows.map((row) => row.doc);
-  }
-  return pagination(userList, PAGE_LIMIT, {
-    paginate: true,
-    property,
-    getKey
-  });
-};
-async function getUserCount() {
-  const response = await queryGlobalViewRaw("by_email2" /* USER_BY_EMAIL */, {
-    limit: 0,
-    // to be as fast as possible - we just want the total rows count
-    include_docs: false
-  });
-  return response.total_rows;
-}
-function removePortalUserPermissions(user) {
-  delete user.admin;
-  delete user.builder;
-  return user;
-}
-function cleanseUserObject(user, base) {
-  delete user.admin;
-  delete user.builder;
-  delete user.roles;
-  if (base) {
-    user.admin = base.admin;
-    user.builder = base.builder;
-    user.roles = base.roles;
-  }
-  return user;
-}
 
 // src/users/utils.ts
 init_environment2();
@@ -6785,14 +6571,17 @@ __export(users_exports2, {
   getGlobalUserID: () => getGlobalUserID,
   hasAdminPermissions: () => hasAdminPermissions,
   hasAppBuilderPermissions: () => hasAppBuilderPermissions,
+  hasAppCreatorPermissions: () => hasAppCreatorPermissions,
   hasBuilderPermissions: () => hasBuilderPermissions,
   isAdmin: () => isAdmin,
   isAdminOrBuilder: () => isAdminOrBuilder,
   isAdminOrGlobalBuilder: () => isAdminOrGlobalBuilder,
   isBuilder: () => isBuilder,
+  isCreator: () => isCreator,
   isGlobalBuilder: () => isGlobalBuilder
 });
 init_src();
+var _ = __toESM(require("lodash/fp"));
 function isBuilder(user, appId) {
   if (!user) {
     return false;
@@ -6827,6 +6616,17 @@ function hasAppBuilderPermissions(user) {
   const isGlobalBuilder3 = !!user.builder?.global;
   return !isGlobalBuilder3 && appLength != null && appLength > 0;
 }
+function hasAppCreatorPermissions(user) {
+  if (!user) {
+    return false;
+  }
+  return _.flow(
+    _.get("roles"),
+    _.values,
+    _.find((x) => ["CREATOR", "ADMIN"].includes(x)),
+    (x) => !!x
+  )(user);
+}
 function hasBuilderPermissions(user) {
   if (!user) {
     return false;
@@ -6839,6 +6639,12 @@ function hasAdminPermissions(user) {
   }
   return !!user.admin?.global;
 }
+function isCreator(user) {
+  if (!user) {
+    return false;
+  }
+  return isGlobalBuilder(user) || hasAdminPermissions(user) || hasAppBuilderPermissions(user) || hasAppCreatorPermissions(user);
+}
 function getGlobalUserID(userId) {
   if (typeof userId !== "string") {
     return userId;
@@ -6880,6 +6686,7 @@ var allowDisplayColumnByType = {
 // src/users/utils.ts
 var isBuilder2 = sdk_exports.users.isBuilder;
 var isAdmin2 = sdk_exports.users.isAdmin;
+var isCreator2 = sdk_exports.users.isCreator;
 var isGlobalBuilder2 = sdk_exports.users.isGlobalBuilder;
 var isAdminOrBuilder2 = sdk_exports.users.isAdminOrBuilder;
 var hasAdminPermissions2 = sdk_exports.users.hasAdminPermissions;
@@ -6913,6 +6720,236 @@ async function getAccountHolderFromUserIds(userIds) {
   }
 }
 
+// src/users/users.ts
+function removeUserPassword(users) {
+  if (Array.isArray(users)) {
+    return users.map((user) => {
+      if (user) {
+        delete user.password;
+        return user;
+      }
+    });
+  } else if (users) {
+    delete users.password;
+    return users;
+  }
+  return users;
+}
+var isSupportedUserSearch = (query) => {
+  const allowed = [
+    { op: "string" /* STRING */, key: "email" },
+    { op: "equal" /* EQUAL */, key: "_id" }
+  ];
+  for (let [key, operation] of Object.entries(query)) {
+    if (typeof operation !== "object") {
+      return false;
+    }
+    const fields = Object.keys(operation || {});
+    if (fields.length === 0) {
+      continue;
+    }
+    const allowedOperation = allowed.find(
+      (allow) => allow.op === key && fields.length === 1 && fields[0] === allow.key
+    );
+    if (!allowedOperation) {
+      return false;
+    }
+  }
+  return true;
+};
+var bulkGetGlobalUsersById = async (userIds, opts) => {
+  const db = getGlobalDB();
+  let users = (await db.allDocs({
+    keys: userIds,
+    include_docs: true
+  })).rows.map((row) => row.doc);
+  if (opts?.cleanup) {
+    users = removeUserPassword(users);
+  }
+  return users;
+};
+var getAllUserIds = async () => {
+  const db = getGlobalDB();
+  const startKey = `${"us" /* USER */}${SEPARATOR}`;
+  const response = await db.allDocs({
+    startkey: startKey,
+    endkey: `${startKey}${UNICODE_MAX}`
+  });
+  return response.rows.map((row) => row.id);
+};
+var bulkUpdateGlobalUsers = async (users) => {
+  const db = getGlobalDB();
+  return await db.bulkDocs(users);
+};
+async function getById(id, opts) {
+  const db = getGlobalDB();
+  let user = await db.get(id);
+  if (opts?.cleanup) {
+    user = removeUserPassword(user);
+  }
+  return user;
+}
+var getGlobalUserByEmail = async (email, opts) => {
+  if (email == null) {
+    throw "Must supply an email address to view";
+  }
+  const response = await queryGlobalView("by_email2" /* USER_BY_EMAIL */, {
+    key: email.toLowerCase(),
+    include_docs: true
+  });
+  if (Array.isArray(response)) {
+    throw new Error(`Multiple users found with email address: ${email}`);
+  }
+  let user = response;
+  if (opts?.cleanup) {
+    user = removeUserPassword(user);
+  }
+  return user;
+};
+var searchGlobalUsersByApp = async (appId, opts, getOpts) => {
+  if (typeof appId !== "string") {
+    throw new Error("Must provide a string based app ID");
+  }
+  const params2 = getUsersByAppParams(appId, {
+    include_docs: true
+  });
+  params2.startkey = opts && opts.startkey ? opts.startkey : params2.startkey;
+  let response = await queryGlobalView("by_app" /* USER_BY_APP */, params2);
+  if (!response) {
+    response = [];
+  }
+  let users = Array.isArray(response) ? response : [response];
+  if (getOpts?.cleanup) {
+    users = removeUserPassword(users);
+  }
+  return users;
+};
+var searchGlobalUsersByAppAccess = async (appId, opts) => {
+  const roleSelector = `roles.${appId}`;
+  let orQuery = [
+    {
+      "builder.global": true
+    },
+    {
+      "admin.global": true
+    }
+  ];
+  if (appId) {
+    const roleCheck = {
+      [roleSelector]: {
+        $exists: true
+      }
+    };
+    orQuery.push(roleCheck);
+  }
+  let searchOptions = {
+    selector: {
+      $or: orQuery,
+      _id: {
+        $regex: "^us_"
+      }
+    },
+    limit: opts?.limit || 50
+  };
+  const resp = await directCouchFind(getGlobalDBName(), searchOptions);
+  return resp?.rows;
+};
+var getGlobalUserByAppPage = (appId, user) => {
+  if (!user) {
+    return;
+  }
+  return generateAppUserID(getProdAppID(appId), user._id);
+};
+var searchGlobalUsersByEmail = async (email, opts, getOpts) => {
+  if (typeof email !== "string") {
+    throw new Error("Must provide a string to search by");
+  }
+  const lcEmail = email.toLowerCase();
+  const startkey = opts && opts.startkey ? opts.startkey : lcEmail;
+  let response = await queryGlobalView("by_email2" /* USER_BY_EMAIL */, {
+    ...opts,
+    startkey,
+    endkey: `${lcEmail}${UNICODE_MAX}`
+  });
+  if (!response) {
+    response = [];
+  }
+  let users = Array.isArray(response) ? response : [response];
+  if (getOpts?.cleanup) {
+    users = removeUserPassword(users);
+  }
+  return users;
+};
+var PAGE_LIMIT = 8;
+var paginatedUsers = async ({
+  bookmark,
+  query,
+  appId
+} = {}) => {
+  const db = getGlobalDB();
+  const opts = {
+    include_docs: true,
+    limit: PAGE_LIMIT + 1
+  };
+  if (bookmark) {
+    opts.startkey = bookmark;
+  }
+  let userList, property = "_id", getKey;
+  if (query?.equal?._id) {
+    userList = [await getById(query.equal._id)];
+  } else if (appId) {
+    userList = await searchGlobalUsersByApp(appId, opts);
+    getKey = (doc) => getGlobalUserByAppPage(appId, doc);
+  } else if (query?.string?.email) {
+    userList = await searchGlobalUsersByEmail(query?.string?.email, opts);
+    property = "email";
+  } else {
+    const response = await db.allDocs(getGlobalUserParams(null, opts));
+    userList = response.rows.map((row) => row.doc);
+  }
+  return pagination(userList, PAGE_LIMIT, {
+    paginate: true,
+    property,
+    getKey
+  });
+};
+async function getUserCount() {
+  const response = await queryGlobalViewRaw("by_email2" /* USER_BY_EMAIL */, {
+    limit: 0,
+    // to be as fast as possible - we just want the total rows count
+    include_docs: false
+  });
+  return response.total_rows;
+}
+async function getCreatorCount() {
+  let creators = 0;
+  async function iterate(startPage) {
+    const page = await paginatedUsers({ bookmark: startPage });
+    creators += page.data.filter(isCreator2).length;
+    if (page.hasNextPage) {
+      await iterate(page.nextPage);
+    }
+  }
+  await iterate();
+  return creators;
+}
+function removePortalUserPermissions(user) {
+  delete user.admin;
+  delete user.builder;
+  return user;
+}
+function cleanseUserObject(user, base) {
+  delete user.admin;
+  delete user.builder;
+  delete user.roles;
+  if (base) {
+    user.admin = base.admin;
+    user.builder = base.builder;
+    user.roles = base.roles;
+  }
+  return user;
+}
+
 // src/users/db.ts
 init_environment2();
 
@@ -7419,8 +7456,8 @@ function newJob(queue, message) {
 var InMemoryQueue = class {
   /**
    * The constructor the queue, exactly the same as that of Bulls.
-   * @param {string} name The name of the queue which is being configured.
-   * @param {object|null} opts This is not used by the in memory queue as there is no real use
+   * @param name The name of the queue which is being configured.
+   * @param opts This is not used by the in memory queue as there is no real use
    * case when in memory, but is the same API as Bull
    */
   constructor(name, opts = null) {
@@ -7435,7 +7472,7 @@ var InMemoryQueue = class {
    * Same callback API as Bull, each callback passed to this will consume messages as they are
    * available. Please note this is a queue service, not a notification service, so each
    * consumer will receive different messages.
-   * @param {function<object>} func The callback function which will return a "Job", the same
+   * @param func The callback function which will return a "Job", the same
    * as the Bull API, within this job the property "data" contains the JSON message. Please
    * note this is incredibly limited compared to Bull as in reality the Job would contain
    * a lot more information about the queue and current status of Bull cluster.
@@ -7458,9 +7495,9 @@ var InMemoryQueue = class {
    * Simple function to replicate the add message functionality of Bull, putting
    * a new message on the queue. This then emits an event which will be used to
    * return the message to a consumer (if one is attached).
-   * @param {object} msg A message to be transported over the queue, this should be
+   * @param msg A message to be transported over the queue, this should be
    * a JSON message as this is required by Bull.
-   * @param {boolean} repeat serves no purpose for the import queue.
+   * @param repeat serves no purpose for the import queue.
    */
   // eslint-disable-next-line no-unused-vars
   add(msg, repeat) {
@@ -7479,7 +7516,7 @@ var InMemoryQueue = class {
   }
   /**
    * This removes a cron which has been implemented, this is part of Bull API.
-   * @param {string} cronJobId The cron which is to be removed.
+   * @param cronJobId The cron which is to be removed.
    */
   removeRepeatableByKey(cronJobId) {
     console.log(cronJobId);
@@ -9898,7 +9935,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) {
@@ -9942,6 +9980,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 = [];
@@ -9957,49 +9996,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();
@@ -10030,10 +10076,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;
@@ -10070,7 +10117,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" });
@@ -10247,7 +10295,7 @@ async function put(db, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
   }
   return { ok: true, id: output._id, rev: output._rev };
 }
-async function get2(db, id) {
+async function get3(db, id) {
   const cache = await getCache();
   const cacheKey = makeCacheKey(db, id);
   let cacheItem = await cache.get(cacheKey);
@@ -10276,11 +10324,11 @@ 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 get2(this.db, id);
+    return get3(this.db, id);
   }
   async remove(docOrId, rev) {
     return remove(this.db, docOrId, rev);