From 24dbe4f1971608a2ac47c115b859c07f2a9b85a0 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 23 Apr 2024 14:54:48 +0200
Subject: [PATCH] AskPopupView.password default is to only ask passphrase

---
 dev/App/User.js            |  8 ++++++--
 dev/Storage/Passphrases.js |  2 +-
 dev/View/Popup/Identity.js | 14 +++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev/App/User.js b/dev/App/User.js
index a45a741bb..31babbbb7 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -255,10 +255,14 @@ AskPopupView.password = function(sAskDesc, btnText, ask) {
 	return new Promise(resolve => {
 		this.showModal([
 			sAskDesc,
-			view => resolve({password:view.passphrase(), remember:view.remember()}),
+			view => resolve({
+				password:view.passphrase(),
+				username:/*ask & 2 ? */view.username(),
+				remember:/*ask & 4 ? */view.remember()
+			}),
 			() => resolve(null),
 			true,
-			ask || 5,
+			ask || 1,
 			btnText
 		]);
 	});
diff --git a/dev/Storage/Passphrases.js b/dev/Storage/Passphrases.js
index 6196f2651..eb3c7e563 100644
--- a/dev/Storage/Passphrases.js
+++ b/dev/Storage/Passphrases.js
@@ -5,7 +5,7 @@ export const Passphrases = new WeakMap();
 Passphrases.ask = async (key, sAskDesc, btnText) =>
 	Passphrases.has(key)
 		? {password:Passphrases.handle(key)/*, remember:false*/}
-		: await AskPopupView.password(sAskDesc, btnText);
+		: await AskPopupView.password(sAskDesc, btnText, 5);
 
 const timeouts = {};
 // get/set accessor to control deletion after 15 minutes of inactivity
diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js
index a76dac767..35c189b36 100644
--- a/dev/View/Popup/Identity.js
+++ b/dev/View/Popup/Identity.js
@@ -46,8 +46,8 @@ export class IdentityPopupView extends AbstractViewPopup {
 	}
 
 	createSelfSigned() {
-		AskPopupView.password('', 'CRYPTO/CREATE_SELF_SIGNED').then(pass => {
-			if (pass) {
+		AskPopupView.password('', 'CRYPTO/CREATE_SELF_SIGNED').then(result => {
+			if (result) {
 				const identity = this.identity();
 				Remote.request('SMimeCreateCertificate', (iError, oData) => {
 					if (oData.Result.x509) {
@@ -60,7 +60,7 @@ export class IdentityPopupView extends AbstractViewPopup {
 					name: identity.name(),
 					email: identity.email(),
 					privateKey: identity.smimeKey(),
-					passphrase: pass.password
+					passphrase: result.password
 				});
 			}
 		});
@@ -70,13 +70,13 @@ export class IdentityPopupView extends AbstractViewPopup {
 		const identity = this.identity();
 		let old = null
 		if (identity.smimeKeyEncrypted()) {
-			old = await AskPopupView.password(i18n('CRYPTO/CURRENT_PASS'), 'CRYPTO/DECRYPT', 1);
+			old = await AskPopupView.password(i18n('CRYPTO/CURRENT_PASS'), 'CRYPTO/DECRYPT');
 			if (!old) {
 				return;
 			}
 		}
-		AskPopupView.password(i18n('CRYPTO/NEW_PASS'), 'GLOBAL/SAVE', 1).then(pass => {
-			if (pass) {
+		AskPopupView.password(i18n('CRYPTO/NEW_PASS'), 'GLOBAL/SAVE').then(result => {
+			if (result) {
 				Remote.request('SMimeExportPrivateKey', (iError, oData) => {
 					if (oData.Result) {
 						identity.smimeKey(oData.Result);
@@ -86,7 +86,7 @@ export class IdentityPopupView extends AbstractViewPopup {
 				}, {
 					privateKey: identity.smimeKey(),
 					oldPassphrase: old?.password,
-					newPassphrase: pass.password
+					newPassphrase: result.password
 				});
 			}
 		});