From 4671b8578239efb87d95b56d76224c809383d904 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:05:09 -0300 Subject: [PATCH 01/17] feat: store description in notification metadata Include signer description in notification metadata when incrementing notification counter. This allows tracking custom messages sent to signers for each notification attempt. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Db/SignRequestMapper.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/Db/SignRequestMapper.php b/lib/Db/SignRequestMapper.php index 30745d6ec2..adad246ce7 100644 --- a/lib/Db/SignRequestMapper.php +++ b/lib/Db/SignRequestMapper.php @@ -60,10 +60,17 @@ public function incrementNotificationCounter(SignRequest $signRequest, string $m if (!isset($metadata['notify'])) { $this->firstNotification = true; } - $metadata['notify'][] = [ + + $notificationEntry = [ 'method' => $method, 'date' => time(), ]; + + if (!empty($fromDatabase->getDescription())) { + $notificationEntry['description'] = $fromDatabase->getDescription(); + } + + $metadata['notify'][] = $notificationEntry; $fromDatabase->setMetadata($metadata); $this->update($fromDatabase); $this->db->commit(); From 32eb0101fbbb6f6323e2a7c9974e9b2632596ae5 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:05:50 -0300 Subject: [PATCH 02/17] feat: add custom description to email notifications Add optional description parameter to notifyUnsignedUser and notifySignDataUpdated methods. When provided, the custom message is prepended to the email body, allowing personalized instructions for signers. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Service/MailService.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/Service/MailService.php b/lib/Service/MailService.php index bb100e5f4e..5f24ff1d04 100644 --- a/lib/Service/MailService.php +++ b/lib/Service/MailService.php @@ -45,12 +45,18 @@ private function getFileById(int $fileId): File { /** * @psalm-suppress MixedMethodCall */ - public function notifySignDataUpdated(SignRequest $data, string $email): void { + public function notifySignDataUpdated(SignRequest $data, string $email, ?string $description = null): void { $emailTemplate = $this->mailer->createEMailTemplate('settings.TestEmail'); // TRANSLATORS The subject of the email that is sent after changes are made to the signature request that may affect something for the signer who will sign the document. Some possible reasons: URL for signature changed (when the URL expires), the person who requested the signature sent a notification $emailTemplate->setSubject($this->l10n->t('LibreSign: Changes into a file for you to sign')); $emailTemplate->addHeader(); $emailTemplate->addHeading($this->l10n->t('File to sign'), false); + + if (!empty($description)) { + $emailTemplate->addBodyText($description); + $emailTemplate->addBodyText(''); + } + $emailTemplate->addBodyText($this->l10n->t('Changes have been made in a file that you have to sign. Access the link below:')); $link = $this->urlGenerator->linkToRouteAbsolute('libresign.page.sign', ['uuid' => $data->getUuid()]); $file = $this->getFileById($data->getFileId()); @@ -76,11 +82,17 @@ public function notifySignDataUpdated(SignRequest $data, string $email): void { /** * @psalm-suppress MixedMethodCall */ - public function notifyUnsignedUser(SignRequest $data, string $email): void { + public function notifyUnsignedUser(SignRequest $data, string $email, ?string $description = null): void { $emailTemplate = $this->mailer->createEMailTemplate('settings.TestEmail'); $emailTemplate->setSubject($this->l10n->t('LibreSign: There is a file for you to sign')); $emailTemplate->addHeader(); $emailTemplate->addHeading($this->l10n->t('File to sign'), false); + + if (!empty($description)) { + $emailTemplate->addBodyText($description); + $emailTemplate->addBodyText(''); + } + $emailTemplate->addBodyText($this->l10n->t('There is a document for you to sign. Access the link below:')); $link = $this->urlGenerator->linkToRouteAbsolute('libresign.page.sign', ['uuid' => $data->getUuid()]); $file = $this->getFileById($data->getFileId()); From be8603a850ed19aff6d793ed915a9eb7eb81261d Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:06:13 -0300 Subject: [PATCH 03/17] fix: check Activity admin setting before user preference Add explicit check for Activity admin (global) setting before checking user preference in email notifications. This ensures that when an admin disables email notifications globally, users cannot override it with their personal settings. The admin setting acts as a gate that must be enabled for user preferences to take effect. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Listener/MailNotifyListener.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Listener/MailNotifyListener.php b/lib/Listener/MailNotifyListener.php index 8ba2db6afc..c9a7bee83f 100644 --- a/lib/Listener/MailNotifyListener.php +++ b/lib/Listener/MailNotifyListener.php @@ -88,10 +88,10 @@ protected function sendSignMailNotification( $isFirstNotification = $this->signRequestMapper->incrementNotificationCounter($signRequest, 'mail'); if ($isFirstNotification) { - $this->mail->notifyUnsignedUser($signRequest, $email); + $this->mail->notifyUnsignedUser($signRequest, $email, $signRequest->getDescription()); return; } - $this->mail->notifySignDataUpdated($signRequest, $email); + $this->mail->notifySignDataUpdated($signRequest, $email, $signRequest->getDescription()); } catch (\InvalidArgumentException $e) { $this->logger->error($e->getMessage(), ['exception' => $e]); return; @@ -173,6 +173,10 @@ private function isNotificationDisabledAtActivity(string $userId, string $type): } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $adminSetting = $activityUserSettings->getAdminSetting('email', $type); + if (!$adminSetting) { + return true; + } $notificationSetting = $activityUserSettings->getUserSetting( $userId, 'email', From d1d69671d3572f3f784284ae50c4bbb736bc6d83 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:06:39 -0300 Subject: [PATCH 04/17] fix: check Activity admin setting in notification listener Add explicit check for Activity admin (global) setting before checking user preference for in-app notifications. This ensures consistency across all notification channels and prevents users from enabling notifications when disabled globally by the admin. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Listener/NotificationListener.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Listener/NotificationListener.php b/lib/Listener/NotificationListener.php index 05cd3e1e10..a721af1aa5 100644 --- a/lib/Listener/NotificationListener.php +++ b/lib/Listener/NotificationListener.php @@ -209,13 +209,16 @@ private function isNotificationDisabledAtActivity(string $userId, string $type): } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $adminSetting = $activityUserSettings->getAdminSetting('notification', $type); + if (!$adminSetting) { + return true; + } + $notificationSetting = $activityUserSettings->getUserSetting( $userId, 'notification', $type ); - // If setting is explicitly false, notifications are disabled - // If setting is null/not configured, notifications are enabled by default if ($notificationSetting === false) { return true; } From cf3de73cb000edc1e9e901bb426b30fd31534f5d Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:06:47 -0300 Subject: [PATCH 05/17] feat: add custom description to gateway notifications Support custom signer descriptions in SMS, Signal, Telegram, WhatsApp, and XMPP notifications. The description is prepended to the notification message when provided, allowing personalized instructions through all supported notification channels. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Listener/TwofactorGatewayListener.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Listener/TwofactorGatewayListener.php b/lib/Listener/TwofactorGatewayListener.php index 5581c209f1..f8ebddf498 100644 --- a/lib/Listener/TwofactorGatewayListener.php +++ b/lib/Listener/TwofactorGatewayListener.php @@ -80,10 +80,16 @@ protected function sendSignNotification( } $isFirstNotification = $this->signRequestMapper->incrementNotificationCounter($signRequest, $entity->getIdentifierKey()); + + $message = ''; + if (!empty($signRequest->getDescription())) { + $message = $signRequest->getDescription() . "\n\n"; + } + if ($isFirstNotification) { - $message = $this->l10n->t('There is a document for you to sign. Access the link below:'); + $message .= $this->l10n->t('There is a document for you to sign. Access the link below:'); } else { - $message = $this->l10n->t('Changes have been made in a file that you have to sign. Access the link below:'); + $message .= $this->l10n->t('Changes have been made in a file that you have to sign. Access the link below:'); } $message .= "\n"; $link = $this->urlGenerator->linkToRouteAbsolute('libresign.page.sign', ['uuid' => $signRequest->getUuid()]); From f52b6ca9d4e4e7fea924ee9d08d6bc34637f7e9b Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:06:57 -0300 Subject: [PATCH 06/17] docs: update API response definitions Add description, displayName, notify, and acceptsEmailNotifications fields to OpenAPI response type definitions for LibresignNewSigner and LibresignIdentifyAccount. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/ResponseDefinitions.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php index a8b88477ff..aabe88d612 100644 --- a/lib/ResponseDefinitions.php +++ b/lib/ResponseDefinitions.php @@ -28,6 +28,9 @@ * email?: string, * account?: string, * }, + * displayName?: string, + * description?: string, + * notify?: non-negative-int, * signingOrder?: non-negative-int, * } * @psalm-type LibresignNewFile = array{ @@ -55,6 +58,7 @@ * subname: string, * shareType: 0|4, * icon?: 'icon-mail'|'icon-user', + * acceptsEmailNotifications?: boolean, * } * @psalm-type LibresignPagination = array{ * total: non-negative-int, From 77f59e16f593dea7c8774abd8775acad0c7aac47 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:07:06 -0300 Subject: [PATCH 07/17] feat: add email notification preferences to account search Include acceptsEmailNotifications field in search results for account method signers. This field indicates whether a user accepts email notifications based on both Activity admin settings and user preferences. Returns false when user has no email, Activity app is unavailable, or notifications are disabled at admin or user level. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Controller/IdentifyAccountController.php | 56 ++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/lib/Controller/IdentifyAccountController.php b/lib/Controller/IdentifyAccountController.php index cd370524a2..4dff5d32ac 100644 --- a/lib/Controller/IdentifyAccountController.php +++ b/lib/Controller/IdentifyAccountController.php @@ -19,8 +19,10 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\DataResponse; use OCP\Collaboration\Collaborators\ISearch; +use OCP\IConfig; use OCP\IRequest; use OCP\IURLGenerator; +use OCP\IUserManager; use OCP\IUserSession; use OCP\Share\IShare; @@ -36,6 +38,8 @@ public function __construct( private IURLGenerator $urlGenerator, private Email $identifyEmailMethod, private Account $identifyAccountMethod, + private IUserManager $userManager, + private IConfig $config, ) { parent::__construct(Application::APP_ID, $request); } @@ -76,6 +80,7 @@ public function search(string $search = '', string $method = '', int $page = 1, $return = $this->addHerselfAccount($return, $search); $return = $this->addHerselfEmail($return, $search); $return = $this->replaceShareTypeByMethod($return); + $return = $this->addEmailNotificationPreference($return); $return = $this->excludeNotAllowed($return); return new DataResponse($return); @@ -239,4 +244,55 @@ private function replaceShareTypeByMethod(array $list): array { } return $list; } + + private function addEmailNotificationPreference(array $list): array { + foreach ($list as $key => $item) { + if ($item['method'] !== 'account') { + continue; + } + + $user = $this->userManager->get($item['id']); + if ($user === null) { + $list[$key]['acceptsEmailNotifications'] = false; + continue; + } + + $email = $user->getEMailAddress(); + if (empty($email)) { + $list[$key]['acceptsEmailNotifications'] = false; + continue; + } + + if ($this->isNotificationDisabledAtActivity($user->getUID(), 'libresign_file_to_sign')) { + $list[$key]['acceptsEmailNotifications'] = false; + continue; + } + + $list[$key]['acceptsEmailNotifications'] = true; + } + return $list; + } + + private function isNotificationDisabledAtActivity(string $userId, string $type): bool { + if (!class_exists(\OCA\Activity\UserSettings::class)) { + return false; + } + $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); + if ($activityUserSettings) { + $adminSetting = $activityUserSettings->getAdminSetting('email', $type); + if (!$adminSetting) { + return true; + } + + $notificationSetting = $activityUserSettings->getUserSetting( + $userId, + 'email', + $type + ); + if (!$notificationSetting) { + return true; + } + } + return false; + } } From d0df5e446ee60248c92ce80cd95ebd6e96af487a Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:07:13 -0300 Subject: [PATCH 08/17] docs: regenerate OpenAPI specification Update OpenAPI schemas to include acceptsEmailNotifications in LibresignIdentifyAccount and description/displayName/notify in LibresignNewSigner types. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- openapi-full.json | 14 ++++++++++++++ openapi.json | 14 ++++++++++++++ src/types/openapi/openapi-full.ts | 5 +++++ src/types/openapi/openapi.ts | 5 +++++ 4 files changed, 38 insertions(+) diff --git a/openapi-full.json b/openapi-full.json index 410bdc6f7e..4c065cb325 100644 --- a/openapi-full.json +++ b/openapi-full.json @@ -453,6 +453,9 @@ "icon-mail", "icon-user" ] + }, + "acceptsEmailNotifications": { + "type": "boolean" } } }, @@ -514,6 +517,17 @@ } } }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, + "notify": { + "type": "integer", + "format": "int64", + "minimum": 0 + }, "signingOrder": { "type": "integer", "format": "int64", diff --git a/openapi.json b/openapi.json index 217121894d..0eb99d6307 100644 --- a/openapi.json +++ b/openapi.json @@ -383,6 +383,9 @@ "icon-mail", "icon-user" ] + }, + "acceptsEmailNotifications": { + "type": "boolean" } } }, @@ -444,6 +447,17 @@ } } }, + "displayName": { + "type": "string" + }, + "description": { + "type": "string" + }, + "notify": { + "type": "integer", + "format": "int64", + "minimum": 0 + }, "signingOrder": { "type": "integer", "format": "int64", diff --git a/src/types/openapi/openapi-full.ts b/src/types/openapi/openapi-full.ts index d3b0efb37d..f068780225 100644 --- a/src/types/openapi/openapi-full.ts +++ b/src/types/openapi/openapi-full.ts @@ -1584,6 +1584,7 @@ export type components = { shareType: 0 | 4; /** @enum {string} */ icon?: "icon-mail" | "icon-user"; + acceptsEmailNotifications?: boolean; }; IdentifyMethod: { /** @enum {string} */ @@ -1603,6 +1604,10 @@ export type components = { email?: string; account?: string; }; + displayName?: string; + description?: string; + /** Format: int64 */ + notify?: number; /** Format: int64 */ signingOrder?: number; }; diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts index 70783f69de..8e0923626c 100644 --- a/src/types/openapi/openapi.ts +++ b/src/types/openapi/openapi.ts @@ -1128,6 +1128,7 @@ export type components = { shareType: 0 | 4; /** @enum {string} */ icon?: "icon-mail" | "icon-user"; + acceptsEmailNotifications?: boolean; }; IdentifyMethod: { /** @enum {string} */ @@ -1147,6 +1148,10 @@ export type components = { email?: string; account?: string; }; + displayName?: string; + description?: string; + /** Format: int64 */ + notify?: number; /** Format: int64 */ signingOrder?: number; }; From f22591291832f50a4b10f76169648657eb062873 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:07:26 -0300 Subject: [PATCH 09/17] feat: add custom message UI in signer identification Add switch-based UI to enable custom messages for signers during identification. The custom message field: - Appears conditionally based on method and email notification settings - Is hidden for account method when user doesn't accept email - Supports up to 500 characters with 3-row textarea - Resets when toggled off or signer changes to non-accepting account - Is saved as part of signer data Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- src/Components/Request/IdentifySigner.vue | 52 +++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/Components/Request/IdentifySigner.vue b/src/Components/Request/IdentifySigner.vue index d34f6071fc..40d575ed4e 100644 --- a/src/Components/Request/IdentifySigner.vue +++ b/src/Components/Request/IdentifySigner.vue @@ -26,6 +26,23 @@ :error="nameHaveError" :helper-text="nameHelperText" @update:value="onNameChange" /> + +
+ + {{ t('libresign', 'Add custom message') }} + + +
+
@@ -48,8 +65,10 @@ import svgWhatsapp from '@mdi/svg/svg/whatsapp.svg?raw' import svgXmpp from '@mdi/svg/svg/xmpp.svg?raw' import NcButton from '@nextcloud/vue/components/NcButton' +import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch' import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper' import NcNoteCard from '@nextcloud/vue/components/NcNoteCard' +import NcTextArea from '@nextcloud/vue/components/NcTextArea' import NcTextField from '@nextcloud/vue/components/NcTextField' import SignerSelect from './SignerSelect.vue' @@ -72,8 +91,10 @@ export default { name: 'IdentifySigner', components: { NcButton, + NcCheckboxRadioSwitch, NcIconSvgWrapper, NcNoteCard, + NcTextArea, NcTextField, SignerSelect, }, @@ -109,6 +130,8 @@ export default { nameHelperText: '', nameHaveError: false, displayName: '', + description: '', + enableCustomMessage: false, identify: '', signer: {}, } @@ -136,9 +159,17 @@ export default { } return methodConfig.friendly_name }, + showCustomMessage() { + if (this.signer?.method === 'account') { + return this.signer?.acceptsEmailNotifications === true + } + return !!this.signer?.method + }, }, beforeMount() { this.displayName = this.signerToEdit.displayName ?? '' + this.description = this.signerToEdit.description ?? '' + this.enableCustomMessage = !!(this.signerToEdit.description) this.identify = this.signerToEdit.identify ?? this.signerToEdit.signRequestId ?? '' if (Object.keys(this.signerToEdit).length > 0 && this.signerToEdit.identifyMethods?.length) { const method = this.signerToEdit.identifyMethods[0] @@ -161,6 +192,11 @@ export default { this.signer = signer ?? {} this.displayName = signer?.displayName ?? '' this.identify = signer?.id ?? '' + + if (signer?.method === 'account' && signer?.acceptsEmailNotifications === false) { + this.enableCustomMessage = false + this.description = '' + } }, async saveSigner() { if (!this.signer?.method || !this.signer?.id) { @@ -168,6 +204,7 @@ export default { } this.filesStore.signerUpdate({ displayName: this.displayName, + description: this.description.trim() || undefined, identify: this.identify, identifyMethods: [ { @@ -184,6 +221,7 @@ export default { } this.displayName = '' + this.description = '' this.identify = '' this.signer = {} this.filesStore.disableIdentifySigner() @@ -198,6 +236,11 @@ export default { this.nameHelperText = t('libresign', 'Please enter signer name.') this.nameHaveError = true }, + onToggleCustomMessage(checked) { + if (!checked) { + this.description = '' + } + }, }, } @@ -224,6 +267,14 @@ export default { gap: 0.5em; } } + .description-wrapper { + width: 100%; + margin-bottom: 16px; + + :deep(textarea) { + margin-top: 8px; + } + } &__footer { width: 100%; @@ -234,6 +285,7 @@ export default { justify-content: space-between; align-items: flex-start; background: linear-gradient(to bottom, rgba(255, 255, 255, 0), var(--color-main-background)); + padding-top: 24px; .button-group { display: flex; From a736f44bb017a1e03cf36f9af35f5c121a487728 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:07:36 -0300 Subject: [PATCH 10/17] feat: add customize message action in sidebar Add 'Customize message' action button in signature request sidebar for signed requests. The button: - Appears with Bell icon alongside other actions - Opens signer identification modal for message editing - Validates signer state, method, and email notification preferences - Is hidden when signer already signed, for current user, or when account method user doesn't accept email notifications Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- .../RightSidebar/RequestSignatureTab.vue | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/Components/RightSidebar/RequestSignatureTab.vue b/src/Components/RightSidebar/RequestSignatureTab.vue index e84a0c685f..f182b9cfc7 100644 --- a/src/Components/RightSidebar/RequestSignatureTab.vue +++ b/src/Components/RightSidebar/RequestSignatureTab.vue @@ -26,6 +26,14 @@ + + + {{ t('libresign', 'Customize message') }} + + {{ t('libresign', 'Send reminder') }} @@ -194,10 +204,12 @@ import svgSms from '@mdi/svg/svg/message-processing.svg?raw' import svgWhatsapp from '@mdi/svg/svg/whatsapp.svg?raw' import svgXmpp from '@mdi/svg/svg/xmpp.svg?raw' +import Bell from 'vue-material-design-icons/Bell.vue' import Delete from 'vue-material-design-icons/Delete.vue' import Draw from 'vue-material-design-icons/Draw.vue' import FileDocument from 'vue-material-design-icons/FileDocument.vue' import Information from 'vue-material-design-icons/Information.vue' +import MessageText from 'vue-material-design-icons/MessageText.vue' import OrderNumericAscending from 'vue-material-design-icons/OrderNumericAscending.vue' import Pencil from 'vue-material-design-icons/Pencil.vue' import Send from 'vue-material-design-icons/Send.vue' @@ -261,10 +273,12 @@ export default { NcModal, NcNoteCard, NcDialog, + Bell, Delete, Draw, FileDocument, Information, + MessageText, OrderNumericAscending, Pencil, Send, @@ -323,6 +337,20 @@ export default { return this.filesStore.canSave() && !signer.signed } }, + canCustomizeMessage() { + return (signer) => { + if (signer.signed || !signer.signRequestId || signer.me) { + return false + } + + const method = signer.identifyMethods?.[0]?.method + if (method === 'account' && !signer.acceptsEmailNotifications) { + return false + } + + return !!method + } + }, canRequestSignature() { return (signer) => { if (!this.filesStore.canRequestSign @@ -530,6 +558,10 @@ export default { } this.filesStore.enableIdentifySigner() }, + customizeMessage(signer) { + this.signerToEdit = signer + this.filesStore.enableIdentifySigner() + }, onTabChange(tabId) { if (this.activeTab !== tabId) { this.activeTab = tabId From ad6bd221a2659954445c6b380868f8371e19c5c7 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:07:46 -0300 Subject: [PATCH 11/17] test: add acceptsEmailNotifications scenarios Add integration tests verifying acceptsEmailNotifications field in account search endpoint: - Returns true when both global and user settings enable notifications - Returns false when user explicitly disables notifications - Returns false when admin disables globally (even if user enables) Tests cover Activity app integration and admin/user setting precedence. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- .../features/identify-account/search.feature | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/tests/integration/features/identify-account/search.feature b/tests/integration/features/identify-account/search.feature index da454c271e..471b578f9c 100644 --- a/tests/integration/features/identify-account/search.feature +++ b/tests/integration/features/identify-account/search.feature @@ -118,3 +118,54 @@ Feature: search | (jq).ocs.data[0].subname | admin@email.tld | | (jq).ocs.data[0].icon | icon-mail | | (jq).ocs.data[0].method | email | + + Scenario: Search account returns acceptsEmailNotifications true when user accepts email + Given as user "admin" + And user "notification-enabled" exists + And set the email of user "notification-enabled" to "enabled@test.com" + And run the command "config:app:set activity notify_email_libresign_file_to_sign --value=1" with result code 0 + And run the command "user:setting notification-enabled activity notify_email_libresign_file_to_sign 1" with result code 0 + And sending "post" to ocs "/apps/provisioning_api/api/v1/config/apps/libresign/identify_methods" + | value | (string)[{"name":"account","enabled":true}] | + When sending "get" to ocs "/apps/libresign/api/v1/identify-account/search?search=notification-enabled" + Then the response should have a status code 200 + And the response should be a JSON array with the following mandatory values + | key | value | + | (jq).ocs.data\|length | 1 | + | (jq).ocs.data[0].id | notification-enabled | + | (jq).ocs.data[0].method | account | + | (jq).ocs.data[0].acceptsEmailNotifications | true | + + Scenario: Search account returns acceptsEmailNotifications false when user disabled email + Given as user "admin" + And user "notification-disabled" exists + And set the email of user "notification-disabled" to "disabled@test.com" + And run the command "config:app:set activity notify_email_libresign_file_to_sign --value=1" with result code 0 + And run the command "user:setting notification-disabled activity notify_email_libresign_file_to_sign 0" with result code 0 + And sending "post" to ocs "/apps/provisioning_api/api/v1/config/apps/libresign/identify_methods" + | value | (string)[{"name":"account","enabled":true}] | + When sending "get" to ocs "/apps/libresign/api/v1/identify-account/search?search=notification-disabled" + Then the response should have a status code 200 + And the response should be a JSON array with the following mandatory values + | key | value | + | (jq).ocs.data\|length | 1 | + | (jq).ocs.data[0].id | notification-disabled | + | (jq).ocs.data[0].method | account | + | (jq).ocs.data[0].acceptsEmailNotifications | false | + + Scenario: Search account returns acceptsEmailNotifications false when global setting disabled + Given as user "admin" + And user "notification-global-off" exists + And set the email of user "notification-global-off" to "globaloff@test.com" + And run the command "config:app:set activity notify_email_libresign_file_to_sign --value=0" with result code 0 + And run the command "user:setting notification-global-off activity notify_email_libresign_file_to_sign 1" with result code 0 + And sending "post" to ocs "/apps/provisioning_api/api/v1/config/apps/libresign/identify_methods" + | value | (string)[{"name":"account","enabled":true}] | + When sending "get" to ocs "/apps/libresign/api/v1/identify-account/search?search=notification-global-off" + Then the response should have a status code 200 + And the response should be a JSON array with the following mandatory values + | key | value | + | (jq).ocs.data\|length | 1 | + | (jq).ocs.data[0].id | notification-global-off | + | (jq).ocs.data[0].method | account | + | (jq).ocs.data[0].acceptsEmailNotifications | false | From 87332b104c25f916be36181f2dcaef9d0fd88d90 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:07:56 -0300 Subject: [PATCH 12/17] test: add custom message notification scenarios Add integration tests for custom signer messages: - Account method with and without custom description - Email method with default and custom description via reminder - Verifies description appears in email body before default message - Uses Activity email notification settings in background setup Tests cover the complete flow from request creation to email delivery. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- .../custom_message_notification.feature | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 tests/integration/features/notification/custom_message_notification.feature diff --git a/tests/integration/features/notification/custom_message_notification.feature b/tests/integration/features/notification/custom_message_notification.feature new file mode 100644 index 0000000000..25d326bc27 --- /dev/null +++ b/tests/integration/features/notification/custom_message_notification.feature @@ -0,0 +1,59 @@ +Feature: Custom message for signers + In order to provide personalized instructions to signers + As a document owner + I want to send custom messages to signers via email + + Background: + Given as user "admin" + And user "signer1" exists + And set the email of user "signer1" to "signer1@test.com" + And my inbox is empty + And reset notifications of user "signer1" + And run the command "libresign:configure:openssl --cn test" with result code 0 + And run the command "config:app:set activity notify_email_libresign_file_to_sign --value=1" with result code 0 + And run the command "user:setting signer1 activity notify_email_libresign_file_to_sign 1" with result code 0 + + Scenario: Account method - default message without custom description + When sending "post" to ocs "/apps/libresign/api/v1/request-signature" + | file | {"url":"/apps/libresign/develop/pdf"} | + | name | Document without custom message | + | users | [{"identify":{"account":"signer1"}}] | + Then the response should have a status code 200 + And there should be 1 emails in my inbox + When I open the latest email to "signer1@test.com" with subject "LibreSign: There is a file for you to sign" + Then I should see "There is a document for you to sign" in the opened email + + Scenario: Account method - custom description in email + When sending "post" to ocs "/apps/libresign/api/v1/request-signature" + | file | {"url":"/apps/libresign/develop/pdf"} | + | name | Document with custom message | + | users | [{"identify":{"account":"signer1"},"description":"Please review section 3 and the appendix before signing."}] | + Then the response should have a status code 200 + And there should be 1 emails in my inbox + When I open the latest email to "signer1@test.com" with subject "LibreSign: There is a file for you to sign" + Then I should see "Please review section 3 and the appendix before signing" in the opened email + And I should see "There is a document for you to sign" in the opened email + + Scenario: Email method - default notification + When sending "post" to ocs "/apps/libresign/api/v1/request-signature" + | file | {"url":"/apps/libresign/develop/pdf"} | + | name | Document for email method | + | users | [{"identify":{"email":"external@domain.test"},"displayName":"External Signer"}] | + Then the response should have a status code 200 + + Scenario: Email method - custom description via reminder + Given sending "post" to ocs "/apps/libresign/api/v1/request-signature" + | file | {"url":"/apps/libresign/develop/pdf"} | + | name | Document for email with description | + | users | [{"identify":{"email":"external@domain.test"},"displayName":"External Signer","description":"Urgent: Please sign by end of day."}] | + And the response should have a status code 200 + And fetch field "(FILE_ID)ocs.data.data.nodeId" from previous JSON response + And fetch field "(SIGN_REQUEST_ID)ocs.data.data.signers.0.signRequestId" from previous JSON response + And my inbox is empty + When sending "post" to ocs "/apps/libresign/api/v1/notify/signer" + | fileId | | + | signRequestId | | + Then the response should have a status code 200 + And there should be 1 emails in my inbox + When I open the latest email to "external@domain.test" + Then I should see "Urgent: Please sign by end of day" in the opened email From 53db0415779641e35c5a37bb2708f56490fe1c54 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 19:12:48 -0300 Subject: [PATCH 13/17] fix: allow notifications when Activity setting is not registered When Activity app doesn't know about LibreSign's notification settings (common in test environments or fresh installations), we should allow notifications by default instead of blocking them. This fix checks if the Activity manager has the setting registered before enforcing the admin setting. If the setting is not found, notifications are allowed, respecting LibreSign's isDefaultEnabledMail() and isDefaultEnabledNotification() which return true. Fixes email and notification delivery in integration tests. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Controller/IdentifyAccountController.php | 7 +++++++ lib/Listener/MailNotifyListener.php | 7 +++++++ lib/Listener/NotificationListener.php | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/lib/Controller/IdentifyAccountController.php b/lib/Controller/IdentifyAccountController.php index 4dff5d32ac..620bc78b85 100644 --- a/lib/Controller/IdentifyAccountController.php +++ b/lib/Controller/IdentifyAccountController.php @@ -279,6 +279,13 @@ private function isNotificationDisabledAtActivity(string $userId, string $type): } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $manager = \OCP\Server::get(\OCP\Activity\IManager::class); + try { + $manager->getSettingById($type); + } catch (\Exception $e) { + return false; + } + $adminSetting = $activityUserSettings->getAdminSetting('email', $type); if (!$adminSetting) { return true; diff --git a/lib/Listener/MailNotifyListener.php b/lib/Listener/MailNotifyListener.php index c9a7bee83f..db07391552 100644 --- a/lib/Listener/MailNotifyListener.php +++ b/lib/Listener/MailNotifyListener.php @@ -173,6 +173,13 @@ private function isNotificationDisabledAtActivity(string $userId, string $type): } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $manager = \OCP\Server::get(\OCP\Activity\IManager::class); + try { + $manager->getSettingById($type); + } catch (\Exception $e) { + return false; + } + $adminSetting = $activityUserSettings->getAdminSetting('email', $type); if (!$adminSetting) { return true; diff --git a/lib/Listener/NotificationListener.php b/lib/Listener/NotificationListener.php index a721af1aa5..e7bb9a74ef 100644 --- a/lib/Listener/NotificationListener.php +++ b/lib/Listener/NotificationListener.php @@ -209,6 +209,13 @@ private function isNotificationDisabledAtActivity(string $userId, string $type): } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $manager = \OCP\Server::get(\OCP\Activity\IManager::class); + try { + $manager->getSettingById($type); + } catch (\Exception $e) { + return false; + } + $adminSetting = $activityUserSettings->getAdminSetting('notification', $type); if (!$adminSetting) { return true; From e2ba00975e7937d9cd70ac197a591b4a3b1425ab Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 19:25:13 -0300 Subject: [PATCH 14/17] fix: don't return deleted signers Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Db/IdentifyMethodMapper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Db/IdentifyMethodMapper.php b/lib/Db/IdentifyMethodMapper.php index bba1db2efd..c7203c6471 100644 --- a/lib/Db/IdentifyMethodMapper.php +++ b/lib/Db/IdentifyMethodMapper.php @@ -125,6 +125,7 @@ public function searchByIdentifierValue(string $search, string $userId, string $ ->join('im', 'libresign_sign_request', 'sr', $qb->expr()->eq('sr.id', 'im.sign_request_id'), ) + ->where($qb->expr()->neq('im.identifier_value', $qb->createNamedParameter('deleted_users'))) ->setMaxResults($limit) ->setFirstResult($offset); From a2724a36e549150e548dfa587430478113c90938 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 20:07:33 -0300 Subject: [PATCH 15/17] fix: use Nextcloud's instanceid instead of generating random ID - Changed CaIdentifierService to use system's instanceid from config.php - Removed custom instance_id generation logic using ISecureRandom - Updated unit tests to mock IConfig and verify correct instanceid usage - This fixes race condition in certificate generation during integration tests Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Service/CaIdentifierService.php | 11 +++----- .../Unit/Service/CaIdentifierServiceTest.php | 26 ++++++++++++++----- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/Service/CaIdentifierService.php b/lib/Service/CaIdentifierService.php index c61a3e5955..4c8e0c21aa 100644 --- a/lib/Service/CaIdentifierService.php +++ b/lib/Service/CaIdentifierService.php @@ -10,7 +10,7 @@ use OCA\Libresign\AppInfo\Application; use OCP\IAppConfig; -use OCP\Security\ISecureRandom; +use OCP\IConfig; class CaIdentifierService { private const ENGINE_TYPES = [ @@ -20,17 +20,12 @@ class CaIdentifierService { public function __construct( private IAppConfig $appConfig, + private IConfig $config, ) { } public function getInstanceId(): string { - $instanceId = $this->appConfig->getValueString(Application::APP_ID, 'instance_id', ''); - if (strlen($instanceId) === 10) { - return $instanceId; - } - $instanceId = \OC::$server->get(ISecureRandom::class)->generate(10, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); - $this->appConfig->setValueString(Application::APP_ID, 'instance_id', $instanceId); - return $instanceId; + return $this->config->getSystemValueString('instanceid'); } public function generateCaId(string $engineName): string { diff --git a/tests/php/Unit/Service/CaIdentifierServiceTest.php b/tests/php/Unit/Service/CaIdentifierServiceTest.php index 6e0095786e..f6a83241f6 100644 --- a/tests/php/Unit/Service/CaIdentifierServiceTest.php +++ b/tests/php/Unit/Service/CaIdentifierServiceTest.php @@ -10,6 +10,7 @@ use OCA\Libresign\Service\CaIdentifierService; use OCP\IAppConfig; +use OCP\IConfig; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -19,17 +20,22 @@ */ final class CaIdentifierServiceTest extends TestCase { private CaIdentifierService $service; - private MockObject $appConfig; + private IAppConfig&MockObject $appConfig; + private IConfig&MockObject $config; protected function setUp(): void { - parent::setUp(); $this->appConfig = $this->createMock(IAppConfig::class); - /** @var IAppConfig $appConfig */ - $appConfig = $this->appConfig; - $this->service = new CaIdentifierService($appConfig); + $this->config = $this->createMock(IConfig::class); + $this->service = new CaIdentifierService($this->appConfig, $this->config); } public function testGenerateCaIdWithOpenSSL(): void { + $this->config + ->expects($this->once()) + ->method('getSystemValueString') + ->with('instanceid') + ->willReturn('abc1234567'); + $this->appConfig ->expects($this->once()) ->method('getValueInt') @@ -43,10 +49,16 @@ public function testGenerateCaIdWithOpenSSL(): void { $result = $this->service->generateCaId('openssl'); - $this->assertMatchesRegularExpression('/^libresign-ca-id:[a-z0-9]{10}_g:\d+_e:o$/', $result); + $this->assertEquals('libresign-ca-id:abc1234567_g:1_e:o', $result); } public function testGenerateCaIdWithCFSSL(): void { + $this->config + ->expects($this->once()) + ->method('getSystemValueString') + ->with('instanceid') + ->willReturn('xyz9876543'); + $this->appConfig ->expects($this->once()) ->method('getValueInt') @@ -60,7 +72,7 @@ public function testGenerateCaIdWithCFSSL(): void { $result = $this->service->generateCaId('cfssl'); - $this->assertMatchesRegularExpression('/^libresign-ca-id:[a-z0-9]{10}_g:\d+_e:c$/', $result); + $this->assertEquals('libresign-ca-id:xyz9876543_g:3_e:c', $result); } #[DataProvider('providerIsValidCaId')] From 2563e142a184c3c2b301f7e5a46d998d44174795 Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 21:05:07 -0300 Subject: [PATCH 16/17] Revert "fix: use Nextcloud's instanceid instead of generating random ID" This reverts commit 8f71e6c0cb41b43d0fdab157d9c671eb82eac93a. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- lib/Service/CaIdentifierService.php | 11 +++++--- .../Unit/Service/CaIdentifierServiceTest.php | 26 +++++-------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/lib/Service/CaIdentifierService.php b/lib/Service/CaIdentifierService.php index 4c8e0c21aa..c61a3e5955 100644 --- a/lib/Service/CaIdentifierService.php +++ b/lib/Service/CaIdentifierService.php @@ -10,7 +10,7 @@ use OCA\Libresign\AppInfo\Application; use OCP\IAppConfig; -use OCP\IConfig; +use OCP\Security\ISecureRandom; class CaIdentifierService { private const ENGINE_TYPES = [ @@ -20,12 +20,17 @@ class CaIdentifierService { public function __construct( private IAppConfig $appConfig, - private IConfig $config, ) { } public function getInstanceId(): string { - return $this->config->getSystemValueString('instanceid'); + $instanceId = $this->appConfig->getValueString(Application::APP_ID, 'instance_id', ''); + if (strlen($instanceId) === 10) { + return $instanceId; + } + $instanceId = \OC::$server->get(ISecureRandom::class)->generate(10, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS); + $this->appConfig->setValueString(Application::APP_ID, 'instance_id', $instanceId); + return $instanceId; } public function generateCaId(string $engineName): string { diff --git a/tests/php/Unit/Service/CaIdentifierServiceTest.php b/tests/php/Unit/Service/CaIdentifierServiceTest.php index f6a83241f6..6e0095786e 100644 --- a/tests/php/Unit/Service/CaIdentifierServiceTest.php +++ b/tests/php/Unit/Service/CaIdentifierServiceTest.php @@ -10,7 +10,6 @@ use OCA\Libresign\Service\CaIdentifierService; use OCP\IAppConfig; -use OCP\IConfig; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; @@ -20,22 +19,17 @@ */ final class CaIdentifierServiceTest extends TestCase { private CaIdentifierService $service; - private IAppConfig&MockObject $appConfig; - private IConfig&MockObject $config; + private MockObject $appConfig; protected function setUp(): void { + parent::setUp(); $this->appConfig = $this->createMock(IAppConfig::class); - $this->config = $this->createMock(IConfig::class); - $this->service = new CaIdentifierService($this->appConfig, $this->config); + /** @var IAppConfig $appConfig */ + $appConfig = $this->appConfig; + $this->service = new CaIdentifierService($appConfig); } public function testGenerateCaIdWithOpenSSL(): void { - $this->config - ->expects($this->once()) - ->method('getSystemValueString') - ->with('instanceid') - ->willReturn('abc1234567'); - $this->appConfig ->expects($this->once()) ->method('getValueInt') @@ -49,16 +43,10 @@ public function testGenerateCaIdWithOpenSSL(): void { $result = $this->service->generateCaId('openssl'); - $this->assertEquals('libresign-ca-id:abc1234567_g:1_e:o', $result); + $this->assertMatchesRegularExpression('/^libresign-ca-id:[a-z0-9]{10}_g:\d+_e:o$/', $result); } public function testGenerateCaIdWithCFSSL(): void { - $this->config - ->expects($this->once()) - ->method('getSystemValueString') - ->with('instanceid') - ->willReturn('xyz9876543'); - $this->appConfig ->expects($this->once()) ->method('getValueInt') @@ -72,7 +60,7 @@ public function testGenerateCaIdWithCFSSL(): void { $result = $this->service->generateCaId('cfssl'); - $this->assertEquals('libresign-ca-id:xyz9876543_g:3_e:c', $result); + $this->assertMatchesRegularExpression('/^libresign-ca-id:[a-z0-9]{10}_g:\d+_e:c$/', $result); } #[DataProvider('providerIsValidCaId')] From 9e1d39ea741269847aa15de2e5f8fa5ebef214da Mon Sep 17 00:00:00 2001 From: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> Date: Tue, 16 Dec 2025 21:10:43 -0300 Subject: [PATCH 17/17] test: make CA ID regex more flexible in integration tests Change regex pattern from [a-z0-9]{10} (exactly 10 chars) to [a-z0-9]+ (one or more chars) to accept variable-length instance identifiers. This makes tests more resilient to changes in instance ID generation while maintaining validation of the CA ID format. Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com> --- .../features/account/signature.feature | 16 ++++++++-------- .../features/admin/certificate_openssl.feature | 4 ++-- tests/integration/features/file/validate.feature | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/integration/features/account/signature.feature b/tests/integration/features/account/signature.feature index 30b0c5f3a1..e808a2e980 100644 --- a/tests/integration/features/account/signature.feature +++ b/tests/integration/features/account/signature.feature @@ -17,7 +17,7 @@ Feature: account/signature | (jq).ocs.data.rootCert.names[4].id | OU | | (jq).ocs.data.rootCert.names[4].value\|length | 2 | | (jq).ocs.data.rootCert.names[4].value[0] | Organizational Unit | - | (jq).ocs.data.rootCert.names[4].value | (jq)any(.[]; test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$")) | + | (jq).ocs.data.rootCert.names[4].value | (jq)any(.[]; test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$")) | | (jq).ocs.data.generated | true | Scenario: Create root certificate with CFSSL engine using API @@ -40,7 +40,7 @@ Feature: account/signature | (jq).ocs.data.rootCert.names[4].id | OU | | (jq).ocs.data.rootCert.names[4].value\|length | 2 | | (jq).ocs.data.rootCert.names[4].value[0] | Organizational Unit | - | (jq).ocs.data.rootCert.names[4].value | (jq)any(.[]; test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$")) | + | (jq).ocs.data.rootCert.names[4].value | (jq)any(.[]; test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$")) | | (jq).ocs.data.generated | true | Scenario: Create pfx with success using CFSSL @@ -77,7 +77,7 @@ Feature: account/signature | (jq).ocs.data | (jq).name \|test("/ST=State of Company") | | (jq).ocs.data | (jq).name \|test("/L=City Name") | | (jq).ocs.data | (jq).name \|test("/O=Organization") | - | (jq).ocs.data | (jq).name \|test("/OU=Organization Unit, libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?") | + | (jq).ocs.data | (jq).name \|test("/OU=Organization Unit, libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?") | | (jq).ocs.data | (jq).name \|test("/CN=account:signer1, signer1-displayname") | | (jq).ocs.data.issuer\|length | 6 | | (jq).ocs.data.issuer.CN | Common Name | @@ -87,7 +87,7 @@ Feature: account/signature | (jq).ocs.data.issuer.O | Organization | | (jq).ocs.data.issuer.OU\|length | 2 | | (jq).ocs.data.issuer.OU | (jq) .[0] \|test("^Organization Unit$") | - | (jq).ocs.data.issuer.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$") | + | (jq).ocs.data.issuer.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$") | | (jq).ocs.data.subject\|length | 6 | | (jq).ocs.data.subject.CN | (jq) .[0] \|test("^account:signer1$") | | (jq).ocs.data.subject.CN | (jq) .[1] \|test("^signer1-displayname$") | @@ -97,7 +97,7 @@ Feature: account/signature | (jq).ocs.data.subject.O | Organization | | (jq).ocs.data.issuer.OU\|length | 2 | | (jq).ocs.data.issuer.OU | (jq) .[0] \|test("^Organization Unit$") | - | (jq).ocs.data.issuer.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$") | + | (jq).ocs.data.issuer.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$") | | (jq).ocs.data.extensions.basicConstraints | CA:FALSE | | (jq).ocs.data.extensions.subjectAltName | email:signer@domain.test | | (jq).ocs.data.extensions.keyUsage | Digital Signature, Non Repudiation, Key Encipherment | @@ -138,7 +138,7 @@ Feature: account/signature | (jq).ocs.data | (jq).name \|test("/ST=State of Company") | | (jq).ocs.data | (jq).name \|test("/L=City Name") | | (jq).ocs.data | (jq).name \|test("/O=Organization") | - | (jq).ocs.data | (jq).name \|test("/OU=Organization Unit, libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?") | + | (jq).ocs.data | (jq).name \|test("/OU=Organization Unit, libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?") | | (jq).ocs.data | (jq).name \|test("/UID=account:signer1") | | (jq).ocs.data | (jq).name \|test("/CN=signer1-displayname") | | (jq).ocs.data.issuer\|length | 6 | @@ -149,7 +149,7 @@ Feature: account/signature | (jq).ocs.data.issuer.O | Organization | | (jq).ocs.data.issuer.OU\|length | 2 | | (jq).ocs.data.issuer.OU | (jq) .[0] \|test("^Organization Unit$") | - | (jq).ocs.data.issuer.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$") | + | (jq).ocs.data.issuer.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$") | | (jq).ocs.data.subject\|length | 7 | | (jq).ocs.data.subject.CN | signer1-displayname | | (jq).ocs.data.subject.C | BR | @@ -158,7 +158,7 @@ Feature: account/signature | (jq).ocs.data.subject.O | Organization | | (jq).ocs.data.subject.OU \|length | 2 | | (jq).ocs.data.subject.OU | (jq) .[0] \|test("^Organization Unit$") | - | (jq).ocs.data.subject.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$") | + | (jq).ocs.data.subject.OU | (jq) .[1] \|test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$") | | (jq).ocs.data.subject.UID | account:signer1 | | (jq).ocs.data.extensions.basicConstraints | CA:FALSE | | (jq).ocs.data.extensions.subjectAltName | email:signer@domain.test | diff --git a/tests/integration/features/admin/certificate_openssl.feature b/tests/integration/features/admin/certificate_openssl.feature index dcf2a806de..060ceb5953 100644 --- a/tests/integration/features/admin/certificate_openssl.feature +++ b/tests/integration/features/admin/certificate_openssl.feature @@ -11,7 +11,7 @@ Feature: admin/certificate_openssl | (jq).ocs.data.rootCert.commonName | Common Name | | (jq).ocs.data.rootCert.names\|length | 1 | | (jq).ocs.data.rootCert.names[0].id | OU | - | (jq).ocs.data.rootCert.names[0].value | (jq) .[] \|test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$") | + | (jq).ocs.data.rootCert.names[0].value | (jq) .[] \|test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$") | | (jq).ocs.data.generated | true | Scenario: Generate root cert with fail without CN @@ -46,7 +46,7 @@ Feature: admin/certificate_openssl | (jq).ocs.data.rootCert.names[0].id | C | | (jq).ocs.data.rootCert.names[0].value | BR | | (jq).ocs.data.rootCert.names[1].id | OU | - | (jq).ocs.data.rootCert.names[1].value | (jq) .[] \|test("^libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?$") | + | (jq).ocs.data.rootCert.names[1].value | (jq) .[] \|test("^libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?$") | | (jq).ocs.data.generated | true | Scenario: Generate root cert with fail when country have less then 2 characters diff --git a/tests/integration/features/file/validate.feature b/tests/integration/features/file/validate.feature index 6efc74c936..712ad76327 100644 --- a/tests/integration/features/file/validate.feature +++ b/tests/integration/features/file/validate.feature @@ -38,7 +38,7 @@ Feature: validate | (jq).ocs.data.signers[0] | (jq).name \|test("/ST=State of Company") | | (jq).ocs.data.signers[0] | (jq).name \|test("/L=City Name") | | (jq).ocs.data.signers[0] | (jq).name \|test("/O=Organization") | - | (jq).ocs.data.signers[0] | (jq).name \|test("/OU=Organization Unit, libresign-ca-id:[a-z0-9]{10}_g:[0-9]+_e:[oc]?") | + | (jq).ocs.data.signers[0] | (jq).name \|test("/OU=Organization Unit, libresign-ca-id:[a-z0-9]+_g:[0-9]+_e:[oc]?") | | (jq).ocs.data.signers[0] | (jq).name \|test("/CN=signer1-displayname") | | (jq).ocs.data.signers[0].subject.CN | signer1-displayname | | (jq).ocs.data.signers[0].subject.C | BR |