feat: Implement session debugging and cookie management in API
- Added a new API route for session management that retrieves session information and cookie data. - Enhanced error handling to provide detailed error messages in case of failures. - Updated login page to support callback URLs for redirection after successful login. - Introduced debug logging for session creation and token validation in non-production environments.
This commit is contained in:
parent
c0a1ed146f
commit
ea7da85d5e
51
app/api/debug/session/route.ts
Normal file
51
app/api/debug/session/route.ts
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
import { auth } from "@/lib/auth"
|
||||||
|
import { NextResponse } from "next/server"
|
||||||
|
import { cookies } from "next/headers"
|
||||||
|
|
||||||
|
export async function GET(request: Request) {
|
||||||
|
try {
|
||||||
|
const session = await auth()
|
||||||
|
const cookieStore = await cookies()
|
||||||
|
const cookieHeader = request.headers.get("cookie") || ""
|
||||||
|
|
||||||
|
// Parse cookies from header
|
||||||
|
const cookieMap: Record<string, string> = {}
|
||||||
|
cookieHeader.split(";").forEach(cookie => {
|
||||||
|
const [key, value] = cookie.trim().split("=")
|
||||||
|
if (key && value) {
|
||||||
|
cookieMap[key] = decodeURIComponent(value)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
const sessionToken = cookieStore.get("__Secure-authjs.session-token")?.value ||
|
||||||
|
cookieMap["__Secure-authjs.session-token"] ||
|
||||||
|
"NOT FOUND"
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
hasSession: !!session,
|
||||||
|
session: session ? {
|
||||||
|
user: session.user,
|
||||||
|
expires: session.expires,
|
||||||
|
} : null,
|
||||||
|
cookies: {
|
||||||
|
sessionTokenPresent: !!sessionToken && sessionToken !== "NOT FOUND",
|
||||||
|
sessionTokenPreview: sessionToken !== "NOT FOUND" ? `${sessionToken.substring(0, 20)}...` : "NOT FOUND",
|
||||||
|
allCookieKeys: Object.keys(cookieMap),
|
||||||
|
cookieHeaderLength: cookieHeader.length,
|
||||||
|
},
|
||||||
|
env: {
|
||||||
|
hasSecret: !!process.env.NEXTAUTH_SECRET,
|
||||||
|
nextAuthUrl: process.env.NEXTAUTH_URL,
|
||||||
|
nodeEnv: process.env.NODE_ENV,
|
||||||
|
authTrustHost: process.env.AUTH_TRUST_HOST,
|
||||||
|
secretLength: process.env.NEXTAUTH_SECRET?.length || 0,
|
||||||
|
secretPreview: process.env.NEXTAUTH_SECRET ? `${process.env.NEXTAUTH_SECRET.substring(0, 10)}...` : "missing",
|
||||||
|
}
|
||||||
|
})
|
||||||
|
} catch (error) {
|
||||||
|
return NextResponse.json({
|
||||||
|
error: error instanceof Error ? error.message : "Unknown error",
|
||||||
|
stack: error instanceof Error ? error.stack : undefined
|
||||||
|
}, { status: 500 })
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -23,11 +23,19 @@ export default function LoginPage() {
|
|||||||
redirect: false,
|
redirect: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
console.log("Sign in result:", { result, error: result?.error, ok: result?.ok, url: result?.url })
|
||||||
|
|
||||||
if (result?.error) {
|
if (result?.error) {
|
||||||
setError("Invalid email or password")
|
setError("Invalid email or password")
|
||||||
} else {
|
} else if (result?.ok) {
|
||||||
router.push("/photos")
|
// Check if there's a callback URL in the query params
|
||||||
|
const params = new URLSearchParams(window.location.search)
|
||||||
|
const callbackUrl = params.get("callbackUrl") || "/photos"
|
||||||
|
console.log("Redirecting to:", callbackUrl)
|
||||||
|
router.push(callbackUrl)
|
||||||
router.refresh()
|
router.refresh()
|
||||||
|
} else {
|
||||||
|
setError("Login failed. Please try again.")
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
setError("An error occurred. Please try again.")
|
setError("An error occurred. Please try again.")
|
||||||
|
|||||||
35
lib/auth.ts
35
lib/auth.ts
@ -10,6 +10,7 @@ if (!nextAuthSecret) {
|
|||||||
|
|
||||||
export const { handlers, auth, signIn, signOut } = NextAuth({
|
export const { handlers, auth, signIn, signOut } = NextAuth({
|
||||||
trustHost: true,
|
trustHost: true,
|
||||||
|
debug: process.env.NODE_ENV !== "production",
|
||||||
providers: [
|
providers: [
|
||||||
Credentials({
|
Credentials({
|
||||||
name: "Credentials",
|
name: "Credentials",
|
||||||
@ -66,6 +67,10 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
|
|||||||
async session({ session, token }) {
|
async session({ session, token }) {
|
||||||
// Always ensure session.user exists when token exists
|
// Always ensure session.user exists when token exists
|
||||||
if (token && (token.id || token.email)) {
|
if (token && (token.id || token.email)) {
|
||||||
|
// Ensure session.user is always an object
|
||||||
|
if (!session.user) {
|
||||||
|
session.user = {} as any
|
||||||
|
}
|
||||||
session.user = {
|
session.user = {
|
||||||
...session.user,
|
...session.user,
|
||||||
id: token.id as string,
|
id: token.id as string,
|
||||||
@ -73,8 +78,22 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
|
|||||||
name: (token.name as string) || session.user?.name || "",
|
name: (token.name as string) || session.user?.name || "",
|
||||||
role: token.role as string,
|
role: token.role as string,
|
||||||
}
|
}
|
||||||
} else if (process.env.NODE_ENV !== "production") {
|
if (process.env.NODE_ENV !== "production") {
|
||||||
console.warn("Session callback: token missing or invalid", { token, session })
|
console.log("Session callback: session created", {
|
||||||
|
userId: token.id,
|
||||||
|
email: token.email,
|
||||||
|
hasUser: !!session.user,
|
||||||
|
userKeys: session.user ? Object.keys(session.user) : []
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.warn("Session callback: token missing or invalid", {
|
||||||
|
hasToken: !!token,
|
||||||
|
tokenKeys: token ? Object.keys(token) : [],
|
||||||
|
hasSession: !!session,
|
||||||
|
sessionKeys: session ? Object.keys(session) : [],
|
||||||
|
sessionUser: session?.user
|
||||||
|
})
|
||||||
}
|
}
|
||||||
return session
|
return session
|
||||||
}
|
}
|
||||||
@ -84,6 +103,18 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
|
|||||||
},
|
},
|
||||||
session: {
|
session: {
|
||||||
strategy: "jwt",
|
strategy: "jwt",
|
||||||
|
maxAge: 30 * 24 * 60 * 60, // 30 days
|
||||||
|
},
|
||||||
|
cookies: {
|
||||||
|
sessionToken: {
|
||||||
|
name: `__Secure-authjs.session-token`,
|
||||||
|
options: {
|
||||||
|
httpOnly: true,
|
||||||
|
sameSite: "lax",
|
||||||
|
path: "/",
|
||||||
|
secure: process.env.NODE_ENV === "production",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
secret: nextAuthSecret,
|
secret: nextAuthSecret,
|
||||||
})
|
})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user