From 0a156ee2f75b712784f331c5142b4d4d76ab3581 Mon Sep 17 00:00:00 2001
From: jleroy <johan.leroy2023@campus-eni.fr>
Date: Tue, 23 Apr 2024 08:55:19 +0200
Subject: [PATCH] Connexion page

---
 build.gradle                                  |   5 ++++
 .../controllers/AccueilController.java        |   8 +++---
 .../enchere/security/WebSecurityConfig.java   |  10 +++-----
 .../resources/static/{ => img}/favicon.ico    | Bin
 src/main/resources/static/{ => img}/logo.png  | Bin
 src/main/resources/templates/accueil.html     |   4 +--
 src/main/resources/templates/login.html       |  23 ++++++++++++++++++
 src/main/resources/templates/modele-page.html |   4 +--
 8 files changed, 41 insertions(+), 13 deletions(-)
 rename src/main/resources/static/{ => img}/favicon.ico (100%)
 rename src/main/resources/static/{ => img}/logo.png (100%)
 create mode 100644 src/main/resources/templates/login.html

diff --git a/build.gradle b/build.gradle
index 84e330d..f4815e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,11 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
 	implementation 'org.mariadb.jdbc:mariadb-java-client:2.2.0'
+	//Securité
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
+	testImplementation 'org.springframework.security:spring-security-test'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
 tasks.named('test') {
diff --git a/src/main/java/fr/eni/enchere/controllers/AccueilController.java b/src/main/java/fr/eni/enchere/controllers/AccueilController.java
index 4e9b0bb..b577289 100644
--- a/src/main/java/fr/eni/enchere/controllers/AccueilController.java
+++ b/src/main/java/fr/eni/enchere/controllers/AccueilController.java
@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 public class AccueilController {
 
     private static final Logger logger = LoggerFactory.getLogger(AccueilController.class);
-
     private ArticleService articleService;
 
     public AccueilController(ArticleService articleService) {
@@ -22,10 +21,13 @@ public class AccueilController {
 
     @GetMapping({"/", "/accueil"})
     public String viewAccueil(Model model) {
-
         model.addAttribute("articles", articleService.findAllArticle());
-
         return "accueil";
     }
 
+    @GetMapping("/login")
+    public String login(Model modele) {
+        return "login";
+    }
+
 }
diff --git a/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java b/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java
index 1862200..7036e23 100644
--- a/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java
+++ b/src/main/java/fr/eni/enchere/security/WebSecurityConfig.java
@@ -15,12 +15,10 @@ public class WebSecurityConfig {
 
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        http.authorizeHttpRequests((requests) -> requests.requestMatchers("/", "/films", "/filmotheque", "/film").permitAll()
-                        .requestMatchers("/filmLogout", "/login").permitAll()
-                        .requestMatchers("/css/**", "/images/**").permitAll()
-                        .requestMatchers("/genres").hasRole("ADMIN")
-                        .requestMatchers("/ajoutFilm")
-                        .hasAnyRole("MEMBRE", "ADMIN")
+        http.authorizeHttpRequests((requests) -> requests.requestMatchers("/", "/accueil").permitAll()
+                        .requestMatchers("/accueil", "/login", "/inscription").permitAll()
+                        .requestMatchers("/css/**", "/images/**", "/assets/**", "/img/**", "/js/**").permitAll()
+                        .requestMatchers("/admin").hasRole("ADMIN")
                         .anyRequest().authenticated())
                 .formLogin((form) -> form.loginPage("/login").defaultSuccessUrl("/", true))
                 .logout((logout) -> logout.clearAuthentication(true).invalidateHttpSession(true)
diff --git a/src/main/resources/static/favicon.ico b/src/main/resources/static/img/favicon.ico
similarity index 100%
rename from src/main/resources/static/favicon.ico
rename to src/main/resources/static/img/favicon.ico
diff --git a/src/main/resources/static/logo.png b/src/main/resources/static/img/logo.png
similarity index 100%
rename from src/main/resources/static/logo.png
rename to src/main/resources/static/img/logo.png
diff --git a/src/main/resources/templates/accueil.html b/src/main/resources/templates/accueil.html
index 7edb53d..4172347 100644
--- a/src/main/resources/templates/accueil.html
+++ b/src/main/resources/templates/accueil.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr"  th:replace="~{modele-page :: layout('Accueil',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<html lang="fr"  th:replace="~{modele-page :: layout('Accueil - ENI-Enchères',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
     <title>Accueil</title>
@@ -31,7 +31,7 @@
                                 <div class="d-flex justify-content-between align-items-center">
                                     <div>
                                         <h6>Prix de vente: <span th:text="${article.prixVente}"></span> €</h6>
-                                        <h6 class="text-muted">Fin de l'enchere: <span th:text="${#dates.format(article.dateFinEnch, 'dd/MM/yyyy')}"></span> €</h6>
+                                        <h6 class="text-muted">Fin de l'enchere: <span th:text="${#dates.format(article.dateFinEnch, 'dd/MM/yyyy')}"></span></h6>
 
                                     </div>
                                 </div>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
new file mode 100644
index 0000000..d07f4f2
--- /dev/null
+++ b/src/main/resources/templates/login.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="fr"  th:replace="~{modele-page :: layout('Login',~{::link} , ~{::#container-main})}" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+</head>
+    <body>
+    <div id="container-main">
+        <h2>Pour se Connecter :</h2>
+        <br>
+        <form th:action="@{/login}" method="post">
+            <div><label>Identifiant: <input type="text" name="username"/> </label></div>
+            <div><label>Mot de passe: <input type="password" name="password"/> </label></div>
+            <div><input type="submit" value="Connexion"/></div>
+        </form>
+        <div th:if="${param.error}">
+            Identifiant ou mot de passe incorrect
+        </div>
+        <div th:if="${param.logout}">
+            Vous avez été déconnecté
+        </div>
+    </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modele-page.html b/src/main/resources/templates/modele-page.html
index bcdf100..635630d 100644
--- a/src/main/resources/templates/modele-page.html
+++ b/src/main/resources/templates/modele-page.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>[[${title}]]</title>
-    <link rel="icon" th:href="@{favicon.ico}" />
+    <link rel="icon" th:href="@{img/favicon.ico}" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet">
     <link href="assets/bootstrap-icons/bootstrap-icons.min.css" rel="stylesheet">
 </head>
@@ -11,7 +11,7 @@
     <header>
         <nav class="navbar navbar-expand-lg navbar navbar-dark bg-dark navbar-">
             <a class="navbar-brand" href="#">
-                <img src="logo.png" width="70" height="70" alt="Logo">
+                <img src="img/logo.png" width="70" height="70" alt="Logo">
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>