Merge branch 'shinhee'

LikeLion-12th-SKHU · Jul 23, 2024 · d9c1683 · d9c1683
2 parents bbd92fe + 86f6e05
commit d9c1683
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 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
@@ -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)

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
@@ -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
@@ -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
@@ -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())