From cf74a711e9b343b2b3eb224a6f9608a8203e80e7 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Fri, 19 Sep 2025 15:11:09 +0200
Subject: [PATCH] Fixes response for protected API routes

---
 web/src/hooks.server.ts |  5 ++++-
 web/src/routes/+page.ts | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/web/src/hooks.server.ts b/web/src/hooks.server.ts
index ddf3e400..1eae4998 100644
--- a/web/src/hooks.server.ts
+++ b/web/src/hooks.server.ts
@@ -4,7 +4,7 @@ import type { Settings } from '$lib/models/settings'
 
 import PocketBase from 'pocketbase'
 import { isRouteProtected } from '$lib/util/authorization_util'
-import { json, redirect, text, type Handle } from '@sveltejs/kit'
+import { error, json, redirect, text, type Handle } from '@sveltejs/kit'
 import { sequence } from '@sveltejs/kit/hooks'
 import { MeiliSearch } from 'meilisearch'
 import { locale } from 'svelte-i18n'
@@ -60,6 +60,9 @@ const auth: Handle = async ({ event, resolve }) => {
 
   // validate the user existence and if the path is acceesible
   if (!pb.authStore.record && isRouteProtected(url)) {
+    if (url.pathname.startsWith("/api")) {
+      return json({ message: "Unauthorized" }, { status: 401 })
+    }
     throw redirect(302, '/login?r=' + url.pathname);
   } else if (pb.authStore.record && url.pathname === "/login") {
     throw redirect(302, '/');
diff --git a/web/src/routes/+page.ts b/web/src/routes/+page.ts
index 95c68cac..cf85734d 100644
--- a/web/src/routes/+page.ts
+++ b/web/src/routes/+page.ts
@@ -2,9 +2,9 @@ import type { Trail } from "$lib/models/trail";
 import { categories_index } from "$lib/stores/category_store";
 import { feed_index } from "$lib/stores/feed_store";
 import { trails_recommend } from "$lib/stores/trail_store";
-import type { ServerLoad } from "@sveltejs/kit";
+import type { Load } from "@sveltejs/kit";
 
-export const load: ServerLoad = async ({ params, locals, fetch }) => {
+export const load: Load = async ({ fetch }) => {
     try {
         await categories_index(fetch)
 
@@ -14,7 +14,9 @@ export const load: ServerLoad = async ({ params, locals, fetch }) => {
         return { trails: trails ?? [], feed }
 
     } catch (e) {
-        console.error(e)
+        if (!(e instanceof Error) || e.message !== "Unauthorized") {
+            console.error(e)
+        }
     }
-    return { trails: [], feed: {items: [], page: 1, perPage: 1, totalItems: 0, totalPages: 0} }
+    return { trails: [], feed: { items: [], page: 1, perPage: 1, totalItems: 0, totalPages: 0 } }
 };
\ No newline at end of file