conflict done

build.gradle

@@ -16,6 +16,7 @@ repositories {
 }
 
 dependencies {
+
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

src/main/java/fr/eni/enchere/bll/UserService.java

@@ -6,8 +6,8 @@ import java.util.List;
 
 public interface UserService {
     List<UserProfil> listeUtilisateurs();
-    UserProfil utilisateurById(int id);
+    UserProfil utilisateur(int id);
-    UserProfil utilisateurByName(String username);
+    UserProfil userByName(String username);
     void setUtilisateur(UserProfil utilisateur);
     void deleteUtilisateur(int id);
 }

src/main/java/fr/eni/enchere/bll/UserServiceImpl.java

@@ -21,12 +21,12 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public UserProfil utilisateurById(int id) {
+    public UserProfil utilisateur(int id) {
         return userRepository.findById(id);
     }
 
     @Override
-    public UserProfil utilisateurByName(String username) {
+    public UserProfil userByName(String username) {
         return userRepository.findByUsername(username);
     }
 

src/main/java/fr/eni/enchere/controllers/LoginController.java

@@ -0,0 +1,40 @@
+package fr.eni.enchere.controllers;
+
+import fr.eni.enchere.bll.UserService;
+import fr.eni.enchere.bo.UserProfil;
+import fr.eni.enchere.dal.UserRepository;
+import jakarta.servlet.http.HttpSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Controller
+public class LoginController {
+
+    @Autowired
+    private UserService userService;
+
+    public LoginController(UserService userService) {
+        super();
+        this.userService = userService;
+    }
+
+    @GetMapping("/login")
+    public String login(Model modele) {
+        return "security/login";
+    }
+
+    @PostMapping("/login")
+    public String login(@RequestParam("username") String username, @RequestParam("password") String password, HttpSession session) {
+        UserProfil user = userService.userByName(username);
+        System.out.println("test");
+        if (user != null && user.getPassword().equals(password)) {
+            return "redirect:/accueil";
+        } else {
+            return "redirect:/security/login?error";
+        }
+    }
+}

src/main/java/fr/eni/enchere/controllers/MvcConfig.java

@@ -0,0 +1,12 @@
+package fr.eni.enchere.controllers;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/login").setViewName("security/login");
+    }
+}

src/main/java/fr/eni/enchere/security/LoginService.java

@@ -2,13 +2,10 @@ package fr.eni.enchere.security;
 
 import fr.eni.enchere.bo.UserProfil;
 import fr.eni.enchere.dal.UserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.User.UserBuilder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -16,7 +13,6 @@ public class LoginService implements UserDetailsService {
 
     private UserRepository userRep;
 
-    @Autowired
     public LoginService(UserRepository userRep) {
         this.userRep = userRep;
     }
@@ -24,20 +20,19 @@ public class LoginService implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         // Charger l'utilisateur depuis la base de données
-        UserProfil utilisateur = userRep.findByUsername(username);
+        UserProfil utilisateur = this.userRep.findByUsername(username);
+        UserDetails userDetails = null;
         // Créer un nouvel objet UserBuilder
-        UserBuilder userBuilder = User.builder()
+        if (utilisateur != null) {
-                .username(utilisateur.getPseudo())
+            userDetails = User.builder()
-                .password(utilisateur.getPassword());
+                    .username(utilisateur.getPseudo())
-        // Ajouter les rôles en fonction de isAdmin()
+                    .password(utilisateur.getPassword())
-        if(utilisateur.isAdmin()) {
+                    .roles(utilisateur.isAdmin() ? "ADMIN" : "MEMBRE")
-            userBuilder.roles("ADMIN", "MEMBRE");
+                    .build();
         } else {
-            userBuilder.roles("MEMBRE");
+            throw new UsernameNotFoundException("Les identifiants sont incorrect !");
         }
-
+        return userDetails;
-        // Retourner l'utilisateur UserDetails construit
-        return userBuilder.build();
     }
 
-}
+}

src/main/java/fr/eni/enchere/security/SecurityConfig.java

@@ -8,9 +8,9 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 @Configuration
 public class SecurityConfig {
 
-    @Bean
+//    @Bean
-    public PasswordEncoder passwordEncoder() {
+//    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
+//        return new BCryptPasswordEncoder();
-    }
+//    }
 
 }

src/main/java/fr/eni/enchere/security/WebSecurityConfig.java

@@ -4,27 +4,39 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.factory.PasswordEncoderFactories;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 @Configuration
 @EnableWebSecurity
-public class WebSecurityConfig {
+public class WebSecurityConfig{
 
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        http.authorizeHttpRequests((requests) -> requests
+        http.authorizeHttpRequests((requests) -> requests.requestMatchers("/", "/accueil").permitAll()
-                        .requestMatchers("/", "/accueil").permitAll()
+                        .requestMatchers("/login").permitAll()
-                        .requestMatchers("/accueil", "/login", "/inscription/**", "/searchArticle", "/profile/**").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)
+                .logout((logout) -> logout.clearAuthentication(true).invalidateHttpSession(true).deleteCookies("JSESSIONID").logoutSuccessUrl("/filmLogout")
-                        .deleteCookies("JSESSIONID").logoutSuccessUrl("/logout")
                         .logoutRequestMatcher(new AntPathRequestMatcher("/logout")).permitAll());
 
         return http.build();
     }
 
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+
+    }
+
+//    @Bean
+//    public PasswordEncoder passwordEncoder() {
+//        return PasswordEncoderFactories.createDelegatingPasswordEncoder();
+//    }
+
 }

src/main/resources/templates/modele-page.html

@@ -88,6 +88,7 @@
             © 2024 Copyright:
         </div>
     </footer>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
 </body>
 </html>

src/main/resources/templates/security/login.html

@@ -8,8 +8,14 @@
             <h2>Pour se Connecter :</h2>
             <br>
             <form th:action="@{/login}" method="post">
-                <div><label>Identifiant: <input type="text" name="username"/> </label></div>
+                <div>
-                <div><label>Mot de passe: <input type="password" name="password"/> </label></div>
+                    <label for="username">Identifiant: </label>
+                    <input type="username" name="username" id="username"/>
+                </div>
+                <div>
+                    <label for="password">Mot de passe:</label>
+                    <input type="password" name="password" id="password"/>
+                </div>
                 <div><input type="checkbox" id="remember-me" name="remember-me"/><label for="remember-me"> Se souvenir de moi</label></div>
                 <div><a href="/mot-de-passe-oublie">Mot de passe oublié</a></div>
                 <div><input type="submit" value="Connexion"/></div>