[refactor] : 토큰 generate 메서드 파라미터 변경으로 인한 리팩토링

dnd-side-project · Nov 21, 2024 · 7dd9fab · 7dd9fab
1 parent 0252049
commit 7dd9fab
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/src/test/java/com/dnd/gongmuin/auth/controller/AuthControllerTest.java b/src/test/java/com/dnd/gongmuin/auth/controller/AuthControllerTest.java
@@ -102,7 +102,7 @@ void signUp() throws Exception {
 			savedMember.getSocialEmail(),
 			savedMember.getRole()
 		);
-		String token = tokenProvider.generateAccessToken(new CustomOauth2User(authInfo), new Date());
+		String token = tokenProvider.generateAccessToken(savedMember, new CustomOauth2User(authInfo), new Date());
 		this.loginMember = savedMember;
 		this.accessToken = new Cookie("Authorization", token);
 

diff --git a/src/test/java/com/dnd/gongmuin/auth/service/AuthServiceTest.java b/src/test/java/com/dnd/gongmuin/auth/service/AuthServiceTest.java
@@ -174,10 +174,16 @@ void reissue() {
 		given(cookieUtil.createCookie(anyString())).willReturn(new Cookie("Authorization", "reissueToken"));
 		given(tokenProvider.getAuthentication(anyString())).willReturn(authentication);
 		given(redisUtil.getValues(anyString())).willReturn("refreshToken");
-		given(tokenProvider.generateAccessToken(any(CustomOauth2User.class), any(Date.class))).willReturn(
-			"reissueToken");
-		given(tokenProvider.generateRefreshToken(any(CustomOauth2User.class), any(Date.class))).willReturn(
-			"reissueToken");
+		given(tokenProvider.generateAccessToken(
+			any(Member.class),
+			any(CustomOauth2User.class),
+			any(Date.class)))
+			.willReturn("reissueToken");
+		given(tokenProvider.generateRefreshToken(
+			any(Member.class),
+			any(CustomOauth2User.class),
+			any(Date.class)))
+			.willReturn("reissueToken");
 
 		// when
 		ReissueResponse response = authService.reissue(mockRequest, mockResponse);

diff --git a/src/test/java/com/dnd/gongmuin/common/support/ApiTestSupport.java b/src/test/java/com/dnd/gongmuin/common/support/ApiTestSupport.java
@@ -54,8 +54,8 @@ public void setUpMember() {
 			savedMember.getSocialEmail(),
 			savedMember.getRole()
 		);
-		String token = tokenProvider.generateAccessToken(new CustomOauth2User(authInfo), new Date());
-		tokenProvider.generateRefreshToken(new CustomOauth2User(authInfo), new Date());
+		String token = tokenProvider.generateAccessToken(savedMember, new CustomOauth2User(authInfo), new Date());
+		tokenProvider.generateRefreshToken(savedMember, new CustomOauth2User(authInfo), new Date());
 		this.loginMember = savedMember;
 		this.accessToken = cookieUtil.createCookie(token);
 	}

diff --git a/src/test/java/com/dnd/gongmuin/security/jwt/TokenProviderTest.java b/src/test/java/com/dnd/gongmuin/security/jwt/TokenProviderTest.java
@@ -66,7 +66,7 @@ void generateAccessToken() {
 		CustomOauth2User authentication = new CustomOauth2User(authInfo);
 
 		// when
-		String accessToken = tokenProvider.generateAccessToken(authentication, now);
+		String accessToken = tokenProvider.generateAccessToken(MemberFixture.member(1L), authentication, now);
 		Claims claims = Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(accessToken).getPayload();
 		Date expiration = claims.getExpiration();
 
@@ -85,25 +85,25 @@ void generateRefreshToken() {
 		CustomOauth2User authentication = new CustomOauth2User(authInfo);
 
 		// when
-		String accessToken = tokenProvider.generateRefreshToken(authentication, now);
+		String accessToken = tokenProvider.generateRefreshToken(MemberFixture.member(1L), authentication, now);
 		Claims claims = Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(accessToken).getPayload();
 		Date expiration = claims.getExpiration();
 
 		// then
 		assertThat(expiration.getTime()).isCloseTo(expectedExpirationTime, within(1000L));
 	}
 
-	@DisplayName("토큰 파싱을 통해 만들어진 인증 객체의 이메일은 토큰 정보의 이메일 값과 동일하다.")
+	@DisplayName("토큰 파싱을 통해 만들어진 인증 객체의 이메일은 회원 이메일과 동일하다.")
 	@Test
 	void getAuthentication() {
 		// given
 		Date now = new Date();
 
-		Member member = MemberFixture.member();
+		Member member = MemberFixture.member(1L);
 		CustomOauth2User customOauth2User = new CustomOauth2User(authInfo);
-		String accessToken = tokenProvider.generateAccessToken(customOauth2User, now);
+		String accessToken = tokenProvider.generateAccessToken(member, customOauth2User, now);
 
-		given(memberRepository.findBySocialEmail(anyString())).willReturn(Optional.ofNullable(member));
+		given(memberRepository.findById(anyLong())).willReturn(Optional.ofNullable(member));
 
 		// when
 		Authentication authentication = tokenProvider.getAuthentication(accessToken);
@@ -121,7 +121,7 @@ void validateToken() {
 		Date past = new Date(124, 6, 30, 16, 0, 0);
 
 		CustomOauth2User customOauth2User = new CustomOauth2User(authInfo);
-		String accessToken = tokenProvider.generateRefreshToken(customOauth2User, past);
+		String accessToken = tokenProvider.generateRefreshToken(MemberFixture.member(1L), customOauth2User, past);
 
 		// when
 		boolean result = tokenProvider.validateToken(accessToken, new Date());