refactor: PrivateClaims의 타입을 Long으로 변경

woowacourse-teams · Aug 8, 2023 · 92d4759 · 92d4759
1 parent 867e4ea
commit 92d4759
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/backend/ddang/src/main/java/com/ddang/ddang/authentication/domain/PrivateClaims.java b/backend/ddang/src/main/java/com/ddang/ddang/authentication/domain/PrivateClaims.java
@@ -1,4 +1,4 @@
 package com.ddang.ddang.authentication.domain;
 
-public record PrivateClaims(String userId) {
+public record PrivateClaims(Long userId) {
 }
diff --git a/...end/ddang/src/main/java/com/ddang/ddang/authentication/infrastructure/jwt/JwtDecoder.java b/...end/ddang/src/main/java/com/ddang/ddang/authentication/infrastructure/jwt/JwtDecoder.java
@@ -28,7 +28,7 @@ public class JwtDecoder implements TokenDecoder {
     public Optional<PrivateClaims> decode(final TokenType tokenType, final String token) {
         validateBearerToken(token);
 
-        return this.parseWithClaims(token, tokenType)
+        return this.parse(tokenType, token)
                    .map(this::convert);
     }
 
@@ -48,8 +48,9 @@ private void validateTokenType(final String tokenType) {
         }
     }
 
-    private Optional<Claims> parseWithClaims(final String token, final TokenType tokenType) {
+    private Optional<Claims> parse(final TokenType tokenType, final String token) {
         final String key = jwtConfigurationProperties.findTokenKey(tokenType);
+
         try {
             return Optional.of(
                     Jwts.parserBuilder()
@@ -64,7 +65,7 @@ private Optional<Claims> parseWithClaims(final String token, final TokenType tok
     }
 
     private PrivateClaims convert(Claims claims) {
-        return new PrivateClaims(claims.get(CLAIM_NAME, String.class));
+        return new PrivateClaims(claims.get(CLAIM_NAME, Long.class));
     }
 
     private String findPureToken(String token) {

diff --git a/backend/ddang/src/test/java/com/ddang/ddang/auction/application/AuctionServiceTest.java b/backend/ddang/src/test/java/com/ddang/ddang/auction/application/AuctionServiceTest.java
@@ -342,7 +342,7 @@ class AuctionServiceTest {
                 List.of(thirdRegion.getId()),
                 main.getId(),
                 List.of(auctionImage),
-                1L
+                seller.getId()
         );
 
         // when & then
@@ -579,7 +579,7 @@ class AuctionServiceTest {
     void 지정한_아이디에_해당하는_회원과_판매자가_일치하지_않는_경우_삭제시_예외가_발생한다() {
         // given
         final User seller = User.builder()
-                                .name("회원")
+                                .name("회원1")
                                 .profileImage("profile.png")
                                 .reliability(4.7d)
                                 .oauthId("12345")
@@ -594,7 +594,7 @@ class AuctionServiceTest {
                                        .seller(seller)
                                        .build();
         final User user = User.builder()
-                              .name("회원")
+                              .name("회원2")
                               .profileImage("profile.png")
                               .reliability(4.7d)
                               .oauthId("12346")

diff --git a/...g/src/test/java/com/ddang/ddang/authentication/application/AuthenticationServiceTest.java b/...g/src/test/java/com/ddang/ddang/authentication/application/AuthenticationServiceTest.java
@@ -146,7 +146,7 @@ void setUp(
     @Test
     void refreshToken을_전달하면_새로운_accessToken을_반환한다() {
         // given
-        final Map<String, Object> privateClaims = Map.of("userId", "12345");
+        final Map<String, Object> privateClaims = Map.of("userId", 1L);
         final String refreshToken = "Bearer " + tokenEncoder.encode(
                 LocalDateTime.now(),
                 TokenType.REFRESH,

diff --git a/...ddang/src/test/java/com/ddang/ddang/authentication/infrastructure/jwt/JwtDecoderTest.java b/...ddang/src/test/java/com/ddang/ddang/authentication/infrastructure/jwt/JwtDecoderTest.java
@@ -73,7 +73,7 @@ void setUp() {
     @Test
     void 유효한_토큰이면_해당_토큰의_본문을_반환한다() {
         // given
-        final Map<String, Object> privateClaims = Map.of("userId", "12345");
+        final Map<String, Object> privateClaims = Map.of("userId", 1L);
         final String accessToken = "Bearer " + jwtEncoder.encode(LocalDateTime.now(), TokenType.ACCESS, privateClaims);
 
         // when