diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ForgottenPasswordBean.java b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ForgottenPasswordBean.java index deabafb..5cd479b 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ForgottenPasswordBean.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ForgottenPasswordBean.java @@ -1,6 +1,5 @@ package uppa.project.bean; -import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.Properties; import java.util.UUID; @@ -30,8 +29,8 @@ public class ForgottenPasswordBean implements Serializable { public ForgottenPasswordBean() { } - public ForgottenPasswordBean(String username, String password) { - this.email = username; + public ForgottenPasswordBean(String email) { + this.email = email; } public boolean validate(String requestPath) { @@ -71,8 +70,8 @@ public class ForgottenPasswordBean implements Serializable { /** * Envoi d'un e-mail de réinitialisation de mot de passe * - * @param email - * @param token + * @param email l'adresse e-mail du destinataire + * @param token le token de réinitialisation */ public void sendRecoveryEmail(String email, String token, String requestPath){ String host = Global.MAIL_HOST; diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ProfileBean.java b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ProfileBean.java index bd36e06..3b88982 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ProfileBean.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ProfileBean.java @@ -51,7 +51,7 @@ public class ProfileBean { return false; } //Check if the oldPassword is correct - if(!oldPassword.equals("") && !user.verifyPassword(oldPassword)) { + if(!oldPassword.isEmpty() && !user.verifyPassword(oldPassword)) { error = new HttpResponse(HttpResponseCode.UNAUTHORIZED, "Ancien mot de passe incorrect"); entityManager.getTransaction().rollback(); return false; @@ -63,7 +63,7 @@ public class ProfileBean { } //Update the user user.setEmail(email); - if (!password.equals("")) { + if (!password.isEmpty()) { user.setPassword(password); } user.setGender(User.Gender.valueOf(gender)); diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatistics.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatistics.java index 43185b9..71bc83d 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatistics.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatistics.java @@ -26,7 +26,7 @@ public class GameStatistics extends HttpServlet { request.setAttribute("game", game); request.getRequestDispatcher("/WEB-INF/pages/game-statistics.jsp").forward(request, response); } catch (Exception e) { - e.printStackTrace(); - } + request.getRequestDispatcher("/WEB-INF/pages/profile.jsp").forward(request, response); + } ; } } diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java index c8e80fb..b7e2743 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java @@ -14,13 +14,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; import uppa.project.bean.ProfileBean; -import uppa.project.bean.RegisterBean; -import uppa.project.database.pojo.Game; -import uppa.project.database.pojo.Player; -import uppa.project.database.pojo.User; import uppa.project.json.HttpResponse; import uppa.project.json.HttpResponseCode; diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp index 8b7e2b4..f6a8c55 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp @@ -1,4 +1,3 @@ -<%@ page import="java.util.List" %> <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %> diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/profile.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/profile.jsp index 0b3ef6b..c821f9b 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/profile.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/profile.jsp @@ -1,10 +1,4 @@ -<%@ page import="uppa.project.database.pojo.Player" %> -<%@ page import="uppa.project.database.pojo.Game" %> -<%@ page import="java.util.List" %> <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> -<%--<%@ taglib uri = "https://mvnrepository.com/artifact/jakarta.servlet.jsp.jstl/jakarta.servlet.jsp.jstl-api" prefix = "c" %>--%> - - <%@taglib prefix="layout" tagdir="/WEB-INF/tags/layouts" %> <%@taglib prefix="component" tagdir="/WEB-INF/tags/components" %> diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag index 25d5b7d..dd97678 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag @@ -1,5 +1,4 @@ <%@ tag import="uppa.project.database.pojo.Player" %> -<%@ tag import="java.util.Calendar" %> <%@ tag import="uppa.project.database.pojo.Game" %> <%@tag description="component/statistics" pageEncoding="UTF-8" %>