From 280df1fbb0a8f5fd64aa821dfa52885aab78300f Mon Sep 17 00:00:00 2001
From: Florine Lefebvre <florine.lefebvre.etu@univ-lille.fr>
Date: Fri, 7 Mar 2025 09:17:59 +0100
Subject: [PATCH] correction redirection page derreur
---
WEB-INF/src/controleur/Account.java | 2 +-
WEB-INF/src/controleur/Authent.java | 9 ++++++++-
WEB-INF/src/controleur/Navigation.java | 4 ++--
WEB-INF/src/controleur/ThreadController.java | 8 ++++----
WEB-INF/vue/compte.jsp | 4 ++--
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/WEB-INF/src/controleur/Account.java b/WEB-INF/src/controleur/Account.java
index 0b3f559..d210ac9 100644
--- a/WEB-INF/src/controleur/Account.java
+++ b/WEB-INF/src/controleur/Account.java
@@ -68,7 +68,7 @@ public class Account extends HttpServlet{
break;
default:
req.setAttribute("error", "Ne changez pas l'url vous même!");
- req.getRequestDispatcher("/WEB-INF/vue/error.jsp");
+ req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp);
return;
}
}
diff --git a/WEB-INF/src/controleur/Authent.java b/WEB-INF/src/controleur/Authent.java
index b5a68e5..73c0c8e 100644
--- a/WEB-INF/src/controleur/Authent.java
+++ b/WEB-INF/src/controleur/Authent.java
@@ -18,9 +18,15 @@ public class Authent extends HttpServlet {
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
DaoUser daoUser = new DaoUser();
String action = req.getParameter("action");
- String username = req.getParameter("username").toLowerCase();
+ String username = req.getParameter("username");
String password = req.getParameter("password");
+ if(username == null || password == null){
+ req.setAttribute("error", "Vous ne pouvez pas avoir un pseudo ou mot de passe vide !");
+ req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp);
+ return;
+ }
String hashedPassword;
+ username = username.toLowerCase();
MessageDigest md;
this.getServletContext();
@@ -49,6 +55,7 @@ public class Authent extends HttpServlet {
return;
} else {
req.setAttribute("error", "Identifiant ou mot de passe incorrect");
+ req.getRequestDispatcher("/WEB-INF/vue/error.jsp");
}
break;
diff --git a/WEB-INF/src/controleur/Navigation.java b/WEB-INF/src/controleur/Navigation.java
index cdbf5df..23827ae 100644
--- a/WEB-INF/src/controleur/Navigation.java
+++ b/WEB-INF/src/controleur/Navigation.java
@@ -45,8 +45,8 @@ public class Navigation extends HttpServlet{
break;
default:
req.setAttribute("error", "Ne changez pas l'url vous même!");
- req.getRequestDispatcher("/WEB-INF/vue/error.jsp");
- return;
+ vue = "/WEB-INF/vue/error.jsp";
+ break;
}
req.getRequestDispatcher(vue).forward(req, resp);
diff --git a/WEB-INF/src/controleur/ThreadController.java b/WEB-INF/src/controleur/ThreadController.java
index 68c197a..f0da83c 100644
--- a/WEB-INF/src/controleur/ThreadController.java
+++ b/WEB-INF/src/controleur/ThreadController.java
@@ -45,7 +45,7 @@ public class ThreadController extends HttpServlet {
if(daoThread.findById(idThread) == null){
req.setAttribute("error", "Ne changez pas l'url vous même!");
- req.getRequestDispatcher("/WEB-INF/vue/error.jsp");
+ req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp);
return;
}
@@ -55,7 +55,7 @@ public class ThreadController extends HttpServlet {
case "follow":
if(daoFollower.checkFollowerExist(follow)){
req.setAttribute("error", "Vous suivez déjà ce fils");
- req.getRequestDispatcher("/WEB-INF/vue/error.jsp");
+ req.getRequestDispatcher("/WEB-INF/vue/error.jsp").forward(req, resp);
return ;
}
daoFollower.create(follow);
@@ -85,8 +85,8 @@ public class ThreadController extends HttpServlet {
break;
default:
req.setAttribute("error", "Ne changez pas l'url vous même!");
- req.getRequestDispatcher("/WEB-INF/vue/error.jsp");
- return;
+ vue = "/WEB-INF/vue/error.jsp";
+ break;
}
req.getRequestDispatcher(vue).forward(req, resp);
}
diff --git a/WEB-INF/vue/compte.jsp b/WEB-INF/vue/compte.jsp
index 24c468c..941ee79 100644
--- a/WEB-INF/vue/compte.jsp
+++ b/WEB-INF/vue/compte.jsp
@@ -95,8 +95,8 @@
<input class="form-control" name="lastname" type="text" value="<%= user.getLastname() %>" maxlength="50">
</div>
</div>
- <div class="mt-5 d-flex flex-column justify-content-center">
- <input class="btn btn-primary flex-fill" type="submit" value="Mettre à jour mes informations">
+ <div class="mt-5 d-flex justify-content-center">
+ <input class="btn btn-primary" type="submit" value="Mettre à jour mes informations">
</div>
</form>
</div>
--
GitLab