jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-02-26 16:10:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:nagisa77/OpenIsle

Browse Source
This commit is contained in:
tim
2025-07-15 16:13:23 +08:00
parent 94eea956ad 0fb0e733b7
commit e3fd51e133
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/openisle/controller/AuthController.java
View File

@@ -69,6 +69,9 @@ public class AuthController {
return ResponseEntity.badRequest().body(Map.of("error", "Invalid captcha"));
}
Optional<User> userOpt = userService.findByUsername(req.getUsername());
if (userOpt.isEmpty()) {
userOpt = userService.findByEmail(req.getUsername());
}
if (userOpt.isEmpty() || !userService.matchesPassword(userOpt.get(), req.getPassword())) {
return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid credentials",

4
src/main/java/com/openisle/service/UserService.java
View File

@@ -102,6 +102,10 @@ public class UserService {
return userRepository.findByUsername(username);
}
public Optional<User> findByEmail(String email) {
return userRepository.findByEmail(email);
}
public Optional<User> findById(Long id) {
return userRepository.findById(id);
}