feat[OAuth]: 미사용 코드 제거 및 중복 형변환 제거

asowjdan · asowjdan · commit 7863b629439a · 2025-10-01T17:39:57.000+09:00
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/dto/MemberResponse.java b/backend/src/main/java/com/ai/lawyer/domain/member/dto/MemberResponse.java
@@ -41,8 +41,7 @@ public static MemberResponse from(Member member) {
     public static MemberResponse from(MemberAdapter memberAdapter) {
         if (memberAdapter instanceof Member) {
             return from((Member) memberAdapter);
-        } else if (memberAdapter instanceof OAuth2Member) {
-            OAuth2Member oauth2Member = (OAuth2Member) memberAdapter;
+        } else if (memberAdapter instanceof OAuth2Member oauth2Member) {
             return MemberResponse.builder()
                     .memberId(oauth2Member.getMemberId())
                     .loginId(oauth2Member.getLoginId())
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/entity/MemberAdapter.java b/backend/src/main/java/com/ai/lawyer/domain/member/entity/MemberAdapter.java
@@ -21,7 +21,7 @@ default String getEmail() {
         if (isLocalMember()) {
             return getLoginId(); // 로컬 회원은 loginId가 이메일
         } else if (isOAuth2Member()) {
-            return ((OAuth2Member) this).getEmail();
+            return this.getEmail();
         }
         return null;
     }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/entity/OAuth2Member.java b/backend/src/main/java/com/ai/lawyer/domain/member/entity/OAuth2Member.java
@@ -81,13 +81,6 @@ public enum Provider {
         Provider(String description) { this.description = description; }
     }
 
-    /**
-     * OAuth2Member를 Member 인터페이스로 변환하기 위한 어댑터 메서드
-     */
-    public boolean isOAuthMember() {
-        return true;
-    }
-
     public String getProvider() {
         return provider != null ? provider.name() : null;
     }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/repositories/OAuth2MemberRepository.java b/backend/src/main/java/com/ai/lawyer/domain/member/repositories/OAuth2MemberRepository.java
@@ -13,14 +13,4 @@ public interface OAuth2MemberRepository extends JpaRepository<OAuth2Member, Long
      * loginId(email)로 OAuth2 회원 조회
      */
     Optional<OAuth2Member> findByLoginId(String loginId);
-
-    /**
-     * loginId(email) 존재 여부 확인
-     */
-    boolean existsByLoginId(String loginId);
-
-    /**
-     * Provider와 ProviderId로 OAuth2 회원 조회
-     */
-    Optional<OAuth2Member> findByProviderAndProviderId(OAuth2Member.Provider provider, String providerId);
 }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/member/service/MemberService.java b/backend/src/main/java/com/ai/lawyer/domain/member/service/MemberService.java
@@ -86,9 +86,7 @@ public MemberResponse refreshToken(String refreshToken, HttpServletResponse resp
         // Member 또는 OAuth2Member 조회
         com.ai.lawyer.domain.member.entity.MemberAdapter member = memberRepository.findByLoginId(loginId)
                 .map(m -> (com.ai.lawyer.domain.member.entity.MemberAdapter) m)
-                .orElse(oauth2MemberRepository.findByLoginId(loginId)
-                        .map(m -> (com.ai.lawyer.domain.member.entity.MemberAdapter) m)
-                        .orElse(null));
+                .orElse(oauth2MemberRepository.findByLoginId(loginId).orElse(null));
 
         if (member == null) {
             throw new IllegalArgumentException("존재하지 않는 회원입니다.");
diff --git a/backend/src/main/java/com/ai/lawyer/global/jwt/JwtAuthenticationFilter.java b/backend/src/main/java/com/ai/lawyer/global/jwt/JwtAuthenticationFilter.java
@@ -141,9 +141,7 @@ private void handleTokenRefresh(HttpServletRequest request, HttpServletResponse
             // 회원 정보 조회 (Member 또는 OAuth2Member)
             MemberAdapter member = memberRepository.findByLoginId(loginId)
                     .map(m -> (MemberAdapter) m)
-                    .orElse(oauth2MemberRepository.findByLoginId(loginId)
-                            .map(m -> (MemberAdapter) m)
-                            .orElse(null));
+                    .orElse(oauth2MemberRepository.findByLoginId(loginId).orElse(null));
 
             if (member == null) {
                 log.warn("존재하지 않는 회원 - 쿠키 클리어: {}", loginId);
diff --git a/backend/src/main/java/com/ai/lawyer/global/jwt/TokenProvider.java b/backend/src/main/java/com/ai/lawyer/global/jwt/TokenProvider.java
@@ -1,6 +1,5 @@
 package com.ai.lawyer.global.jwt;
 
-import com.ai.lawyer.domain.member.entity.Member;
 import com.ai.lawyer.global.config.JwtProperties;
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;
diff --git a/backend/src/main/java/com/ai/lawyer/global/oauth/NaverUserInfo.java b/backend/src/main/java/com/ai/lawyer/global/oauth/NaverUserInfo.java
@@ -50,4 +50,8 @@ public String getBirthYear() {
         }
         return null;
     }
+
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
 }
diff --git a/backend/src/main/java/com/ai/lawyer/global/oauth/OAuth2SuccessHandler.java b/backend/src/main/java/com/ai/lawyer/global/oauth/OAuth2SuccessHandler.java
@@ -1,6 +1,5 @@
 package com.ai.lawyer.global.oauth;
 
-import com.ai.lawyer.domain.member.entity.Member;
 import com.ai.lawyer.global.jwt.CookieUtil;
 import com.ai.lawyer.global.jwt.TokenProvider;
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/backend/src/main/java/com/ai/lawyer/global/oauth/OAuth2UserInfo.java b/backend/src/main/java/com/ai/lawyer/global/oauth/OAuth2UserInfo.java
@@ -1,7 +1,5 @@
 package com.ai.lawyer.global.oauth;
 
-import java.util.Map;
-
 public interface OAuth2UserInfo {
     String getProviderId();
     String getProvider();
diff --git a/backend/src/main/java/com/ai/lawyer/global/oauth/PrincipalDetails.java b/backend/src/main/java/com/ai/lawyer/global/oauth/PrincipalDetails.java
@@ -0,0 +1,84 @@
+package com.ai.lawyer.global.oauth;
+
+import com.ai.lawyer.domain.member.entity.MemberAdapter;
+import lombok.Getter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+@Getter
+public class PrincipalDetails implements OAuth2User, UserDetails {
+
+    private final MemberAdapter member;
+    private final Map<String, Object> attributes;
+
+    // OAuth2 로그인용
+    public PrincipalDetails(MemberAdapter member, Map<String, Object> attributes) {
+        this.member = member;
+        this.attributes = attributes;
+    }
+
+    // 일반 로그인용
+    public PrincipalDetails(MemberAdapter member) {
+        this.member = member;
+        this.attributes = null;
+    }
+
+    // OAuth2User 메서드
+    @Override
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    @Override
+    public String getName() {
+        return member.getName();
+    }
+
+    // UserDetails 메서드
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(
+                new SimpleGrantedAuthority("ROLE_" + member.getRole().name())
+        );
+    }
+
+    @Override
+    public String getPassword() {
+        // OAuth2Member는 password가 없으므로 null 반환
+        if (member.isLocalMember()) {
+            return ((com.ai.lawyer.domain.member.entity.Member) member).getPassword();
+        }
+        return null;
+    }
+
+    @Override
+    public String getUsername() {
+        return member.getLoginId();
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return true;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ default String getEmail() {`
`21`	`21`	`if (isLocalMember()) {`
`22`	`22`	`return getLoginId(); // 로컬 회원은 loginId가 이메일`
`23`	`23`	`} else if (isOAuth2Member()) {`
`24`		`- return ((OAuth2Member) this).getEmail();`
	`24`	`+ return this.getEmail();`
`25`	`25`	`}`
`26`	`26`	`return null;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,13 +81,6 @@ public enum Provider {`
`81`	`81`	`Provider(String description) { this.description = description; }`
`82`	`82`	`}`
`83`	`83`
`84`		`- /**`
`85`		`- * OAuth2Member를 Member 인터페이스로 변환하기 위한 어댑터 메서드`
`86`		`- */`
`87`		`- public boolean isOAuthMember() {`
`88`		`- return true;`
`89`		`- }`
`90`		`-`
`91`	`84`	`public String getProvider() {`
`92`	`85`	`return provider != null ? provider.name() : null;`
`93`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,8 @@ public String getBirthYear() {`
`50`	`50`	`}`
`51`	`51`	`return null;`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ public Map<String, Object> getAttributes() {`
	`55`	`+ return attributes;`
	`56`	`+ }`
`53`	`57`	`}`