Merge branch 'development' into staging

Author: itsskofficial

src/client/app/api/auth/token/route.js

@@ -30,6 +30,15 @@ export async function GET() {
 		return NextResponse.json({ accessToken: token })
 	} catch (error) {
 		console.error("Error in /api/auth/token:", error)
+		// If the error is specifically because of a missing session,
+		// return a 401 Unauthorized status, which is more appropriate
+		// and allows the client to handle it by redirecting to login.
+		if (error.code === "missing_session") {
+			return NextResponse.json(
+				{ message: error.message },
+				{ status: 401 }
+			)
+		}
 		return NextResponse.json(
 			{ message: "Internal Server Error", error: error.message },
 			{ status: 500 }

src/client/app/api/user/data/route.js

@@ -15,13 +15,13 @@ export const GET = withAuth(async function GET(request, { authHeader }) {
 			cache: "no-store" // Prevent Next.js from caching this server-side fetch
 		})
 
-		const data = await response.json()
 		if (!response.ok) {
+			const data = await response.json()
 			throw new Error(
 				data.message || "Failed to fetch user data from backend"
 			)
 		}
-
+		const data = await response.json()
 		return NextResponse.json(data)
 	} catch (error) {
 		console.error("API Error in /user/data:", error)