Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,15 @@ async function handleLoginRedirect(
request: NextRequest,
next: () => Promise<NextResponse | null>
): Promise<NextResponse | null> {
const isProduction = process.env.NODE_ENV === 'production';

if (request.nextUrl.pathname === PROTECTED_ROUTES.LOGIN) {
if (isProduction) {
console.log('Login redirect handler called:', {
path: request.nextUrl.pathname,
timestamp: new Date().toISOString(),
});
}
return await handleAuthenticatedRedirectMiddleware(request, NextResponse.next());
}

Expand Down
17 changes: 17 additions & 0 deletions middlewares/auth/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,24 @@ export async function handleAuthenticationMiddleware(request: NextRequest, respo
}

export async function handleAuthenticatedRedirectMiddleware(request: NextRequest, response: NextResponse) {
const isProduction = process.env.NODE_ENV === 'production';

if (isProduction) {
console.log('Authenticated redirect middleware called:', {
path: request.nextUrl.pathname,
timestamp: new Date().toISOString(),
});
}

// Siempre forzar refresh para verificar la sesión actual, especialmente importante
// cuando el usuario navega manualmente a /login
const session = await getSession(request, response, true);

if (session && typeof session === 'object' && 'tokens' in session && session.tokens) {
if (isProduction) {
console.log('User has valid session, redirecting...');
}

// Verificar que la sesión tiene tokens válidos antes de redirigir
const lastStoreId = getLastVisitedStore(request);

Expand All @@ -196,6 +209,10 @@ export async function handleAuthenticatedRedirectMiddleware(request: NextRequest
}
}

if (isProduction) {
console.log('No valid session found, allowing login page');
}

// Si no hay sesión válida, limpiar caché y permitir continuar (mostrar login)
clearUserSessionCache(request);
return response;
Expand Down
Loading