diff --git a/packages/hoppscotch-backend/src/admin/admin.service.ts b/packages/hoppscotch-backend/src/admin/admin.service.ts index e3c90c80d..7640a6902 100644 --- a/packages/hoppscotch-backend/src/admin/admin.service.ts +++ b/packages/hoppscotch-backend/src/admin/admin.service.ts @@ -240,7 +240,7 @@ export class AdminService { teamID, user.value.uid, )(); - if (E.left(isUserAlreadyMember)) { + if (E.isLeft(isUserAlreadyMember)) { const addedUser = await this.teamService.addMemberToTeamWithEmail( teamID, userEmail, @@ -248,6 +248,18 @@ export class AdminService { ); if (E.isLeft(addedUser)) return E.left(addedUser.left); + const isUserInvited = + await this.teamInvitationService.getTeamInviteByEmailAndTeamID( + userEmail, + teamID, + ); + + if (E.isRight(isUserInvited)) { + await this.teamInvitationService.revokeInvitation( + isUserInvited.right.id, + )(); + } + return E.right(addedUser.right); }