accessToken과 refreshToken을 추출하는 메서드 분리 (#13)

refreshToken을 추출하는 메서드를 추가했습니다. 기존에는 accessToken만 추출을 하였는데, refreshToken 또한 추출하여서 내부 값을 확인해야하므로 메서드를 추가하였습니다. 추가적으로 formatter를 제거하고, 전반적인 코드의 format을 변경하였습니다. 버전 업을 할 때 한꺼번에 하고 싶었습니다.
SWM-KAWAI-MANS · Sep 10, 2023 · bba7e02 · bba7e02
1 parent 591b5f3
commit bba7e02
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 47 deletions.
diff --git a/.github/workflows/reformat-java.yml b/.github/workflows/reformat-java.yml
diff --git a/src/main/java/online/partyrun/jwtmanager/JwtExtractor.java b/src/main/java/online/partyrun/jwtmanager/JwtExtractor.java
@@ -3,5 +3,7 @@
 import online.partyrun.jwtmanager.dto.JwtPayload;
 
 public interface JwtExtractor {
-    JwtPayload extract(String accessToken);
+    JwtPayload extractAccessToken(String accessToken);
+
+    JwtPayload extractRefreshToken(String refreshToken);
 }
diff --git a/src/main/java/online/partyrun/jwtmanager/config/JwtConfig.java b/src/main/java/online/partyrun/jwtmanager/config/JwtConfig.java
@@ -4,10 +4,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
-
 import online.partyrun.jwtmanager.manager.JwtManager;
 import online.partyrun.jwtmanager.manager.TokenManager;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -22,9 +20,8 @@ public class JwtConfig {
     public JwtManager jwtManager(
             @Value("${jwt.access-secret-key}") String accessKey,
             @Value("${jwt.access-expire-second:#{'1'}}") Long accessExpireSecond,
-            @Value(
-                            "${jwt.refresh-secret-key:#{'DefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefault'}}")
-                    String refreshKey,
+            @Value("${jwt.refresh-secret-key:#{'DefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefaultDefault'}}")
+            String refreshKey,
             @Value("${jwt.refresh-expire-second:#{'1'}}") Long refreshExpireSecond) {
         log.info("Starting JwtManager");
         return new JwtManager(

diff --git a/src/main/java/online/partyrun/jwtmanager/dto/JwtPayload.java b/src/main/java/online/partyrun/jwtmanager/dto/JwtPayload.java
@@ -3,4 +3,5 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-public record JwtPayload(String id, List<String> roles, LocalDateTime expireAt) {}
+public record JwtPayload(String id, List<String> roles, LocalDateTime expireAt) {
+}
diff --git a/src/main/java/online/partyrun/jwtmanager/dto/JwtToken.java b/src/main/java/online/partyrun/jwtmanager/dto/JwtToken.java
@@ -3,4 +3,5 @@
 import lombok.Builder;
 
 @Builder
-public record JwtToken(String accessToken, String refreshToken) {}
+public record JwtToken(String accessToken, String refreshToken) {
+}
diff --git a/src/main/java/online/partyrun/jwtmanager/manager/JwtManager.java b/src/main/java/online/partyrun/jwtmanager/manager/JwtManager.java
@@ -3,7 +3,6 @@
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
-
 import online.partyrun.jwtmanager.JwtExtractor;
 import online.partyrun.jwtmanager.JwtGenerator;
 import online.partyrun.jwtmanager.dto.JwtPayload;
@@ -26,11 +25,6 @@ public JwtToken generate(String id, Set<String> roles) {
                 .build();
     }
 
-    @Override
-    public JwtPayload extract(String accessToken) {
-        return accessTokenManager.extract(accessToken);
-    }
-
     @Override
     public JwtToken refresh(String refreshToken) {
         final JwtPayload jwtPayload = refreshTokenManager.extract(refreshToken);
@@ -39,4 +33,14 @@ public JwtToken refresh(String refreshToken) {
                 .refreshToken(refreshTokenManager.generate(jwtPayload.id(), jwtPayload.roles()))
                 .build();
     }
+
+    @Override
+    public JwtPayload extractAccessToken(String accessToken) {
+        return accessTokenManager.extract(accessToken);
+    }
+
+    @Override
+    public JwtPayload extractRefreshToken(String refreshToken) {
+        return refreshTokenManager.extract(refreshToken);
+    }
 }
diff --git a/src/main/java/online/partyrun/jwtmanager/manager/TokenManager.java b/src/main/java/online/partyrun/jwtmanager/manager/TokenManager.java
@@ -5,19 +5,19 @@
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
-
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-
 import online.partyrun.jwtmanager.dto.JwtPayload;
-
 import org.springframework.util.StringUtils;
 
 import java.security.Key;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class TokenManager {

diff --git a/src/test/java/online/partyrun/jwtmanager/manager/JwtManagerTest.java b/src/test/java/online/partyrun/jwtmanager/manager/JwtManagerTest.java
@@ -1,17 +1,15 @@
 package online.partyrun.jwtmanager.manager;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
-
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-
 import online.partyrun.jwtmanager.dto.JwtToken;
-
 import org.junit.jupiter.api.*;
 
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
 @DisplayName("JwtManagerTest 클래스")
 @FieldDefaults(level = AccessLevel.PRIVATE)
 class JwtManagerTest {

diff --git a/src/test/java/online/partyrun/jwtmanager/manager/TokenManagerTest.java b/src/test/java/online/partyrun/jwtmanager/manager/TokenManagerTest.java
@@ -1,17 +1,10 @@
 package online.partyrun.jwtmanager.manager;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertAll;
-
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.MalformedJwtException;
-
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
-
 import online.partyrun.jwtmanager.dto.JwtPayload;
-
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EmptySource;
@@ -22,6 +15,10 @@
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
 @DisplayName("TokenManager 클래스")
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 class TokenManagerTest {