From 0d8e40d80dabcc3c6b7b3b8dc58e6e2f00556f1c Mon Sep 17 00:00:00 2001 From: jekaG Date: Wed, 25 Sep 2024 19:47:17 +0300 Subject: [PATCH 1/2] add login method in AuthenticationService and findByEmail method in UserService --- .../mate/academy/service/AuthenticationService.java | 13 ++++++++++++- src/main/java/mate/academy/service/UserService.java | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c97..cb99cc42 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -1,5 +1,7 @@ package mate.academy.service; +import mate.academy.model.User; + public class AuthenticationService { /** * Imagine that some user wants to login to your site. @@ -11,6 +13,15 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - return false; + User user = new User(email,password); + UserService userService = new UserService(); + + if (userService.findByEmail(user.getEmail()) != null + && userService.findByEmail(user.getEmail()).getPassword().equals(user + .getPassword())) { + return true; + } else { + return false; + } } } diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 1652d7d6..e0d90165 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -15,6 +15,13 @@ public class UserService { * Return null if there is no suitable user */ public User findByEmail(String email) { + + for (User user : users) { + + if (user.getEmail().equals(email)) { + return user; + } + } return null; } } From 0cfabe259c0ad2e00780466c98f5ab678cdbee31 Mon Sep 17 00:00:00 2001 From: jekaG Date: Wed, 25 Sep 2024 21:59:26 +0300 Subject: [PATCH 2/2] fix AuthenticationService --- .../java/mate/academy/service/AuthenticationService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index cb99cc42..19376070 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -3,6 +3,8 @@ import mate.academy.model.User; public class AuthenticationService { + private UserService userService = new UserService(); + /** * Imagine that some user wants to login to your site. * You should check if user credentials (login and password) are valid or not. @@ -14,10 +16,9 @@ public class AuthenticationService { */ public boolean login(String email, String password) { User user = new User(email,password); - UserService userService = new UserService(); + User user1 = userService.findByEmail(email); - if (userService.findByEmail(user.getEmail()) != null - && userService.findByEmail(user.getEmail()).getPassword().equals(user + if (user1 != null && user1.getPassword().equals(user .getPassword())) { return true; } else {