IPK-77 Fixed middleware bug

src/lib/actions.ts

@@ -1,5 +1,6 @@
 "use server";
 
+import { User } from "@/types";
 import { cookies } from "next/headers";
 import { ZodError, z } from "zod";
 
@@ -67,7 +68,7 @@ export async function refreshAccessToken() {
   }
 }
 
-export async function getUser() {
+export async function getUser(): Promise<User | null> {
   try {
     if (!cookies().get("accessToken")) {
       throw new Error("Unauthorized");
@@ -85,10 +86,12 @@ export async function getUser() {
       } else if (!response.ok) {
         throw new Error("Network error");
       }
-      return response.json();
+      return response.json() as Promise<User>;
     });
+    return null;
   } catch (error) {
     console.error("There was a problem with the Fetch operation: ", error);
+    return null;
   }
 }
 

src/middleware.ts

@@ -1,13 +1,12 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getUser } from "./lib/actions";
+import { User } from "./types";
 
 export async function middleware(req: NextRequest) {
-  const user = await getUser();
-  if (user?.status !== 200 && user?.status != undefined) {
-    return NextResponse.redirect(new URL("/login", req.url));
-  }
+  const user = (await getUser()) as User;
+  if (user) return NextResponse.redirect(new URL("/login", req.url));
   try {
-    if (req.nextUrl.pathname.startsWith("/admin") && user && "role" in user && user?.role !== "ADMIN") {
+    if (req.nextUrl.pathname.startsWith("/admin") && (user as User).role !== "ADMIN") {
       return NextResponse.redirect(new URL("/unauthorized", req.url));
     }
 

src/types/index.d.ts

@@ -28,3 +28,10 @@ type RegisterInputs = {
   password: string;
   password_confirmation: string;
 };
+
+type User = {
+  id: number;
+  name: string;
+  email: string;
+  role: string;
+};