diff --git a/package.json b/package.json index 8931a24d..27bc1f9b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,8 @@ "howler": "^2.2.4", "jsonwebtoken": "^9.0.2", "lucide-svelte": "^0.396.0", - "pixi.js": "^8.2.0" + "pixi.js": "^8.2.0", + "zod": "^3.23.8" }, "devDependencies": { "@antfu/eslint-config": "^2.21.1", diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 33645019..ac5ac3ab 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,14 +1,13 @@ import { type Handle, redirect } from '@sveltejs/kit' import jwt from 'jsonwebtoken' import { sequence } from '@sveltejs/kit/hooks' -import { env as privateEnv } from '$env/dynamic/private' -import { env as publicEnv } from '$env/dynamic/public' import type { Profile } from '$lib/types' import { type Locale, defaultLocale, supportedLocales } from '$lib/translations' +import { serverConfig } from '$lib/config' const handleJWT: Handle = ({ event, resolve }) => { - const cookieKey = publicEnv.PUBLIC_COOKIE_KEY ?? '' - const jwtSecret = privateEnv.PRIVATE_JWT_SECRET_KEY + const cookieKey = serverConfig.cookieKey + const jwtSecret = serverConfig.jwtSecretKey const token = event.cookies.get(cookieKey) if (!token || !jwtSecret) { diff --git a/src/lib/components/Footer.svelte b/src/lib/components/Footer.svelte index e6d13dd3..3a1421ff 100644 --- a/src/lib/components/Footer.svelte +++ b/src/lib/components/Footer.svelte @@ -1,25 +1,20 @@