From 6c9b42369f7a62e3d92542e2f4ef593bfe327419 Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Fri, 27 Sep 2024 20:04:13 +0200 Subject: [PATCH] Fix JWT signature error for initial fetch request --- web-app/src/hooks.server.ts | 9 ++++----- web-app/src/routes/+layout.svelte | 10 +++++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/web-app/src/hooks.server.ts b/web-app/src/hooks.server.ts index 574ebb3..73cf58b 100644 --- a/web-app/src/hooks.server.ts +++ b/web-app/src/hooks.server.ts @@ -5,7 +5,8 @@ export const handle = async ({ event, resolve }) => { if (!event.url.pathname.startsWith("/api/")) { const userData = await apiRequest(event.fetch, `${API_BASE_PREFIX}/account`, "GET", { headers: { - Accept: "application/vnd.pgrst.object+json" + Accept: "application/vnd.pgrst.object+json", + Authorization: `Bearer ${event.cookies.get("session_token")}` }, returnData: true }); @@ -27,10 +28,8 @@ export const handle = async ({ event, resolve }) => { }; export const handleFetch = async ({ event, request, fetch }) => { - const sessionToken = event.cookies.get("session_token"); - - if (sessionToken) { - request.headers.set("Authorization", `Bearer ${sessionToken}`); + if (event.locals.user) { + request.headers.set("Authorization", `Bearer ${event.cookies.get("session_token")}`); } return fetch(request); diff --git a/web-app/src/routes/+layout.svelte b/web-app/src/routes/+layout.svelte index 7f3e807..5dac755 100644 --- a/web-app/src/routes/+layout.svelte +++ b/web-app/src/routes/+layout.svelte @@ -42,10 +42,14 @@