Skip to content

fix: calendar delegation #8213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grnd-alt merged 2 commits into from
Jul 29, 2026
Merged

fix: calendar delegation #8213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7669e04
fix: calendar delegation
GVodyanov Jul 29, 2026
55bfadb
Merge branch 'main' into fix/calendar-delegation-deck
GVodyanov Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions lib/DAV/CalendarPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

class CalendarPlugin implements ICalendarProvider {

private const USER_PRINCIPAL_PREFIX = 'principals/users/';

/** @var DeckCalendarBackend */
private $backend;
/** @var ConfigService */
Expand All @@ -33,7 +35,7 @@ public function getAppId(): string {
}

public function fetchAllForCalendarHome(string $principalUri): array {
if (!$this->calendarIntegrationEnabled) {
if (!$this->calendarIntegrationEnabled || !$this->isOwnCalendarHome($principalUri)) {
return [];
}

Expand All @@ -46,7 +48,7 @@ public function fetchAllForCalendarHome(string $principalUri): array {
}

public function hasCalendarInCalendarHome(string $principalUri, string $calendarUri): bool {
if (!$this->calendarIntegrationEnabled) {
if (!$this->calendarIntegrationEnabled || !$this->isOwnCalendarHome($principalUri)) {
return false;
}

Expand All @@ -71,4 +73,10 @@ public function getCalendarInCalendarHome(string $principalUri, string $calendar
}
return null;
}

private function isOwnCalendarHome(string $principalUri): bool {
$userId = $this->configService->getUserId();

return $userId !== null && $principalUri === self::USER_PRINCIPAL_PREFIX . $userId;
}
}
Loading