From 8f8a51c5aa6137a4076e83d65b4694a4ee5fecc0 Mon Sep 17 00:00:00 2001
From: yujiyea <54650556+yujiyea@users.noreply.github.com>
Date: Fri, 17 May 2024 00:04:16 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C?=
 =?UTF-8?q?=20=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=20=EC=97=AC=EB=B6=80=20?=
 =?UTF-8?q?=EC=B2=B4=ED=81=AC=ED=95=98=EB=A9=B4=EC=84=9C=20=EB=B0=9C?=
 =?UTF-8?q?=EC=83=9D=ED=95=9C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0(?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=ED=95=9C=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=EA=B0=80=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=A0=20?=
 =?UTF-8?q?=EB=95=8C=20=EC=96=B4=EB=96=BB=EA=B2=8C=20=ED=95=A0=EC=A7=80=20?=
 =?UTF-8?q?=EC=83=9D=EA=B0=81=ED=95=B4=EC=95=BC=20=ED=95=A8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/umc/mada/auth/handler/OAuth2LoginSuccessHandler.java  | 4 +++-
 .../com/umc/mada/auth/service/CustomUserDetailService.java    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/umc/mada/auth/handler/OAuth2LoginSuccessHandler.java b/src/main/java/com/umc/mada/auth/handler/OAuth2LoginSuccessHandler.java
index 6cd4f59..acfa1d0 100644
--- a/src/main/java/com/umc/mada/auth/handler/OAuth2LoginSuccessHandler.java
+++ b/src/main/java/com/umc/mada/auth/handler/OAuth2LoginSuccessHandler.java
@@ -1,6 +1,7 @@
 package com.umc.mada.auth.handler;
 
 import com.umc.mada.auth.handler.jwt.JwtTokenProvider;
+import com.umc.mada.exception.NotFoundUserException;
 import com.umc.mada.user.domain.CusomtUserDetails;
 import com.umc.mada.user.domain.User;
 import com.umc.mada.user.repository.UserRepository;
@@ -33,7 +34,8 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
         String refreshToken = jwtTokenProvider.createRefreshToken(oAuth2User);
 
         //refreshtoken을 DB에 저장해야함
-        User user = userRepository.findByAuthIdAndAccountExpired(authentication.getName(), false).orElseThrow(()-> new RuntimeException("올바른 유저 ID가 아닙니다."));
+//        User user = userRepository.findByAuthIdAndAccountExpired(authentication.getName(), false).orElseThrow(()-> new RuntimeException("올바른 유저 ID가 아닙니다."));
+        User user = userRepository.findByAuthId(oAuth2User.getName()).orElseThrow(()-> new NotFoundUserException("유저를 찾을 수 없습니다."));
         user.setRefreshToken(refreshToken);
 
 //        tokenResponse(response, accessToken);
diff --git a/src/main/java/com/umc/mada/auth/service/CustomUserDetailService.java b/src/main/java/com/umc/mada/auth/service/CustomUserDetailService.java
index a4e1cdb..2200933 100644
--- a/src/main/java/com/umc/mada/auth/service/CustomUserDetailService.java
+++ b/src/main/java/com/umc/mada/auth/service/CustomUserDetailService.java
@@ -49,7 +49,8 @@ private OAuth2User process(OAuth2UserRequest userRequest, OAuth2User oAuth2User)
 
         OAuth2Attributes oAuth2Attributes = OAuth2Attributes.of(provider, userNameAttributeName, oAuth2User.getAttributes());
 
-        Optional<User> userOptional = userRepository.findByAuthIdAndAccountExpired(oAuth2Attributes.getAuthId(), false);
+        Optional<User> userOptional = userRepository.findByAuthId(oAuth2Attributes.getAuthId());
+//        Optional<User> userOptional = userRepository.findByAuthIdAndAccountExpired(oAuth2Attributes.getAuthId(), false);
 
         User user;
         boolean newUser=false;