fixup! fixup! fixup! feat: add iMip Request Handling

Signed-off-by: SebastianKrupinski <[email protected]>

apps/dav/lib/CalDAV/CachedSubscriptionImpl.php

@@ -9,9 +9,11 @@
 namespace OCA\DAV\CalDAV;
 
 use OCP\Calendar\ICalendar;
+use OCP\Calendar\ICalendarIsShared;
+use OCP\Calendar\ICalendarIsWritable;
 use OCP\Constants;
 
-class CachedSubscriptionImpl implements ICalendar {
+class CachedSubscriptionImpl implements ICalendar, ICalendarIsShared, ICalendarIsWritable {
  private CalDavBackend $backend;
  private CachedSubscription $calendar;
  /** @var array<string, mixed> */

apps/dav/lib/CalDAV/CalendarImpl.php

@@ -11,6 +11,8 @@
 use OCA\DAV\CalDAV\Auth\CustomPrincipalPlugin;
 use OCA\DAV\CalDAV\InvitationResponse\InvitationResponseServer;
 use OCP\Calendar\Exceptions\CalendarException;
+use OCP\Calendar\ICalendarIsShared;
+use OCP\Calendar\ICalendarIsWritable;
 use OCP\Calendar\ICreateFromString;
 use OCP\Calendar\IHandleImipMessage;
 use OCP\Constants;
@@ -24,7 +26,7 @@
 use Sabre\VObject\Reader;
 use function Sabre\Uri\split as uriSplit;
 
-class CalendarImpl implements ICreateFromString, IHandleImipMessage {
+class CalendarImpl implements ICreateFromString, IHandleImipMessage, ICalendarIsWritable, ICalendarIsShared {
  private CalDavBackend $backend;
  private Calendar $calendar;
  /** @var array<string, mixed> */

lib/composer/composer/autoload_classmap.php

@@ -163,6 +163,8 @@
  'OCP\\Calendar\\BackendTemporarilyUnavailableException' => $baseDir . '/lib/public/Calendar/BackendTemporarilyUnavailableException.php',
  'OCP\\Calendar\\Exceptions\\CalendarException' => $baseDir . '/lib/public/Calendar/Exceptions/CalendarException.php',
  'OCP\\Calendar\\ICalendar' => $baseDir . '/lib/public/Calendar/ICalendar.php',
+ 'OCP\\Calendar\\ICalendarIsShared' => $baseDir . '/lib/public/Calendar/ICalendarIsShared.php',
+ 'OCP\\Calendar\\ICalendarIsWritable' => $baseDir . '/lib/public/Calendar/ICalendarIsWritable.php',
  'OCP\\Calendar\\ICalendarProvider' => $baseDir . '/lib/public/Calendar/ICalendarProvider.php',
  'OCP\\Calendar\\ICalendarQuery' => $baseDir . '/lib/public/Calendar/ICalendarQuery.php',
  'OCP\\Calendar\\ICreateFromString' => $baseDir . '/lib/public/Calendar/ICreateFromString.php',

lib/composer/composer/autoload_static.php

@@ -196,6 +196,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
  'OCP\\Calendar\\BackendTemporarilyUnavailableException' => __DIR__ . '/../../..' . '/lib/public/Calendar/BackendTemporarilyUnavailableException.php',
  'OCP\\Calendar\\Exceptions\\CalendarException' => __DIR__ . '/../../..' . '/lib/public/Calendar/Exceptions/CalendarException.php',
  'OCP\\Calendar\\ICalendar' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendar.php',
+ 'OCP\\Calendar\\ICalendarIsShared' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarIsShared.php',
+ 'OCP\\Calendar\\ICalendarIsWritable' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarIsWritable.php',
  'OCP\\Calendar\\ICalendarProvider' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarProvider.php',
  'OCP\\Calendar\\ICalendarQuery' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarQuery.php',
  'OCP\\Calendar\\ICreateFromString' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICreateFromString.php',

lib/private/Calendar/Manager.php

@@ -12,6 +12,8 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Calendar\Exceptions\CalendarException;
 use OCP\Calendar\ICalendar;
+use OCP\Calendar\ICalendarIsShared;
+use OCP\Calendar\ICalendarIsWritable;
 use OCP\Calendar\ICalendarProvider;
 use OCP\Calendar\ICalendarQuery;
 use OCP\Calendar\ICreateFromString;
@@ -217,7 +219,7 @@ public function handleIMipRequest(
 
  $userCalendars = $this->getCalendarsForPrincipal($principalUri);
  if (empty($userCalendars)) {
- $this->logger->warning('iMip message could not be processed because user has on calendars');
+ $this->logger->warning('iMip message could not be processed because user has no calendars');
  return false;
  }
 
@@ -230,7 +232,7 @@ public function handleIMipRequest(
  }
 
  if (!isset($calendarObject->VEVENT)) {
- $this->logger->warning('iMip message contains an no event');
+ $this->logger->warning('iMip message contains no event');
  return false;
  }
 
@@ -260,6 +262,10 @@ public function handleIMipRequest(
 
  foreach ($userCalendars as $calendar) {
 
+ if (!$calendar instanceof ICalendarIsWritable && !$calendar instanceof ICalendarIsShared) {
+ continue;
+ }
+
  if ($calendar->isDeleted() || !$calendar->isWritable() || $calendar->isShared()) {
  continue;
  }

lib/public/Calendar/ICalendar.php

@@ -58,24 +58,10 @@ public function search(string $pattern, array $searchProperties = [], array $opt
  */
  public function getPermissions(): int;
 
- /**
- * Indicates whether the calendar can be modified
- *
- * @since 31.0.0
- */
- public function isWritable(): bool;
-
  /**
  * Indicates whether the calendar is in the trash bin
  *
  * @since 26.0.0
  */
  public function isDeleted(): bool;
-
- /**
- * Indicates whether the calendar is shared with the current user
- *
- * @since 31.0.0
- */
- public function isShared(): bool;
 }

lib/public/Calendar/ICalendarIsShared.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCP\Calendar;
+
+/**
+ * ICalendar Interface Extension
+ *
+ * @since 31.0.0
+ */
+interface ICalendarIsShared {
+
+ /**
+ * Indicates whether the calendar is shared with the current user
+ *
+ * @since 31.0.0
+ */
+ public function isShared(): bool;
+
+}

lib/public/Calendar/ICalendarIsWritable.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCP\Calendar;
+
+/**
+ * ICalendar Interface Extension
+ *
+ * @since 31.0.0
+ */
+interface ICalendarIsWritable {
+
+ /**
+ * Indicates whether the calendar can be modified
+ *
+ * @since 31.0.0
+ */
+ public function isWritable(): bool;
+
+}