fixup! fix: access shared trashbin objects

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

Author: hamza221

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -1239,7 +1239,9 @@ private function collectDeletedCalendarObjectsForPrincipal(string $principalUri,
 			if ($this->resultHasMorePermissiveEntry($result, $row['id'], $proxyOverlay)) {
 				continue;
 			}
-			$result[$row['id']] = $this->rowToDeletedCalendarObject($row, $row['calendaruri'], false, $proxyOverlay);
+			[, $ownerName] = Uri\split($row['calendarprincipaluri']);
+			$calendarUri = $proxyOverlay !== null ? $row['calendaruri'] . '_delegated_by_' . $ownerName : $row['calendaruri'];
+			$result[$row['id']] = $this->rowToDeletedCalendarObject($row, $calendarUri, false, $proxyOverlay);
 		}
 		$stmt->closeCursor();
 
@@ -1334,6 +1336,7 @@ private function rowToDeletedCalendarObject(array $row, string $calendarUri, boo
 			'etag' => '"' . $row['etag'] . '"',
 			'calendarid' => $row['calendarid'],
 			'calendaruri' => $calendarUri,
+			'sourcecalendaruri' => $row['calendaruri'],
 			'calendarprincipaluri' => $row['calendarprincipaluri'],
 			'size' => (int)$row['size'],
 			'component' => strtolower($row['componenttype']),
@@ -2720,7 +2723,9 @@ private function findDeletedCalendarObjectForPrincipal(int $id, string $principa
 		$stmt->closeCursor();
 
 		if ($row) {
-			return $this->rowToDeletedCalendarObject($row, $row['calendaruri'], true, $proxyOverlay);
+			[, $ownerName] = Uri\split($row['calendarprincipaluri']);
+			$calendarUri = $proxyOverlay !== null ? $row['calendaruri'] . '_delegated_by_' . $ownerName : $row['calendaruri'];
+			return $this->rowToDeletedCalendarObject($row, $calendarUri, true, $proxyOverlay);
 		}
 
 		// Check shared calendars; order by access ASC so the most permissive

apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php

@@ -115,6 +115,14 @@ public function getCalendarUri(): string {
 		return $this->objectData['calendaruri'];
 	}
 
+	public function getSourceCalendarUri(): string {
+		return $this->objectData['sourcecalendaruri'] ?? $this->objectData['calendaruri'];
+	}
+
+	public function getCalendarPrincipalUri(): ?string {
+		return $this->objectData['calendarprincipaluri'] ?? null;
+	}
+
 	#[\Override]
 	public function getACL(): array {
 		$acl = [

apps/dav/lib/CalDAV/Trashbin/Plugin.php

@@ -27,6 +27,8 @@
 class Plugin extends ServerPlugin {
 	public const PROPERTY_DELETED_AT = '{http://nextcloud.com/ns}deleted-at';
 	public const PROPERTY_CALENDAR_URI = '{http://nextcloud.com/ns}calendar-uri';
+	public const PROPERTY_SOURCE_CALENDAR_URI = '{http://nextcloud.com/ns}source-calendar-uri';
+	public const PROPERTY_CALENDAR_OWNER_PRINCIPAL_URI = '{http://nextcloud.com/ns}calendar-owner-principal-uri';
 	public const PROPERTY_RETENTION_DURATION = '{http://nextcloud.com/ns}trash-bin-retention-duration';
 
 	/** @var bool */
@@ -97,6 +99,13 @@ private function propFind(
 			$propFind->handle(self::PROPERTY_CALENDAR_URI, function () use ($node) {
 				return $node->getCalendarUri();
 			});
+			// needed in case of delegated or shared calendars
+			$propFind->handle(self::PROPERTY_SOURCE_CALENDAR_URI, function () use ($node) {
+				return $node->getSourceCalendarUri();
+			});
+			$propFind->handle(self::PROPERTY_CALENDAR_OWNER_PRINCIPAL_URI, function () use ($node) {
+				return $node->getCalendarPrincipalUri();
+			});
 		}
 		if ($node instanceof TrashbinHome) {
 			$propFind->handle(self::PROPERTY_RETENTION_DURATION, function () use ($node) {