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

Merge branch 'main' into codex/remove-duplicate-notifications-for-register-request

Browse Source
This commit is contained in:
Tim
2025-07-15 12:52:21 +08:00
committed by GitHub
parent 4036bd25a5 b25a25f5bc
commit 56a1f534bb
6 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,9 +93,14 @@ public class AuthController {
Optional<User> user = googleAuthService.authenticate(req.getIdToken(), req.getReason(), registerModeService.getRegisterMode());
if (user.isPresent()) {
if (!user.get().isApproved()) {
if (req.getReason() != null && !req.getReason().isEmpty()) {
// do not send empty notification (while try login)
if (user.get().getRegisterReason() != null && !user.get().getRegisterReason().isEmpty()) {
// do not send empty notifition (while try login)
notificationService.createRegisterRequestNotifications(user.get(), req.getReason());
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",
"reason_code", "IS_APPROVING"
));
}
return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval",

6
src/main/java/com/openisle/service/GoogleAuthService.java
View File

@@ -50,6 +50,12 @@ public class GoogleAuthService {
user.setVerificationCode(null);
userRepository.save(user);
}
if (!user.isApproved() && reason != null && !reason.isEmpty()) {
user.setRegisterReason(reason);
userRepository.save(user);
}
return user;
}
User user = new User();