fix(smime): persist sign preference per alias

Signed-off-by: Hamza Mahjoubi <[email protected]>
Signed-off-by: Richard Steinmetz <[email protected]>

Author: hamza221

lib/Controller/PageController.php

@@ -188,6 +188,11 @@ public function index(): TemplateResponse {
 			$this->preferences->getPreference($this->currentUserId, 'internal-addresses', false)
 		);
 
+		$this->initialStateService->provideInitialState(
+			'smime-sign-aliases',
+			json_decode($this->preferences->getPreference($this->currentUserId, 'smime-sign-aliases', '[]'), true, 512, JSON_THROW_ON_ERROR) ?? []
+		);
+
 		$this->initialStateService->provideInitialState(
 			'sort-order',
 			$this->preferences->getPreference($this->currentUserId, 'sort-order', 'newest')

src/components/Composer.vue

@@ -359,8 +359,8 @@
 						</ActionCheckbox>
 						<ActionCheckbox v-if="smimeCertificateForCurrentAlias"
 							:checked="wantsSmimeSign"
-							@check="wantsSmimeSign = true"
-							@uncheck="wantsSmimeSign = false">
+							@check="smimeSignCheck(true)"
+							@uncheck="smimeSignCheck(false)">
 							{{ t('mail', 'Sign message with S/MIME') }}
 						</ActionCheckbox>
 						<ActionCheckbox v-if="smimeCertificateForCurrentAlias"
@@ -497,6 +497,7 @@ import { TRIGGER_CHANGE_ALIAS, TRIGGER_EDITOR_READY } from '../ckeditor/signatur
 import { EDITOR_MODE_HTML, EDITOR_MODE_TEXT } from '../store/constants.js'
 import useMainStore from '../store/mainStore.js'
 import { mapStores, mapState } from 'pinia'
+import { savePreference } from '../service/PreferenceService.js'
 
 const debouncedSearch = debouncePromise(findRecipient, 500)
 
@@ -689,6 +690,7 @@ export default {
 			wantsSmimeEncrypt: this.smimeEncrypt,
 			isPickerOpen: false,
 			recipientSearchTerms: {},
+			smimeSignAliases: [],
 		}
 	},
 	computed: {
@@ -939,6 +941,13 @@ export default {
 		requestMdnVal(val) {
 			this.$emit('update:request-mdn', val)
 		},
+		selectedAlias: {
+			handler() {
+				const aliasEmailAddress = this.selectedAlias.emailAddress
+				this.wantsSmimeSign = this.smimeSignAliases.indexOf(aliasEmailAddress) !== -1
+			},
+			immediate: true,
+		}
 	},
 	async beforeMount() {
 		this.setAlias()
@@ -984,6 +993,8 @@ export default {
 		if (this.sendAt && this.isSendAtCustom) {
 			this.selectedDate = new Date(this.sendAt)
 		}
+
+		this.smimeSignAliases = this.mainStore.getPreference('smime-sign-aliases', [])
 	},
 	beforeDestroy() {
 		window.removeEventListener('mailvelope', this.onMailvelopeLoaded)
@@ -1418,6 +1429,17 @@ export default {
 			return this.mainStore.getSmimeCertificate(certificateId)
 		},
 
+		smimeSignCheck(value) {
+			this.wantsSmimeSign = value
+			if (value) {
+				this.smimeSignAliases.push(this.selectedAlias.emailAddress)
+			} else {
+				this.smimeSignAliases = this.smimeSignAliases
+					.filter((alias) => alias !== this.selectedAlias.emailAddress)
+			}
+			savePreference('smime-sign-aliases', JSON.stringify(this.smimeSignAliases))
+		},
+
 		/**
 		 * Create a new option for the to, cc and bcc selects.
 		 *

src/init.js

@@ -82,6 +82,10 @@ export default function initAfterAppCreation() {
 		key: 'internal-addresses',
 		value: loadState('mail', 'internal-addresses', false),
 	})
+	mainStore.savePreferenceMutation({
+		key: 'smime-sign-aliases',
+		value: loadState('mail', 'smime-sign-aliases', []),
+	})
 
 	const accountSettings = loadState('mail', 'account-settings')
 	const accounts = loadState('mail', 'accounts', [])

tests/Unit/Controller/PageControllerTest.php

@@ -168,7 +168,7 @@ public function testIndex(): void {
 		$account1 = $this->createMock(Account::class);
 		$account2 = $this->createMock(Account::class);
 		$mailbox = $this->createMock(Mailbox::class);
-		$this->preferences->expects($this->exactly(11))
+		$this->preferences->expects($this->exactly(12))
 			->method('getPreference')
 			->willReturnMap([
 				[$this->userId, 'account-settings', '[]', json_encode([])],
@@ -182,6 +182,7 @@ public function testIndex(): void {
 				[$this->userId, 'layout-message-view', 'threaded', 'threaded'],
 				[$this->userId, 'follow-up-reminders', 'true', 'true'],
 				[$this->userId, 'internal-addresses', 'false', 'false'],
+				[$this->userId, 'smime-sign-aliases', '[]', '[]'],
 			]);
 		$this->classificationSettingsService->expects(self::once())
 			->method('isClassificationEnabled')
@@ -302,7 +303,7 @@ public function testIndex(): void {
 			->method('getLoginCredentials')
 			->willReturn($loginCredentials);
 
-		$this->initialState->expects($this->exactly(21))
+		$this->initialState->expects($this->exactly(22))
 			->method('provideInitialState')
 			->withConsecutive(
 				['debug', true],
@@ -312,6 +313,7 @@ public function testIndex(): void {
 				['tags', []],
 				['internal-addresses-list', []],
 				['internal-addresses', false],
+				['smime-sign-aliases',[]],
 				['sort-order', 'newest'],
 				['password-is-unavailable', true],
 				['preferences', [