Add high level error messages to public api.

This commit is contained in:
Tankred Hase 2014-10-01 22:20:28 +02:00
parent bdbd7819f4
commit bf1cb6d521
2 changed files with 13 additions and 7 deletions
src
test/worker

View File

@ -73,7 +73,8 @@ function encryptMessage(keys, text) {
msg = msg.encrypt(keys); msg = msg.encrypt(keys);
armored = armor.encode(enums.armor.message, msg.packets.write()); armored = armor.encode(enums.armor.message, msg.packets.write());
return armored; return armored;
});
}).catch(onError.bind(null, 'Error encrypting message!'));
} }
/** /**
@ -100,7 +101,8 @@ function signAndEncryptMessage(publicKeys, privateKey, text) {
msg = msg.encrypt(publicKeys); msg = msg.encrypt(publicKeys);
armored = armor.encode(enums.armor.message, msg.packets.write()); armored = armor.encode(enums.armor.message, msg.packets.write());
return armored; return armored;
});
}).catch(onError.bind(null, 'Error signing and encrypting message!'));
} }
/** /**
@ -119,7 +121,8 @@ function decryptMessage(privateKey, msg) {
return execute(function() { return execute(function() {
msg = msg.decrypt(privateKey); msg = msg.decrypt(privateKey);
return msg.getText(); return msg.getText();
});
}).catch(onError.bind(null, 'Error decrypting message!'));
} }
/** /**
@ -150,7 +153,8 @@ function decryptAndVerifyMessage(privateKey, publicKeys, msg) {
return result; return result;
} }
return null; return null;
});
}).catch(onError.bind(null, 'Error decrypting and verifying message!'));
} }
/** /**
@ -173,7 +177,8 @@ function signClearMessage(privateKeys, text) {
var cleartextMessage = new cleartext.CleartextMessage(text); var cleartextMessage = new cleartext.CleartextMessage(text);
cleartextMessage.sign(privateKeys); cleartextMessage.sign(privateKeys);
return cleartextMessage.armor(); return cleartextMessage.armor();
});
}).catch(onError.bind(null, 'Error signing cleartext message!'));
} }
/** /**
@ -201,7 +206,8 @@ function verifyClearSignedMessage(publicKeys, msg) {
result.text = msg.getText(); result.text = msg.getText();
result.signatures = msg.verify(publicKeys); result.signatures = msg.verify(publicKeys);
return result; return result;
});
}).catch(onError.bind(null, 'Error verifying cleartext signed message!'));
} }
/** /**

View File

@ -348,7 +348,7 @@ describe('High level API', function() {
it('Signing with not decrypted key gives error', function (done) { it('Signing with not decrypted key gives error', function (done) {
openpgp.signClearMessage([privKeyRSA], plaintext).catch(function(err) { openpgp.signClearMessage([privKeyRSA], plaintext).catch(function(err) {
expect(err).to.exist; expect(err).to.exist;
expect(err.message).to.equal('Private key is not decrypted.'); expect(err.message).to.equal('Error signing cleartext message!');
done(); done();
}); });
}); });