connexion done

This commit is contained in:
Parpaillax
2024-04-23 14:57:37 +02:00
parent 7d0ea267e4
commit 7e51af9a4c
12 changed files with 123 additions and 49 deletions

View File

@@ -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'

View File

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

View File

@@ -25,6 +25,11 @@ public class UserServiceImpl implements UserService {
return userRepository.findById(id);
}
@Override
public UserProfil userByName(String username) {
return userRepository.findByUsername(username);
}
@Override
public void setUtilisateur(UserProfil utilisateur) {
userRepository.save(utilisateur);

View File

@@ -25,9 +25,4 @@ public class AccueilController {
return "accueil";
}
@GetMapping("/login")
public String login(Model modele) {
return "login";
}
}

View File

@@ -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";
}
}
}

View File

@@ -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");
}
}

View File

@@ -3,6 +3,7 @@ package fr.eni.enchere.dal;
import fr.eni.enchere.bo.UserProfil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -43,9 +44,10 @@ public class UserRepositoryImpl implements UserRepository {
@Override
public UserProfil findByUsername(String username) {
String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = :username OR email = :username";
String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = :username";
Map<String, Object> params = new HashMap<>();
params.put("username", username);
try {
UserProfil user = namedParameterJdbcTemplate.queryForObject(sql, params, (rs, rowNum) -> {
UserProfil userProfile = new UserProfil();
userProfile.setId(rs.getInt("no_utilisateur"));
@@ -63,6 +65,9 @@ public class UserRepositoryImpl implements UserRepository {
return userProfile;
});
return user;
} catch (EmptyResultDataAccessException err) {
return null;
}
}
@Override

View File

@@ -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) {
userDetails = User.builder()
.username(utilisateur.getPseudo())
.password(utilisateur.getPassword());
// Ajouter les rôles en fonction de isAdmin()
if(utilisateur.isAdmin()) {
userBuilder.roles("ADMIN", "MEMBRE");
.password(utilisateur.getPassword())
.roles(utilisateur.isAdmin() ? "ADMIN" : "MEMBRE")
.build();
} else {
userBuilder.roles("MEMBRE");
throw new UsernameNotFoundException("Les identifiants sont incorrect !");
}
// Retourner l'utilisateur UserDetails construit
return userBuilder.build();
return userDetails;
}
}

View File

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

View File

@@ -4,26 +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.requestMatchers("/", "/accueil").permitAll()
.requestMatchers("/accueil", "/login", "/inscription").permitAll()
.requestMatchers("/login").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)
.deleteCookies("JSESSIONID").logoutSuccessUrl("/filmLogout")
.logout((logout) -> logout.clearAuthentication(true).invalidateHttpSession(true).deleteCookies("JSESSIONID").logoutSuccessUrl("/filmLogout")
.logoutRequestMatcher(new AntPathRequestMatcher("/logout")).permitAll());
return http.build();
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
// @Bean
// public PasswordEncoder passwordEncoder() {
// return PasswordEncoderFactories.createDelegatingPasswordEncoder();
// }
}

View File

@@ -85,6 +85,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>

View File

@@ -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><label>Mot de passe: <input type="password" name="password"/> </label></div>
<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>