✨ feat(MenusService, SessionConfiguration): Add error handling an…

…d improve exception messages for menu operations.
vnobo · Dec 18, 2024 · 32c614e · 32c614e
1 parent 0d395f3
commit 32c614e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/boot/platform/src/main/java/com/plate/boot/config/SessionConfiguration.java b/boot/platform/src/main/java/com/plate/boot/config/SessionConfiguration.java
@@ -1,5 +1,6 @@
 package com.plate.boot.config;
 
+import com.nimbusds.oauth2.sdk.dpop.verifiers.AccessTokenValidationException;
 import com.plate.boot.commons.exception.RestServerException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,7 +36,7 @@
  */
 @Configuration(proxyBeanMethods = false)
 @EnableRedisIndexedWebSession
-public class SessionConfiguration{
+public class SessionConfiguration {
 
     public static final String HEADER_SESSION_ID_NAME = "X-Auth-Token";
     public static final String X_REQUESTED_WITH = "X-Requested-With";
@@ -112,7 +113,7 @@ private static String resolveAccessTokenFromRequest(ServerHttpRequest request) {
         }
 
         private static RestServerException invalidTokenError(String message) {
-            return RestServerException.withMsg("Bearer token is malformed!", message);
+            return RestServerException.withMsg(message, new AccessTokenValidationException("Bearer token is malformed"));
         }
 
         @Override
@@ -210,7 +211,8 @@ private String resolveFromAuthorizationHeader(HttpHeaders headers) {
             }
             Matcher matcher = AUTHORIZATION_PATTERN.matcher(authorization);
             if (!matcher.matches()) {
-                throw invalidTokenError("bearer is malformed.");
+                throw invalidTokenError("Extracts the bearer token from the" +
+                        " 'Authorization' header within the provided HTTP headers.");
             }
             return matcher.group("token");
         }

diff --git a/boot/platform/src/main/java/com/plate/boot/relational/menus/MenusService.java b/boot/platform/src/main/java/com/plate/boot/relational/menus/MenusService.java
@@ -62,17 +62,19 @@ public Mono<Menu> add(MenuRequest request) {
         var existsMono = this.entityTemplate.exists(Query.query(criteria), Menu.class);
         existsMono = existsMono.filter(isExists -> !isExists);
         existsMono = existsMono.switchIfEmpty(Mono.error(RestServerException
-                .withMsg("Add menu[" + request.getName() + "] is exists!",
-                        "The menu already exists, please try another name. is params: " + criteria)));
+                .withMsg("Add menu[" + request.getName() + "] is exists",
+                        new IllegalArgumentException("The menu already exists, please try another name. is params: "
+                                + criteria))));
         return existsMono.flatMap((b) -> this.operate(request));
     }
 
     public Mono<Menu> modify(MenuRequest request) {
         log.debug("Menu modify request: {}", request);
         var oldMunuMono = this.menusRepository.findByCode(request.getCode())
                 .switchIfEmpty(Mono.error(RestServerException.withMsg(
-                        "Modify menu [" + request.getName() + "] is empty!",
-                        "The menu does not exist, please choose another name. is code: " + request.getCode())));
+                        "Modify menu [" + request.getName() + "] is empty",
+                        new IllegalArgumentException("The menu does not exist, please choose another name. is code: "
+                                + request.getCode()))));
         oldMunuMono = oldMunuMono.flatMap(old -> {
             request.setId(old.getId());
             request.setAuthority(old.getAuthority());