From 45843e328dd0ccb1022554c2d149bbaef10fb48b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 4 Mar 2025 17:23:08 +0000
Subject: [PATCH] Small improvements.

---
 packages/backend-core/src/users/utils.ts | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/backend-core/src/users/utils.ts b/packages/backend-core/src/users/utils.ts
index 83c581dd6c..7c8cbb083a 100644
--- a/packages/backend-core/src/users/utils.ts
+++ b/packages/backend-core/src/users/utils.ts
@@ -16,8 +16,8 @@ export const hasAdminPermissions = sdk.users.hasAdminPermissions
 export const hasBuilderPermissions = sdk.users.hasBuilderPermissions
 export const hasAppBuilderPermissions = sdk.users.hasAppBuilderPermissions
 
-async function getGroups(groupIds: string[]) {
-  if (groupIds.length) {
+async function getGroups(groupIds?: string[]) {
+  if (groupIds?.length) {
     const db = context.getGlobalDB()
     return await db.getMultiple<UserGroup>(groupIds, { allowMissing: true })
   }
@@ -34,21 +34,16 @@ export async function creatorsInList(
       groups = await getGroups(groupIds)
     }
   }
-  return users.map(user => isCreatorSync(user, groups || []))
+  return users.map(user => isCreatorSync(user, groups))
 }
 
 // fetches groups if no provided, but is async and shouldn't be looped with
-export async function isCreatorAsync(
-  user: User | ContextUser,
-  groups?: UserGroup[]
-) {
-  if (!groups) {
-    groups = await getGroups(user.userGroups || [])
-  }
+export async function isCreatorAsync(user: User | ContextUser) {
+  const groups = await getGroups(user.userGroups)
   return isCreatorSync(user, groups)
 }
 
-export function isCreatorSync(user: User | ContextUser, groups: UserGroup[]) {
+export function isCreatorSync(user: User | ContextUser, groups?: UserGroup[]) {
   const isCreatorByUserDefinition = sdk.users.isCreator(user)
   if (!isCreatorByUserDefinition && user) {
     return isCreatorByGroupMembership(user, groups)
@@ -58,12 +53,12 @@ export function isCreatorSync(user: User | ContextUser, groups: UserGroup[]) {
 
 function isCreatorByGroupMembership(
   user: User | ContextUser,
-  groups: UserGroup[]
+  groups?: UserGroup[]
 ) {
-  const userGroups = groups.filter(
+  const userGroups = groups?.filter(
     group => user.userGroups?.indexOf(group._id!) !== -1
   )
-  if (userGroups.length > 0) {
+  if (userGroups && userGroups.length > 0) {
     return userGroups.some(group =>
       Object.values(group.roles || {}).includes(BUILTIN_ROLE_IDS.ADMIN)
     )