From 2c7f5f617379107a5fdb810d1ddd89e055cef327 Mon Sep 17 00:00:00 2001
From: ankitsridhar16 <ankit.sridhar16@gmail.com>
Date: Thu, 22 Jun 2023 11:29:37 +0530
Subject: [PATCH] fix: add check for existing invitation for the invitee and
 revoke

---
 .../hoppscotch-backend/src/admin/admin.service.ts  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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);
     }