From 72169c4e64495b10229adc088dba1770a69810f1 Mon Sep 17 00:00:00 2001 From: Jared Date: Wed, 25 Jun 2025 13:05:09 +0200 Subject: [PATCH] fixed get user infos for token based routes --- src/routes/(token-based)/+layout.server.ts | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/routes/(token-based)/+layout.server.ts b/src/routes/(token-based)/+layout.server.ts index 6797d53..99517b3 100644 --- a/src/routes/(token-based)/+layout.server.ts +++ b/src/routes/(token-based)/+layout.server.ts @@ -2,15 +2,18 @@ import { checkIfVorgangExists, hasValidToken } from '$lib/server/vorgangService' import { redirect } from '@sveltejs/kit'; import type { PageServerLoad } from './list/[vorgang]/$types'; -export const load: PageServerLoad = async ({params, url}) => { - - const caseId = params.vorgang; - const caseToken = url.searchParams.get('token'); - - const isVorgangValid = await checkIfVorgangExists(caseId); - const isTokenValid = await hasValidToken(caseId, caseToken); +export const load: PageServerLoad = async ({ params, url, locals }) => { + if (locals.user) { + return { + user: locals.user + }; + } - if(!isVorgangValid || !isTokenValid) throw redirect(303, `/anmeldung`); - + const caseId = params.vorgang; + const caseToken = url.searchParams.get('token'); + const isVorgangValid = await checkIfVorgangExists(caseId); + const isTokenValid = await hasValidToken(caseId, caseToken); + + if (!isVorgangValid || !isTokenValid) throw redirect(303, `/anmeldung`); };