public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix members count when team slug is same as org slug

10-28-fix_members_count_when_team_slug_is_same_as_org_slug
Hariom 2023-10-28 18:01:15 +05:30
parent 901fc36c97
commit f7739c72cf
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/lib/server/queries/teams/index.ts
View File

@ -41,6 +41,7 @@ export async function getTeamWithMembers(args: {
team: { team: {
select: { select: {
slug: true, slug: true,
id: true,
}, },
}, },
}, },
@ -153,12 +154,12 @@ export async function getTeamWithMembers(args: {
}); });
} }
const team = teams[0]; const orgOrTeam = teams[0];
if (!team) return null; if (!orgOrTeam) return null;
// This should improve performance saving already app data found. // This should improve performance saving already app data found.
const appDataMap = new Map(); const appDataMap = new Map();
const members = team.members.map((obj) => { const members = orgOrTeam.members.map((obj) => {
const { credentials, ...restUser } = obj.user; const { credentials, ...restUser } = obj.user;
return { return {
...restUser, ...restUser,
@ -166,7 +167,7 @@ export async function getTeamWithMembers(args: {
accepted: obj.accepted, accepted: obj.accepted,
disableImpersonation: obj.disableImpersonation, disableImpersonation: obj.disableImpersonation,
subteams: orgSlug subteams: orgSlug
? obj.user.teams.filter((obj) => obj.team.slug !== orgSlug).map((obj) => obj.team.slug) ? obj.user.teams.filter((obj) => obj.team.id !== orgOrTeam.id).map((obj) => obj.team.slug)
: null, : null,
avatar: `${WEBAPP_URL}/${obj.user.username}/avatar.png`, avatar: `${WEBAPP_URL}/${obj.user.username}/avatar.png`,
orgOrigin: getOrgFullOrigin(obj.user.organization?.slug || ""), orgOrigin: getOrgFullOrigin(obj.user.organization?.slug || ""),
@ -193,15 +194,15 @@ export async function getTeamWithMembers(args: {
}; };
}); });
const eventTypes = team.eventTypes.map((eventType) => ({ const eventTypes = orgOrTeam.eventTypes.map((eventType) => ({
...eventType, ...eventType,
metadata: EventTypeMetaDataSchema.parse(eventType.metadata), metadata: EventTypeMetaDataSchema.parse(eventType.metadata),
})); }));
// Don't leak invite tokens to the frontend // Don't leak invite tokens to the frontend
const { inviteTokens, ...teamWithoutInviteTokens } = team; const { inviteTokens, ...teamWithoutInviteTokens } = orgOrTeam;
// Don't leak stripe payment ids // Don't leak stripe payment ids
const teamMetadata = teamMetadataSchema.parse(team.metadata); const teamMetadata = teamMetadataSchema.parse(orgOrTeam.metadata);
const { const {
paymentId: _, paymentId: _,
subscriptionId: __, subscriptionId: __,
@ -214,7 +215,7 @@ export async function getTeamWithMembers(args: {
/** To prevent breaking we only return non-email attached token here, if we have one */ /** To prevent breaking we only return non-email attached token here, if we have one */
inviteToken: inviteTokens.find( inviteToken: inviteTokens.find(
(token) => (token) =>
token.identifier === `invite-link-for-teamId-${team.id}` && token.identifier === `invite-link-for-teamId-${orgOrTeam.id}` &&
token.expires > new Date(new Date().setHours(24)) token.expires > new Date(new Date().setHours(24))
), ),
metadata: restTeamMetadata, metadata: restTeamMetadata,