Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-08 09:32:07 +01:00
Code Issues Projects Releases Wiki Activity

cleanup autofill service a bit

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-25 21:55:52 -04:00
parent 0bcc764274
commit 1c3143867b
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/services/autofillService.js
View File

@ -78,16 +78,8 @@ function initAutofill() {
};
var isoProvinces = {
alberta: 'AB',
'british columbia': 'BC',
manitoba: 'MB',
'new brunswick': 'NB',
'newfoundland and labrador': 'NL',
'nova scotia': 'NS',
ontario: 'ON',
'prince edward island': 'PE',
quebec: 'QC',
saskatchewan: 'SK'
alberta: 'AB', 'british columbia': 'BC', manitoba: 'MB', 'new brunswick': 'NB', 'newfoundland and labrador': 'NL',
'nova scotia': 'NS', ontario: 'ON', 'prince edward island': 'PE', quebec: 'QC', saskatchewan: 'SK'
};
AutofillService.prototype.getFormsWithPasswordFields = function (pageDetails) {
@ -95,25 +87,29 @@ function initAutofill() {
formData = [];
passwordFields = loadPasswordFields(pageDetails, true);
if (passwordFields.length) {
for (var formKey in pageDetails.forms) {
for (var i = 0; i < passwordFields.length; i++) {
var pf = passwordFields[i];
if (formKey === pf.form) {
var uf = findUsernameField(pageDetails, pf, false, false);
if (!uf) {
// not able to find any viewable username fields. maybe there are some "hidden" ones?
uf = findUsernameField(pageDetails, pf, true, false);
}
if (!passwordFields.length) {
return formData;
}
formData.push({
form: pageDetails.forms[formKey],
password: pf,
username: uf
});
break;
}
for (var formKey in pageDetails.forms) {
for (var i = 0; i < passwordFields.length; i++) {
var pf = passwordFields[i];
if (formKey !== pf.form) {
continue;
}
var uf = findUsernameField(pageDetails, pf, false, false);
if (!uf) {
// not able to find any viewable username fields. maybe there are some "hidden" ones?
uf = findUsernameField(pageDetails, pf, true, false);
}
formData.push({
form: pageDetails.forms[formKey],
password: pf,
username: uf
});
break;
}
}