Merge pull request #1542 from LibreSign/backport/1541/stable26

[stable26] Fix save signature as image
LibreSign · Mar 28, 2023 · 739fd40 · 739fd40
2 parents 690e63c + 4ec32f1
commit 739fd40
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/lib/Helper/ValidateHelper.php b/lib/Helper/ValidateHelper.php
@@ -163,7 +163,10 @@ public function validateBase64(string $base64, int $type = self::TYPE_TO_SIGN):
 
 		$mimeType = $this->mimeTypeDetector->detectString($string);
 
-		if ($mimeType !== 'application/pdf') {
+		if (
+			($type === self::TYPE_TO_SIGN && $mimeType !== 'application/pdf')
+			|| (in_array($type, [self::TYPE_VISIBLE_ELEMENT_USER, self::TYPE_VISIBLE_ELEMENT_PDF]) && $mimeType !== 'image/png')
+		) {
 			throw new LibresignException($this->l10n->t('File type: %s. Invalid base64 file.', [$this->getTypeOfFile($type)]));
 		}
 	}

diff --git a/src/Components/Draw/FileUpload.vue b/src/Components/Draw/FileUpload.vue
@@ -55,6 +55,7 @@ export default {
 			this.imageData = canvas.toDataURL('image/png')
 		},
 		saveSignature() {
+			this.modal = false
 			this.$emit('save', this.imageData)
 		},
 		confirmSave() {

diff --git a/src/Components/Draw/TextInput.vue b/src/Components/Draw/TextInput.vue
@@ -77,6 +77,7 @@ export default {
 
 	methods: {
 		saveSignature() {
+			this.handleModal(false)
 			this.$emit('save', this.imageData)
 		},
 

diff --git a/src/views/Account/partials/Signature.vue b/src/views/Account/partials/Signature.vue
@@ -112,7 +112,8 @@ export default {
 		padding: 15px;
 		margin: 5px;
 		border-radius: 10px;
-		background-color: #cecece;
+		background-color: var(--color-main-background);
+		box-shadow: 0 2px 9px var(--color-box-shadow);
 		cursor: pointer;
 		span{
 			cursor: inherit;