diff --git a/build.gradle b/build.gradle index b7032b3..e671d33 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } //버전 변경은 여기서 -def commonVer = "beta.1.0.63" +def commonVer = "beta.1.0.64" group = 'com.kri.common' version = commonVer diff --git a/src/main/java/com/kri/common/auth/jwt/JwtService.java b/src/main/java/com/kri/common/auth/jwt/JwtService.java index 43ed3ee..4780529 100644 --- a/src/main/java/com/kri/common/auth/jwt/JwtService.java +++ b/src/main/java/com/kri/common/auth/jwt/JwtService.java @@ -175,11 +175,11 @@ public class JwtService { authorities.add(new SimpleGrantedAuthority(authority)); } - return new UsernamePasswordAuthenticationToken( - principal, - null, - authorities - ); + UsernamePasswordAuthenticationToken auth = + new UsernamePasswordAuthenticationToken(principal, null, authorities); + + auth.setDetails(dto); // 핵심: claims를 details에 보관 + return auth; } /** diff --git a/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java b/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java index 3730ab3..6d4fa67 100644 --- a/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java +++ b/src/main/java/com/kri/common/webmvc/RequestUserContextArgumentResolver.java @@ -39,8 +39,16 @@ public class RequestUserContextArgumentResolver implements HandlerMethodArgument // 1) SecurityContext 에 이미 JwtUserClaimsDto 가 principal 로 들어있는 경우 Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth != null && auth.getPrincipal() instanceof JwtUserClaimsDto jwtDto) { - claims = jwtDto; + if (auth != null) { + Object principal = auth.getPrincipal(); + if (principal instanceof JwtUserClaimsDto jwtDto) { + claims = jwtDto; + } else { + Object details = auth.getDetails(); + if (details instanceof JwtUserClaimsDto jwtDto) { + claims = jwtDto; + } + } } // 2) 현재 공통 JwtService 는 principal 을 userId(String) 로 쓰고 있으니까,