refactor: replace generic file resolvers

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

lib/Controller/FileController.php

@@ -188,26 +188,22 @@ private function validate(?string $type = null, $identifier = null): DataRespons
 		try {
 			if ($type === 'Uuid' && !empty($identifier)) {
 				try {
-					$this->fileService
-						->setFileByType('Uuid', $identifier);
+					$this->fileService->setFileByUuid((string)$identifier);
 				} catch (LibresignException) {
-					$this->fileService
-						->setFileByType('SignerUuid', $identifier);
+					$this->fileService->setFileBySignerUuid((string)$identifier);
 				}
-			} elseif (!empty($type) && !empty($identifier)) {
-				$this->fileService
-					->setFileByType($type, $identifier);
-
+			} elseif ($type === 'SignerUuid' && !empty($identifier)) {
+				$this->fileService->setFileBySignerUuid((string)$identifier);
+			} elseif ($type === 'FileId' && !empty($identifier)) {
+				$this->fileService->setFileById((int)$identifier);
 			} elseif ($this->request->getParam('fileId')) {
-				$this->fileService->setFileByType(
-					'FileId',
-					$this->request->getParam('fileId')
-				);
+				$this->fileService->setFileById((int)$this->request->getParam('fileId'));
 			} elseif ($this->request->getParam('uuid')) {
-				$this->fileService->setFileByType(
-					'Uuid',
-					$this->request->getParam('uuid')
-				);
+				try {
+					$this->fileService->setFileByUuid((string)$this->request->getParam('uuid'));
+				} catch (LibresignException) {
+					$this->fileService->setFileBySignerUuid((string)$this->request->getParam('uuid'));
+				}
 			}
 
 			$return = $this->fileService

lib/Controller/PageController.php

@@ -190,7 +190,7 @@ public function indexFPath(string $path): TemplateResponse {
 			try {
 				$this->initialState->provideInitialState('file_info',
 					$this->fileService
-						->setFileByType('uuid', $matches['uuid'])
+						->setFileByUuid($matches['uuid'])
 						->setIdentifyMethodId($this->sessionService->getIdentifyMethodId())
 						->setHost($this->request->getServerHost())
 						->setMe($this->userSession->getUser())
@@ -635,7 +635,7 @@ public function resetPassword(): TemplateResponse {
 	public function validationFilePublic(string $uuid): TemplateResponse {
 		try {
 			$this->signFileService->getFileByUuid($uuid);
-			$this->fileService->setFileByType('uuid', $uuid);
+			$this->fileService->setFileByUuid($uuid);
 		} catch (DoesNotExistException) {
 			try {
 				$signRequest = $this->signFileService->getSignRequestByUuid($uuid);

lib/Dav/SignatureStatusPlugin.php

@@ -32,7 +32,7 @@ public function propFind(PropFind $propFind, INode $node): void {
 			return;
 		}
 
-		$fileService->setFileByType('FileId', $nodeId);
+		$fileService->setFileByNodeId($nodeId);
 
 		$propFind->handle('{http://nextcloud.org/ns}libresign-signature-status', $fileService->getStatus());
 		$propFind->handle('{http://nextcloud.org/ns}libresign-signed-node-id', $fileService->getSignedNodeId());

lib/Service/FileService.php

@@ -228,22 +228,34 @@ public function showValidateFile(bool $validateFile = true): self {
 		return $this;
 	}
 
-	/**
-	 * @return static
-	 */
-	public function setFileByType(string $type, $identifier): self {
+	private function setFileOrFail(callable $resolver): self {
 		try {
-			$method = $type === 'FileId' ? 'getById' : 'getBy' . $type;
-			/** @var File */
-			$file = call_user_func([$this->fileMapper, $method], $identifier);
+			$file = $resolver();
 		} catch (\Throwable) {
 			throw new LibresignException($this->l10n->t('Invalid data to validate file'), 404);
 		}
-		if (!$file) {
+
+		if (!$file instanceof File) {
 			throw new LibresignException($this->l10n->t('Invalid file identifier'), 404);
 		}
-		$this->setFile($file);
-		return $this;
+
+		return $this->setFile($file);
+	}
+
+	public function setFileById(int $fileId): self {
+		return $this->setFileOrFail(fn () => $this->fileMapper->getById($fileId));
+	}
+
+	public function setFileByUuid(string $uuid): self {
+		return $this->setFileOrFail(fn () => $this->fileMapper->getByUuid($uuid));
+	}
+
+	public function setFileBySignerUuid(string $uuid): self {
+		return $this->setFileOrFail(fn () => $this->fileMapper->getBySignerUuid($uuid));
+	}
+
+	public function setFileByNodeId(int $nodeId): self {
+		return $this->setFileOrFail(fn () => $this->fileMapper->getByNodeId($nodeId));
 	}
 
 	public function validateUploadedFile(array $file): void {
@@ -302,6 +314,10 @@ public function getStatus(): int {
 		return $this->file->getStatus();
 	}
 
+	public function isLibresignFile(int $nodeId): bool {
+		return $this->fileMapper->fileIdExists($nodeId);
+	}
+
 	public function getSignedNodeId(): ?int {
 		$status = $this->file->getStatus();
 

tests/php/Unit/Service/FileServiceTest.php

@@ -61,7 +61,7 @@ public function testValidateFileContentSkipsNonPdfFiles(): void {
 		$service->validateFileContent('{"json": true}', 'json');
 	}
 
-	public function testSetFileByTypeThrowsOnInvalid(): void {
+	public function testSetFileByIdThrowsOnInvalid(): void {
 		$fileMapper = $this->createMock(\OCA\Libresign\Db\FileMapper::class);
 		$fileMapper->method('getById')->willThrowException(new \Exception('not found'));
 
@@ -70,10 +70,10 @@ public function testSetFileByTypeThrowsOnInvalid(): void {
 		]);
 
 		$this->expectException(LibresignException::class);
-		$service->setFileByType('FileId', 123);
+		$service->setFileById(123);
 	}
 
-	public function testSetFileByTypeSetsFile(): void {
+	public function testSetFileByIdSetsFile(): void {
 		$file = new \OCA\Libresign\Db\File();
 		$file->setStatus(1);
 
@@ -84,7 +84,7 @@ public function testSetFileByTypeSetsFile(): void {
 			\OCA\Libresign\Db\FileMapper::class => $fileMapper,
 		]);
 
-		$returned = $service->setFileByType('FileId', 123);
+		$returned = $service->setFileById(123);
 		$this->assertInstanceOf(FileService::class, $returned);
 		$this->assertSame(1, $service->getStatus());
 	}