Merge pull request #3949 from nextcloud/fix/stable30-templates

fix: Fix missing conflicts on pdf templating

lib/Service/TemplateFieldService.php

@@ -12,6 +12,7 @@
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
+use OCP\Files\NotFoundException;
 use OCP\Files\Template\Field;
 use OCP\Files\Template\FieldType;
 use OCP\Http\Client\IClientService;
@@ -46,12 +47,16 @@ public function extractFields(Node|int $file): array {
 		}
 
 		try {
+			if (!$file || !$file instanceof File) {
+				throw new NotFoundException();
+			}
+
 			$localCache = $this->cacheFactory->createLocal('richdocuments_templates/');
 			$cacheName = $file->getId() . "/" . $file->getEtag();
 			$cachedResponse = $localCache->get($cacheName);
-			
+
 			if ($cachedResponse !== null) {
-				// return $cachedResponse;
+				return $cachedResponse;
 			}
 
 			if ($file->getMimeType() === 'application/pdf') {
@@ -125,6 +130,13 @@ public function fillFields(Node|int $file, array $fields = [], ?string $destinat
 			$file = $this->rootFolder->getFirstNodeById($file);
 		}
 
+		if (!$file || !$file instanceof File) {
+			$e = new NotFoundException();
+			$this->logger->error($e->getMessage());
+
+			throw $e;
+		}
+
 		if ($file->getMimeType() === 'application/pdf') {
 			$content = $this->pdfService->fillFields($file, $fields);
 			if ($destination !== null) {