#18 [Update] jwt 토큰 부분 코드 리팩토링

MeongPanNyaengPan-MPNP · Jul 18, 2022 · 61b48f9 · 61b48f9
1 parent 8224362
commit 61b48f9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/src/main/java/com/mpnp/baechelin/login/jwt/AuthToken.java b/src/main/java/com/mpnp/baechelin/login/jwt/AuthToken.java
@@ -60,24 +60,11 @@ public boolean tokenValidate() {
 
     // 토큰의 claims, payload 값 가져오기
     public Claims getTokenClaims() {
-        try {
-            return Jwts.parserBuilder()
-                    .setSigningKey(key)
-                    .build()
-                    .parseClaimsJws(token)
-                    .getBody();
-        } catch (SignatureException e) {
-            log.info("잘못된 JWT 서명입니다.");
-        } catch (MalformedJwtException e) {
-            log.info("유효하지 않은 구성의 JWT 토큰입니다.");
-        } catch (ExpiredJwtException e) {
-            log.info("만료된 JWT 토큰입니다.");
-        } catch (UnsupportedJwtException e) {
-            log.info("지원되지 않는 형식이나 구성의 JWT 토큰입니다.");
-        } catch (IllegalArgumentException e) {
-            log.info(e.toString().split(":")[1].trim());
-        }
-        return null;
+        return Jwts.parserBuilder()
+                .setSigningKey(key)
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
     }
 
     // 만료된 토큰인지 확인하는 용도

diff --git a/src/main/java/com/mpnp/baechelin/login/jwt/controller/TokenController.java b/src/main/java/com/mpnp/baechelin/login/jwt/controller/TokenController.java
@@ -20,7 +20,7 @@ public class TokenController {
 
     @ApiOperation(value = "Access Token 만료 시 Refresh Token을 이용하여 재발급 받는 메소드")
     @GetMapping("/refresh")
-    public AuthResponse refreshToken (HttpServletRequest request, HttpServletResponse response) {
+    public AuthResponse<?> refreshToken (HttpServletRequest request, HttpServletResponse response) {
         return tokenService.refreshToken(request, response);
     }
 }
diff --git a/...p/baechelin/login/oauth/repository/OAuth2AuthorizationRequestBasedOnCookieRepository.java b/...p/baechelin/login/oauth/repository/OAuth2AuthorizationRequestBasedOnCookieRepository.java
@@ -9,7 +9,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// refresh 토큰을 쿠기에 저장하기 위해 사용하는 repository
+// refresh 토큰을 쿠키에 저장하기 위해 사용하는 repository
 public class OAuth2AuthorizationRequestBasedOnCookieRepository implements AuthorizationRequestRepository<OAuth2AuthorizationRequest> {
 
     public final static String OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME = "oauth2_auth_request";

diff --git a/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java b/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java
@@ -61,7 +61,7 @@ private OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) {
         if (savedUser != null) {
             // DB에 유저 정보가 있을 때
             if (providerType != savedUser.getProviderType()) {
-                throw new OAuthProviderMissMatchException(ErrorCode.ALREADY_LOGIN_ACCOUNT.getCode() + "=" + providerType);
+                throw new OAuthProviderMissMatchException(ErrorCode.ALREADY_LOGIN_ACCOUNT.getCode() + "," + providerType);
             }
             updateUser(savedUser, userInfo);
         } else {