johanleroy/ENI-enchere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch

Browse Source
This commit is contained in:
Parpaillax
2024-04-23 16:36:35 +02:00
parent 8d60124175
commit aa25617c81
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/eni/enchere/controllers/LoginController.java
View File

@@ -2,8 +2,6 @@ package fr.eni.enchere.controllers;
import fr.eni.enchere.bll.UserService; import fr.eni.enchere.bll.UserService;
import fr.eni.enchere.bo.UserProfil; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -28,9 +26,8 @@ public class LoginController {
} }
@PostMapping("/login") @PostMapping("/login")
public String login(@RequestParam("username") String username, @RequestParam("password") String password, HttpSession session) { public String login(@RequestParam("username") String username, @RequestParam("password") String password) {
UserProfil user = userService.utilisateurByName(username); UserProfil user = userService.utilisateurByName(username);
System.out.println(user);
if (user != null && user.getPassword().equals(password)) { if (user != null && user.getPassword().equals(password)) {
return "redirect:/accueil"; return "redirect:/accueil";
} else { } else {

2
src/main/java/fr/eni/enchere/dal/UserRepository.java
View File

@@ -7,7 +7,7 @@ import java.util.List;
public interface UserRepository { public interface UserRepository {
List<UserProfil> findAll(); List<UserProfil> findAll();
UserProfil findById(int id); UserProfil findById(int id);
UserProfil findByUsername(String username); UserProfil findByUsername(String username, String email);
void save(UserProfil utilisateur); void save(UserProfil utilisateur);
void delete(int id); void delete(int id);
} }

15
src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java
View File

@@ -57,11 +57,16 @@ public class UserRepositoryImpl implements UserRepository {
} }
@Override @Override
public UserProfil findByUsername(String username) { public UserProfil findByUsername(String username, String email) {
String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = :username OR email = :username AND isDelete = 0"; UserProfil user = null;
Map<String, Object> params = new HashMap<>(); if (username != null) {
params.put("username", username); String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = ? AND isDelete = 0";
UserProfil user = jdbcTemplate.queryForObject(sql, new UserRowMapper(), params); 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());
return user; return user;
} }