From 4a34daa54cd32fdd0d8e5238d6462040f1522201 Mon Sep 17 00:00:00 2001
From: Aelita4 <kontakt@mikorosa.pl>
Date: Tue, 26 Dec 2023 20:58:30 +0100
Subject: [PATCH] Fix "validateAccessToken" not returning AccessToken object

---
 src/lib/utils/validateAccessToken.ts  |  5 +++--
 src/pages/api/auth/testAccessToken.ts | 11 +----------
 src/pages/api/build/createBuilding.ts |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/lib/utils/validateAccessToken.ts b/src/lib/utils/validateAccessToken.ts
index c6c5ee9..fcfc293 100644
--- a/src/lib/utils/validateAccessToken.ts
+++ b/src/lib/utils/validateAccessToken.ts
@@ -1,6 +1,7 @@
+import type AccessToken from "../../types/AccessToken";
 import { getAccessToken } from "../db/accessTokens";
 
-export default async function validateAccessToken(request: Request): Promise<Response | string> {
+export default async function validateAccessToken(request: Request): Promise<Response | AccessToken> {
     let accessToken = request.url.split("?")[1]?.split("&").filter((x) => x.split("=")[0] === "token")[0].split("=")[1];
 
     const cookies = request.headers.get("Cookie")?.split(";").map((x) => x.trim().split("=")) ?? [];
@@ -41,5 +42,5 @@ export default async function validateAccessToken(request: Request): Promise<Res
         }), { status: 403 }
     );
 
-    return accessToken;
+    return response;
 }
\ No newline at end of file
diff --git a/src/pages/api/auth/testAccessToken.ts b/src/pages/api/auth/testAccessToken.ts
index 5e5bfad..e46e69e 100644
--- a/src/pages/api/auth/testAccessToken.ts
+++ b/src/pages/api/auth/testAccessToken.ts
@@ -6,20 +6,11 @@ export const GET: APIRoute = async({ request }) => {
     const response = await validateAccessToken(request);
     if(response instanceof Response) return response;
 
-    const accessToken = await getAccessToken(response);
-    if(!accessToken) return new Response(
-        JSON.stringify({
-            code: 404,
-            message: "Not Found",
-            data: "Access token not found"
-        }), { status: 404 }
-    );
-
     return new Response(
         JSON.stringify({
             code: 200,
             message: "OK",
-            data: "Access token valid for user " + accessToken.username
+            data: "Access token valid for user " + response.username
         })
     );
 }
\ No newline at end of file
diff --git a/src/pages/api/build/createBuilding.ts b/src/pages/api/build/createBuilding.ts
index 502782a..a5bc6ea 100644
--- a/src/pages/api/build/createBuilding.ts
+++ b/src/pages/api/build/createBuilding.ts
@@ -9,7 +9,7 @@ export const POST: APIRoute = async({ request }) => {
     const response = await validateAccessToken(request);
     if(response instanceof Response) return response;
 
-    const user = (await getAccessToken(response))?.username ?? "";
+    const user = response.username;
     const resources = await getUserResources(user);
     const buildingId = (await request.json()).building;
     const building = buildings.map(cat => cat.buildings.filter(b => b.id === buildingId))[0][0];