Merge pull request #1128 from nextcloud/backport/1127/stable24

[stable24] ignore remnants
nextcloud · Aug 30, 2022 · fd641a0 · fd641a0
2 parents 2817d41 + bf17657
commit fd641a0
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/lib/ShareByCircleProvider.php b/lib/ShareByCircleProvider.php
@@ -34,9 +34,7 @@
 
 namespace OCA\Circles;
 
-use OCA\Circles\Tools\Traits\TNCLogger;
-use OCA\Circles\Tools\Traits\TArrayTools;
-use OCA\Circles\Tools\Traits\TStringTools;
+use Exception;
 use OC;
 use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Exceptions\ContactAddressBookNotFoundException;
@@ -68,6 +66,9 @@
 use OCA\Circles\Service\FederatedEventService;
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Service\ShareWrapperService;
+use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Circles\Tools\Traits\TNCLogger;
+use OCA\Circles\Tools\Traits\TStringTools;
 use OCP\Files\Folder;
 use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
@@ -453,10 +454,19 @@ public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offs
 			return [];
 		}
 
-		$federatedUser = $this->federatedUserService->getLocalFederatedUser($userId);
+		$nodeId = (!is_null($node)) ? $node->getId() : 0;
+
+		try {
+			$federatedUser = $this->federatedUserService->getLocalFederatedUser($userId, false);
+		} catch (Exception $e) {
+			$this->e($e, ['userId' => $userId, 'shareType' => $shareType, 'nodeId' => $nodeId]);
+
+			return [];
+		}
+
 		$wrappedShares = $this->shareWrapperService->getSharesBy(
 			$federatedUser,
-			(!is_null($node)) ? $node->getId() : 0,
+			$nodeId,
 			$reshares,
 			$limit,
 			$offset,