From 238c02b328a326f9df6b4cd423150b486992b91f Mon Sep 17 00:00:00 2001
From: glazk0 <43091603+glazk0@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:34:27 +0100
Subject: [PATCH] refactor: better session middleware handling

---
 src/hooks.server.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 7699c9d..8e87a4b 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -5,6 +5,7 @@ import { API_URL } from '$env/static/private';
 import type { User } from '$lib/types';
 
 export const handle: Handle = async ({ event, resolve }) => {
+
 	const session = event.cookies.get('session');
 
 	if (!session) {
@@ -18,13 +19,14 @@ export const handle: Handle = async ({ event, resolve }) => {
 		}
 	});
 
-	if (res.ok) {
-		const user = (await res.json()) as User;
-		event.locals.user = user;
-	} else {
+	if (!res.ok) {
 		event.locals.user = null;
 		event.cookies.delete('session', { path: '/' });
+		return resolve(event);
 	}
 
+	const user: User = await res.json();
+	event.locals.user = user;
+
 	return resolve(event);
 };