diff --git a/src/main/java/com/roshka/proyectofinal/login/LoginServlet.java b/src/main/java/com/roshka/proyectofinal/login/LoginServlet.java index e7b379b..69a78eb 100644 --- a/src/main/java/com/roshka/proyectofinal/login/LoginServlet.java +++ b/src/main/java/com/roshka/proyectofinal/login/LoginServlet.java @@ -2,17 +2,15 @@ package com.roshka.proyectofinal.login; import java.io.IOException; import java.io.PrintWriter; import java.security.NoSuchAlgorithmException; - +import jakarta.servlet.RequestDispatcher; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import com.roshka.proyectofinal.entity.LoginBean; import com.roshka.proyectofinal.login.md5JavaHash; import jakarta.servlet.http.HttpSession; - import static java.lang.System.out; /** @@ -21,7 +19,6 @@ import static java.lang.System.out; @WebServlet("/login") public class LoginServlet extends HttpServlet { private static final long serialVersionUID = 1L; - /** * @see HttpServlet#HttpServlet() */ @@ -45,6 +42,7 @@ public class LoginServlet extends HttpServlet { LoginDao loginDao = new LoginDao(); md5JavaHash passEncrip = new md5JavaHash(); String passwordMD5 = ""; + response.setContentType("text/html"); PrintWriter out = response.getWriter(); String username = request.getParameter("username"); @@ -65,31 +63,48 @@ public class LoginServlet extends HttpServlet { if (loginDao.validate(loginBean)) { HttpSession session = request.getSession(true); //incluir nota de sesion valida - session.setAttribute("logon.isDone", username); + session.setAttribute("logon.isDone", correo); + out.print ("Bienvenido " + correo); // Tratar de re-dirigir a la pagina que el usuario quiso acceder try { String target = (String) session.getAttribute("login.target"); - response.sendRedirect("loginSuccess.jsp"); + //response.sendRedirect("loginSuccess.jsp"); + out.println(" \n Destino: " + target); if (target != null) response.sendRedirect(target); - return; + //return; } catch (Exception ignored) { } // Si no es posible redireccionar a la pagina solicitada, llevar a la main page - //response.sendRedirect(request.getScheme() + "://" + - // request.getServerName() + ":" + request.getServerPort()); - System.out.println("redirigir al index.html"); + response.sendRedirect(request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort()); } else { //si no es un user valido - mandar error y redireccionar al inicio de sesion - /* out.println(""); + RequestDispatcher rd = request.getRequestDispatcher("/login.jsp"); + out.print("
Credenciales incorrectas! Reintente ...
"); + rd.include(request,response); + + } + + + + } + + + +} + + +/* out.println(""); out.println("

You may want to try again

"); out.println("Access Denied<title><head>");*/ - //request.getRequestDispatcher("login.jsp").include(request, response); - out.println("<!DOCTYPE html>"); +//request.getRequestDispatcher("login.jsp").include(request, response); + + /* out.println("<!DOCTYPE html>"); out.println("<html> <head> <title>BootcampsLogin "); out.println("
"); out.println("

User Login Form

"); @@ -100,12 +115,4 @@ public class LoginServlet extends HttpServlet { out.println("
"); out.println("
"); out.println("
Credenciales incorrectas! Reintente ...
"); - out.println(""); - - //response.sendRedirect("login.jsp"); - } - } - - - -} + out.println("");*/ diff --git a/src/main/java/com/roshka/proyectofinal/login/LogoutServlet.java b/src/main/java/com/roshka/proyectofinal/login/LogoutServlet.java new file mode 100644 index 0000000..2d86d39 --- /dev/null +++ b/src/main/java/com/roshka/proyectofinal/login/LogoutServlet.java @@ -0,0 +1,48 @@ +package com.roshka.proyectofinal.login; +import java.io.IOException; +import java.io.PrintWriter; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + + +/** + * Servlet implementation class LoginServlet + */ +@WebServlet("/logout") +public class LogoutServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + /** + * @see HttpServlet#HttpServlet() + */ + public LogoutServlet() { + super(); + // TODO Auto-generated constructor stub + } + + /** + * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) + */ + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + //response.getWriter().append("Served at: ").append(request.getContextPath()); + + response.setContentType("text/html"); + PrintWriter out = response.getWriter(); + out.print("Has cerrado tu sesion !"); + + request.getRequestDispatcher("index.html").include(request,response); + + HttpSession session = request.getSession(true); + session.invalidate(); + + + + out.close(); + } + +} \ No newline at end of file diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a026d71..1e89b6c 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -14,6 +14,10 @@
Hello Servlet
+ LOGIN
+ LOGOUT
+ RECUSO PROTEGIDO
+