fix: click to sign unauthenticated

lib/Controller/PageController.php

@@ -18,6 +18,7 @@
 use OCA\Libresign\Middleware\Attribute\RequireSetupOk;
 use OCA\Libresign\Middleware\Attribute\RequireSignRequestUuid;
 use OCA\Libresign\Service\AccountService;
+use OCA\Libresign\Service\File\FileListService;
 use OCA\Libresign\Service\FileService;
 use OCA\Libresign\Service\IdentifyMethod\SignatureMethod\TokenService;
 use OCA\Libresign\Service\IdentifyMethodService;
@@ -61,6 +62,7 @@ public function __construct(
 		private IdentifyMethodService $identifyMethodService,
 		private IAppConfig $appConfig,
 		private FileService $fileService,
+		private FileListService $fileListService,
 		private FileMapper $fileMapper,
 		private SignRequestMapper $signRequestMapper,
 		private LoggerInterface $logger,
@@ -395,29 +397,34 @@ private function getPdfUrls(): array {
 	}
 
 	private function getEnvelopeChildFiles(): array {
-		$childFiles = $this->fileMapper->getChildrenFiles($this->getFileEntity()->getId());
-		$result = [];
-
-		foreach ($childFiles as $childFile) {
-
-			$childSignRequest = $this->signRequestMapper->getByFileIdAndSignRequestId(
-				$childFile->getId(),
-				$this->getSignRequestEntity()->getId()
-			);
+		$parentFileId = $this->getFileEntity()->getId();
+		$currentSignRequest = $this->getSignRequestEntity();
+		$childFiles = $this->fileMapper->getChildrenFiles($parentFileId);
+		$childSignRequests = $this->signRequestMapper->getByEnvelopeChildrenAndIdentifyMethod(
+			$parentFileId,
+			$currentSignRequest->getId()
+		);
 
-			$fileData = $this->fileService
-				->setFile($childFile)
-				->setHost($this->request->getServerHost())
-				->setSignerIdentified()
-				->setIdentifyMethodId($this->sessionService->getIdentifyMethodId())
-				->setSignRequest($childSignRequest)
-				->showSigners()
-				->toArray();
+		$signRequestsByFileId = [];
+		foreach ($childSignRequests as $childSignRequest) {
+			$signRequestsByFileId[$childSignRequest->getFileId()] = true;
+		}
 
-			$result[] = $fileData;
+		foreach ($childFiles as $childFile) {
+			if (!isset($signRequestsByFileId[$childFile->getId()])) {
+				$this->logger->warning('Missing sign request for envelope child file', [
+					'parentFileId' => $parentFileId,
+					'childFileId' => $childFile->getId(),
+					'signRequestId' => $currentSignRequest->getId(),
+				]);
+			}
 		}
 
-		return $result;
+		return $this->fileListService->formatEnvelopeChildFilesForSignRequest(
+			$childFiles,
+			$childSignRequests,
+			$currentSignRequest,
+		);
 	}
 
 	/**

lib/Service/File/FileListService.php

@@ -89,6 +89,77 @@ public function formatSingleFile(IUser $user, File $file): array {
 		return $this->formatSingleFileData($file, $signers, $identifyMethods, $visibleElements, $user);
 	}
 
+	public function formatSingleFileForSignRequest(File $file, ?SignRequest $currentSignRequest = null): array {
+		$signers = $this->signRequestMapper->getByMultipleFileId([$file->getId()]);
+		$identifyMethods = $this->signRequestMapper->getIdentifyMethodsFromSigners($signers);
+		$visibleElements = $this->signRequestMapper->getVisibleElementsFromSigners($signers);
+
+		return $this->formatSingleFileData(
+			$file,
+			$signers,
+			$identifyMethods,
+			$visibleElements,
+			null,
+			$currentSignRequest?->getId(),
+		);
+	}
+
+	/**
+	 * Format multiple envelope child files for a sign request with preloaded data.
+	 * Avoids N+1 queries by reusing the provided sign request collection.
+	 *
+	 * @param File[] $childFiles
+	 * @param SignRequest[] $childSignRequests
+	 * @return list<array<string, mixed>>
+	 */
+	public function formatEnvelopeChildFilesForSignRequest(
+		array $childFiles,
+		array $childSignRequests,
+		?SignRequest $currentSignRequest = null,
+	): array {
+		$identifyMethods = $this->signRequestMapper->getIdentifyMethodsFromSigners($childSignRequests);
+		$visibleElements = $this->signRequestMapper->getVisibleElementsFromSigners($childSignRequests);
+		$signRequestsByFileId = [];
+		foreach ($childSignRequests as $signRequest) {
+			$signRequestsByFileId[$signRequest->getFileId()][] = $signRequest;
+		}
+		$currentIdentifyKey = null;
+		if ($currentSignRequest) {
+			if (!isset($identifyMethods[$currentSignRequest->getId()])) {
+				$currentIdentifyMethods = $this->signRequestMapper->getIdentifyMethodsFromSigners([$currentSignRequest]);
+				$identifyMethods += $currentIdentifyMethods;
+			}
+			$currentIdentifyMethods = $identifyMethods[$currentSignRequest->getId()] ?? [];
+			$currentIdentifyKey = $this->buildIdentifyKey($currentIdentifyMethods);
+		}
+
+		$formatted = [];
+		foreach ($childFiles as $childFile) {
+			$signers = $signRequestsByFileId[$childFile->getId()] ?? [];
+			$meSignRequestId = null;
+			if ($currentIdentifyKey !== null) {
+				foreach ($signers as $signer) {
+					$signerIdentifyKey = $this->buildIdentifyKey($identifyMethods[$signer->getId()] ?? []);
+					if ($signerIdentifyKey === $currentIdentifyKey) {
+						$meSignRequestId = $signer->getId();
+						break;
+					}
+				}
+			}
+
+			$formatted[] = $this->formatSingleFileData(
+				$childFile,
+				$signers,
+				$identifyMethods,
+				$visibleElements,
+				null,
+				$meSignRequestId,
+			);
+		}
+
+		return $formatted;
+	}
+
 	/**
 	 * @param File[] $files
 	 * @param SignRequest[] $signers
@@ -119,15 +190,16 @@ private function associateAllAndFormat(
 	 * @param SignRequest[] $signers
 	 * @param array<int, array<string, Entity&IdentifyMethod>> $identifyMethods
 	 * @param array<int, FileElement[]> $visibleElements
-	 * @param IUser $user
+	 * @param IUser|null $user
 	 * @return LibresignFileDetail
 	 */
 	private function formatSingleFileData(
 		File $fileEntity,
 		array $signers,
 		array $identifyMethods,
 		array $visibleElements,
-		IUser $user,
+		?IUser $user,
+		?int $meSignRequestId = null,
 	): array {
 		$file = [
 			'id' => $fileEntity->getId(),
@@ -165,7 +237,14 @@ private function formatSingleFileData(
 			if ($signer->getFileId() !== $fileEntity->getId()) {
 				continue;
 			}
-			$signerData = $this->formatSignerData($signer, $identifyMethods, $visibleElements, $file['metadata'], $user);
+			$signerData = $this->formatSignerData(
+				$signer,
+				$identifyMethods,
+				$visibleElements,
+				$file['metadata'],
+				$user,
+				$meSignRequestId,
+			);
 			$file['signers'][] = $signerData;
 			if (!empty($signerData['me']) && !isset($file['signUuid'])) {
 				$file['signUuid'] = $signerData['sign_uuid'];
@@ -214,9 +293,24 @@ private function formatSignerData(
 		array $identifyMethods,
 		array $visibleElements,
 		array $metadata,
-		IUser $user,
+		?IUser $user,
+		?int $meSignRequestId = null,
 	): array {
 		$identifyMethodsOfSigner = $identifyMethods[$signer->getId()] ?? [];
+		$me = false;
+		if ($meSignRequestId !== null) {
+			$me = $signer->getId() === $meSignRequestId;
+		} elseif ($user) {
+			$me = array_reduce($identifyMethodsOfSigner, function (bool $carry, IdentifyMethod $identifyMethod) use ($user): bool {
+				if ($identifyMethod->getIdentifierKey() === IdentifyMethodService::IDENTIFY_ACCOUNT) {
+					return $user->getUID() === $identifyMethod->getIdentifierValue();
+				}
+				if ($identifyMethod->getIdentifierKey() === IdentifyMethodService::IDENTIFY_EMAIL && $user->getEMailAddress()) {
+					return $user->getEMailAddress() === $identifyMethod->getIdentifierValue();
+				}
+				return $carry;
+			}, false);
+		}
 		/** @var LibresignSigner */
 		$data = [
 			'email' => array_reduce($identifyMethodsOfSigner, function (string $carry, IdentifyMethod $identifyMethod): string {
@@ -241,15 +335,7 @@ private function formatSignerData(
 			'signingOrder' => $signer->getSigningOrder(),
 			'status' => $signer->getStatus(),
 			'statusText' => $this->signRequestMapper->getTextOfSignerStatus($signer->getStatus()),
-			'me' => array_reduce($identifyMethodsOfSigner, function (bool $carry, IdentifyMethod $identifyMethod) use ($user): bool {
-				if ($identifyMethod->getIdentifierKey() === IdentifyMethodService::IDENTIFY_ACCOUNT) {
-					return $user->getUID() === $identifyMethod->getIdentifierValue();
-				}
-				if ($identifyMethod->getIdentifierKey() === IdentifyMethodService::IDENTIFY_EMAIL && $user->getEMailAddress()) {
-					return $user->getEMailAddress() === $identifyMethod->getIdentifierValue();
-				}
-				return $carry;
-			}, false),
+			'me' => $me,
 			'visibleElements' => isset($visibleElements[$signer->getId()])
 				? $this->fileElementService->formatVisibleElements(
 					$visibleElements[$signer->getId()],

lib/Service/SignJobCoordinator.php

@@ -137,10 +137,11 @@ private function resolveUser(?string $userId): ?IUser {
 	}
 
 	private function retrieveCredentials(?IUser $user, ?string $credentialsId): ?array {
-		if (empty($credentialsId) || $user === null) {
+		if (empty($credentialsId)) {
 			return null;
 		}
-		return $this->credentialsManager->retrieve($user->getUID(), $credentialsId);
+		$uid = $user?->getUID() ?? '';
+		return $this->credentialsManager->retrieve($uid, $credentialsId);
 	}
 
 	private function hydrateSignService(array $argument, ?array $credentials, FileEntity $file, SignRequestEntity $signRequest, ?IUser $user): void {

src/views/SignPDF/SignPDF.vue

@@ -71,7 +71,6 @@ export default {
 			pdfBlobs: [],
 			fileNames: [],
 			envelopeFiles: [],
-			envelopePdfFiles: [],
 		}
 	},
 	computed: {
@@ -187,63 +186,53 @@ export default {
 		},
 		async loadEnvelopePdfs(parentFileId) {
 			try {
-				const envelopeFiles = loadState('libresign', 'envelopeFiles', [])
+				const envelopeFiles = await this.fetchEnvelopeFiles(parentFileId)
+				this.envelopeFiles = envelopeFiles
 
-				let files = []
-				if (envelopeFiles.length > 0) {
-					files = envelopeFiles
-				} else {
-					const url = generateOcsUrl('/apps/libresign/api/v1/file/list')
-					const params = new URLSearchParams({
-						page: '1',
-						length: '100',
-						parentFileId: parentFileId.toString(),
-						signer_uuid: this.$route.params.uuid,
-					})
-
-					const { data } = await axios.get(`${url}?${params.toString()}`)
-					if (data.ocs?.data?.data) {
-						files = data.ocs.data.data
-					} else {
-						this.signStore.errors = [{ message: t('libresign', 'Failed to load envelope files') }]
-						return
-					}
+				if (!envelopeFiles.length) {
+					this.signStore.errors = [{ message: t('libresign', 'Failed to load envelope files') }]
+					return
 				}
 
-				this.envelopeFiles = files
-				const pdfFiles = files.flatMap(file => {
-					if (Array.isArray(file.files) && file.files.length > 0) {
-						return file.files
-					}
-					return [file]
-				})
-				this.envelopePdfFiles = pdfFiles
-
-				for (const file of files) {
-					const signer = file.signers?.find(row => row.me) || {}
-					if (Object.keys(signer).length > 0) {
-						this.filesStore.addFile(file)
-						break
-					}
+				const fileWithMe = envelopeFiles.find(file => file.signers?.some(row => row.me))
+				if (fileWithMe) {
+					this.filesStore.addFile(fileWithMe)
 				}
 
-				const urls = pdfFiles.map(file => file.file).filter(Boolean)
-				if (urls.length === 0) {
+				const urls = envelopeFiles
+					.map(file => file.files?.[0]?.file)
+					.filter(Boolean)
+				if (!urls.length) {
 					this.signStore.errors = [{ message: t('libresign', 'Failed to load envelope files') }]
 					return
 				}
-				this.fileNames = pdfFiles.map(file => {
-					return `${file.name}.${file.metadata?.extension || 'pdf'}`
-				})
+
+				this.fileNames = envelopeFiles.map(file => `${file.name}.${file.metadata?.extension || 'pdf'}`)
 				await this.handleInitialStatePdfs(urls)
 			} catch (error) {
 				this.signStore.errors = [{ message: t('libresign', 'Failed to load envelope files') }]
 			}
 		},
+		async fetchEnvelopeFiles(parentFileId) {
+			const cachedEnvelopeFiles = loadState('libresign', 'envelopeFiles', [])
+			if (Array.isArray(cachedEnvelopeFiles) && cachedEnvelopeFiles.length > 0) {
+				return cachedEnvelopeFiles
+			}
+
+			const url = generateOcsUrl('/apps/libresign/api/v1/file/list')
+			const params = new URLSearchParams({
+				page: '1',
+				length: '100',
+				parentFileId: parentFileId.toString(),
+				signer_uuid: this.$route.params.uuid,
+			})
+			const response = await axios.get(`${url}?${params.toString()}`)
+			return response.data?.ocs?.data?.data ?? []
+		},
 		updateSigners(data) {
 			if (this.signStore.document.nodeType === 'envelope' && this.envelopeFiles.length > 0) {
 				const fileIndexById = new Map(
-					this.envelopePdfFiles.map((file, index) => [file.id, index]),
+					this.envelopeFiles.map((file, index) => [file.id, index]),
 				)
 				const elements = this.envelopeFiles.flatMap(file => file.visibleElements || [])
 				elements.forEach(element => {

src/views/SignPDF/_partials/Sign.vue

@@ -399,8 +399,9 @@ export default {
 						}))
 				}
 			}
+			const isAuthenticated = !!getCurrentUser()
 			let url = ''
-			if (this.signStore.document.id > 0) {
+			if (isAuthenticated && this.signStore.document.id > 0) {
 				url = generateOcsUrl('/apps/libresign/api/v1/sign/file_id/{id}', { id: this.signStore.document.id })
 			} else {
 				url = generateOcsUrl('/apps/libresign/api/v1/sign/uuid/{uuid}', { uuid: this.signRequestUuid })