refactor: centralize validation localization mapping

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

Author: vitormattos

lib/Handler/SignEngine/Pkcs12Handler.php

@@ -301,11 +301,11 @@ private function enrichLeafWithNativeData(array $result, array $metadata, array
 		}
 
 		if (isset($validation['signatureValidation']) && is_array($validation['signatureValidation'])) {
-			$leaf['signature_validation'] = $this->getLocalizedSignatureValidation($validation['signatureValidation']);
+			$leaf['signature_validation'] = $this->pdfSignatureValidationService->localizeSignatureValidation($validation['signatureValidation']);
 		}
 
 		if (isset($validation['certificateValidation']) && is_array($validation['certificateValidation'])) {
-			$leaf['certificate_validation'] = $this->getLocalizedCertificateValidation($validation['certificateValidation']);
+			$leaf['certificate_validation'] = $this->pdfSignatureValidationService->localizeCertificateValidation($validation['certificateValidation']);
 		}
 
 		if (!isset($leaf['certificate_validation'])) {
@@ -318,74 +318,6 @@ private function enrichLeafWithNativeData(array $result, array $metadata, array
 		return $result;
 	}
 
-	/**
-	 * Keep LibreSign-side l10n compatibility regardless of upstream validator labels.
-	 */
-	private function getLocalizedSignatureValidation(array $validation): array {
-		$id = (int)($validation['id'] ?? 6);
-
-		return match ($id) {
-			1 => [
-				'id' => 1,
-				'label' => $this->l10n->t('Signature is valid.'),
-			],
-			2 => [
-				'id' => 2,
-				'label' => $this->l10n->t('Signature is invalid.'),
-			],
-			3 => [
-				'id' => 3,
-				'label' => $this->l10n->t('Digest mismatch.'),
-			],
-			5 => [
-				'id' => 5,
-				'label' => $this->l10n->t('Signature has not yet been verified.'),
-			],
-			default => [
-				'id' => 6,
-				'label' => $this->l10n->t('Unknown validation failure.'),
-			],
-		};
-	}
-
-	/**
-	 * Keep LibreSign-side l10n compatibility regardless of upstream validator labels.
-	 */
-	private function getLocalizedCertificateValidation(array $validation): array {
-		$id = (int)($validation['id'] ?? 7);
-
-		return match ($id) {
-			1 => [
-				'id' => 1,
-				'label' => $this->l10n->t('Certificate is trusted.'),
-			],
-			2 => [
-				'id' => 2,
-				'label' => $this->l10n->t("Certificate issuer isn't trusted."),
-			],
-			3 => [
-				'id' => 3,
-				'label' => $this->l10n->t('Certificate issuer is unknown.'),
-			],
-			4 => [
-				'id' => 4,
-				'label' => $this->l10n->t('Certificate has been revoked.'),
-			],
-			5 => [
-				'id' => 5,
-				'label' => $this->l10n->t('Certificate has expired'),
-			],
-			6 => [
-				'id' => 6,
-				'label' => $this->l10n->t('Certificate has not yet been verified.'),
-			],
-			default => [
-				'id' => 7,
-				'label' => $this->l10n->t('Unknown issue with certificate or corrupted data.'),
-			],
-		};
-	}
-
 	/**
 	 * @param resource $resource
 	 * @return list<array>

lib/Service/Signature/PdfSignatureValidationService.php

@@ -69,6 +69,48 @@ public function setTrustedRoots(array $certificates): void {
 		$this->validator->setTrustedRoots($certificates);
 	}
 
+	/**
+	 * Normalize a signature validation payload by id/reason to the canonical LibreSign shape.
+	 *
+	 * @param array{id?: int|string, reason?: mixed} $validation
+	 */
+	public function localizeSignatureValidation(array $validation): array {
+		$id = (int)($validation['id'] ?? 6);
+		$reason = is_string($validation['reason'] ?? null) ? $validation['reason'] : null;
+
+		$state = match ($id) {
+			1 => ValidationState::SIGNATURE_VALID,
+			2 => ValidationState::SIGNATURE_INVALID,
+			3 => ValidationState::DIGEST_MISMATCH,
+			5 => ValidationState::NOT_VERIFIED,
+			default => ValidationState::UNKNOWN_FAILURE,
+		};
+
+		return $this->mapSignatureValidation(new ValidationResult($state, $reason));
+	}
+
+	/**
+	 * Normalize a certificate validation payload by id/reason to the canonical LibreSign shape.
+	 *
+	 * @param array{id?: int|string, reason?: mixed} $validation
+	 */
+	public function localizeCertificateValidation(array $validation): array {
+		$id = (int)($validation['id'] ?? 7);
+		$reason = is_string($validation['reason'] ?? null) ? $validation['reason'] : null;
+
+		$state = match ($id) {
+			1 => ValidationState::CERT_TRUSTED,
+			2 => ValidationState::CERT_ISSUER_NOT_TRUSTED,
+			3 => ValidationState::CERT_ISSUER_UNKNOWN,
+			4 => ValidationState::CERT_REVOKED,
+			5 => ValidationState::CERT_EXPIRED,
+			6 => ValidationState::CERT_NOT_VERIFIED,
+			default => ValidationState::UNKNOWN_FAILURE,
+		};
+
+		return $this->mapCertificateValidation(new ValidationResult($state, $reason));
+	}
+
 	/**
 	 * Validate PDF signatures from file resource.
 	 *