From e14ff37160b180f10bfa4e92d6060aeb22cad26c Mon Sep 17 00:00:00 2001 From: misha-levko Date: Thu, 4 Jan 2024 20:33:23 -0500 Subject: [PATCH] Added UserService field to AuthenticationService --- .../java/mate/academy/service/AuthenticationService.java | 9 ++++++++- src/main/java/mate/academy/service/UserService.java | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/mate/academy/service/AuthenticationService.java b/src/main/java/mate/academy/service/AuthenticationService.java index c4622afd9..baafd2e42 100644 --- a/src/main/java/mate/academy/service/AuthenticationService.java +++ b/src/main/java/mate/academy/service/AuthenticationService.java @@ -3,6 +3,12 @@ import mate.academy.model.User; public class AuthenticationService { + private final UserService userService; + + public AuthenticationService() { + this.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. @@ -12,8 +18,9 @@ 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 user = UserService.findByEmail(email); + 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 631b1712a..b9701582e 100644 --- a/src/main/java/mate/academy/service/UserService.java +++ b/src/main/java/mate/academy/service/UserService.java @@ -14,7 +14,8 @@ 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) { + + public User findByEmail(String email) { for (User user : users) { if (user.getEmail().equals(email)) { return user;