From 31aff6252f5e28bdee23078da316fe5674354daa Mon Sep 17 00:00:00 2001 From: Oleg Date: Thu, 7 Aug 2025 15:40:03 +0300 Subject: [PATCH 1/2] add implementations of login and findByEmail methods --- .../java/mate/academy/service/AuthenticationService.java | 7 ++++++- src/main/java/mate/academy/service/UserService.java | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c975..feecfa7a7 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,9 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - return false; + UserService userService = new UserService(); + User user = userService.findByEmail(email); + + return user != null && user.getPassword().equals(password); } } diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 1652d7d68..24aa6cfda 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -15,6 +15,12 @@ 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 8bdfc78513fec18bd857e59e27e4eb21e7c0456d Mon Sep 17 00:00:00 2001 From: Oleg Date: Thu, 7 Aug 2025 20:09:02 +0300 Subject: [PATCH 2/2] move UserService variable to class-level section --- .../java/mate/academy/service/AuthenticationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index feecfa7a7..38545051b 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 final 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. @@ -13,8 +15,7 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - UserService userService = new UserService(); - User user = userService.findByEmail(email); + User user = this.userService.findByEmail(email); return user != null && user.getPassword().equals(password); }