From 5323974d4d7c16474b5f4413b98b256c7aa255bd Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Mon, 26 Oct 2026 13:14:22 +0100 Subject: [PATCH] Handle server authentication through fetch hook. --- web/src/hooks.server.ts | 28 +++++++++++++++++++ web/src/lib/data/auth.ts | 4 +-- web/src/lib/data/index.ts | 6 ++-- web/src/lib/models/auth.ts | 4 +-- web/src/lib/utilities/fetch.ts | 7 ----- .../scheduled-transactions/+page.server.ts | 14 ++-------- 6 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 web/src/hooks.server.ts delete mode 100644 web/src/lib/utilities/fetch.ts diff --git a/web/src/hooks.server.ts b/web/src/hooks.server.ts new file mode 100644 index 0000000..0f2cd5c --- /dev/null +++ b/web/src/hooks.server.ts @@ -0,0 +1,28 @@ +import { serverHostname, serverPort } from '#lib/data/index.ts'; +import type { Cookies } from '@sveltejs/kit'; +import type { Token } from '#lib/models/auth.ts'; +import type { HandleFetch } from '@sveltejs/kit/hooks'; + +export const handleFetch: HandleFetch = async ({ event, request, fetch }) => { + if (isServerApiRequest(request)) { + const token = getTokenCookie(event.cookies); + if (token) setAuthorizationHeader(request.headers, token); + } + return fetch(request); +}; + +function isServerApiRequest(request: Request): boolean { + const url = new URL(request.url); + return ( + url.hostname === serverHostname && url.port === serverPort && url.pathname.startsWith('/api') + ); +} + +function getTokenCookie(cookies: Cookies): Token | null { + const tokenJson = cookies.get('token'); + return tokenJson ? JSON.parse(tokenJson) : null; +} + +function setAuthorizationHeader(headers: Headers, token: Token): void { + headers.set('Authorization', `Bearer ${token.access_token}`); +} diff --git a/web/src/lib/data/auth.ts b/web/src/lib/data/auth.ts index 1b02e78..7d2c56b 100644 --- a/web/src/lib/data/auth.ts +++ b/web/src/lib/data/auth.ts @@ -1,7 +1,7 @@ import { serverBasePath } from '.'; -import type { TokenRequest, TokenResponse } from '../models/auth'; +import type { TokenRequest, Token } from '../models/auth'; -export async function login(token: TokenRequest, f: typeof fetch): Promise { +export async function login(token: TokenRequest, f: typeof fetch): Promise { return f(`${serverBasePath}/auth/token`, { method: 'POST', headers: { diff --git a/web/src/lib/data/index.ts b/web/src/lib/data/index.ts index 07c8fac..d77ef0d 100644 --- a/web/src/lib/data/index.ts +++ b/web/src/lib/data/index.ts @@ -1,3 +1,3 @@ -export const serverHostname = 'http://localhost'; -export const serverPort = 3000; -export const serverBasePath = `${serverHostname}:${serverPort}/api`; +export const serverHostname = 'localhost'; +export const serverPort = '3000'; +export const serverBasePath = `http://${serverHostname}:${serverPort}/api`; diff --git a/web/src/lib/models/auth.ts b/web/src/lib/models/auth.ts index 28ea1ad..1201879 100644 --- a/web/src/lib/models/auth.ts +++ b/web/src/lib/models/auth.ts @@ -4,9 +4,7 @@ export type ClientCredentials = { client_secret: string; }; -export type TokenRequest = ClientCredentials; - -export type TokenResponse = { +export type Token = { access_token: string; token_type: string; expires_in: number; diff --git a/web/src/lib/utilities/fetch.ts b/web/src/lib/utilities/fetch.ts deleted file mode 100644 index 8cdbe66..0000000 --- a/web/src/lib/utilities/fetch.ts +++ /dev/null @@ -1,7 +0,0 @@ -export function authenticatedFetch(token: string, f: typeof fetch): typeof fetch { - return (input: URL | RequestInfo, init?: RequestInit | undefined) => { - const headers = new Headers(init?.headers || {}); - headers.set('Authorization', `Bearer ${token}`); - return f(input, { ...init, headers }); - }; -} diff --git a/web/src/routes/scheduled-transactions/+page.server.ts b/web/src/routes/scheduled-transactions/+page.server.ts index 26183ef..67e1354 100644 --- a/web/src/routes/scheduled-transactions/+page.server.ts +++ b/web/src/routes/scheduled-transactions/+page.server.ts @@ -1,18 +1,8 @@ import type { PageServerLoad } from './$types'; import { listScheduledTransactions } from '#lib/data/scheduled-transactions.ts'; -import type { TokenResponse } from '#lib/models/auth.ts'; -import { authenticatedFetch } from '#lib/utilities/fetch.ts'; - -export const load: PageServerLoad = async ({ cookies, fetch }) => { - const token = cookies.get('token'); - if (!token) throw new Error('Not authenticated'); - - const parsedToken = JSON.parse(token) as TokenResponse; - if (!parsedToken.access_token) throw new Error('Not authenticated'); +export const load: PageServerLoad = async ({ fetch }) => { return { - scheduledTransactions: listScheduledTransactions( - authenticatedFetch(parsedToken.access_token, fetch) - ) + scheduledTransactions: listScheduledTransactions(fetch) }; };