mirror of
https://github.com/bitwarden/browser
synced 2025-12-19 01:33:33 +00:00
Merge branch 'main' into auth/pm-8111/browser-refresh-login-component
This commit is contained in:
@@ -163,7 +163,12 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
|
||||
null,
|
||||
);
|
||||
|
||||
await this.loginStrategyService.logIn(credentials);
|
||||
const authenticationResult = await this.loginStrategyService.logIn(credentials);
|
||||
|
||||
if (authenticationResult?.requiresTwoFactor) {
|
||||
await this.router.navigate(["/2fa"]);
|
||||
return;
|
||||
}
|
||||
|
||||
this.toastService.showToast({
|
||||
variant: "success",
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<span
|
||||
>{{ "alreadyHaveAccount" | i18n }} <a [routerLink]="loginRoute">{{ "logIn" | i18n }}</a></span
|
||||
>{{ "alreadyHaveAccount" | i18n }}
|
||||
<a [routerLink]="loginRoute" bitLink>{{ "logIn" | i18n }}</a></span
|
||||
>
|
||||
|
||||
@@ -4,6 +4,7 @@ import { ActivatedRoute, RouterModule } from "@angular/router";
|
||||
import { firstValueFrom } from "rxjs";
|
||||
|
||||
import { JslibModule } from "@bitwarden/angular/jslib.module";
|
||||
import { LinkModule } from "@bitwarden/components";
|
||||
|
||||
/**
|
||||
* RegistrationStartSecondaryComponentData
|
||||
@@ -17,7 +18,7 @@ export interface RegistrationStartSecondaryComponentData {
|
||||
standalone: true,
|
||||
selector: "auth-registration-start-secondary",
|
||||
templateUrl: "./registration-start-secondary.component.html",
|
||||
imports: [CommonModule, JslibModule, RouterModule],
|
||||
imports: [CommonModule, JslibModule, RouterModule, LinkModule],
|
||||
})
|
||||
export class RegistrationStartSecondaryComponent implements OnInit {
|
||||
loginRoute: string;
|
||||
|
||||
Reference in New Issue
Block a user