aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src/gpgmejs_openpgpjs.js
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-04-25 08:54:24 +0000
committerMaximilian Krambach <[email protected]>2018-04-25 08:54:24 +0000
commitc72adc00965fe4fcedd9d18609211021a091b28b (patch)
treeaf1cc5df7da410f42f2762da9b03b5ca3d39087d /lang/js/src/gpgmejs_openpgpjs.js
parentjs: allow openpgp-like Message objects as Data (diff)
downloadgpgme-c72adc00965fe4fcedd9d18609211021a091b28b.tar.gz
gpgme-c72adc00965fe4fcedd9d18609211021a091b28b.zip
js: change in Error behaviour
-- * Error objects will now return the error code if defined as error type in src/Errors.js, or do a console.log if it is a warning. Errors from the native gpgme-json will be marked as GNUPG_ERROR.
Diffstat (limited to 'lang/js/src/gpgmejs_openpgpjs.js')
-rw-r--r--lang/js/src/gpgmejs_openpgpjs.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/lang/js/src/gpgmejs_openpgpjs.js b/lang/js/src/gpgmejs_openpgpjs.js
index 23076569..e32f43a3 100644
--- a/lang/js/src/gpgmejs_openpgpjs.js
+++ b/lang/js/src/gpgmejs_openpgpjs.js
@@ -88,14 +88,14 @@
|| signature !== null
|| returnSessionKey !== null
|| date !== null){
- return Promise.reject(new GPMGEJS_Error('NOT_IMPLEMENTED'));
+ return Promise.reject(GPMGEJS_Error('NOT_IMPLEMENTED'));
}
if ( privateKeys
|| filename
|| compression
|| armor === false
|| detached == true){
- return Promise.reject(new GPGMEJS_Error('NOT_YET_IMPLEMENTED'));
+ return Promise.reject(GPGMEJS_Error('NOT_YET_IMPLEMENTED'));
}
return this.GpgME.encrypt(data, translateKeyInput(publicKeys), wildcard);
}
@@ -123,14 +123,14 @@
if (passwords !== undefined
|| sessionKeys
|| date){
- return Promise.reject(new GPGMEJS_Error('NOT_IMPLEMENTED'));
+ return Promise.reject(GPGMEJS_Error('NOT_IMPLEMENTED'));
}
if ( privateKeys
|| publicKeys
|| format !== 'utf8'
|| signature
){
- return Promise.reject(new GPGMEJS_Error('NOT_YET_IMPLEMENTED'));
+ return Promise.reject(GPGMEJS_Error('NOT_YET_IMPLEMENTED'));
}
return this.GpgME.decrypt(message);
// TODO: translate between:
@@ -185,7 +185,7 @@ class GPGME_Keyring_openpgpmode {
else {
// TODO: Can there be "no default key"?
// TODO: Can there be several default keys?
- return new GPGMEJS_Error; //TODO
+ return GPGMEJS_Error('TODO');
}
});
}
@@ -202,10 +202,10 @@ class GPGME_Keyring_openpgpmode {
*/
deleteKey(key){
if (typeof(key) !== "object"){
- return Promise.reject(new GPGMEJS_Error('WRONGPARAM'));
+ return Promise.reject(GPGMEJS_Error('PARAM_WRONG'));
}
if ( !key.fingerprint || ! isFingerprint(key.fingerprint)){
- return Promise.reject(new GPGMEJS_Error('WRONGPARAM'));
+ return Promise.reject(GPGMEJS_Error('PARAM_WRONG'));
}
let key_to_delete = new GPGME_Key(key.fingerprint);
return key_to_delete.deleteKey(key.secret);