jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-05-31 06:57:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: whitelist mode

Browse Source
This commit is contained in:
tim
2025-07-15 12:52:36 +08:00
parent b25a25f5bc
commit 7a16d53ada
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@ public class AuthController {
"error", "User not verified", "error", "User not verified",
"reason_code", "NOT_VERIFIED")); "reason_code", "NOT_VERIFIED"));
} }
if (!user.isApproved()) { if (RegisterMode.WHITELIST.equals(registerModeService.getRegisterMode()) && !user.isApproved()) {
return ResponseEntity.badRequest().body(Map.of( return ResponseEntity.badRequest().body(Map.of(
"error", "Register reason not approved", "error", "Register reason not approved",
"reason_code", "NOT_APPROVED")); "reason_code", "NOT_APPROVED"));
@@ -96,14 +96,18 @@ public class AuthController {
public ResponseEntity<?> loginWithGoogle(@RequestBody GoogleLoginRequest req) { public ResponseEntity<?> loginWithGoogle(@RequestBody GoogleLoginRequest req) {
Optional<User> user = googleAuthService.authenticate(req.getIdToken(), req.getReason(), registerModeService.getRegisterMode()); Optional<User> user = googleAuthService.authenticate(req.getIdToken(), req.getReason(), registerModeService.getRegisterMode());
if (user.isPresent()) { if (user.isPresent()) {
if (RegisterMode.DIRECT.equals(registerModeService.getRegisterMode())) {
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(user.get().getUsername())));
}
if (!user.get().isApproved()) { if (!user.get().isApproved()) {
if (user.get().getRegisterReason() != null && !user.get().getRegisterReason().isEmpty()) { if (req.reason != null && !req.reason.isEmpty()) {
// do not send empty notifition (while try login) // do not send empty notifition (while try login)
for (User admin : userRepository.findByRole(com.openisle.model.Role.ADMIN)) { for (User admin : userRepository.findByRole(com.openisle.model.Role.ADMIN)) {
notificationService.createNotification(admin, NotificationType.REGISTER_REQUEST, null, null, notificationService.createNotification(admin, NotificationType.REGISTER_REQUEST, null, null,
null, user.get(), null, req.getReason()); null, user.get(), null, req.getReason());
} }
}
if (user.get().getRegisterReason() != null && !user.get().getRegisterReason().isEmpty()) {
return ResponseEntity.badRequest().body(Map.of( return ResponseEntity.badRequest().body(Map.of(
"error", "Account awaiting approval", "error", "Account awaiting approval",
"reason_code", "IS_APPROVING" "reason_code", "IS_APPROVING"
@@ -114,7 +118,6 @@ public class AuthController {
"reason_code", "NOT_APPROVED" "reason_code", "NOT_APPROVED"
)); ));
} }
return ResponseEntity.ok(Map.of("token", jwtService.generateToken(user.get().getUsername())));
} }
return ResponseEntity.badRequest().body(Map.of( return ResponseEntity.badRequest().body(Map.of(
"error", "Invalid google token", "error", "Invalid google token",