bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

All Clients - Route data typing clean up (#11265)

Browse Source
This commit is contained in:
Jared Snider
2024-09-30 13:51:31 -04:00
committed by GitHub
parent a11c627687
commit ffc97c385d
4 changed files with 141 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
apps/web/src/app/oss-routing.module.ts
View File

@@ -61,7 +61,7 @@ import { VerifyEmailTokenComponent } from "./auth/verify-email-token.component";
import { VerifyRecoverDeleteComponent } from "./auth/verify-recover-delete.component";
import { SponsoredFamiliesComponent } from "./billing/settings/sponsored-families.component";
import { EnvironmentSelectorComponent } from "./components/environment-selector/environment-selector.component";
import { DataProperties } from "./core";
import { RouteDataProperties } from "./core";
import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
import { UserLayoutComponent } from "./layouts/user-layout.component";
import { RequestSMAccessComponent } from "./secrets-manager/secrets-manager-landing/request-sm-access.component";
@@ -79,7 +79,7 @@ const routes: Routes = [
{
path: "",
component: FrontendLayoutComponent,
data: { doNotSaveUrl: true } satisfies DataProperties,
data: { doNotSaveUrl: true } satisfies RouteDataProperties,
children: [
{
path: "",
@@ -90,17 +90,17 @@ const routes: Routes = [
{
path: "login-with-device",
component: LoginViaAuthRequestComponent,
data: { titleId: "loginWithDevice" } satisfies DataProperties,
data: { titleId: "loginWithDevice" } satisfies RouteDataProperties,
},
{
path: "login-with-passkey",
component: LoginViaWebAuthnComponent,
data: { titleId: "loginWithPasskey" } satisfies DataProperties,
data: { titleId: "loginWithPasskey" } satisfies RouteDataProperties,
},
{
path: "admin-approval-requested",
component: LoginViaAuthRequestComponent,
data: { titleId: "adminApprovalRequested" } satisfies DataProperties,
data: { titleId: "adminApprovalRequested" } satisfies RouteDataProperties,
},
{
path: "login-initiated",
@@ -111,7 +111,7 @@ const routes: Routes = [
path: "register",
component: TrialInitiationComponent,
canActivate: [unauthGuardFn()],
data: { titleId: "createAccount" } satisfies DataProperties,
data: { titleId: "createAccount" } satisfies RouteDataProperties,
},
{
path: "trial",
@@ -121,20 +121,23 @@ const routes: Routes = [
{
path: "set-password",
component: SetPasswordComponent,
data: { titleId: "setMasterPassword" } satisfies DataProperties,
data: { titleId: "setMasterPassword" } satisfies RouteDataProperties,
},
{ path: "verify-email", component: VerifyEmailTokenComponent },
{
path: "accept-organization",
canActivate: [deepLinkGuard()],
component: AcceptOrganizationComponent,
data: { titleId: "joinOrganization", doNotSaveUrl: false } satisfies DataProperties,
data: { titleId: "joinOrganization", doNotSaveUrl: false } satisfies RouteDataProperties,
},
{
path: "accept-families-for-enterprise",
component: AcceptFamilySponsorshipComponent,
canActivate: [deepLinkGuard()],
data: { titleId: "acceptFamilySponsorship", doNotSaveUrl: false } satisfies DataProperties,
data: {
titleId: "acceptFamilySponsorship",
doNotSaveUrl: false,
} satisfies RouteDataProperties,
},
{ path: "recover", pathMatch: "full", redirectTo: "recover-2fa" },
{
@@ -147,19 +150,19 @@ const routes: Routes = [
path: "verify-recover-delete-provider",
component: VerifyRecoverDeleteProviderComponent,
canActivate: [unauthGuardFn()],
data: { titleId: "deleteAccount" } satisfies DataProperties,
data: { titleId: "deleteAccount" } satisfies RouteDataProperties,
},
{
path: "update-temp-password",
component: UpdateTempPasswordComponent,
canActivate: [authGuard],
data: { titleId: "updateTempPassword" } satisfies DataProperties,
data: { titleId: "updateTempPassword" } satisfies RouteDataProperties,
},
{
path: "update-password",
component: UpdatePasswordComponent,
canActivate: [authGuard],
data: { titleId: "updatePassword" } satisfies DataProperties,
data: { titleId: "updatePassword" } satisfies RouteDataProperties,
},
{
path: "migrate-legacy-encryption",
@@ -220,8 +223,10 @@ const routes: Routes = [
{
path: "signup",
canActivate: [canAccessFeature(FeatureFlag.EmailVerification), unauthGuardFn()],
data: { pageTitle: "createAccount", titleId: "createAccount" } satisfies DataProperties &
AnonLayoutWrapperData,
data: {
pageTitle: "createAccount",
titleId: "createAccount",
} satisfies RouteDataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
@@ -244,7 +249,7 @@ const routes: Routes = [
pageTitle: "setAStrongPassword",
pageSubtitle: "finishCreatingYourAccountBySettingAPassword",
titleId: "setAStrongPassword",
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
@@ -257,7 +262,7 @@ const routes: Routes = [
data: {
pageTitle: "viewSend",
showReadonlyHostname: true,
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
@@ -301,7 +306,7 @@ const routes: Routes = [
data: {
pageTitle: "enterpriseSingleSignOn",
titleId: "enterpriseSingleSignOn",
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
@@ -362,7 +367,7 @@ const routes: Routes = [
],
data: {
pageTitle: "verifyIdentity",
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
},
{
path: "recover-2fa",
@@ -381,7 +386,7 @@ const routes: Routes = [
data: {
pageTitle: "recoverAccountTwoStep",
titleId: "recoverAccountTwoStep",
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
},
{
path: "accept-emergency",
@@ -390,7 +395,7 @@ const routes: Routes = [
pageTitle: "emergencyAccess",
titleId: "acceptEmergency",
doNotSaveUrl: false,
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
@@ -407,7 +412,7 @@ const routes: Routes = [
data: {
pageTitle: "deleteAccount",
titleId: "deleteAccount",
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
@@ -426,7 +431,7 @@ const routes: Routes = [
data: {
pageTitle: "deleteAccount",
titleId: "deleteAccount",
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
children: [
{
path: "",
@@ -441,7 +446,7 @@ const routes: Routes = [
data: {
pageTitle: "removeMasterPassword",
titleId: "removeMasterPassword",
} satisfies DataProperties & AnonLayoutWrapperData,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
},
{
path: "trial-initiation",
@@ -479,7 +484,7 @@ const routes: Routes = [
{
path: "sends",
component: SendComponent,
data: { titleId: "send" } satisfies DataProperties,
data: { titleId: "send" } satisfies RouteDataProperties,
},
{
path: "sm-landing",
@@ -494,7 +499,7 @@ const routes: Routes = [
{
path: "create-organization",
component: CreateOrganizationComponent,
data: { titleId: "newOrganization" } satisfies DataProperties,
data: { titleId: "newOrganization" } satisfies RouteDataProperties,
},
{
path: "settings",
@@ -503,12 +508,12 @@ const routes: Routes = [
{
path: "account",
component: AccountComponent,
data: { titleId: "myAccount" } satisfies DataProperties,
data: { titleId: "myAccount" } satisfies RouteDataProperties,
},
{
path: "preferences",
component: PreferencesComponent,
data: { titleId: "preferences" } satisfies DataProperties,
data: { titleId: "preferences" } satisfies RouteDataProperties,
},
{
path: "security",
@@ -517,7 +522,7 @@ const routes: Routes = [
{
path: "domain-rules",
component: DomainRulesComponent,
data: { titleId: "domainRules" } satisfies DataProperties,
data: { titleId: "domainRules" } satisfies RouteDataProperties,
},
{
path: "subscription",
@@ -532,19 +537,19 @@ const routes: Routes = [
{
path: "",
component: EmergencyAccessComponent,
data: { titleId: "emergencyAccess" } satisfies DataProperties,
data: { titleId: "emergencyAccess" } satisfies RouteDataProperties,
},
{
path: ":id",
component: EmergencyAccessViewComponent,
data: { titleId: "emergencyAccess" } satisfies DataProperties,
data: { titleId: "emergencyAccess" } satisfies RouteDataProperties,
},
],
},
{
path: "sponsored-families",
component: SponsoredFamiliesComponent,
data: { titleId: "sponsoredFamilies" } satisfies DataProperties,
data: { titleId: "sponsoredFamilies" } satisfies RouteDataProperties,
},
],
},
@@ -559,7 +564,7 @@ const routes: Routes = [
import("./tools/import/import-web.component").then((mod) => mod.ImportWebComponent),
data: {
titleId: "importData",
} satisfies DataProperties,
} satisfies RouteDataProperties,
},
{
path: "export",
@@ -569,12 +574,12 @@ const routes: Routes = [
),
data: {
titleId: "exportVault",
} satisfies DataProperties,
} satisfies RouteDataProperties,
},
{
path: "generator",
component: GeneratorComponent,
data: { titleId: "generator" } satisfies DataProperties,
data: { titleId: "generator" } satisfies RouteDataProperties,
},
],
},