Refactor authentication and session management: remove debug logging and streamline session verification
This commit is contained in:
@@ -35,14 +35,6 @@ export async function POST(request: NextRequest) {
|
|||||||
role: user[0].role as 'user' | 'admin',
|
role: user[0].role as 'user' | 'admin',
|
||||||
});
|
});
|
||||||
|
|
||||||
// Debug: Check if cookie was actually set
|
|
||||||
console.log('LOGIN: Session created for user:', user[0].email);
|
|
||||||
console.log('LOGIN: Request headers:', {
|
|
||||||
host: request.headers.get('host'),
|
|
||||||
'x-forwarded-proto': request.headers.get('x-forwarded-proto'),
|
|
||||||
'user-agent': request.headers.get('user-agent')
|
|
||||||
});
|
|
||||||
|
|
||||||
// Log the login activity
|
// Log the login activity
|
||||||
await logActivity({
|
await logActivity({
|
||||||
userId: user[0].id,
|
userId: user[0].id,
|
||||||
|
|||||||
+7
-34
@@ -32,31 +32,19 @@ export async function encrypt(payload: SessionPayload) {
|
|||||||
|
|
||||||
export async function decrypt(session: string | undefined = '') {
|
export async function decrypt(session: string | undefined = '') {
|
||||||
try {
|
try {
|
||||||
if (!session) {
|
if (!session) return null;
|
||||||
console.log('Failed to verify session: No session provided');
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const { payload } = await jwtVerify(session, encodedKey, {
|
const { payload } = await jwtVerify(session, encodedKey, {
|
||||||
algorithms: ['HS256'],
|
algorithms: ['HS256'],
|
||||||
});
|
});
|
||||||
|
|
||||||
const sessionData = {
|
return {
|
||||||
userId: payload.userId as string,
|
userId: payload.userId as string,
|
||||||
email: payload.email as string,
|
email: payload.email as string,
|
||||||
role: payload.role as 'user' | 'admin',
|
role: payload.role as 'user' | 'admin',
|
||||||
expiresAt: new Date(payload.expiresAt as number),
|
expiresAt: new Date(payload.expiresAt as number),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Check if session is expired
|
|
||||||
if (sessionData.expiresAt < new Date()) {
|
|
||||||
console.log('Failed to verify session: Session expired');
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return sessionData;
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('Failed to verify session:', error instanceof Error ? error.message : 'Unknown error');
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -67,26 +55,13 @@ export async function createSession(payload: Omit<SessionPayload, 'expiresAt'>)
|
|||||||
|
|
||||||
const cookieStore = await cookies();
|
const cookieStore = await cookies();
|
||||||
|
|
||||||
// For Cloudflare tunnel: external is HTTPS, internal is HTTP
|
cookieStore.set('session', session, {
|
||||||
// Use secure cookies when NEXTAUTH_URL is https (external URL)
|
|
||||||
const isSecure = process.env.NEXTAUTH_URL?.startsWith('https') ?? false;
|
|
||||||
|
|
||||||
const cookieOptions = {
|
|
||||||
httpOnly: true,
|
httpOnly: true,
|
||||||
secure: isSecure,
|
secure: process.env.NODE_ENV === 'production',
|
||||||
expires: expiresAt,
|
expires: expiresAt,
|
||||||
sameSite: isSecure ? 'none' : 'lax', // none required for secure cross-site
|
sameSite: 'lax',
|
||||||
path: '/',
|
path: '/',
|
||||||
} as const;
|
|
||||||
|
|
||||||
console.log('CREATE_SESSION: Setting cookie with options:', cookieOptions);
|
|
||||||
console.log('CREATE_SESSION: Environment:', {
|
|
||||||
NODE_ENV: process.env.NODE_ENV,
|
|
||||||
NEXTAUTH_URL: process.env.NEXTAUTH_URL,
|
|
||||||
isSecure
|
|
||||||
});
|
});
|
||||||
|
|
||||||
cookieStore.set('session', session, cookieOptions);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function updateSession() {
|
export async function updateSession() {
|
||||||
@@ -101,13 +76,11 @@ export async function updateSession() {
|
|||||||
const expires = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
|
const expires = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
|
||||||
const newSession = await encrypt({ ...payload, expiresAt: expires });
|
const newSession = await encrypt({ ...payload, expiresAt: expires });
|
||||||
|
|
||||||
const isSecure = process.env.NEXTAUTH_URL?.startsWith('https') ?? false;
|
|
||||||
|
|
||||||
cookieStore.set('session', newSession, {
|
cookieStore.set('session', newSession, {
|
||||||
httpOnly: true,
|
httpOnly: true,
|
||||||
secure: isSecure,
|
secure: process.env.NODE_ENV === 'production',
|
||||||
expires: expires,
|
expires: expires,
|
||||||
sameSite: isSecure ? 'none' : 'lax',
|
sameSite: 'lax',
|
||||||
path: '/',
|
path: '/',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,17 +15,6 @@ export default async function middleware(req: NextRequest) {
|
|||||||
const isAuthRoute = authRoutes.includes(path);
|
const isAuthRoute = authRoutes.includes(path);
|
||||||
|
|
||||||
const cookie = req.cookies.get('session')?.value;
|
const cookie = req.cookies.get('session')?.value;
|
||||||
|
|
||||||
// Debug logging for production
|
|
||||||
if (!cookie && (isProtectedRoute || isAuthRoute)) {
|
|
||||||
console.log(`No session cookie found for ${path}, headers:`, {
|
|
||||||
host: req.headers.get('host'),
|
|
||||||
'x-forwarded-proto': req.headers.get('x-forwarded-proto'),
|
|
||||||
'x-forwarded-host': req.headers.get('x-forwarded-host'),
|
|
||||||
cookies: req.headers.get('cookie')
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const session = await decrypt(cookie);
|
const session = await decrypt(cookie);
|
||||||
|
|
||||||
// Redirect to login if accessing protected route without session
|
// Redirect to login if accessing protected route without session
|
||||||
|
|||||||
Reference in New Issue
Block a user