fix(caldav-delegation): send notification to delegator

Signed-off-by: Hamza <hamzamahjoubi221@gmail.com>

apps/dav/composer/composer/autoload_classmap.php

@@ -331,6 +331,7 @@ return array(
     'OCA\\DAV\\Listener\\AddressbookListener' => $baseDir . '/../lib/Listener/AddressbookListener.php',
     'OCA\\DAV\\Listener\\BirthdayListener' => $baseDir . '/../lib/Listener/BirthdayListener.php',
     'OCA\\DAV\\Listener\\CalendarContactInteractionListener' => $baseDir . '/../lib/Listener/CalendarContactInteractionListener.php',
+    'OCA\\DAV\\Listener\\CalendarDelegateActionListener' => $baseDir . '/../lib/Listener/CalendarDelegateActionListener.php',
     'OCA\\DAV\\Listener\\CalendarDeletionDefaultUpdaterListener' => $baseDir . '/../lib/Listener/CalendarDeletionDefaultUpdaterListener.php',
     'OCA\\DAV\\Listener\\CalendarFederationNotificationListener' => $baseDir . '/../lib/Listener/CalendarFederationNotificationListener.php',
     'OCA\\DAV\\Listener\\CalendarObjectReminderUpdaterListener' => $baseDir . '/../lib/Listener/CalendarObjectReminderUpdaterListener.php',

apps/dav/composer/composer/autoload_static.php

@@ -346,6 +346,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Listener\\AddressbookListener' => __DIR__ . '/..' . '/../lib/Listener/AddressbookListener.php',
         'OCA\\DAV\\Listener\\BirthdayListener' => __DIR__ . '/..' . '/../lib/Listener/BirthdayListener.php',
         'OCA\\DAV\\Listener\\CalendarContactInteractionListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarContactInteractionListener.php',
+        'OCA\\DAV\\Listener\\CalendarDelegateActionListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarDelegateActionListener.php',
         'OCA\\DAV\\Listener\\CalendarDeletionDefaultUpdaterListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarDeletionDefaultUpdaterListener.php',
         'OCA\\DAV\\Listener\\CalendarFederationNotificationListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarFederationNotificationListener.php',
         'OCA\\DAV\\Listener\\CalendarObjectReminderUpdaterListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarObjectReminderUpdaterListener.php',

apps/dav/lib/AppInfo/Application.php

@@ -49,6 +49,7 @@ use OCA\DAV\Listener\AddMissingIndicesListener;
 use OCA\DAV\Listener\AddressbookListener;
 use OCA\DAV\Listener\BirthdayListener;
 use OCA\DAV\Listener\CalendarContactInteractionListener;
+use OCA\DAV\Listener\CalendarDelegateActionListener;
 use OCA\DAV\Listener\CalendarDeletionDefaultUpdaterListener;
 use OCA\DAV\Listener\CalendarFederationNotificationListener;
 use OCA\DAV\Listener\CalendarObjectReminderUpdaterListener;
@@ -217,6 +218,12 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarFederationNotificationListener::class);
 		$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarFederationNotificationListener::class);
 
+		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarDelegateActionListener::class);
+		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarDelegateActionListener::class);
+		$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarDelegateActionListener::class);
+		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarDelegateActionListener::class);
+		$context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarDelegateActionListener::class);
+
 		$context->registerNotifierService(NotifierCalDAV::class);
 		$context->registerNotifierService(NotifierCardDAV::class);
 

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -1463,10 +1463,15 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 		$extraData = $this->getDenormalizedData($calendarData);
 
 		return $this->atomic(function () use ($calendarId, $objectUri, $calendarData, $extraData, $calendarType) {
+			// Read the object before overwriting it so the update event can carry
+			// both the previous and the new version of the object.
+			$oldObjectRow = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
+
+			$lastModified = time();
 			$query = $this->db->getQueryBuilder();
 			$query->update('calendarobjects')
 				->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
-				->set('lastmodified', $query->createNamedParameter(time()))
+				->set('lastmodified', $query->createNamedParameter($lastModified))
 				->set('etag', $query->createNamedParameter($extraData['etag']))
 				->set('size', $query->createNamedParameter($extraData['size']))
 				->set('componenttype', $query->createNamedParameter($extraData['componentType']))
@@ -1482,13 +1487,28 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			$this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
 			$this->addChanges($calendarId, [$objectUri], 2, $calendarType);
 
-			$objectRow = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
-			if (is_array($objectRow)) {
+			if (is_array($oldObjectRow)) {
+				// Derive the new object row from the previous one and the freshly
+				// denormalized data instead of querying again, mirroring the columns
+				// written above (see rowToCalendarObject()).
+				$objectRow = array_merge($oldObjectRow, [
+					'uid' => $extraData['uid'],
+					'lastmodified' => $lastModified,
+					'etag' => '"' . $extraData['etag'] . '"',
+					'size' => (int)$extraData['size'],
+					'calendardata' => $calendarData,
+					'component' => strtolower($extraData['componentType']),
+					'classification' => (int)$extraData['classification'],
+				]);
+				// Refresh the cache populated by the read above so later lookups in
+				// this request see the new version instead of the stale one.
+				$this->cachedObjects[$calendarId . '::' . $objectUri . '::' . $calendarType] = $objectRow;
+
 				if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
 					$calendarRow = $this->getCalendarById($calendarId);
 					$shares = $this->getShares($calendarId);
 
-					$this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent($calendarId, $calendarRow, $shares, $objectRow));
+					$this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent($calendarId, $calendarRow, $shares, $objectRow, $oldObjectRow));
 				} elseif ($calendarType === self::CALENDAR_TYPE_SUBSCRIPTION) {
 					$subscriptionRow = $this->getSubscriptionById($calendarId);
 

apps/dav/lib/Listener/CalendarDelegateActionListener.php

@@ -0,0 +1,264 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\DAV\Listener;
+
+use OCA\DAV\CalDAV\Proxy\ProxyMapper;
+use OCA\DAV\CalDAV\Schedule\IMipService;
+use OCP\Calendar\Events\CalendarObjectCreatedEvent;
+use OCP\Calendar\Events\CalendarObjectDeletedEvent;
+use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent;
+use OCP\Calendar\Events\CalendarObjectRestoredEvent;
+use OCP\Calendar\Events\CalendarObjectUpdatedEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\L10N\IFactory as IL10NFactory;
+use OCP\Mail\IMailer;
+use OCP\Util;
+use Psr\Log\LoggerInterface;
+use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Component\VEvent;
+use Sabre\VObject\Reader;
+use Throwable;
+
+/**
+ * Sends an iMIP-style notification email to a calendar owner whenever one
+ * of their calendar-proxy delegates creates, modifies, deletes, trashes,
+ * or restores an event on their behalf.
+ *
+ * The email body is built with IMipService so the owner sees the same rich
+ * bullet-list rendering used for regular invitations, including diff
+ * strike-throughs on update.
+ *
+ * @template-implements IEventListener<CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarObjectDeletedEvent|CalendarObjectMovedToTrashEvent|CalendarObjectRestoredEvent>
+ */
+class CalendarDelegateActionListener implements IEventListener {
+
+	private const ACTION_CREATE = 'create';
+	private const ACTION_UPDATE = 'update';
+	private const ACTION_DELETE = 'delete';
+	private const ACTION_TRASH = 'trash';
+	private const ACTION_RESTORE = 'restore';
+
+	public function __construct(
+		private readonly IUserSession $userSession,
+		private readonly IUserManager $userManager,
+		private readonly ProxyMapper $proxyMapper,
+		private readonly IMailer $mailer,
+		private readonly IL10NFactory $l10nFactory,
+		private readonly IMipService $imipService,
+		private readonly LoggerInterface $logger,
+	) {
+	}
+
+	#[\Override]
+	public function handle(Event $event): void {
+		$action = match (true) {
+			$event instanceof CalendarObjectCreatedEvent => self::ACTION_CREATE,
+			$event instanceof CalendarObjectUpdatedEvent => self::ACTION_UPDATE,
+			$event instanceof CalendarObjectDeletedEvent => self::ACTION_DELETE,
+			$event instanceof CalendarObjectMovedToTrashEvent => self::ACTION_TRASH,
+			$event instanceof CalendarObjectRestoredEvent => self::ACTION_RESTORE,
+			default => null,
+		};
+		if ($action === null) {
+			return;
+		}
+
+		$actor = $this->userSession->getUser();
+		if ($actor === null) {
+			return;
+		}
+
+		$calendarInfo = $event->getCalendarData();
+		$ownerPrincipalUri = $calendarInfo['principaluri'] ?? null;
+		if (!is_string($ownerPrincipalUri) || !str_starts_with($ownerPrincipalUri, 'principals/users/')) {
+			return;
+		}
+
+		[, $ownerUid] = \Sabre\Uri\split($ownerPrincipalUri);
+		if ($ownerUid === $actor->getUID()) {
+			return;
+		}
+
+		if (!$this->actorIsProxyOf($actor->getUID(), $ownerPrincipalUri)) {
+			return;
+		}
+
+		$owner = $this->userManager->get($ownerUid);
+		if ($owner === null) {
+			return;
+		}
+		$ownerEmail = $owner->getEMailAddress();
+		if ($ownerEmail === null || $ownerEmail === '') {
+			return;
+		}
+
+		// Only an update carries a meaningful previous version to diff against.
+		$oldObjectData = $event instanceof CalendarObjectUpdatedEvent ? $event->getOldObjectData() : [];
+
+		try {
+			$this->sendNotification($action, $actor, $owner, $ownerEmail, $calendarInfo, $event->getObjectData(), $oldObjectData);
+		} catch (Throwable $e) {
+			$this->logger->warning('Could not send delegate-action notification to calendar owner', [
+				'app' => 'dav',
+				'owner' => $ownerUid,
+				'actor' => $actor->getUID(),
+				'action' => $action,
+				'exception' => $e,
+			]);
+		}
+	}
+
+	private function actorIsProxyOf(string $actorUid, string $ownerPrincipalUri): bool {
+		$actorPrincipalUri = 'principals/users/' . $actorUid;
+		foreach ($this->proxyMapper->getProxiesOf($ownerPrincipalUri) as $proxy) {
+			if ($proxy->getProxyId() === $actorPrincipalUri) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private function sendNotification(
+		string $action,
+		IUser $actor,
+		IUser $owner,
+		string $ownerEmail,
+		array $calendarInfo,
+		array $objectData,
+		array $oldObjectData,
+	): void {
+		$l = $this->l10nFactory->get('dav', $this->l10nFactory->getUserLanguage($owner));
+
+		$newVCalendar = $this->readVCalendar($objectData['calendardata'] ?? null);
+		$newVEvent = $this->firstVEvent($newVCalendar);
+		if ($newVEvent === null) {
+			// Without a VEVENT there is nothing meaningful to describe.
+			return;
+		}
+
+		$oldVCalendar = $this->readVCalendar($oldObjectData['calendardata'] ?? null);
+		$oldVEvent = $this->firstVEvent($oldVCalendar);
+
+		$actorName = $actor->getDisplayName() ?: $actor->getUID();
+		$calendarName = (string)($calendarInfo['{DAV:}displayname'] ?? $calendarInfo['uri'] ?? 'calendar');
+
+		// Build the same data payload IMipPlugin uses, so addBulletList renders
+		// the familiar title/when/location/url/description list — with diff
+		// strikethroughs when an old version is available.
+		$isCancellation = $action === self::ACTION_DELETE || $action === self::ACTION_TRASH;
+		$data = $isCancellation
+			? $this->imipService->buildCancelledBodyData($newVEvent)
+			: $this->imipService->buildBodyData($newVEvent, $action === self::ACTION_UPDATE ? $oldVEvent : null);
+
+		$summary = (string)($newVEvent->SUMMARY ?? $l->t('Untitled event'));
+
+		[$subject, $heading] = $this->subjectAndHeading($l, $action, $actorName, $summary, $calendarName);
+
+		$template = $this->mailer->createEMailTemplate('dav.delegateAction.' . $action, [
+			'actor' => $actorName,
+			'calendar' => $calendarName,
+			'event' => $summary,
+		]);
+		$template->addHeader();
+		$template->setSubject($subject);
+		$template->addHeading($heading);
+
+		// Attribution row (who did it, on which calendar) — sits above the
+		// event details so the owner immediately sees the responsible delegate.
+		$template->addBodyListItem($actorName, $l->t('Delegate:'));
+		$template->addBodyListItem($calendarName, $l->t('Calendar:'));
+
+		$this->imipService->addBulletList($template, $newVEvent, $data);
+
+		$template->addFooter();
+
+		$message = $this->mailer->createMessage();
+		$message->setFrom([Util::getDefaultEmailAddress('invitations-noreply') => $actorName]);
+		$message->setTo([$ownerEmail => $owner->getDisplayName() ?: $owner->getUID()]);
+		$message->setSubject($subject);
+		$message->useTemplate($template);
+
+		// Attach the raw iCalendar so the owner's client can pick up the change.
+		if ($action !== self::ACTION_DELETE) {
+			$calendarData = $objectData['calendardata'] ?? null;
+			if (is_resource($calendarData)) {
+				$calendarData = stream_get_contents($calendarData);
+			}
+			if (is_string($calendarData) && $calendarData !== '') {
+				$message->attachInline(
+					$calendarData,
+					'event.ics',
+					'text/calendar; charset="utf-8"',
+				);
+			}
+		}
+
+		$this->mailer->send($message);
+	}
+
+	/**
+	 * @return array{0: string, 1: string} [subject, heading]
+	 */
+	private function subjectAndHeading(\OCP\IL10N $l, string $action, string $actorName, string $summary, string $calendarName): array {
+		return match ($action) {
+			self::ACTION_CREATE => [
+				$l->t('%1$s created "%2$s" on your behalf', [$actorName, $summary]),
+				$l->t('%1$s created "%2$s" on your calendar "%3$s"', [$actorName, $summary, $calendarName]),
+			],
+			self::ACTION_UPDATE => [
+				$l->t('%1$s updated "%2$s" on your behalf', [$actorName, $summary]),
+				$l->t('%1$s updated "%2$s" on your calendar "%3$s"', [$actorName, $summary, $calendarName]),
+			],
+			self::ACTION_DELETE => [
+				$l->t('%1$s deleted "%2$s" on your behalf', [$actorName, $summary]),
+				$l->t('%1$s permanently deleted "%2$s" from your calendar "%3$s"', [$actorName, $summary, $calendarName]),
+			],
+			self::ACTION_TRASH => [
+				$l->t('%1$s moved "%2$s" to the trash on your behalf', [$actorName, $summary]),
+				$l->t('%1$s moved "%2$s" to the trash on your calendar "%3$s"', [$actorName, $summary, $calendarName]),
+			],
+			self::ACTION_RESTORE => [
+				$l->t('%1$s restored "%2$s" on your behalf', [$actorName, $summary]),
+				$l->t('%1$s restored "%2$s" on your calendar "%3$s"', [$actorName, $summary, $calendarName]),
+			],
+		};
+	}
+
+	private function readVCalendar(mixed $calendarData): ?VCalendar {
+		if (is_resource($calendarData)) {
+			$calendarData = stream_get_contents($calendarData);
+		}
+		if (!is_string($calendarData) || $calendarData === '') {
+			return null;
+		}
+		try {
+			$vCalendar = Reader::read($calendarData);
+		} catch (Throwable) {
+			return null;
+		}
+		return $vCalendar instanceof VCalendar ? $vCalendar : null;
+	}
+
+	private function firstVEvent(?VCalendar $vCalendar): ?VEvent {
+		if ($vCalendar === null) {
+			return null;
+		}
+		foreach ($vCalendar->VEVENT ?? [] as $vEvent) {
+			if ($vEvent instanceof VEvent) {
+				return $vEvent;
+			}
+		}
+		return null;
+	}
+}

lib/public/Calendar/Events/CalendarObjectUpdatedEvent.php

@@ -13,4 +13,33 @@ namespace OCP\Calendar\Events;
  * @since 32.0.0
  */
 class CalendarObjectUpdatedEvent extends AbstractCalendarObjectEvent {
+
+	/**
+	 * @param int $calendarId
+	 * @param array $calendarData
+	 * @param array $shares
+	 * @param array $objectData The object data after the update
+	 * @param array $oldObjectData The object data before the update, in the same
+	 *                             shape as $objectData (empty when unavailable)
+	 * @since 32.0.0
+	 */
+	public function __construct(
+		int $calendarId,
+		array $calendarData,
+		array $shares,
+		array $objectData,
+		private array $oldObjectData = [],
+	) {
+		parent::__construct($calendarId, $calendarData, $shares, $objectData);
+	}
+
+	/**
+	 * Returns the object data as it was before the update.
+	 *
+	 * @return array
+	 * @since 35.0.0
+	 */
+	public function getOldObjectData(): array {
+		return $this->oldObjectData;
+	}
 }