aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src/gpgmejs.js
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-04-25 13:59:36 +0000
committerMaximilian Krambach <[email protected]>2018-04-25 13:59:36 +0000
commit1fb310cabe578625f96fce5d84ff6f0092c08d24 (patch)
tree7d86ba979e8a4c39fd75ea2f727cce8c169d4e08 /lang/js/src/gpgmejs.js
parentjs: reactivate timeout on connection (diff)
downloadgpgme-1fb310cabe578625f96fce5d84ff6f0092c08d24.tar.gz
gpgme-1fb310cabe578625f96fce5d84ff6f0092c08d24.zip
js: Configuration and Error handling
-- * gpgmejs_openpgpjs - unsuported values with no negative consequences can now reject, warn or be ignored, according to config.unconsidered_params - cleanup of unsupported/supported parameters and TODOS * A src/index.js init() now accepts a configuration object * Errors will now be derived from Error, offering more info and a stacktrace. * Fixed Connection.post() timeout triggering on wrong cases * Added comments in permittedOperations.js, which gpgme interactions are still unimplemented and should be added next
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 b20ff0f2..b504a457 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -21,7 +21,7 @@
import {Connection} from "./Connection"
import {GPGME_Message} from './Message'
import {toKeyIdArray} from "./Helpers"
-import {GPGMEJS_Error as Error, GPGMEJS_Error} from "./Errors"
+import { gpgme_error } from "./Errors"
import { GPGME_Keyring } from "./Keyring";
export class GpgME {
@@ -35,10 +35,12 @@ export class GpgME {
set connection(connection){
if (this._connection instanceof Connection){
- //TODO Warning: Connection already established
+ gpgme_error('CONN_ALREADY_CONNECTED');
}
if (connection instanceof Connection){
this._connection = connection;
+ } else {
+ gpgme_error('PARAM_WRONG');
}
}
@@ -54,11 +56,12 @@ export class GpgME {
set Keyring(keyring){
if (ring && ring instanceof GPGME_Keyring){
- this.Keyring = ring;
+ this._Keyring = ring;
}
}
get Keyring(){
+ return this._Keyring;
}
/**
@@ -96,7 +99,7 @@ export class GpgME {
decrypt(data){
if (data === undefined){
- return Promise.reject(GPGMEJS_Error('MSG_EMPTY'));
+ return Promise.reject(gpgme_error('MSG_EMPTY'));
}
let msg = new GPGME_Message('decrypt');
putData(msg, data);
@@ -105,7 +108,7 @@ export class GpgME {
}
deleteKey(key, delete_secret = false, no_confirm = false){
- return Promise.reject(GPGMEJS_Error('NOT_YET_IMPLEMENTED'));
+ return Promise.reject(gpgme_error('NOT_YET_IMPLEMENTED'));
let msg = new GPGME_Message('deletekey');
let key_arr = toKeyIdArray(key);
if (key_arr.length !== 1){
@@ -126,7 +129,7 @@ export class GpgME {
case 'ERR_NO_ERROR':
return Promise.resolve('okay'); //TBD
default:
- return Promise.reject(GPGMEJS_Error('TODO') ); //
+ return Promise.reject(gpgme_error('TODO') ); //
// INV_VALUE,
// GPG_ERR_NO_PUBKEY,
// GPG_ERR_AMBIGUOUS_NAME,
@@ -145,7 +148,7 @@ export class GpgME {
*/
function putData(message, data){
if (!message || !message instanceof GPGME_Message ) {
- return GPGMEJS_Error('PARAM_WRONG');
+ return gpgme_error('PARAM_WRONG');
}
if (!data){
message.setParameter('data', '');
@@ -164,6 +167,6 @@ function putData(message, data){
message.setParameter ('data', decoder.decode(txt));
}
} else {
- return GPGMEJS_Error('PARAM_WRONG');
+ return gpgme_error('PARAM_WRONG');
}
}