-
Notifications
You must be signed in to change notification settings - Fork 918
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implemented a login method in AuthenticationService and findByEmail method in UserService #1120
base: master
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
package mate.academy.model; | ||
|
||
public class User { | ||
private String email; | ||
private String password; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove empty line |
||
private final String email; | ||
private final String password; | ||
|
||
public User(String email, String password) { | ||
this.email = email; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,25 @@ | ||
package mate.academy.service; | ||
|
||
import mate.academy.model.User; | ||
|
||
public class AuthenticationService { | ||
|
||
/** | ||
* Imagine that some user wants to login to your site. | ||
* Imagine that some user wants to //login to your site. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. undo this change |
||
* You should check if user credentials (login and password) are valid or not. | ||
* All users are stored in <code>UserService</code> class. | ||
* @param email - user's email | ||
* @param password - user's password | ||
* @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) { | ||
return false; | ||
User user = UserService.findByEmail(email); | ||
|
||
if (user == null) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use ternary operator |
||
return false; | ||
} | ||
return user.getPassword().equals(password); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -3,6 +3,7 @@ | |||||
import mate.academy.model.User; | ||||||
|
||||||
public class UserService { | ||||||
|
||||||
private static final User[] users = new User[] { | ||||||
new User("[email protected]", "1234"), | ||||||
new User("[email protected]", "1234") | ||||||
|
@@ -14,7 +15,13 @@ public class UserService { | |||||
* @return - user if his email is equal to passed email. | ||||||
* Return <code>null</code> if there is no suitable user | ||||||
*/ | ||||||
public User findByEmail(String email) { | ||||||
|
||||||
public static User findByEmail(String email) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
for (User person : users) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
minor comment |
||||||
if (person.getEmail().equals(email)) { | ||||||
return person; | ||||||
} | ||||||
} | ||||||
return null; | ||||||
} | ||||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove empty line