[Feat] ArgumentResolver 구현 및 멤버 조회, 등록 적용(#13)

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/dto/SuccessMessage.java

@@ -10,7 +10,9 @@
 @Getter
 public enum SuccessMessage {
 
-    MEMBER_CREATE_SUCCESS(HttpStatus.CREATED.value(), "유저 생성이 완료되었습니다."),
+    MEMBER_CREATE_SUCCESS(HttpStatus.CREATED.value(), "유저 생성에 성공했습니다."),
+    MEMBER_FIND_SUCCESS(HttpStatus.OK.value(), "유저 검색에 성공했습니다."),
+
 
     BLOG_CREATE_SUCCESS(HttpStatus.CREATED.value(), "블로그 생성이 완료되었습니다."),
     BLOG_CONTENT_CREATE_SUCCESS(HttpStatus.CREATED.value(), "블로그에 글 작성이 완료되었습니다."),

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/JwtTokenProvider.java

@@ -8,9 +8,10 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 @RequiredArgsConstructor
-@Component
+@Service
 public class JwtTokenProvider {
 
     private final JwtTokenGenerator jwtTokenGenerator;

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/JwtTokenValidator.java

@@ -5,10 +5,11 @@
 import org.sopt.springFirstSeminar.common.dto.ErrorMessage;
 import org.sopt.springFirstSeminar.exception.UnauthorizedException;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 
 @RequiredArgsConstructor
-@Component
+@Service
 public class JwtTokenValidator {
 
     private final JwtTokenGenerator jwtTokenGenerator;

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/UserId.java → springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/MemberId.java

@@ -7,5 +7,5 @@
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface UserId {
+public @interface MemberId {
 }

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/RefreshToken.java

@@ -21,9 +21,9 @@ public class RefreshToken {
     @Indexed
     private String refreshToken;
 
-    public static RefreshToken of(final Long userId, final String refreshToken) {
+    public static RefreshToken of(final Long memberId, final String refreshToken) {
         return RefreshToken.builder()
-                .id(userId)
+                .id(memberId)
                 .refreshToken(refreshToken)
                 .build();
     }

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/filter/SecurityConfig.java → springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/SecurityConfig.java

@@ -1,9 +1,10 @@
-package org.sopt.springFirstSeminar.common.jwt.auth.filter;
+package org.sopt.springFirstSeminar.common.jwt.auth;
 
 import lombok.RequiredArgsConstructor;
 import org.sopt.springFirstSeminar.common.jwt.JwtTokenProvider;
 import org.sopt.springFirstSeminar.common.jwt.JwtTokenValidator;
-import org.sopt.springFirstSeminar.common.jwt.auth.CustomAccessDeniedHandler;
+import org.sopt.springFirstSeminar.common.jwt.auth.filter.CustomJwtAuthenticationEntryPoint;
+import org.sopt.springFirstSeminar.common.jwt.auth.filter.JwtAuthenticationFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -25,7 +26,7 @@ public class SecurityConfig {
     private final JwtTokenValidator jwtTokenValidator;
 
 
-    private static final String[] AUTH_WHITE_LIST = {"/api/v1/member"};
+    private static final String[] AUTH_WHITE_LIST = {"/api/v1/member", "/test"};
 
     @Bean
     SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/UserIdArgumentResolver.java

@@ -2,20 +2,29 @@
 
 import org.springframework.core.MethodParameter;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
+@Component
 public class UserIdArgumentResolver implements HandlerMethodArgumentResolver {
 
-    //
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
-        boolean hasUserIdAnnotation = parameter.hasParameterAnnotation(UserId.class);
+
+        //요청받은 메소드의 파라미터에  @UserId 어노테이션이 붙어있는지 확인
+        boolean hasUserIdAnnotation = parameter.hasParameterAnnotation(MemberId.class);
+
+        //타입이 같은지 확인
         boolean isLongType = Long.class.isAssignableFrom(parameter.getParameterType());
+
+        //둘 다 true면 아래 resolveArgument 메서드 실행
         return hasUserIdAnnotation && isLongType;
     }
 
+    //SecurityContextHolder에 있는 UserId 추출
     @Override
     public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
         return SecurityContextHolder.getContext()

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/WebConfig.java

@@ -0,0 +1,20 @@
+package org.sopt.springFirstSeminar.common.jwt.auth;
+
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    private final UserIdArgumentResolver userIdArgumentResolver;
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(userIdArgumentResolver);
+    }
+}

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/filter/JwtAuthenticationFilter.java

@@ -5,6 +5,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.sopt.springFirstSeminar.common.Constant;
 import org.sopt.springFirstSeminar.common.dto.ErrorMessage;
 import org.sopt.springFirstSeminar.common.jwt.JwtTokenProvider;
@@ -25,6 +26,7 @@
 
 @RequiredArgsConstructor
 @Component
+@Slf4j
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     private final JwtTokenProvider jwtTokenProvider;
@@ -33,9 +35,13 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        final String accessToken = getAccessToken(request);
-        jwtTokenValidator.validateAccessToken(accessToken);
-        doAuthentication(request, jwtTokenProvider.getSubject(accessToken));
+        try {
+            final String accessToken = getAccessToken(request);
+            jwtTokenValidator.validateAccessToken(accessToken);
+            doAuthentication(request, jwtTokenProvider.getSubject(accessToken));
+        } catch(UnauthorizedException e){
+            log.info("———");
+        }
         filterChain.doFilter(request, response);
     }
 

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/common/jwt/auth/redis/repository/RedisConfig.java

@@ -0,0 +1,22 @@
+package org.sopt.springFirstSeminar.common.jwt.auth.redis.repository;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+
+@Configuration
+public class RedisConfig {
+
+    @Value("${spring.data.redis.host}")
+    private String host;
+
+    @Value("${spring.data.redis.port}")
+    private int port;
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        return new LettuceConnectionFactory(host, port);
+    }
+}

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/controller/MemberController.java

@@ -7,6 +7,7 @@
 import org.sopt.springFirstSeminar.common.BaseResponse;
 import org.sopt.springFirstSeminar.common.Constant;
 import org.sopt.springFirstSeminar.common.dto.SuccessMessage;
+import org.sopt.springFirstSeminar.common.jwt.auth.MemberId;
 import org.sopt.springFirstSeminar.common.jwt.dto.TokenResponse;
 import org.sopt.springFirstSeminar.service.MemberService;
 import org.sopt.springFirstSeminar.service.dto.MemberCreateDTO;
@@ -26,17 +27,19 @@ public class MemberController {
     private final MemberService memberService;
 
     @PostMapping
-    public ResponseEntity<BaseResponse<?>> postMember(@RequestHeader(Constant.AUTHORIZATION) final String token,
-                                                      @RequestBody MemberCreateDTO memberCreate)
+    public ResponseEntity<BaseResponse<?>> postMember(@RequestBody MemberCreateDTO memberCreate)
     {
-        final TokenResponse userJoinResponse = memberService.createMember(token, memberCreate);
+        final TokenResponse memberJoinResponse = memberService.createMember(memberCreate);
 
-        return ApiResponseUtil.success(SuccessMessage.MEMBER_CREATE_SUCCESS, userJoinResponse);
+        return ApiResponseUtil.success(SuccessMessage.MEMBER_CREATE_SUCCESS, memberJoinResponse);
     }
 
-    @GetMapping("/{memberId}")
-    public ResponseEntity<MemberFindDTO> findMemberById(@PathVariable final Long memberId) {
-        return ResponseEntity.ok(memberService.findMemberById(memberId));
+    @GetMapping
+    public ResponseEntity<BaseResponse<?>> findMemberById(@MemberId final Long memberId) {
+
+        final MemberFindDTO memberFindDTO = memberService.findMemberById(memberId);
+
+        return ApiResponseUtil.success(SuccessMessage.MEMBER_FIND_SUCCESS, memberFindDTO);
     }
 
     @DeleteMapping("/{memberId}")

springFirstSeminar/src/main/java/org/sopt/springFirstSeminar/service/MemberService.java

@@ -23,28 +23,34 @@
 
 @Service
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class MemberService {
 
     private final MemberRepository memberRepository;
 
     private final JwtTokenProvider jwtTokenProvider;
     private final RefreshTokenRepository refreshTokenRepository;
 
+    //멤버가입
     @Transactional
-    public TokenResponse createMember(String token, MemberCreateDTO memberCreate) {
+    public TokenResponse createMember(MemberCreateDTO memberCreate) {
+
         Member createdMember = memberRepository.save(
                 Member.create(memberCreate.name(), memberCreate.part(), memberCreate.age())
         );
-
         Long createdMemberId = createdMember.getId();
         Token issuedToken = jwtTokenProvider.issueTokens(createdMemberId);
-        updateRefreshToken(issuedToken.refreshToken(), createdMember);
+        updateRefreshToken(issuedToken.refreshToken(), createdMemberId);
 
         return TokenResponse.of(issuedToken.accessToken(), issuedToken.refreshToken(), createdMemberId);
     }
 
-    private void updateRefreshToken(String refreshToken, Member member) {
-        refreshTokenRepository.save(RefreshToken.of(member.getId(), refreshToken));
+
+
+
+
+    private void updateRefreshToken(String refreshToken, Long memberId) {
+        refreshTokenRepository.save(RefreshToken.of(memberId, refreshToken));
     }
 
     public void findById(final Long memberId) {