Dev > Main 브랜치 병합

1. Request Parameter 인식되지 않은 오류를 수정 후 Main 브랜치에 병합합니다.

Author: NamDoHyeon2

src/main/java/hs/kr/backend/devpals/infra/oauth2/CustomOauth2UserService.java

@@ -27,11 +27,17 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         OAuth2User oAuth2User = super.loadUser(userRequest);
         String provider = userRequest.getClientRegistration().getRegistrationId();
 
-        // request에 provider 저장
+        // request + 세션 접근
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         if (attributes != null) {
             HttpServletRequest request = attributes.getRequest();
+
             request.setAttribute("provider", provider);
+
+            String mode = request.getParameter("state"); // 또는 "mode"
+            if (mode != null) {
+                request.getSession().setAttribute("oauth_mode", mode);
+            }
         }
 
         String email = extractEmail(provider, oAuth2User);
@@ -48,6 +54,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
             String githubUrl = oAuth2User.getAttribute("html_url");
             user.updateGithub(githubUrl);
         }
+
         userRepository.save(user);
 
         Map<String, Object> attributesMap = new java.util.HashMap<>(oAuth2User.getAttributes());
@@ -64,18 +71,14 @@ public static String extractEmail(String provider, OAuth2User oAuth2User) {
         switch (provider) {
             case "google":
                 return oAuth2User.getAttribute("email");
-
             case "kakao":
                 Map<String, Object> kakaoAccount = oAuth2User.getAttribute("kakao_account");
                 return kakaoAccount != null ? (String) kakaoAccount.get("email") : null;
-
             case "naver":
                 Map<String, Object> response = oAuth2User.getAttribute("response");
                 return response != null ? (String) response.get("email") : null;
-
             case "github":
                 return oAuth2User.getAttribute("email");
-
             default:
                 throw new IllegalArgumentException("Unsupported provider: " + provider);
         }
@@ -85,20 +88,16 @@ public static String extractName(String provider, OAuth2User oAuth2User) {
         switch (provider) {
             case "google":
                 return oAuth2User.getAttribute("name");
-
             case "kakao":
                 Map<String, Object> kakaoAccount = oAuth2User.getAttribute("kakao_account");
                 if (kakaoAccount == null) return null;
                 Map<String, Object> profile = (Map<String, Object>) kakaoAccount.get("profile");
                 return profile != null ? (String) profile.get("nickname") : null;
-
             case "naver":
                 Map<String, Object> response = oAuth2User.getAttribute("response");
                 return response != null ? (String) response.get("name") : null;
-
             case "github":
                 return oAuth2User.getAttribute("name");
-
             default:
                 throw new IllegalArgumentException("Unsupported provider: " + provider);
         }

src/main/java/hs/kr/backend/devpals/infra/oauth2/Oauth2LoginSuccessHandler.java

@@ -48,13 +48,14 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
         UserEntity user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new CustomException(ErrorException.USER_NOT_FOUND));
 
-        String mode = request.getParameter("state");
+        String mode = (String) request.getSession().getAttribute("oauth_mode");
+        request.getSession().removeAttribute("oauth_mode"); // 한번 쓰고 제거
+
         if ("github_verify".equals(mode) && "github".equals(provider)) {
             String githubUrl = oAuth2User.getAttribute("html_url");
             user.updateGithub(githubUrl);
             userRepository.save(user);
 
-            // 깔끔하게 리디렉션
             response.sendRedirect("http://localhost:5173/user/profile?github=success");
             return;
         }