aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src/gpgmejs.js
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-08-21 13:26:17 +0000
committerMaximilian Krambach <[email protected]>2018-08-21 13:26:17 +0000
commit6d720137dd9564931bf313a7e7078e63fb00287c (patch)
tree93e09926a8b922fd186daee42cea741d1d35729a /lang/js/src/gpgmejs.js
parentjs: remove outdated checklists (diff)
downloadgpgme-6d720137dd9564931bf313a7e7078e63fb00287c.tar.gz
gpgme-6d720137dd9564931bf313a7e7078e63fb00287c.zip
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)
Diffstat (limited to 'lang/js/src/gpgmejs.js')
-rw-r--r--lang/js/src/gpgmejs.js19
1 files changed, 11 insertions, 8 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){