RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

accept email on login

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-04-21 17:48:10 -06:00
parent 8786cae3f8
commit e0505cbaaa
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/com/petshop/backend/controller/AuthController.java
View File

@@ -143,11 +143,16 @@ public class AuthController {
@PostMapping("/login") @PostMapping("/login")
public ResponseEntity<LoginResponse> login(@Valid @RequestBody LoginRequest request) { public ResponseEntity<LoginResponse> login(@Valid @RequestBody LoginRequest request) {
try { try {
String identifier = request.getUsername();
String resolvedUsername = identifier != null && identifier.contains("@")
? userRepository.findByEmail(identifier).map(User::getUsername).orElse(identifier)
: identifier;
authenticationManager.authenticate( authenticationManager.authenticate(
new UsernamePasswordAuthenticationToken(request.getUsername(), request.getPassword()) new UsernamePasswordAuthenticationToken(resolvedUsername, request.getPassword())
); );
User user = userRepository.findByUsername(request.getUsername()) User user = userRepository.findByUsername(resolvedUsername)
.orElseThrow(() -> new UsernameNotFoundException("User not found")); .orElseThrow(() -> new UsernameNotFoundException("User not found"));
String token = jwtUtil.generateToken(user); String token = jwtUtil.generateToken(user);