refactor: AuthenticationPrincipalArgumentResolver 클래스 member 패키지 의존성 제거

- LoginMember 클래스 auth 패키지로 이동 및 User로 명칭 변경 - LoginMember 클래스 이동으로 순환이 제거되어 기존 UserDetail이 불필요하여 삭제
next-step · Sep 14, 2022 · b794805 · b794805
1 parent 6b73538
commit b794805
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 75 deletions.
diff --git a/src/main/java/nextstep/auth/authentication/BasicAuthFilter.java b/src/main/java/nextstep/auth/authentication/BasicAuthFilter.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import nextstep.auth.context.Authentication;
-import nextstep.auth.user.UserDetail;
+import nextstep.auth.user.User;
 import nextstep.auth.user.UserDetailService;
 import nextstep.auth.interceptor.AuthContextChainInterceptor;
 import org.apache.tomcat.util.codec.binary.Base64;
@@ -15,7 +15,7 @@ public class BasicAuthFilter extends AuthContextChainInterceptor {
 
     @Override
     protected void checkValidAuth(final AuthenticationToken token) {
-        UserDetail loginMember = userDetailService.loadUserByUsername(token.getPrincipal());
+        User loginMember = userDetailService.loadUserByUsername(token.getPrincipal());
         if (loginMember == null) {
             throw new AuthenticationException();
         }
@@ -26,7 +26,7 @@ protected void checkValidAuth(final AuthenticationToken token) {
 
     @Override
     protected Authentication getAuthentication(final AuthenticationToken token) {
-        UserDetail loginMember = userDetailService.loadUserByUsername(token.getPrincipal());
+        User loginMember = userDetailService.loadUserByUsername(token.getPrincipal());
         return new Authentication(loginMember.getEmail(), loginMember.getAuthorities());
     }
 

diff --git a/src/main/java/nextstep/auth/authentication/UsernamePasswordAuthFilter.java b/src/main/java/nextstep/auth/authentication/UsernamePasswordAuthFilter.java
@@ -2,8 +2,8 @@
 
 import nextstep.auth.context.Authentication;
 import nextstep.auth.context.SecurityContextHolder;
-import nextstep.auth.user.UserDetail;
 import nextstep.auth.interceptor.AuthNotChainInterceptor;
+import nextstep.auth.user.User;
 import nextstep.auth.user.UserDetailService;
 
 import javax.servlet.http.HttpServletRequest;
@@ -27,8 +27,8 @@ protected AuthenticationToken createAuthToken(final HttpServletRequest request)
     }
 
     @Override
-    protected void afterSuccessUserCheck(final HttpServletRequest request, final HttpServletResponse response, UserDetail userDetail) {
-        Authentication authentication = new Authentication(userDetail.getEmail(), userDetail.getAuthorities());
+    protected void afterSuccessUserCheck(final HttpServletRequest request, final HttpServletResponse response, User user) {
+        Authentication authentication = new Authentication(user.getEmail(), user.getAuthorities());
         SecurityContextHolder.getContext().setAuthentication(authentication);
     }
 }
diff --git a/src/main/java/nextstep/auth/authorization/AuthenticationPrincipalArgumentResolver.java b/src/main/java/nextstep/auth/authorization/AuthenticationPrincipalArgumentResolver.java
@@ -2,7 +2,7 @@
 
 import nextstep.auth.context.Authentication;
 import nextstep.auth.context.SecurityContextHolder;
-import nextstep.member.domain.LoginMember;
+import nextstep.auth.user.User;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
@@ -16,12 +16,12 @@ public boolean supportsParameter(MethodParameter parameter) {
     }
 
     @Override
-    public LoginMember resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+    public User resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication == null) {
-            return LoginMember.guest();
+            return User.guest();
         }
 
-        return LoginMember.of(authentication.getPrincipal().toString(), authentication.getAuthorities());
+        return User.of(authentication.getPrincipal().toString(), authentication.getAuthorities());
     }
 }
diff --git a/src/main/java/nextstep/auth/interceptor/AuthNotChainInterceptor.java b/src/main/java/nextstep/auth/interceptor/AuthNotChainInterceptor.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import nextstep.auth.authentication.AuthenticationException;
 import nextstep.auth.authentication.AuthenticationToken;
-import nextstep.auth.user.UserDetail;
+import nextstep.auth.user.User;
 import nextstep.auth.user.UserDetailService;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -20,8 +20,8 @@ public boolean preHandle(final HttpServletRequest request, final HttpServletResp
         try {
             AuthenticationToken authToken = createAuthToken(request);
             checkValidAuth(authToken);
-            UserDetail userDetail = getUserDetail(authToken);
-            afterSuccessUserCheck(request, response, userDetail);
+            User user = getUserDetail(authToken);
+            afterSuccessUserCheck(request, response, user);
             return false;
         } catch (Exception e) {
             return true;
@@ -30,11 +30,11 @@ public boolean preHandle(final HttpServletRequest request, final HttpServletResp
 
     protected abstract AuthenticationToken createAuthToken(final HttpServletRequest request) throws IOException;
 
-    protected abstract void afterSuccessUserCheck(final HttpServletRequest request, final HttpServletResponse response, UserDetail userDetail)
+    protected abstract void afterSuccessUserCheck(final HttpServletRequest request, final HttpServletResponse response, User user)
         throws IOException;
 
     protected void checkValidAuth(AuthenticationToken authToken){
-        UserDetail loginMember = getUserDetail(authToken);
+        User loginMember = getUserDetail(authToken);
 
         if (loginMember == null) {
             throw new AuthenticationException();
@@ -45,7 +45,7 @@ protected void checkValidAuth(AuthenticationToken authToken){
         }
     }
 
-    private UserDetail getUserDetail(final AuthenticationToken authToken) {
+    private User getUserDetail(final AuthenticationToken authToken) {
         return userDetailService.loadUserByUsername(authToken.getPrincipal());
     }
 }
diff --git a/src/main/java/nextstep/auth/token/TokenAuthInterceptor.java b/src/main/java/nextstep/auth/token/TokenAuthInterceptor.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import nextstep.auth.authentication.AuthenticationToken;
-import nextstep.auth.user.UserDetail;
+import nextstep.auth.user.User;
 import nextstep.auth.interceptor.AuthNotChainInterceptor;
 import nextstep.auth.user.UserDetailService;
 import org.springframework.http.MediaType;
@@ -30,8 +30,8 @@ protected AuthenticationToken createAuthToken(final HttpServletRequest request)
     @Override
     protected void afterSuccessUserCheck(final HttpServletRequest request,
                                          final HttpServletResponse response,
-                                         final UserDetail userDetail) throws IOException {
-        String token = jwtTokenProvider.createToken(userDetail.getEmail(), userDetail.getAuthorities());
+                                         final User user) throws IOException {
+        String token = jwtTokenProvider.createToken(user.getEmail(), user.getAuthorities());
         TokenResponse tokenResponse = new TokenResponse(token);
 
         String responseToClient = new ObjectMapper().writeValueAsString(tokenResponse);

diff --git a/src/main/java/nextstep/auth/user/User.java b/src/main/java/nextstep/auth/user/User.java
@@ -0,0 +1,33 @@
+package nextstep.auth.user;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class User {
+    private String email;
+    private String password;
+    private List<String> authorities;
+
+    public static User of(String email, List<String> authorities) {
+        return new User(email, null, authorities);
+    }
+
+    public static User of(String email, String password, List<String> authorities) {
+        return new User(email, password, authorities);
+    }
+
+    public static User guest() {
+        return new User();
+    }
+
+    public boolean checkPassword(final String password) {
+        return this.password.equals(password);
+    }
+}
diff --git a/src/main/java/nextstep/auth/user/UserDetail.java b/src/main/java/nextstep/auth/user/UserDetail.java
diff --git a/src/main/java/nextstep/auth/user/UserDetailService.java b/src/main/java/nextstep/auth/user/UserDetailService.java
@@ -1,5 +1,5 @@
 package nextstep.auth.user;
 
 public interface UserDetailService {
-    UserDetail loadUserByUsername(String email);
+    User loadUserByUsername(String email);
 }
diff --git a/src/main/java/nextstep/member/application/LoginMemberService.java b/src/main/java/nextstep/member/application/LoginMemberService.java
@@ -1,7 +1,7 @@
 package nextstep.member.application;
 
+import nextstep.auth.user.User;
 import nextstep.auth.user.UserDetailService;
-import nextstep.member.domain.LoginMember;
 import nextstep.member.domain.Member;
 import nextstep.member.domain.MemberRepository;
 import org.springframework.stereotype.Service;
@@ -14,8 +14,8 @@ public LoginMemberService(MemberRepository memberRepository) {
         this.memberRepository = memberRepository;
     }
 
-    public LoginMember loadUserByUsername(String email) {
+    public User loadUserByUsername(String email) {
         Member member = memberRepository.findByEmail(email).orElseThrow(RuntimeException::new);
-        return LoginMember.of(member);
+        return User.of(member.getEmail(), member.getPassword(), member.getRoles());
     }
 }
diff --git a/src/main/java/nextstep/member/domain/LoginMember.java b/src/main/java/nextstep/member/domain/LoginMember.java
diff --git a/src/main/java/nextstep/member/ui/MemberController.java b/src/main/java/nextstep/member/ui/MemberController.java
@@ -1,10 +1,10 @@
 package nextstep.member.ui;
 
 import nextstep.auth.authorization.AuthenticationPrincipal;
+import nextstep.auth.user.User;
 import nextstep.member.application.MemberService;
 import nextstep.member.application.dto.MemberRequest;
 import nextstep.member.application.dto.MemberResponse;
-import nextstep.member.domain.LoginMember;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,19 +43,19 @@ public ResponseEntity<MemberResponse> deleteMember(@PathVariable Long id) {
     }
 
     @GetMapping("/members/me")
-    public ResponseEntity<MemberResponse> findMemberOfMine(@AuthenticationPrincipal LoginMember loginMember) {
+    public ResponseEntity<MemberResponse> findMemberOfMine(@AuthenticationPrincipal User loginMember) {
         MemberResponse member = memberService.findMember(loginMember.getEmail());
         return ResponseEntity.ok().body(member);
     }
 
     @PutMapping("/members/me")
-    public ResponseEntity<MemberResponse> updateMemberOfMine(@AuthenticationPrincipal LoginMember loginMember, @RequestBody MemberRequest param) {
+    public ResponseEntity<MemberResponse> updateMemberOfMine(@AuthenticationPrincipal User loginMember, @RequestBody MemberRequest param) {
         memberService.updateMember(loginMember.getEmail(), param);
         return ResponseEntity.ok().build();
     }
 
     @DeleteMapping("/members/me")
-    public ResponseEntity<MemberResponse> deleteMemberOfMine(@AuthenticationPrincipal LoginMember loginMember) {
+    public ResponseEntity<MemberResponse> deleteMemberOfMine(@AuthenticationPrincipal User loginMember) {
         memberService.deleteMember(loginMember.getEmail());
         return ResponseEntity.noContent().build();
     }