From fbd5813f863f8b879603c4aabb1bc245b05efbd0 Mon Sep 17 00:00:00 2001
From: David <davsotpon@alum.us.es>
Date: Thu, 25 Mar 2021 20:15:34 +0100
Subject: [PATCH] Vista de login

---
 pom.xml                                              |  3 +++
 .../cheapy/configuration/SecurityConfiguration.java  |  8 ++++----
 .../cheapy/system/LoginController.java               |  9 ++++++++-
 src/main/webapp/WEB-INF/jsp/login.jsp                | 12 +++++++-----
 .../WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp   |  3 +--
 src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp    |  3 +--
 src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp  |  3 +--
 src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp    |  3 +--
 .../webapp/WEB-INF/jsp/users/createOwnerForm.jsp     |  3 +--
 src/main/webapp/WEB-INF/tags/menu.tag                |  8 ++++----
 src/main/webapp/WEB-INF/tags/menuItem.tag            |  3 +--
 11 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60be53522..38e0cd40b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,10 @@
       <artifactId>spring-boot-devtools</artifactId>
       <optional>true</optional>
     </dependency>
+        
   </dependencies>
+  
+  
 
   <build>
     <plugins>
diff --git a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java
index 677bb736d..673ad7a35 100644
--- a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java
+++ b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java
@@ -36,15 +36,15 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 		.antMatchers(HttpMethod.GET, "/", "/oups").permitAll()
 		.antMatchers("/users/new").permitAll()
 		.antMatchers("/login/**").anonymous()
+		.antMatchers("/logout").permitAll()
 		.antMatchers("/usuarios/new").permitAll()
 		.antMatchers("/admin/**").hasAnyAuthority("admin")
 		.antMatchers("/owners/**").hasAnyAuthority("owner", "admin")
 		.antMatchers("/vets/**").authenticated().anyRequest().anonymous()
 		.and().formLogin()
-			.loginPage("/login")
-			.successForwardUrl("/")
-		    .failureUrl("/login?error")
-		    .and().logout().logoutUrl("/login?logout");
+			.loginPage("/login").permitAll()
+			.failureUrl("/login?error")
+		    .and().logout().logoutSuccessUrl("/login");
 
 		// Configuración para que funcione la consola de administración
 		// de la BD H2 (deshabilitar las cabeceras de protección contra
diff --git a/src/main/java/org/springframework/cheapy/system/LoginController.java b/src/main/java/org/springframework/cheapy/system/LoginController.java
index e0e0fa7a9..e26025570 100644
--- a/src/main/java/org/springframework/cheapy/system/LoginController.java
+++ b/src/main/java/org/springframework/cheapy/system/LoginController.java
@@ -16,6 +16,9 @@
 
 package org.springframework.cheapy.system;
 
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -24,7 +27,11 @@ class LoginController {
 
 	@GetMapping("/login")
 	public String login() {
-		return "login";
+		Authentication authentication= SecurityContextHolder.getContext().getAuthentication();
+		if(authentication==null || authentication instanceof AnonymousAuthenticationToken) {
+			return "login";
+		}
+		return "redirect:/";
 	}
 
 	
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index bf718d6e4..796cdceeb 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -4,9 +4,9 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
-
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+
 <!-- %@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %-->  
 
 <style>
@@ -280,13 +280,15 @@
 	    <div class="fadeIn first">
 	      <img src="/resources/images/Logo Cheapy.png" id="icon" />
 	    </div>
-	
+		<div th:if="${param.error}">
+			<p class="text-danger"> Invalid username or password</p>
+		</div>
 	    <!-- Login Form -->
 	    <form class='form-signin' action="/login" method='POST'>
-	      <input type="text" id="login" class="fadeIn second" name="login" placeholder="login">
-	      <input type="password" id="password" class="fadeIn third" name="login" placeholder="password">
+	      <input type="text" id="username" class="fadeIn second" name="username" placeholder="username" required autofocus>
+	      <input type="password" id="password" class="fadeIn third" name="password" placeholder="password" required>
 	      <sec:csrfInput />  
-		  <input type="submit" class="fadeIn fourth" value="Log In">
+		  <input type="submit" class="fadeIn fourth" value="Login">
 	    </form>
 	
 	    <!-- Remind Passowrd -->
diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
index c88a4c589..970f56781 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
@@ -2,10 +2,9 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
-
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <cheapy:layout pageName="owners">
     <h2>
         <c:if test="${owner['new']}">New </c:if> Owner
diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
index fd57e3541..c68c500ab 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
@@ -2,12 +2,11 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec"
 	uri="http://www.springframework.org/security/tags"%>
 <!--  >%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%-->
-
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <cheapy:layout pageName="owners">
 
     <h2>Find Owners</h2>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
index 98011c4d2..26c556611 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
@@ -1,9 +1,8 @@
 <%@ page session="false" trimDirectiveWhitespaces="true" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
-
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <cheapy:layout pageName="owners">
 
     <h2>Owner Information</h2>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
index f4ef33da5..78817241e 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
@@ -2,9 +2,8 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
-
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <cheapy:layout pageName="owners">
     <h2>Owners</h2>
 
diff --git a/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp b/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp
index f811bda81..e01e1c527 100644
--- a/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/users/createOwnerForm.jsp
@@ -2,10 +2,9 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
-
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <cheapy:layout pageName="owners">
     <h2>
         <c:if test="${owner['new']}">New </c:if> Owner
diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag
index d398ef39b..531c5707d 100644
--- a/src/main/webapp/WEB-INF/tags/menu.tag
+++ b/src/main/webapp/WEB-INF/tags/menu.tag
@@ -69,10 +69,10 @@
 											<p class="text-left">
 												<strong><sec:authentication property="name" /></strong>
 											</p>
-											<p class="text-left">
-												<a href="<c:url value="/logout" />"
-													class="btn btn-primary btn-block btn-sm">Logout</a>
-											</p>
+											<form action="/logout" method=post>
+												<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
+												<input type="submit" value="logout">
+											</form>
 										</div>
 									</div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/tags/menuItem.tag b/src/main/webapp/WEB-INF/tags/menuItem.tag
index 8c14dbbc5..8b60498f5 100644
--- a/src/main/webapp/WEB-INF/tags/menuItem.tag
+++ b/src/main/webapp/WEB-INF/tags/menuItem.tag
@@ -1,9 +1,8 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
 <%@ attribute name="active" required="true" rtexprvalue="true" %>
 <%@ attribute name="url" required="true" rtexprvalue="true" %>
 <%@ attribute name="title" required="false" rtexprvalue="true" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 <li class="${active ? 'active' : ''}">
     <a href="<spring:url value="${url}" htmlEscape="true" />"