Merge pull request #63 from TAVE-9RP/dev

JWT Payload 수정 반영 (Dev -> Main)

Author: minsubyun1

src/main/java/com/nexerp/global/security/jwt/JwtTokenProvider.java

@@ -21,9 +21,7 @@
 import org.springframework.stereotype.Component;
 
 import java.security.Key;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -61,22 +59,24 @@ public long getRefreshTokenExpirationTime() {
      * 인증 정보(Authentication)를 기반으로 Access Token과 Refresh Token을 생성
      */
     public MemberAuthResponseDto generateToken(Authentication authentication) {
-        // 권한 정보와 사용자 ID 가져오기
-        String authorities = authentication.getAuthorities().stream()
-                .map(GrantedAuthority::getAuthority)
-                .collect(Collectors.joining(","));
 
         CustomUserDetails userDetails = (CustomUserDetails) authentication.getPrincipal();
-        String memberId = String.valueOf(userDetails.getMemberId());
+        Member member = userDetails.getMember();
 
         long now = (new Date()).getTime();
         Date accessTokenExpiresIn = new Date(now + accessTokenExpirationTime);
         Date refreshTokenExpiresIn = new Date(now + refreshTokenExpirationTime);
 
         // Access Token 생성 (Subject: 회원 PK, Claim: 권한)
         String accessToken = Jwts.builder()
-                .setSubject(memberId)
-                .claim("auth", authorities)
+                .setSubject(String.valueOf(member.getId()))
+                .claim("companyId", member.getCompanyId())
+                .claim("department", member.getDepartment().name())
+                .claim("permissions", Map.of(
+                  "inventory", member.getPermissions().getInventoryRole().name(),
+                  "logistics", member.getPermissions().getLogisticsRole().name(),
+                  "management", member.getPermissions().getManagementRole().name()
+                ))
                 .setExpiration(accessTokenExpiresIn)
                 .signWith(key, SignatureAlgorithm.HS256)
                 .compact();
@@ -100,17 +100,6 @@ public MemberAuthResponseDto generateToken(Authentication authentication) {
     public Authentication getAuthentication(String accessToken) {
         // 클레임 추출
         Claims claims = parseClaims(accessToken);
-
-        if (claims.get("auth") == null) {
-            throw new RuntimeException("권한 정보가 없는 토큰입니다.");
-        }
-
-        // 권한 정보(auth)를 SimpleGrantedAuthority 객체 리스트로 변환
-        Collection<? extends GrantedAuthority> authorities =
-                Arrays.stream(claims.get("auth").toString().split(","))
-                        .map(SimpleGrantedAuthority::new)
-                        .collect(Collectors.toList());
-
         Long memberId = Long.valueOf(claims.getSubject());
 
         Member member = memberRepository.findById(memberId)
@@ -121,7 +110,7 @@ public Authentication getAuthentication(String accessToken) {
         return new UsernamePasswordAuthenticationToken(
           principal,
           null,
-          principal.getAuthorities()
+          List.of()
         );
 
     }