1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 09:43:23 +00:00

fix: Updated styles and copy, simpler logic

This commit is contained in:
Tomer Shvueli
2021-03-11 11:00:39 -05:00
parent 6eb7106bc5
commit da37add779
3 changed files with 7 additions and 6 deletions

View File

@@ -886,7 +886,7 @@
"message": "If a login form is detected, automatically perform an auto-fill when the web page loads." "message": "If a login form is detected, automatically perform an auto-fill when the web page loads."
}, },
"enableAutoTotpCopyOnAutoFill": { "enableAutoTotpCopyOnAutoFill": {
"message": "Enable Copy to Clipboard of TOTP" "message": "Copy TOTP to clipboard after auto-fill"
}, },
"experimentalFeature": { "experimentalFeature": {
"message": "This is currently an experimental feature. Use at your own risk." "message": "This is currently an experimental feature. Use at your own risk."

View File

@@ -10,8 +10,10 @@
} }
.box { .box {
padding-left: 15px; width: calc(100% - 15px);
padding-bottom: 5px; margin-left: 15px;
margin-bottom: 5px;
border-left: 1px solid #000000;
} }
.box-header { .box-header {

View File

@@ -255,13 +255,12 @@ export default class AutofillService implements AutofillServiceInterface {
} }
const copyTotpOnAutoFill = await this.totpService.isAutoCopyOnAutoFillEnabled(); const copyTotpOnAutoFill = await this.totpService.isAutoCopyOnAutoFillEnabled();
const enableAutoFill = await this.totpService.isAutoCopyEnabled(); const shouldCopyTotp = fromCommand || copyTotpOnAutoFill;
const shouldCopyTotp = copyTotpOnAutoFill && enableAutoFill;
const totpCode = await this.doAutoFill({ const totpCode = await this.doAutoFill({
cipher: cipher, cipher: cipher,
pageDetails: pageDetails, pageDetails: pageDetails,
skipTotp: !fromCommand && !shouldCopyTotp, skipTotp: !shouldCopyTotp,
skipLastUsed: !fromCommand, skipLastUsed: !fromCommand,
skipUsernameOnlyFill: !fromCommand, skipUsernameOnlyFill: !fromCommand,
onlyEmptyFields: !fromCommand, onlyEmptyFields: !fromCommand,