Merge pull request #25 from coffee-meet/feat/#23

Feat/#23 리프레시 토큰 저장 기능 구현
coffee-meet · Oct 23, 2023 · d3be467 · d3be467
2 parents 5588ad0 + 5976154
commit d3be467
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/...t/server/auth/RefreshTokenRepository.java → ...nfrastructure/RefreshTokenRepository.java b/...t/server/auth/RefreshTokenRepository.java → ...nfrastructure/RefreshTokenRepository.java
@@ -1,4 +1,4 @@
-package coffeemeet.server.auth;
+package coffeemeet.server.auth.infrastructure;
 
 import coffeemeet.server.auth.domain.RefreshToken;
 import org.springframework.data.repository.CrudRepository;

diff --git a/src/main/java/coffeemeet/server/auth/utils/AuthTokensGenerator.java b/src/main/java/coffeemeet/server/auth/utils/AuthTokensGenerator.java
@@ -1,5 +1,7 @@
 package coffeemeet.server.auth.utils;
 
+import coffeemeet.server.auth.domain.RefreshToken;
+import coffeemeet.server.auth.infrastructure.RefreshTokenRepository;
 import java.util.Date;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -12,14 +14,16 @@ public class AuthTokensGenerator {
   private final JwtTokenProvider jwtTokenProvider;
   private final Long accessTokenExpireTime;
   private final Long refreshTokenExpireTime;
+  private final RefreshTokenRepository refreshTokenRepository;
 
   public AuthTokensGenerator(JwtTokenProvider jwtTokenProvider,
       @Value("${jwt.access-token-expire-time}") Long accessTokenExpireTime,
-      @Value("${jwt.refresh-token-expire-time}") Long refreshTokenExpireTime
-  ) {
+      @Value("${jwt.refresh-token-expire-time}") Long refreshTokenExpireTime,
+      RefreshTokenRepository refreshTokenRepository) {
     this.jwtTokenProvider = jwtTokenProvider;
     this.accessTokenExpireTime = accessTokenExpireTime;
     this.refreshTokenExpireTime = refreshTokenExpireTime;
+    this.refreshTokenRepository = refreshTokenRepository;
   }
 
   public AuthTokens generate(Long userId) {
@@ -31,6 +35,12 @@ public AuthTokens generate(Long userId) {
     String accessToken = jwtTokenProvider.generate(subject, accessTokenExpiredAt);
     String refreshToken = jwtTokenProvider.generate(subject, refreshTokenExpiredAt);
 
+    RefreshToken refreshTokenEntity = RefreshToken.builder()
+        .userId(userId)
+        .value(refreshToken)
+        .build();
+    refreshTokenRepository.save(refreshTokenEntity);
+
     return AuthTokens.of(
         BEARER_TYPE + accessToken,
         BEARER_TYPE + refreshToken

diff --git a/src/main/java/coffeemeet/server/common/UserArgumentResolver.java b/src/main/java/coffeemeet/server/common/UserArgumentResolver.java
@@ -1,7 +1,7 @@
 package coffeemeet.server.common;
 
-import coffeemeet.server.auth.RefreshTokenRepository;
 import coffeemeet.server.auth.domain.RefreshToken;
+import coffeemeet.server.auth.infrastructure.RefreshTokenRepository;
 import coffeemeet.server.auth.utils.JwtTokenProvider;
 import coffeemeet.server.common.annotation.Login;
 import coffeemeet.server.user.dto.AuthInfo;
@@ -18,7 +18,7 @@
 @RequiredArgsConstructor
 public class UserArgumentResolver implements HandlerMethodArgumentResolver {
 
-  public static final String USER_AUTHENTICATION_FAILED_MESSAGE = "사용자(%s)의 갱신 토큰이 존재하지 않습니다.";
+  public static final String USER_AUTHENTICATION_FAILED_MESSAGE = "사용자(%s)의 재인증(로그인)이 필요합니다.";
   private static final String HEADER_AUTHENTICATION_FAILED_MESSAGE = "(%s)는 잘못된 권한 헤더입니다.";
 
   private final JwtTokenProvider jwtTokenProvider;

diff --git a/src/main/java/coffeemeet/server/common/config/AuthWebConfig.java b/src/main/java/coffeemeet/server/common/config/AuthWebConfig.java
@@ -1,6 +1,6 @@
 package coffeemeet.server.common.config;
 
-import coffeemeet.server.auth.RefreshTokenRepository;
+import coffeemeet.server.auth.infrastructure.RefreshTokenRepository;
 import coffeemeet.server.auth.utils.JwtTokenProvider;
 import coffeemeet.server.auth.utils.converter.OAuthProviderConverter;
 import coffeemeet.server.common.UserArgumentResolver;

diff --git a/src/test/java/coffeemeet/server/common/config/ControllerTestConfig.java b/src/test/java/coffeemeet/server/common/config/ControllerTestConfig.java
@@ -3,7 +3,7 @@
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 
-import coffeemeet.server.auth.RefreshTokenRepository;
+import coffeemeet.server.auth.infrastructure.RefreshTokenRepository;
 import coffeemeet.server.auth.utils.JwtTokenProvider;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;