Merge pull request #10694 from nextcloud/bugfix/noid/duplicate-email-…

…exception fix(participants): Don't throw an exception when inviting the same em…
nextcloud · Oct 13, 2023 · 670f924 · 670f924
2 parents c1472ed + 51f713e
commit 670f924
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
@@ -1070,9 +1070,12 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 				$data = ['type' => $this->room->getType()];
 			}
 
-			$participant = $this->participantService->inviteEmailAddress($this->room, $newParticipant);
-
-			$this->guestManager->sendEmailInvitation($this->room, $participant);
+			try {
+				$this->participantService->getParticipantByActor($this->room, Attendee::ACTOR_EMAILS, $newParticipant);
+			} catch (ParticipantNotFoundException) {
+				$participant = $this->participantService->inviteEmailAddress($this->room, $newParticipant);
+				$this->guestManager->sendEmailInvitation($this->room, $participant);
+			}
 
 			return new DataResponse($data);
 		} elseif ($source === 'remotes') {

diff --git a/tests/integration/features/conversation/invite-email.feature b/tests/integration/features/conversation/invite-email.feature
@@ -7,6 +7,9 @@ Feature: conversation/invite-email)
       | roomType | 3 |
       | roomName | room |
     When user "participant1" adds email "test@example.tld" to room "room" with 200 (v4)
+    # Adding the same email again should not error to help the Calendar integration
+    # Ref https://github.com/nextcloud/calendar/pull/5380
+    When user "participant1" adds email "test@example.tld" to room "room" with 200 (v4)
     Then user "participant1" sees the following attendees in room "room" with 200 (v4)
       | participantType | inCall   | actorType | actorId           |
       | 4               | 0        | emails    | test@example.tld  |