From d8fd4aad8a93f7745c63814b3779469b610a8db0 Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Wed, 22 Aug 2018 12:44:05 +0200
Subject: [PATCH] js: changed verify signature result infos

--

* the resulting information of verify now are as documented,
  and the same as in a decrypt callback
---
 .../BrowserTestExtension/tests/verifyTest.js  | 43 +++++++++++--------
 lang/js/src/gpgmejs.js                        |  6 ++-
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/lang/js/BrowserTestExtension/tests/verifyTest.js b/lang/js/BrowserTestExtension/tests/verifyTest.js
index 82aaf564..5788ed51 100644
--- a/lang/js/BrowserTestExtension/tests/verifyTest.js
+++ b/lang/js/BrowserTestExtension/tests/verifyTest.js
@@ -38,12 +38,12 @@ describe('Verifying data', function () {
         const message = inputvalues.signedMessage.good;
         context.verify(message).then(function (result){
             expect(result.data).to.be.a('string');
-            expect(result.all_valid).to.be.true;
-            expect(result.count).to.equal(1);
-            expect(result.signatures.good).to.be.an('array');
-            expect(result.signatures.good.length).to.equal(1);
-            expect(result.signatures.good[0].fingerprint).to.be.a('string');
-            expect(result.signatures.good[0].valid).to.be.true;
+            expect(result.signatures.all_valid).to.be.true;
+            expect(result.signatures.count).to.equal(1);
+            expect(result.signatures.signatures.good).to.be.an('array');
+            expect(result.signatures.signatures.good.length).to.equal(1);
+            expect(result.signatures.signatures.good[0].fingerprint).to.be.a('string');
+            expect(result.signatures.signatures.good[0].valid).to.be.true;
             done();
         });
     });
@@ -52,12 +52,14 @@ describe('Verifying data', function () {
         const message = inputvalues.signedMessage.bad;
         context.verify(message).then(function (result){
             expect(result.data).to.be.a('string');
-            expect(result.all_valid).to.be.false;
-            expect(result.count).to.equal(1);
-            expect(result.signatures.bad).to.be.an('array');
-            expect(result.signatures.bad.length).to.equal(1);
-            expect(result.signatures.bad[0].fingerprint).to.be.a('string');
-            expect(result.signatures.bad[0].valid).to.be.false;
+            expect(result.signatures.all_valid).to.be.false;
+            expect(result.signatures.count).to.equal(1);
+            expect(result.signatures.signatures.bad).to.be.an('array');
+            expect(result.signatures.signatures.bad.length).to.equal(1);
+            expect(result.signatures.signatures.bad[0].fingerprint)
+                .to.be.a('string');
+            expect(result.signatures.signatures.bad[0].valid)
+                .to.be.false;
             done();
         });
     });
@@ -70,13 +72,16 @@ describe('Verifying data', function () {
                 context.verify(message_encsign.data).then(function (result){
                     expect(result.data).to.equal(message_enc.data);
                     expect(result.data).to.be.a('string');
-                    expect(result.all_valid).to.be.true;
-                    expect(result.count).to.equal(1);
-                    expect(result.signatures.good).to.be.an('array');
-                    expect(result.signatures.good.length).to.equal(1);
-                    expect(
-                        result.signatures.good[0].fingerprint).to.equal(fpr);
-                    expect(result.signatures.good[0].valid).to.be.true;
+                    expect(result.signatures.all_valid).to.be.true;
+                    expect(result.signatures.count).to.equal(1);
+                    expect(result.signatures.signatures.good)
+                        .to.be.an('array');
+                    expect(result.signatures.signatures.good.length)
+                        .to.equal(1);
+                    expect(result.signatures.signatures.good[0].fingerprint)
+                        .to.equal(fpr);
+                    expect(result.signatures.signatures.good[0].valid)
+                        .to.be.true;
                     done();
                 });
             });
diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index 2886c6f6..7692298f 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -301,8 +301,10 @@ export class GpgME {
                 if (!message.info || !message.info.signatures){
                     reject(gpgme_error('SIG_NO_SIGS'));
                 } else {
-                    let _result = collectSignatures(message.info.signatures);
-                    if (_result instanceof Error){
+                    let _result = {
+                        signatures: collectSignatures(message.info.signatures)
+                    };
+                    if (_result.signatures instanceof Error){
                         reject(_result.signatures);
                     } else {
                         _result.is_mime = message.info.is_mime? true: false;