Fix duplicate event email notifications

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>

4 files changed, 125 insertions, 5 deletions

diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
index 273ad939144..9499e9e2ef1 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
@@ -65,6 +65,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 
 	public function testSendWithoutAttendees():void {
 		[$user1, $user2, $user3, , $user5] = $users = $this->getUsers();
+		$principalEmailAddresses = [$user1->getEmailAddress()];
 
 		$enL10N = $this->createMock(IL10N::class);
 		$enL10N->method('t')
@@ -170,11 +171,12 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 		$this->setupURLGeneratorMock(2);
 
 		$vcalendar = $this->getNoAttendeeVCalendar();
-		$this->provider->send($vcalendar->VEVENT, $this->calendarDisplayName, $users);
+		$this->provider->send($vcalendar->VEVENT, $this->calendarDisplayName, $principalEmailAddresses, $users);
 	}
 
-	public function testSendWithAttendees(): void {
+	public function testSendWithAttendeesWhenOwnerIsOrganizer(): void {
 		[$user1, $user2, $user3, , $user5] = $users = $this->getUsers();
+		$principalEmailAddresses = [$user1->getEmailAddress()];
 
 		$enL10N = $this->createMock(IL10N::class);
 		$enL10N->method('t')
@@ -266,7 +268,81 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 		$this->setupURLGeneratorMock(2);
 
 		$vcalendar = $this->getAttendeeVCalendar();
-		$this->provider->send($vcalendar->VEVENT, $this->calendarDisplayName, $users);
+		$this->provider->send($vcalendar->VEVENT, $this->calendarDisplayName, $principalEmailAddresses, $users);
+	}
+
+	public function testSendWithAttendeesWhenOwnerIsAttendee(): void {
+		[$user1, $user2, $user3] = $this->getUsers();
+		$users = [$user2, $user3];
+		$principalEmailAddresses = [$user2->getEmailAddress()];
+
+		$deL10N = $this->createMock(IL10N::class);
+		$deL10N->method('t')
+			->willReturnArgument(0);
+		$deL10N->method('l')
+			->willReturnArgument(0);
+
+		$this->l10nFactory
+			->method('getUserLanguage')
+			->willReturnMap([
+				[$user2, 'de'],
+				[$user3, 'de'],
+			]);
+
+		$this->l10nFactory
+			->method('findGenericLanguage')
+			->willReturn('en');
+
+		$this->l10nFactory
+			->method('languageExists')
+			->willReturnMap([
+				['dav', 'de', true],
+			]);
+
+		$this->l10nFactory
+			->method('get')
+			->willReturnMap([
+				['dav', 'de', null, $deL10N],
+			]);
+
+		$template1 = $this->getTemplateMock();
+		$message12 = $this->getMessageMock('uid2@example.com', $template1);
+		$message13 = $this->getMessageMock('uid3@example.com', $template1);
+
+		$this->mailer->expects(self::once())
+			->method('createEMailTemplate')
+			->with('dav.calendarReminder')
+			->willReturnOnConsecutiveCalls(
+				$template1,
+			);
+		$this->mailer->expects($this->atLeastOnce())
+			->method('validateMailAddress')
+			->willReturnMap([
+				['foo1@example.org', true],
+				['foo3@example.org', true],
+				['foo4@example.org', true],
+				['uid1@example.com', true],
+				['uid2@example.com', true],
+				['uid3@example.com', true],
+				['invalid', false],
+			]);
+		$this->mailer->expects($this->exactly(2))
+			->method('createMessage')
+			->with()
+			->willReturnOnConsecutiveCalls(
+				$message12,
+				$message13,
+			);
+		$this->mailer->expects($this->exactly(2))
+			->method('send')
+			->withConsecutive(
+				[$message12],
+				[$message13],
+			)->willReturn([]);
+		$this->setupURLGeneratorMock(1);
+
+		$vcalendar = $this->getAttendeeVCalendar();
+		$this->provider->send($vcalendar->VEVENT, $this->calendarDisplayName, $principalEmailAddresses, $users);
 	}
 
 	/**
@@ -377,6 +453,14 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 		]);
 
 		$vcalendar->VEVENT->add(
+			'ORGANIZER',
+			'mailto:uid1@example.com',
+			[
+				'LANG' => 'en'
+			]
+		);
+
+		$vcalendar->VEVENT->add(
 			'ATTENDEE',
 			'mailto:foo1@example.org',
 			[
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
index a62cb98a28f..64020b9dbd7 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/PushProviderTest.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
  * @author Georg Ehrke <oc.list@georgehrke.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Citharel <nextcloud@tcit.fr>
+ * @author Richard Steinmetz <richard@steinmetz.cloud>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -90,7 +91,7 @@ class PushProviderTest extends AbstractNotificationProviderTest {
 
 		$users = [$user1, $user2, $user3];
 
-		$this->provider->send($this->vcalendar->VEVENT, $this->calendarDisplayName, $users);
+		$this->provider->send($this->vcalendar->VEVENT, $this->calendarDisplayName, [], $users);
 	}
 
 	public function testSend(): void {
@@ -143,7 +144,7 @@ class PushProviderTest extends AbstractNotificationProviderTest {
 			->method('notify')
 			->with($notification3);
 
-		$this->provider->send($this->vcalendar->VEVENT, $this->calendarDisplayName, $users);
+		$this->provider->send($this->vcalendar->VEVENT, $this->calendarDisplayName, [], $users);
 	}
 
 	/**
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
index 6242e8d0355..79d9376650b 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/ReminderServiceTest.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
  * @author Georg Ehrke <oc.list@georgehrke.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Citharel <nextcloud@tcit.fr>
+ * @author Richard Steinmetz <richard@steinmetz.cloud>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -33,6 +34,7 @@ use OCA\DAV\CalDAV\Reminder\Backend;
 use OCA\DAV\CalDAV\Reminder\INotificationProvider;
 use OCA\DAV\CalDAV\Reminder\NotificationProviderManager;
 use OCA\DAV\CalDAV\Reminder\ReminderService;
+use OCA\DAV\Connector\Sabre\Principal;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\IGroupManager;
@@ -202,6 +204,7 @@ EOD;
 		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->principalConnector = $this->createMock(Principal::class);
 
 		$this->caldavBackend->method('getShares')->willReturn([]);
 
@@ -214,6 +217,7 @@ EOD;
 			$this->timeFactory,
 			$this->config,
 			$this->logger,
+			$this->principalConnector,
 		);
 	}
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
index 444c267b509..7cd31e3b8dd 100644
--- a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
@@ -11,6 +11,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Richard Steinmetz <richard@steinmetz.cloud>
  *
  * @license AGPL-3.0
  *
@@ -974,4 +975,34 @@ class PrincipalTest extends TestCase {
 			['mailto:user3@foo.bar', 'user3@foo.bar', 'principals/users/user3'],
 		];
 	}
+
+	public function testGetEmailAddressesOfPrincipal(): void {
+		$principal = [
+			'{http://sabredav.org/ns}email-address' => 'bar@company.org',
+			'{DAV:}alternate-URI-set' => [
+				'/some/url',
+				'mailto:foo@bar.com',
+				'mailto:duplicate@example.com',
+			],
+			'{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => [
+				'mailto:bernard@example.com',
+				'mailto:bernard.desruisseaux@example.com',
+			],
+			'{http://calendarserver.org/ns/}email-address-set' => [
+				'mailto:duplicate@example.com',
+				'mailto:user@some.org',
+			],
+		];
+
+		$expected = [
+			'bar@company.org',
+			'foo@bar.com',
+			'duplicate@example.com',
+			'bernard@example.com',
+			'bernard.desruisseaux@example.com',
+			'user@some.org',
+		];
+		$actual = $this->connector->getEmailAddressesOfPrincipal($principal);
+		$this->assertEquals($expected, $actual);
+	}
 }