diff --git a/backoffice/src/main/java/uy/edu/fing/tse/jsf/UserLoginBean.java b/backoffice/src/main/java/uy/edu/fing/tse/jsf/UserLoginBean.java index 2844978f65672bd75739542ac3116180225395a9..589e11e4afa3b06890a33e8e748f7d1ac759a607 100644 --- a/backoffice/src/main/java/uy/edu/fing/tse/jsf/UserLoginBean.java +++ b/backoffice/src/main/java/uy/edu/fing/tse/jsf/UserLoginBean.java @@ -77,7 +77,7 @@ public class UserLoginBean implements Serializable { FacesContext.getCurrentInstance().addMessage( null, new FacesMessage(FacesMessage.SEVERITY_WARN, - "Ingreso incorrecto", + "Ingreso Incorrecto", "Por favor verificar los datos ingresados")); // return ""; } diff --git a/backoffice/src/main/java/uy/edu/fing/tse/jsf/security/JwtFilter.java b/backoffice/src/main/java/uy/edu/fing/tse/jsf/security/JwtFilter.java index e71a94e2a1602a942807c8dec0aee2c70d3999a0..c0112eaf8817058e12e5745991edf4a5c54d3a8b 100644 --- a/backoffice/src/main/java/uy/edu/fing/tse/jsf/security/JwtFilter.java +++ b/backoffice/src/main/java/uy/edu/fing/tse/jsf/security/JwtFilter.java @@ -9,39 +9,39 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebFilter("/jsf/*") -public class JwtFilter implements javax.servlet.Filter { - @Override - public void init(FilterConfig filterConfig) throws ServletException { - - } - - @Override - public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { - final HttpServletRequest request = (HttpServletRequest) req; - final HttpServletResponse response = (HttpServletResponse) res; - - final String authHeader = request.getHeader("Authorization"); - if (authHeader == null || !authHeader.startsWith("Bearer ")) { - //TODO se puede hacer un send Redirect para enviarlo al Login - response.setStatus(401); - return; - } - - try { - final String token = authHeader.substring(7); // The part after "Bearer " - final Claims claims = Jwts.parser().setSigningKey("1q2w3e4r5t6y7u8i9o0p").parseClaimsJws(token).getBody(); - request.setAttribute("claims", claims); - } catch (final Exception e) { - response.setStatus(401); - return; - } - - chain.doFilter(req, res); - } - - @Override - public void destroy() { - - } -} +//@WebFilter("/jsf/*") +//public class JwtFilter implements javax.servlet.Filter { +// @Override +// public void init(FilterConfig filterConfig) throws ServletException { +// +// } +// +// @Override +// public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { +// final HttpServletRequest request = (HttpServletRequest) req; +// final HttpServletResponse response = (HttpServletResponse) res; +// +// final String authHeader = request.getHeader("Authorization"); +// if (authHeader == null || !authHeader.startsWith("Bearer ")) { +// //TODO se puede hacer un send Redirect para enviarlo al Login +// response.setStatus(401); +// return; +// } +// +// try { +// final String token = authHeader.substring(7); // The part after "Bearer " +// final Claims claims = Jwts.parser().setSigningKey("1q2w3e4r5t6y7u8i9o0p").parseClaimsJws(token).getBody(); +// request.setAttribute("claims", claims); +// } catch (final Exception e) { +// response.setStatus(401); +// return; +// } +// +// chain.doFilter(req, res); +// } +// +// @Override +// public void destroy() { +// +// } +//} diff --git a/backoffice/src/main/webapp/login.xhtml b/backoffice/src/main/webapp/login.xhtml index 05a937d8811bcc4c81461bff40e50dfd0eb59179..13361863583e03012f5026ad1bf7bc6cd9e21df4 100644 --- a/backoffice/src/main/webapp/login.xhtml +++ b/backoffice/src/main/webapp/login.xhtml @@ -11,20 +11,22 @@ <ui:define name="contenido"> <h:form> <h1>LOGIN</h1> - <h:panelGrid columns="3" cellpadding="5" id="form"> + <h:panelGrid columns="2" cellpadding="5" id="form"> <h:outputLabel for="username" value="Username:"/> <p:inputText id="username" value="#{userLoginView.user.mail}" required="true" requiredMessage="Ingrese su e-mail" label="username"/> - <p:message id="msgName" for="username"/> + <h:outputLabel for="password" value="Password:"/> <p:password id="password" value="#{userLoginView.user.password}" required="true" requiredMessage="Ingrese: su password" label="password"/> - <p:message id="msgPassword" for="password"/> + <f:facet name="footer"> - <p:commandButton value="Register" action="register.xhmtl?faces-redirect=true" + + <h:commandButton value="Register" action="register.xhmtl?faces-redirect=true" update="form" async="true" process="@this"/> - <p:commandButton value="Login" action="#{userLoginView.login()}" update="form"/> + + <h:commandButton value="Login" action="#{userLoginView.login()}" update="form"/> </f:facet> <h:inputHidden id="token" value="#{sessionBean.token}"/> </h:panelGrid>