Merge pull request #313 from Codiary-UMC-6th/test/#312-setting-jwt-test

Test: test 관련 설정

build.gradle

@@ -39,6 +39,8 @@ dependencies {
     // Lombok
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 
     // MySQL
     runtimeOnly 'com.mysql:mysql-connector-j'
@@ -66,6 +68,8 @@ dependencies {
 
     // Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
 

src/main/java/com/codiary/backend/domain/member/service/AuthService.java

@@ -9,6 +9,8 @@
 import com.codiary.backend.global.apiPayload.exception.handler.MemberHandler;
 import com.codiary.backend.global.jwt.JwtTokenProvider;
 import com.codiary.backend.global.jwt.TokenInfo;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -19,9 +21,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
 @Service
 @RequiredArgsConstructor
 public class AuthService {
@@ -98,7 +97,7 @@ public MemberResponseDTO.MemberTokenResponseDTO login(MemberRequestDTO.MemberLog
 
             // 3. 인증 정보를 기반으로 JWT 토큰 생성
             Member getMember = memberRepository.findByEmail(request.email()).orElseThrow();
-            TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication, getMember.getMemberId());
+            TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication);
 
             return MemberResponseDTO.MemberTokenResponseDTO.builder()
                     .email(getMember.getEmail())

src/main/java/com/codiary/backend/domain/member/service/SocialLoginService.java

@@ -72,8 +72,7 @@ public MemberResponseDTO.MemberTokenResponseDTO kakaoLogin(String code, String r
         }
         Member member = memberRepository.findByEmail(userEmail).get();
 
-
-        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail(), member.getMemberId());
+        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail());
 
         return MemberResponseDTO.MemberTokenResponseDTO.builder()
                 .email(member.getEmail())
@@ -102,7 +101,7 @@ public MemberResponseDTO.MemberTokenResponseDTO naverLogin(String code, String s
         }
         Member member = memberRepository.findByEmail(userEmail).get();
 
-        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail(), member.getMemberId());
+        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail());
 
         return MemberResponseDTO.MemberTokenResponseDTO.builder()
                 .email(member.getEmail())
@@ -130,7 +129,7 @@ public MemberResponseDTO.MemberTokenResponseDTO githubLogin(String code) {
         }
         Member member = memberRepository.findByEmail(userEmail).get();
 
-        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail(), member.getMemberId());
+        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail());
 
         return MemberResponseDTO.MemberTokenResponseDTO.builder()
                 .email(member.getEmail())
@@ -161,7 +160,7 @@ public MemberResponseDTO.MemberTokenResponseDTO googleLogin(String code, String
         }
         Member member = memberRepository.findByEmail(userEmail).get();
 
-        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail(), member.getMemberId());
+        TokenInfo tokenInfo = jwtTokenProvider.generateToken(member.getEmail());
 
         return MemberResponseDTO.MemberTokenResponseDTO.builder()
                 .email(member.getEmail())

src/main/java/com/codiary/backend/global/jwt/JwtTokenProvider.java

@@ -42,7 +42,7 @@ public JwtTokenProvider(@Value("${jwt.secret}") String secretKey, CustomMemberDe
     }
 
     // token 생성
-    public TokenInfo generateToken(Authentication authentication, Long memberId) {
+    public TokenInfo generateToken(Authentication authentication) {
         // 권한 가져오기
         String authorities = authentication.getAuthorities().stream()
                 .map(GrantedAuthority::getAuthority)
@@ -55,7 +55,6 @@ public TokenInfo generateToken(Authentication authentication, Long memberId) {
         String accessToken = Jwts.builder()
                 .setSubject(authentication.getName())
                 .claim(AUTHORITIES_KEY, authorities)
-                .claim("memberId", memberId)
                 .setExpiration(accessTokenExpiresIn)
                 .signWith(key, SignatureAlgorithm.HS256)
                 .compact();
@@ -76,15 +75,14 @@ public TokenInfo generateToken(Authentication authentication, Long memberId) {
     }
 
     // 이메일로 토큰 생성
-    public TokenInfo generateToken(String email, Long memberId) {
+    public TokenInfo generateToken(String email) {
         long now = (new Date()).getTime();
 
         // Access Token 생성
         Date accessTokenExpiresIn = new Date(now + ACCESS_TOKEN_EXPIRE_TIME);
         String accessToken = Jwts.builder()
                 .setSubject(email)
                 .claim(AUTHORITIES_KEY, "ROLE_USER")
-                .claim("memberId", memberId)
                 .setExpiration(accessTokenExpiresIn)
                 .signWith(key, SignatureAlgorithm.HS256)
                 .compact();

src/test/java/com/codiary/backend/domain/MemberTest.java

@@ -0,0 +1,48 @@
+package com.codiary.backend.domain;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.codiary.backend.global.jwt.JwtTokenProvider;
+import com.codiary.backend.global.jwt.TokenInfo;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class MemberTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+    @Autowired
+    private JwtTokenProvider jwtTokenProvider;
+
+    private String token;
+
+    @BeforeEach
+    public void setup() {
+        // 존재하는 사용자 정보를 바탕으로 토큰을 생성합니다. DB에 있는 사용자의 email을 입력해주어야 해요.
+        TokenInfo token = jwtTokenProvider.generateToken("[email protected]");
+        this.token = token.getAccessToken();
+    }
+
+    @Test
+    public void test() throws Exception {
+        // Test 하고자 하는 url을 입력
+        MvcResult result = mockMvc.perform(
+                get("/api/v2/member/info").header("Authorization", "Bearer " + token)
+                )
+                .andExpect(status().isOk())
+                .andReturn();
+
+        // 응답 분석 (body든 뭐든 정보 꺼내서 확인해봅니다.)
+        String responseBody = result.getResponse().getContentAsString();
+        assertThat(responseBody).contains("\"email\":\"[email protected]\"");
+    }
+}