✨ feat(UsersService.java): Add UsernameNotFoundException for bett…

…er security exception handling.
vnobo · Dec 18, 2024 · 6ecb7d9 · 6ecb7d9
1 parent 32c614e
commit 6ecb7d9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/boot/platform/src/main/java/com/plate/boot/security/core/user/UsersService.java b/boot/platform/src/main/java/com/plate/boot/security/core/user/UsersService.java
@@ -9,6 +9,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -92,7 +93,7 @@ public Mono<User> add(UserRequest request) {
         return this.usersRepository.existsByUsernameIgnoreCase(request.getUsername()).flatMap(exists -> {
             if (exists) {
                 return Mono.error(RestServerException.withMsg("User already exists",
-                        "Username [" + request.getUsername() + "] already exists!"));
+                        new UsernameNotFoundException("User by username [" + request.getUsername() + "] already exists")));
             }
             return this.operate(request);
         });
@@ -111,9 +112,10 @@ public Mono<User> add(UserRequest request) {
      * @return A Mono that, when subscribed to, emits the updated User entity after modification or throws an exception if the user was not found.
      */
     public Mono<User> modify(UserRequest request) {
-        return this.usersRepository.findByUsername(request.getUsername())
-                .switchIfEmpty(Mono.error(RestServerException.withMsg(
-                        "User not found!", "User by username [" + request.getUsername() + "] not found!")))
+        Mono<User> userFoundMono = Mono.defer(() -> Mono.error(RestServerException
+                .withMsg("User [" + request.getUsername() + "] not found",
+                        new UsernameNotFoundException("User by username [" + request.getUsername() + "] not found!"))));
+        return this.usersRepository.findByUsername(request.getUsername()).switchIfEmpty(userFoundMono)
                 .flatMap(user -> {
                     request.setId(user.getId());
                     request.setCode(user.getCode());
@@ -172,8 +174,6 @@ public Mono<User> save(User user) {
         } else {
             assert user.getId() != null;
             return this.usersRepository.findById(user.getId())
-                    .switchIfEmpty(Mono.error(RestServerException.withMsg("User not found",
-                            "User by id [" + user.getId() + "] not found!")))
                     .flatMap(old -> {
                         user.setCreatedTime(old.getCreatedTime());
                         user.setPassword(old.getPassword());