Skip to content
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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/mate/academy/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import mate.academy.service.AuthenticationService;

public class Main {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove empty line

private static final AuthenticationService authenticationService = new AuthenticationService();

public static void main(String[] args) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/mate/academy/model/User.java
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;

Choose a reason for hiding this comment

The 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;
Expand Down
13 changes: 11 additions & 2 deletions src/main/java/mate/academy/service/AuthenticationService.java
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.
Copy link

Choose a reason for hiding this comment

The 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) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use ternary operator

return false;
}
return user.getPassword().equals(password);
}
}
9 changes: 8 additions & 1 deletion src/main/java/mate/academy/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public static User findByEmail(String email) {
public User findByEmail(String email) {

for (User person : users) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (User person : users) {
for (User user : users) {

minor comment

if (person.getEmail().equals(email)) {
return person;
}
}
return null;
}
}
Loading