js: include armored Key in import callback

--

* The import answer now also directly contains the armored Key as Key
  property, without need to refresh the Key object created in the
  answer. This allows for direct comparision of input and output.
* BrowserTestExtension: added test for that import callback
This commit is contained in:
Maximilian Krambach 2018-07-24 14:56:33 +02:00
parent 040b1ed40a
commit 4b343c4e33
2 changed files with 32 additions and 3 deletions

View File

@ -83,6 +83,32 @@ describe('Key importing', function () {
}); });
}); });
}); });
it('Import result feedback', function(done){
let prm = Gpgmejs.init();
prm.then(function (context) {
context.Keyring.getKeys(ImportablePublicKey.fingerprint).then(
function(result){
expect(result).to.be.an('array');
expect(result.length).to.equal(0);
context.Keyring.importKey(ImportablePublicKey.key, true)
.then(function(result){
expect(result).to.be.an('object');
expect(result.Keys[0]).to.be.an('object');
expect(result.Keys[0].key.fingerprint).to.equal(
ImportablePublicKey.fingerprint);
expect(result.Keys[0].status).to.equal('newkey');
result.Keys[0].key.getArmor().then(function(armor){
expect(armor).to.be.a('string');
result.Keys[0].key.delete().then(function(){
done();
});
});
});
});
});
});
it('exporting armored Key with getKeysArmored', function (done) { it('exporting armored Key with getKeysArmored', function (done) {
let prm = Gpgmejs.init(); let prm = Gpgmejs.init();
const fpr = inputvalues.encrypt.good.fingerprint; const fpr = inputvalues.encrypt.good.fingerprint;

View File

@ -141,7 +141,7 @@ export class GPGME_Key {
* during a session. The key still can be reloaded by invoking * during a session. The key still can be reloaded by invoking
* {@link refreshKey}. * {@link refreshKey}.
* @returns {*|Promise<*>} the value (Boolean, String, Array, Object). * @returns {*|Promise<*>} the value (Boolean, String, Array, Object).
* If 'cached' is true, the value will be resolved as a Promise. * If 'cached' is false, the value will be resolved as a Promise.
*/ */
get(property, cached=true) { get(property, cached=true) {
if (cached === false) { if (cached === false) {
@ -194,11 +194,14 @@ export class GPGME_Key {
if (result.keys.length === 1){ if (result.keys.length === 1){
me.setKeyData(result.keys[0]); me.setKeyData(result.keys[0]);
me.getHasSecret().then(function(){ me.getHasSecret().then(function(){
//TODO retrieve armored Key me.getArmor().then(function(){
resolve(me); resolve(me);
}, function(error){ }, function(error){
reject(error); reject(error);
}); });
}, function(error){
reject(error);
});
} else { } else {
reject(gpgme_error('KEY_NOKEY')); reject(gpgme_error('KEY_NOKEY'));
} }