[fix] ResponseCookie를 private으로 변경하여 캡슐화 개선 #8

Author: Hyeromon

src/main/java/org/dfbf/soundlink/domain/user/controller/UserController.java

@@ -41,17 +41,17 @@ public ResponseResult checkNickName(@RequestParam String nickName){
 
     @PutMapping
     @Operation(summary = "유저 수정", description = "유저 수정 API")
-    public ResponseResult updateUser(/*@AuthenticationPrincipal id: Int, */@RequestBody UserUpdateDto userUpdateDto) {
-        return userService.updateUser(1L, userUpdateDto);
+    public ResponseResult updateUser(@AuthenticationPrincipal Long id,@RequestBody UserUpdateDto userUpdateDto) {
+        return userService.updateUser(id, userUpdateDto);
     }
 
     @DeleteMapping
     @Operation(summary = "유저 삭제", description = "회원 탈퇴하는 API (탈퇴시 프로필 정보도 삭제됩니다.)")
-    public ResponseResult deleteUser(/*@AuthenticationPrincipal id: Int*/) { return userService.deleteUser(1L); }
+    public ResponseResult deleteUser(@AuthenticationPrincipal Long id) { return userService.deleteUser(id); }
 
     @GetMapping("/mypage")
     @Operation(summary = "마이 페이지", description = "마이 페이지 조회 API")
-    public ResponseResult getMyPage(/*@AuthenticationPrincipal id: Int*/) { return userService.getMyPage(1L); }
+    public ResponseResult getMyPage(@AuthenticationPrincipal Long id) { return userService.getMyPage(id); }
 
     @PostMapping("/login")
     @Operation(summary = "로그인", description = "로그인 API")

src/main/java/org/dfbf/soundlink/domain/user/service/UserService.java

@@ -1,7 +1,6 @@
 package org.dfbf.soundlink.domain.user.service;
 
 import jakarta.mail.MessagingException;
-import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
@@ -23,12 +22,8 @@
 import org.dfbf.soundlink.global.auth.TokenProperties;
 import org.dfbf.soundlink.global.exception.ErrorCode;
 import org.dfbf.soundlink.global.exception.ResponseResult;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpHeaders;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.ResponseCookie;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -50,6 +45,7 @@ public class UserService {
     private final RedisService redisService;
     private final JwtProvider jwtProvider;
     private final TokenProperties tokenProperties;
+    private RedisTemplate<String, String> redisTemplate;
 
 
     // 회원가입
@@ -108,9 +104,6 @@ public ResponseResult updateUser(Long userId, UserUpdateDto userUpdateDto) {
     public ResponseResult deleteUser(Long userId) {
         try {
             User user = userRepository.findById(userId).orElseThrow(() -> new NoUserDataException());
-
-//            profileMusicRepository.deleteByUser(user);  // 유저 프로필 음악 삭제
-//            emotionRecordRepository.deleteByUser(user); // 유저 감정 기록 삭제
             userRepository.deleteById(userId);          // 유저 삭제
 
             return new ResponseResult(ErrorCode.SUCCESS);
@@ -180,7 +173,7 @@ public boolean checkNickName(String nickName){
     }
 
     //refreshToken을 쿠키로 설정
-    public ResponseCookie getRefreshToken(String refreshToken) {
+    private ResponseCookie getRefreshToken(String refreshToken) {
         return ResponseCookie
                 .from("REFRESHTOKEN", refreshToken)
                 .domain("localhost")
@@ -207,7 +200,6 @@ public ResponseResult login(LoginReqDto loginReqDto, HttpServletResponse respons
             String accessToken = jwtProvider.createAccessToken(user.getUserId());
             String refreshToken = jwtProvider.createRefreshToken(user.getUserId());
 
-
             //refreshToken - 쿠키
             ResponseCookie refreshCookie = getRefreshToken(refreshToken);
             response.setHeader("Set-Cookie", refreshCookie.toString());

src/main/java/org/dfbf/soundlink/global/auth/JwtAuthenticationFilter.java

@@ -29,24 +29,17 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
     public void setAuthentication(String token) {
         Long userId = jwtProvider.getUserId(token); //userId 추출
 
-        // 로그 추가
-        System.out.println("Extracted User ID: " + userId);
-
         if (userId == null) {
             throw new IllegalArgumentException("userId cannot be null");
         }
 
         CustomUserDetails userDetails = new CustomUserDetails(userId);
 
-        // 로그 추가
-        System.out.println("Created CustomUserDetails: " + userDetails);
-
         // 인증토큰 생성
         UsernamePasswordAuthenticationToken authentication =
                 new UsernamePasswordAuthenticationToken(userId, null, userDetails.getAuthorities());
 
         // 인증정보 설정
-        System.out.println("Setting authentication with user ID: " + userId); // 로그 추가
         SecurityContextHolder.getContext().setAuthentication(authentication);
     }