bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-22 11:13:46 +00:00
Code Issues Releases Wiki Activity

autofill ui for other types. autofill fixes

Browse Source
This commit is contained in:
Kyle Spearrin
2017-10-17 15:22:16 -04:00
parent cebf913999
commit e87f9e268a
13 changed files with 130 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/services/autofillService.js
View File

@@ -201,7 +201,7 @@ function initAutofill() {
return;
}
if (!tab || !options.login || !options.pageDetails || !options.pageDetails.length) {
if (!tab || !options.cipher || !options.pageDetails || !options.pageDetails.length) {
deferred.reject();
return;
}
@@ -213,20 +213,24 @@ function initAutofill() {
continue;
}
var fillScript = self.generateFillScript(options.pageDetails[i].details, {
username: options.login.username,
password: options.login.password,
fields: options.login.fields,
var fillOptions = {
fields: options.cipher.fields,
skipUsernameOnlyFill: options.skipUsernameOnlyFill || false
});
};
if (options.cipher.login) {
fillOptions.username = options.cipher.login.username;
fillOptions.password = options.cipher.login.password;
}
var fillScript = self.generateFillScript(options.pageDetails[i].details, fillOptions);
if (!fillScript || !fillScript.script || !fillScript.script.length) {
continue;
}
didAutofill = true;
if (!options.skipLastUsed) {
self.cipherService.updateLastUsedDate(options.login.id);
self.cipherService.updateLastUsedDate(options.cipher.id);
}
chrome.tabs.sendMessage(tab.id, {
@@ -235,14 +239,14 @@ function initAutofill() {
}, { frameId: options.pageDetails[i].frameId });
if (totpPromise || (options.fromBackground && self.utilsService.isFirefox()) ||
options.skipTotp || !options.login.totp || !self.tokenService.getPremium()) {
options.skipTotp || !options.cipher.login || !options.cipher.login.totp || !self.tokenService.getPremium()) {
continue;
}
totpPromise = self.totpService.isAutoCopyEnabled().then(function (enabled) {
if (enabled) {
/* jshint ignore:start */
return self.totpService.getCode(options.login.totp);
return self.totpService.getCode(options.cipher.login.totp);
/* jshint ignore:end */
}
@@ -300,7 +304,7 @@ function initAutofill() {
}
self.doAutoFill({
login: cipher,
cipher: cipher,
pageDetails: pageDetails,
fromBackground: true,
skipTotp: !fromCommand,

5
src/services/cipherService.js
View File

@@ -260,7 +260,7 @@ function initCipherService() {
});
};
CipherService.prototype.getAllDecryptedForDomain = function (domain) {
CipherService.prototype.getAllDecryptedForDomain = function (domain, includeOtherTypes) {
var self = this;
var eqDomainsPromise = self.settingsService.getEquivalentDomains().then(function (eqDomains) {
@@ -288,6 +288,9 @@ function initCipherService() {
matchingDomains.indexOf(ciphers[i].login.domain) > -1) {
ciphersToReturn.push(ciphers[i]);
}
else if (includeOtherTypes && includeOtherTypes.indexOf(ciphers[i].type) > -1) {
ciphersToReturn.push(ciphers[i]);
}
}
return ciphersToReturn;