diff --git a/packages/features/ee/organizations/repositories/OrganizationRepository.ts b/packages/features/ee/organizations/repositories/OrganizationRepository.ts index 9439699b4d..4914b69486 100644 --- a/packages/features/ee/organizations/repositories/OrganizationRepository.ts +++ b/packages/features/ee/organizations/repositories/OrganizationRepository.ts @@ -333,7 +333,9 @@ export class OrganizationRepository { accepted: membership?.accepted, }, ...membership?.team, - metadata, + metadata: { + requestedSlug: metadata?.requestedSlug ?? null, + }, }; } diff --git a/packages/features/ee/teams/repositories/TeamRepository.ts b/packages/features/ee/teams/repositories/TeamRepository.ts index 3dc3c99f06..a949d0fa3f 100644 --- a/packages/features/ee/teams/repositories/TeamRepository.ts +++ b/packages/features/ee/teams/repositories/TeamRepository.ts @@ -308,9 +308,16 @@ export class TeamRepository { slug: true, logoUrl: true, isOrganization: true, - metadata: true, inviteTokens: true, - parent: true, + parent: { + select: { + id: true, + slug: true, + logoUrl: true, + name: true, + isOrganization: true, + }, + }, parentId: true, }, }, @@ -323,14 +330,21 @@ export class TeamRepository { if (includeOrgs) return true; return !mmship.team.isOrganization; }) - .map(({ team: { inviteTokens, ...team }, ...membership }) => ({ - role: membership.role, - accepted: membership.accepted, - ...team, - metadata: teamMetadataSchema.parse(team.metadata), - /** To prevent breaking we only return non-email attached token here, if we have one */ - inviteToken: inviteTokens.find((token) => token.identifier === `invite-link-for-teamId-${team.id}`), - })); + .map(({ team: { inviteTokens, ...team }, ...membership }) => { + // Only return inviteToken if user is OWNER or ADMIN + const inviteToken = + membership.role === "OWNER" || membership.role === "ADMIN" + ? inviteTokens.find((token) => token.identifier === `invite-link-for-teamId-${team.id}`) + : null; + + return { + role: membership.role, + accepted: membership.accepted, + ...team, + /** To prevent breaking we only return non-email attached token here, if we have one */ + inviteToken, + }; + }); } /** @@ -357,9 +371,7 @@ export class TeamRepository { }, }); - return memberships - .filter((mmship) => !mmship.team.isOrganization) - .map((mmship) => mmship.team); + return memberships.filter((mmship) => !mmship.team.isOrganization).map((mmship) => mmship.team); } async findTeamWithOrganizationSettings(teamId: number) { diff --git a/packages/features/users/repositories/UserRepository.ts b/packages/features/users/repositories/UserRepository.ts index ffed9e449f..a2a56263ff 100644 --- a/packages/features/users/repositories/UserRepository.ts +++ b/packages/features/users/repositories/UserRepository.ts @@ -516,6 +516,45 @@ export class UserRepository { }; } + async enrichUserWithItsProfileExcludingOrgMetadata< + T extends { + id: number; + username: string | null; + } + >({ + user, + }: { + user: T; + }): Promise< + T & { + nonProfileUsername: string | null; + profile: UserProfile; + } + > { + const enrichedUser = await this.enrichUserWithItsProfile({ user }); + + const { profile } = enrichedUser; + + if (!profile || !profile.organization) { + return enrichedUser; + } + + // Exclude organization metadata + const sanitizedProfile: UserProfile = { + ...profile, + organization: { + ...profile.organization, + metadata: {}, + organizationSettings: profile.organization.organizationSettings, + }, + }; + + return { + ...enrichedUser, + profile: sanitizedProfile, + }; + } + async enrichUsersWithTheirProfiles( users: T[] ): Promise< @@ -575,6 +614,42 @@ export class UserRepository { }); } + async enrichUsersWithTheirProfileExcludingOrgMetadata( + users: T[] + ): Promise< + Array< + T & { + nonProfileUsername: string | null; + profile: UserProfile; + } + > + > { + const enrichedUsers = await this.enrichUsersWithTheirProfiles(users); + + return enrichedUsers.map((enrichedUser) => { + const { profile } = enrichedUser; + + if (!profile || !profile.organization) { + return enrichedUser; + } + + // Exclude organization metadata + const sanitizedProfile: UserProfile = { + ...profile, + organization: { + ...profile.organization, + metadata: {}, + organizationSettings: profile.organization.organizationSettings, + }, + }; + + return { + ...enrichedUser, + profile: sanitizedProfile, + }; + }); + } + enrichUserWithItsProfileBuiltFromUser({ user, }: { diff --git a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts index d8bc42e112..5d4e572dd9 100644 --- a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts +++ b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts @@ -75,7 +75,7 @@ async function getTeamMembers({ for (const membership of memberships) { membershipWithUserProfile.push({ ...membership, - user: await userRepo.enrichUserWithItsProfile({ + user: await userRepo.enrichUserWithItsProfileExcludingOrgMetadata({ user: membership.user, }), }); diff --git a/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts b/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts index 4a46250455..82e2d7ff33 100644 --- a/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts +++ b/packages/trpc/server/routers/viewer/organizations/listOtherTeamMembers.handler.ts @@ -104,13 +104,23 @@ export const listOtherTeamMembers = async ({ input }: ListOptions) => { nextCursor = nextItem?.id || null; } + const users = members.map((membership) => membership.user); + const enrichedUsers = await new UserRepository(prisma).enrichUsersWithTheirProfileExcludingOrgMetadata( + users + ); + + const enrichedUserMap = new Map(); + enrichedUsers.forEach((enrichedUser) => { + enrichedUserMap.set(enrichedUser.id, enrichedUser); + }); + const enrichedMemberships = []; for (const membership of members) { + const enrichedUser = enrichedUserMap.get(membership.user.id); + if (!enrichedUser) continue; enrichedMemberships.push({ ...membership, - user: await new UserRepository(prisma).enrichUserWithItsProfile({ - user: membership.user, - }), + user: enrichedUser, }); } return { diff --git a/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts b/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts index f64589a5de..dcc605305c 100644 --- a/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/legacyListMembers.handler.ts @@ -1,7 +1,4 @@ -import { Resource, CustomAction } from "@calcom/features/pbac/domain/types/permission-registry"; -import { getSpecificPermissions } from "@calcom/features/pbac/lib/resource-permissions"; import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service"; -import { UserRepository } from "@calcom/features/users/repositories/UserRepository"; import type { PrismaClient } from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; import { MembershipRole } from "@calcom/prisma/enums"; @@ -110,28 +107,21 @@ export const legacyListMembers = async ({ ctx, input }: ListMembersOptions) => { ], }); - const enrichedMembers = await Promise.all( - memberships.map(async (membership) => - new UserRepository(prisma).enrichUserWithItsProfile({ - user: { - ...membership.user, - accepted: membership.accepted, - membershipId: membership.id, - }, - }) - ) - ); - - const usersFetched = enrichedMembers.length; - let nextCursor: typeof cursor | undefined = undefined; - if (usersFetched > limit) { - const nextItem = enrichedMembers.pop(); - nextCursor = nextItem?.membershipId; + if (memberships.length > limit) { + const nextItem = memberships.pop(); + nextCursor = nextItem?.id; } + const members = memberships.map((membership) => ({ + id: membership.user.id, + name: membership.user.name, + username: membership.user.username, + avatarUrl: membership.user.avatarUrl, + })); + return { - members: enrichedMembers, + members, nextCursor, }; }; diff --git a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts b/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts index 1e0bb521d5..5707db3e6b 100644 --- a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts @@ -105,11 +105,23 @@ export const listMembersHandler = async ({ ctx, input }: ListMembersHandlerOptio // PBAC not enabled or error occurred, continue with traditional roles } - const membersWithApps = await Promise.all( - teamMembers.map(async (member) => { - const user = await new UserRepository(prisma).enrichUserWithItsProfile({ - user: member.user, - }); + const users = teamMembers.map((member) => member.user); + const enrichedUsers = await new UserRepository(prisma).enrichUsersWithTheirProfileExcludingOrgMetadata( + users + ); + + const enrichedUserMap = new Map(); + enrichedUsers.forEach((enrichedUser) => { + enrichedUserMap.set(enrichedUser.id, enrichedUser); + }); + + const membersWithApps = teamMembers + .map((member) => { + const user = enrichedUserMap.get(member.user.id); + if (!user) { + return null; + } + const { profile, ...restUser } = user; // Determine the role to display @@ -140,7 +152,7 @@ export const listMembersHandler = async ({ ctx, input }: ListMembersHandlerOptio : null, }; }) - ); + .filter((member): member is NonNullable => member !== null); return { members: membersWithApps,