diff --git a/src/main/java/fr/eni/enchere/dal/UserRepository.java b/src/main/java/fr/eni/enchere/dal/UserRepository.java index adfe6d7..cd03bae 100644 --- a/src/main/java/fr/eni/enchere/dal/UserRepository.java +++ b/src/main/java/fr/eni/enchere/dal/UserRepository.java @@ -7,7 +7,7 @@ import java.util.List; public interface UserRepository { List findAll(); UserProfil findById(int id); - UserProfil findByUsername(String username, String email); + UserProfil findByUsername(String username); void save(UserProfil utilisateur); void delete(int id); } diff --git a/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java b/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java index 3e9eeee..4ee84d7 100644 --- a/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java +++ b/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java @@ -11,6 +11,7 @@ import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.jdbc.support.KeyHolder; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Repository; @@ -57,16 +58,9 @@ public class UserRepositoryImpl implements UserRepository { } @Override - public UserProfil findByUsername(String username, String email) { - UserProfil user = null; - if (username != null) { - String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = ? AND isDelete = 0"; - user = jdbcTemplate.queryForObject(sql, new UserRowMapper(), username); - } else if (email != null) { - String sql = "SELECT * FROM UTILISATEURS WHERE email = ? AND isDelete = 0"; - user = jdbcTemplate.queryForObject(sql, new UserRowMapper(), email); - } - System.out.println(user.getPassword()); + public UserProfil findByUsername(String username) { + String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = ? OR email = ? AND isDelete = 0"; + UserProfil user = jdbcTemplate.queryForObject(sql, new UserRowMapper(), username, username); return user; }