aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src/Message.js
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-08-22 10:18:55 +0000
committerMaximilian Krambach <[email protected]>2018-08-22 10:18:55 +0000
commit93f674d33d4dacb115398196a7218c28323fd708 (patch)
tree56f3169f96f36dbbc682b06dfcf2c28cf9c0b5ff /lang/js/src/Message.js
parentjs: update decrypt/verify results (diff)
downloadgpgme-93f674d33d4dacb115398196a7218c28323fd708.tar.gz
gpgme-93f674d33d4dacb115398196a7218c28323fd708.zip
js: throw errors in sync functions
-- * synchronous functions should throw errors if something goes wrong, Promises should reject. This commit changes some error cases that returned Error objects instead of throwing them - src/Key.js: createKey() and sync Key.get() throw errors - src/Error.js: Exporting the list of errors to be able to test and compare against these strings - src/Keyring.js: Setting a null value in pattern is not useful, and now caused an error with the new changes. - src/Message.js: createMessage and Message.setParameter now throw errors
Diffstat (limited to '')
-rw-r--r--lang/js/src/Message.js26
1 files changed, 13 insertions, 13 deletions
diff --git a/lang/js/src/Message.js b/lang/js/src/Message.js
index 1ba2b658..b83caf6d 100644
--- a/lang/js/src/Message.js
+++ b/lang/js/src/Message.js
@@ -29,16 +29,16 @@ import { Connection } from './Connection';
* Initializes a message for gnupg, validating the message's purpose with
* {@link permittedOperations} first
* @param {String} operation
- * @returns {GPGME_Message|GPGME_Error} The Message object
+ * @returns {GPGME_Message} The Message object
*/
export function createMessage (operation){
if (typeof (operation) !== 'string'){
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
}
if (permittedOperations.hasOwnProperty(operation)){
return new GPGME_Message(operation);
} else {
- return gpgme_error('MSG_WRONG_OP');
+ throw gpgme_error('MSG_WRONG_OP');
}
}
@@ -117,11 +117,11 @@ export class GPGME_Message {
*/
setParameter ( param,value ){
if (!param || typeof (param) !== 'string'){
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
}
let po = permittedOperations[this._msg.op];
if (!po){
- return gpgme_error('MSG_WRONG_OP');
+ throw gpgme_error('MSG_WRONG_OP');
}
let poparam = null;
if (po.required.hasOwnProperty(param)){
@@ -129,7 +129,7 @@ export class GPGME_Message {
} else if (po.optional.hasOwnProperty(param)){
poparam = po.optional[param];
} else {
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
}
// check incoming value for correctness
let checktype = function (val){
@@ -139,24 +139,24 @@ export class GPGME_Message {
&& val.length > 0) {
return true;
}
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
case 'number':
if (
poparam.allowed.indexOf('number') >= 0
&& isNaN(value) === false){
return true;
}
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
case 'boolean':
if (poparam.allowed.indexOf('boolean') >= 0){
return true;
}
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
case 'object':
if (Array.isArray(val)){
if (poparam.array_allowed !== true){
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
}
for (let i=0; i < val.length; i++){
let res = checktype(val[i]);
@@ -171,13 +171,13 @@ export class GPGME_Message {
if (poparam.allowed.indexOf('Uint8Array') >= 0){
return true;
}
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
} else {
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
}
break;
default:
- return gpgme_error('PARAM_WRONG');
+ throw gpgme_error('PARAM_WRONG');
}
};
let typechecked = checktype(value);