Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

autofill adjustments

Browse Source
This commit is contained in:
Kyle Spearrin 2017-09-29 15:12:23 -04:00
parent f733fe659b
commit 9aaf080716
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/services/autofillService.js
View File

@ -29,7 +29,7 @@ function initAutofill() {
var passwordFields = [], var passwordFields = [],
passwords = [], passwords = [],
usernames = [], usernames = [],
filledOpIds = [], filledFields = {},
pf = null, pf = null,
username = null, username = null,
i = 0; i = 0;
@ -48,13 +48,13 @@ function initAutofill() {
for (i = 0; i < pageDetails.fields.length; i++) { for (i = 0; i < pageDetails.fields.length; i++) {
var field = pageDetails.fields[i]; var field = pageDetails.fields[i];
if (filledOpIds.indexOf(field.opid) > -1 || !field.viewable) { if (filledFields.hasOwnProperty(field.opid) || !field.viewable) {
continue; continue;
} }
var matchingIndex = findMatchingFieldIndex(field, fieldNames); var matchingIndex = findMatchingFieldIndex(field, fieldNames);
if (matchingIndex > -1) { if (matchingIndex > -1) {
filledOpIds.push(field.opid); filledFields[field.opid] = field;
fillScript.script.push(['click_on_opid', field.opid]); fillScript.script.push(['click_on_opid', field.opid]);
fillScript.script.push(['fill_by_opid', field.opid, fill.fields[matchingIndex].value]); fillScript.script.push(['fill_by_opid', field.opid, fill.fields[matchingIndex].value]);
} }
@ -63,11 +63,7 @@ function initAutofill() {
if (!fill.password || fill.password === '') { if (!fill.password || fill.password === '') {
// No password for this login. Maybe they just wanted to auto-fill some custom fields? // No password for this login. Maybe they just wanted to auto-fill some custom fields?
if (!filledOpIds.length) { fillScript = setFillScriptForFocus(filledFields, fillScript);
return null;
}
fillScript.script.push(['focus_by_opid', filledOpIds[filledOpIds.length - 1]]);
return fillScript; return fillScript;
} }
@ -129,7 +125,7 @@ function initAutofill() {
// No password fields on this page. Let's try to just fuzzy fill the username. // No password fields on this page. Let's try to just fuzzy fill the username.
for (i = 0; i < pageDetails.fields.length; i++) { for (i = 0; i < pageDetails.fields.length; i++) {
var f = pageDetails.fields[i]; var f = pageDetails.fields[i];
if ((f.type === 'text' || f.type === 'email' || f.type === 'tel') && if (f.viewable && (f.type === 'text' || f.type === 'email' || f.type === 'tel') &&
fieldIsFuzzyMatch(f, usernameFieldNames)) { fieldIsFuzzyMatch(f, usernameFieldNames)) {
usernames.push(f); usernames.push(f);
} }
@ -137,29 +133,26 @@ function initAutofill() {
} }
for (i = 0; i < usernames.length; i++) { for (i = 0; i < usernames.length; i++) {
if (filledOpIds.indexOf(usernames[i].opid) > -1) { if (filledFields.hasOwnProperty(usernames[i].opid)) {
continue; continue;
} }
filledOpIds.push(usernames[i].opid); filledFields[usernames[i].opid] = usernames[i];
fillScript.script.push(['click_on_opid', usernames[i].opid]); fillScript.script.push(['click_on_opid', usernames[i].opid]);
fillScript.script.push(['fill_by_opid', usernames[i].opid, fill.username]); fillScript.script.push(['fill_by_opid', usernames[i].opid, fill.username]);
} }
for (i = 0; i < passwords.length; i++) { for (i = 0; i < passwords.length; i++) {
if (filledOpIds.indexOf(passwords[i].opid) > -1) { if (filledFields.hasOwnProperty(passwords[i].opid)) {
continue; continue;
} }
filledOpIds.push(passwords[i].opid); filledFields[passwords[i].opid] = passwords[i];
fillScript.script.push(['click_on_opid', passwords[i].opid]); fillScript.script.push(['click_on_opid', passwords[i].opid]);
fillScript.script.push(['fill_by_opid', passwords[i].opid, fill.password]); fillScript.script.push(['fill_by_opid', passwords[i].opid, fill.password]);
} }
if (filledOpIds.length) { fillScript = setFillScriptForFocus(filledFields, fillScript);
fillScript.script.push(['focus_by_opid', filledOpIds[filledOpIds.length - 1]]);
}
return fillScript; return fillScript;
}; };
@ -393,4 +386,29 @@ function initAutofill() {
return false; return false;
} }
function setFillScriptForFocus(filledFields, fillScript) {
var lastField = null,
lastPasswordField = null;
for (var opid in filledFields) {
if (filledFields.hasOwnProperty(opid) && filledFields[opid].viewable) {
lastField = filledFields[opid];
if (filledFields[opid].type === 'password') {
lastPasswordField = filledFields[opid];
}
}
}
// Prioritize password field over others.
if (lastPasswordField) {
fillScript.script.push(['focus_by_opid', lastPasswordField.opid]);
}
else if (lastField) {
fillScript.script.push(['focus_by_opid', lastField.opid]);
}
return fillScript;
}
} }