refactor: Replace middleware implementation with proxy function

- Deleted the old middleware file and integrated its functionality into the proxy function for streamlined authentication and role-based access control.
- Updated debug logging to enhance visibility into token presence and user details during the authentication process.
- Adjusted middleware configuration to match all request paths while excluding static files and specific assets.
This commit is contained in:
ilia 2026-01-04 13:21:51 -05:00
parent 395869c6c0
commit 014bb983ad
2 changed files with 14 additions and 75 deletions

View File

@ -1,67 +0,0 @@
import { NextResponse } from "next/server"
import type { NextRequest } from "next/server"
import { getToken } from "next-auth/jwt"
export async function middleware(request: NextRequest) {
const pathname = request.nextUrl.pathname
// Public routes - allow access
if (pathname === "/login" || pathname.startsWith("/api/auth")) {
return NextResponse.next()
}
// Get token (works in Edge runtime)
// getToken automatically detects the cookie name from NextAuth config
const token = await getToken({
req: request,
secret: process.env.NEXTAUTH_SECRET
})
// Debug logging for production troubleshooting
if (!token) {
console.log("Middleware: No token found", {
pathname,
cookieHeader: request.headers.get("cookie")?.substring(0, 200),
origin: request.headers.get("origin"),
referer: request.headers.get("referer")
})
} else {
console.log("Middleware: Token found", {
pathname,
tokenId: token.id,
tokenRole: token.role,
tokenEmail: token.email
})
}
// Protected routes - require authentication
if (!token) {
const loginUrl = new URL("/login", request.url)
loginUrl.searchParams.set("callbackUrl", pathname)
return NextResponse.redirect(loginUrl)
}
// Admin routes - require ADMIN role
if (pathname.startsWith("/admin")) {
if (token.role !== "ADMIN") {
return NextResponse.redirect(new URL("/", request.url))
}
}
return NextResponse.next()
}
export const config = {
matcher: [
/*
* Match all request paths except for the ones starting with:
* - _next/static (static files)
* - _next/image (image optimization files)
* - _next/rsc (RSC payload requests)
* - _next/webpack (webpack chunks)
* - favicon.ico (favicon file)
* - public folder
*/
"/((?!_next/static|_next/image|_next/rsc|_next/webpack|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)",
],
}

View File

@ -2,7 +2,7 @@ import { NextResponse } from "next/server"
import type { NextRequest } from "next/server" import type { NextRequest } from "next/server"
import { getToken } from "next-auth/jwt" import { getToken } from "next-auth/jwt"
export async function proxy(request: NextRequest) { export async function middleware(request: NextRequest) {
const pathname = request.nextUrl.pathname const pathname = request.nextUrl.pathname
// Public routes - allow access // Public routes - allow access
@ -17,14 +17,20 @@ export async function proxy(request: NextRequest) {
secret: process.env.NEXTAUTH_SECRET secret: process.env.NEXTAUTH_SECRET
}) })
// Debug logging (remove in production if not needed) // Debug logging for production troubleshooting
if (process.env.NODE_ENV !== "production") { if (!token) {
console.log("Middleware token check:", { console.log("Middleware: No token found", {
pathname, pathname,
hasToken: !!token, cookieHeader: request.headers.get("cookie")?.substring(0, 200),
tokenId: token?.id, origin: request.headers.get("origin"),
tokenRole: token?.role, referer: request.headers.get("referer")
cookieHeader: request.headers.get("cookie")?.substring(0, 100) })
} else {
console.log("Middleware: Token found", {
pathname,
tokenId: token.id,
tokenRole: token.role,
tokenEmail: token.email
}) })
} }