fixup!: Move common logic to caller

Signed-off-by: Louis Chmn <[email protected]>

Author: artonge

apps/files_sharing/lib/External/MountProvider.php

@@ -13,7 +13,6 @@
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Federation\ICloudIdManager;
 use OCP\Files\Config\IMountProvider;
-use OCP\Files\Config\IMountProviderArgs;
 use OCP\Files\Config\IPartialMountProvider;
 use OCP\Files\Storage\IStorageFactory;
 use OCP\Http\Client\IClientService;
@@ -78,35 +77,7 @@ public function getMountsForPath(
 		array $mountProviderArgs,
 		IStorageFactory $loader,
 	): array {
-		if (empty($mountProviderArgs)) {
-			return [];
-		}
-
-		$userId = null;
-		$user = null;
-		foreach ($mountProviderArgs as $mountProviderArg) {
-			if ($userId === null) {
-				$user = $mountProviderArg->mountInfo->getUser();
-				$userId = $user->getUID();
-			} elseif ($userId !== $mountProviderArg->mountInfo->getUser()->getUID()) {
-				throw new \LogicException('Mounts must belong to the same user!');
-			}
-		}
-
-		if (!$forChildren) {
-			// override path with mount point when fetching without children
-			$path = $mountProviderArgs[0]->mountInfo->getMountPoint();
-		}
-
-		// remove /uid/files as the target is stored without
-		$path = \substr($path, \strlen('/' . $userId . '/files'));
-		// remove trailing slash
-		$path = \rtrim($path, '/');
-
-		// make sure trailing slash is present when loading children
-		if ($forChildren || $path === '') {
-			$path .= '/';
-		}
+		$user = $mountProviderArgs[0]->mountInfo->getUser();
 
 		$qb = $this->connection->getQueryBuilder();
 		$qb->select('id', 'remote', 'share_token', 'password', 'mountpoint', 'owner')

apps/files_sharing/lib/MountProvider.php

@@ -14,7 +14,6 @@
 use OCP\Cache\CappedMemoryCache;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Config\IMountProvider;
-use OCP\Files\Config\IMountProviderArgs;
 use OCP\Files\Config\IPartialMountProvider;
 use OCP\Files\Mount\IMountManager;
 use OCP\Files\Mount\IMountPoint;
@@ -364,36 +363,9 @@ public function getMountsForPath(
 		array $mountProviderArgs,
 		IStorageFactory $loader,
 	): array {
-		if (empty($mountProviderArgs)) {
-			return [];
-		}
-
 		$limit = -1;
-		$userId = null;
-		$user = null;
-		foreach ($mountProviderArgs as $mountProviderArg) {
-			if ($userId === null) {
-				$user = $mountProviderArg->mountInfo->getUser();
-				$userId = $user->getUID();
-			} elseif ($userId !== $mountProviderArg->mountInfo->getUser()->getUID()) {
-				throw new \LogicException('Mounts must belong to the same user!');
-			}
-		}
-
-		if (!$forChildren) {
-			// override path with mount point when fetching without children
-			$path = $mountProviderArgs[0]->mountInfo->getMountPoint();
-		}
-
-		// remove /uid/files as the target is stored without
-		$path = \substr($path, \strlen('/' . $userId . '/files'));
-		// remove trailing slash
-		$path = \rtrim($path, '/');
-
-		// make sure trailing slash is present when loading children
-		if ($forChildren || $path === '') {
-			$path .= '/';
-		}
+		$user = $mountProviderArgs[0]->mountInfo->getUser();
+		$userId = $user->getUID();
 
 		$shares = $this->mergeIterables(
 			$this->shareManager->getSharedWithByPath($userId, IShare::TYPE_USER, $path, $forChildren, $limit),
@@ -406,10 +378,7 @@ public function getMountsForPath(
 		$shares = $this->filterShares($shares, $userId);
 		$superShares = $this->buildSuperShares($shares, $user);
 
-		return $this->getMountsFromSuperShares($userId,
-			$superShares,
-			$loader,
-			$user);
+		return $this->getMountsFromSuperShares($userId, $superShares, $loader, $user);
 	}
 
 	/**

lib/private/Files/Config/MountProviderCollection.php

@@ -99,12 +99,42 @@ public function getUserMountsFromProviderByPath(
 			return [];
 		}
 
+		if (empty($mountProviderArgs)) {
+			return [];
+		}
+
 		if (!is_a($providerClass, IPartialMountProvider::class, true)) {
 			throw new \LogicException(
 				'Mount provider does not support partial mounts'
 			);
 		}
 
+		$userId = null;
+		$user = null;
+		foreach ($mountProviderArgs as $mountProviderArg) {
+			if ($userId === null) {
+				$user = $mountProviderArg->mountInfo->getUser();
+				$userId = $user->getUID();
+			} elseif ($userId !== $mountProviderArg->mountInfo->getUser()->getUID()) {
+				throw new \LogicException('Mounts must belong to the same user!');
+			}
+		}
+
+		if (!$forChildren) {
+			// override path with mount point when fetching without children
+			$path = $mountProviderArgs[0]->mountInfo->getMountPoint();
+		}
+
+		// remove /uid/files as the target is stored without
+		$path = \substr($path, \strlen('/' . $userId . '/files'));
+		// remove trailing slash
+		$path = \rtrim($path, '/');
+
+		// make sure trailing slash is present when loading children
+		if ($forChildren || $path === '') {
+			$path .= '/';
+		}
+
 		/** @var IPartialMountProvider $provider */
 		return $provider->getMountsForPath(
 			$path,