aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src/Key.js
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-06-06 09:57:41 +0000
committerMaximilian Krambach <[email protected]>2018-06-06 09:57:41 +0000
commit0356a667c5a8b4fdb4404cebb57475ed3f39ade9 (patch)
tree60ca63e53480947677f3a4875dbc739e3e301c9a /lang/js/src/Key.js
parentjs: more Keyring/Key handling (diff)
downloadgpgme-0356a667c5a8b4fdb4404cebb57475ed3f39ade9.tar.gz
gpgme-0356a667c5a8b4fdb4404cebb57475ed3f39ade9.zip
js: implement import/delete Key, some fixes
-- * Keyring.js - implemented importKey: importing one or more armored public key blocks. - implemented deleteKey: deleting a public Key from gpg. * Key.js renamed property Key.armor to Key.armored * Helpers.js: toKeyIDArray does not complain anymore if there are no keys. Not having Keys in e.g. signing keys in encrypt is legitimate and common, the complaints were getting spammy * Errors.js: gpgme_errors now always pass an optional additional message, for easier debugging in minified code * Connection.js: Fix in gpgme-json responses containing objects * eslintrc.json: Start using eslint. A cleanup to conform to it is not done yet * Added further tests for the new functionality
Diffstat (limited to 'lang/js/src/Key.js')
-rw-r--r--lang/js/src/Key.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/js/src/Key.js b/lang/js/src/Key.js
index 454b1912..d85c8b6e 100644
--- a/lang/js/src/Key.js
+++ b/lang/js/src/Key.js
@@ -207,7 +207,7 @@ export class GPGME_Key {
msg.setParameter('armor', true);
msg.setParameter('keys', me._data.fingerprint);
msg.post().then(function(result){
- me._data.armor = result.data;
+ me._data.armored = result.data;
resolve(result.data);
}, function(error){
reject(error);
@@ -280,7 +280,7 @@ export class GPGME_Key {
/**
* Deletes the public Key from the GPG Keyring. Note that a deletion of a
* secret key is not supported by the native backend.
- * @returns {Boolean} Success if key was deleted, rejects with a GPG error
+ * @returns {Promise<Boolean>} Success if key was deleted, rejects with a GPG error
* otherwise
*/
delete(){