The minimalistic document archiving platform.
refactor(auth): replace ts-pattern with solid-js Switch for navigation logic (#632)
Corentin Thomassetec33ae629413
diff --git a/apps/papra-client/package.json b/apps/papra-client/package.jsonindex adc3f806..fe2a364b 100644--- a/apps/papra-client/package.json+++ b/apps/papra-client/package.json@@ -48,7 +48,6 @@"solid-js": "^1.9.9","solid-sonner": "^0.2.8","tailwind-merge": "^2.6.0",- "ts-pattern": "^5.7.1","unocss-preset-animations": "^1.3.0","unstorage": "^1.16.0","valibot": "1.0.0-beta.10"diff --git a/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsx b/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsxindex d5621182..5d12dc77 100644--- a/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsx+++ b/apps/papra-client/src/modules/auth/middleware/protected-page.middleware.tsx@@ -1,8 +1,7 @@import type { Component } from 'solid-js';import { Navigate } from '@solidjs/router';-import { Suspense } from 'solid-js';+import { Match, Suspense, Switch } from 'solid-js';import { Dynamic } from 'solid-js/web';-import { match } from 'ts-pattern';import { useSession } from '../auth.services';export function createProtectedPage({ authType, component }: { authType: 'public' | 'private' | 'public-only' | 'admin'; component: Component }) {@@ -13,19 +12,14 @@ export function createProtectedPage({ authType, component }: { authType: 'publicreturn (<Suspense>- {- match({- authType,- isAuthenticated: getIsAuthenticated(),- // isAdmin: user?.roles.includes('admin'),- })-- .with({ authType: 'private', isAuthenticated: false }, () => <Navigate href="/login" />)- .with({ authType: 'public-only', isAuthenticated: true }, () => <Navigate href="/" />)- // .with({ authType: 'admin', isAuthenticated: false }, () => <Navigate href="/login" />)- // .with({ authType: 'admin', isAuthenticated: true, isAdmin: false }, () => <Navigate href="/" />)- .otherwise(() => <Dynamic component={component} />)- }+ <Switch fallback={<Dynamic component={component} />}>+ <Match when={authType === 'private' && !getIsAuthenticated()}>+ <Navigate href="/login" />+ </Match>+ <Match when={authType === 'public-only' && getIsAuthenticated()}>+ <Navigate href="/" />+ </Match>+ </Switch></Suspense>);};diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 4ebf75eb..26fde0b7 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -15,18 +15,12 @@ catalogs:'@types/node':specifier: ^24.0.0version: 24.0.10- '@vitest/coverage-v8':- specifier: ^4.0.3- version: 4.0.3better-auth:specifier: 1.3.32version: 1.3.32eslint:specifier: ^9.38.0version: 9.38.0- tsdown:- specifier: ^0.13.4- version: 0.13.4typescript:specifier: ^5.6.2version: 5.8.3@@ -189,9 +183,6 @@ importers:tailwind-merge:specifier: ^2.6.0version: 2.6.0- ts-pattern:- specifier: ^5.7.1- version: 5.7.1unocss-preset-animations:specifier: ^1.3.0version: 1.3.0(@unocss/[email protected])([email protected]([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])))@@ -7386,9 +7377,6 @@ packages:peerDependencies:typescript: '>=4.0.0'- resolution: {integrity: sha512-EGs8PguQqAAUIcQfK4E9xdXxB6s2GK4sJfT/vcc9V1ELIvC4LH/zXu2t/5fajtv6oiRCxdv7BgtVK3vWgROxag==}-resolution: {integrity: sha512-CLDfGgUp7XPswWnezWwsCRxNmgQjhYq3VXHM0/XIRxhVrKw0M1if9agzryh1QS3nxjCROvV+xWxoJO1YctzzWg==}engines: {node: ^18 || >=20}@@ -16400,8 +16388,6 @@ snapshots:picomatch: 4.0.3typescript: 5.8.3- [email protected]: {}-optionalDependencies:typescript: 5.8.3