diff --git a/src/main/java/com/codeit/todo/common/config/SecurityConfig.java b/src/main/java/com/codeit/todo/common/config/SecurityConfig.java index c08c754..bb847d7 100644 --- a/src/main/java/com/codeit/todo/common/config/SecurityConfig.java +++ b/src/main/java/com/codeit/todo/common/config/SecurityConfig.java @@ -28,7 +28,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti authorizeRequests .requestMatchers("/signup").permitAll() .requestMatchers("/login").permitAll() - .requestMatchers("/searches").permitAll() .requestMatchers("/swagger-ui/**").permitAll() .requestMatchers("/**").permitAll() .anyRequest().authenticated() diff --git a/src/main/java/com/codeit/todo/service/search/SearchService.java b/src/main/java/com/codeit/todo/service/search/SearchService.java index ec25fb0..1941116 100644 --- a/src/main/java/com/codeit/todo/service/search/SearchService.java +++ b/src/main/java/com/codeit/todo/service/search/SearchService.java @@ -6,5 +6,5 @@ import java.util.List; public interface SearchService { - List findUserAndGoal(ReadSearchRequest request); + List findUserAndGoal(int userId, ReadSearchRequest request); } diff --git a/src/main/java/com/codeit/todo/service/search/impl/SearchServiceImpl.java b/src/main/java/com/codeit/todo/service/search/impl/SearchServiceImpl.java index f1724ff..756d2b6 100644 --- a/src/main/java/com/codeit/todo/service/search/impl/SearchServiceImpl.java +++ b/src/main/java/com/codeit/todo/service/search/impl/SearchServiceImpl.java @@ -37,7 +37,7 @@ public class SearchServiceImpl implements SearchService { private static final int NOT_FOUND = 404; @Override - public List findUserAndGoal(ReadSearchRequest request) { + public List findUserAndGoal(int userId, ReadSearchRequest request) { String searchField = request.searchField(); String keyword = request.keyword(); diff --git a/src/main/java/com/codeit/todo/web/controller/SearchController.java b/src/main/java/com/codeit/todo/web/controller/SearchController.java index fcdd3b3..104b71c 100644 --- a/src/main/java/com/codeit/todo/web/controller/SearchController.java +++ b/src/main/java/com/codeit/todo/web/controller/SearchController.java @@ -12,10 +12,7 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -32,8 +29,10 @@ public class SearchController { }) @GetMapping public Response> getSearch( - @Valid @RequestBody ReadSearchRequest request + @AuthenticationPrincipal CustomUserDetails userDetails, + @Valid @ModelAttribute ReadSearchRequest request ){ - return Response.ok(searchService.findUserAndGoal(request)); + int userId = userDetails.getUserId(); + return Response.ok(searchService.findUserAndGoal(userId, request)); } } diff --git a/src/main/java/com/codeit/todo/web/filter/JwtAuthenticationFilter.java b/src/main/java/com/codeit/todo/web/filter/JwtAuthenticationFilter.java index 03bc686..7bcb045 100644 --- a/src/main/java/com/codeit/todo/web/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/codeit/todo/web/filter/JwtAuthenticationFilter.java @@ -76,7 +76,7 @@ private void processExceptionHandle(HttpServletResponse response, ErrorStatus er */ @Override protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException { - String[] excludedPaths = {"/api/v1/auths/signup", "/api/v1/auths/login", "/api/v1/searches", "/v3/**", "/swagger-ui/**"}; + String[] excludedPaths = {"/api/v1/auths/signup", "/api/v1/auths/login", "/v3/**", "/swagger-ui/**"}; AntPathMatcher antPathMatcher = new AntPathMatcher(); for (String excludedPath : excludedPaths) {