Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-15 01:11:47 +01:00
Code Issues Projects Releases Wiki Activity

PM-8113 - TwoFactorAuthComp - More refactoring

Browse Source
This commit is contained in:
Jared Snider 2024-12-09 19:20:21 -05:00
parent 9bee399811
commit a5cf61b597
No known key found for this signature in database
GPG Key ID: A149DDD612516286
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
View File

@ -5,7 +5,7 @@ import { Component, Inject, OnDestroy, OnInit, ViewChild } from "@angular/core";
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { FormBuilder, ReactiveFormsModule, Validators } from "@angular/forms";
import { ActivatedRoute, NavigationExtras, Router, RouterLink } from "@angular/router";
import { Subject, takeUntil, lastValueFrom, firstValueFrom } from "rxjs";
import { lastValueFrom, firstValueFrom } from "rxjs";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
@ -88,7 +88,8 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
providerData: any;
@ViewChild("duoComponent") duoComponent!: TwoFactorAuthDuoComponent;
formGroup = this.formBuilder.group({
form = this.formBuilder.group({
token: [
"",
{
@ -100,9 +101,8 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
});
actionButtonText = "";
title = "";
formPromise: Promise<any>;
private destroy$ = new Subject<void>();
formPromise: Promise<any>;
onSuccessfulLoginTde: () => Promise<void>;
onSuccessfulLoginTdeNavigate: () => Promise<void>;
@ -142,9 +142,9 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
async ngOnInit() {
// TODO: should this be in a guard instead of here?
const authenticating = await this.authenticating();
const userIsAuthenticating = await this.userIsAuthenticating();
const twoFactorProviders = await this.twoFactorService.getProviders();
if (!authenticating || twoFactorProviders == null) {
if (!userIsAuthenticating || twoFactorProviders == null) {
await this.router.navigate([this.loginRoute]);
return;
}
@ -157,10 +157,11 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
return providers.get(this.selectedProviderType);
});
this.providerData = providerData;
await this.updateUIToProviderData();
await this.setTitleByTwoFactorProvider();
this.actionButtonText = this.i18nService.t("continue");
this.formGroup.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((value) => {
this.form.valueChanges.pipe(takeUntilDestroyed()).subscribe((value) => {
this.token = value.token;
this.remember = value.remember;
});
@ -254,7 +255,7 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
});
this.providerData = providerData;
this.selectedProviderType = response.type;
await this.updateUIToProviderData();
await this.setTitleByTwoFactorProvider();
}
}
@ -287,7 +288,7 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
return true;
}
async updateUIToProviderData() {
async setTitleByTwoFactorProvider() {
if (this.selectedProviderType == null) {
this.title = this.i18nService.t("loginUnavailable");
return;
@ -455,15 +456,10 @@ export class TwoFactorAuthComponent implements OnInit, OnDestroy {
}
}
private async authenticating(): Promise<boolean> {
private async userIsAuthenticating(): Promise<boolean> {
return (await firstValueFrom(this.loginStrategyService.currentAuthType$)) !== null;
}
private async needsLock(): Promise<boolean> {
const authType = await firstValueFrom(this.loginStrategyService.currentAuthType$);
return authType == AuthenticationType.Sso || authType == AuthenticationType.UserApiKey;
}
async isLinux() {
// TODO: this was extension logic and must be moved to service if platform utils service doesn't have support for this
// return (await BrowserApi.getPlatformInfo()).os === "linux";