diff --git a/WEB-INF/src/controleurs/Account.java b/WEB-INF/src/controleurs/Account.java index 170ad05a71ad75f3262f59fc847e50a29eb6fea5..3f727476eadc49b84a93e338313b76144ce6a15e 100644 --- a/WEB-INF/src/controleurs/Account.java +++ b/WEB-INF/src/controleurs/Account.java @@ -51,6 +51,7 @@ public class Account extends HttpServlet { System.out.println(user.getPwd()); System.out.println(user.getId()); boolean b = userDao.updatePassword(user.getUserName(), user.getPwd(), npwd); + req.getSession().setAttribute("user", userDao.getUserByLogs(user.getUserName(), npwd)); System.out.println(b); if (b == true){ out.println("<p style=\"color:lightgreen\">Your password was successfully changed"); diff --git a/WEB-INF/src/controleurs/DeleteAccount.java b/WEB-INF/src/controleurs/DeleteAccount.java index 7be450208d6af4f17ae482320584321015c32190..3f855798dd7f0e898167fc541ca9ed8e9a3918f3 100644 --- a/WEB-INF/src/controleurs/DeleteAccount.java +++ b/WEB-INF/src/controleurs/DeleteAccount.java @@ -23,7 +23,6 @@ public class DeleteAccount extends HttpServlet { if (req.getSession().getAttribute("user") != null) { UserDAO userDao = new UserDAO(); PrintWriter out = res.getWriter(); - String login = (String) req.getSession().getAttribute("login"); User user = (User) req.getSession().getAttribute("user"); if (user != null) { @@ -32,7 +31,7 @@ public class DeleteAccount extends HttpServlet { out.println("<link rel=\"stylesheet\" href=\"css/account.css\">"); out.println("<title>Account</title>"); out.println("</body>"); - if (userDao.deleteUser(user.getUserName(), user.getPwd())){ + if (userDao.deleteUser(user)){ out.println("Your account was successfully deleted !"); }else { out.println("A problem occurred while deleting your account..."); diff --git a/WEB-INF/src/dao/UserDAO.java b/WEB-INF/src/dao/UserDAO.java index 9372e8a5a5cb46824215cc2a547182ea68e28685..f2e520aae825ecdbf5f0bc039634e499d042e8f3 100644 --- a/WEB-INF/src/dao/UserDAO.java +++ b/WEB-INF/src/dao/UserDAO.java @@ -48,18 +48,19 @@ public class UserDAO { return false; } - public boolean deleteUser(String username, String password){ + public boolean deleteUser(User user){ + try{ - if (isDatabased(getUserByLogs(username, password))) { - PreparedStatement stmt = this.con.prepareStatement("DELETE FROM userAccount WHERE username=? AND password=?"); - stmt.setString(1, username); - stmt.setString(2, password); + if (isDatabased(user)) { + PreparedStatement stmt = this.con.prepareStatement("DELETE FROM userAccount WHERE userid=? AND username=?"); + stmt.setInt(1, user.getId()); + stmt.setString(2, user.getUserName()); stmt.executeUpdate(); return true; } }catch (SQLException sqle){ - sqle.getStackTrace(); + sqle.printStackTrace(); } return false; }