Improve OCA\DAV\Connector\Sabre\Principal

Signed-off-by: Thomas Citharel <[email protected]>

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

@@ -235,12 +235,10 @@ public function getGroupMembership($principal, $needGroups = false) {
 			}
 		}
 
-		$groups = array_unique(array_merge(
+		return array_unique(array_merge(
 			$groups,
 			$this->traitGetGroupMembership($principal, $needGroups)
 		));
-
-		return $groups;
 	}
 
 	/**
@@ -472,25 +470,23 @@ public function findByUri($uri, $principalPrefix) {
 			$restrictGroups = $this->groupManager->getUserGroupIds($user);
 		}
 
-		if (strpos($uri, 'mailto:') === 0) {
-			if ($principalPrefix === 'principals/users') {
-				$users = $this->userManager->getByEmail(substr($uri, 7));
-				if (count($users) !== 1) {
-					return null;
-				}
-				$user = $users[0];
+		if ($principalPrefix === 'principals/users' && (strpos($uri, 'mailto:') === 0)) {
+			$users = $this->userManager->getByEmail(substr($uri, 7));
+			if (count($users) !== 1) {
+				return null;
+			}
+			$user = $users[0];
 
-				if ($restrictGroups !== false) {
-					$userGroups = $this->groupManager->getUserGroupIds($user);
-					if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
-						return null;
-					}
+			if ($restrictGroups !== false) {
+				$userGroups = $this->groupManager->getUserGroupIds($user);
+				if (count(array_intersect($userGroups, $restrictGroups)) === 0) {
+					return null;
 				}
-
-				return $this->principalPrefix . '/' . $user->getUID();
 			}
+
+			return $this->principalPrefix . '/' . $user->getUID();
 		}
-		if (substr($uri, 0, 10) === 'principal:') {
+		if (strpos($uri, 'principal:') === 0) {
 			$principal = substr($uri, 10);
 			$principal = $this->getPrincipalByPath($principal);
 			if ($principal !== null) {
@@ -505,7 +501,7 @@ public function findByUri($uri, $principalPrefix) {
 	 * @param IUser $user
 	 * @return array
 	 */
-	protected function userToPrincipal($user) {
+	protected function userToPrincipal(IUser $user): array {
 		$userId = $user->getUID();
 		$displayName = $user->getDisplayName();
 		$principal = [
@@ -523,21 +519,21 @@ protected function userToPrincipal($user) {
 		return $principal;
 	}
 
-	public function getPrincipalPrefix() {
+	public function getPrincipalPrefix(): string {
 		return $this->principalPrefix;
 	}
 
 	/**
 	 * @param string $circleUniqueId
 	 * @return array|null
 	 */
-	protected function circleToPrincipal($circleUniqueId) {
+	protected function circleToPrincipal(string $circleUniqueId): ?array {
 		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
 			return null;
 		}
 
 		try {
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true);
+			$circle = Circles::detailsCircle($circleUniqueId, true);
 		} catch (QueryException $ex) {
 			return null;
 		} catch (CircleNotFoundException $ex) {
@@ -562,10 +558,9 @@ protected function circleToPrincipal($circleUniqueId) {
 	 * @param string $principal
 	 * @return array
 	 * @throws Exception
-	 * @throws \OCP\AppFramework\QueryException
 	 * @suppress PhanUndeclaredClassMethod
 	 */
-	public function getCircleMembership($principal):array {
+	public function getCircleMembership(string $principal):array {
 		if (!$this->appManager->isEnabledForUser('circles') || !class_exists('\OCA\Circles\Api\v1\Circles')) {
 			return [];
 		}
@@ -577,14 +572,12 @@ public function getCircleMembership($principal):array {
 				throw new Exception('Principal not found');
 			}
 
-			$circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);
+			$circles = Circles::joinedCircles($name, true);
 
-			$circles = array_map(function ($circle) {
-				/** @var \OCA\Circles\Model\Circle $circle */
+			return array_map(static function ($circle) {
+				/** @var Circle $circle */
 				return 'principals/circles/' . urlencode($circle->getSingleId());
 			}, $circles);
-
-			return $circles;
 		}
 
 		return [];

apps/dav/lib/Traits/PrincipalProxyTrait.php

@@ -108,7 +108,7 @@ public function getGroupMembership($principal, $needGroups = false) {
 	 *
 	 * @param string $principal
 	 * @param string[] $members
-	 * @throws Exception
+	 * @throws Exception|\OCP\DB\Exception
 	 */
 	public function setGroupMemberSet($principal, array $members) {
 		[$principalUri, $target] = \Sabre\Uri\split($principal);
@@ -183,7 +183,7 @@ private function isProxyPrincipal(string $principalUri):bool {
 		[$realPrincipalUri, $proxy] = \Sabre\Uri\split($principalUri);
 		[$prefix, $userId] = \Sabre\Uri\split($realPrincipalUri);
 
-		if (!isset($prefix) || !isset($userId)) {
+		if (!isset($prefix, $userId)) {
 			return false;
 		}
 		if ($prefix !== $this->principalPrefix) {