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

Update base export component for userVerificationService changes (#552)

Browse Source 
* Use new try/catch pattern in export.component

* Set initial value in VerifyMasterPass component
This commit is contained in:
Thomas Rittson 2021-11-16 19:43:37 +10:00 committed by GitHub
parent 386903f5a9
commit 720967475b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
angular/src/components/export.component.ts
View File

@ -69,7 +69,10 @@ export class ExportComponent implements OnInit {
} }
const secret = this.exportForm.get('secret').value; const secret = this.exportForm.get('secret').value;
if (!await this.userVerificationService.verifyUser(secret)) { try {
await this.userVerificationService.verifyUser(secret);
} catch (e) {
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), e.message);
return; return;
} }

24
angular/src/components/verify-master-password.component.ts
View File

@ -8,7 +8,6 @@ import {
NG_VALUE_ACCESSOR, NG_VALUE_ACCESSOR,
} from '@angular/forms'; } from '@angular/forms';
import { ApiService } from 'jslib-common/abstractions/api.service';
import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service'; import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service';
import { UserVerificationService } from 'jslib-common/abstractions/userVerification.service'; import { UserVerificationService } from 'jslib-common/abstractions/userVerification.service';
@ -40,17 +39,9 @@ export class VerifyMasterPasswordComponent implements ControlValueAccessor, OnIn
async ngOnInit() { async ngOnInit() {
this.usesKeyConnector = await this.keyConnectorService.getUsesKeyConnector(); this.usesKeyConnector = await this.keyConnectorService.getUsesKeyConnector();
this.processChanges(this.secret.value);
this.secret.valueChanges.subscribe(secret => { this.secret.valueChanges.subscribe(secret => this.processChanges(secret));
if (this.onChange == null) {
return;
}
this.onChange({
type: this.usesKeyConnector ? VerificationType.OTP : VerificationType.MasterPassword,
secret: secret,
});
});
} }
async requestOTP() { async requestOTP() {
@ -80,4 +71,15 @@ export class VerifyMasterPasswordComponent implements ControlValueAccessor, OnIn
this.secret.enable(); this.secret.enable();
} }
} }
private processChanges(secret: string) {
if (this.onChange == null) {
return;
}
this.onChange({
type: this.usesKeyConnector ? VerificationType.OTP : VerificationType.MasterPassword,
secret: secret,
});
}
} }