Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions apps/dav/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@
'OCA\\DAV\\CalDAV\\Calendar' => $baseDir . '/../lib/CalDAV/Calendar.php',
'OCA\\DAV\\CalDAV\\CalendarHome' => $baseDir . '/../lib/CalDAV/CalendarHome.php',
'OCA\\DAV\\CalDAV\\CalendarImpl' => $baseDir . '/../lib/CalDAV/CalendarImpl.php',
'OCA\\DAV\\CalDAV\\CalendarImplV2' => $baseDir . '/../lib/CalDAV/CalendarImplV2.php',
'OCA\\DAV\\CalDAV\\CalendarManager' => $baseDir . '/../lib/CalDAV/CalendarManager.php',
'OCA\\DAV\\CalDAV\\CalendarObject' => $baseDir . '/../lib/CalDAV/CalendarObject.php',
'OCA\\DAV\\CalDAV\\CalendarProvider' => $baseDir . '/../lib/CalDAV/CalendarProvider.php',
'OCA\\DAV\\CalDAV\\CalendarObjectImplV2' => $baseDir . '/../lib/CalDAV/CalendarObjectImplV2.php',
'OCA\\DAV\\CalDAV\\CalendarRoot' => $baseDir . '/../lib/CalDAV/CalendarRoot.php',
'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => $baseDir . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
'OCA\\DAV\\CalDAV\\IRestorable' => $baseDir . '/../lib/CalDAV/IRestorable.php',
Expand Down
6 changes: 4 additions & 2 deletions apps/dav/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
class ComposerStaticInitDAV
{
public static $prefixLengthsPsr4 = array (
'O' =>
'O' =>
array (
'OCA\\DAV\\' => 8,
),
);

public static $prefixDirsPsr4 = array (
'OCA\\DAV\\' =>
'OCA\\DAV\\' =>
array (
0 => __DIR__ . '/..' . '/../lib',
),
Expand Down Expand Up @@ -62,9 +62,11 @@ class ComposerStaticInitDAV
'OCA\\DAV\\CalDAV\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Calendar.php',
'OCA\\DAV\\CalDAV\\CalendarHome' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarHome.php',
'OCA\\DAV\\CalDAV\\CalendarImpl' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarImpl.php',
'OCA\\DAV\\CalDAV\\CalendarImplV2' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarImplV2.php',
'OCA\\DAV\\CalDAV\\CalendarManager' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarManager.php',
'OCA\\DAV\\CalDAV\\CalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarObject.php',
'OCA\\DAV\\CalDAV\\CalendarProvider' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarProvider.php',
'OCA\\DAV\\CalDAV\\CalendarObjectImplV2' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarObjectImplV2.php',
'OCA\\DAV\\CalDAV\\CalendarRoot' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarRoot.php',
'OCA\\DAV\\CalDAV\\ICSExportPlugin\\ICSExportPlugin' => __DIR__ . '/..' . '/../lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php',
'OCA\\DAV\\CalDAV\\IRestorable' => __DIR__ . '/..' . '/../lib/CalDAV/IRestorable.php',
Expand Down
32 changes: 29 additions & 3 deletions apps/dav/lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
use OCA\DAV\CalDAV\Reminder\NotificationProvider\PushProvider;
use OCA\DAV\CalDAV\Reminder\NotificationProviderManager;
use OCA\DAV\CalDAV\Reminder\Notifier;

use OCA\DAV\Capabilities;
use OCA\DAV\CardDAV\CardDavBackend;
use OCA\DAV\CardDAV\ContactsManager;
Expand Down Expand Up @@ -99,6 +98,7 @@
use OCP\Calendar\IManager as ICalendarManager;
use OCP\Config\BeforePreferenceDeletedEvent;
use OCP\Config\BeforePreferenceSetEvent;
use OCP\Calendar\IManagerV2 as ICalendarManagerV2;
use OCP\Contacts\IManager as IContactsManager;
use OCP\IServerContainer;
use OCP\IUser;
Expand Down Expand Up @@ -207,15 +207,15 @@ public function boot(IBootContext $context): void {
$context->injectFn([$this, 'registerHooks']);
$context->injectFn([$this, 'registerContactsManager']);
$context->injectFn([$this, 'registerCalendarManager']);
$context->injectFn([$this, 'registerCalendarManagerV2']);
$context->injectFn([$this, 'registerNotifier']);
$context->injectFn([$this, 'registerCalendarReminders']);
}

public function registerHooks(HookManager $hm,
EventDispatcherInterface $dispatcher,
IAppContainer $container,
IServerContainer $serverContainer) {
$hm->setup();

// first time login event setup
$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
if ($event instanceof GenericEvent) {
Expand Down Expand Up @@ -304,6 +304,32 @@ private function setupCalendarProvider(ICalendarManager $calendarManager,
$cm->setupCalendarProvider($calendarManager, $userId);
}

public function registerCalendarManagerV2(ICalendarManagerV2 $calendarManager,
IAppContainer $container): void {
$calendarManager->register(function () use ($container, $calendarManager) {
$user = \OC::$server->getUserSession()->getUser();
if ($user !== null) {
$this->setupCalendarProviderV2($calendarManager, $container, $user->getUID());
}
});
}

/**
* @param ICalendarManagerV2 $calendarManager
* @param string $userId
*/
public function setupCalendarProviderV2(ICalendarManagerV2 $calendarManager,
IAppContainer $container,
$userId) {
/** @var CalendarManager $cm */
$cm = $container->query(CalendarManager::class);
$cm->setupCalendarProviderV2($calendarManager, $userId);
}

public function registerNotifier(INotificationManager $manager): void {

Check failure

Code scanning / Psalm

UndefinedClass

Class, interface or enum named OCA\DAV\AppInfo\INotificationManager does not exist
$manager->registerNotifierService(Notifier::class);
}

public function registerCalendarReminders(NotificationProviderManager $manager,
LoggerInterface $logger): void {
try {
Expand Down
154 changes: 154 additions & 0 deletions apps/dav/lib/CalDAV/CalendarImplV2.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?php
/**
* @copyright 2020, Thomas Citharel <nextcloud@tcit.fr>
*
* @author Thomas Citharel <nextcloud@tcit.fr>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace OCA\DAV\CalDAV;

use OCP\Calendar\ICalendarObjectV2;
use OCP\Calendar\ICalendarV2;
use OCP\Constants;
use Sabre\DAV\Exception\BadRequest;
use Sabre\VObject\Component\VCalendar;
use Sabre\VObject\Reader;
use Sabre\VObject\UUIDUtil;

class CalendarImplV2 implements ICalendarV2 {

/** @var CalDavBackend */
private $backend;

/** @var Calendar */
private $calendar;

/** @var array */
private $calendarInfo;

/**
* CalendarImpl constructor.
*
* @param Calendar $calendar
* @param array $calendarInfo
* @param CalDavBackend $backend
*/
public function __construct(Calendar $calendar, array $calendarInfo,
CalDavBackend $backend) {
$this->calendar = $calendar;
$this->calendarInfo = $calendarInfo;
$this->backend = $backend;
}

/**
* @return string defining the technical unique key
* @since 21.0.0
*/
public function getKey(): string {
return $this->calendarInfo['id'];
}

/**
* In comparison to getKey() this function returns a human readable (maybe translated) name
* @return null|string
* @since 21.0.0
*/
public function getDisplayName(): ?string {
return $this->calendarInfo['{DAV:}displayname'];
}

/**
* Calendar color
* @return null|string
* @since 21.0.0
*/
public function getDisplayColor(): ?string {
return $this->calendarInfo['{http://apple.com/ns/ical/}calendar-color'];
}

/**
* @param string $pattern which should match within the $searchProperties
* @param array $searchProperties defines the properties within the query pattern should match
* @param array $options - optional parameters:
* ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]]
* @param integer|null $limit - limit number of search results
* @param integer|null $offset - offset for paging of search results
* @return array an array of events/journals/todos which are arrays of key-value-pairs
* @since 21.0.0
*/
public function search($pattern, array $searchProperties=[], array $options=[], int $limit = null, int $offset = null): array {
return $this->backend->search($this->calendarInfo, $pattern,
$searchProperties, $options, $limit, $offset);
}

/**
* @return bool
* @since 21.0.0
*/
public function isWriteable(): bool {
$permissions = $this->calendar->getACL();
$result = 0;
foreach ($permissions as $permission) {
switch ($permission['privilege']) {
case '{DAV:}read':
$result |= Constants::PERMISSION_READ;
break;
case '{DAV:}write':
$result |= Constants::PERMISSION_CREATE;
$result |= Constants::PERMISSION_UPDATE;
break;
case '{DAV:}all':
$result |= Constants::PERMISSION_ALL;
break;
}
}

return $result > Constants::PERMISSION_READ;
}

/**
* @param string $uri
* @return ICalendarObjectV2|null
* @since 21.0.0
*/
public function getByUri(string $uri): ?ICalendarObjectV2 {
if ($calendarObjectData = $this->backend->getCalendarObject($this->getKey(), $uri)) {
if (isset($calendarObjectData['calendardata'])) {
$calendarData = Reader::read($calendarObjectData['calendardata']);
if ($calendarData instanceof VCalendar) {
return new CalendarObjectImplV2($calendarObjectData['calendarid'], $calendarObjectData['uri'], $calendarData, $this->backend);
}
}
}
return null;
}

/**
* @param VCalendar $vObject
* @return ICalendarObjectV2|null
* @throws BadRequest
* @since 21.0.0
*/
public function create(VCalendar $vObject): ?ICalendarObjectV2 {
CalendarObjectImplV2::validateCalendarData($vObject);
$uuid = UUIDUtil::getUUID() . '.ics';
$this->backend->createCalendarObject($this->getKey(), $uuid, $vObject->serialize());
return $this->getByUri($uuid);
}
}
25 changes: 25 additions & 0 deletions apps/dav/lib/CalDAV/CalendarManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
namespace OCA\DAV\CalDAV;

use OCP\Calendar\IManager;
use OCP\Calendar\IManagerV2;
use OCP\IConfig;
use OCP\IL10N;
use Psr\Log\LoggerInterface;
Expand Down Expand Up @@ -66,6 +67,15 @@ public function setupCalendarProvider(IManager $cm, $userId) {
$this->register($cm, $calendars);
}

/**
* @param IManagerV2 $cm
* @param string $userId
*/
public function setupCalendarProviderV2(IManagerV2 $cm, $userId) {
$calendars = $this->backend->getCalendarsForUser("principals/users/$userId");
$this->registerV2($cm, $calendars);
}

/**
* @param IManager $cm
* @param array $calendars
Expand All @@ -80,4 +90,19 @@ private function register(IManager $cm, array $calendars) {
));
}
}

/**
* @param IManagerV2 $cm
* @param array $calendars
*/
private function registerV2(IManagerV2 $cm, array $calendars) {
foreach ($calendars as $calendarInfo) {
$calendar = new Calendar($this->backend, $calendarInfo, $this->l10n, $this->config);

Check failure

Code scanning / Psalm

TooFewArguments

Too few arguments for OCA\DAV\CalDAV\Calendar::__construct - expecting logger to be passed
$cm->registerCalendar(new CalendarImplV2(
$calendar,
$calendarInfo,
$this->backend
));
}
}
}
Loading