btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix: add check for existing invitation for the invitee and revoke

Browse Source
This commit is contained in:
ankitsridhar16
2023-06-22 11:29:37 +05:30
committed by Andrew Bastin
parent f19dc700ef
commit 2c7f5f6173
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/hoppscotch-backend/src/admin/admin.service.ts
View File

@@ -240,7 +240,7 @@ export class AdminService {
teamID, teamID,
user.value.uid, user.value.uid,
)(); )();
if (E.left(isUserAlreadyMember)) { if (E.isLeft(isUserAlreadyMember)) {
const addedUser = await this.teamService.addMemberToTeamWithEmail( const addedUser = await this.teamService.addMemberToTeamWithEmail(
teamID, teamID,
userEmail, userEmail,
@@ -248,6 +248,18 @@ export class AdminService {
); );
if (E.isLeft(addedUser)) return E.left(addedUser.left); 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); return E.right(addedUser.right);
} }