Replace TCPDI by TCPDF

TCPDI have problems when manipulate the original PDF file. The approach to add footer at PDF files was replaced by create an overlay to each page and merge with original PDF file. Signed-off-by: Vitor Mattos <[email protected]>
LibreSign · Mar 27, 2024 · 63a7978 · 63a7978
1 parent 3ffe45c
commit 63a7978
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 232 deletions.
diff --git a/composer.json b/composer.json
@@ -5,13 +5,12 @@
   "license": "AGPL",
   "require": {
     "endroid/qr-code": "^4.6",
-    "iio/libmergepdf": "dev-move-tcpdi-parser-to-package",
     "jsignpdf/jsignpdf-php": "^1.2",
     "mikehaertl/php-pdftk": "^0.13.0",
     "pagerfanta/pagerfanta": "^3.6",
     "smalot/pdfparser": "^2.4",
     "symfony/console": "^5.4",
-    "tecnickcom/tcpdf": "^6.4",
+    "tecnickcom/tcpdf": "^6.7",
     "wobeto/email-blur": "^1.0"
   },
   "require-dev": {
@@ -62,11 +61,5 @@
     "psr-4": {
       "OCP\\": "vendor/nextcloud/ocp/OCP"
     }
-  },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/LibreCodeCoop/libmergepdf"
-    }
-  ]
+  }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Db/File.php b/lib/Db/File.php
@@ -25,6 +25,7 @@
 namespace OCA\Libresign\Db;
 
 use OCP\AppFramework\Db\Entity;
+use stdClass;
 
 /**
  * @method void setId(int $id)
@@ -45,8 +46,7 @@
  * @method string getCallback()
  * @method void setStatus(int $status)
  * @method int getStatus()
- * @method void setPages(int $pages)
- * @method int getPages()
+ * @method string getMetadata()
  */
 class File extends Entity {
 	/** @var integer */
@@ -97,4 +97,16 @@ public function __construct() {
 		$this->addType('status', 'integer');
 		$this->addType('metadata', 'string');
 	}
+
+	public function setMetadata($metadata): void {
+		if (is_array($metadata)) {
+			$metadata = json_encode($metadata);
+		}
+		$this->metadata = (string) $metadata;
+		$this->markFieldUpdated('metadata');
+	}
+
+	public function getMetadataDecoded(): ?stdClass {
+		return json_decode($this->metadata);
+	}
 }
diff --git a/lib/Db/SignRequest.php b/lib/Db/SignRequest.php
@@ -43,7 +43,7 @@
  * @method void setDisplayName(string $displayName)
  * @method string getDisplayName()
  * @method void setMetadata(array $metadata)
- * @method string getMetadata()
+ * @method array getMetadata()
  */
 class SignRequest extends Entity {
 	/** @var integer */

diff --git a/lib/Db/SignRequestMapper.php b/lib/Db/SignRequestMapper.php
@@ -69,9 +69,6 @@ public function incrementNotificationCounter(SignRequest $signRequest, string $m
 		try {
 			$fromDatabase = $this->getById($signRequest->getId());
 			$metadata = $fromDatabase->getMetadata();
-			if (!empty($metadata)) {
-				$metadata = json_decode($metadata, true);
-			}
 			if (!isset($metadata['notify'])) {
 				$this->firstNotification = true;
 			}