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.

Sign up for GitHub

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

fix: Expected status 400 but got status 500 when username not found #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Expected status 400 but got status 500 when username not found #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...n/java/com/github/fenixsoft/bookstore/domain/security/AuthenticAccountDetailsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class AuthenticAccountDetailsService implements UserDetailsService {
*/
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
return Optional.ofNullable(accountRepository.findByUsername(username)).orElseThrow(() -> new UsernameNotFoundException("未找到该用户:" + username));
return accountRepository.optionalByUsername(username).orElseThrow(() -> new UsernameNotFoundException("未找到该用户:" + username));
}

}
9 changes: 7 additions & 2 deletions .../main/java/com/github/fenixsoft/bookstore/domain/security/AuthenticAccountRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Optional;

/**
* 认证用户的数据仓库
*
Expand All @@ -34,7 +36,10 @@ public class AuthenticAccountRepository {
private AccountServiceClient userService;

public AuthenticAccount findByUsername(String username) {
Account account = userService.findByUsername(username);
return new AuthenticAccount(account);
return optionalByUsername(username).orElse(null);
}

public Optional<AuthenticAccount> optionalByUsername(String username) {
return Optional.ofNullable(userService.findByUsername(username)).map(AuthenticAccount::new);
}
}