Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-07 09:31:31 +01:00
Code Issues Projects Releases Wiki Activity

init u2f param

Browse Source
This commit is contained in:
Kyle Spearrin 2019-07-03 10:37:26 -04:00
parent cfec7c4815
commit 05859a1df3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/angular/components/two-factor.component.ts
View File

@ -27,6 +27,7 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
token: string = ''; token: string = '';
remember: boolean = false; remember: boolean = false;
u2fReady: boolean = false; u2fReady: boolean = false;
initU2f: boolean = true;
providers = TwoFactorProviders; providers = TwoFactorProviders;
providerType = TwoFactorProviderType; providerType = TwoFactorProviderType;
selectedProviderType: TwoFactorProviderType = TwoFactorProviderType.Authenticator; selectedProviderType: TwoFactorProviderType = TwoFactorProviderType.Authenticator;
@ -57,7 +58,7 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
return; return;
} }
if (this.win != null && this.u2fSupported) { if (this.initU2f && this.win != null && this.u2fSupported) {
let customWebVaultUrl: string = null; let customWebVaultUrl: string = null;
if (this.environmentService.baseUrl != null) { if (this.environmentService.baseUrl != null) {
customWebVaultUrl = this.environmentService.baseUrl; customWebVaultUrl = this.environmentService.baseUrl;
@ -102,7 +103,9 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
} }
if (providerData.Challenge != null) { if (providerData.Challenge != null) {
setTimeout(() => {
this.u2f.init(JSON.parse(providerData.Challenge)); this.u2f.init(JSON.parse(providerData.Challenge));
}, 500);
} else { } else {
// TODO: Deprecated. Remove in future version. // TODO: Deprecated. Remove in future version.
const challenges = JSON.parse(providerData.Challenges); const challenges = JSON.parse(providerData.Challenges);