From 4b343c4e339862a5faf8dd20590a3c4592fb6abb Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Tue, 24 Jul 2018 14:56:33 +0200
Subject: [PATCH] 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
---
 .../tests/KeyImportExport.js                  | 26 +++++++++++++++++++
 lang/js/src/Key.js                            |  9 ++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/lang/js/BrowserTestExtension/tests/KeyImportExport.js b/lang/js/BrowserTestExtension/tests/KeyImportExport.js
index 4a53c7a6..ed307b32 100644
--- a/lang/js/BrowserTestExtension/tests/KeyImportExport.js
+++ b/lang/js/BrowserTestExtension/tests/KeyImportExport.js
@@ -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) {
         let prm = Gpgmejs.init();
         const fpr = inputvalues.encrypt.good.fingerprint;
diff --git a/lang/js/src/Key.js b/lang/js/src/Key.js
index 30f507c1..b024a77b 100644
--- a/lang/js/src/Key.js
+++ b/lang/js/src/Key.js
@@ -141,7 +141,7 @@ export class GPGME_Key {
      * during a session. The key still can be reloaded by invoking
      * {@link refreshKey}.
      * @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) {
         if (cached === false) {
@@ -194,8 +194,11 @@ export class GPGME_Key {
                 if (result.keys.length === 1){
                     me.setKeyData(result.keys[0]);
                     me.getHasSecret().then(function(){
-                        //TODO retrieve armored Key
-                        resolve(me);
+                        me.getArmor().then(function(){
+                            resolve(me);
+                        }, function(error){
+                            reject(error);
+                        });
                     }, function(error){
                         reject(error);
                     });