js: update decrypt/verify results

--

* src/gpgmejs.js: Decrypt now parses additional optional dec_info
  information, as well as any verify information, if present

* src/permittedOperations: Now decrypt also expect the new return
  object dec_inf (containing info such as is_mime and file_name)

2 files changed, 13 insertions, 10 deletions

diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index 9a0925b0..3be5cdd5 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -192,18 +192,21 @@ export class GpgME {
             msg.post().then(function (result){
                 let _result = { data: result.data };
                 _result.base64 = result.base64 ? true: false;
-                _result.is_mime = result.is_mime ? true: false;
-                if (result.file_name){
-                    _result.file_name = result.file_name;
-                } else {
+                if (result.hasOwnProperty('dec_info')){
+                    _result.is_mime = result.dec_info.is_mime ? true: false;
+                    if (result.dec_info.file_name) {
+                        _result.file_name = result.dec_info.file_name;
+                    }
+                }
+                if (!result.file_name) {
                     _result.file_name = null;
                 }
-                if (
-                    result.hasOwnProperty('signatures') &&
-                    Array.isArray(result.signatures)
+                if (result.hasOwnProperty('info')
+                    && result.info.hasOwnProperty('signatures')
+                    && Array.isArray(result.info.signatures)
                 ) {
                     _result.signatures = collectSignatures(
-                        result.signatures);
+                        result.info.signatures);
                 }
                 resolve(_result);
             }, function (error){
diff --git a/lang/js/src/permittedOperations.js b/lang/js/src/permittedOperations.js
index 3142725c..6c05fc6c 100644
--- a/lang/js/src/permittedOperations.js
+++ b/lang/js/src/permittedOperations.js
@@ -127,8 +127,8 @@ export const permittedOperations = {
                 'data': 'string',
                 'base64': 'boolean',
                 'mime': 'boolean',
-                'signatures': 'object',
-                'info': 'object'
+                'info': 'object',
+                'dec_info': 'object'
             }
         }
     },