fixup! fix: aliases and capitalization of emails

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

apps/dav/lib/CalDAV/CalendarImpl.php

@@ -14,7 +14,6 @@
 use OCP\Calendar\CalendarExportOptions;
 use OCP\Calendar\Exceptions\CalendarException;
 use OCP\Calendar\ICalendarExport;
-use OCP\Calendar\ICalendarHandleImip;
 use OCP\Calendar\ICalendarIsEnabled;
 use OCP\Calendar\ICalendarIsShared;
 use OCP\Calendar\ICalendarIsWritable;
@@ -32,7 +31,7 @@
 use Sabre\VObject\Reader;
 use function Sabre\Uri\split as uriSplit;
 
-class CalendarImpl implements ICreateFromString, IHandleImipMessage, ICalendarIsEnabled, ICalendarIsWritable, ICalendarIsShared, ICalendarHandleImip, ICalendarExport {
+class CalendarImpl implements ICreateFromString, IHandleImipMessage, ICalendarIsEnabled, ICalendarIsWritable, ICalendarIsShared, ICalendarExport {
 	public function __construct(
 		private Calendar $calendar,
 		/** @var array<string, mixed> */
@@ -203,25 +202,12 @@ public function createFromString(string $name, string $calendarData): void {
 
 	/**
 	 * @throws CalendarException
-	 *
-	 * @deprecated 32.0.0 Use handleIMip() instead
 	 */
 	public function handleIMipMessage(string $name, string $calendarData): void {
-		$this->handleIMip($calendarData);
-	}
-
-	/**
-	 * Processes an iMip message
-	 *
-	 * @since 32.0.0
-	 *
-	 * @throws CalendarException
-	 */
-	public function handleIMip(string $message): void {
 
 		try {
 			/** @var VCalendar $vObject|null */
-			$vObject = Reader::read($message);
+			$vObject = Reader::read($calendarData);
 		} catch (ParseException $e) {
 			throw new CalendarException('iMip message could not be processed because an error occurred while parsing the iMip message', 0, $e);
 		}

lib/private/Calendar/Manager.php

@@ -16,11 +16,11 @@
 use OCP\Calendar\Exceptions\CalendarException;
 use OCP\Calendar\ICalendar;
 use OCP\Calendar\ICalendarEventBuilder;
-use OCP\Calendar\ICalendarHandleImip;
 use OCP\Calendar\ICalendarIsWritable;
 use OCP\Calendar\ICalendarProvider;
 use OCP\Calendar\ICalendarQuery;
 use OCP\Calendar\ICreateFromString;
+use OCP\Calendar\IHandleImipMessage;
 use OCP\Calendar\IManager;
 use OCP\IUser;
 use OCP\IUserManager;
@@ -244,42 +244,25 @@ public function handleIMip(
 		}
 
 		if (!isset($vObject->VEVENT)) {
-			$this->logger->warning('iMip message contains no event');
+			$this->logger->warning('iMip message does not contain any event(s)');
 			return false;
 		}
 
-		/** @var VEvent|null $vEvent */
-		$eventObject = $calendarObject->VEVENT;
-
-		if (!isset($eventObject->UID)) {
+		if (!isset($vObject->VEVENT->UID)) {
 			$this->logger->warning('iMip message event dose not contains a UID');
 			return false;
 		}
 
-		if (!isset($eventObject->ORGANIZER)) {
+		if (!isset($vObject->VEVENT->ORGANIZER)) {
 			$this->logger->warning('iMip message event dose not contains an organizer');
 			return false;
 		}
 
-		if (!isset($eventObject->ATTENDEE)) {
+		if (!isset($vObject->VEVENT->ATTENDEE)) {
 			$this->logger->warning('iMip message event dose not contains any attendees');
 			return false;
 		}
 
-		foreach ($eventObject->ATTENDEE as $entry) {
-			$address = trim(str_replace('mailto:', '', $entry->getValue()));
-			if ($address === $recipient) {
-				$attendee = $address;
-				break;
-			}
-		}
-		if (!isset($attendee)) {
-			$this->logger->warning('iMip message event does not contain a attendee that matches the recipient');
-		if (!isset($vObject->VEVENT->UID)) {
-			$this->logger->warning('iMip message event dose not contain a UID');
-			return false;
-		}
-
 		foreach ($userCalendars as $calendar) {
 			if (!$calendar instanceof ICalendarIsWritable) {
 				continue;
@@ -289,8 +272,8 @@ public function handleIMip(
 			}
 			if (!empty($calendar->search('', [], ['uid' => $vObject->VEVENT->UID->getValue()]))) {
 				try {
-					if ($calendar instanceof ICalendarHandleImip) {
-						$calendar->handleIMip($vObject->serialize());
+					if ($calendar instanceof IHandleImipMessage) {
+						$calendar->handleIMipMessage($userId, $vObject->serialize());
 					}
 					return true;
 				} catch (CalendarException $e) {

lib/public/Calendar/ICalendarHandleImip.php

@@ -17,8 +17,6 @@
  * @link https://www.rfc-editor.org/rfc/rfc6047
  *
  * @since 26.0.0
- *
- * @deprecated 32.0.0 Use IHandleImip instead
  */
 interface IHandleImipMessage extends ICalendar {
 	/**
@@ -27,8 +25,6 @@ interface IHandleImipMessage extends ICalendar {
 	 * @since 26.0.0
 	 *
 	 * @throws CalendarException on validation failure or calendar write error
-	 *
-	 * @deprecated 32.0.0 Use IHandleImip instead
 	 */
 	public function handleIMipMessage(string $name, string $calendarData): void;
 }

lib/public/Calendar/IHandleImipMessage.php

@@ -17,7 +17,6 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Calendar\ICalendar;
 use OCP\Calendar\ICalendarExport;
-use OCP\Calendar\ICalendarHandleImip;
 use OCP\Calendar\ICalendarIsEnabled;
 use OCP\Calendar\ICalendarIsShared;
 use OCP\Calendar\ICalendarIsWritable;
@@ -37,7 +36,7 @@
 /*
  * This allows us to create Mock object supporting both interfaces
  */
-interface ITestCalendar extends ICreateFromString, IHandleImipMessage, ICalendarIsEnabled, ICalendarIsWritable, ICalendarIsShared, ICalendarHandleImip, ICalendarExport {
+interface ITestCalendar extends ICreateFromString, IHandleImipMessage, ICalendarIsEnabled, ICalendarIsWritable, ICalendarIsShared, ICalendarExport {
 
 }
 
@@ -373,8 +372,8 @@ public function testHandleImipRequestWithNoEvent(): void {
 			->method('getCalendarsForPrincipal')
 			->willReturn([$userCalendar]);
 		// construct logger returns
-		$this->logger->expects(self::once())->method('warning')
-			->with('iMip message contains no event');
+			   $this->logger->expects(self::once())->method('warning')
+					   ->with('iMip message does not contain any event(s)');
 		// construct parameters
 		$userId = 'attendee1';
 		$calendar = $this->vCalendar1a;
@@ -407,8 +406,8 @@ public function testHandleImipRequestWithNoUid(): void {
 			->method('getCalendarsForPrincipal')
 			->willReturn([$userCalendar]);
 		// construct logger returns
-		$this->logger->expects(self::once())->method('warning')
-			->with('iMip message event dose not contain a UID');
+			   $this->logger->expects(self::once())->method('warning')
+					   ->with('iMip message event dose not contains a UID');
 		// construct parameters
 		$userId = 'attendee1';
 		$calendar = $this->vCalendar1a;
@@ -450,8 +449,8 @@ public function testHandleImipRequestWithNoMatch(): void {
 			->method('getCalendarsForPrincipal')
 			->willReturn([$userCalendar]);
 		// construct logger returns
-		$this->logger->expects(self::once())->method('warning')
-			->with('iMip message could not be processed because the no corresponding event was found in any calendar');
+			   $this->logger->expects(self::once())->method('warning')
+					   ->with('iMip message could not be processed because no corresponding event was found in any calendar');
 		// construct parameters
 		$userId = 'attendee1';
 		$calendar = $this->vCalendar1a;
@@ -497,7 +496,7 @@ public function testHandleImipRequest(): void {
 		$calendar->add('METHOD', 'REQUEST');
 		// construct user calendar returns
 		$userCalendar->expects(self::once())
-			->method('handleIMip');
+			->method('handleIMipMessage');
 		// test method
 		$result = $manager->handleIMip($userId, $calendar->serialize());
 	}