From aa25617c81c521bfc988f7f876dc17a8566e805c Mon Sep 17 00:00:00 2001
From: Parpaillax <parpaillax@orange.fr>
Date: Tue, 23 Apr 2024 16:36:35 +0200
Subject: [PATCH] patch

---
 .../eni/enchere/controllers/LoginController.java  |  5 +----
 .../java/fr/eni/enchere/dal/UserRepository.java   |  2 +-
 .../fr/eni/enchere/dal/UserRepositoryImpl.java    | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/fr/eni/enchere/controllers/LoginController.java b/src/main/java/fr/eni/enchere/controllers/LoginController.java
index e4cd451..dcd0ce7 100644
--- a/src/main/java/fr/eni/enchere/controllers/LoginController.java
+++ b/src/main/java/fr/eni/enchere/controllers/LoginController.java
@@ -2,8 +2,6 @@ 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;
@@ -28,9 +26,8 @@ public class LoginController {
     }
 
     @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);
-        System.out.println(user);
         if (user != null && user.getPassword().equals(password)) {
             return "redirect:/accueil";
         } else {
diff --git a/src/main/java/fr/eni/enchere/dal/UserRepository.java b/src/main/java/fr/eni/enchere/dal/UserRepository.java
index cd03bae..adfe6d7 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<UserProfil> findAll();
     UserProfil findById(int id);
-    UserProfil findByUsername(String username);
+    UserProfil findByUsername(String username, String email);
     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 0d11068..3e9eeee 100644
--- a/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java
+++ b/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java
@@ -57,11 +57,16 @@ public class UserRepositoryImpl implements UserRepository {
     }
 
     @Override
-    public UserProfil findByUsername(String username) {
-        String sql = "SELECT * FROM UTILISATEURS WHERE pseudo = :username OR email = :username AND isDelete = 0";
-        Map<String, Object> params = new HashMap<>();
-        params.put("username", username);
-        UserProfil user = jdbcTemplate.queryForObject(sql, new UserRowMapper(), params);
+    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());
         return user;
     }