@budibase/backend-core 2.11.40 → 2.11.42

package/dist/index.js

@@ -2141,8 +2141,8 @@ var init_pouchDB = __esm({
         import_pouchdb.default.adapter("writableStream", replicationStream.adapters.writableStream);
       }
       if (opts.find) {
-        const find2 = require("pouchdb-find");
-        import_pouchdb.default.plugin(find2);
+        const find = require("pouchdb-find");
+        import_pouchdb.default.plugin(find);
       }
       return import_pouchdb.default.defaults(POUCH_DB_DEFAULTS);
     };
@@ -2581,12 +2581,12 @@ function getAppId() {
     return foundId;
   }
 }
-function doInEnvironmentContext(values2, task) {
-  if (!values2) {
+function doInEnvironmentContext(values, task) {
+  if (!values) {
     throw new Error("Must supply environment variables.");
   }
   const updates = {
-    environmentVariables: values2
+    environmentVariables: values
   };
   return newContext(updates, task);
 }
@@ -6254,7 +6254,6 @@ __export(users_exports3, {
   getAccountHolderFromUserIds: () => getAccountHolderFromUserIds,
   getAllUserIds: () => getAllUserIds,
   getById: () => getById,
-  getCreatorCount: () => getCreatorCount,
   getExistingAccounts: () => getExistingAccounts,
   getExistingPlatformUsers: () => getExistingPlatformUsers,
   getExistingTenantUsers: () => getExistingTenantUsers,
@@ -6268,7 +6267,6 @@ __export(users_exports3, {
   isAdmin: () => isAdmin2,
   isAdminOrBuilder: () => isAdminOrBuilder2,
   isBuilder: () => isBuilder2,
-  isCreator: () => isCreator2,
   isGlobalBuilder: () => isGlobalBuilder2,
   isSupportedUserSearch: () => isSupportedUserSearch,
   paginatedUsers: () => paginatedUsers,
@@ -6285,6 +6283,224 @@ 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,
+  limit
+} = {}) => {
+  const db = getGlobalDB();
+  const pageLimit = limit ? limit + 1 : PAGE_LIMIT + 1;
+  const opts = {
+    include_docs: true,
+    limit: pageLimit
+  };
+  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, pageLimit, {
+    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();
@@ -6571,17 +6787,14 @@ __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;
@@ -6616,17 +6829,6 @@ 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;
@@ -6639,12 +6841,6 @@ 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;
@@ -6704,7 +6900,6 @@ var allowSortColumnByType = {
 // 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;
@@ -6738,236 +6933,6 @@ 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();
 
@@ -9885,14 +9850,14 @@ var UserDB = class _UserDB {
       userCount: response.length
     };
   }
-  static async getUsersByAppAccess(appId) {
-    const opts = {
+  static async getUsersByAppAccess(opts) {
+    const params2 = {
       include_docs: true,
-      limit: 50
+      limit: opts.limit || 50
     };
     let response = await searchGlobalUsersByAppAccess(
-      appId,
-      opts
+      opts.appId,
+      params2
     );
     return response;
   }
@@ -9953,8 +9918,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) {
@@ -9998,7 +9962,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 = [];
@@ -10014,56 +9977,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();
@@ -10094,11 +10050,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;
@@ -10135,8 +10090,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" });
@@ -10313,7 +10267,7 @@ async function put(db, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
   }
   return { ok: true, id: output._id, rev: output._rev };
 }
-async function get3(db, id) {
+async function get2(db, id) {
   const cache = await getCache();
   const cacheKey = makeCacheKey(db, id);
   let cacheItem = await cache.get(cacheKey);
@@ -10342,11 +10296,11 @@ 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);
+    return get2(this.db, id);
   }
   async remove(docOrId, rev) {
     return remove(this.db, docOrId, rev);