diff --git a/src/main/java/com/test/servlets/AccueilServlet.java b/src/main/java/com/test/servlets/AccueilServlet.java index 7eff23f..5f32241 100644 --- a/src/main/java/com/test/servlets/AccueilServlet.java +++ b/src/main/java/com/test/servlets/AccueilServlet.java @@ -18,7 +18,7 @@ import jakarta.servlet.http.HttpServletResponse; * @author steve.maingana */ -@WebServlet(name = "AccueilServlet", urlPatterns = {"/"}) +@WebServlet(name = "AccueilServlet", urlPatterns = {"/Accueil"}) public class AccueilServlet extends HttpServlet { String monPseudo = "steve.mngn"; @@ -61,19 +61,9 @@ public class AccueilServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // processRequest(request, response); - - - String pseudo = request.getParameter("pseudo"); - String mdp = request.getParameter("mdp"); - if ((pseudo != null && !pseudo.isBlank()) || (mdp != null && !mdp.isBlank())) { - request.setAttribute("login", false); - } else if (!pseudo.equals(this.monPseudo) && !mdp.equals(this.monMdp)) { - request.setAttribute("login", false); - } else { - request.setAttribute("login", true); - } + String login = "false"; + request.setAttribute("login", login); RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/accueilVue.jsp"); dispatcher.forward(request, response); @@ -90,14 +80,17 @@ public class AccueilServlet extends HttpServlet { @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); - String pseudo = request.getParameter("pseudo"); - String mdp = request.getParameter("mdp"); - if (pseudo.equals(this.monPseudo) && mdp.equals(this.monMdp)) { - request.setAttribute("login", true); - request.setAttribute("pseudo", pseudo); + String pseudo = (String) request.getParameter("pseudo"); + String mdp = (String) request.getParameter("mdp"); + if (!pseudo.isBlank() && !mdp.isBlank()) { + if (pseudo.equals(this.monPseudo) && mdp.equals(this.monMdp)) { + request.setAttribute("login", true); + } } + + RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/accueilVue.jsp"); + dispatcher.forward(request, response); } /** diff --git a/src/main/webapp/WEB-INF/accueilVue.jsp b/src/main/webapp/WEB-INF/accueilVue.jsp index 7ff896c..e803292 100644 --- a/src/main/webapp/WEB-INF/accueilVue.jsp +++ b/src/main/webapp/WEB-INF/accueilVue.jsp @@ -4,6 +4,7 @@ Author : steve.maingana --%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@page contentType="text/html" pageEncoding="UTF-8"%> @@ -11,17 +12,11 @@ <%@include file="jspf/menu.jspf" %>

Bienvenue sur la nouvelle application de gestion des clients écrite avec JakartaEE

- <% - boolean login = (boolean) request.getAttribute("login"); - if (login) { - %> -

Bienvenue ${pseudo}

- <% - } else { - %> - <%@include file="jspf/login.jspf" %> - <% - } - %> + + <%@ include file="jspf/login.jspf" %> + +

Bienvenue ${param.pseudo} !

+ + diff --git a/src/main/webapp/WEB-INF/jspf/entete.jspf b/src/main/webapp/WEB-INF/jspf/entete.jspf index 26e72a2..cfae8a9 100644 --- a/src/main/webapp/WEB-INF/jspf/entete.jspf +++ b/src/main/webapp/WEB-INF/jspf/entete.jspf @@ -3,5 +3,5 @@ Gestion des clients - + diff --git a/src/main/webapp/WEB-INF/jspf/login.jspf b/src/main/webapp/WEB-INF/jspf/login.jspf index d64c3c6..dd29e04 100644 --- a/src/main/webapp/WEB-INF/jspf/login.jspf +++ b/src/main/webapp/WEB-INF/jspf/login.jspf @@ -1,6 +1,7 @@ <%-- any content can be specified here e.g.: --%> <%@ page pageEncoding="UTF-8" %> -
- - + +
+
+
diff --git a/src/main/webapp/WEB-INF/jspf/menu.jspf b/src/main/webapp/WEB-INF/jspf/menu.jspf index beb8464..e6a3aaf 100644 --- a/src/main/webapp/WEB-INF/jspf/menu.jspf +++ b/src/main/webapp/WEB-INF/jspf/menu.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %>