prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix saving to a new group

Browse source
This commit is contained in:
varjolintu 2020-06-11 21:13:24 +03:00
parent 76a3e58203
commit a744d81f41
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
keepassxc-browser/content/banner.js
View file

@ -144,27 +144,7 @@ kpxcBanner.saveNewCredentials = async function(credentials = {}) {
action: 'get_database_groups'
});
// Only the Root group and no KeePassXC-Browser passwords -> save to default
// Or when default group is not set and defaultGroupAskAlways is disabled -> save to default
if ((result.groups === undefined || (result.groups.length > 0 && result.groups[0].children.length === 0))
|| (!result.defaultGroupAlwaysAsk && (result.defaultGroup === '' || result.defaultGroup === DEFAULT_BROWSER_GROUP))) {
const args = [ credentials.username, credentials.password, credentials.url ];
// If root group is defined by the user, and there's no default browser group, save the credentials to the root group
if (result.groups !== undefined
&& result.groups.length > 0
&& result.groups[0].children.length === 0
&& result.defaultGroup.toLowerCase() === 'root') {
args.push(result.groups[0].name, result.groups[0].uuid);
}
const res = await browser.runtime.sendMessage({
action: 'add_credentials',
args: args
});
kpxcBanner.verifyResult(res);
return;
} else if (!result.defaultGroupAlwaysAsk && (result.defaultGroup !== '' || result.defaultGroup !== DEFAULT_BROWSER_GROUP)) {
if (!result.defaultGroupAlwaysAsk && (result.defaultGroup !== '' && result.defaultGroup !== DEFAULT_BROWSER_GROUP)) {
// Another group name has been specified
const [ gname, guuid ] = kpxcBanner.getDefaultGroup(result.groups[0].children, result.defaultGroup);
if (gname === '' && guuid === '') {
@ -197,6 +177,27 @@ kpxcBanner.saveNewCredentials = async function(credentials = {}) {
});
kpxcBanner.verifyResult(res);
return;
} else if ((result.groups === undefined || (result.groups.length > 0 && result.groups[0].children.length === 0))
|| (!result.defaultGroupAlwaysAsk && (result.defaultGroup === '' || result.defaultGroup === DEFAULT_BROWSER_GROUP))) {
// Only the Root group and no KeePassXC-Browser passwords -> save to default
// Or when default group is not set and defaultGroupAskAlways is disabled -> save to default
const args = [ credentials.username, credentials.password, credentials.url ];
// If root group is defined by the user, and there's no default browser group, save the credentials to the root group
if (result.groups !== undefined
&& result.groups.length > 0
&& result.groups[0].children.length === 0
&& (result.defaultGroup.toLowerCase() === 'root'
|| result.defaultGroup === '/')) {
args.push(result.groups[0].name, result.groups[0].uuid);
}
const res = await browser.runtime.sendMessage({
action: 'add_credentials',
args: args
});
kpxcBanner.verifyResult(res);
return;
}
const addChildren = function(group, parentElement, depth) {