refactor: 문자열 토큰을 Token 클래스로

src/main/java/com/example/solidconnection/auth/controller/AuthController.java

@@ -9,6 +9,7 @@
 import com.example.solidconnection.auth.dto.SignUpRequest;
 import com.example.solidconnection.auth.dto.oauth.OAuthCodeRequest;
 import com.example.solidconnection.auth.dto.oauth.OAuthResponse;
+import com.example.solidconnection.auth.service.AccessToken;
 import com.example.solidconnection.auth.service.AuthService;
 import com.example.solidconnection.auth.service.CommonSignUpTokenProvider;
 import com.example.solidconnection.auth.service.EmailSignInService;
@@ -97,11 +98,10 @@ public ResponseEntity<SignInResponse> signUp(
     public ResponseEntity<Void> signOut(
             Authentication authentication
     ) {
-        String token = authentication.getCredentials().toString();
-        if (token == null) {
+        if (!(authentication.getCredentials() instanceof AccessToken accessToken)) { // null or AccessToken 로 형변환 실패
             throw new CustomException(ErrorCode.AUTHENTICATION_FAILED, "토큰이 없습니다.");
         }
-        authService.signOut(token);
+        authService.signOut(accessToken);
         return ResponseEntity.ok().build();
     }
 

src/main/java/com/example/solidconnection/auth/dto/ReissueResponse.java

@@ -1,5 +1,12 @@
 package com.example.solidconnection.auth.dto;
 
+import com.example.solidconnection.auth.service.AccessToken;
+
 public record ReissueResponse(
-        String accessToken) {
+        String accessToken
+) {
+
+    public static ReissueResponse from(AccessToken accessToken) {
+        return new ReissueResponse(accessToken.token());
+    }
 }

src/main/java/com/example/solidconnection/auth/dto/SignInResponse.java

@@ -1,7 +1,14 @@
 package com.example.solidconnection.auth.dto;
 
+import com.example.solidconnection.auth.service.AccessToken;
+import com.example.solidconnection.auth.service.RefreshToken;
+
 public record SignInResponse(
         String accessToken,
         String refreshToken
 ) {
+
+    public static SignInResponse of(AccessToken accessToken, RefreshToken refreshToken) {
+        return new SignInResponse(accessToken.token(), refreshToken.token());
+    }
 }

src/main/java/com/example/solidconnection/auth/service/AccessToken.java

@@ -0,0 +1,11 @@
+package com.example.solidconnection.auth.service;
+
+public record AccessToken(
+        Subject subject,
+        String token
+) {
+
+    public AccessToken(String subject, String token) {
+        this(new Subject(subject), token);
+    }
+}

src/main/java/com/example/solidconnection/auth/service/AuthService.java

@@ -1,35 +1,29 @@
 package com.example.solidconnection.auth.service;
 
-
 import com.example.solidconnection.auth.dto.ReissueRequest;
 import com.example.solidconnection.auth.dto.ReissueResponse;
-import com.example.solidconnection.config.security.JwtProperties;
 import com.example.solidconnection.custom.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
-import java.util.Objects;
-import java.util.Optional;
 
 import static com.example.solidconnection.custom.exception.ErrorCode.REFRESH_TOKEN_EXPIRED;
-import static com.example.solidconnection.util.JwtUtils.parseSubject;
 
 @RequiredArgsConstructor
 @Service
 public class AuthService {
 
     private final AuthTokenProvider authTokenProvider;
-    private final JwtProperties jwtProperties;
 
     /*
      * 로그아웃 한다.
      * - 엑세스 토큰을 블랙리스트에 추가한다.
      * */
-    public void signOut(String accessToken) {
-        authTokenProvider.generateAndSaveBlackListToken(accessToken);
+    public void signOut(AccessToken accessToken) {
+        authTokenProvider.addToBlacklist(accessToken);
     }
 
     /*
@@ -45,19 +39,18 @@ public void quit(SiteUser siteUser) {
 
     /*
      * 액세스 토큰을 재발급한다.
-     * - 요청된 리프레시 토큰과 동일한 subject 의 토큰이 저장되어 있으며 값이 일치할 경우, 액세스 토큰을 재발급한다.
-     * - 그렇지 않으면 예외를 반환한다.
+     * - 유효한 리프레시토큰이면, 액세스 토큰을 재발급한다.
+     * - 그렇지 않으면 예외를 발생시킨다.
      * */
     public ReissueResponse reissue(ReissueRequest reissueRequest) {
         // 리프레시 토큰 확인
         String requestedRefreshToken = reissueRequest.refreshToken();
-        String subject = parseSubject(requestedRefreshToken, jwtProperties.secret());
-        Optional<String> savedRefreshToken = authTokenProvider.findRefreshToken(subject);
-        if (!Objects.equals(requestedRefreshToken, savedRefreshToken.orElse(null))) {
+        if (!authTokenProvider.isValidRefreshToken(requestedRefreshToken)) {
             throw new CustomException(REFRESH_TOKEN_EXPIRED);
         }
         // 액세스 토큰 재발급
-        String newAccessToken = authTokenProvider.generateAccessToken(subject);
-        return new ReissueResponse(newAccessToken);
+        Subject subject = authTokenProvider.parseSubject(requestedRefreshToken);
+        AccessToken newAccessToken = authTokenProvider.generateAccessToken(subject);
+        return ReissueResponse.from(newAccessToken);
     }
 }

src/main/java/com/example/solidconnection/auth/service/AuthTokenProvider.java

@@ -3,49 +3,70 @@
 import com.example.solidconnection.auth.domain.TokenType;
 import com.example.solidconnection.config.security.JwtProperties;
 import com.example.solidconnection.siteuser.domain.SiteUser;
+import com.example.solidconnection.util.JwtUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import java.util.Optional;
+import java.util.Objects;
 
 @Component
-public class AuthTokenProvider extends TokenProvider {
+public class AuthTokenProvider extends TokenProvider implements BlacklistChecker {
 
     public AuthTokenProvider(JwtProperties jwtProperties, RedisTemplate<String, String> redisTemplate) {
         super(jwtProperties, redisTemplate);
     }
 
-    public String generateAccessToken(SiteUser siteUser) {
-        String subject = getSubject(siteUser);
-        return generateToken(subject, TokenType.ACCESS);
+    public AccessToken generateAccessToken(Subject subject) {
+        String token = generateToken(subject.value(), TokenType.ACCESS);
+        return new AccessToken(subject, token);
     }
 
-    public String generateAccessToken(String subject) {
-        return generateToken(subject, TokenType.ACCESS);
+    public RefreshToken generateAndSaveRefreshToken(Subject subject) {
+        String token = generateToken(subject.value(), TokenType.REFRESH);
+        saveToken(token, TokenType.REFRESH);
+        return new RefreshToken(subject, token);
     }
 
-    public String generateAndSaveRefreshToken(SiteUser siteUser) {
-        String subject = getSubject(siteUser);
-        String refreshToken = generateToken(subject, TokenType.REFRESH);
-        return saveToken(refreshToken, TokenType.REFRESH);
+    /*
+    * 액세스 토큰을 블랙리스트에 저장한다.
+    * - key = BLACKLIST:{subject}
+    * - value = {accessToken}
+    * */
+    public void addToBlacklist(AccessToken accessToken) {
+        saveToken(accessToken.token(), TokenType.BLACKLIST);
     }
 
-    public String generateAndSaveBlackListToken(String accessToken) {
-        String blackListToken = generateToken(accessToken, TokenType.BLACKLIST);
-        return saveToken(blackListToken, TokenType.BLACKLIST);
-    }
-
-    public Optional<String> findRefreshToken(String subject) {
+    /*
+    * 유효한 리프레시 토큰인지 확인한다.
+    * - 요청된 토큰과 같은 subject 의 리프레시 토큰을 조회한다.
+    * - 조회된 리프레시 토큰과 요청된 토큰이 같은지 비교한다.
+    * */
+    public boolean isValidRefreshToken(String requestedRefreshToken) {
+        String subject = JwtUtils.parseSubject(requestedRefreshToken, jwtProperties.secret());
         String refreshTokenKey = TokenType.REFRESH.addPrefix(subject);
-        return Optional.ofNullable(redisTemplate.opsForValue().get(refreshTokenKey));
+        String foundRefreshToken = redisTemplate.opsForValue().get(refreshTokenKey);
+        return Objects.equals(requestedRefreshToken, foundRefreshToken);
     }
 
-    public Optional<String> findBlackListToken(String subject) {
+    /*
+    * 블랙리스트에 등록된 토큰인지 확인한다.
+    * - 액세스 토큰의 subject 에 해당하는 블랙리스트 토큰을 조회한다.
+    * - 조회된 블랙리스트 토큰과 요청된 액세스 토큰이 같은지 비교한다.
+    */
+    @Override
+    public boolean isTokenBlacklisted(String accessToken) {
+        String subject = JwtUtils.parseSubject(accessToken, jwtProperties.secret());
         String blackListTokenKey = TokenType.BLACKLIST.addPrefix(subject);
-        return Optional.ofNullable(redisTemplate.opsForValue().get(blackListTokenKey));
+        String foundBlackListToken = redisTemplate.opsForValue().get(blackListTokenKey);
+        return Objects.equals(accessToken, foundBlackListToken);
+    }
+
+    public Subject parseSubject(String token) {
+        String subject = JwtUtils.parseSubject(token, jwtProperties.secret());
+        return new Subject(subject);
     }
 
-    private String getSubject(SiteUser siteUser) {
-        return siteUser.getId().toString();
+    public Subject toSubject(SiteUser siteUser) {
+        return new Subject(siteUser.getId().toString());
     }
 }

src/main/java/com/example/solidconnection/auth/service/BlacklistChecker.java

@@ -0,0 +1,6 @@
+package com.example.solidconnection.auth.service;
+
+public interface BlacklistChecker {
+
+    boolean isTokenBlacklisted(String token);
+}

src/main/java/com/example/solidconnection/auth/service/RefreshToken.java

@@ -0,0 +1,11 @@
+package com.example.solidconnection.auth.service;
+
+public record RefreshToken(
+        Subject subject,
+        String token
+) {
+
+    RefreshToken(String subject, String token) {
+        this(new Subject(subject), token);
+    }
+}

src/main/java/com/example/solidconnection/auth/service/SignInService.java

@@ -15,9 +15,10 @@ public class SignInService {
     @Transactional
     public SignInResponse signIn(SiteUser siteUser) {
         resetQuitedAt(siteUser);
-        String accessToken = authTokenProvider.generateAccessToken(siteUser);
-        String refreshToken = authTokenProvider.generateAndSaveRefreshToken(siteUser);
-        return new SignInResponse(accessToken, refreshToken);
+        Subject subject = authTokenProvider.toSubject(siteUser);
+        AccessToken accessToken = authTokenProvider.generateAccessToken(subject);
+        RefreshToken refreshToken = authTokenProvider.generateAndSaveRefreshToken(subject);
+        return SignInResponse.of(accessToken, refreshToken);
     }
 
     private void resetQuitedAt(SiteUser siteUser) {

src/main/java/com/example/solidconnection/auth/service/Subject.java

@@ -0,0 +1,6 @@
+package com.example.solidconnection.auth.service;
+
+public record Subject(
+        String value
+) {
+}

src/main/java/com/example/solidconnection/custom/security/filter/SignOutCheckFilter.java

@@ -1,6 +1,6 @@
 package com.example.solidconnection.custom.security.filter;
 
-import com.example.solidconnection.auth.service.AuthTokenProvider;
+import com.example.solidconnection.auth.service.BlacklistChecker;
 import com.example.solidconnection.custom.exception.CustomException;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
@@ -20,7 +20,7 @@
 @RequiredArgsConstructor
 public class SignOutCheckFilter extends OncePerRequestFilter {
 
-    private final AuthTokenProvider authTokenProvider;
+    private final BlacklistChecker tokenBlacklistChecker;
 
     @Override
     protected void doFilterInternal(@NonNull HttpServletRequest request,
@@ -34,6 +34,6 @@ protected void doFilterInternal(@NonNull HttpServletRequest request,
     }
 
     private boolean hasSignedOut(String accessToken) {
-        return authTokenProvider.findBlackListToken(accessToken).isPresent();
+        return tokenBlacklistChecker.isTokenBlacklisted(accessToken);
     }
 }

src/test/java/com/example/solidconnection/auth/service/AuthServiceTest.java

@@ -1,16 +1,13 @@
 package com.example.solidconnection.auth.service;
 
-import com.example.solidconnection.auth.domain.TokenType;
 import com.example.solidconnection.auth.dto.ReissueRequest;
 import com.example.solidconnection.auth.dto.ReissueResponse;
-import com.example.solidconnection.config.security.JwtProperties;
 import com.example.solidconnection.custom.exception.CustomException;
 import com.example.solidconnection.siteuser.domain.SiteUser;
 import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import com.example.solidconnection.support.TestContainerSpringBootTest;
 import com.example.solidconnection.type.PreparationStatus;
 import com.example.solidconnection.type.Role;
-import com.example.solidconnection.util.JwtUtils;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -35,19 +32,16 @@ class AuthServiceTest {
     @Autowired
     private SiteUserRepository siteUserRepository;
 
-    @Autowired
-    private JwtProperties jwtProperties;
-
     @Test
     void 로그아웃한다() {
         // given
-        String accessToken = "accessToken";
+        AccessToken accessToken = authTokenProvider.generateAccessToken(new Subject("subject")); // todo: #296
 
         // when
         authService.signOut(accessToken);
 
         // then
-        assertThat(authTokenProvider.findBlackListToken(accessToken)).isNotNull();
+        assertThat(authTokenProvider.isTokenBlacklisted(accessToken.token())).isTrue();
     }
 
     @Test
@@ -67,26 +61,25 @@ class AuthServiceTest {
     class 토큰을_재발급한다 {
 
         @Test
-        void 요청의_리프레시_토큰이_저장되어_있고_값이_일치면_액세스_토큰을_재발급한다() {
+        void 요청의_리프레시_토큰이_저장되어_있으면_액세스_토큰을_재발급한다() {
             // given
-            SiteUser siteUser = createSiteUser();
-            String refreshToken = authTokenProvider.generateAndSaveRefreshToken(siteUser);
-            ReissueRequest reissueRequest = new ReissueRequest(refreshToken);
+            RefreshToken refreshToken = authTokenProvider.generateAndSaveRefreshToken(new Subject("subject"));
+            ReissueRequest reissueRequest = new ReissueRequest(refreshToken.token());
 
             // when
             ReissueResponse reissuedAccessToken = authService.reissue(reissueRequest);
 
-            // then
-            String actualSubject = JwtUtils.parseSubject(reissuedAccessToken.accessToken(), jwtProperties.secret());
-            String expectedSubject = JwtUtils.parseSubject(refreshToken, jwtProperties.secret());
+            // then - 요청의 리프레시 토큰과 재발급한 액세스 토큰의 subject 가 동일해야 한다.
+            Subject expectedSubject = authTokenProvider.parseSubject(refreshToken.token());
+            Subject actualSubject = authTokenProvider.parseSubject(reissuedAccessToken.accessToken());
             assertThat(actualSubject).isEqualTo(expectedSubject);
         }
 
         @Test
         void 요청의_리프레시_토큰이_저장되어있지_않다면_예외_응답을_반환한다() {
             // given
-            String refreshToken = authTokenProvider.generateToken("subject", TokenType.REFRESH);
-            ReissueRequest reissueRequest = new ReissueRequest(refreshToken);
+            String invalidRefreshToken = authTokenProvider.generateAccessToken(new Subject("subject")).token();
+            ReissueRequest reissueRequest = new ReissueRequest(invalidRefreshToken);
 
             // when, then
             assertThatCode(() -> authService.reissue(reissueRequest))