chore: move logic to parse the template to JSignPdf handler

Signed-off-by: Vitor Mattos <vitor@php.rio>

Author: vitormattos

lib/Handler/ISignEngineHandler.php

@@ -19,6 +19,6 @@ public function setPassword(string $password): self;
 	public function getPassword(): string;
 	public function sign(): File;
 	public function getSignedContent(): string;
-	public function getSignatureText(): string;
-	public function setSignatureText(string $text): self;
+	public function getSignatureParams(): array;
+	public function setSignatureParams(array $params): self;
 }

lib/Handler/JSignPdfHandler.php

@@ -13,6 +13,7 @@
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Service\Install\InstallService;
+use OCA\Libresign\Service\SignatureTextService;
 use OCP\Files\File;
 use OCP\IAppConfig;
 use Psr\Log\LoggerInterface;
@@ -26,6 +27,7 @@ class JSignPdfHandler extends SignEngineHandler {
 	public function __construct(
 		private IAppConfig $appConfig,
 		private LoggerInterface $logger,
+		private SignatureTextService $signatureTextService,
 	) {
 	}
 
@@ -146,7 +148,17 @@ private function signUsingVisibleElements(): string {
 
 	public function getSignatureText(): string {
 		$signatureText = parent::getSignatureText();
-		$signatureText = '"' . str_replace('"', '\"', $signatureText) . '"';
+		$params = $this->getSignatureParams();
+		$params['SignerName'] = '${signer}';
+		$params['SignatureDate'] = '${timestamp}';
+		$this->signatureTextService->parse(context: $params);
+
+		$signatureText = '"' . str_replace(
+			['"', '$'],
+			['\"', '\$'],
+			$signatureText
+		) . '"';
+
 		return $signatureText;
 	}
 

lib/Handler/Pkcs12Handler.php

@@ -422,7 +422,7 @@ public function sign(): File {
 			->setCertificate($this->getCertificate())
 			->setInputFile($this->getInputFile())
 			->setPassword($this->getPassword())
-			->setSignatureText($this->getSignatureText())
+			->setSignatureParams($this->getSignatureParams())
 			->setVisibleElements($this->getVisibleElements())
 			->getSignedContent();
 		$this->getInputFile()->putContent($signedContent);

lib/Handler/SignEngineHandler.php

@@ -17,7 +17,7 @@ abstract class SignEngineHandler implements ISignEngineHandler {
 	private string $password = '';
 	/** @var VisibleElementAssoc[] */
 	private array $visibleElements = [];
-	private string $signatureText = '';
+	private array $signatureParams = [];
 
 	/**
 	 * @return static
@@ -72,12 +72,12 @@ public function getSignedContent(): string {
 		return $this->sign()->getContent();
 	}
 
-	public function getSignatureText(): string {
-		return $this->signatureText;
+	public function getSignatureParams(): array {
+		return $this->signatureParams;
 	}
 
-	public function setSignatureText(string $text): self {
-		$this->signatureText = $text;
+	public function setSignatureParams(array $params): self {
+		$this->signatureParams = $params;
 		return $this;
 	}
 }

lib/Service/SignFileService.php

@@ -97,7 +97,6 @@ public function __construct(
 		private ITempManager $tempManager,
 		private IdentifyMethodService $identifyMethodService,
 		private ITimeFactory $timeFactory,
-		private SignatureTextService $signatureTextService,
 	) {
 	}
 
@@ -270,12 +269,10 @@ public function sign(): File {
 					->setCertificate($pfxFileContent)
 					->setVisibleElements($this->elements)
 					->setPassword($this->password)
-					->setSignatureText($this->signatureTextService->parse(context: [
-						'SignerName' => '\${signer}',
+					->setSignatureParams([
 						'DocumentUUID' => $this->libreSignFile->getUuid(),
 						'IssuerCommonName' => $pfxData['issuer']['CN'],
-						'SignatureDate' => '\${timestamp}',
-					]))
+					])
 					->sign();
 				break;
 			default: