[FIX] oauth 방식 수정

Author: hyunbin1

src/main/java/com/example/ai_tutor/domain/auth/application/CustomDefaultOAuth2UserService.java

@@ -19,6 +19,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
 import java.util.Optional;
 
 @Slf4j
@@ -27,48 +28,37 @@
 public class CustomDefaultOAuth2UserService extends DefaultOAuth2UserService {
 
     private final UserRepository userRepository;
+    private final OAuth2UserInfoFactory oAuth2UserInfoFactory;
 
     @Override
+    @Transactional
     public OAuth2User loadUser(OAuth2UserRequest oAuth2UserRequest) throws OAuth2AuthenticationException {
+        log.info("loadUser Start");
         OAuth2User oAuth2User = super.loadUser(oAuth2UserRequest);
-        log.info("OAuth2 user loaded: {}", oAuth2User);
-        try {
-            log.info("Processing OAuth2 user: {}", oAuth2User);
-            return processOAuth2User(oAuth2UserRequest, oAuth2User);
-        } catch (Exception e) {
-            log.info("Error processing OAuth2 user: {}", e.getMessage());
-            DefaultAssert.isAuthentication(e.getMessage());
+        String registrationId = oAuth2UserRequest.getClientRegistration().getRegistrationId();
+        Map<String, Object> attributes = oAuth2User.getAttributes();
+        User user = this.processOAuth2User(registrationId, attributes);
+        log.info("Processing OAuth2 user: {}", oAuth2User);
+        UserPrincipal userPrincipal = UserPrincipal.create(user);
+        log.info("OAuth2 로그인 UserPrincipal 생성됨 - UUID: {}", userPrincipal.getUsername());
+
+        return userPrincipal;
         }
-        return null;
-    }
 
-    private OAuth2User processOAuth2User(OAuth2UserRequest oAuth2UserRequest, OAuth2User oAuth2User) {
-        OAuth2UserInfo oAuth2UserInfo = OAuth2UserInfoFactory.getOAuth2UserInfo(oAuth2UserRequest.getClientRegistration().getRegistrationId(), oAuth2User.getAttributes());
+    private User processOAuth2User(String registrationId, Map<String, Object> attributes) {
+        OAuth2UserInfo oAuth2UserInfo = oAuth2UserInfoFactory.getOAuthUserInfo(registrationId, attributes);
         DefaultAssert.isAuthentication(!oAuth2UserInfo.getEmail().isEmpty());
-
-        Optional<User> userOptional = userRepository.findByEmail(oAuth2UserInfo.getEmail());
-        User user;
-        if(userOptional.isPresent()) {
-            user = userOptional.get();
-            DefaultAssert.isAuthentication(user.getProvider().equals(Provider.valueOf(oAuth2UserRequest.getClientRegistration().getRegistrationId())));
-            user = updateExistingUser(user, oAuth2UserInfo);
-            log.info("User updated: {}", user);
-        } else {
-            user = registerNewUser(oAuth2UserRequest, oAuth2UserInfo);
-            log.info("New user registered: {}", user);
-        }
-
-        log.info("OAuth2 user processed: {}", user);
-        return UserPrincipal.create(user, oAuth2User.getAttributes());
+        Optional<User> user = userRepository.findByEmail(oAuth2UserInfo.getEmail());
+        return user.orElseGet(() -> this.registerNewUser(oAuth2UserInfo, registrationId));
     }
 
-    private User registerNewUser(OAuth2UserRequest oAuth2UserRequest, OAuth2UserInfo oAuth2UserInfo) {
+    private User registerNewUser(OAuth2UserInfo oAuth2UserInfo, String registrationId) {
         User user = User.builder()
                 .name(oAuth2UserInfo.getName())
                 .email(oAuth2UserInfo.getEmail())
                 .password("oauth-only")
-                .provider(Provider.valueOf(oAuth2UserRequest.getClientRegistration().getRegistrationId()))
-                .providerId(oAuth2UserInfo.getId())
+                .provider(registrationId)
+                .providerId(oAuth2UserInfo.getProviderId())
                 .build();
 
         return userRepository.save(user);

src/main/java/com/example/ai_tutor/domain/user/domain/User.java

@@ -3,13 +3,16 @@
 import com.example.ai_tutor.domain.common.BaseEntity;
 import com.example.ai_tutor.domain.professor.domain.Professor;
 import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Table(name="User")
 @NoArgsConstructor
+@AllArgsConstructor
+@Builder
 @Getter
 public class User extends BaseEntity {
     @Id
@@ -26,8 +29,7 @@ public class User extends BaseEntity {
     @Column(name="password")
     private String password;
 
-    @Enumerated(EnumType.STRING)
-    private Provider provider;
+    private String provider;
 
     @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinColumn(name="professor_id")
@@ -38,17 +40,6 @@ public class User extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private Role role = Role.PROFESSOR;
 
-
-    @Builder
-    public User(String name, String email, String password, Provider provider, String providerId){
-        this.name = name;
-        this.email = email;
-        this.password = password;
-        this.provider = provider;
-        this.professor = new Professor(name, this);
-        this.providerId = providerId;
-    }
-
     public void updateProfessor(Professor professor) { this.professor = professor; }
 
     public void updateName(String name) { this.name = name; }

src/main/java/com/example/ai_tutor/global/config/security/auth/CustomOAuth2AuthorizationRequestRedirectFilter.java

@@ -0,0 +1,39 @@
+package com.example.ai_tutor.global.config.security.auth;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter;
+import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+@Component
+public class CustomOAuth2AuthorizationRequestRedirectFilter extends OAuth2AuthorizationRequestRedirectFilter {
+
+    public CustomOAuth2AuthorizationRequestRedirectFilter(OAuth2AuthorizationRequestResolver customOAuth2AuthorizationRequestResolver) {
+        super(customOAuth2AuthorizationRequestResolver);
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws IOException, ServletException {
+        // 프론트엔드에서 전달된 redirect_url과 error_redirect_url 쿼리 파라미터를 처리
+        String redirectUrl = request.getParameter("redirect_url");
+        String errorRedirectUrl = request.getParameter("error_redirect_url");
+
+        // 쿼리 파라미터가 있다면 세션에 저장
+        if (redirectUrl != null) {
+            request.getSession().setAttribute("OAUTH2_REDIRECT_URL", redirectUrl);
+        }
+
+        if (errorRedirectUrl != null) {
+            request.getSession().setAttribute("OAUTH2_ERROR_REDIRECT_URL", errorRedirectUrl);
+        }
+
+        // 기존 필터 체인 동작
+        super.doFilterInternal(request, response, filterChain);
+    }
+}

src/main/java/com/example/ai_tutor/global/config/security/auth/CustomOAuth2AuthorizationRequestResolver.java

@@ -0,0 +1,36 @@
+package com.example.ai_tutor.global.config.security.auth;
+
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizationRequestResolver;
+import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CustomOAuth2AuthorizationRequestResolver implements OAuth2AuthorizationRequestResolver {
+
+    private final DefaultOAuth2AuthorizationRequestResolver delegate;
+
+    public CustomOAuth2AuthorizationRequestResolver(ClientRegistrationRepository clientRegistrationRepository) {
+        this.delegate = new DefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepository, "/oauth2/authorize");
+
+        this.delegate.setAuthorizationRequestCustomizer(builder -> {
+            String registrationId = (String) builder.build().getAttributes().get("registration_id");
+            if ("google".equals(registrationId)) {
+                builder.additionalParameters(params -> params.put("prompt", "select_account"));
+            }
+        });
+    }
+
+    @Override
+    public OAuth2AuthorizationRequest resolve(HttpServletRequest request) {
+        return delegate.resolve(request);
+    }
+
+    @Override
+    public OAuth2AuthorizationRequest resolve(HttpServletRequest request, String clientRegistrationId) {
+        return delegate.resolve(request, clientRegistrationId);
+    }
+}

src/main/java/com/example/ai_tutor/global/config/security/auth/GoogleOAuth2UserInfo.java

@@ -0,0 +1,25 @@
+package com.example.ai_tutor.global.config.security.auth;
+
+import java.util.Map;
+
+public class GoogleOAuth2UserInfo extends OAuth2UserInfo {
+    public GoogleOAuth2UserInfo(Map<String, Object> attributes) {
+        super(attributes);
+    }
+
+    @Override
+    public String getEmail() {
+        return attributes.get("email").toString();
+    }
+
+    @Override
+    public String getProviderId() {
+        return attributes.get("sub").toString();
+    }
+
+    @Override
+    public String getName() {
+        return "";
+    }
+}
+

src/main/java/com/example/ai_tutor/global/config/security/auth/OAuth2UserInfo.java

@@ -1,25 +1,17 @@
 package com.example.ai_tutor.global.config.security.auth;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 import java.util.Map;
 
+
+@Getter
+@AllArgsConstructor
 public abstract class OAuth2UserInfo {
     protected Map<String, Object> attributes;
 
-    public OAuth2UserInfo(Map<String, Object> attributes) {
-        this.attributes = attributes;
-    }
-
-    public Map<String, Object> getAttributes() {
-        return attributes;
-    }
-
-    public abstract String getProvider();
-
-    public abstract String getId();
-
     public abstract String getName();
-
     public abstract String getEmail();
-
-    public abstract String getImageUrl();
+    public abstract String getProviderId();
 }

src/main/java/com/example/ai_tutor/global/config/security/auth/OAuth2UserInfoFactory.java

@@ -1,18 +1,18 @@
 package com.example.ai_tutor.global.config.security.auth;
 
-import com.example.ai_tutor.domain.user.domain.Provider;
-import com.example.ai_tutor.global.DefaultAssert;
-import com.example.ai_tutor.global.config.security.auth.company.Google;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
+@Component
 public class OAuth2UserInfoFactory {
-    public static OAuth2UserInfo getOAuth2UserInfo(String registrationId, Map<String, Object> attributes) {
-        if(registrationId.equalsIgnoreCase(Provider.google.toString())) {
-            return new Google(attributes);
-        } else {
-            DefaultAssert.isAuthentication("해당 oauth2 기능은 지원하지 않습니다.");
-        }
-        return null;
+    public OAuth2UserInfo getOAuthUserInfo(String registrationId, Map<String, Object> attributes) {
+        return switch (registrationId) {
+
+            case "google" -> new GoogleOAuth2UserInfo(attributes);
+
+            default -> throw new OAuth2AuthenticationException("지원하지 않는 소셜 로그인입니다.");
+        };
     }
 }

src/main/java/com/example/ai_tutor/global/config/security/auth/company/Google.java

@@ -22,26 +22,29 @@
 @Component
 @Slf4j
 public class CustomSimpleUrlAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
-    private final CustomAuthorizationRequestRepository customAuthorizationRequestRepository;
 
     @Override
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
         log.error("OAuth2 로그인 실패: {}", exception.getMessage());
 
+        String errorMessage = exception.getMessage();
+
         log.info("Request URI: {}", request.getRequestURI());
         log.info("Query String: {}", request.getQueryString());
         log.info("Cookies: {}", Arrays.toString(request.getCookies()));
 
-        String targetUrl = CustomCookie.getCookie(request, REDIRECT_URI_PARAM_COOKIE_NAME)
-                .map(Cookie::getValue)
-                .orElse(("/"));
+        // 세션에서 error_redirect_url 가져오기
+        String errorRedirectUrl = (String) request.getSession().getAttribute("OAUTH2_ERROR_REDIRECT_URL");
+        if (errorRedirectUrl == null || errorRedirectUrl.isEmpty()) {
+            errorRedirectUrl = "https://ai-tutor.ac.kr/login?error";  // 기본 오류 리디렉션 URL
+        }
 
-        targetUrl = UriComponentsBuilder.fromUriString(targetUrl)
-                .queryParam("error", "invalid_request")
-                .build()
-                .toUriString();
-        customAuthorizationRequestRepository.removeAuthorizationRequestCookies(request, response);
+        // 에러를 쿼리 파라미터에 추가
+        errorRedirectUrl = UriComponentsBuilder.fromUriString(errorRedirectUrl)
+                .queryParam("error", errorMessage)
+                .build().toUriString();
 
-        getRedirectStrategy().sendRedirect(request, response, targetUrl);
+        log.info("OAuth2 로그인 실패 - 에러 메시지: {}", errorMessage);
+        getRedirectStrategy().sendRedirect(request, response, errorRedirectUrl);
     }
 }