Merge branch 'main' into chore#320

Author: seungwookc97

src/main/java/com/back/domain/user/controller/UserAuthController.java

@@ -57,6 +57,7 @@ public RsData<Void> logout(HttpServletRequest request, HttpServletResponse respo
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "사용자 정보 조회"),
     })
+
     @GetMapping("/me")
     public RsData<UserMeResDto> getCurrentUser() {
         UserMeResDto userInfo = userAuthService.getCurrentUser();

src/main/java/com/back/global/security/SecurityConfig.java

@@ -1,5 +1,7 @@
 package com.back.global.security;
 
+import com.back.global.rsData.RsData;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -62,33 +64,34 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .addFilterBefore(customAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
                 .authorizeHttpRequests(auth -> auth
 
-                                // OAuth, GET POST 둘 다 사용
-                                .requestMatchers("/oauth2/**").permitAll()
-                                .requestMatchers("/login/oauth2/**").permitAll()
+                        // OAuth, GET POST 둘 다 사용
+                        .requestMatchers("/oauth2/**").permitAll()
+                        .requestMatchers("/login/oauth2/**").permitAll()
 
-                                //르프레시 갱신 및 칵테일 검색
-                                .requestMatchers(POST, "/user/auth/refresh").permitAll()
-                                .requestMatchers(POST, "/cocktails/search").permitAll()
+                        //르프레시 갱신 및 칵테일 검색
+                        .requestMatchers(POST, "/user/auth/refresh").permitAll()
+                        .requestMatchers(POST, "/cocktails/search").permitAll()
 
-                                // share은 인증 필요
-                                .requestMatchers(GET, "/cocktails/{id}/share").authenticated()
+                        // share은 인증 필요
+                        .requestMatchers(GET, "/cocktails/{id}/share").authenticated()
 
-                                // 권한 불필요 - 조회 API
-                                .requestMatchers(GET, "/").permitAll()
-                                .requestMatchers(GET, "/actuator/**").permitAll()
+                        // 권한 불필요 - 조회 API
+                        .requestMatchers(GET, "/").permitAll()
+                        .requestMatchers(GET, "/actuator/**").permitAll()
 
-                                .requestMatchers(GET, "/cocktails/**").permitAll()
+                        .requestMatchers(GET, "/cocktails/**").permitAll()
 
-                                .requestMatchers(GET, "/posts").permitAll()
-                                .requestMatchers(GET, "/posts/{postId}").permitAll()
-                                .requestMatchers(GET, "/posts/{postId}/comments").permitAll()
-                                .requestMatchers(GET, "/posts/{postId}/comments/{commentId}").permitAll()
-                                .requestMatchers(GET, "/cocktails/{cocktailId}/comments").permitAll()
-                                .requestMatchers(GET, "/cocktails/{cocktailId}/comments/{cocktailCommentId}").permitAll()
-                                .requestMatchers(GET, "/category").permitAll()
+                        .requestMatchers(GET, "/posts").permitAll()
+                        .requestMatchers(GET, "/posts/{postId}").permitAll()
+                        .requestMatchers(GET, "/posts/{postId}/comments").permitAll()
+                        .requestMatchers(GET, "/posts/{postId}/comments/{commentId}").permitAll()
+                        .requestMatchers(GET, "/cocktails/{cocktailId}/comments").permitAll()
+                        .requestMatchers(GET, "/cocktails/{cocktailId}/comments/{cocktailCommentId}").permitAll()
+                        .requestMatchers(GET, "/category").permitAll()
+
+                        // 나머지 모든 API는 인증 필요
+                        .anyRequest().authenticated()
 
-                                // 나머지 모든 API는 인증 필요
-                                .anyRequest().authenticated()
 
 //                         회원 or 인증된 사용자만 가능
 //                        .requestMatchers("/admin/**").hasRole("ADMIN")
@@ -110,12 +113,19 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .authenticationEntryPoint((request, response, authException) -> {
                             response.setContentType("application/json;charset=UTF-8");
                             response.setStatus(401);
-                            response.getWriter().write("{\"code\":401,\"message\":\"로그인 후 이용해주세요.\"}");
+
+                            RsData<Void> rsData = RsData.of(401, "로그인 후 이용해주세요.");
+
+                            ObjectMapper mapper = new ObjectMapper();
+                            response.getWriter().write(mapper.writeValueAsString(rsData));
                         })
                         .accessDeniedHandler((request, response, accessDeniedException) -> {
                             response.setContentType("application/json;charset=UTF-8");
                             response.setStatus(403);
-                            response.getWriter().write("{\"code\":403,\"message\":\"권한이 없습니다.\"}");
+                            RsData<Void> rsData = RsData.of(403, "권한이 없습니다.");
+
+                            ObjectMapper mapper = new ObjectMapper();
+                            response.getWriter().write(mapper.writeValueAsString(rsData));
                         })
                 )
                 .headers(headers -> headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin));