mirror of https://github.com/keeweb/keeweb.git
fixed entry searching with subdomains
This commit is contained in:
parent
391f2c9c00
commit
448e19d28c
|
@ -417,17 +417,30 @@ const ProtocolHandlers = {
|
||||||
const filter = new SelectEntryFilter({ url: payload.url }, appModel, files);
|
const filter = new SelectEntryFilter({ url: payload.url }, appModel, files);
|
||||||
filter.subdomains = false;
|
filter.subdomains = false;
|
||||||
|
|
||||||
const entries = filter.getEntries();
|
let canReturnFirstEntry = false;
|
||||||
|
|
||||||
|
let entries = filter.getEntries();
|
||||||
|
|
||||||
|
filter.subdomains = true;
|
||||||
|
|
||||||
if (!entries.length) {
|
if (!entries.length) {
|
||||||
throw makeError(Errors.noMatches);
|
canReturnFirstEntry = false;
|
||||||
|
|
||||||
|
entries = filter.getEntries().length > 0;
|
||||||
|
if (!entries.length) {
|
||||||
|
throw makeError(Errors.noMatches);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let entry;
|
let entry;
|
||||||
|
|
||||||
if (entries.length === 1 && client.permissions.askGet === 'multiple') {
|
if (
|
||||||
|
canReturnFirstEntry &&
|
||||||
|
entries.length === 1 &&
|
||||||
|
client.permissions.askGet === 'multiple'
|
||||||
|
) {
|
||||||
entry = entries[0];
|
entry = entries[0];
|
||||||
} else {
|
} else {
|
||||||
filter.subdomains = true;
|
|
||||||
const extName = getHumanReadableExtensionName(client);
|
const extName = getHumanReadableExtensionName(client);
|
||||||
const topMessage = Locale.extensionSelectPasswordFor.replace('{}', extName);
|
const topMessage = Locale.extensionSelectPasswordFor.replace('{}', extName);
|
||||||
const selectEntryView = new SelectEntryView({ filter, topMessage });
|
const selectEntryView = new SelectEntryView({ filter, topMessage });
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue