Revamp PGP management due to implementing Mailvelop and PEAR Crypt_GPG

This commit is contained in:
the-djmaze 2022-01-19 18:24:07 +01:00
parent 43a1196dbb
commit a47397ef09
16 changed files with 885 additions and 633 deletions

View file

@ -648,7 +648,7 @@ export class MessageModel extends AbstractModel {
// const message = self.message();
// message && pgpClickHelper(message.body, message.plain(), message.getEmails(['from', 'to', 'cc']));
/*
pgpEncrypted: () => PgpUserStore.openpgp
pgpEncrypted: () => PgpUserStore.isSupported()
&& MessageUserStore.message() && MessageUserStore.message().isPgpEncrypted(),
*/
}
@ -660,9 +660,11 @@ export class MessageModel extends AbstractModel {
params.Uid = this.uid;
rl.app.Remote.post('MessagePgpVerify', null, params)
.then(data => {
// TODO
console.dir(data);
})
.catch(error => {
// TODO
console.dir(error);
});
}

View file

@ -2,7 +2,6 @@ import ko from 'ko';
import { arrayLength } from 'Common/Utils';
import { AbstractModel } from 'Knoin/AbstractModel';
import { PgpUserStore } from 'Stores/User/Pgp';
export class OpenPgpKeyModel extends AbstractModel {
/**
@ -35,25 +34,21 @@ export class OpenPgpKeyModel extends AbstractModel {
this.deleteAccess = ko.observable(false);
}
getNativeKey() {
let key = null;
/**
* OpenPGP.js
*/
getNativeKeys() {
try {
key = PgpUserStore.openpgp.key.readArmored(this.armor);
let key = openpgp.key.readArmored(this.armor);
if (key && !key.err && key.keys && key.keys[0]) {
return key;
return key.keys;
}
} catch (e) {
console.log(e);
console.error(e);
}
return null;
}
getNativeKeys() {
const key = this.getNativeKey();
return key && key.keys ? key.keys : null;
}
select(pattern, property) {
if (this[property]) {
const index = this[property].indexOf(pattern);