chore(cleanup): error handling

* `checkSharePermissions` has not been throwing `NotPermittedException` for a while.
  See #3765 .
* `InvalidArgumentException` was not being handled.
* throw `NotFoundException` if file cannot be found and there is no share token.

Signed-off-by: Max <max@nextcloud.com>

Author: max-nextcloud

lib/Controller/PublicSessionController.php

@@ -80,10 +80,8 @@ public function create(string $token, ?string $filePath = null, ?string $baseVer
 			*/
 		try {
 			$this->fileService->checkSharePermissions($token, Constants::PERMISSION_READ);
-		} catch (NotFoundException) {
+		} catch (NotFoundException | \InvalidArgumentException) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (NotPermittedException) {
-			return new DataResponse(['error' => $this->l10n->t('This file cannot be displayed as download is disabled by the share')], Http::STATUS_NOT_FOUND);
 		}
 
 		return $this->apiService->create($file, $baseVersionEtag, $token, $guestName);

lib/Service/FileService.php

@@ -40,7 +40,10 @@ public function getFileForSession(Session $session, ?string $shareToken = null):
 		if (!$session->isGuest()) {
 			try {
 				return $this->getFileById($session->getDocumentId(), $session->getUserId());
-			} catch (NotFoundException) {
+			} catch (NotFoundException $e) {
+				if ($shareToken === null) {
+					throw $e;
+				}
 				// We may still have a user session but on a public share link so move on
 			}
 		}
@@ -115,7 +118,8 @@ public function getFileById(int $fileId, string $userId): File {
 	}
 
 	/**
-	 * @throws NotFoundException
+	 * @throws NotFoundException if the share cannot be found based on the token
+	 * @throws \InvalidArgumentException if the share is not a File share and path is omitted.
 	 */
 	public function getFileByShareToken(string $shareToken, ?string $path = null): File {
 		try {
@@ -131,7 +135,7 @@ public function getFileByShareToken(string $shareToken, ?string $path = null): F
 		if ($node instanceof File) {
 			return $node;
 		}
-		throw new \InvalidArgumentException('No proper share data');
+		throw new \InvalidArgumentException('Invalid share data.');
 	}
 
 	public function isReadOnly(File $file, ?string $token): bool {
@@ -166,7 +170,7 @@ public function isDownloadDisabled(File $file): bool {
 	 *
 	 * @return void
 	 *
-	 * @throws NotFoundException|NotPermittedException
+	 * @throws NotFoundException
 	 *
 	 * @psalm-param 1|2 $permission
 	 */