mirror of
https://github.com/kmitresse/Cards-Rush.git
synced 2026-07-09 13:27:45 +00:00
feat: dev-web - new mail address is up
This commit is contained in:
@@ -5,8 +5,8 @@ public final class Global {
|
|||||||
public static final String PERSISTENCE_UNIT_NAME = "prod";
|
public static final String PERSISTENCE_UNIT_NAME = "prod";
|
||||||
public static final String PERSISTENCE_UNIT_NAME_TEST = "test";
|
public static final String PERSISTENCE_UNIT_NAME_TEST = "test";
|
||||||
public static final String TOMCAT_PORT = "8088";
|
public static final String TOMCAT_PORT = "8088";
|
||||||
public static final String MAIL_USERNAME = "cardrushuppa@gmail.com";
|
public static final String MAIL_USERNAME = "cardsrushuppa@gmail.com";
|
||||||
public static final String MAIL_PASSWORD = "evkz lowg dqfs ncrz";
|
public static final String MAIL_PASSWORD = "aktr zity mayw kvek";
|
||||||
public static final String MAIL_PORT = "587";
|
public static final String MAIL_PORT = "587";
|
||||||
public static final String MAIL_HOST = "smtp.gmail.com";
|
public static final String MAIL_HOST = "smtp.gmail.com";
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ public class ForgottenPasswordServlet extends HttpServlet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
||||||
|
|
||||||
request.getRequestDispatcher("/WEB-INF/views/forgotten-password.jsp").forward(request, response);
|
request.getRequestDispatcher("/WEB-INF/views/forgotten-password.jsp").forward(request, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,14 +53,11 @@ public class ForgottenPasswordServlet extends HttpServlet {
|
|||||||
response.sendRedirect(request.getContextPath() + "/forgotten-password?error=1");
|
response.sendRedirect(request.getContextPath() + "/forgotten-password?error=1");
|
||||||
} else {
|
} else {
|
||||||
String token = UUID.randomUUID().toString();
|
String token = UUID.randomUUID().toString();
|
||||||
|
|
||||||
RecoveryPasswordToken recoveryPasswordToken = new RecoveryPasswordToken(token, user);
|
RecoveryPasswordToken recoveryPasswordToken = new RecoveryPasswordToken(token, user);
|
||||||
CreateToken(recoveryPasswordToken);
|
CreateToken(recoveryPasswordToken);
|
||||||
|
|
||||||
sendRecoveryEmail(email, token, request);
|
sendRecoveryEmail(email, token, request);
|
||||||
response.sendRedirect(request.getContextPath() + "/forgotten-password?success=200");
|
response.sendRedirect(request.getContextPath() + "/forgotten-password?success=200");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,17 +18,16 @@ public class ResetPasswordServlet extends HttpServlet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
||||||
|
RecoveryPasswordToken token = findRecoveryToken(request.getParameter("token"));
|
||||||
RecoveryPasswordToken token = findRecoveryToken(request.getParameter("token"));
|
if (token == null) {
|
||||||
if (token == null) {
|
response.sendRedirect(request.getContextPath() + "/forgotten-password?error=invalid-token");
|
||||||
response.sendRedirect(request.getContextPath() + "/forgotten-password?error=invalid-token");
|
return;
|
||||||
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");
|
||||||
response.sendRedirect(request.getContextPath() + "/forgotten-password?error=expired-token");
|
return;
|
||||||
return;
|
}
|
||||||
}
|
request.getRequestDispatcher("/WEB-INF/views/reset-password.jsp").forward(request, response);
|
||||||
request.getRequestDispatcher("/WEB-INF/views/reset-password.jsp").forward(request, response);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user