From abf7677020d3ca8e355492a5fe81b10c51bc9ccf Mon Sep 17 00:00:00 2001 From: shinheekim Date: Wed, 24 Jul 2024 03:20:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20user=20request=20=EC=9C=A0?= =?UTF-8?q?=ED=9A=A8=EC=84=B1=20=EA=B2=80=EC=82=AC(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../likelion12thteam03be/global/config/SecurityConfig.java | 2 +- .../user/api/dto/request/UserLoginReqDto.java | 4 ++-- .../user/api/dto/request/UserSaveReqDto.java | 6 +++--- .../likelion12thteam03be/user/application/UserService.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java b/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java index beb1d62..3056432 100644 --- a/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java +++ b/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java @@ -31,7 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .logout(AbstractHttpConfigurer::disable) .httpBasic(AbstractHttpConfigurer::disable) .authorizeHttpRequests(authorize -> authorize - .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() +// .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() .requestMatchers(HttpMethod.POST, "/users/**").permitAll() // 모든 사용자 회원가입 엔드포인트 허용 .anyRequest().authenticated() ) diff --git a/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserLoginReqDto.java b/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserLoginReqDto.java index 0e45bf7..2ac5d15 100644 --- a/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserLoginReqDto.java +++ b/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserLoginReqDto.java @@ -3,9 +3,9 @@ import jakarta.validation.constraints.NotBlank; public record UserLoginReqDto( - @NotBlank + @NotBlank(message = "아이디를 입력해주세요") String loginId, - @NotBlank + @NotBlank(message = "비밀번호를 입력해주세요") String password ) { } diff --git a/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserSaveReqDto.java b/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserSaveReqDto.java index 30f097f..1a77b90 100644 --- a/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserSaveReqDto.java +++ b/src/main/java/net/skhu/likelion12thteam03be/user/api/dto/request/UserSaveReqDto.java @@ -3,11 +3,11 @@ import jakarta.validation.constraints.NotBlank; public record UserSaveReqDto( - @NotBlank + @NotBlank(message = "아이디를 입력해주세요") String loginId, - @NotBlank + @NotBlank(message = "비밀번호를 입력해주세요") String password, - @NotBlank + @NotBlank(message = "닉네임을 입력해주세요") String nickname ) { diff --git a/src/main/java/net/skhu/likelion12thteam03be/user/application/UserService.java b/src/main/java/net/skhu/likelion12thteam03be/user/application/UserService.java index 6707726..0200fda 100644 --- a/src/main/java/net/skhu/likelion12thteam03be/user/application/UserService.java +++ b/src/main/java/net/skhu/likelion12thteam03be/user/application/UserService.java @@ -26,7 +26,7 @@ public class UserService { @Transactional public void join(UserSaveReqDto userSaveReqDto) { if (userRepository.existsByLoginId(userSaveReqDto.loginId())) { - throw new InvalidUserException("이미 존재하는 아이디입니다."); // incaalidUserException + throw new InvalidUserException("이미 존재하는 아이디입니다."); } User user = User.builder() .loginId(userSaveReqDto.loginId()) From 86f6e05020611714c6d457862c4d251e40fc7473 Mon Sep 17 00:00:00 2001 From: shinheekim Date: Wed, 24 Jul 2024 03:24:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=EC=A3=BC=EC=84=9D=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../likelion12thteam03be/global/config/SecurityConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java b/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java index 3056432..22225c9 100644 --- a/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java +++ b/src/main/java/net/skhu/likelion12thteam03be/global/config/SecurityConfig.java @@ -31,8 +31,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .logout(AbstractHttpConfigurer::disable) .httpBasic(AbstractHttpConfigurer::disable) .authorizeHttpRequests(authorize -> authorize -// .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() - .requestMatchers(HttpMethod.POST, "/users/**").permitAll() // 모든 사용자 회원가입 엔드포인트 허용 + .requestMatchers(HttpMethod.POST, "/users/**").permitAll() .anyRequest().authenticated() ) .addFilterBefore(jwtAuthorizationFilter, UsernamePasswordAuthenticationFilter.class)