From bad26d50b003ef8f51985579d394fceadae40827 Mon Sep 17 00:00:00 2001 From: kmitresse Date: Tue, 26 Mar 2024 10:34:55 +0100 Subject: [PATCH] fix: dev-web - fix expiration token --- .../project/servlet/ResetPasswordServlet.java | 2 +- .../WEB-INF/static/js/forgotten-password.js | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java index a55d917..179c896 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/ResetPasswordServlet.java @@ -24,7 +24,7 @@ public class ResetPasswordServlet extends HttpServlet { response.sendRedirect(request.getContextPath() + "/forgotten-password?error=invalid-token"); return; } - if (token.getExpirationDate().compareTo(new java.util.Date()) > 0){ + if (token.getExpirationDate().compareTo(new java.util.Date()) < 0){ response.sendRedirect(request.getContextPath() + "/forgotten-password?error=expired-token"); return; } diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/static/js/forgotten-password.js b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/static/js/forgotten-password.js index 6de8211..60732ac 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/static/js/forgotten-password.js +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/static/js/forgotten-password.js @@ -1,29 +1,3 @@ -const forgottenPasswordForm = document.getElementById("forgottenPasswordForm"); - -forgottenPasswordForm.addEventListener("submit", (event) => { - event.preventDefault(); - //Recuperer les données du formulaire - const formData = new FormData(forgottenPasswordForm); - const data = {}; - formData.forEach((value, key) => data[key] = value); - //Recuperer l'URL de l'action et la methode - const action = forgottenPasswordForm.getAttribute("action"); - const method = forgottenPasswordForm.getAttribute("method"); - //Redirection vers le servlet ForgottenPasswordServlet - fetch(action, { - headers: {"Content-Type": "application/json"}, - body: JSON.stringify(data), - method, - }) - .then(res => res.json()) - .then(data => { - console.log(data); - // if (data.status === 200) window.location.href = data.redirect; - }) - .catch(error => console.error("Error:", error)) - -}); - window.onload = function (){ const urlParams = new URLSearchParams(window.location.search); let error = null;