nextcloud / server

apps/dav/lib/CalDAV/Reminder/Backend.php

Indentation +176 added lines, -176 removed lines

@@ -18,180 +18,180 @@
  */
 class Backend {
 
-	/**
-	 * Backend constructor.
-	 *
-	 * @param IDBConnection $db
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		protected IDBConnection $db,
-		protected ITimeFactory $timeFactory,
-	) {
-	}
-
-	/**
-	 * Get all reminders with a notification date before now
-	 *
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getRemindersToProcess():array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['cr.id', 'cr.calendar_id','cr.object_id','cr.is_recurring','cr.uid','cr.recurrence_id','cr.is_recurrence_exception','cr.event_hash','cr.alarm_hash','cr.type','cr.is_relative','cr.notification_date','cr.is_repeat_based','co.calendardata', 'c.displayname', 'c.principaluri'])
-			->from('calendar_reminders', 'cr')
-			->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
-			->join('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))
-			->join('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'))
-			->groupBy('cr.event_hash', 'cr.notification_date', 'cr.type', 'cr.id', 'cr.calendar_id', 'cr.object_id', 'cr.is_recurring', 'cr.uid', 'cr.recurrence_id', 'cr.is_recurrence_exception', 'cr.alarm_hash', 'cr.is_relative', 'cr.is_repeat_based', 'co.calendardata', 'c.displayname', 'c.principaluri');
-		$stmt = $query->executeQuery();
-
-		return array_map(
-			[$this, 'fixRowTyping'],
-			$stmt->fetchAllAssociative()
-		);
-	}
-
-	/**
-	 * Get all scheduled reminders for an event
-	 *
-	 * @param int $objectId
-	 * @return array
-	 */
-	public function getAllScheduledRemindersForEvent(int $objectId):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('calendar_reminders')
-			->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
-		$stmt = $query->executeQuery();
-
-		return array_map(
-			[$this, 'fixRowTyping'],
-			$stmt->fetchAllAssociative()
-		);
-	}
-
-	/**
-	 * Insert a new reminder into the database
-	 *
-	 * @param int $calendarId
-	 * @param int $objectId
-	 * @param string $uid
-	 * @param bool $isRecurring
-	 * @param int $recurrenceId
-	 * @param bool $isRecurrenceException
-	 * @param string $eventHash
-	 * @param string $alarmHash
-	 * @param string $type
-	 * @param bool $isRelative
-	 * @param int $notificationDate
-	 * @param bool $isRepeatBased
-	 * @return int The insert id
-	 */
-	public function insertReminder(int $calendarId,
-		int $objectId,
-		string $uid,
-		bool $isRecurring,
-		int $recurrenceId,
-		bool $isRecurrenceException,
-		string $eventHash,
-		string $alarmHash,
-		string $type,
-		bool $isRelative,
-		int $notificationDate,
-		bool $isRepeatBased):int {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_reminders')
-			->values([
-				'calendar_id' => $query->createNamedParameter($calendarId),
-				'object_id' => $query->createNamedParameter($objectId),
-				'uid' => $query->createNamedParameter($uid),
-				'is_recurring' => $query->createNamedParameter($isRecurring ? 1 : 0),
-				'recurrence_id' => $query->createNamedParameter($recurrenceId),
-				'is_recurrence_exception' => $query->createNamedParameter($isRecurrenceException ? 1 : 0),
-				'event_hash' => $query->createNamedParameter($eventHash),
-				'alarm_hash' => $query->createNamedParameter($alarmHash),
-				'type' => $query->createNamedParameter($type),
-				'is_relative' => $query->createNamedParameter($isRelative ? 1 : 0),
-				'notification_date' => $query->createNamedParameter($notificationDate),
-				'is_repeat_based' => $query->createNamedParameter($isRepeatBased ? 1 : 0),
-			])
-			->executeStatement();
-
-		return $query->getLastInsertId();
-	}
-
-	/**
-	 * Sets a new notificationDate on an existing reminder
-	 *
-	 * @param int $reminderId
-	 * @param int $newNotificationDate
-	 */
-	public function updateReminder(int $reminderId,
-		int $newNotificationDate):void {
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendar_reminders')
-			->set('notification_date', $query->createNamedParameter($newNotificationDate))
-			->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
-			->executeStatement();
-	}
-
-	/**
-	 * Remove a reminder by it's id
-	 *
-	 * @param integer $reminderId
-	 * @return void
-	 */
-	public function removeReminder(int $reminderId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
-			->executeStatement();
-	}
-
-	/**
-	 * Cleans reminders in database
-	 *
-	 * @param int $objectId
-	 */
-	public function cleanRemindersForEvent(int $objectId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
-			->executeStatement();
-	}
-
-	/**
-	 * Remove all reminders for a calendar
-	 *
-	 * @param int $calendarId
-	 * @return void
-	 */
-	public function cleanRemindersForCalendar(int $calendarId):void {
-		$query = $this->db->getQueryBuilder();
-
-		$query->delete('calendar_reminders')
-			->where($query->expr()->eq('calendar_id', $query->createNamedParameter($calendarId)))
-			->executeStatement();
-	}
-
-	/**
-	 * @param array $row
-	 * @return array
-	 */
-	private function fixRowTyping(array $row): array {
-		$row['id'] = (int)$row['id'];
-		$row['calendar_id'] = (int)$row['calendar_id'];
-		$row['object_id'] = (int)$row['object_id'];
-		$row['is_recurring'] = (bool)$row['is_recurring'];
-		$row['recurrence_id'] = (int)$row['recurrence_id'];
-		$row['is_recurrence_exception'] = (bool)$row['is_recurrence_exception'];
-		$row['is_relative'] = (bool)$row['is_relative'];
-		$row['notification_date'] = (int)$row['notification_date'];
-		$row['is_repeat_based'] = (bool)$row['is_repeat_based'];
-
-		return $row;
-	}
+    /**
+     * Backend constructor.
+     *
+     * @param IDBConnection $db
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        protected IDBConnection $db,
+        protected ITimeFactory $timeFactory,
+    ) {
+    }
+
+    /**
+     * Get all reminders with a notification date before now
+     *
+     * @return array
+     * @throws \Exception
+     */
+    public function getRemindersToProcess():array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['cr.id', 'cr.calendar_id','cr.object_id','cr.is_recurring','cr.uid','cr.recurrence_id','cr.is_recurrence_exception','cr.event_hash','cr.alarm_hash','cr.type','cr.is_relative','cr.notification_date','cr.is_repeat_based','co.calendardata', 'c.displayname', 'c.principaluri'])
+            ->from('calendar_reminders', 'cr')
+            ->where($query->expr()->lte('cr.notification_date', $query->createNamedParameter($this->timeFactory->getTime())))
+            ->join('cr', 'calendarobjects', 'co', $query->expr()->eq('cr.object_id', 'co.id'))
+            ->join('cr', 'calendars', 'c', $query->expr()->eq('cr.calendar_id', 'c.id'))
+            ->groupBy('cr.event_hash', 'cr.notification_date', 'cr.type', 'cr.id', 'cr.calendar_id', 'cr.object_id', 'cr.is_recurring', 'cr.uid', 'cr.recurrence_id', 'cr.is_recurrence_exception', 'cr.alarm_hash', 'cr.is_relative', 'cr.is_repeat_based', 'co.calendardata', 'c.displayname', 'c.principaluri');
+        $stmt = $query->executeQuery();
+
+        return array_map(
+            [$this, 'fixRowTyping'],
+            $stmt->fetchAllAssociative()
+        );
+    }
+
+    /**
+     * Get all scheduled reminders for an event
+     *
+     * @param int $objectId
+     * @return array
+     */
+    public function getAllScheduledRemindersForEvent(int $objectId):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('calendar_reminders')
+            ->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
+        $stmt = $query->executeQuery();
+
+        return array_map(
+            [$this, 'fixRowTyping'],
+            $stmt->fetchAllAssociative()
+        );
+    }
+
+    /**
+     * Insert a new reminder into the database
+     *
+     * @param int $calendarId
+     * @param int $objectId
+     * @param string $uid
+     * @param bool $isRecurring
+     * @param int $recurrenceId
+     * @param bool $isRecurrenceException
+     * @param string $eventHash
+     * @param string $alarmHash
+     * @param string $type
+     * @param bool $isRelative
+     * @param int $notificationDate
+     * @param bool $isRepeatBased
+     * @return int The insert id
+     */
+    public function insertReminder(int $calendarId,
+        int $objectId,
+        string $uid,
+        bool $isRecurring,
+        int $recurrenceId,
+        bool $isRecurrenceException,
+        string $eventHash,
+        string $alarmHash,
+        string $type,
+        bool $isRelative,
+        int $notificationDate,
+        bool $isRepeatBased):int {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendar_reminders')
+            ->values([
+                'calendar_id' => $query->createNamedParameter($calendarId),
+                'object_id' => $query->createNamedParameter($objectId),
+                'uid' => $query->createNamedParameter($uid),
+                'is_recurring' => $query->createNamedParameter($isRecurring ? 1 : 0),
+                'recurrence_id' => $query->createNamedParameter($recurrenceId),
+                'is_recurrence_exception' => $query->createNamedParameter($isRecurrenceException ? 1 : 0),
+                'event_hash' => $query->createNamedParameter($eventHash),
+                'alarm_hash' => $query->createNamedParameter($alarmHash),
+                'type' => $query->createNamedParameter($type),
+                'is_relative' => $query->createNamedParameter($isRelative ? 1 : 0),
+                'notification_date' => $query->createNamedParameter($notificationDate),
+                'is_repeat_based' => $query->createNamedParameter($isRepeatBased ? 1 : 0),
+            ])
+            ->executeStatement();
+
+        return $query->getLastInsertId();
+    }
+
+    /**
+     * Sets a new notificationDate on an existing reminder
+     *
+     * @param int $reminderId
+     * @param int $newNotificationDate
+     */
+    public function updateReminder(int $reminderId,
+        int $newNotificationDate):void {
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendar_reminders')
+            ->set('notification_date', $query->createNamedParameter($newNotificationDate))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
+            ->executeStatement();
+    }
+
+    /**
+     * Remove a reminder by it's id
+     *
+     * @param integer $reminderId
+     * @return void
+     */
+    public function removeReminder(int $reminderId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($reminderId)))
+            ->executeStatement();
+    }
+
+    /**
+     * Cleans reminders in database
+     *
+     * @param int $objectId
+     */
+    public function cleanRemindersForEvent(int $objectId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
+            ->executeStatement();
+    }
+
+    /**
+     * Remove all reminders for a calendar
+     *
+     * @param int $calendarId
+     * @return void
+     */
+    public function cleanRemindersForCalendar(int $calendarId):void {
+        $query = $this->db->getQueryBuilder();
+
+        $query->delete('calendar_reminders')
+            ->where($query->expr()->eq('calendar_id', $query->createNamedParameter($calendarId)))
+            ->executeStatement();
+    }
+
+    /**
+     * @param array $row
+     * @return array
+     */
+    private function fixRowTyping(array $row): array {
+        $row['id'] = (int)$row['id'];
+        $row['calendar_id'] = (int)$row['calendar_id'];
+        $row['object_id'] = (int)$row['object_id'];
+        $row['is_recurring'] = (bool)$row['is_recurring'];
+        $row['recurrence_id'] = (int)$row['recurrence_id'];
+        $row['is_recurrence_exception'] = (bool)$row['is_recurrence_exception'];
+        $row['is_relative'] = (bool)$row['is_relative'];
+        $row['notification_date'] = (int)$row['notification_date'];
+        $row['is_repeat_based'] = (bool)$row['is_repeat_based'];
+
+        return $row;
+    }
 }

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

Indentation +465 added lines, -465 removed lines

@@ -26,469 +26,469 @@
 
 abstract class AbstractPrincipalBackend implements BackendInterface {
 
-	/** @var string */
-	private $dbTableName;
-
-	/** @var string */
-	private $dbMetaDataTableName;
-
-	/** @var string */
-	private $dbForeignKeyName;
-
-	public function __construct(
-		private IDBConnection $db,
-		private IUserSession $userSession,
-		private IGroupManager $groupManager,
-		private LoggerInterface $logger,
-		private ProxyMapper $proxyMapper,
-		private string $principalPrefix,
-		string $dbPrefix,
-		private string $cuType,
-	) {
-		$this->dbTableName = 'calendar_' . $dbPrefix . 's';
-		$this->dbMetaDataTableName = $this->dbTableName . '_md';
-		$this->dbForeignKeyName = $dbPrefix . '_id';
-	}
-
-	use PrincipalProxyTrait;
-
-	/**
-	 * Returns a list of principals based on a prefix.
-	 *
-	 * This prefix will often contain something like 'principals'. You are only
-	 * expected to return principals that are in this base path.
-	 *
-	 * You are expected to return at least a 'uri' for every user, you can
-	 * return any additional properties if you wish so. Common properties are:
-	 *   {DAV:}displayname
-	 *
-	 * @param string $prefixPath
-	 * @return string[]
-	 */
-	public function getPrincipalsByPrefix($prefixPath): array {
-		$principals = [];
-
-		if ($prefixPath === $this->principalPrefix) {
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-				->from($this->dbTableName);
-			$stmt = $query->executeQuery();
-
-			$metaDataQuery = $this->db->getQueryBuilder();
-			$metaDataQuery->select([$this->dbForeignKeyName, 'key', 'value'])
-				->from($this->dbMetaDataTableName);
-			$metaDataStmt = $metaDataQuery->executeQuery();
-			$metaDataRows = $metaDataStmt->fetchAllAssociative();
-
-			$metaDataById = [];
-			foreach ($metaDataRows as $metaDataRow) {
-				if (!isset($metaDataById[$metaDataRow[$this->dbForeignKeyName]])) {
-					$metaDataById[$metaDataRow[$this->dbForeignKeyName]] = [];
-				}
-
-				$metaDataById[$metaDataRow[$this->dbForeignKeyName]][$metaDataRow['key']]
-					= $metaDataRow['value'];
-			}
-
-			while ($row = $stmt->fetchAssociative()) {
-				$id = $row['id'];
-
-				if (isset($metaDataById[$id])) {
-					$principals[] = $this->rowToPrincipal($row, $metaDataById[$id]);
-				} else {
-					$principals[] = $this->rowToPrincipal($row);
-				}
-			}
-
-			$stmt->closeCursor();
-		}
-
-		return $principals;
-	}
-
-	/**
-	 * Returns a specific principal, specified by its path.
-	 * The returned structure should be the exact same as from
-	 * getPrincipalsByPrefix.
-	 *
-	 * @param string $prefixPath
-	 *
-	 * @return array
-	 */
-	public function getPrincipalByPath($path) {
-		if (!str_starts_with($path, $this->principalPrefix)) {
-			return null;
-		}
-		[, $name] = \Sabre\Uri\split($path);
-
-		[$backendId, $resourceId] = explode('-', $name, 2);
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-		$stmt = $query->executeQuery();
-		$row = $stmt->fetchAssociative();
-
-		if (!$row) {
-			return null;
-		}
-
-		$metaDataQuery = $this->db->getQueryBuilder();
-		$metaDataQuery->select(['key', 'value'])
-			->from($this->dbMetaDataTableName)
-			->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
-		$metaDataStmt = $metaDataQuery->executeQuery();
-		$metaDataRows = $metaDataStmt->fetchAllAssociative();
-		$metadata = [];
-
-		foreach ($metaDataRows as $metaDataRow) {
-			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
-		}
-
-		return $this->rowToPrincipal($row, $metadata);
-	}
-
-	/**
-	 * @param int $id
-	 * @return string[]|null
-	 */
-	public function getPrincipalById($id): ?array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
-			->from($this->dbTableName)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$stmt = $query->executeQuery();
-		$row = $stmt->fetchAssociative();
-
-		if (!$row) {
-			return null;
-		}
-
-		$metaDataQuery = $this->db->getQueryBuilder();
-		$metaDataQuery->select(['key', 'value'])
-			->from($this->dbMetaDataTableName)
-			->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
-		$metaDataStmt = $metaDataQuery->executeQuery();
-		$metaDataRows = $metaDataStmt->fetchAllAssociative();
-		$metadata = [];
-
-		foreach ($metaDataRows as $metaDataRow) {
-			$metadata[$metaDataRow['key']] = $metaDataRow['value'];
-		}
-
-		return $this->rowToPrincipal($row, $metadata);
-	}
-
-	/**
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 * @return int
-	 */
-	public function updatePrincipal($path, PropPatch $propPatch): int {
-		return 0;
-	}
-
-	/**
-	 * @param string $prefixPath
-	 * @param string $test
-	 *
-	 * @return array
-	 */
-	public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-		$results = [];
-		if (\count($searchProperties) === 0) {
-			return [];
-		}
-		if ($prefixPath !== $this->principalPrefix) {
-			return [];
-		}
-
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return [];
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		foreach ($searchProperties as $prop => $value) {
-			switch ($prop) {
-				case '{http://sabredav.org/ns}email-address':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->executeQuery();
-					$principals = [];
-					while ($row = $stmt->fetchAssociative()) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{DAV:}displayname':
-					$query = $this->db->getQueryBuilder();
-					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-
-					$stmt = $query->executeQuery();
-					$principals = [];
-					while ($row = $stmt->fetchAssociative()) {
-						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-							continue;
-						}
-						$principals[] = $this->rowToPrincipal($row)['uri'];
-					}
-					$results[] = $principals;
-
-					$stmt->closeCursor();
-					break;
-
-				case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
-					// If you add support for more search properties that qualify as a user-address,
-					// please also add them to the array below
-					$results[] = $this->searchPrincipals($this->principalPrefix, [
-						'{http://sabredav.org/ns}email-address' => $value,
-					], 'anyof');
-					break;
-
-				case IRoomMetadata::FEATURES:
-					$results[] = $this->searchPrincipalsByRoomFeature($prop, $value);
-					break;
-
-				case IRoomMetadata::CAPACITY:
-				case IResourceMetadata::VEHICLE_SEATING_CAPACITY:
-					$results[] = $this->searchPrincipalsByCapacity($prop, $value);
-					break;
-
-				default:
-					$results[] = $this->searchPrincipalsByMetadataKey($prop, $value, $usersGroups);
-					break;
-			}
-		}
-
-		// results is an array of arrays, so this is not the first search result
-		// but the results of the first searchProperty
-		if (count($results) === 1) {
-			return $results[0];
-		}
-
-		switch ($test) {
-			case 'anyof':
-				return array_values(array_unique(array_merge(...$results)));
-
-			case 'allof':
-			default:
-				return array_values(array_intersect(...$results));
-		}
-	}
-
-	/**
-	 * @param string $key
-	 * @return IQueryBuilder
-	 */
-	private function getMetadataQuery(string $key): IQueryBuilder {
-		$query = $this->db->getQueryBuilder();
-		$query->select([$this->dbForeignKeyName])
-			->from($this->dbMetaDataTableName)
-			->where($query->expr()->eq('key', $query->createNamedParameter($key)));
-		return $query;
-	}
-
-	/**
-	 * Searches principals based on their metadata keys.
-	 * This allows to search for all principals with a specific key.
-	 * e.g.:
-	 * '{http://nextcloud.com/ns}room-building-address' => 'ABC Street 123, ...'
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function searchPrincipalsByMetadataKey(string $key, string $value, array $usersGroups = []): array {
-		$query = $this->getMetadataQuery($key);
-		$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
-		return $this->getRows($query, $usersGroups);
-	}
-
-	/**
-	 * Searches principals based on room features
-	 * e.g.:
-	 * '{http://nextcloud.com/ns}room-features' => 'TV,PROJECTOR'
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function searchPrincipalsByRoomFeature(string $key, string $value, array $usersGroups = []): array {
-		$query = $this->getMetadataQuery($key);
-		foreach (explode(',', $value) as $v) {
-			$query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($v) . '%')));
-		}
-		return $this->getRows($query, $usersGroups);
-	}
-
-	/**
-	 * Searches principals based on room seating capacity or vehicle capacity
-	 * e.g.:
-	 * '{http://nextcloud.com/ns}room-seating-capacity' => '100'
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function searchPrincipalsByCapacity(string $key, string $value, array $usersGroups = []): array {
-		$query = $this->getMetadataQuery($key);
-		$query->andWhere($query->expr()->gte('value', $query->createNamedParameter($value)));
-		return $this->getRows($query, $usersGroups);
-	}
-
-	/**
-	 * @param IQueryBuilder $query
-	 * @param string[] $usersGroups
-	 * @return string[]
-	 */
-	private function getRows(IQueryBuilder $query, array $usersGroups): array {
-		try {
-			$stmt = $query->executeQuery();
-		} catch (Exception $e) {
-			$this->logger->error('Could not search resources: ' . $e->getMessage(), ['exception' => $e]);
-		}
-
-		$rows = [];
-		while ($row = $stmt->fetchAssociative()) {
-			$principalRow = $this->getPrincipalById($row[$this->dbForeignKeyName]);
-			if (!$principalRow) {
-				continue;
-			}
-
-			$rows[] = $principalRow;
-		}
-
-		$stmt->closeCursor();
-
-		$filteredRows = array_filter($rows, function ($row) use ($usersGroups) {
-			return $this->isAllowedToAccessResource($row, $usersGroups);
-		});
-
-		return array_map(static function ($row): string {
-			return $row['uri'];
-		}, $filteredRows);
-	}
-
-	/**
-	 * @param string $uri
-	 * @param string $principalPrefix
-	 * @return null|string
-	 * @throws Exception
-	 */
-	public function findByUri($uri, $principalPrefix): ?string {
-		$user = $this->userSession->getUser();
-		if (!$user) {
-			return null;
-		}
-		$usersGroups = $this->groupManager->getUserGroupIds($user);
-
-		if (str_starts_with($uri, 'mailto:')) {
-			$email = substr($uri, 7);
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('email', $query->createNamedParameter($email)));
-
-			$stmt = $query->executeQuery();
-			$row = $stmt->fetchAssociative();
-
-			if (!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		if (str_starts_with($uri, 'principal:')) {
-			$path = substr($uri, 10);
-			if (!str_starts_with($path, $this->principalPrefix)) {
-				return null;
-			}
-
-			[, $name] = \Sabre\Uri\split($path);
-			[$backendId, $resourceId] = explode('-', $name, 2);
-
-			$query = $this->db->getQueryBuilder();
-			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
-				->from($this->dbTableName)
-				->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
-				->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
-			$stmt = $query->executeQuery();
-			$row = $stmt->fetchAssociative();
-
-			if (!$row) {
-				return null;
-			}
-			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
-				return null;
-			}
-
-			return $this->rowToPrincipal($row)['uri'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * convert database row to principal
-	 *
-	 * @param string[] $row
-	 * @param string[] $metadata
-	 * @return string[]
-	 */
-	private function rowToPrincipal(array $row, array $metadata = []): array {
-		return array_merge([
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{http://sabredav.org/ns}email-address' => $row['email'],
-			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
-		], $metadata);
-	}
-
-	/**
-	 * @param array $row
-	 * @param array $userGroups
-	 * @return bool
-	 */
-	private function isAllowedToAccessResource(array $row, array $userGroups): bool {
-		if (!isset($row['group_restrictions'])
-			|| $row['group_restrictions'] === null
-			|| $row['group_restrictions'] === '') {
-			return true;
-		}
-
-		// group restrictions contains something, but not parsable, deny access and log warning
-		$json = json_decode($row['group_restrictions'], null, 512, JSON_THROW_ON_ERROR);
-		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
-			return false;
-		}
-
-		// empty array => no group restrictions
-		if (empty($json)) {
-			return true;
-		}
-
-		return !empty(array_intersect($json, $userGroups));
-	}
+    /** @var string */
+    private $dbTableName;
+
+    /** @var string */
+    private $dbMetaDataTableName;
+
+    /** @var string */
+    private $dbForeignKeyName;
+
+    public function __construct(
+        private IDBConnection $db,
+        private IUserSession $userSession,
+        private IGroupManager $groupManager,
+        private LoggerInterface $logger,
+        private ProxyMapper $proxyMapper,
+        private string $principalPrefix,
+        string $dbPrefix,
+        private string $cuType,
+    ) {
+        $this->dbTableName = 'calendar_' . $dbPrefix . 's';
+        $this->dbMetaDataTableName = $this->dbTableName . '_md';
+        $this->dbForeignKeyName = $dbPrefix . '_id';
+    }
+
+    use PrincipalProxyTrait;
+
+    /**
+     * Returns a list of principals based on a prefix.
+     *
+     * This prefix will often contain something like 'principals'. You are only
+     * expected to return principals that are in this base path.
+     *
+     * You are expected to return at least a 'uri' for every user, you can
+     * return any additional properties if you wish so. Common properties are:
+     *   {DAV:}displayname
+     *
+     * @param string $prefixPath
+     * @return string[]
+     */
+    public function getPrincipalsByPrefix($prefixPath): array {
+        $principals = [];
+
+        if ($prefixPath === $this->principalPrefix) {
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+                ->from($this->dbTableName);
+            $stmt = $query->executeQuery();
+
+            $metaDataQuery = $this->db->getQueryBuilder();
+            $metaDataQuery->select([$this->dbForeignKeyName, 'key', 'value'])
+                ->from($this->dbMetaDataTableName);
+            $metaDataStmt = $metaDataQuery->executeQuery();
+            $metaDataRows = $metaDataStmt->fetchAllAssociative();
+
+            $metaDataById = [];
+            foreach ($metaDataRows as $metaDataRow) {
+                if (!isset($metaDataById[$metaDataRow[$this->dbForeignKeyName]])) {
+                    $metaDataById[$metaDataRow[$this->dbForeignKeyName]] = [];
+                }
+
+                $metaDataById[$metaDataRow[$this->dbForeignKeyName]][$metaDataRow['key']]
+                    = $metaDataRow['value'];
+            }
+
+            while ($row = $stmt->fetchAssociative()) {
+                $id = $row['id'];
+
+                if (isset($metaDataById[$id])) {
+                    $principals[] = $this->rowToPrincipal($row, $metaDataById[$id]);
+                } else {
+                    $principals[] = $this->rowToPrincipal($row);
+                }
+            }
+
+            $stmt->closeCursor();
+        }
+
+        return $principals;
+    }
+
+    /**
+     * Returns a specific principal, specified by its path.
+     * The returned structure should be the exact same as from
+     * getPrincipalsByPrefix.
+     *
+     * @param string $prefixPath
+     *
+     * @return array
+     */
+    public function getPrincipalByPath($path) {
+        if (!str_starts_with($path, $this->principalPrefix)) {
+            return null;
+        }
+        [, $name] = \Sabre\Uri\split($path);
+
+        [$backendId, $resourceId] = explode('-', $name, 2);
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+            ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+        $stmt = $query->executeQuery();
+        $row = $stmt->fetchAssociative();
+
+        if (!$row) {
+            return null;
+        }
+
+        $metaDataQuery = $this->db->getQueryBuilder();
+        $metaDataQuery->select(['key', 'value'])
+            ->from($this->dbMetaDataTableName)
+            ->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
+        $metaDataStmt = $metaDataQuery->executeQuery();
+        $metaDataRows = $metaDataStmt->fetchAllAssociative();
+        $metadata = [];
+
+        foreach ($metaDataRows as $metaDataRow) {
+            $metadata[$metaDataRow['key']] = $metaDataRow['value'];
+        }
+
+        return $this->rowToPrincipal($row, $metadata);
+    }
+
+    /**
+     * @param int $id
+     * @return string[]|null
+     */
+    public function getPrincipalById($id): ?array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
+            ->from($this->dbTableName)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $stmt = $query->executeQuery();
+        $row = $stmt->fetchAssociative();
+
+        if (!$row) {
+            return null;
+        }
+
+        $metaDataQuery = $this->db->getQueryBuilder();
+        $metaDataQuery->select(['key', 'value'])
+            ->from($this->dbMetaDataTableName)
+            ->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
+        $metaDataStmt = $metaDataQuery->executeQuery();
+        $metaDataRows = $metaDataStmt->fetchAllAssociative();
+        $metadata = [];
+
+        foreach ($metaDataRows as $metaDataRow) {
+            $metadata[$metaDataRow['key']] = $metaDataRow['value'];
+        }
+
+        return $this->rowToPrincipal($row, $metadata);
+    }
+
+    /**
+     * @param string $path
+     * @param PropPatch $propPatch
+     * @return int
+     */
+    public function updatePrincipal($path, PropPatch $propPatch): int {
+        return 0;
+    }
+
+    /**
+     * @param string $prefixPath
+     * @param string $test
+     *
+     * @return array
+     */
+    public function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
+        $results = [];
+        if (\count($searchProperties) === 0) {
+            return [];
+        }
+        if ($prefixPath !== $this->principalPrefix) {
+            return [];
+        }
+
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return [];
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        foreach ($searchProperties as $prop => $value) {
+            switch ($prop) {
+                case '{http://sabredav.org/ns}email-address':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->executeQuery();
+                    $principals = [];
+                    while ($row = $stmt->fetchAssociative()) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{DAV:}displayname':
+                    $query = $this->db->getQueryBuilder();
+                    $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                        ->from($this->dbTableName)
+                        ->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+
+                    $stmt = $query->executeQuery();
+                    $principals = [];
+                    while ($row = $stmt->fetchAssociative()) {
+                        if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                            continue;
+                        }
+                        $principals[] = $this->rowToPrincipal($row)['uri'];
+                    }
+                    $results[] = $principals;
+
+                    $stmt->closeCursor();
+                    break;
+
+                case '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set':
+                    // If you add support for more search properties that qualify as a user-address,
+                    // please also add them to the array below
+                    $results[] = $this->searchPrincipals($this->principalPrefix, [
+                        '{http://sabredav.org/ns}email-address' => $value,
+                    ], 'anyof');
+                    break;
+
+                case IRoomMetadata::FEATURES:
+                    $results[] = $this->searchPrincipalsByRoomFeature($prop, $value);
+                    break;
+
+                case IRoomMetadata::CAPACITY:
+                case IResourceMetadata::VEHICLE_SEATING_CAPACITY:
+                    $results[] = $this->searchPrincipalsByCapacity($prop, $value);
+                    break;
+
+                default:
+                    $results[] = $this->searchPrincipalsByMetadataKey($prop, $value, $usersGroups);
+                    break;
+            }
+        }
+
+        // results is an array of arrays, so this is not the first search result
+        // but the results of the first searchProperty
+        if (count($results) === 1) {
+            return $results[0];
+        }
+
+        switch ($test) {
+            case 'anyof':
+                return array_values(array_unique(array_merge(...$results)));
+
+            case 'allof':
+            default:
+                return array_values(array_intersect(...$results));
+        }
+    }
+
+    /**
+     * @param string $key
+     * @return IQueryBuilder
+     */
+    private function getMetadataQuery(string $key): IQueryBuilder {
+        $query = $this->db->getQueryBuilder();
+        $query->select([$this->dbForeignKeyName])
+            ->from($this->dbMetaDataTableName)
+            ->where($query->expr()->eq('key', $query->createNamedParameter($key)));
+        return $query;
+    }
+
+    /**
+     * Searches principals based on their metadata keys.
+     * This allows to search for all principals with a specific key.
+     * e.g.:
+     * '{http://nextcloud.com/ns}room-building-address' => 'ABC Street 123, ...'
+     *
+     * @param string $key
+     * @param string $value
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function searchPrincipalsByMetadataKey(string $key, string $value, array $usersGroups = []): array {
+        $query = $this->getMetadataQuery($key);
+        $query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+        return $this->getRows($query, $usersGroups);
+    }
+
+    /**
+     * Searches principals based on room features
+     * e.g.:
+     * '{http://nextcloud.com/ns}room-features' => 'TV,PROJECTOR'
+     *
+     * @param string $key
+     * @param string $value
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function searchPrincipalsByRoomFeature(string $key, string $value, array $usersGroups = []): array {
+        $query = $this->getMetadataQuery($key);
+        foreach (explode(',', $value) as $v) {
+            $query->andWhere($query->expr()->iLike('value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($v) . '%')));
+        }
+        return $this->getRows($query, $usersGroups);
+    }
+
+    /**
+     * Searches principals based on room seating capacity or vehicle capacity
+     * e.g.:
+     * '{http://nextcloud.com/ns}room-seating-capacity' => '100'
+     *
+     * @param string $key
+     * @param string $value
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function searchPrincipalsByCapacity(string $key, string $value, array $usersGroups = []): array {
+        $query = $this->getMetadataQuery($key);
+        $query->andWhere($query->expr()->gte('value', $query->createNamedParameter($value)));
+        return $this->getRows($query, $usersGroups);
+    }
+
+    /**
+     * @param IQueryBuilder $query
+     * @param string[] $usersGroups
+     * @return string[]
+     */
+    private function getRows(IQueryBuilder $query, array $usersGroups): array {
+        try {
+            $stmt = $query->executeQuery();
+        } catch (Exception $e) {
+            $this->logger->error('Could not search resources: ' . $e->getMessage(), ['exception' => $e]);
+        }
+
+        $rows = [];
+        while ($row = $stmt->fetchAssociative()) {
+            $principalRow = $this->getPrincipalById($row[$this->dbForeignKeyName]);
+            if (!$principalRow) {
+                continue;
+            }
+
+            $rows[] = $principalRow;
+        }
+
+        $stmt->closeCursor();
+
+        $filteredRows = array_filter($rows, function ($row) use ($usersGroups) {
+            return $this->isAllowedToAccessResource($row, $usersGroups);
+        });
+
+        return array_map(static function ($row): string {
+            return $row['uri'];
+        }, $filteredRows);
+    }
+
+    /**
+     * @param string $uri
+     * @param string $principalPrefix
+     * @return null|string
+     * @throws Exception
+     */
+    public function findByUri($uri, $principalPrefix): ?string {
+        $user = $this->userSession->getUser();
+        if (!$user) {
+            return null;
+        }
+        $usersGroups = $this->groupManager->getUserGroupIds($user);
+
+        if (str_starts_with($uri, 'mailto:')) {
+            $email = substr($uri, 7);
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('email', $query->createNamedParameter($email)));
+
+            $stmt = $query->executeQuery();
+            $row = $stmt->fetchAssociative();
+
+            if (!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        if (str_starts_with($uri, 'principal:')) {
+            $path = substr($uri, 10);
+            if (!str_starts_with($path, $this->principalPrefix)) {
+                return null;
+            }
+
+            [, $name] = \Sabre\Uri\split($path);
+            [$backendId, $resourceId] = explode('-', $name, 2);
+
+            $query = $this->db->getQueryBuilder();
+            $query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
+                ->from($this->dbTableName)
+                ->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
+                ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
+            $stmt = $query->executeQuery();
+            $row = $stmt->fetchAssociative();
+
+            if (!$row) {
+                return null;
+            }
+            if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
+                return null;
+            }
+
+            return $this->rowToPrincipal($row)['uri'];
+        }
+
+        return null;
+    }
+
+    /**
+     * convert database row to principal
+     *
+     * @param string[] $row
+     * @param string[] $metadata
+     * @return string[]
+     */
+    private function rowToPrincipal(array $row, array $metadata = []): array {
+        return array_merge([
+            'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{http://sabredav.org/ns}email-address' => $row['email'],
+            '{urn:ietf:params:xml:ns:caldav}calendar-user-type' => $this->cuType,
+        ], $metadata);
+    }
+
+    /**
+     * @param array $row
+     * @param array $userGroups
+     * @return bool
+     */
+    private function isAllowedToAccessResource(array $row, array $userGroups): bool {
+        if (!isset($row['group_restrictions'])
+            || $row['group_restrictions'] === null
+            || $row['group_restrictions'] === '') {
+            return true;
+        }
+
+        // group restrictions contains something, but not parsable, deny access and log warning
+        $json = json_decode($row['group_restrictions'], null, 512, JSON_THROW_ON_ERROR);
+        if (!\is_array($json)) {
+            $this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+            return false;
+        }
+
+        // empty array => no group restrictions
+        if (empty($json)) {
+            return true;
+        }
+
+        return !empty(array_intersect($json, $userGroups));
+    }
 }

apps/dav/lib/DAV/CustomPropertiesBackend.php

Indentation +674 added lines, -674 removed lines

@@ -40,678 +40,678 @@
 
 class CustomPropertiesBackend implements BackendInterface {
 
-	/** @var string */
-	private const TABLE_NAME = 'properties';
-
-	/**
-	 * Value is stored as string.
-	 */
-	public const PROPERTY_TYPE_STRING = 1;
-
-	/**
-	 * Value is stored as XML fragment.
-	 */
-	public const PROPERTY_TYPE_XML = 2;
-
-	/**
-	 * Value is stored as a property object.
-	 */
-	public const PROPERTY_TYPE_OBJECT = 3;
-
-	/**
-	 * Value is stored as a {DAV:}href string.
-	 */
-	public const PROPERTY_TYPE_HREF = 4;
-
-	/**
-	 * Ignored properties
-	 *
-	 * @var string[]
-	 */
-	private const IGNORED_PROPERTIES = [
-		'{DAV:}getcontentlength',
-		'{DAV:}getcontenttype',
-		'{DAV:}getetag',
-		'{DAV:}quota-used-bytes',
-		'{DAV:}quota-available-bytes',
-	];
-
-	/**
-	 * Allowed properties for the oc/nc namespace, all other properties in the namespace are ignored
-	 *
-	 * @var string[]
-	 */
-	private const ALLOWED_NC_PROPERTIES = [
-		'{http://owncloud.org/ns}calendar-enabled',
-		'{http://owncloud.org/ns}enabled',
-	];
-
-	/**
-	 * Properties set by one user, readable by all others
-	 *
-	 * @var string[]
-	 */
-	private const PUBLISHED_READ_ONLY_PROPERTIES = [
-		'{urn:ietf:params:xml:ns:caldav}calendar-availability',
-		'{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
-	];
-
-	/**
-	 * Map of custom XML elements to parse when trying to deserialize an instance of
-	 * \Sabre\DAV\Xml\Property\Complex to find a more specialized PROPERTY_TYPE_*
-	 * @var array<string, class-string>
-	 */
-	private const COMPLEX_XML_ELEMENT_MAP = [
-		'{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL' => Href::class,
-	];
-
-	/**
-	 * Map of well-known property names to default values
-	 * @var array<string, string>
-	 */
-	private const PROPERTY_DEFAULT_VALUES = [
-		'{http://owncloud.org/ns}calendar-enabled' => '1',
-	];
-
-	/**
-	 * Properties cache
-	 */
-	private array $userCache = [];
-	private array $publishedCache = [];
-	private XmlService $xmlService;
-
-	/**
-	 * @param IUser $user owner of the tree and properties
-	 */
-	public function __construct(
-		private readonly Server $server,
-		private readonly Tree $tree,
-		private readonly IDBConnection $connection,
-		private readonly IUser $user,
-		private readonly PropertyMapper $propertyMapper,
-		private readonly DefaultCalendarValidator $defaultCalendarValidator,
-	) {
-		$this->xmlService = new XmlService();
-		$this->xmlService->elementMap = array_merge(
-			$this->xmlService->elementMap,
-			self::COMPLEX_XML_ELEMENT_MAP,
-		);
-	}
-
-	/**
-	 * Fetches properties for a path.
-	 *
-	 * @param string $path
-	 * @param PropFind $propFind
-	 */
-	#[Override]
-	public function propFind($path, PropFind $propFind): void {
-		$requestedProps = $propFind->get404Properties();
-
-		$requestedProps = array_filter(
-			$requestedProps,
-			$this->isPropertyAllowed(...),
-		);
-
-		// substr of calendars/ => path is inside the CalDAV component
-		// two '/' => this a calendar (no calendar-home nor calendar object)
-		if (str_starts_with($path, 'calendars/') && substr_count($path, '/') === 2) {
-			$allRequestedProps = $propFind->getRequestedProperties();
-			$customPropertiesForShares = [
-				'{DAV:}displayname',
-				'{urn:ietf:params:xml:ns:caldav}calendar-description',
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone',
-				'{http://apple.com/ns/ical/}calendar-order',
-				'{http://apple.com/ns/ical/}calendar-color',
-				'{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp',
-			];
-
-			foreach ($customPropertiesForShares as $customPropertyForShares) {
-				if (in_array($customPropertyForShares, $allRequestedProps)) {
-					$requestedProps[] = $customPropertyForShares;
-				}
-			}
-		}
-
-		// substr of addressbooks/ => path is inside the CardDAV component
-		// three '/' => this a addressbook (no addressbook-home nor contact object)
-		if (str_starts_with($path, 'addressbooks/') && substr_count($path, '/') === 3) {
-			$allRequestedProps = $propFind->getRequestedProperties();
-			$customPropertiesForShares = [
-				'{DAV:}displayname',
-			];
-
-			foreach ($customPropertiesForShares as $customPropertyForShares) {
-				if (in_array($customPropertyForShares, $allRequestedProps, true)) {
-					$requestedProps[] = $customPropertyForShares;
-				}
-			}
-		}
-
-		// substr of principals/users/ => path is a user principal
-		// two '/' => this a principal collection (and not some child object)
-		if (str_starts_with($path, 'principals/users/') && substr_count($path, '/') === 2) {
-			$allRequestedProps = $propFind->getRequestedProperties();
-			$customProperties = [
-				'{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
-			];
-
-			foreach ($customProperties as $customProperty) {
-				if (in_array($customProperty, $allRequestedProps, true)) {
-					$requestedProps[] = $customProperty;
-				}
-			}
-		}
-
-		if (empty($requestedProps)) {
-			return;
-		}
-
-		$node = $this->tree->getNodeForPath($path);
-		if ($node instanceof Directory && $propFind->getDepth() !== 0) {
-			$this->cacheDirectory($path, $node);
-		}
-
-		if ($node instanceof CalendarHome && $propFind->getDepth() !== 0) {
-			$backend = $node->getCalDAVBackend();
-			if ($backend instanceof CalDavBackend) {
-				$this->cacheCalendars($node, $requestedProps);
-			}
-		}
-
-		if ($node instanceof CalendarObject) {
-			// No custom properties supported on individual events
-			return;
-		}
-
-		// First fetch the published properties (set by another user), then get the ones set by
-		// the current user. If both are set then the latter as priority.
-		foreach ($this->getPublishedProperties($path, $requestedProps) as $propName => $propValue) {
-			try {
-				$this->validateProperty($path, $propName, $propValue);
-			} catch (DavException $e) {
-				continue;
-			}
-			$propFind->set($propName, $propValue);
-		}
-		foreach ($this->getUserProperties($path, $requestedProps) as $propName => $propValue) {
-			try {
-				$this->validateProperty($path, $propName, $propValue);
-			} catch (DavException $e) {
-				continue;
-			}
-			$propFind->set($propName, $propValue);
-		}
-	}
-
-	private function isPropertyAllowed(string $property): bool {
-		if (in_array($property, self::IGNORED_PROPERTIES)) {
-			return false;
-		}
-		if (str_starts_with($property, '{http://owncloud.org/ns}') || str_starts_with($property, '{http://nextcloud.org/ns}')) {
-			return in_array($property, self::ALLOWED_NC_PROPERTIES);
-		}
-		return true;
-	}
-
-	/**
-	 * Updates properties for a path
-	 *
-	 * @param string $path
-	 */
-	#[Override]
-	public function propPatch($path, PropPatch $propPatch): void {
-		$propPatch->handleRemaining(function (array $changedProps) use ($path) {
-			return $this->updateProperties($path, $changedProps);
-		});
-	}
-
-	/**
-	 * This method is called after a node is deleted.
-	 *
-	 * @param string $path path of node for which to delete properties
-	 */
-	#[Override]
-	public function delete($path): void {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('properties')
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($this->user->getUID())))
-			->andWhere($qb->expr()->eq('propertypath', $qb->createNamedParameter($this->formatPath($path))));
-		$qb->executeStatement();
-		unset($this->userCache[$path]);
-	}
-
-	/**
-	 * This method is called after a successful MOVE
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 */
-	#[Override]
-	public function move($source, $destination): void {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('properties')
-			->set('propertypath', $qb->createNamedParameter($this->formatPath($destination)))
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($this->user->getUID())))
-			->andWhere($qb->expr()->eq('propertypath', $qb->createNamedParameter($this->formatPath($source))));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Validate the value of a property. Will throw if a value is invalid.
-	 *
-	 * @throws DavException The value of the property is invalid
-	 */
-	private function validateProperty(string $path, string $propName, mixed $propValue): void {
-		switch ($propName) {
-			case '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL':
-				/** @var Href $propValue */
-				$href = $propValue->getHref();
-				if ($href === null) {
-					throw new DavException('Href is empty');
-				}
-
-				// $path is the principal here as this prop is only set on principals
-				$node = $this->tree->getNodeForPath($href);
-				if (!($node instanceof Calendar) || $node->getOwner() !== $path) {
-					throw new DavException('No such calendar');
-				}
-
-				$this->defaultCalendarValidator->validateScheduleDefaultCalendar($node);
-				break;
-		}
-	}
-
-	/**
-	 * @param string[] $requestedProperties
-	 *
-	 * @return array<string, mixed|Complex|Href|string>
-	 * @throws \OCP\DB\Exception
-	 */
-	private function getPublishedProperties(string $path, array $requestedProperties): array {
-		$allowedProps = array_intersect(self::PUBLISHED_READ_ONLY_PROPERTIES, $requestedProperties);
-
-		if (empty($allowedProps)) {
-			return [];
-		}
-
-		if (isset($this->publishedCache[$path])) {
-			return $this->publishedCache[$path];
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq('propertypath', $qb->createNamedParameter($path)));
-		$result = $qb->executeQuery();
-		$props = [];
-		while ($row = $result->fetchAssociative()) {
-			$props[$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
-		}
-		$result->closeCursor();
-		$this->publishedCache[$path] = $props;
-		return $props;
-	}
-
-	/**
-	 * Prefetch all user properties in a directory
-	 */
-	private function cacheDirectory(string $path, Directory $node): void {
-		$prefix = ltrim($path . '/', '/');
-		$query = $this->connection->getQueryBuilder();
-		$query->select('name', 'p.propertypath', 'p.propertyname', 'p.propertyvalue', 'p.valuetype')
-			->from('filecache', 'f')
-			->hintShardKey('storage', $node->getNode()->getMountPoint()->getNumericStorageId())
-			->leftJoin('f', 'properties', 'p', $query->expr()->eq('p.propertypath', $query->func()->concat(
-				$query->createNamedParameter($prefix),
-				'f.name'
-			)),
-			)
-			->where($query->expr()->eq('parent', $query->createNamedParameter($node->getInternalFileId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->orX(
-				$query->expr()->eq('p.userid', $query->createNamedParameter($this->user->getUID())),
-				$query->expr()->isNull('p.userid'),
-			));
-		$result = $query->executeQuery();
-
-		$propsByPath = [];
-
-		while ($row = $result->fetchAssociative()) {
-			$childPath = $prefix . $row['name'];
-			if (!isset($propsByPath[$childPath])) {
-				$propsByPath[$childPath] = [];
-			}
-			if (isset($row['propertyname'])) {
-				$propsByPath[$childPath][$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
-			}
-		}
-		$this->userCache = array_merge($this->userCache, $propsByPath);
-	}
-
-	private function cacheCalendars(CalendarHome $node, array $requestedProperties): void {
-		$calendars = $node->getChildren();
-
-		$users = [];
-		foreach ($calendars as $calendar) {
-			if ($calendar instanceof Calendar) {
-				$user = str_replace('principals/users/', '', $calendar->getPrincipalURI());
-				if (!isset($users[$user])) {
-					$users[$user] = ['calendars/' . $user];
-				}
-				$users[$user][] = 'calendars/' . $user . '/' . $calendar->getUri();
-			} elseif ($calendar instanceof Inbox || $calendar instanceof Outbox || $calendar instanceof TrashbinHome || $calendar instanceof ExternalCalendar) {
-				if ($calendar->getOwner()) {
-					$user = str_replace('principals/users/', '', $calendar->getOwner());
-					if (!isset($users[$user])) {
-						$users[$user] = ['calendars/' . $user];
-					}
-					$users[$user][] = 'calendars/' . $user . '/' . $calendar->getName();
-				}
-			}
-		}
-
-		// user properties
-		$properties = $this->propertyMapper->findPropertiesByPathsAndUsers($users);
-
-		$propsByPath = [];
-		foreach ($users as $paths) {
-			foreach ($paths as $path) {
-				$propsByPath[$path] = [];
-			}
-		}
-
-		foreach ($properties as $property) {
-			$propsByPath[$property->getPropertypath()][$property->getPropertyname()] = $this->decodeValueFromDatabase($property->getPropertyvalue(), $property->getValuetype());
-		}
-		$this->userCache = array_merge($this->userCache, $propsByPath);
-
-		// published properties
-		$allowedProps = array_intersect(self::PUBLISHED_READ_ONLY_PROPERTIES, $requestedProperties);
-		if (empty($allowedProps)) {
-			return;
-		}
-		$paths = [];
-		foreach ($users as $nestedPaths) {
-			$paths = array_merge($paths, $nestedPaths);
-		}
-		$paths = array_unique($paths);
-
-		$propsByPath = array_fill_keys(array_values($paths), []);
-		$properties = $this->propertyMapper->findPropertiesByPaths($paths, $allowedProps);
-		foreach ($properties as $property) {
-			$propsByPath[$property->getPropertypath()][$property->getPropertyname()] = $this->decodeValueFromDatabase($property->getPropertyvalue(), $property->getValuetype());
-		}
-		$this->publishedCache = array_merge($this->publishedCache, $propsByPath);
-	}
-
-	/**
-	 * Returns a list of properties for the given path and current user
-	 *
-	 * @param array $requestedProperties requested properties or empty array for "all"
-	 * @return array<string, mixed>
-	 * @note The properties list is a list of propertynames the client
-	 * requested, encoded as xmlnamespace#tagName, for example:
-	 * http://www.example.org/namespace#author If the array is empty, all
-	 * properties should be returned
-	 */
-	private function getUserProperties(string $path, array $requestedProperties): array {
-		if (isset($this->userCache[$path])) {
-			return $this->userCache[$path];
-		}
-
-		$props = [];
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('properties')
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($this->user->getUID(), IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('propertypath', $qb->createNamedParameter($this->formatPath($path), IQueryBuilder::PARAM_STR)));
-
-		if (!empty($requestedProperties)) {
-			// request only a subset
-			$qb->andWhere($qb->expr()->in('propertyname', $qb->createParameter('requestedProperties')));
-			$chunks = array_chunk($requestedProperties, 1000);
-			foreach ($chunks as $chunk) {
-				$qb->setParameter('requestedProperties', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-				$result = $qb->executeQuery();
-				while ($row = $result->fetchAssociative()) {
-					$props[$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
-				}
-			}
-		} else {
-			$result = $qb->executeQuery();
-			while ($row = $result->fetchAssociative()) {
-				$props[$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
-			}
-		}
-
-		$this->userCache[$path] = $props;
-		return $props;
-	}
-
-	private function isPropertyDefaultValue(string $name, mixed $value): bool {
-		if (!isset(self::PROPERTY_DEFAULT_VALUES[$name])) {
-			return false;
-		}
-
-		return self::PROPERTY_DEFAULT_VALUES[$name] === $value;
-	}
-
-	/**
-	 * @param array<string, string> $properties
-	 * @throws Exception
-	 */
-	private function updateProperties(string $path, array $properties): bool {
-		// TODO: use "insert or update" strategy ?
-		$existing = $this->getUserProperties($path, []);
-		try {
-			$this->connection->beginTransaction();
-			foreach ($properties as $propertyName => $propertyValue) {
-				// common parameters for all queries
-				$dbParameters = [
-					'userid' => $this->user->getUID(),
-					'propertyPath' => $this->formatPath($path),
-					'propertyName' => $propertyName,
-				];
-
-				// If it was null or set to the default value, we need to delete the property
-				if (is_null($propertyValue) || $this->isPropertyDefaultValue($propertyName, $propertyValue)) {
-					if (array_key_exists($propertyName, $existing)) {
-						$deleteQuery = $deleteQuery ?? $this->createDeleteQuery();
-						$deleteQuery
-							->setParameters($dbParameters)
-							->executeStatement();
-					}
-				} else {
-					[$value, $valueType] = $this->encodeValueForDatabase(
-						$path,
-						$propertyName,
-						$propertyValue,
-					);
-					$dbParameters['propertyValue'] = $value;
-					$dbParameters['valueType'] = $valueType;
-
-					if (!array_key_exists($propertyName, $existing)) {
-						$insertQuery = $insertQuery ?? $this->createInsertQuery();
-						$insertQuery
-							->setParameters($dbParameters)
-							->executeStatement();
-					} else {
-						$updateQuery = $updateQuery ?? $this->createUpdateQuery();
-						$updateQuery
-							->setParameters($dbParameters)
-							->executeStatement();
-					}
-				}
-			}
-
-			$this->connection->commit();
-			unset($this->userCache[$path]);
-		} catch (Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Long paths are hashed to ensure they fit in the database
-	 */
-	private function formatPath(string $path): string {
-		if (strlen($path) > 250) {
-			return sha1($path);
-		}
-
-		return $path;
-	}
-
-	private static function checkIsArrayOfScalar(string $name, array $array): void {
-		foreach ($array as $item) {
-			if (is_array($item)) {
-				self::checkIsArrayOfScalar($name, $item);
-			} elseif ($item !== null && !is_scalar($item)) {
-				throw new DavException(
-					"Property \"$name\" has an invalid value of array containing " . gettype($item),
-				);
-			}
-		}
-	}
-
-	/**
-	 * @throws ParseException If parsing a \Sabre\DAV\Xml\Property\Complex value fails
-	 * @throws DavException If the property value is invalid
-	 */
-	private function encodeValueForDatabase(string $path, string $name, mixed $value): array {
-		// Try to parse a more specialized property type first
-		if ($value instanceof Complex) {
-			$xml = $this->xmlService->write($name, [$value], $this->server->getBaseUri());
-			$value = $this->xmlService->parse($xml, $this->server->getBaseUri()) ?? $value;
-		}
-
-		if ($name === '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL') {
-			$value = $this->encodeDefaultCalendarUrl($value);
-		}
-
-		try {
-			$this->validateProperty($path, $name, $value);
-		} catch (DavException $e) {
-			throw new DavException(
-				"Property \"$name\" has an invalid value: " . $e->getMessage(),
-				0,
-				$e,
-			);
-		}
-
-		if (is_scalar($value)) {
-			$valueType = self::PROPERTY_TYPE_STRING;
-		} elseif ($value instanceof Complex) {
-			$valueType = self::PROPERTY_TYPE_XML;
-			$value = $value->getXml();
-		} elseif ($value instanceof Href) {
-			$valueType = self::PROPERTY_TYPE_HREF;
-			$value = $value->getHref();
-		} else {
-			if (is_array($value)) {
-				// For array only allow scalar values
-				self::checkIsArrayOfScalar($name, $value);
-			} elseif (!is_object($value)) {
-				throw new DavException(
-					"Property \"$name\" has an invalid value of type " . gettype($value),
-				);
-			} else {
-				if (!str_starts_with($value::class, 'Sabre\\DAV\\Xml\\Property\\')
-					&& !str_starts_with($value::class, 'Sabre\\CalDAV\\Xml\\Property\\')
-					&& !str_starts_with($value::class, 'Sabre\\CardDAV\\Xml\\Property\\')
-					&& !str_starts_with($value::class, 'OCA\\DAV\\')) {
-					throw new DavException(
-						"Property \"$name\" has an invalid value of class " . $value::class,
-					);
-				}
-			}
-			$valueType = self::PROPERTY_TYPE_OBJECT;
-			// serialize produces null character
-			// these can not be properly stored in some databases and need to be replaced
-			$value = str_replace(chr(0), '\x00', serialize($value));
-		}
-		return [$value, $valueType];
-	}
-
-	/**
-	 * @return mixed|Complex|string
-	 */
-	private function decodeValueFromDatabase(string $value, int $valueType): mixed {
-		switch ($valueType) {
-			case self::PROPERTY_TYPE_XML:
-				return new Complex($value);
-			case self::PROPERTY_TYPE_HREF:
-				return new Href($value);
-			case self::PROPERTY_TYPE_OBJECT:
-				if (preg_match('/^a:/', $value)) {
-					// Array, unserialize only scalar values
-					return unserialize(str_replace('\x00', chr(0), $value), ['allowed_classes' => false]);
-				}
-				if (!preg_match('/^O\:\d+\:\"(OCA\\\\DAV\\\\|Sabre\\\\(Cal|Card)?DAV\\\\Xml\\\\Property\\\\)/', $value)) {
-					throw new \LogicException('Found an object class serialized in DB that is not allowed');
-				}
-				// some databases can not handel null characters, these are custom encoded during serialization
-				// this custom encoding needs to be first reversed before unserializing
-				return unserialize(str_replace('\x00', chr(0), $value));
-			default:
-				return $value;
-		};
-	}
-
-	private function encodeDefaultCalendarUrl(Href $value): Href {
-		$href = $value->getHref();
-		if ($href === null) {
-			return $value;
-		}
-
-		if (!str_starts_with($href, '/')) {
-			return $value;
-		}
-
-		try {
-			// Build path relative to the dav base URI to be used later to find the node
-			$value = new LocalHref($this->server->calculateUri($href) . '/');
-		} catch (DavException\Forbidden) {
-			// Not existing calendars will be handled later when the value is validated
-		}
-
-		return $value;
-	}
-
-	private function createDeleteQuery(): IQueryBuilder {
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('properties')
-			->where($deleteQuery->expr()->eq('userid', $deleteQuery->createParameter('userid')))
-			->andWhere($deleteQuery->expr()->eq('propertypath', $deleteQuery->createParameter('propertyPath')))
-			->andWhere($deleteQuery->expr()->eq('propertyname', $deleteQuery->createParameter('propertyName')));
-		return $deleteQuery;
-	}
-
-	private function createInsertQuery(): IQueryBuilder {
-		$insertQuery = $this->connection->getQueryBuilder();
-		$insertQuery->insert('properties')
-			->values([
-				'userid' => $insertQuery->createParameter('userid'),
-				'propertypath' => $insertQuery->createParameter('propertyPath'),
-				'propertyname' => $insertQuery->createParameter('propertyName'),
-				'propertyvalue' => $insertQuery->createParameter('propertyValue'),
-				'valuetype' => $insertQuery->createParameter('valueType'),
-			]);
-		return $insertQuery;
-	}
-
-	private function createUpdateQuery(): IQueryBuilder {
-		$updateQuery = $this->connection->getQueryBuilder();
-		$updateQuery->update('properties')
-			->set('propertyvalue', $updateQuery->createParameter('propertyValue'))
-			->set('valuetype', $updateQuery->createParameter('valueType'))
-			->where($updateQuery->expr()->eq('userid', $updateQuery->createParameter('userid')))
-			->andWhere($updateQuery->expr()->eq('propertypath', $updateQuery->createParameter('propertyPath')))
-			->andWhere($updateQuery->expr()->eq('propertyname', $updateQuery->createParameter('propertyName')));
-		return $updateQuery;
-	}
+    /** @var string */
+    private const TABLE_NAME = 'properties';
+
+    /**
+     * Value is stored as string.
+     */
+    public const PROPERTY_TYPE_STRING = 1;
+
+    /**
+     * Value is stored as XML fragment.
+     */
+    public const PROPERTY_TYPE_XML = 2;
+
+    /**
+     * Value is stored as a property object.
+     */
+    public const PROPERTY_TYPE_OBJECT = 3;
+
+    /**
+     * Value is stored as a {DAV:}href string.
+     */
+    public const PROPERTY_TYPE_HREF = 4;
+
+    /**
+     * Ignored properties
+     *
+     * @var string[]
+     */
+    private const IGNORED_PROPERTIES = [
+        '{DAV:}getcontentlength',
+        '{DAV:}getcontenttype',
+        '{DAV:}getetag',
+        '{DAV:}quota-used-bytes',
+        '{DAV:}quota-available-bytes',
+    ];
+
+    /**
+     * Allowed properties for the oc/nc namespace, all other properties in the namespace are ignored
+     *
+     * @var string[]
+     */
+    private const ALLOWED_NC_PROPERTIES = [
+        '{http://owncloud.org/ns}calendar-enabled',
+        '{http://owncloud.org/ns}enabled',
+    ];
+
+    /**
+     * Properties set by one user, readable by all others
+     *
+     * @var string[]
+     */
+    private const PUBLISHED_READ_ONLY_PROPERTIES = [
+        '{urn:ietf:params:xml:ns:caldav}calendar-availability',
+        '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
+    ];
+
+    /**
+     * Map of custom XML elements to parse when trying to deserialize an instance of
+     * \Sabre\DAV\Xml\Property\Complex to find a more specialized PROPERTY_TYPE_*
+     * @var array<string, class-string>
+     */
+    private const COMPLEX_XML_ELEMENT_MAP = [
+        '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL' => Href::class,
+    ];
+
+    /**
+     * Map of well-known property names to default values
+     * @var array<string, string>
+     */
+    private const PROPERTY_DEFAULT_VALUES = [
+        '{http://owncloud.org/ns}calendar-enabled' => '1',
+    ];
+
+    /**
+     * Properties cache
+     */
+    private array $userCache = [];
+    private array $publishedCache = [];
+    private XmlService $xmlService;
+
+    /**
+     * @param IUser $user owner of the tree and properties
+     */
+    public function __construct(
+        private readonly Server $server,
+        private readonly Tree $tree,
+        private readonly IDBConnection $connection,
+        private readonly IUser $user,
+        private readonly PropertyMapper $propertyMapper,
+        private readonly DefaultCalendarValidator $defaultCalendarValidator,
+    ) {
+        $this->xmlService = new XmlService();
+        $this->xmlService->elementMap = array_merge(
+            $this->xmlService->elementMap,
+            self::COMPLEX_XML_ELEMENT_MAP,
+        );
+    }
+
+    /**
+     * Fetches properties for a path.
+     *
+     * @param string $path
+     * @param PropFind $propFind
+     */
+    #[Override]
+    public function propFind($path, PropFind $propFind): void {
+        $requestedProps = $propFind->get404Properties();
+
+        $requestedProps = array_filter(
+            $requestedProps,
+            $this->isPropertyAllowed(...),
+        );
+
+        // substr of calendars/ => path is inside the CalDAV component
+        // two '/' => this a calendar (no calendar-home nor calendar object)
+        if (str_starts_with($path, 'calendars/') && substr_count($path, '/') === 2) {
+            $allRequestedProps = $propFind->getRequestedProperties();
+            $customPropertiesForShares = [
+                '{DAV:}displayname',
+                '{urn:ietf:params:xml:ns:caldav}calendar-description',
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone',
+                '{http://apple.com/ns/ical/}calendar-order',
+                '{http://apple.com/ns/ical/}calendar-color',
+                '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp',
+            ];
+
+            foreach ($customPropertiesForShares as $customPropertyForShares) {
+                if (in_array($customPropertyForShares, $allRequestedProps)) {
+                    $requestedProps[] = $customPropertyForShares;
+                }
+            }
+        }
+
+        // substr of addressbooks/ => path is inside the CardDAV component
+        // three '/' => this a addressbook (no addressbook-home nor contact object)
+        if (str_starts_with($path, 'addressbooks/') && substr_count($path, '/') === 3) {
+            $allRequestedProps = $propFind->getRequestedProperties();
+            $customPropertiesForShares = [
+                '{DAV:}displayname',
+            ];
+
+            foreach ($customPropertiesForShares as $customPropertyForShares) {
+                if (in_array($customPropertyForShares, $allRequestedProps, true)) {
+                    $requestedProps[] = $customPropertyForShares;
+                }
+            }
+        }
+
+        // substr of principals/users/ => path is a user principal
+        // two '/' => this a principal collection (and not some child object)
+        if (str_starts_with($path, 'principals/users/') && substr_count($path, '/') === 2) {
+            $allRequestedProps = $propFind->getRequestedProperties();
+            $customProperties = [
+                '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
+            ];
+
+            foreach ($customProperties as $customProperty) {
+                if (in_array($customProperty, $allRequestedProps, true)) {
+                    $requestedProps[] = $customProperty;
+                }
+            }
+        }
+
+        if (empty($requestedProps)) {
+            return;
+        }
+
+        $node = $this->tree->getNodeForPath($path);
+        if ($node instanceof Directory && $propFind->getDepth() !== 0) {
+            $this->cacheDirectory($path, $node);
+        }
+
+        if ($node instanceof CalendarHome && $propFind->getDepth() !== 0) {
+            $backend = $node->getCalDAVBackend();
+            if ($backend instanceof CalDavBackend) {
+                $this->cacheCalendars($node, $requestedProps);
+            }
+        }
+
+        if ($node instanceof CalendarObject) {
+            // No custom properties supported on individual events
+            return;
+        }
+
+        // First fetch the published properties (set by another user), then get the ones set by
+        // the current user. If both are set then the latter as priority.
+        foreach ($this->getPublishedProperties($path, $requestedProps) as $propName => $propValue) {
+            try {
+                $this->validateProperty($path, $propName, $propValue);
+            } catch (DavException $e) {
+                continue;
+            }
+            $propFind->set($propName, $propValue);
+        }
+        foreach ($this->getUserProperties($path, $requestedProps) as $propName => $propValue) {
+            try {
+                $this->validateProperty($path, $propName, $propValue);
+            } catch (DavException $e) {
+                continue;
+            }
+            $propFind->set($propName, $propValue);
+        }
+    }
+
+    private function isPropertyAllowed(string $property): bool {
+        if (in_array($property, self::IGNORED_PROPERTIES)) {
+            return false;
+        }
+        if (str_starts_with($property, '{http://owncloud.org/ns}') || str_starts_with($property, '{http://nextcloud.org/ns}')) {
+            return in_array($property, self::ALLOWED_NC_PROPERTIES);
+        }
+        return true;
+    }
+
+    /**
+     * Updates properties for a path
+     *
+     * @param string $path
+     */
+    #[Override]
+    public function propPatch($path, PropPatch $propPatch): void {
+        $propPatch->handleRemaining(function (array $changedProps) use ($path) {
+            return $this->updateProperties($path, $changedProps);
+        });
+    }
+
+    /**
+     * This method is called after a node is deleted.
+     *
+     * @param string $path path of node for which to delete properties
+     */
+    #[Override]
+    public function delete($path): void {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('properties')
+            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($this->user->getUID())))
+            ->andWhere($qb->expr()->eq('propertypath', $qb->createNamedParameter($this->formatPath($path))));
+        $qb->executeStatement();
+        unset($this->userCache[$path]);
+    }
+
+    /**
+     * This method is called after a successful MOVE
+     *
+     * @param string $source
+     * @param string $destination
+     */
+    #[Override]
+    public function move($source, $destination): void {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('properties')
+            ->set('propertypath', $qb->createNamedParameter($this->formatPath($destination)))
+            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($this->user->getUID())))
+            ->andWhere($qb->expr()->eq('propertypath', $qb->createNamedParameter($this->formatPath($source))));
+        $qb->executeStatement();
+    }
+
+    /**
+     * Validate the value of a property. Will throw if a value is invalid.
+     *
+     * @throws DavException The value of the property is invalid
+     */
+    private function validateProperty(string $path, string $propName, mixed $propValue): void {
+        switch ($propName) {
+            case '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL':
+                /** @var Href $propValue */
+                $href = $propValue->getHref();
+                if ($href === null) {
+                    throw new DavException('Href is empty');
+                }
+
+                // $path is the principal here as this prop is only set on principals
+                $node = $this->tree->getNodeForPath($href);
+                if (!($node instanceof Calendar) || $node->getOwner() !== $path) {
+                    throw new DavException('No such calendar');
+                }
+
+                $this->defaultCalendarValidator->validateScheduleDefaultCalendar($node);
+                break;
+        }
+    }
+
+    /**
+     * @param string[] $requestedProperties
+     *
+     * @return array<string, mixed|Complex|Href|string>
+     * @throws \OCP\DB\Exception
+     */
+    private function getPublishedProperties(string $path, array $requestedProperties): array {
+        $allowedProps = array_intersect(self::PUBLISHED_READ_ONLY_PROPERTIES, $requestedProperties);
+
+        if (empty($allowedProps)) {
+            return [];
+        }
+
+        if (isset($this->publishedCache[$path])) {
+            return $this->publishedCache[$path];
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq('propertypath', $qb->createNamedParameter($path)));
+        $result = $qb->executeQuery();
+        $props = [];
+        while ($row = $result->fetchAssociative()) {
+            $props[$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
+        }
+        $result->closeCursor();
+        $this->publishedCache[$path] = $props;
+        return $props;
+    }
+
+    /**
+     * Prefetch all user properties in a directory
+     */
+    private function cacheDirectory(string $path, Directory $node): void {
+        $prefix = ltrim($path . '/', '/');
+        $query = $this->connection->getQueryBuilder();
+        $query->select('name', 'p.propertypath', 'p.propertyname', 'p.propertyvalue', 'p.valuetype')
+            ->from('filecache', 'f')
+            ->hintShardKey('storage', $node->getNode()->getMountPoint()->getNumericStorageId())
+            ->leftJoin('f', 'properties', 'p', $query->expr()->eq('p.propertypath', $query->func()->concat(
+                $query->createNamedParameter($prefix),
+                'f.name'
+            )),
+            )
+            ->where($query->expr()->eq('parent', $query->createNamedParameter($node->getInternalFileId(), IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->orX(
+                $query->expr()->eq('p.userid', $query->createNamedParameter($this->user->getUID())),
+                $query->expr()->isNull('p.userid'),
+            ));
+        $result = $query->executeQuery();
+
+        $propsByPath = [];
+
+        while ($row = $result->fetchAssociative()) {
+            $childPath = $prefix . $row['name'];
+            if (!isset($propsByPath[$childPath])) {
+                $propsByPath[$childPath] = [];
+            }
+            if (isset($row['propertyname'])) {
+                $propsByPath[$childPath][$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
+            }
+        }
+        $this->userCache = array_merge($this->userCache, $propsByPath);
+    }
+
+    private function cacheCalendars(CalendarHome $node, array $requestedProperties): void {
+        $calendars = $node->getChildren();
+
+        $users = [];
+        foreach ($calendars as $calendar) {
+            if ($calendar instanceof Calendar) {
+                $user = str_replace('principals/users/', '', $calendar->getPrincipalURI());
+                if (!isset($users[$user])) {
+                    $users[$user] = ['calendars/' . $user];
+                }
+                $users[$user][] = 'calendars/' . $user . '/' . $calendar->getUri();
+            } elseif ($calendar instanceof Inbox || $calendar instanceof Outbox || $calendar instanceof TrashbinHome || $calendar instanceof ExternalCalendar) {
+                if ($calendar->getOwner()) {
+                    $user = str_replace('principals/users/', '', $calendar->getOwner());
+                    if (!isset($users[$user])) {
+                        $users[$user] = ['calendars/' . $user];
+                    }
+                    $users[$user][] = 'calendars/' . $user . '/' . $calendar->getName();
+                }
+            }
+        }
+
+        // user properties
+        $properties = $this->propertyMapper->findPropertiesByPathsAndUsers($users);
+
+        $propsByPath = [];
+        foreach ($users as $paths) {
+            foreach ($paths as $path) {
+                $propsByPath[$path] = [];
+            }
+        }
+
+        foreach ($properties as $property) {
+            $propsByPath[$property->getPropertypath()][$property->getPropertyname()] = $this->decodeValueFromDatabase($property->getPropertyvalue(), $property->getValuetype());
+        }
+        $this->userCache = array_merge($this->userCache, $propsByPath);
+
+        // published properties
+        $allowedProps = array_intersect(self::PUBLISHED_READ_ONLY_PROPERTIES, $requestedProperties);
+        if (empty($allowedProps)) {
+            return;
+        }
+        $paths = [];
+        foreach ($users as $nestedPaths) {
+            $paths = array_merge($paths, $nestedPaths);
+        }
+        $paths = array_unique($paths);
+
+        $propsByPath = array_fill_keys(array_values($paths), []);
+        $properties = $this->propertyMapper->findPropertiesByPaths($paths, $allowedProps);
+        foreach ($properties as $property) {
+            $propsByPath[$property->getPropertypath()][$property->getPropertyname()] = $this->decodeValueFromDatabase($property->getPropertyvalue(), $property->getValuetype());
+        }
+        $this->publishedCache = array_merge($this->publishedCache, $propsByPath);
+    }
+
+    /**
+     * Returns a list of properties for the given path and current user
+     *
+     * @param array $requestedProperties requested properties or empty array for "all"
+     * @return array<string, mixed>
+     * @note The properties list is a list of propertynames the client
+     * requested, encoded as xmlnamespace#tagName, for example:
+     * http://www.example.org/namespace#author If the array is empty, all
+     * properties should be returned
+     */
+    private function getUserProperties(string $path, array $requestedProperties): array {
+        if (isset($this->userCache[$path])) {
+            return $this->userCache[$path];
+        }
+
+        $props = [];
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('properties')
+            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($this->user->getUID(), IQueryBuilder::PARAM_STR)))
+            ->andWhere($qb->expr()->eq('propertypath', $qb->createNamedParameter($this->formatPath($path), IQueryBuilder::PARAM_STR)));
+
+        if (!empty($requestedProperties)) {
+            // request only a subset
+            $qb->andWhere($qb->expr()->in('propertyname', $qb->createParameter('requestedProperties')));
+            $chunks = array_chunk($requestedProperties, 1000);
+            foreach ($chunks as $chunk) {
+                $qb->setParameter('requestedProperties', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+                $result = $qb->executeQuery();
+                while ($row = $result->fetchAssociative()) {
+                    $props[$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
+                }
+            }
+        } else {
+            $result = $qb->executeQuery();
+            while ($row = $result->fetchAssociative()) {
+                $props[$row['propertyname']] = $this->decodeValueFromDatabase($row['propertyvalue'], $row['valuetype']);
+            }
+        }
+
+        $this->userCache[$path] = $props;
+        return $props;
+    }
+
+    private function isPropertyDefaultValue(string $name, mixed $value): bool {
+        if (!isset(self::PROPERTY_DEFAULT_VALUES[$name])) {
+            return false;
+        }
+
+        return self::PROPERTY_DEFAULT_VALUES[$name] === $value;
+    }
+
+    /**
+     * @param array<string, string> $properties
+     * @throws Exception
+     */
+    private function updateProperties(string $path, array $properties): bool {
+        // TODO: use "insert or update" strategy ?
+        $existing = $this->getUserProperties($path, []);
+        try {
+            $this->connection->beginTransaction();
+            foreach ($properties as $propertyName => $propertyValue) {
+                // common parameters for all queries
+                $dbParameters = [
+                    'userid' => $this->user->getUID(),
+                    'propertyPath' => $this->formatPath($path),
+                    'propertyName' => $propertyName,
+                ];
+
+                // If it was null or set to the default value, we need to delete the property
+                if (is_null($propertyValue) || $this->isPropertyDefaultValue($propertyName, $propertyValue)) {
+                    if (array_key_exists($propertyName, $existing)) {
+                        $deleteQuery = $deleteQuery ?? $this->createDeleteQuery();
+                        $deleteQuery
+                            ->setParameters($dbParameters)
+                            ->executeStatement();
+                    }
+                } else {
+                    [$value, $valueType] = $this->encodeValueForDatabase(
+                        $path,
+                        $propertyName,
+                        $propertyValue,
+                    );
+                    $dbParameters['propertyValue'] = $value;
+                    $dbParameters['valueType'] = $valueType;
+
+                    if (!array_key_exists($propertyName, $existing)) {
+                        $insertQuery = $insertQuery ?? $this->createInsertQuery();
+                        $insertQuery
+                            ->setParameters($dbParameters)
+                            ->executeStatement();
+                    } else {
+                        $updateQuery = $updateQuery ?? $this->createUpdateQuery();
+                        $updateQuery
+                            ->setParameters($dbParameters)
+                            ->executeStatement();
+                    }
+                }
+            }
+
+            $this->connection->commit();
+            unset($this->userCache[$path]);
+        } catch (Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+
+        return true;
+    }
+
+    /**
+     * Long paths are hashed to ensure they fit in the database
+     */
+    private function formatPath(string $path): string {
+        if (strlen($path) > 250) {
+            return sha1($path);
+        }
+
+        return $path;
+    }
+
+    private static function checkIsArrayOfScalar(string $name, array $array): void {
+        foreach ($array as $item) {
+            if (is_array($item)) {
+                self::checkIsArrayOfScalar($name, $item);
+            } elseif ($item !== null && !is_scalar($item)) {
+                throw new DavException(
+                    "Property \"$name\" has an invalid value of array containing " . gettype($item),
+                );
+            }
+        }
+    }
+
+    /**
+     * @throws ParseException If parsing a \Sabre\DAV\Xml\Property\Complex value fails
+     * @throws DavException If the property value is invalid
+     */
+    private function encodeValueForDatabase(string $path, string $name, mixed $value): array {
+        // Try to parse a more specialized property type first
+        if ($value instanceof Complex) {
+            $xml = $this->xmlService->write($name, [$value], $this->server->getBaseUri());
+            $value = $this->xmlService->parse($xml, $this->server->getBaseUri()) ?? $value;
+        }
+
+        if ($name === '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL') {
+            $value = $this->encodeDefaultCalendarUrl($value);
+        }
+
+        try {
+            $this->validateProperty($path, $name, $value);
+        } catch (DavException $e) {
+            throw new DavException(
+                "Property \"$name\" has an invalid value: " . $e->getMessage(),
+                0,
+                $e,
+            );
+        }
+
+        if (is_scalar($value)) {
+            $valueType = self::PROPERTY_TYPE_STRING;
+        } elseif ($value instanceof Complex) {
+            $valueType = self::PROPERTY_TYPE_XML;
+            $value = $value->getXml();
+        } elseif ($value instanceof Href) {
+            $valueType = self::PROPERTY_TYPE_HREF;
+            $value = $value->getHref();
+        } else {
+            if (is_array($value)) {
+                // For array only allow scalar values
+                self::checkIsArrayOfScalar($name, $value);
+            } elseif (!is_object($value)) {
+                throw new DavException(
+                    "Property \"$name\" has an invalid value of type " . gettype($value),
+                );
+            } else {
+                if (!str_starts_with($value::class, 'Sabre\\DAV\\Xml\\Property\\')
+                    && !str_starts_with($value::class, 'Sabre\\CalDAV\\Xml\\Property\\')
+                    && !str_starts_with($value::class, 'Sabre\\CardDAV\\Xml\\Property\\')
+                    && !str_starts_with($value::class, 'OCA\\DAV\\')) {
+                    throw new DavException(
+                        "Property \"$name\" has an invalid value of class " . $value::class,
+                    );
+                }
+            }
+            $valueType = self::PROPERTY_TYPE_OBJECT;
+            // serialize produces null character
+            // these can not be properly stored in some databases and need to be replaced
+            $value = str_replace(chr(0), '\x00', serialize($value));
+        }
+        return [$value, $valueType];
+    }
+
+    /**
+     * @return mixed|Complex|string
+     */
+    private function decodeValueFromDatabase(string $value, int $valueType): mixed {
+        switch ($valueType) {
+            case self::PROPERTY_TYPE_XML:
+                return new Complex($value);
+            case self::PROPERTY_TYPE_HREF:
+                return new Href($value);
+            case self::PROPERTY_TYPE_OBJECT:
+                if (preg_match('/^a:/', $value)) {
+                    // Array, unserialize only scalar values
+                    return unserialize(str_replace('\x00', chr(0), $value), ['allowed_classes' => false]);
+                }
+                if (!preg_match('/^O\:\d+\:\"(OCA\\\\DAV\\\\|Sabre\\\\(Cal|Card)?DAV\\\\Xml\\\\Property\\\\)/', $value)) {
+                    throw new \LogicException('Found an object class serialized in DB that is not allowed');
+                }
+                // some databases can not handel null characters, these are custom encoded during serialization
+                // this custom encoding needs to be first reversed before unserializing
+                return unserialize(str_replace('\x00', chr(0), $value));
+            default:
+                return $value;
+        };
+    }
+
+    private function encodeDefaultCalendarUrl(Href $value): Href {
+        $href = $value->getHref();
+        if ($href === null) {
+            return $value;
+        }
+
+        if (!str_starts_with($href, '/')) {
+            return $value;
+        }
+
+        try {
+            // Build path relative to the dav base URI to be used later to find the node
+            $value = new LocalHref($this->server->calculateUri($href) . '/');
+        } catch (DavException\Forbidden) {
+            // Not existing calendars will be handled later when the value is validated
+        }
+
+        return $value;
+    }
+
+    private function createDeleteQuery(): IQueryBuilder {
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('properties')
+            ->where($deleteQuery->expr()->eq('userid', $deleteQuery->createParameter('userid')))
+            ->andWhere($deleteQuery->expr()->eq('propertypath', $deleteQuery->createParameter('propertyPath')))
+            ->andWhere($deleteQuery->expr()->eq('propertyname', $deleteQuery->createParameter('propertyName')));
+        return $deleteQuery;
+    }
+
+    private function createInsertQuery(): IQueryBuilder {
+        $insertQuery = $this->connection->getQueryBuilder();
+        $insertQuery->insert('properties')
+            ->values([
+                'userid' => $insertQuery->createParameter('userid'),
+                'propertypath' => $insertQuery->createParameter('propertyPath'),
+                'propertyname' => $insertQuery->createParameter('propertyName'),
+                'propertyvalue' => $insertQuery->createParameter('propertyValue'),
+                'valuetype' => $insertQuery->createParameter('valueType'),
+            ]);
+        return $insertQuery;
+    }
+
+    private function createUpdateQuery(): IQueryBuilder {
+        $updateQuery = $this->connection->getQueryBuilder();
+        $updateQuery->update('properties')
+            ->set('propertyvalue', $updateQuery->createParameter('propertyValue'))
+            ->set('valuetype', $updateQuery->createParameter('valueType'))
+            ->where($updateQuery->expr()->eq('userid', $updateQuery->createParameter('userid')))
+            ->andWhere($updateQuery->expr()->eq('propertypath', $updateQuery->createParameter('propertyPath')))
+            ->andWhere($updateQuery->expr()->eq('propertyname', $updateQuery->createParameter('propertyName')));
+        return $updateQuery;
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -261,7 +261,7 @@ 
 	 */
 	#[Override]
 	public function propPatch($path, PropPatch $propPatch): void {
-		$propPatch->handleRemaining(function (array $changedProps) use ($path) {
+		$propPatch->handleRemaining(function(array $changedProps) use ($path) {
 			return $this->updateProperties($path, $changedProps);
 		});
 	}
@@ -357,7 +357,7 @@ 
 	 * Prefetch all user properties in a directory
 	 */
 	private function cacheDirectory(string $path, Directory $node): void {
-		$prefix = ltrim($path . '/', '/');
+		$prefix = ltrim($path.'/', '/');
 		$query = $this->connection->getQueryBuilder();
 		$query->select('name', 'p.propertypath', 'p.propertyname', 'p.propertyvalue', 'p.valuetype')
 			->from('filecache', 'f')
@@ -377,7 +377,7 @@ 
 		$propsByPath = [];
 
 		while ($row = $result->fetchAssociative()) {
-			$childPath = $prefix . $row['name'];
+			$childPath = $prefix.$row['name'];
 			if (!isset($propsByPath[$childPath])) {
 				$propsByPath[$childPath] = [];
 			}
@@ -396,16 +396,16 @@ 
 			if ($calendar instanceof Calendar) {
 				$user = str_replace('principals/users/', '', $calendar->getPrincipalURI());
 				if (!isset($users[$user])) {
-					$users[$user] = ['calendars/' . $user];
+					$users[$user] = ['calendars/'.$user];
 				}
-				$users[$user][] = 'calendars/' . $user . '/' . $calendar->getUri();
+				$users[$user][] = 'calendars/'.$user.'/'.$calendar->getUri();
 			} elseif ($calendar instanceof Inbox || $calendar instanceof Outbox || $calendar instanceof TrashbinHome || $calendar instanceof ExternalCalendar) {
 				if ($calendar->getOwner()) {
 					$user = str_replace('principals/users/', '', $calendar->getOwner());
 					if (!isset($users[$user])) {
-						$users[$user] = ['calendars/' . $user];
+						$users[$user] = ['calendars/'.$user];
 					}
-					$users[$user][] = 'calendars/' . $user . '/' . $calendar->getName();
+					$users[$user][] = 'calendars/'.$user.'/'.$calendar->getName();
 				}
 			}
 		}
@@ -572,7 +572,7 @@ 
 				self::checkIsArrayOfScalar($name, $item);
 			} elseif ($item !== null && !is_scalar($item)) {
 				throw new DavException(
-					"Property \"$name\" has an invalid value of array containing " . gettype($item),
+					"Property \"$name\" has an invalid value of array containing ".gettype($item),
 				);
 			}
 		}
@@ -597,7 +597,7 @@ 
 			$this->validateProperty($path, $name, $value);
 		} catch (DavException $e) {
 			throw new DavException(
-				"Property \"$name\" has an invalid value: " . $e->getMessage(),
+				"Property \"$name\" has an invalid value: ".$e->getMessage(),
 				0,
 				$e,
 			);
@@ -617,7 +617,7 @@ 
 				self::checkIsArrayOfScalar($name, $value);
 			} elseif (!is_object($value)) {
 				throw new DavException(
-					"Property \"$name\" has an invalid value of type " . gettype($value),
+					"Property \"$name\" has an invalid value of type ".gettype($value),
 				);
 			} else {
 				if (!str_starts_with($value::class, 'Sabre\\DAV\\Xml\\Property\\')
@@ -625,7 +625,7 @@ 
 					&& !str_starts_with($value::class, 'Sabre\\CardDAV\\Xml\\Property\\')
 					&& !str_starts_with($value::class, 'OCA\\DAV\\')) {
 					throw new DavException(
-						"Property \"$name\" has an invalid value of class " . $value::class,
+						"Property \"$name\" has an invalid value of class ".$value::class,
 					);
 				}
 			}
@@ -674,7 +674,7 @@ 
 
 		try {
 			// Build path relative to the dav base URI to be used later to find the node
-			$value = new LocalHref($this->server->calculateUri($href) . '/');
+			$value = new LocalHref($this->server->calculateUri($href).'/');
 		} catch (DavException\Forbidden) {
 			// Not existing calendars will be handled later when the value is validated
 		}

apps/dav/lib/DAV/Sharing/SharingMapper.php

Indentation +237 added lines, -237 removed lines

@@ -11,241 +11,241 @@
 use OCP\IDBConnection;
 
 class SharingMapper {
-	public function __construct(
-		private IDBConnection $db,
-	) {
-	}
-
-	protected function getSharesForIdByAccess(int $resourceId, string $resourceType, bool $sharesWithAccess): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['principaluri', 'access'])
-			->from('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR)))
-			->groupBy(['principaluri', 'access']);
-
-		if ($sharesWithAccess) {
-			$query->andWhere($query->expr()->neq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)));
-		} else {
-			$query->andWhere($query->expr()->eq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)));
-		}
-
-		$result = $query->executeQuery();
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-		return $rows;
-	}
-
-	public function getSharesForId(int $resourceId, string $resourceType): array {
-		return $this->getSharesForIdByAccess($resourceId, $resourceType, true);
-	}
-
-	public function getUnsharesForId(int $resourceId, string $resourceType): array {
-		return $this->getSharesForIdByAccess($resourceId, $resourceType, false);
-	}
-
-	public function getSharesForIds(array $resourceIds, string $resourceType): array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['resourceid', 'principaluri', 'access'])
-			->from('dav_shares')
-			->where($query->expr()->in('resourceid', $query->createNamedParameter($resourceIds, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
-			->andWhere($query->expr()->neq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)))
-			->groupBy(['principaluri', 'access', 'resourceid'])
-			->executeQuery();
-
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-		return $rows;
-	}
-
-	public function unshare(int $resourceId, string $resourceType, string $principal): void {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('dav_shares')
-			->values([
-				'principaluri' => $query->createNamedParameter($principal),
-				'type' => $query->createNamedParameter($resourceType),
-				'access' => $query->createNamedParameter(Backend::ACCESS_UNSHARED),
-				'resourceid' => $query->createNamedParameter($resourceId)
-			]);
-		$query->executeStatement();
-	}
-
-	public function share(int $resourceId, string $resourceType, int $access, string $principal): void {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('dav_shares')
-			->values([
-				'principaluri' => $query->createNamedParameter($principal),
-				'type' => $query->createNamedParameter($resourceType),
-				'access' => $query->createNamedParameter($access),
-				'resourceid' => $query->createNamedParameter($resourceId)
-			]);
-		$query->executeStatement();
-	}
-
-	public function shareWithToken(int $resourceId, string $resourceType, int $access, string $principal, string $token): void {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('dav_shares')
-			->values([
-				'principaluri' => $query->createNamedParameter($principal),
-				'type' => $query->createNamedParameter($resourceType),
-				'access' => $query->createNamedParameter($access),
-				'resourceid' => $query->createNamedParameter($resourceId),
-				'token' => $query->createNamedParameter($token),
-			]);
-		$query->executeStatement();
-	}
-
-	public function deleteShare(int $resourceId, string $resourceType, string $principal): void {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares');
-		$query->where(
-			$query->expr()->eq('resourceid', $query->createNamedParameter($resourceId, IQueryBuilder::PARAM_INT)),
-			$query->expr()->eq('type', $query->createNamedParameter($resourceType)),
-			$query->expr()->eq('principaluri', $query->createNamedParameter($principal))
-		);
-		$query->executeStatement();
-
-	}
-
-	public function deleteAllShares(int $resourceId, string $resourceType): void {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
-			->executeStatement();
-	}
-
-	public function deleteAllSharesByUser(string $principaluri, string $resourceType): void {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
-			->executeStatement();
-	}
-
-	public function getSharesByPrincipals(array $principals, string $resourceType): array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['id', 'principaluri', 'type', 'access', 'resourceid'])
-			->from('dav_shares')
-			->where($query->expr()->in('principaluri', $query->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
-			->orderBy('id')
-			->executeQuery();
-
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		return $rows;
-	}
-
-	public function deleteUnsharesByPrincipal(string $principal, string $resourceType): void {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
-			->andWhere($query->expr()->eq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)))
-			->executeStatement();
-	}
-
-	/**
-	 * @return list<array{principaluri: string}>
-	 * @throws \OCP\DB\Exception
-	 */
-	public function getPrincipalUrisByPrefix(string $resourceType, string $prefix): array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->selectDistinct('principaluri')
-			->from('dav_shares')
-			->where($query->expr()->like(
-				'principaluri',
-				$query->createNamedParameter("$prefix/%", IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			))
-			->andWhere($query->expr()->eq(
-				'type',
-				$query->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR)),
-				IQueryBuilder::PARAM_STR,
-			)
-			->executeQuery();
-
-		/** @var list<array{principaluri: string}> $rows */
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		return $rows;
-	}
-
-	/**
-	 * @psalm-return list<array{uri: string, principaluri: string}>
-	 * @throws \OCP\DB\Exception
-	 */
-	public function getSharedCalendarsForRemoteUser(
-		string $remoteUserPrincipalUri,
-		string $token,
-	): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('c.uri', 'c.principaluri')
-			->from('dav_shares', 'ds')
-			->join('ds', 'calendars', 'c', $qb->expr()->eq(
-				'ds.resourceid',
-				'c.id',
-				IQueryBuilder::PARAM_INT,
-			))
-			->where($qb->expr()->eq(
-				'ds.type',
-				$qb->createNamedParameter('calendar', IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			))
-			->andWhere($qb->expr()->eq(
-				'ds.principaluri',
-				$qb->createNamedParameter($remoteUserPrincipalUri, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			))
-			->andWhere($qb->expr()->eq(
-				'ds.token',
-				$qb->createNamedParameter($token, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			));
-		$result = $qb->executeQuery();
-		/** @var list<array{uri: string, principaluri: string}> $rows */
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		return $rows;
-	}
-
-	/**
-	 * @param string[] $principalUris
-	 *
-	 * @throws \OCP\DB\Exception
-	 */
-	public function getSharesByPrincipalsAndResource(
-		array $principalUris,
-		int $resourceId,
-		string $resourceType,
-	): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from('dav_shares')
-			->where($qb->expr()->in(
-				'principaluri',
-				$qb->createNamedParameter($principalUris, IQueryBuilder::PARAM_STR_ARRAY),
-				IQueryBuilder::PARAM_STR_ARRAY,
-			))
-			->andWhere($qb->expr()->eq(
-				'resourceid',
-				$qb->createNamedParameter($resourceId, IQueryBuilder::PARAM_INT),
-				IQueryBuilder::PARAM_INT,
-			))
-			->andWhere($qb->expr()->eq(
-				'type',
-				$qb->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			));
-		$result = $qb->executeQuery();
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		return $rows;
-	}
+    public function __construct(
+        private IDBConnection $db,
+    ) {
+    }
+
+    protected function getSharesForIdByAccess(int $resourceId, string $resourceType, bool $sharesWithAccess): array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['principaluri', 'access'])
+            ->from('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR)))
+            ->groupBy(['principaluri', 'access']);
+
+        if ($sharesWithAccess) {
+            $query->andWhere($query->expr()->neq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)));
+        } else {
+            $query->andWhere($query->expr()->eq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)));
+        }
+
+        $result = $query->executeQuery();
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+        return $rows;
+    }
+
+    public function getSharesForId(int $resourceId, string $resourceType): array {
+        return $this->getSharesForIdByAccess($resourceId, $resourceType, true);
+    }
+
+    public function getUnsharesForId(int $resourceId, string $resourceType): array {
+        return $this->getSharesForIdByAccess($resourceId, $resourceType, false);
+    }
+
+    public function getSharesForIds(array $resourceIds, string $resourceType): array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['resourceid', 'principaluri', 'access'])
+            ->from('dav_shares')
+            ->where($query->expr()->in('resourceid', $query->createNamedParameter($resourceIds, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
+            ->andWhere($query->expr()->neq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)))
+            ->groupBy(['principaluri', 'access', 'resourceid'])
+            ->executeQuery();
+
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+        return $rows;
+    }
+
+    public function unshare(int $resourceId, string $resourceType, string $principal): void {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('dav_shares')
+            ->values([
+                'principaluri' => $query->createNamedParameter($principal),
+                'type' => $query->createNamedParameter($resourceType),
+                'access' => $query->createNamedParameter(Backend::ACCESS_UNSHARED),
+                'resourceid' => $query->createNamedParameter($resourceId)
+            ]);
+        $query->executeStatement();
+    }
+
+    public function share(int $resourceId, string $resourceType, int $access, string $principal): void {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('dav_shares')
+            ->values([
+                'principaluri' => $query->createNamedParameter($principal),
+                'type' => $query->createNamedParameter($resourceType),
+                'access' => $query->createNamedParameter($access),
+                'resourceid' => $query->createNamedParameter($resourceId)
+            ]);
+        $query->executeStatement();
+    }
+
+    public function shareWithToken(int $resourceId, string $resourceType, int $access, string $principal, string $token): void {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('dav_shares')
+            ->values([
+                'principaluri' => $query->createNamedParameter($principal),
+                'type' => $query->createNamedParameter($resourceType),
+                'access' => $query->createNamedParameter($access),
+                'resourceid' => $query->createNamedParameter($resourceId),
+                'token' => $query->createNamedParameter($token),
+            ]);
+        $query->executeStatement();
+    }
+
+    public function deleteShare(int $resourceId, string $resourceType, string $principal): void {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares');
+        $query->where(
+            $query->expr()->eq('resourceid', $query->createNamedParameter($resourceId, IQueryBuilder::PARAM_INT)),
+            $query->expr()->eq('type', $query->createNamedParameter($resourceType)),
+            $query->expr()->eq('principaluri', $query->createNamedParameter($principal))
+        );
+        $query->executeStatement();
+
+    }
+
+    public function deleteAllShares(int $resourceId, string $resourceType): void {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
+            ->executeStatement();
+    }
+
+    public function deleteAllSharesByUser(string $principaluri, string $resourceType): void {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
+            ->executeStatement();
+    }
+
+    public function getSharesByPrincipals(array $principals, string $resourceType): array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['id', 'principaluri', 'type', 'access', 'resourceid'])
+            ->from('dav_shares')
+            ->where($query->expr()->in('principaluri', $query->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
+            ->orderBy('id')
+            ->executeQuery();
+
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        return $rows;
+    }
+
+    public function deleteUnsharesByPrincipal(string $principal, string $resourceType): void {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($resourceType)))
+            ->andWhere($query->expr()->eq('access', $query->createNamedParameter(Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT)))
+            ->executeStatement();
+    }
+
+    /**
+     * @return list<array{principaluri: string}>
+     * @throws \OCP\DB\Exception
+     */
+    public function getPrincipalUrisByPrefix(string $resourceType, string $prefix): array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->selectDistinct('principaluri')
+            ->from('dav_shares')
+            ->where($query->expr()->like(
+                'principaluri',
+                $query->createNamedParameter("$prefix/%", IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ))
+            ->andWhere($query->expr()->eq(
+                'type',
+                $query->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR)),
+                IQueryBuilder::PARAM_STR,
+            )
+            ->executeQuery();
+
+        /** @var list<array{principaluri: string}> $rows */
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        return $rows;
+    }
+
+    /**
+     * @psalm-return list<array{uri: string, principaluri: string}>
+     * @throws \OCP\DB\Exception
+     */
+    public function getSharedCalendarsForRemoteUser(
+        string $remoteUserPrincipalUri,
+        string $token,
+    ): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('c.uri', 'c.principaluri')
+            ->from('dav_shares', 'ds')
+            ->join('ds', 'calendars', 'c', $qb->expr()->eq(
+                'ds.resourceid',
+                'c.id',
+                IQueryBuilder::PARAM_INT,
+            ))
+            ->where($qb->expr()->eq(
+                'ds.type',
+                $qb->createNamedParameter('calendar', IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'ds.principaluri',
+                $qb->createNamedParameter($remoteUserPrincipalUri, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'ds.token',
+                $qb->createNamedParameter($token, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ));
+        $result = $qb->executeQuery();
+        /** @var list<array{uri: string, principaluri: string}> $rows */
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        return $rows;
+    }
+
+    /**
+     * @param string[] $principalUris
+     *
+     * @throws \OCP\DB\Exception
+     */
+    public function getSharesByPrincipalsAndResource(
+        array $principalUris,
+        int $resourceId,
+        string $resourceType,
+    ): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from('dav_shares')
+            ->where($qb->expr()->in(
+                'principaluri',
+                $qb->createNamedParameter($principalUris, IQueryBuilder::PARAM_STR_ARRAY),
+                IQueryBuilder::PARAM_STR_ARRAY,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'resourceid',
+                $qb->createNamedParameter($resourceId, IQueryBuilder::PARAM_INT),
+                IQueryBuilder::PARAM_INT,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'type',
+                $qb->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ));
+        $result = $qb->executeQuery();
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        return $rows;
+    }
 }

apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php

Indentation +74 added lines, -74 removed lines

@@ -22,78 +22,78 @@
  */
 class BuildReminderIndexBackgroundJob extends QueuedJob {
 
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * BuildReminderIndexBackgroundJob constructor.
-	 */
-	public function __construct(
-		private IDBConnection $db,
-		private ReminderService $reminderService,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		ITimeFactory $timeFactory,
-	) {
-		parent::__construct($timeFactory);
-		$this->timeFactory = $timeFactory;
-	}
-
-	public function run($argument) {
-		$offset = (int)$argument['offset'];
-		$stopAt = (int)$argument['stopAt'];
-
-		$this->logger->info('Building calendar reminder index (' . $offset . '/' . $stopAt . ')');
-
-		$offset = $this->buildIndex($offset, $stopAt);
-
-		if ($offset >= $stopAt) {
-			$this->logger->info('Building calendar reminder index done');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('Scheduled a new BuildReminderIndexBackgroundJob with offset ' . $offset);
-		}
-	}
-
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex(int $offset, int $stopAt):int {
-		$startTime = $this->timeFactory->getTime();
-
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('calendarobjects')
-			->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
-			->orderBy('id', 'ASC');
-
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$offset = (int)$row['id'];
-			if (is_resource($row['calendardata'])) {
-				$row['calendardata'] = stream_get_contents($row['calendardata']);
-			}
-			$row['component'] = $row['componenttype'];
-
-			try {
-				$this->reminderService->onCalendarObjectCreate($row);
-			} catch (\Exception $ex) {
-				$this->logger->error($ex->getMessage(), ['exception' => $ex]);
-			}
-
-			if (($this->timeFactory->getTime() - $startTime) > 15) {
-				$result->closeCursor();
-				return $offset;
-			}
-		}
-
-		$result->closeCursor();
-		return $stopAt;
-	}
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * BuildReminderIndexBackgroundJob constructor.
+     */
+    public function __construct(
+        private IDBConnection $db,
+        private ReminderService $reminderService,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        ITimeFactory $timeFactory,
+    ) {
+        parent::__construct($timeFactory);
+        $this->timeFactory = $timeFactory;
+    }
+
+    public function run($argument) {
+        $offset = (int)$argument['offset'];
+        $stopAt = (int)$argument['stopAt'];
+
+        $this->logger->info('Building calendar reminder index (' . $offset . '/' . $stopAt . ')');
+
+        $offset = $this->buildIndex($offset, $stopAt);
+
+        if ($offset >= $stopAt) {
+            $this->logger->info('Building calendar reminder index done');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('Scheduled a new BuildReminderIndexBackgroundJob with offset ' . $offset);
+        }
+    }
+
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex(int $offset, int $stopAt):int {
+        $startTime = $this->timeFactory->getTime();
+
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('calendarobjects')
+            ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
+            ->orderBy('id', 'ASC');
+
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $offset = (int)$row['id'];
+            if (is_resource($row['calendardata'])) {
+                $row['calendardata'] = stream_get_contents($row['calendardata']);
+            }
+            $row['component'] = $row['componenttype'];
+
+            try {
+                $this->reminderService->onCalendarObjectCreate($row);
+            } catch (\Exception $ex) {
+                $this->logger->error($ex->getMessage(), ['exception' => $ex]);
+            }
+
+            if (($this->timeFactory->getTime() - $startTime) > 15) {
+                $result->closeCursor();
+                return $offset;
+            }
+        }
+
+        $result->closeCursor();
+        return $stopAt;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -40,10 +40,10 @@ 
 	}
 
 	public function run($argument) {
-		$offset = (int)$argument['offset'];
-		$stopAt = (int)$argument['stopAt'];
+		$offset = (int) $argument['offset'];
+		$stopAt = (int) $argument['stopAt'];
 
-		$this->logger->info('Building calendar reminder index (' . $offset . '/' . $stopAt . ')');
+		$this->logger->info('Building calendar reminder index ('.$offset.'/'.$stopAt.')');
 
 		$offset = $this->buildIndex($offset, $stopAt);
 
@@ -54,7 +54,7 @@ 
 				'offset' => $offset,
 				'stopAt' => $stopAt
 			]);
-			$this->logger->info('Scheduled a new BuildReminderIndexBackgroundJob with offset ' . $offset);
+			$this->logger->info('Scheduled a new BuildReminderIndexBackgroundJob with offset '.$offset);
 		}
 	}
 
@@ -75,7 +75,7 @@ 
 
 		$result = $query->executeQuery();
 		while ($row = $result->fetchAssociative()) {
-			$offset = (int)$row['id'];
+			$offset = (int) $row['id'];
 			if (is_resource($row['calendardata'])) {
 				$row['calendardata'] = stream_get_contents($row['calendardata']);
 			}

apps/dav/lib/BackgroundJob/CleanupOrphanedChildrenJob.php

Indentation +68 added lines, -68 removed lines

@@ -18,72 +18,72 @@
 use Psr\Log\LoggerInterface;
 
 class CleanupOrphanedChildrenJob extends QueuedJob {
-	public const ARGUMENT_CHILD_TABLE = 'childTable';
-	public const ARGUMENT_PARENT_TABLE = 'parentTable';
-	public const ARGUMENT_PARENT_ID = 'parentId';
-	public const ARGUMENT_LOG_MESSAGE = 'logMessage';
-
-	private const BATCH_SIZE = 1000;
-
-	public function __construct(
-		ITimeFactory $time,
-		private readonly IDBConnection $connection,
-		private readonly LoggerInterface $logger,
-		private readonly IJobList $jobList,
-	) {
-		parent::__construct($time);
-	}
-
-	protected function run($argument): void {
-		$childTable = $argument[self::ARGUMENT_CHILD_TABLE];
-		$parentTable = $argument[self::ARGUMENT_PARENT_TABLE];
-		$parentId = $argument[self::ARGUMENT_PARENT_ID];
-		$logMessage = $argument[self::ARGUMENT_LOG_MESSAGE];
-
-		$orphanCount = $this->cleanUpOrphans($childTable, $parentTable, $parentId);
-		$this->logger->debug(sprintf($logMessage, $orphanCount));
-
-		// Requeue if there might be more orphans
-		if ($orphanCount >= self::BATCH_SIZE) {
-			$this->jobList->add(self::class, $argument);
-		}
-	}
-
-	private function cleanUpOrphans(
-		string $childTable,
-		string $parentTable,
-		string $parentId,
-	): int {
-		// We can't merge both queries into a single one here as DELETEing from a table while
-		// SELECTing it in a sub query is not supported by Oracle DB.
-		// Ref https://docs.oracle.com/cd/E17952_01/mysql-8.0-en/delete.html#idm46006185488144
-
-		$selectQb = $this->connection->getQueryBuilder();
-
-		$selectQb->select('c.id')
-			->from($childTable, 'c')
-			->leftJoin('c', $parentTable, 'p', $selectQb->expr()->eq('c.' . $parentId, 'p.id'))
-			->where($selectQb->expr()->isNull('p.id'))
-			->setMaxResults(self::BATCH_SIZE);
-
-		if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) {
-			$calendarType = $parentTable === 'calendarsubscriptions' ? CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION : CalDavBackend::CALENDAR_TYPE_CALENDAR;
-			$selectQb->andWhere($selectQb->expr()->eq('c.calendartype', $selectQb->createNamedParameter($calendarType, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
-		}
-
-		$result = $selectQb->executeQuery();
-		$rows = $result->fetchAllAssociative();
-		$result->closeCursor();
-		if (empty($rows)) {
-			return 0;
-		}
-
-		$orphanItems = array_map(static fn ($row) => $row['id'], $rows);
-		$deleteQb = $this->connection->getQueryBuilder();
-		$deleteQb->delete($childTable)
-			->where($deleteQb->expr()->in('id', $deleteQb->createNamedParameter($orphanItems, IQueryBuilder::PARAM_INT_ARRAY)));
-		$deleteQb->executeStatement();
-
-		return count($orphanItems);
-	}
+    public const ARGUMENT_CHILD_TABLE = 'childTable';
+    public const ARGUMENT_PARENT_TABLE = 'parentTable';
+    public const ARGUMENT_PARENT_ID = 'parentId';
+    public const ARGUMENT_LOG_MESSAGE = 'logMessage';
+
+    private const BATCH_SIZE = 1000;
+
+    public function __construct(
+        ITimeFactory $time,
+        private readonly IDBConnection $connection,
+        private readonly LoggerInterface $logger,
+        private readonly IJobList $jobList,
+    ) {
+        parent::__construct($time);
+    }
+
+    protected function run($argument): void {
+        $childTable = $argument[self::ARGUMENT_CHILD_TABLE];
+        $parentTable = $argument[self::ARGUMENT_PARENT_TABLE];
+        $parentId = $argument[self::ARGUMENT_PARENT_ID];
+        $logMessage = $argument[self::ARGUMENT_LOG_MESSAGE];
+
+        $orphanCount = $this->cleanUpOrphans($childTable, $parentTable, $parentId);
+        $this->logger->debug(sprintf($logMessage, $orphanCount));
+
+        // Requeue if there might be more orphans
+        if ($orphanCount >= self::BATCH_SIZE) {
+            $this->jobList->add(self::class, $argument);
+        }
+    }
+
+    private function cleanUpOrphans(
+        string $childTable,
+        string $parentTable,
+        string $parentId,
+    ): int {
+        // We can't merge both queries into a single one here as DELETEing from a table while
+        // SELECTing it in a sub query is not supported by Oracle DB.
+        // Ref https://docs.oracle.com/cd/E17952_01/mysql-8.0-en/delete.html#idm46006185488144
+
+        $selectQb = $this->connection->getQueryBuilder();
+
+        $selectQb->select('c.id')
+            ->from($childTable, 'c')
+            ->leftJoin('c', $parentTable, 'p', $selectQb->expr()->eq('c.' . $parentId, 'p.id'))
+            ->where($selectQb->expr()->isNull('p.id'))
+            ->setMaxResults(self::BATCH_SIZE);
+
+        if (\in_array($parentTable, ['calendars', 'calendarsubscriptions'], true)) {
+            $calendarType = $parentTable === 'calendarsubscriptions' ? CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION : CalDavBackend::CALENDAR_TYPE_CALENDAR;
+            $selectQb->andWhere($selectQb->expr()->eq('c.calendartype', $selectQb->createNamedParameter($calendarType, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT));
+        }
+
+        $result = $selectQb->executeQuery();
+        $rows = $result->fetchAllAssociative();
+        $result->closeCursor();
+        if (empty($rows)) {
+            return 0;
+        }
+
+        $orphanItems = array_map(static fn ($row) => $row['id'], $rows);
+        $deleteQb = $this->connection->getQueryBuilder();
+        $deleteQb->delete($childTable)
+            ->where($deleteQb->expr()->in('id', $deleteQb->createNamedParameter($orphanItems, IQueryBuilder::PARAM_INT_ARRAY)));
+        $deleteQb->executeStatement();
+
+        return count($orphanItems);
+    }
 }

apps/dav/lib/Controller/InvitationResponseController.php

Indentation +163 added lines, -163 removed lines

@@ -23,160 +23,160 @@ 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class InvitationResponseController extends Controller {
 
-	/**
-	 * InvitationResponseController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IDBConnection $db
-	 * @param ITimeFactory $timeFactory
-	 * @param InvitationResponseServer $responseServer
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private IDBConnection $db,
-		private ITimeFactory $timeFactory,
-		private InvitationResponseServer $responseServer,
-	) {
-		parent::__construct($appName, $request);
-		// Don't run `$server->exec()`, because we just need access to the
-		// fully initialized schedule plugin, but we don't want Sabre/DAV
-		// to actually handle and reply to the request
-	}
-
-	/**
-	 * @param string $token
-	 * @return TemplateResponse
-	 */
-	#[PublicPage]
-	#[NoCSRFRequired]
-	public function accept(string $token):TemplateResponse {
-		$row = $this->getTokenInformation($token);
-		if (!$row) {
-			return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
-		}
-
-		$iTipMessage = $this->buildITipResponse($row, 'ACCEPTED');
-		$this->responseServer->handleITipMessage($iTipMessage);
-		if ($iTipMessage->getScheduleStatus() === '1.2') {
-			return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
-		}
-
-		return new TemplateResponse($this->appName, 'schedule-response-error', [
-			'organizer' => $row['organizer'],
-		], 'guest');
-	}
-
-	/**
-	 * @param string $token
-	 * @return TemplateResponse
-	 */
-	#[PublicPage]
-	#[NoCSRFRequired]
-	public function decline(string $token):TemplateResponse {
-		$row = $this->getTokenInformation($token);
-		if (!$row) {
-			return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
-		}
-
-		$iTipMessage = $this->buildITipResponse($row, 'DECLINED');
-		$this->responseServer->handleITipMessage($iTipMessage);
-
-		if ($iTipMessage->getScheduleStatus() === '1.2') {
-			return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
-		}
-
-		return new TemplateResponse($this->appName, 'schedule-response-error', [
-			'organizer' => $row['organizer'],
-		], 'guest');
-	}
-
-	/**
-	 * @param string $token
-	 * @return TemplateResponse
-	 */
-	#[PublicPage]
-	#[NoCSRFRequired]
-	public function options(string $token):TemplateResponse {
-		return new TemplateResponse($this->appName, 'schedule-response-options', [
-			'token' => $token
-		], 'guest');
-	}
-
-	/**
-	 * @param string $token
-	 *
-	 * @return TemplateResponse
-	 */
-	#[PublicPage]
-	#[NoCSRFRequired]
-	public function processMoreOptionsResult(string $token):TemplateResponse {
-		$partstat = $this->request->getParam('partStat');
-
-		$row = $this->getTokenInformation($token);
-		if (!$row || !\in_array($partstat, ['ACCEPTED', 'DECLINED', 'TENTATIVE'])) {
-			return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
-		}
-
-		$iTipMessage = $this->buildITipResponse($row, $partstat);
-		$this->responseServer->handleITipMessage($iTipMessage);
-		if ($iTipMessage->getScheduleStatus() === '1.2') {
-			return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
-		}
-
-		return new TemplateResponse($this->appName, 'schedule-response-error', [
-			'organizer' => $row['organizer'],
-		], 'guest');
-	}
-
-	/**
-	 * @param string $token
-	 * @return array|null
-	 */
-	private function getTokenInformation(string $token) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('calendar_invitations')
-			->where($query->expr()->eq('token', $query->createNamedParameter($token)));
-		$stmt = $query->executeQuery();
-		$row = $stmt->fetchAssociative();
-		$stmt->closeCursor();
-
-		if (!$row) {
-			return null;
-		}
-
-		$currentTime = $this->timeFactory->getTime();
-		if (((int)$row['expiration']) < $currentTime) {
-			return null;
-		}
-
-		return $row;
-	}
-
-	/**
-	 * @param array $row
-	 * @param string $partStat participation status of attendee - SEE RFC 5545
-	 * @param int|null $guests
-	 * @param string|null $comment
-	 * @return Message
-	 */
-	private function buildITipResponse(array $row, string $partStat):Message {
-		$iTipMessage = new Message();
-		$iTipMessage->uid = $row['uid'];
-		$iTipMessage->component = 'VEVENT';
-		$iTipMessage->method = 'REPLY';
-		$iTipMessage->sequence = $row['sequence'];
-		$iTipMessage->sender = $row['attendee'];
-
-		if ($this->responseServer->isExternalAttendee($row['attendee'])) {
-			$iTipMessage->recipient = $row['organizer'];
-		} else {
-			$iTipMessage->recipient = $row['attendee'];
-		}
-
-		$message = <<<EOF
+    /**
+     * InvitationResponseController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IDBConnection $db
+     * @param ITimeFactory $timeFactory
+     * @param InvitationResponseServer $responseServer
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private IDBConnection $db,
+        private ITimeFactory $timeFactory,
+        private InvitationResponseServer $responseServer,
+    ) {
+        parent::__construct($appName, $request);
+        // Don't run `$server->exec()`, because we just need access to the
+        // fully initialized schedule plugin, but we don't want Sabre/DAV
+        // to actually handle and reply to the request
+    }
+
+    /**
+     * @param string $token
+     * @return TemplateResponse
+     */
+    #[PublicPage]
+    #[NoCSRFRequired]
+    public function accept(string $token):TemplateResponse {
+        $row = $this->getTokenInformation($token);
+        if (!$row) {
+            return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
+        }
+
+        $iTipMessage = $this->buildITipResponse($row, 'ACCEPTED');
+        $this->responseServer->handleITipMessage($iTipMessage);
+        if ($iTipMessage->getScheduleStatus() === '1.2') {
+            return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
+        }
+
+        return new TemplateResponse($this->appName, 'schedule-response-error', [
+            'organizer' => $row['organizer'],
+        ], 'guest');
+    }
+
+    /**
+     * @param string $token
+     * @return TemplateResponse
+     */
+    #[PublicPage]
+    #[NoCSRFRequired]
+    public function decline(string $token):TemplateResponse {
+        $row = $this->getTokenInformation($token);
+        if (!$row) {
+            return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
+        }
+
+        $iTipMessage = $this->buildITipResponse($row, 'DECLINED');
+        $this->responseServer->handleITipMessage($iTipMessage);
+
+        if ($iTipMessage->getScheduleStatus() === '1.2') {
+            return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
+        }
+
+        return new TemplateResponse($this->appName, 'schedule-response-error', [
+            'organizer' => $row['organizer'],
+        ], 'guest');
+    }
+
+    /**
+     * @param string $token
+     * @return TemplateResponse
+     */
+    #[PublicPage]
+    #[NoCSRFRequired]
+    public function options(string $token):TemplateResponse {
+        return new TemplateResponse($this->appName, 'schedule-response-options', [
+            'token' => $token
+        ], 'guest');
+    }
+
+    /**
+     * @param string $token
+     *
+     * @return TemplateResponse
+     */
+    #[PublicPage]
+    #[NoCSRFRequired]
+    public function processMoreOptionsResult(string $token):TemplateResponse {
+        $partstat = $this->request->getParam('partStat');
+
+        $row = $this->getTokenInformation($token);
+        if (!$row || !\in_array($partstat, ['ACCEPTED', 'DECLINED', 'TENTATIVE'])) {
+            return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
+        }
+
+        $iTipMessage = $this->buildITipResponse($row, $partstat);
+        $this->responseServer->handleITipMessage($iTipMessage);
+        if ($iTipMessage->getScheduleStatus() === '1.2') {
+            return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
+        }
+
+        return new TemplateResponse($this->appName, 'schedule-response-error', [
+            'organizer' => $row['organizer'],
+        ], 'guest');
+    }
+
+    /**
+     * @param string $token
+     * @return array|null
+     */
+    private function getTokenInformation(string $token) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('calendar_invitations')
+            ->where($query->expr()->eq('token', $query->createNamedParameter($token)));
+        $stmt = $query->executeQuery();
+        $row = $stmt->fetchAssociative();
+        $stmt->closeCursor();
+
+        if (!$row) {
+            return null;
+        }
+
+        $currentTime = $this->timeFactory->getTime();
+        if (((int)$row['expiration']) < $currentTime) {
+            return null;
+        }
+
+        return $row;
+    }
+
+    /**
+     * @param array $row
+     * @param string $partStat participation status of attendee - SEE RFC 5545
+     * @param int|null $guests
+     * @param string|null $comment
+     * @return Message
+     */
+    private function buildITipResponse(array $row, string $partStat):Message {
+        $iTipMessage = new Message();
+        $iTipMessage->uid = $row['uid'];
+        $iTipMessage->component = 'VEVENT';
+        $iTipMessage->method = 'REPLY';
+        $iTipMessage->sequence = $row['sequence'];
+        $iTipMessage->sender = $row['attendee'];
+
+        if ($this->responseServer->isExternalAttendee($row['attendee'])) {
+            $iTipMessage->recipient = $row['organizer'];
+        } else {
+            $iTipMessage->recipient = $row['attendee'];
+        }
+
+        $message = <<<EOF
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud/Nextcloud CalDAV Server//EN
 METHOD:REPLY
@@ -191,14 +191,14 @@ 
 END:VCALENDAR
 EOF;
 
-		$vObject = Reader::read(vsprintf($message, [
-			$partStat, $row['attendee'], $row['organizer'],
-			$row['uid'], $row['sequence'] ?? 0, $row['recurrenceid'] ?? ''
-		]));
-		$vEvent = $vObject->{'VEVENT'};
-		$vEvent->DTSTAMP = date('Ymd\\THis\\Z', $this->timeFactory->getTime());
-		$iTipMessage->message = $vObject;
+        $vObject = Reader::read(vsprintf($message, [
+            $partStat, $row['attendee'], $row['organizer'],
+            $row['uid'], $row['sequence'] ?? 0, $row['recurrenceid'] ?? ''
+        ]));
+        $vEvent = $vObject->{'VEVENT'};
+        $vEvent->DTSTAMP = date('Ymd\\THis\\Z', $this->timeFactory->getTime());
+        $iTipMessage->message = $vObject;
 
-		return $iTipMessage;
-	}
+        return $iTipMessage;
+    }
 }

apps/dav/lib/CardDAV/CardDavBackend.php

Indentation +1490 added lines, -1490 removed lines

@@ -34,926 +34,926 @@ 
 use Sabre\VObject\Reader;
 
 class CardDavBackend implements BackendInterface, SyncSupport {
-	use TTransactional;
-	public const PERSONAL_ADDRESSBOOK_URI = 'contacts';
-	public const PERSONAL_ADDRESSBOOK_NAME = 'Contacts';
-
-	private string $dbCardsTable = 'cards';
-	private string $dbCardsPropertiesTable = 'cards_properties';
-
-	/** @var array properties to index */
-	public static array $indexProperties = [
-		'BDAY', 'UID', 'N', 'FN', 'TITLE', 'ROLE', 'NOTE', 'NICKNAME',
-		'ORG', 'CATEGORIES', 'EMAIL', 'TEL', 'IMPP', 'ADR', 'URL', 'GEO',
-		'CLOUD', 'X-SOCIALPROFILE'];
-
-	/**
-	 * @var string[] Map of uid => display name
-	 */
-	protected array $userDisplayNames;
-	private array $etagCache = [];
-
-	public function __construct(
-		private IDBConnection $db,
-		private Principal $principalBackend,
-		private IUserManager $userManager,
-		private IEventDispatcher $dispatcher,
-		private Sharing\Backend $sharingBackend,
-		private IConfig $config,
-	) {
-	}
-
-	/**
-	 * Return the number of address books for a principal
-	 *
-	 * @param $principalUri
-	 * @return int
-	 */
-	public function getAddressBooksForUserCount($principalUri) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->count('*'))
-			->from('addressbooks')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-
-		$result = $query->executeQuery();
-		$column = (int)$result->fetchOne();
-		$result->closeCursor();
-		return $column;
-	}
-
-	/**
-	 * Returns the list of address books for a specific user.
-	 *
-	 * Every addressbook should have the following properties:
-	 *   id - an arbitrary unique id
-	 *   uri - the 'basename' part of the url
-	 *   principaluri - Same as the passed parameter
-	 *
-	 * Any additional clark-notation property may be passed besides this. Some
-	 * common ones are :
-	 *   {DAV:}displayname
-	 *   {urn:ietf:params:xml:ns:carddav}addressbook-description
-	 *   {http://calendarserver.org/ns/}getctag
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	public function getAddressBooksForUser($principalUri) {
-		return $this->atomic(function () use ($principalUri) {
-			$principalUriOriginal = $principalUri;
-			$principalUri = $this->convertPrincipal($principalUri, true);
-			$select = $this->db->getQueryBuilder();
-			$select->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-				->from('addressbooks')
-				->where($select->expr()->eq('principaluri', $select->createNamedParameter($principalUri)));
-
-			$addressBooks = [];
-
-			$result = $select->executeQuery();
-			while ($row = $result->fetchAssociative()) {
-				$addressBooks[$row['id']] = [
-					'id' => $row['id'],
-					'uri' => $row['uri'],
-					'principaluri' => $this->convertPrincipal($row['principaluri'], false),
-					'{DAV:}displayname' => $row['displayname'],
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-				];
-
-				$this->addOwnerPrincipal($addressBooks[$row['id']]);
-			}
-			$result->closeCursor();
-
-			// query for shared addressbooks
-			$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
-
-			$principals[] = $principalUri;
-
-			$select = $this->db->getQueryBuilder();
-			$subSelect = $this->db->getQueryBuilder();
-
-			$subSelect->select('id')
-				->from('dav_shares', 'd')
-				->where($subSelect->expr()->eq('d.access', $select->createNamedParameter(\OCA\DAV\CardDAV\Sharing\Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT))
-				->andWhere($subSelect->expr()->in('d.principaluri', $select->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY));
-
-
-			$select->select(['a.id', 'a.uri', 'a.displayname', 'a.principaluri', 'a.description', 'a.synctoken', 's.access'])
-				->from('dav_shares', 's')
-				->join('s', 'addressbooks', 'a', $select->expr()->eq('s.resourceid', 'a.id'))
-				->where($select->expr()->in('s.principaluri', $select->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY)))
-				->andWhere($select->expr()->eq('s.type', $select->createNamedParameter('addressbook', IQueryBuilder::PARAM_STR)))
-				->andWhere($select->expr()->notIn('s.id', $select->createFunction($subSelect->getSQL()), IQueryBuilder::PARAM_INT_ARRAY));
-			$result = $select->executeQuery();
-
-			$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-			while ($row = $result->fetchAssociative()) {
-				if ($row['principaluri'] === $principalUri) {
-					continue;
-				}
-
-				$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
-				if (isset($addressBooks[$row['id']])) {
-					if ($readOnly) {
-						// New share can not have more permissions then the old one.
-						continue;
-					}
-					if (isset($addressBooks[$row['id']][$readOnlyPropertyName])
-						&& $addressBooks[$row['id']][$readOnlyPropertyName] === 0) {
-						// Old share is already read-write, no more permissions can be gained
-						continue;
-					}
-				}
-
-				[, $name] = \Sabre\Uri\split($row['principaluri']);
-				$uri = $row['uri'] . '_shared_by_' . $name;
-				$displayName = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? $name ?? '') . ')';
-
-				$addressBooks[$row['id']] = [
-					'id' => $row['id'],
-					'uri' => $uri,
-					'principaluri' => $principalUriOriginal,
-					'{DAV:}displayname' => $displayName,
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-					'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
-					$readOnlyPropertyName => $readOnly,
-				];
-
-				$this->addOwnerPrincipal($addressBooks[$row['id']]);
-			}
-			$result->closeCursor();
-
-			return array_values($addressBooks);
-		}, $this->db);
-	}
-
-	public function getUsersOwnAddressBooks($principalUri) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-			->from('addressbooks')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-
-		$addressBooks = [];
-
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$addressBooks[$row['id']] = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], false),
-				'{DAV:}displayname' => $row['displayname'],
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-				'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-			];
-
-			$this->addOwnerPrincipal($addressBooks[$row['id']]);
-		}
-		$result->closeCursor();
-
-		return array_values($addressBooks);
-	}
-
-	/**
-	 * @param int $addressBookId
-	 */
-	public function getAddressBookById(int $addressBookId): ?array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-			->from('addressbooks')
-			->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
-			->executeQuery();
-		$row = $result->fetchAssociative();
-		$result->closeCursor();
-		if (!$row) {
-			return null;
-		}
-
-		$addressBook = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $row['principaluri'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-		];
-
-		$this->addOwnerPrincipal($addressBook);
-
-		return $addressBook;
-	}
-
-	public function getAddressBooksByUri(string $principal, string $addressBookUri): ?array {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
-			->from('addressbooks')
-			->where($query->expr()->eq('uri', $query->createNamedParameter($addressBookUri)))
-			->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
-			->setMaxResults(1)
-			->executeQuery();
-
-		$row = $result->fetchAssociative();
-		$result->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$addressBook = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $row['principaluri'],
-			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-
-		];
-
-		// system address books are always read only
-		if ($principal === 'principals/system/system') {
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'] = $row['principaluri'];
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
-		}
-
-		$this->addOwnerPrincipal($addressBook);
-
-		return $addressBook;
-	}
-
-	/**
-	 * Updates properties for an address book.
-	 *
-	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-	 * To do the actual updates, you must tell this object which properties
-	 * you're going to process with the handle() method.
-	 *
-	 * Calling the handle method is like telling the PropPatch object "I
-	 * promise I can handle updating this property".
-	 *
-	 * Read the PropPatch documentation for more info and examples.
-	 *
-	 * @param string $addressBookId
-	 * @param \Sabre\DAV\PropPatch $propPatch
-	 * @return void
-	 */
-	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
-		$supportedProperties = [
-			'{DAV:}displayname',
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description',
-		];
-
-		$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
-			$updates = [];
-			foreach ($mutations as $property => $newValue) {
-				switch ($property) {
-					case '{DAV:}displayname':
-						$updates['displayname'] = $newValue;
-						break;
-					case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
-						$updates['description'] = $newValue;
-						break;
-				}
-			}
-			[$addressBookRow, $shares] = $this->atomic(function () use ($addressBookId, $updates) {
-				$query = $this->db->getQueryBuilder();
-				$query->update('addressbooks');
-
-				foreach ($updates as $key => $value) {
-					$query->set($key, $query->createNamedParameter($value));
-				}
-				$query->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
-					->executeStatement();
-
-				$this->addChange($addressBookId, '', 2);
-
-				$addressBookRow = $this->getAddressBookById((int)$addressBookId);
-				$shares = $this->getShares((int)$addressBookId);
-				return [$addressBookRow, $shares];
-			}, $this->db);
-
-			$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations));
-
-			return true;
-		});
-	}
-
-	/**
-	 * Creates a new address book
-	 *
-	 * @param string $principalUri
-	 * @param string $url Just the 'basename' of the url.
-	 * @param array $properties
-	 * @return int
-	 * @throws BadRequest
-	 * @throws Exception
-	 */
-	public function createAddressBook($principalUri, $url, array $properties) {
-		if (strlen($url) > 255) {
-			throw new BadRequest('URI too long. Address book not created');
-		}
-
-		$values = [
-			'displayname' => null,
-			'description' => null,
-			'principaluri' => $principalUri,
-			'uri' => $url,
-			'synctoken' => 1
-		];
-
-		foreach ($properties as $property => $newValue) {
-			switch ($property) {
-				case '{DAV:}displayname':
-					$values['displayname'] = $newValue;
-					break;
-				case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
-					$values['description'] = $newValue;
-					break;
-				default:
-					throw new BadRequest('Unknown property: ' . $property);
-			}
-		}
-
-		// Fallback to make sure the displayname is set. Some clients may refuse
-		// to work with addressbooks not having a displayname.
-		if (is_null($values['displayname'])) {
-			$values['displayname'] = $url;
-		}
-
-		[$addressBookId, $addressBookRow] = $this->atomic(function () use ($values) {
-			$query = $this->db->getQueryBuilder();
-			$query->insert('addressbooks')
-				->values([
-					'uri' => $query->createParameter('uri'),
-					'displayname' => $query->createParameter('displayname'),
-					'description' => $query->createParameter('description'),
-					'principaluri' => $query->createParameter('principaluri'),
-					'synctoken' => $query->createParameter('synctoken'),
-				])
-				->setParameters($values)
-				->executeStatement();
-
-			$addressBookId = $query->getLastInsertId();
-			return [
-				$addressBookId,
-				$this->getAddressBookById($addressBookId),
-			];
-		}, $this->db);
-
-		$this->dispatcher->dispatchTyped(new AddressBookCreatedEvent($addressBookId, $addressBookRow));
-
-		return $addressBookId;
-	}
-
-	/**
-	 * Deletes an entire addressbook and all its contents
-	 *
-	 * @param mixed $addressBookId
-	 * @return void
-	 */
-	public function deleteAddressBook($addressBookId) {
-		$this->atomic(function () use ($addressBookId): void {
-			$addressBookId = (int)$addressBookId;
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete($this->dbCardsTable)
-				->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
-				->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
-				->executeStatement();
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete('addressbookchanges')
-				->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
-				->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
-				->executeStatement();
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete('addressbooks')
-				->where($query->expr()->eq('id', $query->createParameter('id')))
-				->setParameter('id', $addressBookId, IQueryBuilder::PARAM_INT)
-				->executeStatement();
-
-			$this->sharingBackend->deleteAllShares($addressBookId);
-
-			$query = $this->db->getQueryBuilder();
-			$query->delete($this->dbCardsPropertiesTable)
-				->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
-				->executeStatement();
-
-			if ($addressBookData) {
-				$this->dispatcher->dispatchTyped(new AddressBookDeletedEvent($addressBookId, $addressBookData, $shares));
-			}
-		}, $this->db);
-	}
-
-	/**
-	 * Returns all cards for a specific addressbook id.
-	 *
-	 * This method should return the following properties for each card:
-	 *   * carddata - raw vcard data
-	 *   * uri - Some unique url
-	 *   * lastmodified - A unix timestamp
-	 *
-	 * It's recommended to also return the following properties:
-	 *   * etag - A unique etag. This must change every time the card changes.
-	 *   * size - The size of the card in bytes.
-	 *
-	 * If these last two properties are provided, less time will be spent
-	 * calculating them. If they are specified, you can also omit carddata.
-	 * This may speed up certain requests, especially with large cards.
-	 *
-	 * @param mixed $addressbookId
-	 * @return array
-	 */
-	public function getCards($addressbookId) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'addressbookid', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
-			->from($this->dbCardsTable)
-			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressbookId)));
-
-		$cards = [];
-
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$row['etag'] = '"' . $row['etag'] . '"';
-
-			$modified = false;
-			$row['carddata'] = $this->readBlob($row['carddata'], $modified);
-			if ($modified) {
-				$row['size'] = strlen($row['carddata']);
-			}
-
-			$cards[] = $row;
-		}
-		$result->closeCursor();
-
-		return $cards;
-	}
-
-	/**
-	 * Returns a specific card.
-	 *
-	 * The same set of properties must be returned as with getCards. The only
-	 * exception is that 'carddata' is absolutely required.
-	 *
-	 * If the card does not exist, you must return false.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @return array
-	 */
-	public function getCard($addressBookId, $cardUri) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'addressbookid', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
-			->from($this->dbCardsTable)
-			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
-			->setMaxResults(1);
-
-		$result = $query->executeQuery();
-		$row = $result->fetchAssociative();
-		if (!$row) {
-			return false;
-		}
-		$row['etag'] = '"' . $row['etag'] . '"';
-
-		$modified = false;
-		$row['carddata'] = $this->readBlob($row['carddata'], $modified);
-		if ($modified) {
-			$row['size'] = strlen($row['carddata']);
-		}
-
-		return $row;
-	}
-
-	/**
-	 * Returns a list of cards.
-	 *
-	 * This method should work identical to getCard, but instead return all the
-	 * cards in the list as an array.
-	 *
-	 * If the backend supports this, it may allow for some speed-ups.
-	 *
-	 * @param mixed $addressBookId
-	 * @param array $uris
-	 * @return array
-	 */
-	public function getMultipleCards($addressBookId, array $uris) {
-		if (empty($uris)) {
-			return [];
-		}
-
-		$chunks = array_chunk($uris, 100);
-		$cards = [];
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'addressbookid', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
-			->from($this->dbCardsTable)
-			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-			->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
-
-		foreach ($chunks as $uris) {
-			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->executeQuery();
-
-			while ($row = $result->fetchAssociative()) {
-				$row['etag'] = '"' . $row['etag'] . '"';
-
-				$modified = false;
-				$row['carddata'] = $this->readBlob($row['carddata'], $modified);
-				if ($modified) {
-					$row['size'] = strlen($row['carddata']);
-				}
-
-				$cards[] = $row;
-			}
-			$result->closeCursor();
-		}
-		return $cards;
-	}
-
-	/**
-	 * Creates a new card.
-	 *
-	 * The addressbook id will be passed as the first argument. This is the
-	 * same id as it is returned from the getAddressBooksForUser method.
-	 *
-	 * The cardUri is a base uri, and doesn't include the full path. The
-	 * cardData argument is the vcard body, and is passed as a string.
-	 *
-	 * It is possible to return an ETag from this method. This ETag is for the
-	 * newly created resource, and must be enclosed with double quotes (that
-	 * is, the string itself must contain the double quotes).
-	 *
-	 * You should only return the ETag if you store the carddata as-is. If a
-	 * subsequent GET request on the same card does not have the same body,
-	 * byte-by-byte and you did return an ETag here, clients tend to get
-	 * confused.
-	 *
-	 * If you don't return an ETag, you can just return null.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 * @param bool $checkAlreadyExists
-	 * @return string
-	 */
-	public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
-		$etag = md5($cardData);
-		$uid = $this->getUID($cardData);
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
-			if ($checkAlreadyExists) {
-				$q = $this->db->getQueryBuilder();
-				$q->select('uid')
-					->from($this->dbCardsTable)
-					->where($q->expr()->eq('addressbookid', $q->createNamedParameter($addressBookId)))
-					->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
-					->setMaxResults(1);
-				$result = $q->executeQuery();
-				$count = (bool)$result->fetchOne();
-				$result->closeCursor();
-				if ($count) {
-					throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
-				}
-			}
-
-			$query = $this->db->getQueryBuilder();
-			$query->insert('cards')
-				->values([
-					'carddata' => $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB),
-					'uri' => $query->createNamedParameter($cardUri),
-					'lastmodified' => $query->createNamedParameter(time()),
-					'addressbookid' => $query->createNamedParameter($addressBookId),
-					'size' => $query->createNamedParameter(strlen($cardData)),
-					'etag' => $query->createNamedParameter($etag),
-					'uid' => $query->createNamedParameter($uid),
-				])
-				->executeStatement();
-
-			$etagCacheKey = "$addressBookId#$cardUri";
-			$this->etagCache[$etagCacheKey] = $etag;
-
-			$this->addChange($addressBookId, $cardUri, 1);
-			$this->updateProperties($addressBookId, $cardUri, $cardData);
-
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-			$objectRow = $this->getCard($addressBookId, $cardUri);
-			$this->dispatcher->dispatchTyped(new CardCreatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-
-			return '"' . $etag . '"';
-		}, $this->db);
-	}
-
-	/**
-	 * Updates a card.
-	 *
-	 * The addressbook id will be passed as the first argument. This is the
-	 * same id as it is returned from the getAddressBooksForUser method.
-	 *
-	 * The cardUri is a base uri, and doesn't include the full path. The
-	 * cardData argument is the vcard body, and is passed as a string.
-	 *
-	 * It is possible to return an ETag from this method. This ETag should
-	 * match that of the updated resource, and must be enclosed with double
-	 * quotes (that is: the string itself must contain the actual quotes).
-	 *
-	 * You should only return the ETag if you store the carddata as-is. If a
-	 * subsequent GET request on the same card does not have the same body,
-	 * byte-by-byte and you did return an ETag here, clients tend to get
-	 * confused.
-	 *
-	 * If you don't return an ETag, you can just return null.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 * @return string
-	 */
-	public function updateCard($addressBookId, $cardUri, $cardData) {
-		$uid = $this->getUID($cardData);
-		$etag = md5($cardData);
-
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
-			$query = $this->db->getQueryBuilder();
-
-			// check for recently stored etag and stop if it is the same
-			$etagCacheKey = "$addressBookId#$cardUri";
-			if (isset($this->etagCache[$etagCacheKey]) && $this->etagCache[$etagCacheKey] === $etag) {
-				return '"' . $etag . '"';
-			}
-
-			$query->update($this->dbCardsTable)
-				->set('carddata', $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB))
-				->set('lastmodified', $query->createNamedParameter(time()))
-				->set('size', $query->createNamedParameter(strlen($cardData)))
-				->set('etag', $query->createNamedParameter($etag))
-				->set('uid', $query->createNamedParameter($uid))
-				->where($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
-				->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-				->executeStatement();
-
-			$this->etagCache[$etagCacheKey] = $etag;
-
-			$this->addChange($addressBookId, $cardUri, 2);
-			$this->updateProperties($addressBookId, $cardUri, $cardData);
-
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-			$objectRow = $this->getCard($addressBookId, $cardUri);
-			$this->dispatcher->dispatchTyped(new CardUpdatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-			return '"' . $etag . '"';
-		}, $this->db);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function moveCard(int $sourceAddressBookId, string $sourceObjectUri, int $targetAddressBookId, string $tragetObjectUri): bool {
-		return $this->atomic(function () use ($sourceAddressBookId, $sourceObjectUri, $targetAddressBookId, $tragetObjectUri) {
-			$card = $this->getCard($sourceAddressBookId, $sourceObjectUri);
-			if (empty($card)) {
-				return false;
-			}
-			$sourceObjectId = (int)$card['id'];
-
-			$query = $this->db->getQueryBuilder();
-			$query->update('cards')
-				->set('addressbookid', $query->createNamedParameter($targetAddressBookId, IQueryBuilder::PARAM_INT))
-				->set('uri', $query->createNamedParameter($tragetObjectUri, IQueryBuilder::PARAM_STR))
-				->where($query->expr()->eq('uri', $query->createNamedParameter($sourceObjectUri, IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR))
-				->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($sourceAddressBookId, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT))
-				->executeStatement();
-
-			$this->purgeProperties($sourceAddressBookId, $sourceObjectId);
-			$this->updateProperties($targetAddressBookId, $tragetObjectUri, $card['carddata']);
-
-			$this->addChange($sourceAddressBookId, $sourceObjectUri, 3);
-			$this->addChange($targetAddressBookId, $tragetObjectUri, 1);
-
-			$card = $this->getCard($targetAddressBookId, $tragetObjectUri);
-			// Card wasn't found - possibly because it was deleted in the meantime by a different client
-			if (empty($card)) {
-				return false;
-			}
-			$targetAddressBookRow = $this->getAddressBookById($targetAddressBookId);
-			// the address book this card is being moved to does not exist any longer
-			if (empty($targetAddressBookRow)) {
-				return false;
-			}
-
-			$sourceShares = $this->getShares($sourceAddressBookId);
-			$targetShares = $this->getShares($targetAddressBookId);
-			$sourceAddressBookRow = $this->getAddressBookById($sourceAddressBookId);
-			$this->dispatcher->dispatchTyped(new CardMovedEvent($sourceAddressBookId, $sourceAddressBookRow, $targetAddressBookId, $targetAddressBookRow, $sourceShares, $targetShares, $card));
-			return true;
-		}, $this->db);
-	}
-
-	/**
-	 * Deletes a card
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $cardUri
-	 * @return bool
-	 */
-	public function deleteCard($addressBookId, $cardUri) {
-		return $this->atomic(function () use ($addressBookId, $cardUri) {
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$shares = $this->getShares($addressBookId);
-			$objectRow = $this->getCard($addressBookId, $cardUri);
-
-			try {
-				$cardId = $this->getCardId($addressBookId, $cardUri);
-			} catch (\InvalidArgumentException $e) {
-				$cardId = null;
-			}
-			$query = $this->db->getQueryBuilder();
-			$ret = $query->delete($this->dbCardsTable)
-				->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-				->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
-				->executeStatement();
-
-			$this->addChange($addressBookId, $cardUri, 3);
-
-			if ($ret === 1) {
-				if ($cardId !== null) {
-					$this->dispatcher->dispatchTyped(new CardDeletedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-					$this->purgeProperties($addressBookId, $cardId);
-				}
-				return true;
-			}
-
-			return false;
-		}, $this->db);
-	}
-
-	/**
-	 * The getChanges method returns all the changes that have happened, since
-	 * the specified syncToken in the specified address book.
-	 *
-	 * This function should return an array, such as the following:
-	 *
-	 * [
-	 *   'syncToken' => 'The current synctoken',
-	 *   'added'   => [
-	 *      'new.txt',
-	 *   ],
-	 *   'modified'   => [
-	 *      'modified.txt',
-	 *   ],
-	 *   'deleted' => [
-	 *      'foo.php.bak',
-	 *      'old.txt'
-	 *   ]
-	 * ];
-	 *
-	 * The returned syncToken property should reflect the *current* syncToken
-	 * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
-	 * property. This is needed here too, to ensure the operation is atomic.
-	 *
-	 * If the $syncToken argument is specified as null, this is an initial
-	 * sync, and all members should be reported.
-	 *
-	 * The modified property is an array of nodenames that have changed since
-	 * the last token.
-	 *
-	 * The deleted property is an array with nodenames, that have been deleted
-	 * from collection.
-	 *
-	 * The $syncLevel argument is basically the 'depth' of the report. If it's
-	 * 1, you only have to report changes that happened only directly in
-	 * immediate descendants. If it's 2, it should also include changes from
-	 * the nodes below the child collections. (grandchildren)
-	 *
-	 * The $limit argument allows a client to specify how many results should
-	 * be returned at most. If the limit is not specified, it should be treated
-	 * as infinite.
-	 *
-	 * If the limit (infinite or not) is higher than you're willing to return,
-	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-	 *
-	 * If the syncToken is expired (due to data cleanup) or unknown, you must
-	 * return null.
-	 *
-	 * The limit is 'suggestive'. You are free to ignore it.
-	 *
-	 * @param string $addressBookId
-	 * @param string $syncToken
-	 * @param int $syncLevel
-	 * @param int|null $limit
-	 * @return array
-	 */
-	public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
-		$maxLimit = $this->config->getSystemValueInt('carddav_sync_request_truncation', 2500);
-		$limit = ($limit === null) ? $maxLimit : min($limit, $maxLimit);
-		// Current synctoken
-		return $this->atomic(function () use ($addressBookId, $syncToken, $syncLevel, $limit) {
-			$qb = $this->db->getQueryBuilder();
-			$qb->select('synctoken')
-				->from('addressbooks')
-				->where(
-					$qb->expr()->eq('id', $qb->createNamedParameter($addressBookId))
-				);
-			$stmt = $qb->executeQuery();
-			$currentToken = $stmt->fetchOne();
-			$stmt->closeCursor();
-
-			if (is_null($currentToken)) {
-				return [];
-			}
-
-			$result = [
-				'syncToken' => $currentToken,
-				'added' => [],
-				'modified' => [],
-				'deleted' => [],
-			];
-			if (str_starts_with($syncToken, 'init_')) {
-				$syncValues = explode('_', $syncToken);
-				$lastID = $syncValues[1];
-				$initialSyncToken = $syncValues[2];
-				$qb = $this->db->getQueryBuilder();
-				$qb->select('id', 'uri')
-					->from('cards')
-					->where(
-						$qb->expr()->andX(
-							$qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId)),
-							$qb->expr()->gt('id', $qb->createNamedParameter($lastID)))
-					)->orderBy('id')
-					->setMaxResults($limit);
-				$stmt = $qb->executeQuery();
-				$values = $stmt->fetchAllAssociative();
-				$stmt->closeCursor();
-				if (count($values) === 0) {
-					$result['syncToken'] = $initialSyncToken;
-					$result['result_truncated'] = false;
-					$result['added'] = [];
-				} else {
-					$lastID = $values[array_key_last($values)]['id'];
-					$result['added'] = array_column($values, 'uri');
-					$result['syncToken'] = count($result['added']) >= $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken ;
-					$result['result_truncated'] = count($result['added']) >= $limit;
-				}
-			} elseif ($syncToken) {
-				$qb = $this->db->getQueryBuilder();
-				$qb->select('uri', 'operation', 'synctoken')
-					->from('addressbookchanges')
-					->where(
-						$qb->expr()->andX(
-							$qb->expr()->gte('synctoken', $qb->createNamedParameter($syncToken)),
-							$qb->expr()->lt('synctoken', $qb->createNamedParameter($currentToken)),
-							$qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
-						)
-					)->orderBy('synctoken');
-
-				if ($limit > 0) {
-					$qb->setMaxResults($limit);
-				}
-
-				// Fetching all changes
-				$stmt = $qb->executeQuery();
-				$rowCount = $stmt->rowCount();
-
-				$changes = [];
-				$highestSyncToken = 0;
-
-				// This loop ensures that any duplicates are overwritten, only the
-				// last change on a node is relevant.
-				while ($row = $stmt->fetchAssociative()) {
-					$changes[$row['uri']] = $row['operation'];
-					$highestSyncToken = $row['synctoken'];
-				}
-
-				$stmt->closeCursor();
-
-				// No changes found, use current token
-				if (empty($changes)) {
-					$result['syncToken'] = $currentToken;
-				}
-
-				foreach ($changes as $uri => $operation) {
-					switch ($operation) {
-						case 1:
-							$result['added'][] = $uri;
-							break;
-						case 2:
-							$result['modified'][] = $uri;
-							break;
-						case 3:
-							$result['deleted'][] = $uri;
-							break;
-					}
-				}
-
-				/*
+    use TTransactional;
+    public const PERSONAL_ADDRESSBOOK_URI = 'contacts';
+    public const PERSONAL_ADDRESSBOOK_NAME = 'Contacts';
+
+    private string $dbCardsTable = 'cards';
+    private string $dbCardsPropertiesTable = 'cards_properties';
+
+    /** @var array properties to index */
+    public static array $indexProperties = [
+        'BDAY', 'UID', 'N', 'FN', 'TITLE', 'ROLE', 'NOTE', 'NICKNAME',
+        'ORG', 'CATEGORIES', 'EMAIL', 'TEL', 'IMPP', 'ADR', 'URL', 'GEO',
+        'CLOUD', 'X-SOCIALPROFILE'];
+
+    /**
+     * @var string[] Map of uid => display name
+     */
+    protected array $userDisplayNames;
+    private array $etagCache = [];
+
+    public function __construct(
+        private IDBConnection $db,
+        private Principal $principalBackend,
+        private IUserManager $userManager,
+        private IEventDispatcher $dispatcher,
+        private Sharing\Backend $sharingBackend,
+        private IConfig $config,
+    ) {
+    }
+
+    /**
+     * Return the number of address books for a principal
+     *
+     * @param $principalUri
+     * @return int
+     */
+    public function getAddressBooksForUserCount($principalUri) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->func()->count('*'))
+            ->from('addressbooks')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+
+        $result = $query->executeQuery();
+        $column = (int)$result->fetchOne();
+        $result->closeCursor();
+        return $column;
+    }
+
+    /**
+     * Returns the list of address books for a specific user.
+     *
+     * Every addressbook should have the following properties:
+     *   id - an arbitrary unique id
+     *   uri - the 'basename' part of the url
+     *   principaluri - Same as the passed parameter
+     *
+     * Any additional clark-notation property may be passed besides this. Some
+     * common ones are :
+     *   {DAV:}displayname
+     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
+     *   {http://calendarserver.org/ns/}getctag
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getAddressBooksForUser($principalUri) {
+        return $this->atomic(function () use ($principalUri) {
+            $principalUriOriginal = $principalUri;
+            $principalUri = $this->convertPrincipal($principalUri, true);
+            $select = $this->db->getQueryBuilder();
+            $select->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+                ->from('addressbooks')
+                ->where($select->expr()->eq('principaluri', $select->createNamedParameter($principalUri)));
+
+            $addressBooks = [];
+
+            $result = $select->executeQuery();
+            while ($row = $result->fetchAssociative()) {
+                $addressBooks[$row['id']] = [
+                    'id' => $row['id'],
+                    'uri' => $row['uri'],
+                    'principaluri' => $this->convertPrincipal($row['principaluri'], false),
+                    '{DAV:}displayname' => $row['displayname'],
+                    '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                    '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+                    '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+                ];
+
+                $this->addOwnerPrincipal($addressBooks[$row['id']]);
+            }
+            $result->closeCursor();
+
+            // query for shared addressbooks
+            $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+
+            $principals[] = $principalUri;
+
+            $select = $this->db->getQueryBuilder();
+            $subSelect = $this->db->getQueryBuilder();
+
+            $subSelect->select('id')
+                ->from('dav_shares', 'd')
+                ->where($subSelect->expr()->eq('d.access', $select->createNamedParameter(\OCA\DAV\CardDAV\Sharing\Backend::ACCESS_UNSHARED, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT))
+                ->andWhere($subSelect->expr()->in('d.principaluri', $select->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR_ARRAY));
+
+
+            $select->select(['a.id', 'a.uri', 'a.displayname', 'a.principaluri', 'a.description', 'a.synctoken', 's.access'])
+                ->from('dav_shares', 's')
+                ->join('s', 'addressbooks', 'a', $select->expr()->eq('s.resourceid', 'a.id'))
+                ->where($select->expr()->in('s.principaluri', $select->createNamedParameter($principals, IQueryBuilder::PARAM_STR_ARRAY)))
+                ->andWhere($select->expr()->eq('s.type', $select->createNamedParameter('addressbook', IQueryBuilder::PARAM_STR)))
+                ->andWhere($select->expr()->notIn('s.id', $select->createFunction($subSelect->getSQL()), IQueryBuilder::PARAM_INT_ARRAY));
+            $result = $select->executeQuery();
+
+            $readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+            while ($row = $result->fetchAssociative()) {
+                if ($row['principaluri'] === $principalUri) {
+                    continue;
+                }
+
+                $readOnly = (int)$row['access'] === Backend::ACCESS_READ;
+                if (isset($addressBooks[$row['id']])) {
+                    if ($readOnly) {
+                        // New share can not have more permissions then the old one.
+                        continue;
+                    }
+                    if (isset($addressBooks[$row['id']][$readOnlyPropertyName])
+                        && $addressBooks[$row['id']][$readOnlyPropertyName] === 0) {
+                        // Old share is already read-write, no more permissions can be gained
+                        continue;
+                    }
+                }
+
+                [, $name] = \Sabre\Uri\split($row['principaluri']);
+                $uri = $row['uri'] . '_shared_by_' . $name;
+                $displayName = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? $name ?? '') . ')';
+
+                $addressBooks[$row['id']] = [
+                    'id' => $row['id'],
+                    'uri' => $uri,
+                    'principaluri' => $principalUriOriginal,
+                    '{DAV:}displayname' => $displayName,
+                    '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                    '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+                    '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+                    '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
+                    $readOnlyPropertyName => $readOnly,
+                ];
+
+                $this->addOwnerPrincipal($addressBooks[$row['id']]);
+            }
+            $result->closeCursor();
+
+            return array_values($addressBooks);
+        }, $this->db);
+    }
+
+    public function getUsersOwnAddressBooks($principalUri) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+            ->from('addressbooks')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+
+        $addressBooks = [];
+
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $addressBooks[$row['id']] = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], false),
+                '{DAV:}displayname' => $row['displayname'],
+                '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+                '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+            ];
+
+            $this->addOwnerPrincipal($addressBooks[$row['id']]);
+        }
+        $result->closeCursor();
+
+        return array_values($addressBooks);
+    }
+
+    /**
+     * @param int $addressBookId
+     */
+    public function getAddressBookById(int $addressBookId): ?array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+            ->from('addressbooks')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
+            ->executeQuery();
+        $row = $result->fetchAssociative();
+        $result->closeCursor();
+        if (!$row) {
+            return null;
+        }
+
+        $addressBook = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $row['principaluri'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+            '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+        ];
+
+        $this->addOwnerPrincipal($addressBook);
+
+        return $addressBook;
+    }
+
+    public function getAddressBooksByUri(string $principal, string $addressBookUri): ?array {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
+            ->from('addressbooks')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($addressBookUri)))
+            ->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
+            ->setMaxResults(1)
+            ->executeQuery();
+
+        $row = $result->fetchAssociative();
+        $result->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $addressBook = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $row['principaluri'],
+            '{DAV:}displayname' => $row['displayname'],
+            '{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+            '{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+
+        ];
+
+        // system address books are always read only
+        if ($principal === 'principals/system/system') {
+            $addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'] = $row['principaluri'];
+            $addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
+        }
+
+        $this->addOwnerPrincipal($addressBook);
+
+        return $addressBook;
+    }
+
+    /**
+     * Updates properties for an address book.
+     *
+     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+     * To do the actual updates, you must tell this object which properties
+     * you're going to process with the handle() method.
+     *
+     * Calling the handle method is like telling the PropPatch object "I
+     * promise I can handle updating this property".
+     *
+     * Read the PropPatch documentation for more info and examples.
+     *
+     * @param string $addressBookId
+     * @param \Sabre\DAV\PropPatch $propPatch
+     * @return void
+     */
+    public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
+        $supportedProperties = [
+            '{DAV:}displayname',
+            '{' . Plugin::NS_CARDDAV . '}addressbook-description',
+        ];
+
+        $propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
+            $updates = [];
+            foreach ($mutations as $property => $newValue) {
+                switch ($property) {
+                    case '{DAV:}displayname':
+                        $updates['displayname'] = $newValue;
+                        break;
+                    case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+                        $updates['description'] = $newValue;
+                        break;
+                }
+            }
+            [$addressBookRow, $shares] = $this->atomic(function () use ($addressBookId, $updates) {
+                $query = $this->db->getQueryBuilder();
+                $query->update('addressbooks');
+
+                foreach ($updates as $key => $value) {
+                    $query->set($key, $query->createNamedParameter($value));
+                }
+                $query->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
+                    ->executeStatement();
+
+                $this->addChange($addressBookId, '', 2);
+
+                $addressBookRow = $this->getAddressBookById((int)$addressBookId);
+                $shares = $this->getShares((int)$addressBookId);
+                return [$addressBookRow, $shares];
+            }, $this->db);
+
+            $this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations));
+
+            return true;
+        });
+    }
+
+    /**
+     * Creates a new address book
+     *
+     * @param string $principalUri
+     * @param string $url Just the 'basename' of the url.
+     * @param array $properties
+     * @return int
+     * @throws BadRequest
+     * @throws Exception
+     */
+    public function createAddressBook($principalUri, $url, array $properties) {
+        if (strlen($url) > 255) {
+            throw new BadRequest('URI too long. Address book not created');
+        }
+
+        $values = [
+            'displayname' => null,
+            'description' => null,
+            'principaluri' => $principalUri,
+            'uri' => $url,
+            'synctoken' => 1
+        ];
+
+        foreach ($properties as $property => $newValue) {
+            switch ($property) {
+                case '{DAV:}displayname':
+                    $values['displayname'] = $newValue;
+                    break;
+                case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+                    $values['description'] = $newValue;
+                    break;
+                default:
+                    throw new BadRequest('Unknown property: ' . $property);
+            }
+        }
+
+        // Fallback to make sure the displayname is set. Some clients may refuse
+        // to work with addressbooks not having a displayname.
+        if (is_null($values['displayname'])) {
+            $values['displayname'] = $url;
+        }
+
+        [$addressBookId, $addressBookRow] = $this->atomic(function () use ($values) {
+            $query = $this->db->getQueryBuilder();
+            $query->insert('addressbooks')
+                ->values([
+                    'uri' => $query->createParameter('uri'),
+                    'displayname' => $query->createParameter('displayname'),
+                    'description' => $query->createParameter('description'),
+                    'principaluri' => $query->createParameter('principaluri'),
+                    'synctoken' => $query->createParameter('synctoken'),
+                ])
+                ->setParameters($values)
+                ->executeStatement();
+
+            $addressBookId = $query->getLastInsertId();
+            return [
+                $addressBookId,
+                $this->getAddressBookById($addressBookId),
+            ];
+        }, $this->db);
+
+        $this->dispatcher->dispatchTyped(new AddressBookCreatedEvent($addressBookId, $addressBookRow));
+
+        return $addressBookId;
+    }
+
+    /**
+     * Deletes an entire addressbook and all its contents
+     *
+     * @param mixed $addressBookId
+     * @return void
+     */
+    public function deleteAddressBook($addressBookId) {
+        $this->atomic(function () use ($addressBookId): void {
+            $addressBookId = (int)$addressBookId;
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete($this->dbCardsTable)
+                ->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
+                ->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
+                ->executeStatement();
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete('addressbookchanges')
+                ->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid')))
+                ->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT)
+                ->executeStatement();
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete('addressbooks')
+                ->where($query->expr()->eq('id', $query->createParameter('id')))
+                ->setParameter('id', $addressBookId, IQueryBuilder::PARAM_INT)
+                ->executeStatement();
+
+            $this->sharingBackend->deleteAllShares($addressBookId);
+
+            $query = $this->db->getQueryBuilder();
+            $query->delete($this->dbCardsPropertiesTable)
+                ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
+                ->executeStatement();
+
+            if ($addressBookData) {
+                $this->dispatcher->dispatchTyped(new AddressBookDeletedEvent($addressBookId, $addressBookData, $shares));
+            }
+        }, $this->db);
+    }
+
+    /**
+     * Returns all cards for a specific addressbook id.
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+     *
+     * It's recommended to also return the following properties:
+     *   * etag - A unique etag. This must change every time the card changes.
+     *   * size - The size of the card in bytes.
+     *
+     * If these last two properties are provided, less time will be spent
+     * calculating them. If they are specified, you can also omit carddata.
+     * This may speed up certain requests, especially with large cards.
+     *
+     * @param mixed $addressbookId
+     * @return array
+     */
+    public function getCards($addressbookId) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'addressbookid', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
+            ->from($this->dbCardsTable)
+            ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressbookId)));
+
+        $cards = [];
+
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $row['etag'] = '"' . $row['etag'] . '"';
+
+            $modified = false;
+            $row['carddata'] = $this->readBlob($row['carddata'], $modified);
+            if ($modified) {
+                $row['size'] = strlen($row['carddata']);
+            }
+
+            $cards[] = $row;
+        }
+        $result->closeCursor();
+
+        return $cards;
+    }
+
+    /**
+     * Returns a specific card.
+     *
+     * The same set of properties must be returned as with getCards. The only
+     * exception is that 'carddata' is absolutely required.
+     *
+     * If the card does not exist, you must return false.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return array
+     */
+    public function getCard($addressBookId, $cardUri) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'addressbookid', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
+            ->from($this->dbCardsTable)
+            ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
+            ->setMaxResults(1);
+
+        $result = $query->executeQuery();
+        $row = $result->fetchAssociative();
+        if (!$row) {
+            return false;
+        }
+        $row['etag'] = '"' . $row['etag'] . '"';
+
+        $modified = false;
+        $row['carddata'] = $this->readBlob($row['carddata'], $modified);
+        if ($modified) {
+            $row['size'] = strlen($row['carddata']);
+        }
+
+        return $row;
+    }
+
+    /**
+     * Returns a list of cards.
+     *
+     * This method should work identical to getCard, but instead return all the
+     * cards in the list as an array.
+     *
+     * If the backend supports this, it may allow for some speed-ups.
+     *
+     * @param mixed $addressBookId
+     * @param array $uris
+     * @return array
+     */
+    public function getMultipleCards($addressBookId, array $uris) {
+        if (empty($uris)) {
+            return [];
+        }
+
+        $chunks = array_chunk($uris, 100);
+        $cards = [];
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'addressbookid', 'uri', 'lastmodified', 'etag', 'size', 'carddata', 'uid'])
+            ->from($this->dbCardsTable)
+            ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+            ->andWhere($query->expr()->in('uri', $query->createParameter('uri')));
+
+        foreach ($chunks as $uris) {
+            $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->executeQuery();
+
+            while ($row = $result->fetchAssociative()) {
+                $row['etag'] = '"' . $row['etag'] . '"';
+
+                $modified = false;
+                $row['carddata'] = $this->readBlob($row['carddata'], $modified);
+                if ($modified) {
+                    $row['size'] = strlen($row['carddata']);
+                }
+
+                $cards[] = $row;
+            }
+            $result->closeCursor();
+        }
+        return $cards;
+    }
+
+    /**
+     * Creates a new card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressBooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag is for the
+     * newly created resource, and must be enclosed with double quotes (that
+     * is, the string itself must contain the double quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @param bool $checkAlreadyExists
+     * @return string
+     */
+    public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
+        $etag = md5($cardData);
+        $uid = $this->getUID($cardData);
+        return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
+            if ($checkAlreadyExists) {
+                $q = $this->db->getQueryBuilder();
+                $q->select('uid')
+                    ->from($this->dbCardsTable)
+                    ->where($q->expr()->eq('addressbookid', $q->createNamedParameter($addressBookId)))
+                    ->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
+                    ->setMaxResults(1);
+                $result = $q->executeQuery();
+                $count = (bool)$result->fetchOne();
+                $result->closeCursor();
+                if ($count) {
+                    throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
+                }
+            }
+
+            $query = $this->db->getQueryBuilder();
+            $query->insert('cards')
+                ->values([
+                    'carddata' => $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB),
+                    'uri' => $query->createNamedParameter($cardUri),
+                    'lastmodified' => $query->createNamedParameter(time()),
+                    'addressbookid' => $query->createNamedParameter($addressBookId),
+                    'size' => $query->createNamedParameter(strlen($cardData)),
+                    'etag' => $query->createNamedParameter($etag),
+                    'uid' => $query->createNamedParameter($uid),
+                ])
+                ->executeStatement();
+
+            $etagCacheKey = "$addressBookId#$cardUri";
+            $this->etagCache[$etagCacheKey] = $etag;
+
+            $this->addChange($addressBookId, $cardUri, 1);
+            $this->updateProperties($addressBookId, $cardUri, $cardData);
+
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+            $objectRow = $this->getCard($addressBookId, $cardUri);
+            $this->dispatcher->dispatchTyped(new CardCreatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
+
+            return '"' . $etag . '"';
+        }, $this->db);
+    }
+
+    /**
+     * Updates a card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressBooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag should
+     * match that of the updated resource, and must be enclosed with double
+     * quotes (that is: the string itself must contain the actual quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string
+     */
+    public function updateCard($addressBookId, $cardUri, $cardData) {
+        $uid = $this->getUID($cardData);
+        $etag = md5($cardData);
+
+        return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
+            $query = $this->db->getQueryBuilder();
+
+            // check for recently stored etag and stop if it is the same
+            $etagCacheKey = "$addressBookId#$cardUri";
+            if (isset($this->etagCache[$etagCacheKey]) && $this->etagCache[$etagCacheKey] === $etag) {
+                return '"' . $etag . '"';
+            }
+
+            $query->update($this->dbCardsTable)
+                ->set('carddata', $query->createNamedParameter($cardData, IQueryBuilder::PARAM_LOB))
+                ->set('lastmodified', $query->createNamedParameter(time()))
+                ->set('size', $query->createNamedParameter(strlen($cardData)))
+                ->set('etag', $query->createNamedParameter($etag))
+                ->set('uid', $query->createNamedParameter($uid))
+                ->where($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
+                ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+                ->executeStatement();
+
+            $this->etagCache[$etagCacheKey] = $etag;
+
+            $this->addChange($addressBookId, $cardUri, 2);
+            $this->updateProperties($addressBookId, $cardUri, $cardData);
+
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+            $objectRow = $this->getCard($addressBookId, $cardUri);
+            $this->dispatcher->dispatchTyped(new CardUpdatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
+            return '"' . $etag . '"';
+        }, $this->db);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function moveCard(int $sourceAddressBookId, string $sourceObjectUri, int $targetAddressBookId, string $tragetObjectUri): bool {
+        return $this->atomic(function () use ($sourceAddressBookId, $sourceObjectUri, $targetAddressBookId, $tragetObjectUri) {
+            $card = $this->getCard($sourceAddressBookId, $sourceObjectUri);
+            if (empty($card)) {
+                return false;
+            }
+            $sourceObjectId = (int)$card['id'];
+
+            $query = $this->db->getQueryBuilder();
+            $query->update('cards')
+                ->set('addressbookid', $query->createNamedParameter($targetAddressBookId, IQueryBuilder::PARAM_INT))
+                ->set('uri', $query->createNamedParameter($tragetObjectUri, IQueryBuilder::PARAM_STR))
+                ->where($query->expr()->eq('uri', $query->createNamedParameter($sourceObjectUri, IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR))
+                ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($sourceAddressBookId, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT))
+                ->executeStatement();
+
+            $this->purgeProperties($sourceAddressBookId, $sourceObjectId);
+            $this->updateProperties($targetAddressBookId, $tragetObjectUri, $card['carddata']);
+
+            $this->addChange($sourceAddressBookId, $sourceObjectUri, 3);
+            $this->addChange($targetAddressBookId, $tragetObjectUri, 1);
+
+            $card = $this->getCard($targetAddressBookId, $tragetObjectUri);
+            // Card wasn't found - possibly because it was deleted in the meantime by a different client
+            if (empty($card)) {
+                return false;
+            }
+            $targetAddressBookRow = $this->getAddressBookById($targetAddressBookId);
+            // the address book this card is being moved to does not exist any longer
+            if (empty($targetAddressBookRow)) {
+                return false;
+            }
+
+            $sourceShares = $this->getShares($sourceAddressBookId);
+            $targetShares = $this->getShares($targetAddressBookId);
+            $sourceAddressBookRow = $this->getAddressBookById($sourceAddressBookId);
+            $this->dispatcher->dispatchTyped(new CardMovedEvent($sourceAddressBookId, $sourceAddressBookRow, $targetAddressBookId, $targetAddressBookRow, $sourceShares, $targetShares, $card));
+            return true;
+        }, $this->db);
+    }
+
+    /**
+     * Deletes a card
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return bool
+     */
+    public function deleteCard($addressBookId, $cardUri) {
+        return $this->atomic(function () use ($addressBookId, $cardUri) {
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $shares = $this->getShares($addressBookId);
+            $objectRow = $this->getCard($addressBookId, $cardUri);
+
+            try {
+                $cardId = $this->getCardId($addressBookId, $cardUri);
+            } catch (\InvalidArgumentException $e) {
+                $cardId = null;
+            }
+            $query = $this->db->getQueryBuilder();
+            $ret = $query->delete($this->dbCardsTable)
+                ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
+                ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
+                ->executeStatement();
+
+            $this->addChange($addressBookId, $cardUri, 3);
+
+            if ($ret === 1) {
+                if ($cardId !== null) {
+                    $this->dispatcher->dispatchTyped(new CardDeletedEvent($addressBookId, $addressBookData, $shares, $objectRow));
+                    $this->purgeProperties($addressBookId, $cardId);
+                }
+                return true;
+            }
+
+            return false;
+        }, $this->db);
+    }
+
+    /**
+     * The getChanges method returns all the changes that have happened, since
+     * the specified syncToken in the specified address book.
+     *
+     * This function should return an array, such as the following:
+     *
+     * [
+     *   'syncToken' => 'The current synctoken',
+     *   'added'   => [
+     *      'new.txt',
+     *   ],
+     *   'modified'   => [
+     *      'modified.txt',
+     *   ],
+     *   'deleted' => [
+     *      'foo.php.bak',
+     *      'old.txt'
+     *   ]
+     * ];
+     *
+     * The returned syncToken property should reflect the *current* syncToken
+     * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
+     * property. This is needed here too, to ensure the operation is atomic.
+     *
+     * If the $syncToken argument is specified as null, this is an initial
+     * sync, and all members should be reported.
+     *
+     * The modified property is an array of nodenames that have changed since
+     * the last token.
+     *
+     * The deleted property is an array with nodenames, that have been deleted
+     * from collection.
+     *
+     * The $syncLevel argument is basically the 'depth' of the report. If it's
+     * 1, you only have to report changes that happened only directly in
+     * immediate descendants. If it's 2, it should also include changes from
+     * the nodes below the child collections. (grandchildren)
+     *
+     * The $limit argument allows a client to specify how many results should
+     * be returned at most. If the limit is not specified, it should be treated
+     * as infinite.
+     *
+     * If the limit (infinite or not) is higher than you're willing to return,
+     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+     *
+     * If the syncToken is expired (due to data cleanup) or unknown, you must
+     * return null.
+     *
+     * The limit is 'suggestive'. You are free to ignore it.
+     *
+     * @param string $addressBookId
+     * @param string $syncToken
+     * @param int $syncLevel
+     * @param int|null $limit
+     * @return array
+     */
+    public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
+        $maxLimit = $this->config->getSystemValueInt('carddav_sync_request_truncation', 2500);
+        $limit = ($limit === null) ? $maxLimit : min($limit, $maxLimit);
+        // Current synctoken
+        return $this->atomic(function () use ($addressBookId, $syncToken, $syncLevel, $limit) {
+            $qb = $this->db->getQueryBuilder();
+            $qb->select('synctoken')
+                ->from('addressbooks')
+                ->where(
+                    $qb->expr()->eq('id', $qb->createNamedParameter($addressBookId))
+                );
+            $stmt = $qb->executeQuery();
+            $currentToken = $stmt->fetchOne();
+            $stmt->closeCursor();
+
+            if (is_null($currentToken)) {
+                return [];
+            }
+
+            $result = [
+                'syncToken' => $currentToken,
+                'added' => [],
+                'modified' => [],
+                'deleted' => [],
+            ];
+            if (str_starts_with($syncToken, 'init_')) {
+                $syncValues = explode('_', $syncToken);
+                $lastID = $syncValues[1];
+                $initialSyncToken = $syncValues[2];
+                $qb = $this->db->getQueryBuilder();
+                $qb->select('id', 'uri')
+                    ->from('cards')
+                    ->where(
+                        $qb->expr()->andX(
+                            $qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId)),
+                            $qb->expr()->gt('id', $qb->createNamedParameter($lastID)))
+                    )->orderBy('id')
+                    ->setMaxResults($limit);
+                $stmt = $qb->executeQuery();
+                $values = $stmt->fetchAllAssociative();
+                $stmt->closeCursor();
+                if (count($values) === 0) {
+                    $result['syncToken'] = $initialSyncToken;
+                    $result['result_truncated'] = false;
+                    $result['added'] = [];
+                } else {
+                    $lastID = $values[array_key_last($values)]['id'];
+                    $result['added'] = array_column($values, 'uri');
+                    $result['syncToken'] = count($result['added']) >= $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken ;
+                    $result['result_truncated'] = count($result['added']) >= $limit;
+                }
+            } elseif ($syncToken) {
+                $qb = $this->db->getQueryBuilder();
+                $qb->select('uri', 'operation', 'synctoken')
+                    ->from('addressbookchanges')
+                    ->where(
+                        $qb->expr()->andX(
+                            $qb->expr()->gte('synctoken', $qb->createNamedParameter($syncToken)),
+                            $qb->expr()->lt('synctoken', $qb->createNamedParameter($currentToken)),
+                            $qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
+                        )
+                    )->orderBy('synctoken');
+
+                if ($limit > 0) {
+                    $qb->setMaxResults($limit);
+                }
+
+                // Fetching all changes
+                $stmt = $qb->executeQuery();
+                $rowCount = $stmt->rowCount();
+
+                $changes = [];
+                $highestSyncToken = 0;
+
+                // This loop ensures that any duplicates are overwritten, only the
+                // last change on a node is relevant.
+                while ($row = $stmt->fetchAssociative()) {
+                    $changes[$row['uri']] = $row['operation'];
+                    $highestSyncToken = $row['synctoken'];
+                }
+
+                $stmt->closeCursor();
+
+                // No changes found, use current token
+                if (empty($changes)) {
+                    $result['syncToken'] = $currentToken;
+                }
+
+                foreach ($changes as $uri => $operation) {
+                    switch ($operation) {
+                        case 1:
+                            $result['added'][] = $uri;
+                            break;
+                        case 2:
+                            $result['modified'][] = $uri;
+                            break;
+                        case 3:
+                            $result['deleted'][] = $uri;
+                            break;
+                    }
+                }
+
+                /*
 				 * The synctoken in oc_addressbooks is always the highest synctoken in oc_addressbookchanges for a given addressbook plus one (see addChange).
 				 *
 				 * For truncated results, it is expected that we return the highest token from the response, so the client can continue from the latest change.
@@ -962,574 +962,574 @@ 
 				 *
 				 * Therefore, we differentiate between truncated and non-truncated results when returning the synctoken.
 				 */
-				if ($rowCount === $limit && $highestSyncToken < $currentToken) {
-					$result['syncToken'] = $highestSyncToken;
-					$result['result_truncated'] = true;
-				}
-			} else {
-				$qb = $this->db->getQueryBuilder();
-				$qb->select('id', 'uri')
-					->from('cards')
-					->where(
-						$qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
-					);
-				// No synctoken supplied, this is the initial sync.
-				$qb->setMaxResults($limit);
-				$stmt = $qb->executeQuery();
-				$values = $stmt->fetchAllAssociative();
-				if (empty($values)) {
-					$result['added'] = [];
-					return $result;
-				}
-				$lastID = $values[array_key_last($values)]['id'];
-				if (count($values) >= $limit) {
-					$result['syncToken'] = 'init_' . $lastID . '_' . $currentToken;
-					$result['result_truncated'] = true;
-				}
-
-				$result['added'] = array_column($values, 'uri');
-
-				$stmt->closeCursor();
-			}
-			return $result;
-		}, $this->db);
-	}
-
-	/**
-	 * Adds a change record to the addressbookchanges table.
-	 *
-	 * @param mixed $addressBookId
-	 * @param string $objectUri
-	 * @param int $operation 1 = add, 2 = modify, 3 = delete
-	 * @return void
-	 */
-	protected function addChange(int $addressBookId, string $objectUri, int $operation): void {
-		$this->atomic(function () use ($addressBookId, $objectUri, $operation): void {
-			$query = $this->db->getQueryBuilder();
-			$query->select('synctoken')
-				->from('addressbooks')
-				->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)));
-			$result = $query->executeQuery();
-			$syncToken = (int)$result->fetchOne();
-			$result->closeCursor();
-
-			$query = $this->db->getQueryBuilder();
-			$query->insert('addressbookchanges')
-				->values([
-					'uri' => $query->createNamedParameter($objectUri),
-					'synctoken' => $query->createNamedParameter($syncToken),
-					'addressbookid' => $query->createNamedParameter($addressBookId),
-					'operation' => $query->createNamedParameter($operation),
-					'created_at' => time(),
-				])
-				->executeStatement();
-
-			$query = $this->db->getQueryBuilder();
-			$query->update('addressbooks')
-				->set('synctoken', $query->createNamedParameter($syncToken + 1, IQueryBuilder::PARAM_INT))
-				->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
-				->executeStatement();
-		}, $this->db);
-	}
-
-	/**
-	 * @param resource|string $cardData
-	 * @param bool $modified
-	 * @return string
-	 */
-	private function readBlob($cardData, &$modified = false) {
-		if (is_resource($cardData)) {
-			$cardData = stream_get_contents($cardData);
-		}
-
-		// Micro optimisation
-		// don't loop through
-		if (str_starts_with($cardData, 'PHOTO:data:')) {
-			return $cardData;
-		}
-
-		$cardDataArray = explode("\r\n", $cardData);
-
-		$cardDataFiltered = [];
-		$removingPhoto = false;
-		foreach ($cardDataArray as $line) {
-			if (str_starts_with($line, 'PHOTO:data:')
-				&& !str_starts_with($line, 'PHOTO:data:image/')) {
-				// Filter out PHOTO data of non-images
-				$removingPhoto = true;
-				$modified = true;
-				continue;
-			}
-
-			if ($removingPhoto) {
-				if (str_starts_with($line, ' ')) {
-					continue;
-				}
-				// No leading space means this is a new property
-				$removingPhoto = false;
-			}
-
-			$cardDataFiltered[] = $line;
-		}
-		return implode("\r\n", $cardDataFiltered);
-	}
-
-	/**
-	 * @param list<array{href: string, commonName: string, readOnly: bool}> $add
-	 * @param list<string> $remove
-	 */
-	public function updateShares(IShareable $shareable, array $add, array $remove): void {
-		$this->atomic(function () use ($shareable, $add, $remove): void {
-			$addressBookId = $shareable->getResourceId();
-			$addressBookData = $this->getAddressBookById($addressBookId);
-			$oldShares = $this->getShares($addressBookId);
-
-			$this->sharingBackend->updateShares($shareable, $add, $remove, $oldShares);
-
-			$this->dispatcher->dispatchTyped(new AddressBookShareUpdatedEvent($addressBookId, $addressBookData, $oldShares, $add, $remove));
-		}, $this->db);
-	}
-
-	/**
-	 * Delete all of a user's shares
-	 */
-	public function deleteAllSharesByUser(string $principaluri): void {
-		$this->sharingBackend->deleteAllSharesByUser($principaluri);
-	}
-
-	/**
-	 * Search contacts in a specific address-book
-	 *
-	 * @param int $addressBookId
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options = array() to define the search behavior
-	 *                       - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
-	 *                       - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
-	 *                       - 'limit' - Set a numeric limit for the search results
-	 *                       - 'offset' - Set the offset for the limited search results
-	 *                       - 'wildcard' - Whether the search should use wildcards
-	 * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
-	 * @return array an array of contacts which are arrays of key-value-pairs
-	 */
-	public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
-		return $this->atomic(function () use ($addressBookId, $pattern, $searchProperties, $options) {
-			return $this->searchByAddressBookIds([$addressBookId], $pattern, $searchProperties, $options);
-		}, $this->db);
-	}
-
-	/**
-	 * Search contacts in all address-books accessible by a user
-	 *
-	 * @param string $principalUri
-	 * @param string $pattern
-	 * @param array $searchProperties
-	 * @param array $options
-	 * @return array
-	 */
-	public function searchPrincipalUri(string $principalUri,
-		string $pattern,
-		array $searchProperties,
-		array $options = []): array {
-		return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
-			$addressBookIds = array_map(static function ($row):int {
-				return (int)$row['id'];
-			}, $this->getAddressBooksForUser($principalUri));
-
-			return $this->searchByAddressBookIds($addressBookIds, $pattern, $searchProperties, $options);
-		}, $this->db);
-	}
-
-	/**
-	 * @param int[] $addressBookIds
-	 * @param string $pattern
-	 * @param array $searchProperties
-	 * @param array $options
-	 * @psalm-param array{
-	 *   types?: bool,
-	 *   escape_like_param?: bool,
-	 *   limit?: int,
-	 *   offset?: int,
-	 *   wildcard?: bool,
-	 *   since?: DateTimeFilter|null,
-	 *   until?: DateTimeFilter|null,
-	 *   person?: string
-	 * } $options
-	 * @return array
-	 */
-	private function searchByAddressBookIds(array $addressBookIds,
-		string $pattern,
-		array $searchProperties,
-		array $options = []): array {
-		if (empty($addressBookIds)) {
-			return [];
-		}
-		$escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
-		$useWildcards = !\array_key_exists('wildcard', $options) || $options['wildcard'] !== false;
-
-		if ($escapePattern) {
-			$searchProperties = array_filter($searchProperties, function ($property) use ($pattern) {
-				if ($property === 'EMAIL' && str_contains($pattern, ' ')) {
-					// There can be no spaces in emails
-					return false;
-				}
-
-				if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 :_.@\/\-\']/', $pattern) === 1) {
-					// There can be no chars in cloud ids which are not valid for user ids plus :/
-					// worst case: CA61590A-BBBC-423E-84AF-E6DF01455A53@https://my.nxt/srv/
-					return false;
-				}
-
-				return true;
-			});
-		}
-
-		if (empty($searchProperties)) {
-			return [];
-		}
-
-		$query2 = $this->db->getQueryBuilder();
-		$query2->selectDistinct('cp.cardid')
-			->from($this->dbCardsPropertiesTable, 'cp')
-			->where($query2->expr()->in('cp.addressbookid', $query2->createNamedParameter($addressBookIds, IQueryBuilder::PARAM_INT_ARRAY), IQueryBuilder::PARAM_INT_ARRAY))
-			->andWhere($query2->expr()->in('cp.name', $query2->createNamedParameter($searchProperties, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		// No need for like when the pattern is empty
-		if ($pattern !== '') {
-			if (!$useWildcards) {
-				$query2->andWhere($query2->expr()->eq('cp.value', $query2->createNamedParameter($pattern)));
-			} elseif (!$escapePattern) {
-				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
-			} else {
-				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
-			}
-		}
-		if (isset($options['limit'])) {
-			$query2->setMaxResults($options['limit']);
-		}
-		if (isset($options['offset'])) {
-			$query2->setFirstResult($options['offset']);
-		}
-
-		if (isset($options['person'])) {
-			$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($options['person']) . '%')));
-		}
-		if (isset($options['since']) || isset($options['until'])) {
-			$query2->join('cp', $this->dbCardsPropertiesTable, 'cp_bday', 'cp.cardid = cp_bday.cardid');
-			$query2->andWhere($query2->expr()->eq('cp_bday.name', $query2->createNamedParameter('BDAY')));
-			/**
-			 * FIXME Find a way to match only 4 last digits
-			 * BDAY can be --1018 without year or 20001019 with it
-			 * $bDayOr = [];
-			 * if ($options['since'] instanceof DateTimeFilter) {
-			 * $bDayOr[] =
-			 * $query2->expr()->gte('SUBSTR(cp_bday.value, -4)',
-			 * $query2->createNamedParameter($options['since']->get()->format('md'))
-			 * );
-			 * }
-			 * if ($options['until'] instanceof DateTimeFilter) {
-			 * $bDayOr[] =
-			 * $query2->expr()->lte('SUBSTR(cp_bday.value, -4)',
-			 * $query2->createNamedParameter($options['until']->get()->format('md'))
-			 * );
-			 * }
-			 * $query2->andWhere($query2->expr()->orX(...$bDayOr));
-			 */
-		}
-
-		$result = $query2->executeQuery();
-		$matches = $result->fetchAllAssociative();
-		$result->closeCursor();
-		$matches = array_map(function ($match) {
-			return (int)$match['cardid'];
-		}, $matches);
-
-		$cardResults = [];
-		$query = $this->db->getQueryBuilder();
-		$query->select('c.addressbookid', 'c.carddata', 'c.uri')
-			->from($this->dbCardsTable, 'c')
-			->where($query->expr()->in('c.id', $query->createParameter('matches')));
-
-		foreach (array_chunk($matches, 1000) as $matchesChunk) {
-			$query->setParameter('matches', $matchesChunk, IQueryBuilder::PARAM_INT_ARRAY);
-			$result = $query->executeQuery();
-			$cardResults[] = $result->fetchAllAssociative();
-			$result->closeCursor();
-		}
-
-		$cards = array_merge(...$cardResults);
-		return array_map(function ($array) {
-			$array['addressbookid'] = (int)$array['addressbookid'];
-			$modified = false;
-			$array['carddata'] = $this->readBlob($array['carddata'], $modified);
-			if ($modified) {
-				$array['size'] = strlen($array['carddata']);
-			}
-			return $array;
-		}, $cards);
-	}
-
-	/**
-	 * @param int $bookId
-	 * @param string $name
-	 * @return array
-	 */
-	public function collectCardProperties($bookId, $name) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->selectDistinct('value')
-			->from($this->dbCardsPropertiesTable)
-			->where($query->expr()->eq('name', $query->createNamedParameter($name)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
-			->executeQuery();
-
-		$all = $result->fetchFirstColumn();
-		$result->closeCursor();
-
-		return $all;
-	}
-
-	/**
-	 * get URI from a given contact
-	 *
-	 * @param int $id
-	 * @return string
-	 */
-	public function getCardUri($id) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('uri')->from($this->dbCardsTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-
-		$result = $query->executeQuery();
-		$uri = $result->fetchAssociative();
-		$result->closeCursor();
-
-		if (!isset($uri['uri'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $id);
-		}
-
-		return $uri['uri'];
-	}
-
-	/**
-	 * return contact with the given URI
-	 *
-	 * @param int $addressBookId
-	 * @param string $uri
-	 * @returns array
-	 */
-	public function getContact($addressBookId, $uri) {
-		$result = [];
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')->from($this->dbCardsTable)
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-		$queryResult = $query->executeQuery();
-		$contact = $queryResult->fetchAssociative();
-		$queryResult->closeCursor();
-
-		if (is_array($contact)) {
-			$modified = false;
-			$contact['etag'] = '"' . $contact['etag'] . '"';
-			$contact['carddata'] = $this->readBlob($contact['carddata'], $modified);
-			if ($modified) {
-				$contact['size'] = strlen($contact['carddata']);
-			}
-
-			$result = $contact;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Returns the list of people whom this address book is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *
-	 * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>
-	 */
-	public function getShares(int $addressBookId): array {
-		return $this->sharingBackend->getShares($addressBookId);
-	}
-
-	/**
-	 * update properties table
-	 *
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param string $vCardSerialized
-	 */
-	protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
-		$this->atomic(function () use ($addressBookId, $cardUri, $vCardSerialized): void {
-			$cardId = $this->getCardId($addressBookId, $cardUri);
-			$vCard = $this->readCard($vCardSerialized);
-
-			$this->purgeProperties($addressBookId, $cardId);
-
-			$query = $this->db->getQueryBuilder();
-			$query->insert($this->dbCardsPropertiesTable)
-				->values(
-					[
-						'addressbookid' => $query->createNamedParameter($addressBookId),
-						'cardid' => $query->createNamedParameter($cardId),
-						'name' => $query->createParameter('name'),
-						'value' => $query->createParameter('value'),
-						'preferred' => $query->createParameter('preferred')
-					]
-				);
-
-			foreach ($vCard->children() as $property) {
-				if (!in_array($property->name, self::$indexProperties)) {
-					continue;
-				}
-				$preferred = 0;
-				foreach ($property->parameters as $parameter) {
-					if ($parameter->name === 'TYPE' && strtoupper($parameter->getValue()) === 'PREF') {
-						$preferred = 1;
-						break;
-					}
-				}
-				$query->setParameter('name', $property->name);
-				$query->setParameter('value', mb_strcut($property->getValue(), 0, 254));
-				$query->setParameter('preferred', $preferred);
-				$query->executeStatement();
-			}
-		}, $this->db);
-	}
-
-	/**
-	 * read vCard data into a vCard object
-	 *
-	 * @param string $cardData
-	 * @return VCard
-	 */
-	protected function readCard($cardData) {
-		return Reader::read($cardData);
-	}
-
-	/**
-	 * delete all properties from a given card
-	 *
-	 * @param int $addressBookId
-	 * @param int $cardId
-	 */
-	protected function purgeProperties($addressBookId, $cardId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->dbCardsPropertiesTable)
-			->where($query->expr()->eq('cardid', $query->createNamedParameter($cardId)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-		$query->executeStatement();
-	}
-
-	/**
-	 * Get ID from a given contact
-	 */
-	protected function getCardId(int $addressBookId, string $uri): int {
-		$query = $this->db->getQueryBuilder();
-		$query->select('id')->from($this->dbCardsTable)
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-
-		$result = $query->executeQuery();
-		$cardIds = $result->fetchAssociative();
-		$result->closeCursor();
-
-		if (!isset($cardIds['id'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $uri);
-		}
-
-		return (int)$cardIds['id'];
-	}
-
-	/**
-	 * For shared address books the sharee is set in the ACL of the address book
-	 *
-	 * @param int $addressBookId
-	 * @param list<array{privilege: string, principal: string, protected: bool}> $acl
-	 * @return list<array{privilege: string, principal: string, protected: bool}>
-	 */
-	public function applyShareAcl(int $addressBookId, array $acl): array {
-		$shares = $this->sharingBackend->getShares($addressBookId);
-		return $this->sharingBackend->applyShareAcl($shares, $acl);
-	}
-
-	/**
-	 * @throws \InvalidArgumentException
-	 */
-	public function pruneOutdatedSyncTokens(int $keep, int $retention): int {
-		if ($keep < 0) {
-			throw new \InvalidArgumentException();
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->max('id'))
-			->from('addressbookchanges');
-
-		$result = $query->executeQuery();
-		$maxId = (int)$result->fetchOne();
-		$result->closeCursor();
-		if (!$maxId || $maxId < $keep) {
-			return 0;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('addressbookchanges')
-			->where(
-				$query->expr()->lte('id', $query->createNamedParameter($maxId - $keep, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
-				$query->expr()->lte('created_at', $query->createNamedParameter($retention)),
-			);
-		return $query->executeStatement();
-	}
-
-	private function convertPrincipal(string $principalUri, bool $toV2): string {
-		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
-			[, $name] = \Sabre\Uri\split($principalUri);
-			if ($toV2 === true) {
-				return "principals/users/$name";
-			}
-			return "principals/$name";
-		}
-		return $principalUri;
-	}
-
-	private function addOwnerPrincipal(array &$addressbookInfo): void {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
-		if (isset($addressbookInfo[$ownerPrincipalKey])) {
-			$uri = $addressbookInfo[$ownerPrincipalKey];
-		} else {
-			$uri = $addressbookInfo['principaluri'];
-		}
-
-		$principalInformation = $this->principalBackend->getPrincipalByPath($uri);
-		if (isset($principalInformation['{DAV:}displayname'])) {
-			$addressbookInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
-		}
-	}
-
-	/**
-	 * Extract UID from vcard
-	 *
-	 * @param string $cardData the vcard raw data
-	 * @return string the uid
-	 * @throws BadRequest if no UID is available or vcard is empty
-	 */
-	private function getUID(string $cardData): string {
-		if ($cardData !== '') {
-			$vCard = Reader::read($cardData);
-			if ($vCard->UID) {
-				$uid = $vCard->UID->getValue();
-				return $uid;
-			}
-			// should already be handled, but just in case
-			throw new BadRequest('vCards on CardDAV servers MUST have a UID property');
-		}
-		// should already be handled, but just in case
-		throw new BadRequest('vCard can not be empty');
-	}
+                if ($rowCount === $limit && $highestSyncToken < $currentToken) {
+                    $result['syncToken'] = $highestSyncToken;
+                    $result['result_truncated'] = true;
+                }
+            } else {
+                $qb = $this->db->getQueryBuilder();
+                $qb->select('id', 'uri')
+                    ->from('cards')
+                    ->where(
+                        $qb->expr()->eq('addressbookid', $qb->createNamedParameter($addressBookId))
+                    );
+                // No synctoken supplied, this is the initial sync.
+                $qb->setMaxResults($limit);
+                $stmt = $qb->executeQuery();
+                $values = $stmt->fetchAllAssociative();
+                if (empty($values)) {
+                    $result['added'] = [];
+                    return $result;
+                }
+                $lastID = $values[array_key_last($values)]['id'];
+                if (count($values) >= $limit) {
+                    $result['syncToken'] = 'init_' . $lastID . '_' . $currentToken;
+                    $result['result_truncated'] = true;
+                }
+
+                $result['added'] = array_column($values, 'uri');
+
+                $stmt->closeCursor();
+            }
+            return $result;
+        }, $this->db);
+    }
+
+    /**
+     * Adds a change record to the addressbookchanges table.
+     *
+     * @param mixed $addressBookId
+     * @param string $objectUri
+     * @param int $operation 1 = add, 2 = modify, 3 = delete
+     * @return void
+     */
+    protected function addChange(int $addressBookId, string $objectUri, int $operation): void {
+        $this->atomic(function () use ($addressBookId, $objectUri, $operation): void {
+            $query = $this->db->getQueryBuilder();
+            $query->select('synctoken')
+                ->from('addressbooks')
+                ->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)));
+            $result = $query->executeQuery();
+            $syncToken = (int)$result->fetchOne();
+            $result->closeCursor();
+
+            $query = $this->db->getQueryBuilder();
+            $query->insert('addressbookchanges')
+                ->values([
+                    'uri' => $query->createNamedParameter($objectUri),
+                    'synctoken' => $query->createNamedParameter($syncToken),
+                    'addressbookid' => $query->createNamedParameter($addressBookId),
+                    'operation' => $query->createNamedParameter($operation),
+                    'created_at' => time(),
+                ])
+                ->executeStatement();
+
+            $query = $this->db->getQueryBuilder();
+            $query->update('addressbooks')
+                ->set('synctoken', $query->createNamedParameter($syncToken + 1, IQueryBuilder::PARAM_INT))
+                ->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)))
+                ->executeStatement();
+        }, $this->db);
+    }
+
+    /**
+     * @param resource|string $cardData
+     * @param bool $modified
+     * @return string
+     */
+    private function readBlob($cardData, &$modified = false) {
+        if (is_resource($cardData)) {
+            $cardData = stream_get_contents($cardData);
+        }
+
+        // Micro optimisation
+        // don't loop through
+        if (str_starts_with($cardData, 'PHOTO:data:')) {
+            return $cardData;
+        }
+
+        $cardDataArray = explode("\r\n", $cardData);
+
+        $cardDataFiltered = [];
+        $removingPhoto = false;
+        foreach ($cardDataArray as $line) {
+            if (str_starts_with($line, 'PHOTO:data:')
+                && !str_starts_with($line, 'PHOTO:data:image/')) {
+                // Filter out PHOTO data of non-images
+                $removingPhoto = true;
+                $modified = true;
+                continue;
+            }
+
+            if ($removingPhoto) {
+                if (str_starts_with($line, ' ')) {
+                    continue;
+                }
+                // No leading space means this is a new property
+                $removingPhoto = false;
+            }
+
+            $cardDataFiltered[] = $line;
+        }
+        return implode("\r\n", $cardDataFiltered);
+    }
+
+    /**
+     * @param list<array{href: string, commonName: string, readOnly: bool}> $add
+     * @param list<string> $remove
+     */
+    public function updateShares(IShareable $shareable, array $add, array $remove): void {
+        $this->atomic(function () use ($shareable, $add, $remove): void {
+            $addressBookId = $shareable->getResourceId();
+            $addressBookData = $this->getAddressBookById($addressBookId);
+            $oldShares = $this->getShares($addressBookId);
+
+            $this->sharingBackend->updateShares($shareable, $add, $remove, $oldShares);
+
+            $this->dispatcher->dispatchTyped(new AddressBookShareUpdatedEvent($addressBookId, $addressBookData, $oldShares, $add, $remove));
+        }, $this->db);
+    }
+
+    /**
+     * Delete all of a user's shares
+     */
+    public function deleteAllSharesByUser(string $principaluri): void {
+        $this->sharingBackend->deleteAllSharesByUser($principaluri);
+    }
+
+    /**
+     * Search contacts in a specific address-book
+     *
+     * @param int $addressBookId
+     * @param string $pattern which should match within the $searchProperties
+     * @param array $searchProperties defines the properties within the query pattern should match
+     * @param array $options = array() to define the search behavior
+     *                       - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array
+     *                       - 'escape_like_param' - If set to false wildcards _ and % are not escaped, otherwise they are
+     *                       - 'limit' - Set a numeric limit for the search results
+     *                       - 'offset' - Set the offset for the limited search results
+     *                       - 'wildcard' - Whether the search should use wildcards
+     * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options
+     * @return array an array of contacts which are arrays of key-value-pairs
+     */
+    public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
+        return $this->atomic(function () use ($addressBookId, $pattern, $searchProperties, $options) {
+            return $this->searchByAddressBookIds([$addressBookId], $pattern, $searchProperties, $options);
+        }, $this->db);
+    }
+
+    /**
+     * Search contacts in all address-books accessible by a user
+     *
+     * @param string $principalUri
+     * @param string $pattern
+     * @param array $searchProperties
+     * @param array $options
+     * @return array
+     */
+    public function searchPrincipalUri(string $principalUri,
+        string $pattern,
+        array $searchProperties,
+        array $options = []): array {
+        return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
+            $addressBookIds = array_map(static function ($row):int {
+                return (int)$row['id'];
+            }, $this->getAddressBooksForUser($principalUri));
+
+            return $this->searchByAddressBookIds($addressBookIds, $pattern, $searchProperties, $options);
+        }, $this->db);
+    }
+
+    /**
+     * @param int[] $addressBookIds
+     * @param string $pattern
+     * @param array $searchProperties
+     * @param array $options
+     * @psalm-param array{
+     *   types?: bool,
+     *   escape_like_param?: bool,
+     *   limit?: int,
+     *   offset?: int,
+     *   wildcard?: bool,
+     *   since?: DateTimeFilter|null,
+     *   until?: DateTimeFilter|null,
+     *   person?: string
+     * } $options
+     * @return array
+     */
+    private function searchByAddressBookIds(array $addressBookIds,
+        string $pattern,
+        array $searchProperties,
+        array $options = []): array {
+        if (empty($addressBookIds)) {
+            return [];
+        }
+        $escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
+        $useWildcards = !\array_key_exists('wildcard', $options) || $options['wildcard'] !== false;
+
+        if ($escapePattern) {
+            $searchProperties = array_filter($searchProperties, function ($property) use ($pattern) {
+                if ($property === 'EMAIL' && str_contains($pattern, ' ')) {
+                    // There can be no spaces in emails
+                    return false;
+                }
+
+                if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 :_.@\/\-\']/', $pattern) === 1) {
+                    // There can be no chars in cloud ids which are not valid for user ids plus :/
+                    // worst case: CA61590A-BBBC-423E-84AF-E6DF01455A53@https://my.nxt/srv/
+                    return false;
+                }
+
+                return true;
+            });
+        }
+
+        if (empty($searchProperties)) {
+            return [];
+        }
+
+        $query2 = $this->db->getQueryBuilder();
+        $query2->selectDistinct('cp.cardid')
+            ->from($this->dbCardsPropertiesTable, 'cp')
+            ->where($query2->expr()->in('cp.addressbookid', $query2->createNamedParameter($addressBookIds, IQueryBuilder::PARAM_INT_ARRAY), IQueryBuilder::PARAM_INT_ARRAY))
+            ->andWhere($query2->expr()->in('cp.name', $query2->createNamedParameter($searchProperties, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        // No need for like when the pattern is empty
+        if ($pattern !== '') {
+            if (!$useWildcards) {
+                $query2->andWhere($query2->expr()->eq('cp.value', $query2->createNamedParameter($pattern)));
+            } elseif (!$escapePattern) {
+                $query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
+            } else {
+                $query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
+            }
+        }
+        if (isset($options['limit'])) {
+            $query2->setMaxResults($options['limit']);
+        }
+        if (isset($options['offset'])) {
+            $query2->setFirstResult($options['offset']);
+        }
+
+        if (isset($options['person'])) {
+            $query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($options['person']) . '%')));
+        }
+        if (isset($options['since']) || isset($options['until'])) {
+            $query2->join('cp', $this->dbCardsPropertiesTable, 'cp_bday', 'cp.cardid = cp_bday.cardid');
+            $query2->andWhere($query2->expr()->eq('cp_bday.name', $query2->createNamedParameter('BDAY')));
+            /**
+             * FIXME Find a way to match only 4 last digits
+             * BDAY can be --1018 without year or 20001019 with it
+             * $bDayOr = [];
+             * if ($options['since'] instanceof DateTimeFilter) {
+             * $bDayOr[] =
+             * $query2->expr()->gte('SUBSTR(cp_bday.value, -4)',
+             * $query2->createNamedParameter($options['since']->get()->format('md'))
+             * );
+             * }
+             * if ($options['until'] instanceof DateTimeFilter) {
+             * $bDayOr[] =
+             * $query2->expr()->lte('SUBSTR(cp_bday.value, -4)',
+             * $query2->createNamedParameter($options['until']->get()->format('md'))
+             * );
+             * }
+             * $query2->andWhere($query2->expr()->orX(...$bDayOr));
+             */
+        }
+
+        $result = $query2->executeQuery();
+        $matches = $result->fetchAllAssociative();
+        $result->closeCursor();
+        $matches = array_map(function ($match) {
+            return (int)$match['cardid'];
+        }, $matches);
+
+        $cardResults = [];
+        $query = $this->db->getQueryBuilder();
+        $query->select('c.addressbookid', 'c.carddata', 'c.uri')
+            ->from($this->dbCardsTable, 'c')
+            ->where($query->expr()->in('c.id', $query->createParameter('matches')));
+
+        foreach (array_chunk($matches, 1000) as $matchesChunk) {
+            $query->setParameter('matches', $matchesChunk, IQueryBuilder::PARAM_INT_ARRAY);
+            $result = $query->executeQuery();
+            $cardResults[] = $result->fetchAllAssociative();
+            $result->closeCursor();
+        }
+
+        $cards = array_merge(...$cardResults);
+        return array_map(function ($array) {
+            $array['addressbookid'] = (int)$array['addressbookid'];
+            $modified = false;
+            $array['carddata'] = $this->readBlob($array['carddata'], $modified);
+            if ($modified) {
+                $array['size'] = strlen($array['carddata']);
+            }
+            return $array;
+        }, $cards);
+    }
+
+    /**
+     * @param int $bookId
+     * @param string $name
+     * @return array
+     */
+    public function collectCardProperties($bookId, $name) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->selectDistinct('value')
+            ->from($this->dbCardsPropertiesTable)
+            ->where($query->expr()->eq('name', $query->createNamedParameter($name)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
+            ->executeQuery();
+
+        $all = $result->fetchFirstColumn();
+        $result->closeCursor();
+
+        return $all;
+    }
+
+    /**
+     * get URI from a given contact
+     *
+     * @param int $id
+     * @return string
+     */
+    public function getCardUri($id) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('uri')->from($this->dbCardsTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+
+        $result = $query->executeQuery();
+        $uri = $result->fetchAssociative();
+        $result->closeCursor();
+
+        if (!isset($uri['uri'])) {
+            throw new \InvalidArgumentException('Card does not exists: ' . $id);
+        }
+
+        return $uri['uri'];
+    }
+
+    /**
+     * return contact with the given URI
+     *
+     * @param int $addressBookId
+     * @param string $uri
+     * @returns array
+     */
+    public function getContact($addressBookId, $uri) {
+        $result = [];
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')->from($this->dbCardsTable)
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
+        $queryResult = $query->executeQuery();
+        $contact = $queryResult->fetchAssociative();
+        $queryResult->closeCursor();
+
+        if (is_array($contact)) {
+            $modified = false;
+            $contact['etag'] = '"' . $contact['etag'] . '"';
+            $contact['carddata'] = $this->readBlob($contact['carddata'], $modified);
+            if ($modified) {
+                $contact['size'] = strlen($contact['carddata']);
+            }
+
+            $result = $contact;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the list of people whom this address book is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *
+     * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>
+     */
+    public function getShares(int $addressBookId): array {
+        return $this->sharingBackend->getShares($addressBookId);
+    }
+
+    /**
+     * update properties table
+     *
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param string $vCardSerialized
+     */
+    protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
+        $this->atomic(function () use ($addressBookId, $cardUri, $vCardSerialized): void {
+            $cardId = $this->getCardId($addressBookId, $cardUri);
+            $vCard = $this->readCard($vCardSerialized);
+
+            $this->purgeProperties($addressBookId, $cardId);
+
+            $query = $this->db->getQueryBuilder();
+            $query->insert($this->dbCardsPropertiesTable)
+                ->values(
+                    [
+                        'addressbookid' => $query->createNamedParameter($addressBookId),
+                        'cardid' => $query->createNamedParameter($cardId),
+                        'name' => $query->createParameter('name'),
+                        'value' => $query->createParameter('value'),
+                        'preferred' => $query->createParameter('preferred')
+                    ]
+                );
+
+            foreach ($vCard->children() as $property) {
+                if (!in_array($property->name, self::$indexProperties)) {
+                    continue;
+                }
+                $preferred = 0;
+                foreach ($property->parameters as $parameter) {
+                    if ($parameter->name === 'TYPE' && strtoupper($parameter->getValue()) === 'PREF') {
+                        $preferred = 1;
+                        break;
+                    }
+                }
+                $query->setParameter('name', $property->name);
+                $query->setParameter('value', mb_strcut($property->getValue(), 0, 254));
+                $query->setParameter('preferred', $preferred);
+                $query->executeStatement();
+            }
+        }, $this->db);
+    }
+
+    /**
+     * read vCard data into a vCard object
+     *
+     * @param string $cardData
+     * @return VCard
+     */
+    protected function readCard($cardData) {
+        return Reader::read($cardData);
+    }
+
+    /**
+     * delete all properties from a given card
+     *
+     * @param int $addressBookId
+     * @param int $cardId
+     */
+    protected function purgeProperties($addressBookId, $cardId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->dbCardsPropertiesTable)
+            ->where($query->expr()->eq('cardid', $query->createNamedParameter($cardId)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
+        $query->executeStatement();
+    }
+
+    /**
+     * Get ID from a given contact
+     */
+    protected function getCardId(int $addressBookId, string $uri): int {
+        $query = $this->db->getQueryBuilder();
+        $query->select('id')->from($this->dbCardsTable)
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
+
+        $result = $query->executeQuery();
+        $cardIds = $result->fetchAssociative();
+        $result->closeCursor();
+
+        if (!isset($cardIds['id'])) {
+            throw new \InvalidArgumentException('Card does not exists: ' . $uri);
+        }
+
+        return (int)$cardIds['id'];
+    }
+
+    /**
+     * For shared address books the sharee is set in the ACL of the address book
+     *
+     * @param int $addressBookId
+     * @param list<array{privilege: string, principal: string, protected: bool}> $acl
+     * @return list<array{privilege: string, principal: string, protected: bool}>
+     */
+    public function applyShareAcl(int $addressBookId, array $acl): array {
+        $shares = $this->sharingBackend->getShares($addressBookId);
+        return $this->sharingBackend->applyShareAcl($shares, $acl);
+    }
+
+    /**
+     * @throws \InvalidArgumentException
+     */
+    public function pruneOutdatedSyncTokens(int $keep, int $retention): int {
+        if ($keep < 0) {
+            throw new \InvalidArgumentException();
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->func()->max('id'))
+            ->from('addressbookchanges');
+
+        $result = $query->executeQuery();
+        $maxId = (int)$result->fetchOne();
+        $result->closeCursor();
+        if (!$maxId || $maxId < $keep) {
+            return 0;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('addressbookchanges')
+            ->where(
+                $query->expr()->lte('id', $query->createNamedParameter($maxId - $keep, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
+                $query->expr()->lte('created_at', $query->createNamedParameter($retention)),
+            );
+        return $query->executeStatement();
+    }
+
+    private function convertPrincipal(string $principalUri, bool $toV2): string {
+        if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
+            [, $name] = \Sabre\Uri\split($principalUri);
+            if ($toV2 === true) {
+                return "principals/users/$name";
+            }
+            return "principals/$name";
+        }
+        return $principalUri;
+    }
+
+    private function addOwnerPrincipal(array &$addressbookInfo): void {
+        $ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
+        $displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+        if (isset($addressbookInfo[$ownerPrincipalKey])) {
+            $uri = $addressbookInfo[$ownerPrincipalKey];
+        } else {
+            $uri = $addressbookInfo['principaluri'];
+        }
+
+        $principalInformation = $this->principalBackend->getPrincipalByPath($uri);
+        if (isset($principalInformation['{DAV:}displayname'])) {
+            $addressbookInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
+        }
+    }
+
+    /**
+     * Extract UID from vcard
+     *
+     * @param string $cardData the vcard raw data
+     * @return string the uid
+     * @throws BadRequest if no UID is available or vcard is empty
+     */
+    private function getUID(string $cardData): string {
+        if ($cardData !== '') {
+            $vCard = Reader::read($cardData);
+            if ($vCard->UID) {
+                $uid = $vCard->UID->getValue();
+                return $uid;
+            }
+            // should already be handled, but just in case
+            throw new BadRequest('vCards on CardDAV servers MUST have a UID property');
+        }
+        // should already be handled, but just in case
+        throw new BadRequest('vCard can not be empty');
+    }
 }

Spacing +63 added lines, -63 removed lines

@@ -77,7 +77,7 @@ 
 			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
 
 		$result = $query->executeQuery();
-		$column = (int)$result->fetchOne();
+		$column = (int) $result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -100,7 +100,7 @@ 
 	 * @return array
 	 */
 	public function getAddressBooksForUser($principalUri) {
-		return $this->atomic(function () use ($principalUri) {
+		return $this->atomic(function() use ($principalUri) {
 			$principalUriOriginal = $principalUri;
 			$principalUri = $this->convertPrincipal($principalUri, true);
 			$select = $this->db->getQueryBuilder();
@@ -117,7 +117,7 @@ 
 					'uri' => $row['uri'],
 					'principaluri' => $this->convertPrincipal($row['principaluri'], false),
 					'{DAV:}displayname' => $row['displayname'],
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+					'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 				];
@@ -148,13 +148,13 @@ 
 				->andWhere($select->expr()->notIn('s.id', $select->createFunction($subSelect->getSQL()), IQueryBuilder::PARAM_INT_ARRAY));
 			$result = $select->executeQuery();
 
-			$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+			$readOnlyPropertyName = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
 			while ($row = $result->fetchAssociative()) {
 				if ($row['principaluri'] === $principalUri) {
 					continue;
 				}
 
-				$readOnly = (int)$row['access'] === Backend::ACCESS_READ;
+				$readOnly = (int) $row['access'] === Backend::ACCESS_READ;
 				if (isset($addressBooks[$row['id']])) {
 					if ($readOnly) {
 						// New share can not have more permissions then the old one.
@@ -168,18 +168,18 @@ 
 				}
 
 				[, $name] = \Sabre\Uri\split($row['principaluri']);
-				$uri = $row['uri'] . '_shared_by_' . $name;
-				$displayName = $row['displayname'] . ' (' . ($this->userManager->getDisplayName($name) ?? $name ?? '') . ')';
+				$uri = $row['uri'].'_shared_by_'.$name;
+				$displayName = $row['displayname'].' ('.($this->userManager->getDisplayName($name) ?? $name ?? '').')';
 
 				$addressBooks[$row['id']] = [
 					'id' => $row['id'],
 					'uri' => $uri,
 					'principaluri' => $principalUriOriginal,
 					'{DAV:}displayname' => $displayName,
-					'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+					'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 					'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 					'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
-					'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $row['principaluri'],
+					'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $row['principaluri'],
 					$readOnlyPropertyName => $readOnly,
 				];
 
@@ -207,7 +207,7 @@ 
 				'uri' => $row['uri'],
 				'principaluri' => $this->convertPrincipal($row['principaluri'], false),
 				'{DAV:}displayname' => $row['displayname'],
-				'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+				'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 				'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 			];
@@ -239,7 +239,7 @@ 
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 		];
@@ -269,7 +269,7 @@ 
 			'uri' => $row['uri'],
 			'principaluri' => $row['principaluri'],
 			'{DAV:}displayname' => $row['displayname'],
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description' => $row['description'],
 			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
 
@@ -277,8 +277,8 @@ 
 
 		// system address books are always read only
 		if ($principal === 'principals/system/system') {
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'] = $row['principaluri'];
-			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
+			$addressBook['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal'] = $row['principaluri'];
+			$addressBook['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only'] = true;
 		}
 
 		$this->addOwnerPrincipal($addressBook);
@@ -305,22 +305,22 @@ 
 	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
 		$supportedProperties = [
 			'{DAV:}displayname',
-			'{' . Plugin::NS_CARDDAV . '}addressbook-description',
+			'{'.Plugin::NS_CARDDAV.'}addressbook-description',
 		];
 
-		$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
+		$propPatch->handle($supportedProperties, function($mutations) use ($addressBookId) {
 			$updates = [];
 			foreach ($mutations as $property => $newValue) {
 				switch ($property) {
 					case '{DAV:}displayname':
 						$updates['displayname'] = $newValue;
 						break;
-					case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+					case '{'.Plugin::NS_CARDDAV.'}addressbook-description':
 						$updates['description'] = $newValue;
 						break;
 				}
 			}
-			[$addressBookRow, $shares] = $this->atomic(function () use ($addressBookId, $updates) {
+			[$addressBookRow, $shares] = $this->atomic(function() use ($addressBookId, $updates) {
 				$query = $this->db->getQueryBuilder();
 				$query->update('addressbooks');
 
@@ -332,12 +332,12 @@ 
 
 				$this->addChange($addressBookId, '', 2);
 
-				$addressBookRow = $this->getAddressBookById((int)$addressBookId);
-				$shares = $this->getShares((int)$addressBookId);
+				$addressBookRow = $this->getAddressBookById((int) $addressBookId);
+				$shares = $this->getShares((int) $addressBookId);
 				return [$addressBookRow, $shares];
 			}, $this->db);
 
-			$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations));
+			$this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int) $addressBookId, $addressBookRow, $shares, $mutations));
 
 			return true;
 		});
@@ -371,11 +371,11 @@ 
 				case '{DAV:}displayname':
 					$values['displayname'] = $newValue;
 					break;
-				case '{' . Plugin::NS_CARDDAV . '}addressbook-description':
+				case '{'.Plugin::NS_CARDDAV.'}addressbook-description':
 					$values['description'] = $newValue;
 					break;
 				default:
-					throw new BadRequest('Unknown property: ' . $property);
+					throw new BadRequest('Unknown property: '.$property);
 			}
 		}
 
@@ -385,7 +385,7 @@ 
 			$values['displayname'] = $url;
 		}
 
-		[$addressBookId, $addressBookRow] = $this->atomic(function () use ($values) {
+		[$addressBookId, $addressBookRow] = $this->atomic(function() use ($values) {
 			$query = $this->db->getQueryBuilder();
 			$query->insert('addressbooks')
 				->values([
@@ -417,8 +417,8 @@ 
 	 * @return void
 	 */
 	public function deleteAddressBook($addressBookId) {
-		$this->atomic(function () use ($addressBookId): void {
-			$addressBookId = (int)$addressBookId;
+		$this->atomic(function() use ($addressBookId): void {
+			$addressBookId = (int) $addressBookId;
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$shares = $this->getShares($addressBookId);
 
@@ -482,7 +482,7 @@ 
 
 		$result = $query->executeQuery();
 		while ($row = $result->fetchAssociative()) {
-			$row['etag'] = '"' . $row['etag'] . '"';
+			$row['etag'] = '"'.$row['etag'].'"';
 
 			$modified = false;
 			$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -522,7 +522,7 @@ 
 		if (!$row) {
 			return false;
 		}
-		$row['etag'] = '"' . $row['etag'] . '"';
+		$row['etag'] = '"'.$row['etag'].'"';
 
 		$modified = false;
 		$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -564,7 +564,7 @@ 
 			$result = $query->executeQuery();
 
 			while ($row = $result->fetchAssociative()) {
-				$row['etag'] = '"' . $row['etag'] . '"';
+				$row['etag'] = '"'.$row['etag'].'"';
 
 				$modified = false;
 				$row['carddata'] = $this->readBlob($row['carddata'], $modified);
@@ -608,7 +608,7 @@ 
 	public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
 		$etag = md5($cardData);
 		$uid = $this->getUID($cardData);
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
+		return $this->atomic(function() use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
 			if ($checkAlreadyExists) {
 				$q = $this->db->getQueryBuilder();
 				$q->select('uid')
@@ -617,7 +617,7 @@ 
 					->andWhere($q->expr()->eq('uid', $q->createNamedParameter($uid)))
 					->setMaxResults(1);
 				$result = $q->executeQuery();
-				$count = (bool)$result->fetchOne();
+				$count = (bool) $result->fetchOne();
 				$result->closeCursor();
 				if ($count) {
 					throw new \Sabre\DAV\Exception\BadRequest('VCard object with uid already exists in this addressbook collection.');
@@ -648,7 +648,7 @@ 
 			$objectRow = $this->getCard($addressBookId, $cardUri);
 			$this->dispatcher->dispatchTyped(new CardCreatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
 
-			return '"' . $etag . '"';
+			return '"'.$etag.'"';
 		}, $this->db);
 	}
 
@@ -681,13 +681,13 @@ 
 		$uid = $this->getUID($cardData);
 		$etag = md5($cardData);
 
-		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
+		return $this->atomic(function() use ($addressBookId, $cardUri, $cardData, $uid, $etag) {
 			$query = $this->db->getQueryBuilder();
 
 			// check for recently stored etag and stop if it is the same
 			$etagCacheKey = "$addressBookId#$cardUri";
 			if (isset($this->etagCache[$etagCacheKey]) && $this->etagCache[$etagCacheKey] === $etag) {
-				return '"' . $etag . '"';
+				return '"'.$etag.'"';
 			}
 
 			$query->update($this->dbCardsTable)
@@ -709,7 +709,7 @@ 
 			$shares = $this->getShares($addressBookId);
 			$objectRow = $this->getCard($addressBookId, $cardUri);
 			$this->dispatcher->dispatchTyped(new CardUpdatedEvent($addressBookId, $addressBookData, $shares, $objectRow));
-			return '"' . $etag . '"';
+			return '"'.$etag.'"';
 		}, $this->db);
 	}
 
@@ -717,12 +717,12 @@ 
 	 * @throws Exception
 	 */
 	public function moveCard(int $sourceAddressBookId, string $sourceObjectUri, int $targetAddressBookId, string $tragetObjectUri): bool {
-		return $this->atomic(function () use ($sourceAddressBookId, $sourceObjectUri, $targetAddressBookId, $tragetObjectUri) {
+		return $this->atomic(function() use ($sourceAddressBookId, $sourceObjectUri, $targetAddressBookId, $tragetObjectUri) {
 			$card = $this->getCard($sourceAddressBookId, $sourceObjectUri);
 			if (empty($card)) {
 				return false;
 			}
-			$sourceObjectId = (int)$card['id'];
+			$sourceObjectId = (int) $card['id'];
 
 			$query = $this->db->getQueryBuilder();
 			$query->update('cards')
@@ -765,7 +765,7 @@ 
 	 * @return bool
 	 */
 	public function deleteCard($addressBookId, $cardUri) {
-		return $this->atomic(function () use ($addressBookId, $cardUri) {
+		return $this->atomic(function() use ($addressBookId, $cardUri) {
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$shares = $this->getShares($addressBookId);
 			$objectRow = $this->getCard($addressBookId, $cardUri);
@@ -855,7 +855,7 @@ 
 		$maxLimit = $this->config->getSystemValueInt('carddav_sync_request_truncation', 2500);
 		$limit = ($limit === null) ? $maxLimit : min($limit, $maxLimit);
 		// Current synctoken
-		return $this->atomic(function () use ($addressBookId, $syncToken, $syncLevel, $limit) {
+		return $this->atomic(function() use ($addressBookId, $syncToken, $syncLevel, $limit) {
 			$qb = $this->db->getQueryBuilder();
 			$qb->select('synctoken')
 				->from('addressbooks')
@@ -899,7 +899,7 @@ 
 				} else {
 					$lastID = $values[array_key_last($values)]['id'];
 					$result['added'] = array_column($values, 'uri');
-					$result['syncToken'] = count($result['added']) >= $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken ;
+					$result['syncToken'] = count($result['added']) >= $limit ? "init_{$lastID}_$initialSyncToken" : $initialSyncToken;
 					$result['result_truncated'] = count($result['added']) >= $limit;
 				}
 			} elseif ($syncToken) {
@@ -983,7 +983,7 @@ 
 				}
 				$lastID = $values[array_key_last($values)]['id'];
 				if (count($values) >= $limit) {
-					$result['syncToken'] = 'init_' . $lastID . '_' . $currentToken;
+					$result['syncToken'] = 'init_'.$lastID.'_'.$currentToken;
 					$result['result_truncated'] = true;
 				}
 
@@ -1004,13 +1004,13 @@ 
 	 * @return void
 	 */
 	protected function addChange(int $addressBookId, string $objectUri, int $operation): void {
-		$this->atomic(function () use ($addressBookId, $objectUri, $operation): void {
+		$this->atomic(function() use ($addressBookId, $objectUri, $operation): void {
 			$query = $this->db->getQueryBuilder();
 			$query->select('synctoken')
 				->from('addressbooks')
 				->where($query->expr()->eq('id', $query->createNamedParameter($addressBookId)));
 			$result = $query->executeQuery();
-			$syncToken = (int)$result->fetchOne();
+			$syncToken = (int) $result->fetchOne();
 			$result->closeCursor();
 
 			$query = $this->db->getQueryBuilder();
@@ -1079,7 +1079,7 @@ 
 	 * @param list<string> $remove
 	 */
 	public function updateShares(IShareable $shareable, array $add, array $remove): void {
-		$this->atomic(function () use ($shareable, $add, $remove): void {
+		$this->atomic(function() use ($shareable, $add, $remove): void {
 			$addressBookId = $shareable->getResourceId();
 			$addressBookData = $this->getAddressBookById($addressBookId);
 			$oldShares = $this->getShares($addressBookId);
@@ -1113,7 +1113,7 @@ 
 	 * @return array an array of contacts which are arrays of key-value-pairs
 	 */
 	public function search($addressBookId, $pattern, $searchProperties, $options = []): array {
-		return $this->atomic(function () use ($addressBookId, $pattern, $searchProperties, $options) {
+		return $this->atomic(function() use ($addressBookId, $pattern, $searchProperties, $options) {
 			return $this->searchByAddressBookIds([$addressBookId], $pattern, $searchProperties, $options);
 		}, $this->db);
 	}
@@ -1131,9 +1131,9 @@ 
 		string $pattern,
 		array $searchProperties,
 		array $options = []): array {
-		return $this->atomic(function () use ($principalUri, $pattern, $searchProperties, $options) {
-			$addressBookIds = array_map(static function ($row):int {
-				return (int)$row['id'];
+		return $this->atomic(function() use ($principalUri, $pattern, $searchProperties, $options) {
+			$addressBookIds = array_map(static function($row):int {
+				return (int) $row['id'];
 			}, $this->getAddressBooksForUser($principalUri));
 
 			return $this->searchByAddressBookIds($addressBookIds, $pattern, $searchProperties, $options);
@@ -1168,7 +1168,7 @@ 
 		$useWildcards = !\array_key_exists('wildcard', $options) || $options['wildcard'] !== false;
 
 		if ($escapePattern) {
-			$searchProperties = array_filter($searchProperties, function ($property) use ($pattern) {
+			$searchProperties = array_filter($searchProperties, function($property) use ($pattern) {
 				if ($property === 'EMAIL' && str_contains($pattern, ' ')) {
 					// There can be no spaces in emails
 					return false;
@@ -1201,7 +1201,7 @@ 
 			} elseif (!$escapePattern) {
 				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
 			} else {
-				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
+				$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%'.$this->db->escapeLikeParameter($pattern).'%')));
 			}
 		}
 		if (isset($options['limit'])) {
@@ -1212,7 +1212,7 @@ 
 		}
 
 		if (isset($options['person'])) {
-			$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($options['person']) . '%')));
+			$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%'.$this->db->escapeLikeParameter($options['person']).'%')));
 		}
 		if (isset($options['since']) || isset($options['until'])) {
 			$query2->join('cp', $this->dbCardsPropertiesTable, 'cp_bday', 'cp.cardid = cp_bday.cardid');
@@ -1240,8 +1240,8 @@ 
 		$result = $query2->executeQuery();
 		$matches = $result->fetchAllAssociative();
 		$result->closeCursor();
-		$matches = array_map(function ($match) {
-			return (int)$match['cardid'];
+		$matches = array_map(function($match) {
+			return (int) $match['cardid'];
 		}, $matches);
 
 		$cardResults = [];
@@ -1258,8 +1258,8 @@ 
 		}
 
 		$cards = array_merge(...$cardResults);
-		return array_map(function ($array) {
-			$array['addressbookid'] = (int)$array['addressbookid'];
+		return array_map(function($array) {
+			$array['addressbookid'] = (int) $array['addressbookid'];
 			$modified = false;
 			$array['carddata'] = $this->readBlob($array['carddata'], $modified);
 			if ($modified) {
@@ -1305,7 +1305,7 @@ 
 		$result->closeCursor();
 
 		if (!isset($uri['uri'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $id);
+			throw new \InvalidArgumentException('Card does not exists: '.$id);
 		}
 
 		return $uri['uri'];
@@ -1330,7 +1330,7 @@ 
 
 		if (is_array($contact)) {
 			$modified = false;
-			$contact['etag'] = '"' . $contact['etag'] . '"';
+			$contact['etag'] = '"'.$contact['etag'].'"';
 			$contact['carddata'] = $this->readBlob($contact['carddata'], $modified);
 			if ($modified) {
 				$contact['size'] = strlen($contact['carddata']);
@@ -1365,7 +1365,7 @@ 
 	 * @param string $vCardSerialized
 	 */
 	protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
-		$this->atomic(function () use ($addressBookId, $cardUri, $vCardSerialized): void {
+		$this->atomic(function() use ($addressBookId, $cardUri, $vCardSerialized): void {
 			$cardId = $this->getCardId($addressBookId, $cardUri);
 			$vCard = $this->readCard($vCardSerialized);
 
@@ -1440,10 +1440,10 @@ 
 		$result->closeCursor();
 
 		if (!isset($cardIds['id'])) {
-			throw new \InvalidArgumentException('Card does not exists: ' . $uri);
+			throw new \InvalidArgumentException('Card does not exists: '.$uri);
 		}
 
-		return (int)$cardIds['id'];
+		return (int) $cardIds['id'];
 	}
 
 	/**
@@ -1471,7 +1471,7 @@ 
 			->from('addressbookchanges');
 
 		$result = $query->executeQuery();
-		$maxId = (int)$result->fetchOne();
+		$maxId = (int) $result->fetchOne();
 		$result->closeCursor();
 		if (!$maxId || $maxId < $keep) {
 			return 0;
@@ -1498,8 +1498,8 @@ 
 	}
 
 	private function addOwnerPrincipal(array &$addressbookInfo): void {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+		$ownerPrincipalKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal';
+		$displaynameKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname';
 		if (isset($addressbookInfo[$ownerPrincipalKey])) {
 			$uri = $addressbookInfo[$ownerPrincipalKey];
 		} else {

apps/dav/lib/Command/RemoveInvalidShares.php

Indentation +37 added lines, -37 removed lines

@@ -22,46 +22,46 @@
  * have no matching principal. Happened because of a bug in the calendar app.
  */
 class RemoveInvalidShares extends Command {
-	public function __construct(
-		private IDBConnection $connection,
-		private Principal $principalBackend,
-		private RemoteUserPrincipalBackend $remoteUserPrincipalBackend,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private Principal $principalBackend,
+        private RemoteUserPrincipalBackend $remoteUserPrincipalBackend,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('dav:remove-invalid-shares')
-			->setDescription('Remove invalid dav shares');
-	}
+    protected function configure(): void {
+        $this
+            ->setName('dav:remove-invalid-shares')
+            ->setDescription('Remove invalid dav shares');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$query = $this->connection->getQueryBuilder();
-		$result = $query->selectDistinct('principaluri')
-			->from('dav_shares')
-			->executeQuery();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $query = $this->connection->getQueryBuilder();
+        $result = $query->selectDistinct('principaluri')
+            ->from('dav_shares')
+            ->executeQuery();
 
-		while ($row = $result->fetchAssociative()) {
-			$principaluri = $row['principaluri'];
-			$p = $this->principalBackend->getPrincipalByPath($principaluri)
-				?? $this->remoteUserPrincipalBackend->getPrincipalByPath($principaluri);
-			if ($p === null) {
-				$this->deleteSharesForPrincipal($principaluri);
-			}
-		}
+        while ($row = $result->fetchAssociative()) {
+            $principaluri = $row['principaluri'];
+            $p = $this->principalBackend->getPrincipalByPath($principaluri)
+                ?? $this->remoteUserPrincipalBackend->getPrincipalByPath($principaluri);
+            if ($p === null) {
+                $this->deleteSharesForPrincipal($principaluri);
+            }
+        }
 
-		$result->closeCursor();
-		return self::SUCCESS;
-	}
+        $result->closeCursor();
+        return self::SUCCESS;
+    }
 
-	/**
-	 * @param string $principaluri
-	 */
-	private function deleteSharesForPrincipal($principaluri): void {
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('dav_shares')
-			->where($delete->expr()->eq('principaluri', $delete->createNamedParameter($principaluri)));
-		$delete->executeStatement();
-	}
+    /**
+     * @param string $principaluri
+     */
+    private function deleteSharesForPrincipal($principaluri): void {
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('dav_shares')
+            ->where($delete->expr()->eq('principaluri', $delete->createNamedParameter($principaluri)));
+        $delete->executeStatement();
+    }
 }