Create infrastructure to allow files to be shared with circles

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -8,6 +8,8 @@
  * @author Thomas Citharel <tcit@tcit.fr>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Georg Ehrke <oc.list@georgehrke.com>
+ * @author Vinicius Cubas Brand <vinicius@eita.org.br>
+ * @author Daniel Tygel <dtygel@eita.org.br>
  *
  * @license AGPL-3.0
  *
@@ -280,6 +282,8 @@ function getCalendarsForUser($principalUri) {
 
 		// query for shared calendars
 		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+		$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
+
 		$principals = array_map(function($principal) {
 			return urldecode($principal);
 		}, $principals);

apps/dav/lib/Connector/Sabre/FilesReportPlugin.php

@@ -45,6 +45,7 @@ class FilesReportPlugin extends ServerPlugin {
 	const NS_OWNCLOUD = 'http://owncloud.org/ns';
 	const REPORT_NAME            = '{http://owncloud.org/ns}filter-files';
 	const SYSTEMTAG_PROPERTYNAME = '{http://owncloud.org/ns}systemtag';
+	const CIRCLE_PROPERTYNAME = '{http://nextcloud.com/ns}circle';
 
 	/**
 	 * Reference to main server object
@@ -255,14 +256,19 @@ protected function processFilterRules($filterRules) {
 		$ns = '{' . $this::NS_OWNCLOUD . '}';
 		$resultFileIds = null;
 		$systemTagIds = [];
+		$circlesIds = [];
 		$favoriteFilter = null;
 		foreach ($filterRules as $filterRule) {
 			if ($filterRule['name'] === $ns . 'systemtag') {
 				$systemTagIds[] = $filterRule['value'];
 			}
+			if ($filterRule['name'] === $ns . 'circle') {
+				$circlesIds[] = $filterRule['value'];
+			}
 			if ($filterRule['name'] === $ns . 'favorite') {
 				$favoriteFilter = true;
 			}
+
 		}
 
 		if ($favoriteFilter !== null) {
@@ -281,6 +287,15 @@ protected function processFilterRules($filterRules) {
 			}
 		}
 
+		if (!empty($circlesIds)) {
+			$fileIds = $this->getCirclesFileIds($circlesIds);
+			if (empty($resultFileIds)) {
+				$resultFileIds = $fileIds;
+			} else {
+				$resultFileIds = array_intersect($fileIds, $resultFileIds);
+			}
+		}
+
 		return $resultFileIds;
 	}
 
@@ -327,6 +342,13 @@ private function getSystemTagFileIds($systemTagIds) {
 		return $resultFileIds;
 	}
 
+	private function getCirclesFileIds($circlesIds) {
+		if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+			return array();
+		}
+		return \OCA\Circles\Api\v1\Circles::getFilesForCircles($circlesIds);
+	}
+
 	/**
 	 * Prepare propfind response for the given nodes
 	 *

apps/dav/lib/Connector/Sabre/Principal.php

@@ -10,6 +10,8 @@
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
+ * @author Vinicius Cubas Brand <vinicius@eita.org.br>
+ * @author Daniel Tygel <dtygel@eita.org.br>
  *
  * @license AGPL-3.0
  *
@@ -52,6 +54,9 @@ class Principal implements BackendInterface {
 	/** @var bool */
 	private $hasGroups;
 
+	/** @var bool */
+	private $hasCircles;
+
 	/**
 	 * @param IUserManager $userManager
 	 * @param IGroupManager $groupManager
@@ -63,7 +68,7 @@ public function __construct(IUserManager $userManager,
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 		$this->principalPrefix = trim($principalPrefix, '/');
-		$this->hasGroups = ($principalPrefix === 'principals/users/');
+		$this->hasGroups = $this->hasCircles = ($principalPrefix === 'principals/users/');
 	}
 
 	/**
@@ -108,6 +113,8 @@ public function getPrincipalByPath($path) {
 			if (!is_null($user)) {
 				return $this->userToPrincipal($user);
 			}
+		} else if ($prefix === 'principals/circles') {
+			return $this->circleToPrincipal($name);
 		}
 		return null;
 	}
@@ -232,4 +239,66 @@ public function getPrincipalPrefix() {
 		return $this->principalPrefix;
 	}
 
+	/**
+	 * @param string $circleUniqueId
+	 * @return array|null
+	 */
+	protected function circleToPrincipal($circleUniqueId) {
+		if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+			return null;
+		}
+
+		$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId);
+
+		if (!$circle) {
+			return null;
+		}
+
+		$principal = [
+			'uri' => 'principals/circles/' . $circleUniqueId,
+			'{DAV:}displayname' => $circle->getName(),
+		];
+
+		return $principal;
+	}
+
+	/**
+	 * Returns the list of circles a principal is a member of
+	 *
+	 * @param string $principal
+	 * @param bool $needGroups
+	 * @return array
+	 * @throws Exception
+	 */
+	public function getCircleMembership($principal) {
+		if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+			return [];
+		}
+
+		list($prefix, $name) = URLUtil::splitPath($principal);
+
+		if ($this->hasCircles && $prefix === $this->principalPrefix) {
+			$user = $this->userManager->get($name);
+			if (!$user) {
+				throw new Exception('Principal not found');
+			}
+
+			$userSession = \OC::$server->getUserSession();
+			$currentUser = $userSession->getUser();
+
+			$userSession->setUser($user);
+			$circles = \OCA\Circles\Api\v1\Circles::joinedCircles();
+			$userSession->setUser($currentUser);
+
+			$circles = array_map(function($circle) {
+				/** @var \OCA\Circles\Model\Circle $group */
+				return 'principals/circles/' . urlencode($circle->getUniqueId());
+			}, $circles);
+
+			return $circles;
+
+		}
+		return [];
+	}
+
 }

apps/dav/lib/Connector/Sabre/SharesPlugin.php

@@ -120,6 +120,7 @@ private function getShareTypes(\OCP\Files\Node $node) {
 			\OCP\Share::SHARE_TYPE_LINK,
 			\OCP\Share::SHARE_TYPE_REMOTE,
 			\OCP\Share::SHARE_TYPE_EMAIL,
+			\OCP\Share::SHARE_TYPE_CIRCLE,
 		];
 		foreach ($requestedShareTypes as $requestedShareType) {
 			// one of each type is enough to find out about the types

core/js/files/client.js

@@ -454,7 +454,7 @@
 
 		/**
 		 * Fetches a flat list of files filtered by a given filter criteria.
-		 * (currently only system tags is supported)
+		 * (currently system tags and circles are supported)
 		 *
 		 * @param {Object} filter filter criteria
 		 * @param {Object} [filter.systemTagIds] list of system tag ids to filter by
@@ -476,7 +476,8 @@
 				properties = options.properties;
 			}
 
-			if (!filter || (!filter.systemTagIds && _.isUndefined(filter.favorite))) {
+			if (!filter ||
+				(!filter.systemTagIds && _.isUndefined(filter.favorite) && !filter.circlesIds) ) {
 				throw 'Missing filter argument';
 			}
 
@@ -502,6 +503,9 @@
 			_.each(filter.systemTagIds, function(systemTagIds) {
 				body += '        <oc:systemtag>' + escapeHTML(systemTagIds) + '</oc:systemtag>\n';
 			});
+			_.each(filter.circlesIds, function(circlesIds) {
+				body += '        <oc:circle>' + escapeHTML(circlesIds) + '</oc:circle>\n';
+			});
 			if (filter.favorite) {
 				body += '        <oc:favorite>' + (filter.favorite ? '1': '0') + '</oc:favorite>\n';
 			}