GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

js: get default key fixes

Browse Source 
--

* src/Keyring.js: The answer was not parsed correctly, so a config was
  being ignored.

* If no config is set, we return the first non-invalid key with a
  secret, instead of the first key (which may be e.g. an expired one)
This commit is contained in:
Maximilian Krambach 2018-08-16 12:03:30 +02:00
parent aeb065acc9
commit 715cdc0d7d
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lang/js/src/Keyring.js
View File

@ -176,12 +176,13 @@ export class GPGME_Keyring {
let msg = createMessage('config_opt'); let msg = createMessage('config_opt');
msg.setParameter('component', 'gpg'); msg.setParameter('component', 'gpg');
msg.setParameter('option', 'default-key'); msg.setParameter('option', 'default-key');
msg.post().then(function(response){ msg.post().then(function(resp){
if (response.value !== undefined if (resp.option !== undefined
&& response.value.hasOwnProperty('string') && resp.option.hasOwnProperty('value')
&& typeof(response.value.string) === 'string' && resp.option.value.length === 1
){ && resp.option.value[0].hasOwnProperty('string')
me.getKeys(response.value.string,true).then( && typeof(resp.option.value[0].string) === 'string'){
me.getKeys(resp.option.value[0].string, true).then(
function(keys){ function(keys){
if(keys.length === 1){ if(keys.length === 1){
resolve(keys[0]); resolve(keys[0]);
@ -198,7 +199,14 @@ export class GPGME_Keyring {
if (result.keys.length === 0){ if (result.keys.length === 0){
reject(gpgme_error('KEY_NO_DEFAULT')); reject(gpgme_error('KEY_NO_DEFAULT'));
} else { } else {
resolve(result.keys[0]); for (let i=0; i< result.keys.length; i++ ) {
if (result.keys[i].get('invalid') === false) {
resolve(result.keys[i]);
break;
} else if (i === result.keys.length - 1){
reject(gpgme_error('KEY_NO_DEFAULT'));
}
}
} }
}, function(error){ }, function(error){
reject(error); reject(error);