fix(auth/users): corregir edicion de contraseñas de usuarios, cambio de contraseña y evitar pantalla en blanco
This commit is contained in:
@@ -433,6 +433,84 @@ app.get('/:blueprint/:route', (req, res) => {
|
||||
});
|
||||
});
|
||||
|
||||
// Middleware 404 para cualquier ruta no encontrada (evita pantallas en blanco y errores Cannot POST/GET)
|
||||
app.use((req, res) => {
|
||||
res.status(404).send(`
|
||||
<!DOCTYPE html>
|
||||
<html lang="es">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Página No Encontrada — Edu-Space</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
||||
<style>
|
||||
body { background: #0f172a; color: #f8fafc; font-family: system-ui, -apple-system, sans-serif; min-height: 100vh; display: flex; align-items: center; justify-content: center; margin: 0; }
|
||||
.card-error { background: #1e293b; border: 1px solid #334155; border-radius: 16px; box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.5); }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container text-center p-4" style="max-width: 520px;">
|
||||
<div class="card card-error p-4 p-md-5">
|
||||
<div class="mb-3 text-warning">
|
||||
<i class="bi bi-compass fs-1"></i>
|
||||
</div>
|
||||
<h1 class="h3 fw-bold mb-2">Página o Acción No Encontrada</h1>
|
||||
<p class="text-secondary small mb-4">
|
||||
La ruta solicitada <code class="text-light">${req.originalUrl}</code> no existe o no admite el método HTTP ejecutado.
|
||||
</p>
|
||||
<div class="d-flex justify-content-center gap-2">
|
||||
<a href="/dashboard" class="btn btn-primary px-4 fw-semibold">
|
||||
<i class="bi bi-house-door me-1"></i>Volver al Panel
|
||||
</a>
|
||||
<button onclick="window.history.back()" class="btn btn-outline-light px-4">
|
||||
Volver Atrás
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
`);
|
||||
});
|
||||
|
||||
// Middleware Global de Error 500
|
||||
app.use((err, req, res, next) => {
|
||||
console.error('Error no capturado en BFF:', err);
|
||||
res.status(500).send(`
|
||||
<!DOCTYPE html>
|
||||
<html lang="es">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Error del Sistema — Edu-Space</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
||||
<style>
|
||||
body { background: #0f172a; color: #f8fafc; font-family: system-ui, -apple-system, sans-serif; min-height: 100vh; display: flex; align-items: center; justify-content: center; margin: 0; }
|
||||
.card-error { background: #1e293b; border: 1px solid #334155; border-radius: 16px; box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.5); }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container text-center p-4" style="max-width: 520px;">
|
||||
<div class="card card-error p-4 p-md-5">
|
||||
<div class="mb-3 text-danger">
|
||||
<i class="bi bi-exclamation-triangle-fill fs-1"></i>
|
||||
</div>
|
||||
<h1 class="h3 fw-bold mb-2">Error en la Aplicación</h1>
|
||||
<p class="text-secondary small mb-4">
|
||||
Ocurrió una eventualidad procesando la solicitud. Nuestro equipo técnico ha sido notificado.
|
||||
</p>
|
||||
<a href="/dashboard" class="btn btn-primary px-4 fw-semibold">
|
||||
<i class="bi bi-house-door me-1"></i>Volver al Panel
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
`);
|
||||
});
|
||||
|
||||
app.listen(port, () => {
|
||||
console.log(`BFF Frontend corriendo en http://localhost:${port}`);
|
||||
});
|
||||
|
||||
|
||||
@@ -428,6 +428,10 @@ const handleUserSave = async (req, res) => {
|
||||
is_active: is_active === 'on' || is_active === 'true' || is_active === true
|
||||
};
|
||||
if (password && password.trim()) {
|
||||
if (password.trim().length < 6) {
|
||||
const errMsg = encodeURIComponent('La contraseña debe tener al menos 6 caracteres.');
|
||||
return res.redirect(userId ? `/admin/users/edit/${userId}?error=${errMsg}` : `/admin/user_add?error=${errMsg}`);
|
||||
}
|
||||
payload.password = password.trim();
|
||||
}
|
||||
try {
|
||||
@@ -440,6 +444,30 @@ const handleUserSave = async (req, res) => {
|
||||
} catch (e) {
|
||||
console.warn('User save API notice:', e.response?.data || e.message);
|
||||
const errMsg = encodeURIComponent(e.response?.data?.message || 'Error al guardar el usuario');
|
||||
return res.redirect(userId ? `/admin/users/edit/${userId}?error=${errMsg}` : `/admin/users_list?error=${errMsg}`);
|
||||
}
|
||||
};
|
||||
|
||||
const handleUserPasswordReset = async (req, res) => {
|
||||
const userId = req.params.id || req.body.id || req.body.user_id;
|
||||
const password = (req.body.password || req.body.new_password || '').trim();
|
||||
|
||||
if (!userId || !password) {
|
||||
const errMsg = encodeURIComponent('Debe seleccionar un usuario e ingresar la nueva contraseña.');
|
||||
return res.redirect(`/admin/users_list?error=${errMsg}`);
|
||||
}
|
||||
|
||||
if (password.length < 6) {
|
||||
const errMsg = encodeURIComponent('La nueva contraseña debe tener al menos 6 caracteres.');
|
||||
return res.redirect(`/admin/users_list?error=${errMsg}`);
|
||||
}
|
||||
|
||||
try {
|
||||
await req.apiClient.post(`/users/${userId}/password`, { password });
|
||||
return res.redirect('/admin/users_list?msg=password_updated');
|
||||
} catch (e) {
|
||||
console.warn('Password reset notice:', e.response?.data || e.message);
|
||||
const errMsg = encodeURIComponent(e.response?.data?.message || 'Error al restablecer la contraseña.');
|
||||
return res.redirect(`/admin/users_list?error=${errMsg}`);
|
||||
}
|
||||
};
|
||||
@@ -447,8 +475,10 @@ const handleUserSave = async (req, res) => {
|
||||
router.get(['/users_list', '/users', '/user_list'], handleUsersList);
|
||||
router.get(['/user_add', '/users/new'], handleUserAdd);
|
||||
router.get(['/user_edit', '/user_edit/:id', '/users/edit', '/users/edit/:id'], handleUserEdit);
|
||||
router.post(['/user_add', '/users/new', '/user_save'], handleUserSave);
|
||||
router.post(['/user_add', '/users/new', '/user_save', '/users/save'], handleUserSave);
|
||||
router.post(['/user_edit', '/user_edit/:id', '/users/edit', '/users/edit/:id'], handleUserSave);
|
||||
router.post(['/users/:id/password', '/users/password', '/user_password', '/user_password/:id', '/user_reset_password'], handleUserPasswordReset);
|
||||
|
||||
|
||||
// ─── 4. ROLES ─────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -165,4 +165,65 @@ router.get('/stop-impersonating', requireAuth, async (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
// Cambiar Contraseña Propia (GET)
|
||||
router.get(['/change_password', '/change-password'], requireAuth, (req, res) => {
|
||||
res.render('auth/change_password', {
|
||||
title: 'Cambiar Contraseña — Edu-Space',
|
||||
error: req.query.error || null,
|
||||
success: req.query.success || null
|
||||
});
|
||||
});
|
||||
|
||||
// Cambiar Contraseña Propia (POST)
|
||||
router.post(['/change_password', '/change-password'], requireAuth, async (req, res) => {
|
||||
const { current_password, new_password, confirm_password } = req.body;
|
||||
|
||||
if (!current_password || !new_password || !confirm_password) {
|
||||
return res.render('auth/change_password', {
|
||||
title: 'Cambiar Contraseña — Edu-Space',
|
||||
error: 'Todos los campos son obligatorios.',
|
||||
success: null
|
||||
});
|
||||
}
|
||||
|
||||
if (new_password !== confirm_password) {
|
||||
return res.render('auth/change_password', {
|
||||
title: 'Cambiar Contraseña — Edu-Space',
|
||||
error: 'La nueva contraseña y su confirmación no coinciden.',
|
||||
success: null
|
||||
});
|
||||
}
|
||||
|
||||
if (new_password.length < 6) {
|
||||
return res.render('auth/change_password', {
|
||||
title: 'Cambiar Contraseña — Edu-Space',
|
||||
error: 'La nueva contraseña debe tener al menos 6 caracteres.',
|
||||
success: null
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
const response = await req.apiClient.post('/auth/change_password', {
|
||||
current_password,
|
||||
new_password,
|
||||
confirm_password
|
||||
});
|
||||
|
||||
return res.render('auth/change_password', {
|
||||
title: 'Cambiar Contraseña — Edu-Space',
|
||||
success: response.data?.message || 'Contraseña actualizada correctamente.',
|
||||
error: null
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Change password error:', error.response?.data || error.message);
|
||||
const errMsg = error.response?.data?.message || 'Error al actualizar la contraseña. Verifique su clave actual.';
|
||||
return res.render('auth/change_password', {
|
||||
title: 'Cambiar Contraseña — Edu-Space',
|
||||
error: errMsg,
|
||||
success: null
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user