Skip to content

Delete account join request when redeeming an invite #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msukkari merged 3 commits into from
Jun 14, 2025
Merged

Delete account join request when redeeming an invite #352

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a66abf2
delete account join request when redeeming an invite
msukkari Jun 13, 2025
b2a7f04
fix account request fetch
msukkari Jun 14, 2025
257375f
Merge branch 'main' into msukkarieh/stale_join_request
msukkari Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions packages/web/src/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,25 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
}
});

// Delete the account request if it exists since we've redeemed an invite
const accountRequest = await tx.accountRequest.findUnique({
where: {
requestedById_orgId: {
requestedById: user.id,
orgId: invite.orgId,
}
},
});

if (accountRequest) {
logger.info(`Deleting account request ${accountRequest.id} for user ${user.id} since they've redeemed an invite`);
await tx.accountRequest.delete({
where: {
id: accountRequest.id,
}
});
}

if (IS_BILLING_ENABLED) {
const result = await incrementOrgSeatCount(invite.orgId, tx);
if (isServiceError(result)) {
Expand Down