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

fix: Nest sub option in Options page, tie auto fill & auto copy features together

Browse Source
This commit is contained in:
Tomer Shvueli 2021-03-04 09:58:22 -05:00
parent 72d0a439d2
commit 6eb7106bc5
5 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_locales/en/messages.json
View File

@ -886,10 +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 On Page Auto-fill" "message": "Enable Copy to Clipboard of TOTP"
},
"enableAutoTotpCopyOnAutoFillDesc": {
"message": "If login auto-fills on page load and TOTP exists for this login, copy to clipboard without prompt"
}, },
"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."

5
src/popup/scss/box.scss
View File

@ -9,6 +9,11 @@
margin-top: 0; margin-top: 0;
} }
.box {
padding-left: 15px;
padding-bottom: 5px;
}
.box-header { .box-header {
margin: 0 10px 5px 10px; margin: 0 10px 5px 10px;
text-transform: uppercase; text-transform: uppercase;

18
src/popup/settings/options.component.html
View File

@ -23,19 +23,15 @@
{{'enableAutoFillOnPageLoadDesc' | i18n}} {{'enableAutoFillOnPageLoadDesc' | i18n}}
<b>{{'warning' | i18n}}</b>: {{'experimentalFeature' | i18n}} <b>{{'warning' | i18n}}</b>: {{'experimentalFeature' | i18n}}
</div> </div>
</div> <div class="box">
<div class="box"> <div class="box-content">
<div class="box-content"> <div class="box-content-row box-content-row-checkbox" appBoxRow>
<div class="box-content-row box-content-row-checkbox" appBoxRow> <label for="autoCopyTotp">{{'enableAutoTotpCopyOnAutoFill' | i18n}}</label>
<label for="autofill">{{'enableAutoTotpCopyOnAutoFill' | i18n}}</label> <input id="autoCopyTotp" type="checkbox" (change)="updateAutoTotpCopyOnAutoFill()"
<input id="autofill" type="checkbox" (change)="updateAutoTotpCopyOnAutoFill()" [(ngModel)]="enableAutoTotpCopyOnAutoFill" [disabled]="!enableAutoFillOnPageLoad">
[(ngModel)]="enableAutoTotpCopyOnAutoFill" [disabled]="!enableAutoFillOnPageLoad"> </div>
</div> </div>
</div> </div>
<div class="box-footer">
{{'enableAutoTotpCopyOnAutoFillDesc' | i18n}}
<b>{{'warning' | i18n}}</b>: {{'experimentalFeature' | i18n}}
</div>
</div> </div>
<div class="box"> <div class="box">
<div class="box-content"> <div class="box-content">

9
src/popup/settings/options.component.ts
View File

@ -123,18 +123,11 @@ export class OptionsComponent implements OnInit {
async updateAutoFillOnPageLoad() { async updateAutoFillOnPageLoad() {
await this.storageService.save(ConstantsService.enableAutoFillOnPageLoadKey, this.enableAutoFillOnPageLoad); await this.storageService.save(ConstantsService.enableAutoFillOnPageLoadKey, this.enableAutoFillOnPageLoad);
if (!this.enableAutoFillOnPageLoad) {
// If we disable Auto Fill on Page Load, also disable Copying of TOTP
await this.storageService.save(ConstantsService.enableAutoTotpCopyOnAutoFill, false);
// TODO the below reloads the entire extension, I just want to reload the current view, or at least the enable auto totp copy checkbox
window.setTimeout(() => window.location.reload(), 200);
}
this.callAnalytics('Auto-fill Page Load', this.enableAutoFillOnPageLoad); this.callAnalytics('Auto-fill Page Load', this.enableAutoFillOnPageLoad);
} }
async updateAutoTotpCopyOnAutoFill() { async updateAutoTotpCopyOnAutoFill() {
await this.storageService.save(ConstantsService.enableAutoTotpCopyOnAutoFill, this.enableAutoTotpCopyOnAutoFill); await this.storageService.save(ConstantsService.enableAutoTotpCopyOnAutoFillKey, this.enableAutoTotpCopyOnAutoFill);
this.callAnalytics('Auto Copy TOTP on Page Load', this.enableAutoTotpCopyOnAutoFill);
} }
async updateDisableFavicon() { async updateDisableFavicon() {

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

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