1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 08:43:33 +00:00

handle oss-routing swap

This commit is contained in:
rr-bw
2024-09-12 09:19:21 -07:00
parent f9dc91228b
commit c89eb92a63
4 changed files with 70 additions and 44 deletions

View File

@@ -40,7 +40,7 @@
routerLink="/login-with-passkey"
(mousedown)="$event.preventDefault()"
>
<span><i class="bwi bwi-passkey"></i> {{ "loginWithPasskey" | i18n }}</span>
<span><i class="bwi bwi-passkey"></i> {{ "logInWithPasskey" | i18n }}</span>
</a>
</div>

View File

@@ -1,6 +1,7 @@
import { NgModule } from "@angular/core";
import { Route, RouterModule, Routes } from "@angular/router";
import { unauthUiRefreshSwap } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-route-swap";
import {
authGuard,
lockGuard,
@@ -20,6 +21,7 @@ import {
LockIcon,
RegistrationLinkExpiredComponent,
LoginComponentV2,
LoginSecondaryContentComponent,
} from "@bitwarden/auth/angular";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -168,6 +170,51 @@ const routes: Routes = [
},
],
},
...unauthUiRefreshSwap(
AnonLayoutWrapperComponent,
AnonLayoutWrapperComponent,
{
path: "login",
canActivate: [unauthGuardFn()],
children: [
{
path: "",
component: LoginComponent,
},
{
path: "",
component: EnvironmentSelectorComponent,
outlet: "environment-selector",
},
],
data: {
pageTitle: "logIn",
},
},
{
path: "login",
canActivate: [unauthGuardFn()],
data: {
pageTitle: "logInToBitwarden",
} satisfies DataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
component: LoginComponentV2,
},
{
path: "",
component: LoginSecondaryContentComponent,
outlet: "secondary",
},
{
path: "",
component: EnvironmentSelectorComponent,
outlet: "environment-selector",
},
],
},
),
{
path: "",
component: AnonLayoutWrapperComponent,
@@ -269,24 +316,6 @@ const routes: Routes = [
},
],
},
{
path: "login",
canActivate: [unauthGuardFn()],
data: {
pageTitle: "logInToBitwarden",
} satisfies DataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
component: LoginComponentV2,
},
{
path: "",
component: EnvironmentSelectorComponent,
outlet: "environment-selector",
},
],
},
{
path: "lock",
canActivate: [deepLinkGuard(), lockGuard()],

View File

@@ -881,6 +881,9 @@
"createAccount": {
"message": "Create account"
},
"newToBitwarden": {
"message": "New to Bitwarden?"
},
"setAStrongPassword": {
"message": "Set a strong password"
},