1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-23 19:53:43 +00:00

handle browser routing and basic browser template

This commit is contained in:
rr-bw
2024-09-09 14:45:55 -07:00
parent 81a623d998
commit bdd6f9f6df
6 changed files with 62 additions and 9 deletions

View File

@@ -756,6 +756,9 @@
"logIn": {
"message": "Log in"
},
"logInToBitwarden": {
"message": "Log in to Bitwarden"
},
"restartRegistration": {
"message": "Restart registration"
},

View File

@@ -1,6 +1,8 @@
import { Injectable, NgModule } from "@angular/core";
import { ActivatedRouteSnapshot, RouteReuseStrategy, RouterModule, Routes } from "@angular/router";
import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components/environment-selector.component";
import { unauthUiRefreshSwap } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-route-swap";
import {
authGuard,
lockGuard,
@@ -14,6 +16,7 @@ import { extensionRefreshSwap } from "@bitwarden/angular/utils/extension-refresh
import {
AnonLayoutWrapperComponent,
AnonLayoutWrapperData,
LoginComponentV2,
RegistrationFinishComponent,
RegistrationStartComponent,
RegistrationStartSecondaryComponent,
@@ -26,6 +29,7 @@ import { twofactorRefactorSwap } from "../../../../libs/angular/src/utils/two-fa
import { fido2AuthGuard } from "../auth/guards/fido2-auth.guard";
import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component";
import { EnvironmentComponent } from "../auth/popup/environment.component";
import { ExtensionAnonLayoutWrapperComponent } from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
import { HintComponent } from "../auth/popup/hint.component";
import { HomeComponent } from "../auth/popup/home.component";
import { LockComponent } from "../auth/popup/lock.component";
@@ -134,12 +138,6 @@ const routes: Routes = [
canActivate: [fido2AuthGuard],
data: { state: "fido2" },
}),
{
path: "login",
component: LoginComponent,
canActivate: [unauthGuardFn(unauthRouteOverrides)],
data: { state: "login" },
},
{
path: "login-with-device",
component: LoginViaAuthRequestComponent,
@@ -385,6 +383,32 @@ const routes: Routes = [
canActivate: [authGuard],
data: { state: "update-temp-password" },
},
...unauthUiRefreshSwap(
LoginComponent,
ExtensionAnonLayoutWrapperComponent,
{
path: "login",
canActivate: [unauthGuardFn(unauthRouteOverrides)],
data: { state: "login" },
},
{
path: "",
children: [
{
path: "login",
canActivate: [unauthGuardFn(unauthRouteOverrides)],
data: {
pageTitle: "logInToBitwarden",
state: "login",
}, // TODO-rr-bw: add `satisfies DataProperties & ExtensionAnonLayoutWrapperData
children: [
{ path: "", component: LoginComponentV2 },
{ path: "", component: EnvironmentSelectorComponent, outlet: "environment-selector" },
],
},
],
},
),
{
path: "",
component: AnonLayoutWrapperComponent,