nextcloud / server

apps/dav/lib/CalDAV/Federation/FederatedCalendarImpl.php

Indentation +43 added lines, -43 removed lines

@@ -17,57 +17,57 @@
 use OCP\Constants;
 
 class FederatedCalendarImpl implements ICalendar, ICalendarIsShared, ICalendarIsWritable, ICalendarIsEnabled {
-	public function __construct(
-		private readonly array $calendarInfo,
-		private readonly CalDavBackend $calDavBackend,
-	) {
-	}
+    public function __construct(
+        private readonly array $calendarInfo,
+        private readonly CalDavBackend $calDavBackend,
+    ) {
+    }
 
-	public function getKey(): string {
-		return (string)$this->calendarInfo['id'];
-	}
+    public function getKey(): string {
+        return (string)$this->calendarInfo['id'];
+    }
 
-	public function getUri(): string {
-		return $this->calendarInfo['uri'];
-	}
+    public function getUri(): string {
+        return $this->calendarInfo['uri'];
+    }
 
-	public function getDisplayName(): ?string {
-		return $this->calendarInfo['{DAV:}displayname'];
-	}
+    public function getDisplayName(): ?string {
+        return $this->calendarInfo['{DAV:}displayname'];
+    }
 
-	public function getDisplayColor(): ?string {
-		return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
-	}
+    public function getDisplayColor(): ?string {
+        return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
+    }
 
-	public function search(string $pattern, array $searchProperties = [], array $options = [], ?int $limit = null, ?int $offset = null): array {
-		return $this->calDavBackend->search(
-			$this->calendarInfo,
-			$pattern,
-			$searchProperties,
-			$options,
-			$limit,
-			$offset,
-		);
-	}
+    public function search(string $pattern, array $searchProperties = [], array $options = [], ?int $limit = null, ?int $offset = null): array {
+        return $this->calDavBackend->search(
+            $this->calendarInfo,
+            $pattern,
+            $searchProperties,
+            $options,
+            $limit,
+            $offset,
+        );
+    }
 
-	public function getPermissions(): int {
-		// TODO: implement read-write sharing
-		return Constants::PERMISSION_READ;
-	}
+    public function getPermissions(): int {
+        // TODO: implement read-write sharing
+        return Constants::PERMISSION_READ;
+    }
 
-	public function isDeleted(): bool {
-		return false;
-	}
+    public function isDeleted(): bool {
+        return false;
+    }
 
-	public function isShared(): bool {
-		return true;
-	}
+    public function isShared(): bool {
+        return true;
+    }
 
-	public function isWritable(): bool {
-		return false;
-	}
+    public function isWritable(): bool {
+        return false;
+    }
 
-	public function isEnabled(): bool {
-		return $this->calendarInfo['{http://owncloud.org/ns}calendar-enabled'] ?? true;
-	}
+    public function isEnabled(): bool {
+        return $this->calendarInfo['{http://owncloud.org/ns}calendar-enabled'] ?? true;
+    }
 }

apps/dav/lib/CalDAV/Federation/CalendarFederationNotifier.php

Indentation +43 added lines, -43 removed lines

@@ -17,52 +17,52 @@
 use OCP\OCM\Exceptions\OCMProviderException;
 
 class CalendarFederationNotifier {
-	public const NOTIFICATION_SYNC_CALENDAR = 'SYNC_CALENDAR';
+    public const NOTIFICATION_SYNC_CALENDAR = 'SYNC_CALENDAR';
 
-	public const PROP_SYNC_CALENDAR_SHARE_WITH = 'shareWith';
-	public const PROP_SYNC_CALENDAR_CALENDAR_URL = 'calendarUrl';
+    public const PROP_SYNC_CALENDAR_SHARE_WITH = 'shareWith';
+    public const PROP_SYNC_CALENDAR_CALENDAR_URL = 'calendarUrl';
 
-	public function __construct(
-		private readonly ICloudFederationFactory $federationFactory,
-		private readonly ICloudFederationProviderManager $federationManager,
-		private readonly IURLGenerator $url,
-	) {
-	}
+    public function __construct(
+        private readonly ICloudFederationFactory $federationFactory,
+        private readonly ICloudFederationProviderManager $federationManager,
+        private readonly IURLGenerator $url,
+    ) {
+    }
 
-	/**
-	 * Notify a remote server to sync a calendar.
-	 *
-	 * @param ICloudId $shareWith The cloud id of the remote sharee.
-	 * @return IResponse
-	 *
-	 * @throws OCMProviderException If sending the notification fails.
-	 */
-	public function notifySyncCalendar(
-		ICloudId $shareWith,
-		string $calendarOwner,
-		string $calendarName,
-		string $sharedSecret,
-	): IResponse {
-		$sharedWithEncoded = base64_encode($shareWith->getId());
-		$relativeCalendarUrl = "remote-calendars/$sharedWithEncoded/{$calendarName}_shared_by_$calendarOwner";
-		$calendarUrl = $this->url->linkTo('', 'remote.php') . "/dav/$relativeCalendarUrl";
-		$calendarUrl = $this->url->getAbsoluteURL($calendarUrl);
+    /**
+     * Notify a remote server to sync a calendar.
+     *
+     * @param ICloudId $shareWith The cloud id of the remote sharee.
+     * @return IResponse
+     *
+     * @throws OCMProviderException If sending the notification fails.
+     */
+    public function notifySyncCalendar(
+        ICloudId $shareWith,
+        string $calendarOwner,
+        string $calendarName,
+        string $sharedSecret,
+    ): IResponse {
+        $sharedWithEncoded = base64_encode($shareWith->getId());
+        $relativeCalendarUrl = "remote-calendars/$sharedWithEncoded/{$calendarName}_shared_by_$calendarOwner";
+        $calendarUrl = $this->url->linkTo('', 'remote.php') . "/dav/$relativeCalendarUrl";
+        $calendarUrl = $this->url->getAbsoluteURL($calendarUrl);
 
-		$notification = $this->federationFactory->getCloudFederationNotification();
-		$notification->setMessage(
-			self::NOTIFICATION_SYNC_CALENDAR,
-			CalendarFederationProvider::CALENDAR_RESOURCE,
-			CalendarFederationProvider::PROVIDER_ID,
-			[
-				'sharedSecret' => $sharedSecret,
-				self::PROP_SYNC_CALENDAR_SHARE_WITH => $shareWith->getId(),
-				self::PROP_SYNC_CALENDAR_CALENDAR_URL => $calendarUrl,
-			],
-		);
+        $notification = $this->federationFactory->getCloudFederationNotification();
+        $notification->setMessage(
+            self::NOTIFICATION_SYNC_CALENDAR,
+            CalendarFederationProvider::CALENDAR_RESOURCE,
+            CalendarFederationProvider::PROVIDER_ID,
+            [
+                'sharedSecret' => $sharedSecret,
+                self::PROP_SYNC_CALENDAR_SHARE_WITH => $shareWith->getId(),
+                self::PROP_SYNC_CALENDAR_CALENDAR_URL => $calendarUrl,
+            ],
+        );
 
-		return $this->federationManager->sendCloudNotification(
-			$shareWith->getRemote(),
-			$notification,
-		);
-	}
+        return $this->federationManager->sendCloudNotification(
+            $shareWith->getRemote(),
+            $notification,
+        );
+    }
 }

apps/dav/lib/CalDAV/Federation/FederatedCalendarSyncService.php

Indentation +50 added lines, -50 removed lines

@@ -15,62 +15,62 @@
 use Psr\Log\LoggerInterface;
 
 class FederatedCalendarSyncService {
-	private const SYNC_TOKEN_PREFIX = 'http://sabre.io/ns/sync/';
+    private const SYNC_TOKEN_PREFIX = 'http://sabre.io/ns/sync/';
 
-	public function __construct(
-		private readonly FederatedCalendarMapper $federatedCalendarMapper,
-		private readonly LoggerInterface $logger,
-		private readonly CalDavSyncService $syncService,
-		private readonly ICloudIdManager $cloudIdManager,
-	) {
-	}
+    public function __construct(
+        private readonly FederatedCalendarMapper $federatedCalendarMapper,
+        private readonly LoggerInterface $logger,
+        private readonly CalDavSyncService $syncService,
+        private readonly ICloudIdManager $cloudIdManager,
+    ) {
+    }
 
-	/**
-	 * @return int Downloaded event count (created or updated).
-	 *
-	 * @throws ClientExceptionInterface If syncing the calendar fails.
-	 */
-	public function syncOne(FederatedCalendarEntity $calendar): int {
-		[,, $sharedWith] = explode('/', $calendar->getPrincipaluri());
-		$calDavUser = $this->cloudIdManager->getCloudId($sharedWith, null)->getId();
-		$remoteUrl = $calendar->getRemoteUrl();
-		$syncToken = $calendar->getSyncTokenForSabre();
+    /**
+     * @return int Downloaded event count (created or updated).
+     *
+     * @throws ClientExceptionInterface If syncing the calendar fails.
+     */
+    public function syncOne(FederatedCalendarEntity $calendar): int {
+        [,, $sharedWith] = explode('/', $calendar->getPrincipaluri());
+        $calDavUser = $this->cloudIdManager->getCloudId($sharedWith, null)->getId();
+        $remoteUrl = $calendar->getRemoteUrl();
+        $syncToken = $calendar->getSyncTokenForSabre();
 
-		// Need to encode the cloud id as it might contain a colon which is not allowed in basic
-		// auth according to RFC 7617
-		$calDavUser = base64_encode($calDavUser);
+        // Need to encode the cloud id as it might contain a colon which is not allowed in basic
+        // auth according to RFC 7617
+        $calDavUser = base64_encode($calDavUser);
 
-		$syncResponse = $this->syncService->syncRemoteCalendar(
-			$remoteUrl,
-			$calDavUser,
-			$calendar->getToken(),
-			$syncToken,
-			$calendar,
-		);
+        $syncResponse = $this->syncService->syncRemoteCalendar(
+            $remoteUrl,
+            $calDavUser,
+            $calendar->getToken(),
+            $syncToken,
+            $calendar,
+        );
 
-		$newSyncToken = $syncResponse->getSyncToken();
+        $newSyncToken = $syncResponse->getSyncToken();
 
-		// Check sync token format and extract the actual sync token integer
-		$matches = [];
-		if (!preg_match('/^http:\/\/sabre\.io\/ns\/sync\/([0-9]+)$/', $newSyncToken, $matches)) {
-			$this->logger->error("Failed to sync federated calendar at $remoteUrl: New sync token has unexpected format: $newSyncToken", [
-				'calendar' => $calendar->toCalendarInfo(),
-				'newSyncToken' => $newSyncToken,
-			]);
-			return 0;
-		}
+        // Check sync token format and extract the actual sync token integer
+        $matches = [];
+        if (!preg_match('/^http:\/\/sabre\.io\/ns\/sync\/([0-9]+)$/', $newSyncToken, $matches)) {
+            $this->logger->error("Failed to sync federated calendar at $remoteUrl: New sync token has unexpected format: $newSyncToken", [
+                'calendar' => $calendar->toCalendarInfo(),
+                'newSyncToken' => $newSyncToken,
+            ]);
+            return 0;
+        }
 
-		$newSyncToken = (int)$matches[1];
-		if ($newSyncToken !== $calendar->getSyncToken()) {
-			$this->federatedCalendarMapper->updateSyncTokenAndTime(
-				$calendar->getId(),
-				$newSyncToken,
-			);
-		} else {
-			$this->logger->debug("Sync Token for $remoteUrl unchanged from previous sync");
-			$this->federatedCalendarMapper->updateSyncTime($calendar->getId());
-		}
+        $newSyncToken = (int)$matches[1];
+        if ($newSyncToken !== $calendar->getSyncToken()) {
+            $this->federatedCalendarMapper->updateSyncTokenAndTime(
+                $calendar->getId(),
+                $newSyncToken,
+            );
+        } else {
+            $this->logger->debug("Sync Token for $remoteUrl unchanged from previous sync");
+            $this->federatedCalendarMapper->updateSyncTime($calendar->getId());
+        }
 
-		return $syncResponse->getDownloadedEvents();
-	}
+        return $syncResponse->getDownloadedEvents();
+    }
 }

apps/dav/lib/CalDAV/Federation/FederatedCalendar.php

Indentation +16 added lines, -16 removed lines

@@ -17,22 +17,22 @@
 use Sabre\CalDAV\Backend;
 
 class FederatedCalendar extends Calendar {
-	public function __construct(
-		Backend\BackendInterface $caldavBackend,
-		$calendarInfo,
-		IL10N $l10n,
-		IConfig $config,
-		LoggerInterface $logger,
-		private readonly FederatedCalendarMapper $federatedCalendarMapper,
-	) {
-		parent::__construct($caldavBackend, $calendarInfo, $l10n, $config, $logger);
-	}
+    public function __construct(
+        Backend\BackendInterface $caldavBackend,
+        $calendarInfo,
+        IL10N $l10n,
+        IConfig $config,
+        LoggerInterface $logger,
+        private readonly FederatedCalendarMapper $federatedCalendarMapper,
+    ) {
+        parent::__construct($caldavBackend, $calendarInfo, $l10n, $config, $logger);
+    }
 
-	public function delete() {
-		$this->federatedCalendarMapper->deleteById($this->getResourceId());
-	}
+    public function delete() {
+        $this->federatedCalendarMapper->deleteById($this->getResourceId());
+    }
 
-	protected function getCalendarType(): int {
-		return CalDavBackend::CALENDAR_TYPE_FEDERATED;
-	}
+    protected function getCalendarType(): int {
+        return CalDavBackend::CALENDAR_TYPE_FEDERATED;
+    }
 }

apps/dav/lib/CalDAV/Federation/FederatedCalendarMapper.php

Indentation +188 added lines, -188 removed lines

@@ -18,192 +18,192 @@
 
 /** @template-extends QBMapper<FederatedCalendarEntity>  */
 class FederatedCalendarMapper extends QBMapper {
-	public const TABLE_NAME = 'calendars_federated';
-
-	public function __construct(
-		IDBConnection $db,
-		private readonly ITimeFactory $time,
-	) {
-		parent::__construct($db, self::TABLE_NAME, FederatedCalendarEntity::class);
-	}
-
-	/**
-	 * @throws DoesNotExistException If there is no federated calendar with the given id.
-	 */
-	public function find(int $id): FederatedCalendarEntity {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq(
-				'id',
-				$qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
-				IQueryBuilder::PARAM_INT,
-			));
-		return $this->findEntity($qb);
-	}
-
-	/**
-	 * @return FederatedCalendarEntity[]
-	 */
-	public function findByPrincipalUri(string $principalUri): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq(
-				'principaluri',
-				$qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			));
-		return $this->findEntities($qb);
-	}
-
-	public function findByUri(string $principalUri, string $uri): ?FederatedCalendarEntity {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq(
-				'principaluri',
-				$qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			))
-			->andWhere($qb->expr()->eq(
-				'uri',
-				$qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			));
-
-		try {
-			return $this->findEntity($qb);
-		} catch (DoesNotExistException $e) {
-			return null;
-		} catch (MultipleObjectsReturnedException $e) {
-			// Should never happen
-			return null;
-		}
-	}
-
-	/**
-	 * @return FederatedCalendarEntity[]
-	 */
-	public function findUnsyncedSinceBefore(int $beforeTimestamp): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->lt(
-				'last_sync',
-				$qb->createNamedParameter($beforeTimestamp, IQueryBuilder::PARAM_INT),
-				IQueryBuilder::PARAM_INT,
-			))
-			// Omit unsynced calendars for now as they are synced by a separate job
-			->andWhere($qb->expr()->isNotNull('last_sync'));
-		return $this->findEntities($qb);
-	}
-
-	public function deleteById(int $id): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete(self::TABLE_NAME)
-			->where($qb->expr()->eq(
-				'id',
-				$qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
-				IQueryBuilder::PARAM_INT,
-			));
-		$qb->executeStatement();
-	}
-
-	public function updateSyncTime(int $id): void {
-		$now = $this->time->getTime();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->update(self::TABLE_NAME)
-			->set('last_sync', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->eq(
-				'id',
-				$qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
-				IQueryBuilder::PARAM_INT,
-			));
-		$qb->executeStatement();
-	}
-
-	public function updateSyncTokenAndTime(int $id, int $syncToken): void {
-		$now = $this->time->getTime();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->update(self::TABLE_NAME)
-			->set('sync_token', $qb->createNamedParameter($syncToken, IQueryBuilder::PARAM_INT))
-			->set('last_sync', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->eq(
-				'id',
-				$qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
-				IQueryBuilder::PARAM_INT,
-			));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * @return \Generator<mixed, FederatedCalendarEntity>
-	 */
-	public function findAll(): \Generator {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from(self::TABLE_NAME);
-
-		$result = $qb->executeQuery();
-		while ($row = $result->fetch()) {
-			yield $this->mapRowToEntity($row);
-		}
-		$result->closeCursor();
-	}
-
-	public function countAll(): int {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select($qb->func()->count('*'))
-			->from(self::TABLE_NAME);
-		$result = $qb->executeQuery();
-		$count = (int)$result->fetchOne();
-		$result->closeCursor();
-		return $count;
-	}
-
-	public function deleteByUri(string $principalUri, string $uri): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete(self::TABLE_NAME)
-			->where($qb->expr()->eq(
-				'principaluri',
-				$qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			))
-			->andWhere($qb->expr()->eq(
-				'uri',
-				$qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			));
-
-		$qb->executeStatement();
-	}
-
-	/**
-	 * @return FederatedCalendarEntity[]
-	 */
-	public function findByRemoteUrl(string $remoteUrl, string $principalUri, string $token): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq(
-				'remote_url',
-				$qb->createNamedParameter($remoteUrl, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			))
-			->andWhere($qb->expr()->eq(
-				'principaluri',
-				$qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			))
-			->andWhere($qb->expr()->eq(
-				'token',
-				$qb->createNamedParameter($token, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR,
-			));
-
-		return $this->findEntities($qb);
-	}
+    public const TABLE_NAME = 'calendars_federated';
+
+    public function __construct(
+        IDBConnection $db,
+        private readonly ITimeFactory $time,
+    ) {
+        parent::__construct($db, self::TABLE_NAME, FederatedCalendarEntity::class);
+    }
+
+    /**
+     * @throws DoesNotExistException If there is no federated calendar with the given id.
+     */
+    public function find(int $id): FederatedCalendarEntity {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq(
+                'id',
+                $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
+                IQueryBuilder::PARAM_INT,
+            ));
+        return $this->findEntity($qb);
+    }
+
+    /**
+     * @return FederatedCalendarEntity[]
+     */
+    public function findByPrincipalUri(string $principalUri): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq(
+                'principaluri',
+                $qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ));
+        return $this->findEntities($qb);
+    }
+
+    public function findByUri(string $principalUri, string $uri): ?FederatedCalendarEntity {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq(
+                'principaluri',
+                $qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'uri',
+                $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ));
+
+        try {
+            return $this->findEntity($qb);
+        } catch (DoesNotExistException $e) {
+            return null;
+        } catch (MultipleObjectsReturnedException $e) {
+            // Should never happen
+            return null;
+        }
+    }
+
+    /**
+     * @return FederatedCalendarEntity[]
+     */
+    public function findUnsyncedSinceBefore(int $beforeTimestamp): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->lt(
+                'last_sync',
+                $qb->createNamedParameter($beforeTimestamp, IQueryBuilder::PARAM_INT),
+                IQueryBuilder::PARAM_INT,
+            ))
+            // Omit unsynced calendars for now as they are synced by a separate job
+            ->andWhere($qb->expr()->isNotNull('last_sync'));
+        return $this->findEntities($qb);
+    }
+
+    public function deleteById(int $id): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete(self::TABLE_NAME)
+            ->where($qb->expr()->eq(
+                'id',
+                $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
+                IQueryBuilder::PARAM_INT,
+            ));
+        $qb->executeStatement();
+    }
+
+    public function updateSyncTime(int $id): void {
+        $now = $this->time->getTime();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->update(self::TABLE_NAME)
+            ->set('last_sync', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->eq(
+                'id',
+                $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
+                IQueryBuilder::PARAM_INT,
+            ));
+        $qb->executeStatement();
+    }
+
+    public function updateSyncTokenAndTime(int $id, int $syncToken): void {
+        $now = $this->time->getTime();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->update(self::TABLE_NAME)
+            ->set('sync_token', $qb->createNamedParameter($syncToken, IQueryBuilder::PARAM_INT))
+            ->set('last_sync', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->eq(
+                'id',
+                $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT),
+                IQueryBuilder::PARAM_INT,
+            ));
+        $qb->executeStatement();
+    }
+
+    /**
+     * @return \Generator<mixed, FederatedCalendarEntity>
+     */
+    public function findAll(): \Generator {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from(self::TABLE_NAME);
+
+        $result = $qb->executeQuery();
+        while ($row = $result->fetch()) {
+            yield $this->mapRowToEntity($row);
+        }
+        $result->closeCursor();
+    }
+
+    public function countAll(): int {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select($qb->func()->count('*'))
+            ->from(self::TABLE_NAME);
+        $result = $qb->executeQuery();
+        $count = (int)$result->fetchOne();
+        $result->closeCursor();
+        return $count;
+    }
+
+    public function deleteByUri(string $principalUri, string $uri): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete(self::TABLE_NAME)
+            ->where($qb->expr()->eq(
+                'principaluri',
+                $qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'uri',
+                $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ));
+
+        $qb->executeStatement();
+    }
+
+    /**
+     * @return FederatedCalendarEntity[]
+     */
+    public function findByRemoteUrl(string $remoteUrl, string $principalUri, string $token): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq(
+                'remote_url',
+                $qb->createNamedParameter($remoteUrl, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'principaluri',
+                $qb->createNamedParameter($principalUri, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ))
+            ->andWhere($qb->expr()->eq(
+                'token',
+                $qb->createNamedParameter($token, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR,
+            ));
+
+        return $this->findEntities($qb);
+    }
 }

apps/dav/lib/CalDAV/Federation/Protocol/CalendarFederationProtocolV1.php

Indentation +112 added lines, -112 removed lines

@@ -10,116 +10,116 @@
 namespace OCA\DAV\CalDAV\Federation\Protocol;
 
 class CalendarFederationProtocolV1 implements ICalendarFederationProtocol {
-	public const VERSION = 'v1';
-
-	public const PROP_URL = 'url';
-	public const PROP_DISPLAY_NAME = 'displayName';
-	public const PROP_COLOR = 'color';
-	public const PROP_ACCESS = 'access';
-	public const PROP_COMPONENTS = 'components';
-
-	private string $url = '';
-	private string $displayName = '';
-	private ?string $color = null;
-	private int $access = 0;
-	private string $components = '';
-
-	/**
-	 * @throws CalendarProtocolParseException If parsing the raw protocol array fails.
-	 */
-	public static function parse(array $rawProtocol): self {
-		if ($rawProtocol[self::PROP_VERSION] !== self::VERSION) {
-			throw new CalendarProtocolParseException('Unknown protocol version');
-		}
-
-		$url = $rawProtocol[self::PROP_URL] ?? null;
-		if (!is_string($url)) {
-			throw new CalendarProtocolParseException('URL is missing or not a string');
-		}
-
-		$displayName = $rawProtocol[self::PROP_DISPLAY_NAME] ?? null;
-		if (!is_string($displayName)) {
-			throw new CalendarProtocolParseException('Display name is missing or not a string');
-		}
-
-		$color = $rawProtocol[self::PROP_COLOR] ?? null;
-		if (!is_string($color) && $color !== null) {
-			throw new CalendarProtocolParseException('Color is set but not a string');
-		}
-
-		$access = $rawProtocol[self::PROP_ACCESS] ?? null;
-		if (!is_int($access)) {
-			throw new CalendarProtocolParseException('Access is missing or not an integer');
-		}
-
-		$components = $rawProtocol[self::PROP_COMPONENTS] ?? null;
-		if (!is_string($components)) {
-			throw new CalendarProtocolParseException('Supported calendar components are missing or not a string');
-		}
-
-		$protocol = new self();
-		$protocol->setUrl($url);
-		$protocol->setDisplayName($displayName);
-		$protocol->setColor($color);
-		$protocol->setAccess($access);
-		$protocol->setComponents($components);
-		return $protocol;
-	}
-
-	#[\Override]
-	public function toProtocol(): array {
-		return [
-			self::PROP_VERSION => $this->getVersion(),
-			self::PROP_URL => $this->getUrl(),
-			self::PROP_DISPLAY_NAME => $this->getDisplayName(),
-			self::PROP_COLOR => $this->getColor(),
-			self::PROP_ACCESS => $this->getAccess(),
-			self::PROP_COMPONENTS => $this->getComponents(),
-		];
-	}
-
-	#[\Override]
-	public function getVersion(): string {
-		return self::VERSION;
-	}
-
-	public function getUrl(): string {
-		return $this->url;
-	}
-
-	public function setUrl(string $url): void {
-		$this->url = $url;
-	}
-
-	public function getDisplayName(): string {
-		return $this->displayName;
-	}
-
-	public function setDisplayName(string $displayName): void {
-		$this->displayName = $displayName;
-	}
-
-	public function getColor(): ?string {
-		return $this->color;
-	}
-
-	public function setColor(?string $color): void {
-		$this->color = $color;
-	}
-
-	public function getAccess(): int {
-		return $this->access;
-	}
-
-	public function setAccess(int $access): void {
-		$this->access = $access;
-	}
-
-	public function getComponents(): string {
-		return $this->components;
-	}
-
-	public function setComponents(string $components): void {
-		$this->components = $components;
-	}
+    public const VERSION = 'v1';
+
+    public const PROP_URL = 'url';
+    public const PROP_DISPLAY_NAME = 'displayName';
+    public const PROP_COLOR = 'color';
+    public const PROP_ACCESS = 'access';
+    public const PROP_COMPONENTS = 'components';
+
+    private string $url = '';
+    private string $displayName = '';
+    private ?string $color = null;
+    private int $access = 0;
+    private string $components = '';
+
+    /**
+     * @throws CalendarProtocolParseException If parsing the raw protocol array fails.
+     */
+    public static function parse(array $rawProtocol): self {
+        if ($rawProtocol[self::PROP_VERSION] !== self::VERSION) {
+            throw new CalendarProtocolParseException('Unknown protocol version');
+        }
+
+        $url = $rawProtocol[self::PROP_URL] ?? null;
+        if (!is_string($url)) {
+            throw new CalendarProtocolParseException('URL is missing or not a string');
+        }
+
+        $displayName = $rawProtocol[self::PROP_DISPLAY_NAME] ?? null;
+        if (!is_string($displayName)) {
+            throw new CalendarProtocolParseException('Display name is missing or not a string');
+        }
+
+        $color = $rawProtocol[self::PROP_COLOR] ?? null;
+        if (!is_string($color) && $color !== null) {
+            throw new CalendarProtocolParseException('Color is set but not a string');
+        }
+
+        $access = $rawProtocol[self::PROP_ACCESS] ?? null;
+        if (!is_int($access)) {
+            throw new CalendarProtocolParseException('Access is missing or not an integer');
+        }
+
+        $components = $rawProtocol[self::PROP_COMPONENTS] ?? null;
+        if (!is_string($components)) {
+            throw new CalendarProtocolParseException('Supported calendar components are missing or not a string');
+        }
+
+        $protocol = new self();
+        $protocol->setUrl($url);
+        $protocol->setDisplayName($displayName);
+        $protocol->setColor($color);
+        $protocol->setAccess($access);
+        $protocol->setComponents($components);
+        return $protocol;
+    }
+
+    #[\Override]
+    public function toProtocol(): array {
+        return [
+            self::PROP_VERSION => $this->getVersion(),
+            self::PROP_URL => $this->getUrl(),
+            self::PROP_DISPLAY_NAME => $this->getDisplayName(),
+            self::PROP_COLOR => $this->getColor(),
+            self::PROP_ACCESS => $this->getAccess(),
+            self::PROP_COMPONENTS => $this->getComponents(),
+        ];
+    }
+
+    #[\Override]
+    public function getVersion(): string {
+        return self::VERSION;
+    }
+
+    public function getUrl(): string {
+        return $this->url;
+    }
+
+    public function setUrl(string $url): void {
+        $this->url = $url;
+    }
+
+    public function getDisplayName(): string {
+        return $this->displayName;
+    }
+
+    public function setDisplayName(string $displayName): void {
+        $this->displayName = $displayName;
+    }
+
+    public function getColor(): ?string {
+        return $this->color;
+    }
+
+    public function setColor(?string $color): void {
+        $this->color = $color;
+    }
+
+    public function getAccess(): int {
+        return $this->access;
+    }
+
+    public function setAccess(int $access): void {
+        $this->access = $access;
+    }
+
+    public function getComponents(): string {
+        return $this->components;
+    }
+
+    public function setComponents(string $components): void {
+        $this->components = $components;
+    }
 }

apps/dav/lib/CalDAV/Federation/Protocol/ICalendarFederationProtocol.php

Indentation +10 added lines, -10 removed lines

@@ -10,16 +10,16 @@
 namespace OCA\DAV\CalDAV\Federation\Protocol;
 
 interface ICalendarFederationProtocol {
-	public const PROP_VERSION = 'version';
+    public const PROP_VERSION = 'version';
 
-	/**
-	 * Get the version of this protocol implementation.
-	 */
-	public function getVersion(): string;
+    /**
+     * Get the version of this protocol implementation.
+     */
+    public function getVersion(): string;
 
-	/**
-	 * Convert the protocol to an associative array to be sent to a remote instance.
-	 * The resulting array still needs to be merged with the base protocol from the share!
-	 */
-	public function toProtocol(): array;
+    /**
+     * Convert the protocol to an associative array to be sent to a remote instance.
+     * The resulting array still needs to be merged with the base protocol from the share!
+     */
+    public function toProtocol(): array;
 }

apps/dav/lib/CalDAV/Federation/FederatedCalendarAuth.php

Indentation +51 added lines, -51 removed lines

@@ -18,64 +18,64 @@
 use Sabre\HTTP\ResponseInterface;
 
 class FederatedCalendarAuth implements BackendInterface {
-	private readonly string $realm;
+    private readonly string $realm;
 
-	public function __construct(
-		private readonly SharingMapper $sharingMapper,
-	) {
-		$defaults = new Defaults();
-		$this->realm = $defaults->getName();
-	}
+    public function __construct(
+        private readonly SharingMapper $sharingMapper,
+    ) {
+        $defaults = new Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	/**
-	 * @return string|null A principal uri if the given combination of user and pass is valid and null otherwise.
-	 */
-	private function validateUserPass(
-		string $requestPath,
-		string $username,
-		string $password,
-	): ?string {
-		$remoteUserPrincipalUri = RemoteUserPrincipalBackend::PRINCIPAL_PREFIX . "/$username";
-		[, $remoteUserPrincipalId] = \Sabre\Uri\split($remoteUserPrincipalUri);
+    /**
+     * @return string|null A principal uri if the given combination of user and pass is valid and null otherwise.
+     */
+    private function validateUserPass(
+        string $requestPath,
+        string $username,
+        string $password,
+    ): ?string {
+        $remoteUserPrincipalUri = RemoteUserPrincipalBackend::PRINCIPAL_PREFIX . "/$username";
+        [, $remoteUserPrincipalId] = \Sabre\Uri\split($remoteUserPrincipalUri);
 
-		$rows = $this->sharingMapper->getSharedCalendarsForRemoteUser(
-			$remoteUserPrincipalUri,
-			$password,
-		);
+        $rows = $this->sharingMapper->getSharedCalendarsForRemoteUser(
+            $remoteUserPrincipalUri,
+            $password,
+        );
 
-		// Is the requested calendar actually shared with the remote user?
-		foreach ($rows as $row) {
-			$ownerPrincipalUri = $row['principaluri'];
-			[, $ownerUserId] = \Sabre\Uri\split($ownerPrincipalUri);
-			$shareUri = $row['uri'] . '_shared_by_' . $ownerUserId;
-			if (str_starts_with($requestPath, "remote-calendars/$remoteUserPrincipalId/$shareUri")) {
-				// Yes? -> return early
-				return $remoteUserPrincipalUri;
-			}
-		}
+        // Is the requested calendar actually shared with the remote user?
+        foreach ($rows as $row) {
+            $ownerPrincipalUri = $row['principaluri'];
+            [, $ownerUserId] = \Sabre\Uri\split($ownerPrincipalUri);
+            $shareUri = $row['uri'] . '_shared_by_' . $ownerUserId;
+            if (str_starts_with($requestPath, "remote-calendars/$remoteUserPrincipalId/$shareUri")) {
+                // Yes? -> return early
+                return $remoteUserPrincipalUri;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	public function check(RequestInterface $request, ResponseInterface $response): array {
-		if (!str_starts_with($request->getPath(), 'remote-calendars/')) {
-			return [false, 'This request is not for a federated calendar'];
-		}
+    public function check(RequestInterface $request, ResponseInterface $response): array {
+        if (!str_starts_with($request->getPath(), 'remote-calendars/')) {
+            return [false, 'This request is not for a federated calendar'];
+        }
 
-		$auth = new BasicAuth($this->realm, $request, $response);
-		$userpass = $auth->getCredentials();
-		if ($userpass === null || count($userpass) !== 2) {
-			return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
-		}
-		$principal = $this->validateUserPass($request->getPath(), $userpass[0], $userpass[1]);
-		if ($principal === null) {
-			return [false, 'Username or password was incorrect'];
-		}
+        $auth = new BasicAuth($this->realm, $request, $response);
+        $userpass = $auth->getCredentials();
+        if ($userpass === null || count($userpass) !== 2) {
+            return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
+        }
+        $principal = $this->validateUserPass($request->getPath(), $userpass[0], $userpass[1]);
+        if ($principal === null) {
+            return [false, 'Username or password was incorrect'];
+        }
 
-		return [true, $principal];
-	}
+        return [true, $principal];
+    }
 
-	public function challenge(RequestInterface $request, ResponseInterface $response): void {
-		// No special challenge is needed here
-	}
+    public function challenge(RequestInterface $request, ResponseInterface $response): void {
+        // No special challenge is needed here
+    }
 }

apps/dav/lib/CalDAV/Federation/CalendarFederationConfig.php

Indentation +7 added lines, -7 removed lines

@@ -12,12 +12,12 @@
 use OCP\AppFramework\Services\IAppConfig;
 
 class CalendarFederationConfig {
-	public function __construct(
-		private readonly IAppConfig $appConfig,
-	) {
-	}
+    public function __construct(
+        private readonly IAppConfig $appConfig,
+    ) {
+    }
 
-	public function isFederationEnabled(): bool {
-		return $this->appConfig->getAppValueBool('enableCalendarFederation', true);
-	}
+    public function isFederationEnabled(): bool {
+        return $this->appConfig->getAppValueBool('enableCalendarFederation', true);
+    }
 }