From 5fcfeffa8499029a95ba1a119ab94de018e8fc2b Mon Sep 17 00:00:00 2001
From: thiloho <123883702+thiloho@users.noreply.github.com>
Date: Wed, 25 Sep 2024 22:05:39 +0200
Subject: [PATCH] Use util fetch for hook as well

---
 web-app/src/hooks.server.ts                   | 19 +++++++------------
 .../articles/[articleId]/+page.server.ts      |  3 +--
 .../[websiteId]/publish/+page.server.ts       |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/web-app/src/hooks.server.ts b/web-app/src/hooks.server.ts
index 992f487..574ebb3 100644
--- a/web-app/src/hooks.server.ts
+++ b/web-app/src/hooks.server.ts
@@ -1,30 +1,25 @@
 import { redirect } from "@sveltejs/kit";
-import { API_BASE_PREFIX } from "$lib/server/utils";
-import type { User } from "$lib/db-schema";
+import { API_BASE_PREFIX, apiRequest } from "$lib/server/utils";
 
 export const handle = async ({ event, resolve }) => {
   if (!event.url.pathname.startsWith("/api/")) {
-    const userData = await event.fetch(`${API_BASE_PREFIX}/account`, {
-      method: "GET",
+    const userData = await apiRequest(event.fetch, `${API_BASE_PREFIX}/account`, "GET", {
       headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${event.cookies.get("session_token")}`,
         Accept: "application/vnd.pgrst.object+json"
-      }
+      },
+      returnData: true
     });
 
-    if (!userData.ok && !["/login", "/register"].includes(event.url.pathname)) {
+    if (!userData.success && !["/login", "/register"].includes(event.url.pathname)) {
       throw redirect(303, "/login");
     }
 
-    if (userData.ok) {
+    if (userData.success) {
       if (["/login", "/register"].includes(event.url.pathname)) {
         throw redirect(303, "/");
       }
 
-      const user: User = await userData.json();
-
-      event.locals.user = user;
+      event.locals.user = userData.data;
     }
   }
 
diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/articles/[articleId]/+page.server.ts b/web-app/src/routes/(authenticated)/website/[websiteId]/articles/[articleId]/+page.server.ts
index 83a1967..e9af2a8 100644
--- a/web-app/src/routes/(authenticated)/website/[websiteId]/articles/[articleId]/+page.server.ts
+++ b/web-app/src/routes/(authenticated)/website/[websiteId]/articles/[articleId]/+page.server.ts
@@ -29,13 +29,12 @@ export const load: PageServerLoad = async ({ parent, params, fetch }) => {
 };
 
 export const actions: Actions = {
-  editArticle: async ({ fetch, cookies, request, params }) => {
+  editArticle: async ({ fetch, request, params }) => {
     const data = await request.formData();
     const coverFile = data.get("cover-image") as File;
 
     const headers: Record<string, string> = {
       "Content-Type": "application/octet-stream",
-      Authorization: `Bearer ${cookies.get("session_token")}`,
       Accept: "application/vnd.pgrst.object+json",
       "X-Website-Id": params.websiteId
     };
diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/publish/+page.server.ts b/web-app/src/routes/(authenticated)/website/[websiteId]/publish/+page.server.ts
index 7542ef3..5abd18e 100644
--- a/web-app/src/routes/(authenticated)/website/[websiteId]/publish/+page.server.ts
+++ b/web-app/src/routes/(authenticated)/website/[websiteId]/publish/+page.server.ts
@@ -105,7 +105,7 @@ export const actions: Actions = {
       },
       body: {
         website_id: params.websiteId,
-        prefix: data.get("domain-prefix") as string
+        prefix: data.get("domain-prefix")
       },
       successMessage: "Successfully created/updated domain prefix"
     });