fix: fallback when server is down

Fix DBP-26

Author: pan93412

app/api/auth/login/route.ts

@@ -15,10 +15,10 @@ import { NextRequest, NextResponse } from "next/server";
  * 4. Redirect user to authorization server
  */
 export async function GET(request: NextRequest) {
-  try {
-    // Check if user is already authenticated
-    await redirectIfAuthenticated();
+  // Check if user is already authenticated
+  await redirectIfAuthenticated();
 
+  try {
     // Generate PKCE parameters
     const codeVerifier = generateCodeVerifier();
     const state = generateState();

lib/auth.rsc.ts

@@ -2,8 +2,16 @@ import { redirect } from "next/navigation";
 import { getAuthStatus } from "./auth";
 
 export async function redirectIfAuthenticated(): Promise<void> {
-  const isAuthenticated = await getAuthStatus();
-  if (isAuthenticated.role === "admin") {
+  let role: string | undefined;
+
+  try {
+    const isAuthenticated = await getAuthStatus();
+    role = isAuthenticated.role;
+  } catch (error) {
+    console.error("Error validating auth:", error);
+  }
+
+  if (role === "admin") {
     redirect("/");
   }
 }

middleware.ts

@@ -78,13 +78,13 @@ export async function middleware(request: NextRequest) {
       return NextResponse.json(
         {
           error: "server_error",
-          error_description: "Authentication validation failed",
+          error_description: "Could not validate authentication",
         },
         { status: 500 },
       );
     } else {
       const loginUrl = new URL("/login", request.url);
-      loginUrl.searchParams.set("error", "auth_error");
+      loginUrl.searchParams.set("error", "server_error");
       return NextResponse.redirect(loginUrl);
     }
   }