fixed entry searching with subdomains

This commit is contained in:
antelle 2021-04-28 18:57:41 +02:00
parent 391f2c9c00
commit 448e19d28c
No known key found for this signature in database
GPG Key ID: 63C9777AAB7C563C
2 changed files with 176 additions and 431 deletions

View File

@ -417,17 +417,30 @@ const ProtocolHandlers = {
const filter = new SelectEntryFilter({ url: payload.url }, appModel, files);
filter.subdomains = false;
const entries = filter.getEntries();
let canReturnFirstEntry = false;
let entries = filter.getEntries();
filter.subdomains = true;
if (!entries.length) {
throw makeError(Errors.noMatches);
canReturnFirstEntry = false;
entries = filter.getEntries().length > 0;
if (!entries.length) {
throw makeError(Errors.noMatches);
}
}
let entry;
if (entries.length === 1 && client.permissions.askGet === 'multiple') {
if (
canReturnFirstEntry &&
entries.length === 1 &&
client.permissions.askGet === 'multiple'
) {
entry = entries[0];
} else {
filter.subdomains = true;
const extName = getHumanReadableExtensionName(client);
const topMessage = Locale.extensionSelectPasswordFor.replace('{}', extName);
const selectEntryView = new SelectEntryView({ filter, topMessage });

586
package-lock.json generated

File diff suppressed because it is too large Load Diff