test: fix thumbnail and middleware PHPUnit regressions

Author: vitormattos

tests/php/Api/Controller/FileControllerTest.php

@@ -9,13 +9,26 @@
 namespace OCA\Libresign\Tests\Api\Controller;
 
 use OCA\Libresign\AppInfo\Application;
+use OCA\Libresign\Db\File as FileEntity;
+use OCA\Libresign\Db\FileMapper;
 use OCA\Libresign\Tests\Api\ApiTestCase;
 
 /**
  * @internal
  * @group DB
  */
 final class FileControllerTest extends ApiTestCase {
+	private function getDocumentFileFromResult(FileEntity $file): FileEntity {
+		if ($file->getNodeType() !== 'envelope') {
+			return $file;
+		}
+
+		$children = \OCP\Server::get(FileMapper::class)->getChildrenFiles($file->getId());
+		$this->assertNotEmpty($children, 'Expected envelope to have at least one child file.');
+
+		return $children[0];
+	}
+
 	/**
 	 * @runInSeparateProcess
 	 */
@@ -180,6 +193,7 @@ public function testGetThumbnailByOwner(): void {
 			]],
 			'userManager' => $owner,
 		]);
+		$file = $this->getDocumentFileFromResult($file);
 
 		$this->request
 			->withRequestHeader([
@@ -216,6 +230,7 @@ public function testGetThumbnailBySigner(): void {
 			]],
 			'userManager' => $owner,
 		]);
+		$file = $this->getDocumentFileFromResult($file);
 
 		$this->request
 			->withRequestHeader([
@@ -252,6 +267,7 @@ public function testGetThumbnailByNodeIdForSigner(): void {
 			]],
 			'userManager' => $owner,
 		]);
+		$file = $this->getDocumentFileFromResult($file);
 
 		$this->request
 			->withRequestHeader([

tests/php/Unit/Middleware/InjectionMiddlewareTest.php

@@ -15,6 +15,7 @@
 use OCA\Libresign\Handler\CertificateEngine\CertificateEngineFactory;
 use OCA\Libresign\Helper\ValidateHelper;
 use OCA\Libresign\Middleware\InjectionMiddleware;
+use OCA\Libresign\Service\FileAccessService;
 use OCA\Libresign\Service\SignFileService;
 use OCA\Libresign\Service\UuidResolverService;
 use OCP\AppFramework\Controller;
@@ -46,11 +47,12 @@ final class InjectionMiddlewareTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	private CertificateEngineFactory $certificateEngineFactory;
 	private FileMapper&MockObject $fileMapper;
 	private IInitialState $initialState;
+	private FileAccessService&MockObject $fileAccessService;
 	private SignFileService&MockObject $signFileService;
 	private UuidResolverService&MockObject $uuidResolverService;
 	private IL10N&MockObject $l10n;
-	private IappConfig&MockObject $appConfig;
-	private IurlGenerator&MockObject $urlGenerator;
+	private IAppConfig&MockObject $appConfig;
+	private IURLGenerator&MockObject $urlGenerator;
 	private ?string $userId = null;
 
 	private InitialStateService $initialStateService;
@@ -72,6 +74,7 @@ public function setUp(): void {
 			$this->createMock(IServerContainer::class)
 		);
 		$this->initialState = new InitialState($this->initialStateService, 'libresign');
+		$this->fileAccessService = $this->createMock(FileAccessService::class);
 		$this->signFileService = $this->createMock(SignFileService::class);
 		$this->uuidResolverService = $this->createMock(UuidResolverService::class);
 		$this->l10n = $this->createMock(IL10N::class);
@@ -88,6 +91,7 @@ public function getInjectionMiddleware(): InjectionMiddleware {
 			$this->certificateEngineFactory,
 			$this->fileMapper,
 			$this->initialState,
+			$this->fileAccessService,
 			$this->signFileService,
 			$this->uuidResolverService,
 			$this->l10n,