bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 00:33:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into feature-aopl-options

Browse Source
This commit is contained in:
Thomas Rittson
2021-05-18 10:11:40 +10:00
parent df8a253a7d fdccc21699
commit 56e127d20c
7 changed files with 26 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/autofill.service.ts
View File

@@ -211,8 +211,8 @@ export default class AutofillService implements AutofillServiceInterface {
url: tab.url,
}, { frameId: pd.frameId });
if (options.cipher.type !== CipherType.Login || totpPromise || options.skipTotp ||
!options.cipher.login.totp || (!canAccessPremium && !options.cipher.organizationUseTotp)) {
if (options.cipher.type !== CipherType.Login || totpPromise || !options.cipher.login.totp ||
(!canAccessPremium && !options.cipher.organizationUseTotp)) {
return;
}
@@ -263,13 +263,9 @@ export default class AutofillService implements AutofillServiceInterface {
return;
}
const copyTotpOnAutoFill = await this.totpService.isAutoCopyOnAutoFillEnabled();
const shouldCopyTotp = fromCommand || copyTotpOnAutoFill;
const totpCode = await this.doAutoFill({
cipher: cipher,
pageDetails: pageDetails,
skipTotp: !shouldCopyTotp,
skipLastUsed: !fromCommand,
skipUsernameOnlyFill: !fromCommand,
onlyEmptyFields: !fromCommand,