fix(share): get file from context for attachments

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

Author: max-nextcloud

lib/Service/AttachmentService.php

@@ -309,7 +309,7 @@ public function uploadAttachment(int $documentId, string $newFileName, $newFileR
 	 * @throws InvalidPathException
 	 * @throws NoUserException
 	 */
-	public function uploadAttachmentPublic(?int $documentId, string $newFileName, $newFileResource, string $shareToken): array {
+	public function uploadAttachmentPublic(int $documentId, string $newFileName, $newFileResource, string $shareToken): array {
 		try {
 			$share = $this->shareManager->getShareByToken($shareToken);
 		} catch (ShareNotFound) {
@@ -541,32 +541,23 @@ private function getTextFile(int $documentId, string $userId): File {
 	 *
 	 * @throws NotFoundException
 	 */
-	private function getTextFilePublic(?int $documentId, string $shareToken): File {
-		// is the file shared with this token?
+	private function getTextFilePublic(int $documentId, string $shareToken): File {
+		// TODO: Lazy load the context and enable these additional checks inside the context
 		try {
 			$share = $this->shareManager->getShareByToken($shareToken);
-			if (in_array($share->getShareType(), [IShare::TYPE_LINK, IShare::TYPE_EMAIL])) {
-				// shared file or folder?
-				if ($share->getNodeType() === 'file') {
-					$textFile = $share->getNode();
-					if ($textFile instanceof File
-						&& !$this->isDownloadDisabled($textFile)
-						&& $textFile->getId() === $documentId
-					) {
-						return $textFile;
-					}
-				} elseif ($documentId !== null && $share->getNodeType() === 'folder') {
-					$folder = $share->getNode();
-					if ($folder instanceof Folder) {
-						$textFile = $folder->getFirstNodeById($documentId);
-						if ($textFile instanceof File && !$this->isDownloadDisabled($textFile)) {
-							return $textFile;
-						}
-					}
-				}
-			}
 		} catch (ShareNotFound) {
-			// same as below
+			throw new NotFoundException();
+		}
+		if (!in_array($share->getShareType(), [IShare::TYPE_LINK, IShare::TYPE_EMAIL])) {
+			throw new NotFoundException();
+		}
+		$document = $this->documentMapper->find($documentId);
+		$type = $document->getContextType();
+		$id = $document->getContextId();
+		$context = $this->contextManager->getContext($type, $id, $shareToken);
+		$file = $context->getFile();
+		if ($file instanceof File && !$this->isDownloadDisabled($file)) {
+			return $file;
 		}
 		throw new NotFoundException('Text file with id=' . (string)$documentId . ' and shareToken ' . $shareToken . ' was not found.');
 	}

lib/Service/FileService.php

@@ -48,7 +48,7 @@ public function getFileByIdFromShare(int $fileId, string $shareToken): File {
 		if ($node instanceof Folder) {
 			$node = $node->getFirstNodeById($fileId);
 		}
-		if ($node instanceof File) {
+		if ($node instanceof File && $node->getId() === $fileId) {
 			return $node;
 		}
 		throw new NotFoundException();