Merge c7f5d11f22 into fd78481fd5

apps/files_sharing/lib/Controller/ShareAPIController.php

@@ -860,13 +860,12 @@ class ShareAPIController extends OCSController {
 			throw new OCSBadRequestException($this->l->t('Not a directory'));
 		}
 
-		$nodes = $folder->getDirectoryListing();
-
 		/** @var \OCP\Share\IShare[] $shares */
-		$shares = array_reduce($nodes, function ($carry, $node) {
-			$carry = array_merge($carry, $this->getAllShares($node, true));
-			return $carry;
-		}, []);
+		$shares = [];
+		$sharesInFolder = $this->shareManager->getSharesInFolder($this->currentUser, $folder, true);
+		foreach ($sharesInFolder as $key => $value) {
+			$shares = array_merge($shares, $value);
+		}
 
 		// filter out duplicate shares
 		$known = [];
@@ -1941,49 +1940,6 @@ class ShareAPIController extends OCSController {
 		return false;
 	}
 
-	/**
-	 * Get all the shares for the current user
-	 *
-	 * @param Node|null $path
-	 * @param boolean $reshares
-	 * @return IShare[]
-	 */
-	private function getAllShares(?Node $path = null, bool $reshares = false) {
-		// Get all shares
-		$userShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_USER, $path, $reshares, -1, 0);
-		$groupShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_GROUP, $path, $reshares, -1, 0);
-		$linkShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_LINK, $path, $reshares, -1, 0);
-
-		// EMAIL SHARES
-		$mailShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_EMAIL, $path, $reshares, -1, 0);
-
-		// CIRCLE SHARES
-		$circleShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_CIRCLE, $path, $reshares, -1, 0);
-
-		// TALK SHARES
-		$roomShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_ROOM, $path, $reshares, -1, 0);
-
-		// DECK SHARES
-		$deckShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_DECK, $path, $reshares, -1, 0);
-
-		// SCIENCEMESH SHARES
-		$sciencemeshShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_SCIENCEMESH, $path, $reshares, -1, 0);
-
-		// FEDERATION
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_REMOTE, $path, $reshares, -1, 0);
-		} else {
-			$federatedShares = [];
-		}
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedGroupShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
-		} else {
-			$federatedGroupShares = [];
-		}
-
-		return array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares, $deckShares, $sciencemeshShares, $federatedShares, $federatedGroupShares);
-	}
-
 
 	/**
 	 * merging already formatted shares.

apps/files_sharing/tests/Controller/ShareAPIControllerTest.php

@@ -1442,6 +1442,22 @@ class ShareAPIControllerTest extends TestCase {
 			->method('outgoingServer2ServerGroupSharesAllowed')
 			->willReturn($extraShareTypes[ISHARE::TYPE_REMOTE_GROUP] ?? false);
 
+		$sharesWithoutTypes = [];
+		foreach ($shares as $file => $fileShares) {
+			$sharesWithoutTypes[$file] = [];
+			foreach ($fileShares as $shareType => $shareTypeShares) {
+				if ($shareType === ISHARE::TYPE_REMOTE or $shareType === ISHARE::TYPE_REMOTE_GROUP) {
+					if ($extraShareTypes[$shareType] ?? false) {
+						$sharesWithoutTypes[$file] = array_merge($sharesWithoutTypes[$file], $shareTypeShares);
+					}
+				} else {
+					$sharesWithoutTypes[$file] = array_merge($sharesWithoutTypes[$file], $shareTypeShares);
+				}
+			}
+		}
+		$this->shareManager
+			->method('getSharesInFolder')->willReturn($sharesWithoutTypes);
+
 		$this->groupManager
 			->method('isInGroup')
 			->willReturnCallback(

lib/private/Share20/DefaultShareProvider.php

@@ -674,13 +674,6 @@ class DefaultShareProvider implements IShareProvider {
 		 */
 		if ($reshares === false) {
 			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
 		}
 
 		// todo? maybe get these from the oc_mounts table