From 46d42b955ce021ff11254dd33d368062b352ee5f Mon Sep 17 00:00:00 2001 From: FroGitHub Date: Thu, 19 Dec 2024 17:50:17 +0200 Subject: [PATCH 1/2] add verify --- .../java/mate/academy/service/AuthenticationService.java | 4 +++- src/main/java/mate/academy/service/UserService.java | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 8f7c7c975..998671b48 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -11,6 +11,8 @@ public class AuthenticationService { * Return false in any other cases. */ public boolean login(String email, String password) { - return false; + return UserService.findByEmail(email) + .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..08940be14 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -14,7 +14,12 @@ public class UserService { * @return - user if his email is equal to passed email. * Return null if there is no suitable user */ - public User findByEmail(String email) { - return null; + public static User findByEmail(String email) { + for (User u : users) { + if (email.equals(u.getEmail())) { + return u; + } + } + return new User("NoNe", ""); } } From 079d7c475c247c0b96e8e373d612bc724b1c8a63 Mon Sep 17 00:00:00 2001 From: FroGitHub Date: Fri, 20 Dec 2024 14:16:58 +0200 Subject: [PATCH 2/2] correcting my code --- .../mate/academy/service/AuthenticationService.java | 12 +++++++++--- src/main/java/mate/academy/service/UserService.java | 10 +++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index 998671b48..0afd140af 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. @@ -10,9 +12,13 @@ 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. */ + private UserService userService = new UserService(); + public boolean login(String email, String password) { - return UserService.findByEmail(email) - .getPassword() - .equals(password); + User user = this.userService.findByEmail(email); + if (user == null) { + return false; + } + return 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 08940be14..08fa125b0 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -14,12 +14,12 @@ public class UserService { * @return - user if his email is equal to passed email. * Return null if there is no suitable user */ - public static User findByEmail(String email) { - for (User u : users) { - if (email.equals(u.getEmail())) { - return u; + public User findByEmail(String email) { + for (User user : users) { + if (email.equals(user.getEmail())) { + return user; } } - return new User("NoNe", ""); + return null; } }