From 3ef6a099a3d3a3a9baaa48188d316c8295067974 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Wed, 3 Nov 2021 12:19:47 +0100 Subject: Add IManager::getCalendarsForPrincipal API The Calendar app needs to access calendars of a given principal in the back-end. The new calendar providers were not accessible for apps before this patch. Now they can access the ICalendar objects on demand. Signed-off-by: Christoph Wurst --- lib/private/Calendar/Manager.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'lib/private/Calendar') diff --git a/lib/private/Calendar/Manager.php b/lib/private/Calendar/Manager.php index 3fa4b55d1ea..16e142264aa 100644 --- a/lib/private/Calendar/Manager.php +++ b/lib/private/Calendar/Manager.php @@ -167,15 +167,14 @@ class Manager implements IManager { $this->calendarLoaders = []; } - public function searchForPrincipal(ICalendarQuery $query): array { + public function getCalendarsForPrincipal(string $principalUri, array $calendarUris = []): array { $context = $this->coordinator->getRegistrationContext(); if ($context === null) { return []; } - /** @var CalendarQuery $query */ - $calendars = array_merge( - ...array_map(function ($registration) use ($query) { + return array_merge( + ...array_map(function ($registration) use ($principalUri, $calendarUris) { try { /** @var ICalendarProvider $provider */ $provider = $this->container->get($registration->getService()); @@ -186,9 +185,17 @@ class Manager implements IManager { return []; } - return $provider->getCalendars($query->getPrincipalUri(), $query->getCalendarUris()); + return $provider->getCalendars($principalUri, $calendarUris); }, $context->getCalendarProviders()) ); + } + + public function searchForPrincipal(ICalendarQuery $query): array { + /** @var CalendarQuery $query */ + $calendars = $this->getCalendarsForPrincipal( + $query->getPrincipalUri(), + $query->getCalendarUris(), + ); $results = []; /** @var ICalendar $calendar */ -- cgit v1.2.3