Merge pull request #4849 from LibreSign/fix/only-notify-when-is-not-draft

fix: only notify when is not draft

Author: vitormattos

lib/Service/RequestSignatureService.php

@@ -50,6 +50,9 @@ public function __construct(
 	public function save(array $data): FileEntity {
 		$file = $this->saveFile($data);
 		$this->saveVisibleElements($data, $file);
+		if (empty($data['status'])) {
+			$data['status'] = $file->getStatus();
+		}
 		$this->associateToSigners($data, $file->getId());
 		return $file;
 	}
@@ -190,7 +193,7 @@ private function associateToSigners(array $data, int $fileId): array {
 							],
 							displayName: $user['displayName'] ?? '',
 							description: $user['description'] ?? '',
-							notify: empty($user['notify']),
+							notify: empty($user['notify']) && $this->isStatusAbleToNotify($data['status'] ?? null),
 							fileId: $fileId,
 						);
 					}
@@ -199,7 +202,7 @@ private function associateToSigners(array $data, int $fileId): array {
 						identifyMethods: $user['identify'],
 						displayName: $user['displayName'] ?? '',
 						description: $user['description'] ?? '',
-						notify: empty($user['notify']),
+						notify: empty($user['notify']) && $this->isStatusAbleToNotify($data['status'] ?? null),
 						fileId: $fileId,
 					);
 				}
@@ -208,6 +211,13 @@ private function associateToSigners(array $data, int $fileId): array {
 		return $return;
 	}
 
+	private function isStatusAbleToNotify(?int $status): bool {
+		return in_array($status, [
+			FileEntity::STATUS_ABLE_TO_SIGN,
+			FileEntity::STATUS_PARTIAL_SIGNED,
+		]);
+	}
+
 	private function associateToSigner(array $identifyMethods, string $displayName, string $description, bool $notify, int $fileId): SignRequestEntity {
 		$identifyMethodsIncances = $this->identifyMethod->getByUserData($identifyMethods);
 		if (empty($identifyMethodsIncances)) {

src/Components/RightSidebar/RequestSignatureTab.vue

@@ -210,7 +210,6 @@ export default {
 			const config = {
 				url: generateOcsUrl('/apps/libresign/api/v1/request-signature'),
 				data: {
-					status: this.filesStore.getFile()?.status ?? 0,
 					name: this.filesStore.getFile()?.name,
 					users: [],
 				},
@@ -230,9 +229,12 @@ export default {
 				})
 				config.data.users.push(user)
 			})
-
-			if (!this.isSignElementsAvailable()) {
+			if (this.filesStore.getFile()?.status) {
+				config.data.status = this.filesStore.getFile()?.status
+			} else if (!this.isSignElementsAvailable()) {
 				config.data.status = 1
+			} else {
+				config.data.status = 0
 			}
 
 			if (this.filesStore.getFile().uuid) {

tests/integration/features/sign/request.feature

@@ -448,3 +448,24 @@ Feature: request-signature
       | (jq).ocs.data.data[0].signers\|length          | 1                       |
       | (jq).ocs.data.data[0].signers[0].email         | signer1@domain.test     |
       | (jq).ocs.data.data[0].signers[0].me            | false                   |
+
+  Scenario: Not notify with status 0 and notify with status 1
+    Given run the command "libresign:configure:openssl --cn test" with result code 0
+    And user "signer1" exists
+    And set the email of user "signer1" to "signer1@domain.test"
+    And my inbox is empty
+    And as user "admin"
+    And sending "post" to ocs "/apps/provisioning_api/api/v1/config/apps/libresign/identify_methods"
+      | value | (string)[{"name":"email","enabled":true,"mandatory":true,"signatureMethods":{"emailToken":{"enabled":true}}}] |
+    When sending "post" to ocs "/apps/libresign/api/v1/request-signature"
+      | file | {"url":"<BASE_URL>/apps/libresign/develop/pdf"} |
+      | users | [{"identify":{"email":"signer1@domain.test"}}] |
+      | name | document |
+      | status | 0 |
+    And there should be 0 emails in my inbox
+    When sending "post" to ocs "/apps/libresign/api/v1/request-signature"
+      | file | {"url":"<BASE_URL>/apps/libresign/develop/pdf"} |
+      | users | [{"identify":{"email":"signer1@domain.test"}}] |
+      | name | document |
+      | status | 1 |
+    And there should be 1 email in my inbox