test(jwt): 프로덕션 코드 수정에 따라서 테스트 코드 수정

- jwt claims에서 UUID 추출이 불가능해서 String으로 추출 후, UUID로 변경

Author: m-a-king

src/test/java/com/somemore/global/auth/jwt/service/JwtServiceTest.java

@@ -1,5 +1,6 @@
 package com.somemore.global.auth.jwt.service;
 
+import com.somemore.global.auth.authentication.UserIdentity;
 import com.somemore.global.auth.jwt.domain.EncodedToken;
 import com.somemore.global.auth.jwt.domain.RefreshToken;
 import com.somemore.global.auth.jwt.domain.TokenType;
@@ -17,6 +18,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.crypto.SecretKey;
 import java.time.Instant;
@@ -26,7 +28,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-
+@Transactional
 class JwtServiceTest extends IntegrationTestSupport {
 
     @Autowired
@@ -40,6 +42,11 @@ class JwtServiceTest extends IntegrationTestSupport {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
+    private final UUID userId = UUID.randomUUID();
+    private final UUID roleId = UUID.randomUUID();
+    private final UserRole role = UserRole.VOLUNTEER;
+    private final UserIdentity userIdentity = UserIdentity.of(userId, roleId, role);;
+
     @AfterEach
     void tearDown() {
         redisTemplate.keys("*")
@@ -50,16 +57,14 @@ void tearDown() {
     @Test
     void generateAndValidateAccessToken() {
         // given
-        String userId = UUID.randomUUID().toString();
-        UserRole role = UserRole.VOLUNTEER;
-        TokenType tokenType = TokenType.ACCESS;
 
         // when
-        EncodedToken token = jwtService.generateToken(userId, role.getAuthority(), tokenType);
+        EncodedToken token = jwtService.generateToken(userIdentity, TokenType.ACCESS);
 
         // then
         Claims claims = jwtService.getClaims(token);
-        assertThat(claims.get("id", String.class)).isEqualTo(userId);
+        assertThat(claims.get("userId", String.class)).isEqualTo(userId.toString());
+        assertThat(claims.get("roleId", String.class)).isEqualTo(roleId.toString());
         assertThat(claims.get("role", String.class)).isEqualTo(role.getAuthority());
         assertThat(claims.getExpiration()).isNotNull();
     }
@@ -68,16 +73,14 @@ void generateAndValidateAccessToken() {
     @Test
     void generateAndValidateLoginToken() {
         // given
-        String userId = UUID.randomUUID().toString();
-        UserRole role = UserRole.VOLUNTEER;
-        TokenType tokenType = TokenType.ACCESS;
 
         // when
-        EncodedToken token = jwtService.generateToken(userId, role.getAuthority(), tokenType);
+        EncodedToken token = jwtService.generateToken(userIdentity, TokenType.SIGN_IN);
 
         // then
         Claims claims = jwtService.getClaims(token);
-        assertThat(claims.get("id", String.class)).isEqualTo(userId);
+        assertThat(claims.get("userId", String.class)).isEqualTo(userId.toString());
+        assertThat(claims.get("roleId", String.class)).isEqualTo(roleId.toString());
         assertThat(claims.get("role", String.class)).isEqualTo(role.getAuthority());
         assertThat(claims.getExpiration()).isNotNull();
     }
@@ -86,12 +89,10 @@ void generateAndValidateLoginToken() {
     @Test
     void tokenExpirationPeriodIsExact() {
         // given
-        String userId = UUID.randomUUID().toString();
-        UserRole role = UserRole.VOLUNTEER;
 
         // when
-        EncodedToken accessToken = jwtService.generateToken(userId, role.getAuthority(), TokenType.ACCESS);
-        EncodedToken refreshToken = jwtService.generateToken(userId, role.getAuthority(), TokenType.REFRESH);
+        EncodedToken accessToken = jwtService.generateToken(userIdentity, TokenType.ACCESS);
+        EncodedToken refreshToken = jwtService.generateToken(userIdentity, TokenType.REFRESH);
 
         // then
         Claims accessClaims = jwtService.getClaims(accessToken);
@@ -108,12 +109,10 @@ void tokenExpirationPeriodIsExact() {
     @Test
     void multipleTokensForSameUserAreDifferent() {
         // given
-        String userId = UUID.randomUUID().toString();
-        UserRole role = UserRole.VOLUNTEER;
 
         // when
-        EncodedToken token1 = jwtService.generateToken(userId, role.getAuthority(), TokenType.ACCESS);
-        EncodedToken token2 = jwtService.generateToken(userId, role.getAuthority(), TokenType.ACCESS);
+        EncodedToken token1 = jwtService.generateToken(userIdentity, TokenType.ACCESS);
+        EncodedToken token2 = jwtService.generateToken(userIdentity, TokenType.ACCESS);
 
         // then
         assertThat(token1.value()).isNotEqualTo(token2.value());
@@ -123,12 +122,10 @@ void multipleTokensForSameUserAreDifferent() {
     @Test
     void throwExceptionWhenRefreshTokenIsInvalid() {
         // given
-        String userId = UUID.randomUUID().toString();
-        UserRole role = UserRole.VOLUNTEER;
-        EncodedToken expiredAccessToken = createExpiredToken(userId, role);
+        EncodedToken expiredAccessToken = createExpiredToken(userId.toString(), role);
+        EncodedToken expiredRefreshToken = createExpiredToken(userId.toString(), role);
 
-        EncodedToken expiredRefreshToken = createExpiredToken(userId, role);
-        RefreshToken refreshToken = new RefreshToken(userId, expiredAccessToken, expiredRefreshToken);
+        RefreshToken refreshToken = new RefreshToken(userId.toString(), expiredAccessToken, expiredRefreshToken);
         tokenManager.save(refreshToken);
 
         // when
@@ -167,7 +164,7 @@ void refreshTokenIsUpdated() {
         EncodedToken expiredAccessToken = createExpiredToken(userId, role);
         RefreshToken oldRefreshToken = createAndSaveRefreshToken(userId, expiredAccessToken, Instant.now().plusMillis(TokenType.REFRESH.getPeriodInMillis()));
 
-        EncodedToken newAccessToken = jwtService.generateToken(userId, role.getAuthority(), TokenType.ACCESS);
+        EncodedToken newAccessToken = jwtService.generateToken(userIdentity, TokenType.ACCESS);
         RefreshToken newRefreshToken = createAndSaveRefreshToken(userId, newAccessToken, Instant.now().plusMillis(TokenType.REFRESH.getPeriodInMillis()));
 
         // when

src/test/java/com/somemore/global/auth/sign/SignOutVolunteerServiceTest.java

@@ -1,5 +1,6 @@
 package com.somemore.global.auth.sign;
 
+import com.somemore.global.auth.authentication.UserIdentity;
 import com.somemore.global.auth.jwt.domain.EncodedToken;
 import com.somemore.global.auth.jwt.domain.TokenType;
 import com.somemore.global.auth.jwt.exception.JwtErrorType;
@@ -17,12 +18,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+@Transactional
 class SignOutServiceTest extends IntegrationTestSupport {
 
     @Autowired
@@ -35,15 +38,15 @@ class SignOutServiceTest extends IntegrationTestSupport {
     private RedisTemplate<String, Object> redisTemplate;
 
     private MockHttpServletResponse response;
-    private UUID userId;
-    private UserRole role;
 
+    private final UUID userId = UUID.randomUUID();
+    private final UUID roleId = UUID.randomUUID();
+    private final UserRole role = UserRole.VOLUNTEER;
+    private final UserIdentity userIdentity = UserIdentity.of(userId, roleId, role);;
 
     @BeforeEach
     void setUp() {
         response = new MockHttpServletResponse();
-        userId = UUID.randomUUID();
-        role = UserRole.VOLUNTEER;
     }
 
     @AfterEach
@@ -53,15 +56,15 @@ void tearDown() {
     }
 
     @Test
-    @DisplayName("로그아웃 시 액세스 토큰 쿠키를 삭제하고 리프레시 토큰을 제거해야 한다.")
+    @DisplayName("로그아웃 시 리프레시 토큰을 제거해야 한다.")
     void signOutDeletesTokens() {
         // Given
-        EncodedToken accessToken = jwtGenerator.generateToken(userId.toString(), role.getAuthority(), TokenType.ACCESS);
+        EncodedToken accessToken = jwtGenerator.generateToken(userIdentity, TokenType.ACCESS);
 
         RefreshToken refreshToken = new RefreshToken(
                 userId.toString(),
                 accessToken,
-                jwtGenerator.generateToken(userId.toString(), role.getAuthority(), TokenType.REFRESH));
+                jwtGenerator.generateToken(userIdentity, TokenType.REFRESH));
 
         tokenManager.save(refreshToken);