fix: 로그인시 refreshtoken 재발급하도록 변경

tipi-tapi · Feb 2, 2025 · 832b651 · 832b651
1 parent b275c40
commit 832b651
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/tipitapi/drawmytoday/domain/oauth/service/AppleOAuthService.java b/src/main/java/tipitapi/drawmytoday/domain/oauth/service/AppleOAuthService.java
@@ -20,6 +20,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 import tipitapi.drawmytoday.common.exception.BusinessException;
 import tipitapi.drawmytoday.common.exception.ErrorCode;
@@ -68,9 +69,11 @@ public ResponseJwtToken login(HttpServletRequest request, RequestAppleLogin requ
             user = userService.registerUser(
                 appleIdToken.getEmail(), SocialCode.APPLE, oAuthAccessToken.getRefreshToken());
         } else {
-            Auth auth = authRepository.findByUser(user)
-                .orElseThrow(() -> new BusinessException(ErrorCode.INTERNAL_SERVER_ERROR));
-            auth.setRefreshToken(oAuthAccessToken.getRefreshToken());
+            if (StringUtils.hasText(oAuthAccessToken.getRefreshToken())) {
+                Auth auth = authRepository.findByUser(user)
+                    .orElseThrow(() -> new BusinessException(ErrorCode.INTERNAL_SERVER_ERROR));
+                auth.setRefreshToken(oAuthAccessToken.getRefreshToken());
+            }
         }
 
         String jwtAccessToken = jwtTokenProvider.createAccessToken(user.getUserId(),

diff --git a/src/main/java/tipitapi/drawmytoday/domain/oauth/service/GoogleOAuthService.java b/src/main/java/tipitapi/drawmytoday/domain/oauth/service/GoogleOAuthService.java
@@ -16,6 +16,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 import tipitapi.drawmytoday.common.exception.BusinessException;
 import tipitapi.drawmytoday.common.exception.ErrorCode;
@@ -60,9 +61,11 @@ public ResponseJwtToken login(HttpServletRequest request) {
             user = userService.registerUser(
                 oAuthUserProfile.getEmail(), SocialCode.GOOGLE, accessToken.getRefreshToken());
         } else {
-            Auth auth = authRepository.findByUser(user)
-                .orElseThrow(() -> new BusinessException(ErrorCode.INTERNAL_SERVER_ERROR));
-            auth.setRefreshToken(accessToken.getRefreshToken());
+            if (StringUtils.hasText(accessToken.getRefreshToken())) {
+                Auth auth = authRepository.findByUser(user)
+                    .orElseThrow(() -> new BusinessException(ErrorCode.INTERNAL_SERVER_ERROR));
+                auth.setRefreshToken(accessToken.getRefreshToken());
+            }
         }
 
         String jwtAccessToken = jwtTokenProvider.createAccessToken(user.getUserId(),