add list-calendars command

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Rebase and delete URI suggestion part

Invite to use occ dav:list-calendars instead

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fix autoload

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Use injection & test everything

And rebase

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add test for ListCalendars and refactoring

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fix indentation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

2 files changed, 136 insertions, 31 deletions

diff --git a/apps/dav/lib/Command/ListCalendars.php b/apps/dav/lib/Command/ListCalendars.php
new file mode 100644
index 00000000000..9080e9f8e29
--- /dev/null
+++ b/apps/dav/lib/Command/ListCalendars.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018, Georg Ehrke
+ *
+ * @author Georg Ehrke <oc.list@georgehrke.com>
+ * @author Thomas Citharel <tcit@tcit.fr>
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\DAV\Command;
+
+use OCA\DAV\CalDAV\BirthdayService;
+use OCA\DAV\CalDAV\CalDavBackend;
+use OCA\DAV\Connector\Sabre\Principal;
+use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\Share\IManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ListCalendars extends Command {
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var CalDavBackend */
+	private $caldav;
+
+	/**
+	 * @param IUserManager $userManager
+	 * @param CalDavBackend $caldav
+	 */
+	function __construct(IUserManager $userManager, CalDavBackend $caldav) {
+		parent::__construct();
+		$this->userManager = $userManager;
+		$this->caldav = $caldav;
+	}
+
+	protected function configure() {
+		$this
+			->setName('dav:list-calendars')
+			->setDescription('List all calendars of a user')
+			->addArgument('user',
+				InputArgument::REQUIRED,
+				'User for whom all calendars will be listed');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$user = $input->getArgument('user');
+		if (!$this->userManager->userExists($user)) {
+			throw new \InvalidArgumentException("User <$user> is unknown.");
+		}
+
+		$calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
+
+		$calendarTableData = [];
+		foreach($calendars as $calendar) {
+			// skip birthday calendar
+			if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+				continue;
+			}
+
+			$readOnly = false;
+			$readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+			if (isset($calendar[$readOnlyIndex])) {
+				$readOnly = $calendar[$readOnlyIndex];
+			}
+
+			$calendarTableData[] = [
+				$calendar['uri'],
+				$calendar['{DAV:}displayname'],
+				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
+				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
+				$readOnly ? ' x ' : ' ✓ ',
+			];
+		}
+
+		if (count($calendarTableData) > 0) {
+			$table = new Table($output);
+			$table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
+				->setRows($calendarTableData);
+
+			$table->render();
+		} else {
+			$output->writeln("<info>User <$user> has no calendars</info>");
+		}
+	}
+
+}
diff --git a/apps/dav/lib/Command/MoveCalendar.php b/apps/dav/lib/Command/MoveCalendar.php
index 20d04bfdd6f..0c2e6daa051 100644
--- a/apps/dav/lib/Command/MoveCalendar.php
+++ b/apps/dav/lib/Command/MoveCalendar.php
@@ -22,10 +22,13 @@ namespace OCA\DAV\Command;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\CalDAV\Calendar;
 use OCA\DAV\Connector\Sabre\Principal;
+use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IL10N;
 use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\Share\IManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -36,37 +39,45 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 class MoveCalendar extends Command {
 
 	/** @var IUserManager */
-	protected $userManager;
+	private $userManager;
 
 	/** @var IGroupManager $groupManager */
 	private $groupManager;
 
-	/** @var \OCP\IDBConnection */
-	protected $dbConnection;
+	/** @var IConfig $config */
+	private $config;
 
 	/** @var IL10N */
-	protected $l10n;
+	private $l10n;
 
 	/** @var SymfonyStyle */
 	private $io;
 
 	/** @var CalDavBackend */
-	private $caldav;
+	private $calDav;
 
 	const URI_USERS = 'principals/users/';
 
 	/**
 	 * @param IUserManager $userManager
 	 * @param IGroupManager $groupManager
-	 * @param IDBConnection $dbConnection
+	 * @param IConfig $config
 	 * @param IL10N $l10n
+	 * @param CalDavBackend $calDav
 	 */
-	function __construct(IUserManager $userManager, IGroupManager $groupManager, IDBConnection $dbConnection, IL10N $l10n) {
+	function __construct(
+		IUserManager $userManager,
+		IGroupManager $groupManager,
+		IConfig $config,
+		IL10N $l10n,
+		CalDavBackend $calDav
+	) {
 		parent::__construct();
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
-		$this->dbConnection = $dbConnection;
+		$this->config = $config;
 		$this->l10n = $l10n;
+		$this->calDav = $calDav;
 	}
 
 	protected function configure() {
@@ -104,35 +115,21 @@ class MoveCalendar extends Command {
 			throw new \InvalidArgumentException("User <$userDestination> is unknown.");
 		}
 
-		$principalBackend = new Principal(
-			$this->userManager,
-			$this->groupManager
-		);
-		$random = \OC::$server->getSecureRandom();
-		$dispatcher = \OC::$server->getEventDispatcher();
-
 		$name = $input->getArgument('name');
-		$this->caldav = new CalDavBackend($this->dbConnection, $principalBackend, $this->userManager, $random, $dispatcher);
 
-		$calendar = $this->caldav->getCalendarByUri(self::URI_USERS . $userOrigin, $name);
+		$calendar = $this->calDav->getCalendarByUri(self::URI_USERS . $userOrigin, $name);
 
 		if (null === $calendar) {
-			/**  If we got no matching calendar with URI, let's try the display names */
-			$suggestedUris = $this->caldav->findCalendarsUrisByDisplayName($name, self::URI_USERS . $userOrigin);
-			if (count($suggestedUris) > 0) {
-				$this->io->note('No calendar with this URI was found, but you may want to try with these?');
-				$this->io->listing($suggestedUris);
-			}
-			throw new \InvalidArgumentException("User <$userOrigin> has no calendar named <$name>.");
+			throw new \InvalidArgumentException("User <$userOrigin> has no calendar named <$name>. You can run occ dav:list-calendars to list calendars URIs for this user.");
 		}
 
-		if (null !== $this->caldav->getCalendarByUri(self::URI_USERS . $userDestination, $name)) {
+		if (null !== $this->calDav->getCalendarByUri(self::URI_USERS . $userDestination, $name)) {
 			throw new \InvalidArgumentException("User <$userDestination> already has a calendar named <$name>.");
 		}
 
 		$this->checkShares($calendar, $userDestination, $input->getOption('force'));
 
-		$this->caldav->moveCalendar($name, self::URI_USERS . $userOrigin, self::URI_USERS . $userDestination);
+		$this->calDav->moveCalendar($name, self::URI_USERS . $userOrigin, self::URI_USERS . $userDestination);
 
 		$this->io->success("Calendar <$name> was moved from user <$userOrigin> to <$userDestination>");
 	}
@@ -147,14 +144,14 @@ class MoveCalendar extends Command {
 	 */
 	private function checkShares($calendar, $userDestination, $force = false)
 	{
-		$shares = $this->caldav->getShares($calendar['id']);
+		$shares = $this->calDav->getShares($calendar['id']);
 		foreach ($shares as $share) {
-			list($prefix, $group) = str_split($share['href'], 28);
-			if ('principal:principals/groups/' === $prefix && !$this->groupManager->isInGroup($userDestination, $group)) {
+			list(, $prefix, $group) = explode('/', $share['href'], 3);
+			if ('groups' === $prefix && !$this->groupManager->isInGroup($userDestination, $group)) {
 				if ($force) {
-					$this->caldav->updateShares(new Calendar($this->caldav, $calendar, $this->l10n), [], ['href' => 'principal:principals/groups/' . $group]);
+					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config), [], ['href' => 'principal:principals/groups/' . $group]);
 				} else {
-					throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$group> with which the calendar <" . $calendar['uri'] . "> was shared. You may use -f to move the calendar while deleting this share.");
+					throw new \InvalidArgumentException("User <$userDestination> is not part of the group <$group> with whom the calendar <" . $calendar['uri'] . "> was shared. You may use -f to move the calendar while deleting this share.");
 				}
 			}
 		}