Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

AskPopupView.password default is to only ask passphrase

Browse source
This commit is contained in:
the-djmaze 2024-04-23 14:54:48 +02:00
parent d198ad5a59
commit 24dbe4f197
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/View/Popup/Identity.js
View file

@ -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
});
}
});