From a4d550b8e347840479aaa5c31cba3c32804df580 Mon Sep 17 00:00:00 2001 From: "Dymchenko, Mykola" Date: Mon, 30 Sep 2024 18:54:58 -0500 Subject: [PATCH 1/3] Added solution to the task. Modified files: AuthenticationService and UserService --- .../mate/academy/service/AuthenticationService.java | 11 +++++++++++ src/main/java/mate/academy/service/UserService.java | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c97..b95401fa 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) { + UserService userService = new UserService(); + User userByEmail = userService.findByEmail(email); + + if (userByEmail != null) { + if (userByEmail.getEmail().equals(email) + && userByEmail.getPassword().equals(password)) { + return true; + } + } return false; } } diff --git a/src/main/java/mate/academy/service/UserService.java b/src/main/java/mate/academy/service/UserService.java index 1652d7d6..94210665 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -15,6 +15,11 @@ 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 ee54a60a21bfe052fc126107ac8a2df52992fece Mon Sep 17 00:00:00 2001 From: "Dymchenko, Mykola" Date: Tue, 1 Oct 2024 05:36:44 -0500 Subject: [PATCH 2/3] Fix added after review --- src/main/java/mate/academy/service/AuthenticationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index b95401fa..7059c918 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -3,6 +3,7 @@ import mate.academy.model.User; public class AuthenticationService { + 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,7 +14,6 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - UserService userService = new UserService(); User userByEmail = userService.findByEmail(email); if (userByEmail != null) { From 9e392d2e228774669e48f6b14b44763bc22dc74c Mon Sep 17 00:00:00 2001 From: "Dymchenko, Mykola" Date: Tue, 1 Oct 2024 05:40:02 -0500 Subject: [PATCH 3/3] added fix to the login method --- .../java/mate/academy/service/AuthenticationService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 7059c918..ad66176d 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -3,7 +3,7 @@ import mate.academy.model.User; public class AuthenticationService { - UserService userService = new UserService(); + 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. @@ -13,12 +13,12 @@ public class AuthenticationService { * @return true if user by email exists and passed password is equal to user's password. * Return false in any other cases. */ + public boolean login(String email, String password) { User userByEmail = userService.findByEmail(email); if (userByEmail != null) { - if (userByEmail.getEmail().equals(email) - && userByEmail.getPassword().equals(password)) { + if (userByEmail.getPassword().equals(password)) { return true; } }