From bfd618b8e455b5ccf3ddea7c0e38027ec09f209f Mon Sep 17 00:00:00 2001 From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com> Date: Thu, 4 Dec 2025 09:54:58 -0600 Subject: [PATCH] Merge pull request #30079 from overleaf/jel-domain-capture-invited [web] Remove invite after joining group via domain capture GitOrigin-RevId: dda31fa7f3dad4a94d6179da7ccd2bfa2b21c605 --- .../Features/Subscription/TeamInvitesHandler.mjs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/services/web/app/src/Features/Subscription/TeamInvitesHandler.mjs b/services/web/app/src/Features/Subscription/TeamInvitesHandler.mjs index 480aece9c2..0325cbca4f 100644 --- a/services/web/app/src/Features/Subscription/TeamInvitesHandler.mjs +++ b/services/web/app/src/Features/Subscription/TeamInvitesHandler.mjs @@ -87,6 +87,14 @@ async function _deleteUserSubscription(subscription, userId, ipAddress) { } } +async function removeTeamInviteAndNotification(subscriptionId, userId, email) { + await _removeInviteFromTeam(subscriptionId, email) + + await NotificationsBuilder.promises + .groupInvitation(userId, subscriptionId, false) + .read() +} + async function acceptInvite(token, userId, ipAddress) { const { invite, subscription } = await getInvite(token) if (!invite) { @@ -132,11 +140,7 @@ async function acceptInvite(token, userId, ipAddress) { } } - await _removeInviteFromTeam(subscription.id, invite.email) - - await NotificationsBuilder.promises - .groupInvitation(userId, subscription._id, false) - .read() + await removeTeamInviteAndNotification(subscription._id, userId, invite.email) return subscription } @@ -453,6 +457,7 @@ export default { createInvite, importInvite, acceptInvite, + removeTeamInviteAndNotification, revokeInvite, createTeamInvitesForLegacyInvitedEmail, },