From 3691bd6f8f03628560dba822d747a388dc135fad Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Fri, 20 Dec 2024 11:02:48 -0500 Subject: [PATCH] check user is present A session can exist without a user, if the user was recently deleted --- src/lib/server/auth/index.ts | 4 ++-- src/routes/+page.server.ts | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/lib/server/auth/index.ts b/src/lib/server/auth/index.ts index 1e0c16f..f359a9b 100644 --- a/src/lib/server/auth/index.ts +++ b/src/lib/server/auth/index.ts @@ -11,7 +11,7 @@ export async function validateSession(event: ServerLoadEvent) { where: { id: sessionId }, include: { user: true }, }); - if (!session) { + if (!session || !session.user) { redirect(300, '/login'); } const expiry = session.expiresAt; @@ -19,4 +19,4 @@ export async function validateSession(event: ServerLoadEvent) { redirect(300, '/login'); } return session; -} +} \ No newline at end of file diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index c0f6e71..fe02d45 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -1,10 +1,5 @@ import { validateSession } from '$lib/server/auth/index.js'; export async function load(event) { - const { - user: { password: _, ...rest }, - } = await validateSession(event); - return { - user: rest, - }; -} + await validateSession(event); +} \ No newline at end of file