Merge pull request #205 from prgrms-web-devcourse-final-project/refactor/deleted-member-redirect(WR9-117)

fix: 회원탈퇴 시 리디렉션 url 설정 (WR9-120)

Author: leeys9423

src/main/java/io/crops/warmletter/global/config/SecurityConfig.java

@@ -78,7 +78,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .oauth2Login(oauth2 -> oauth2
                                 .userInfoEndpoint(userInfo -> userInfo
                                         .userService(customOAuth2UserService))
-                        // 나중에 Handler 구현 후 추가될 부분
                         .successHandler(customOAuth2AuthenticationSuccessHandler)
                         .failureHandler(oAuth2AuthenticationFailureHandler)
                 ).addFilterBefore(new JwtAuthenticationFilter(jwtTokenProvider),

src/main/java/io/crops/warmletter/global/oauth/entity/OAuth2UserWithDeletedFlag.java

@@ -0,0 +1,40 @@
+package io.crops.warmletter.global.oauth.entity;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+public class OAuth2UserWithDeletedFlag implements OAuth2User {
+
+    private final Map<String, Object> attributes;
+    private final String email;
+
+    public OAuth2UserWithDeletedFlag(Map<String, Object> attributes, String email) {
+        this.attributes = attributes;
+        this.email = email;
+    }
+
+    @Override
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        // 권한 없음
+        return Collections.emptyList();
+    }
+
+    @Override
+    public String getName() {
+        return email;
+    }
+
+    // 탈퇴 회원 여부 확인용 메서드
+    public boolean isDeletedMember() {
+        return true;
+    }
+}

src/main/java/io/crops/warmletter/global/oauth/handler/CustomOAuth2AuthenticationSuccessHandler.java

@@ -1,6 +1,7 @@
 package io.crops.warmletter.global.oauth.handler;
 
 import io.crops.warmletter.global.jwt.service.TokenStorage;
+import io.crops.warmletter.global.oauth.entity.OAuth2UserWithDeletedFlag;
 import io.crops.warmletter.global.oauth.entity.UserPrincipal;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -27,6 +28,16 @@ public class CustomOAuth2AuthenticationSuccessHandler extends SavedRequestAwareA
 
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws ServletException, IOException {
+
+        Object principal = authentication.getPrincipal();
+
+        // 탈퇴 회원인 경우 특별 처리
+        if (principal instanceof OAuth2UserWithDeletedFlag) {
+            String redirectUrl = redirectUri + "/auth-callback?error=deleted_member";
+            getRedirectStrategy().sendRedirect(request, response, redirectUrl);
+            return;
+        }
+
         oAuth2AuthenticationSuccessHandler.onAuthenticationSuccess(request, response, null, authentication); // 기존 successHandler 호출
 
         // Access Token을 Authorization 헤더에서 가져오기

src/main/java/io/crops/warmletter/global/oauth/service/CustomOAuth2UserService.java

@@ -4,9 +4,9 @@
 import io.crops.warmletter.domain.member.entity.SocialAccount;
 import io.crops.warmletter.domain.member.enums.Role;
 import io.crops.warmletter.domain.member.enums.SocialProvider;
-import io.crops.warmletter.domain.member.exception.DeletedMemberException;
 import io.crops.warmletter.domain.member.facade.MemberFacade;
 import io.crops.warmletter.domain.member.repository.MemberRepository;
+import io.crops.warmletter.global.oauth.entity.OAuth2UserWithDeletedFlag;
 import io.crops.warmletter.global.oauth.entity.UserPrincipal;
 import io.crops.warmletter.global.oauth.exception.OAuth2EmailNotFoundException;
 import io.crops.warmletter.global.oauth.exception.OAuth2ProcessingException;
@@ -23,6 +23,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.util.Map;
 import java.util.Optional;
 
 @Service
@@ -89,7 +90,7 @@ private OAuth2User process(OAuth2UserRequest userRequest, OAuth2User oauth2User)
 
             // 탈퇴한 회원인지 확인
             if (!member.isActive()) {
-                throw new DeletedMemberException();
+                return createDeletedMemberPrincipal(oauth2User.getAttributes(), email);
             }
 
             // 이메일이 변경되었을 경우 업데이트
@@ -106,4 +107,11 @@ private OAuth2User process(OAuth2UserRequest userRequest, OAuth2User oauth2User)
         return UserPrincipal.create(member, oauth2User.getAttributes());
     }
 
+    // 탈퇴한 회원용 특별한 UserPrincipal 생성
+    private OAuth2User createDeletedMemberPrincipal(Map<String, Object> attributes, String email) {
+        // 권한 없는 특별한 UserPrincipal 객체 생성
+        // 이 객체는 나중에 CustomOAuth2AuthenticationSuccessHandler에서
+        // 특별 처리될 수 있음
+        return new OAuth2UserWithDeletedFlag(attributes, email);
+    }
 }