[debug] #71 디버깅 코드 삭제 (닉네임 에러 해결됨)

BOOK-TALK · Oct 1, 2024 · e51aff9 · e51aff9
1 parent 8d432c7
commit e51aff9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 29 deletions.
diff --git a/src/main/java/com/book/backend/domain/auth/service/CustomUserDetailsService.java b/src/main/java/com/book/backend/domain/auth/service/CustomUserDetailsService.java
@@ -32,7 +32,6 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
                 .authorities("ROLE_USER")
                 .build();
 
-        log.trace("CustomUserDetailsService > loadUserByUsername() > userDetails: {}", userDetails.getUsername());
         return userDetails;
     }
 }
diff --git a/src/main/java/com/book/backend/domain/message/mapper/MessageMapper.java b/src/main/java/com/book/backend/domain/message/mapper/MessageMapper.java
@@ -22,7 +22,6 @@
 @RequiredArgsConstructor
 @Slf4j
 public class MessageMapper {
-    private final ModelMapper mapper;
     private final UserService userService;
     private final UserRepository userRepository;
     private final OpentalkRepository opentalkRepository;
@@ -31,7 +30,6 @@ public class MessageMapper {
     public Message convertToMessage(MessageRequestDto dto) {
         log.trace("MessageMapper > convertToMessage()");
         User user = userService.loadLoggedinUser();
-        log.trace("convertToMessage() message 객체 생성 때의 userid", user.getUserId());
         if (user == null) {
             throw new CustomException(ErrorCode.USER_NOT_FOUND);
         }

diff --git a/src/main/java/com/book/backend/domain/message/service/MessageService.java b/src/main/java/com/book/backend/domain/message/service/MessageService.java
@@ -94,9 +94,7 @@ public MessageResponseDto saveMessage(MessageRequestDto messageRequestDto){
         validateToken(token);
 
         // message DB에 저장
-        log.trace("saveMessage() userId : {}", userService.loadLoggedinUser().getUserId());
         Message message = messageMapper.convertToMessage(messageRequestDto);
-        log.trace("saveMessage() message user : {}", message.getUser().getUserId());
         try{
             messageRepository.save(message);
         } catch (Exception e){
@@ -110,30 +108,17 @@ public void validateToken(String token) {
         log.trace("MessageService > validateToken()");
         try{
             String username = jwtUtil.getUsernameFromToken(token);  // username 가져옴
-            log.trace("validateToken() username : {}", username);
-            // 현재 SecurityContextHolder에 인증객체가 있는지 확인
-            if(SecurityContextHolder.getContext().getAuthentication() == null){
-                log.trace("validateToken() SecurityContextHolder에 인증객체 없음");
-            }
-
-//            if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
-                log.trace("여기 들어왔나?");
-                UserDetails userDetails;
-                userDetails = userDetailsService.loadUserByUsername(username);
-                log.trace("!!! : {}", userDetails.getUsername());
+            UserDetails userDetails;
+            userDetails = userDetailsService.loadUserByUsername(username);
 
-                // 토큰 유효성 검증
-                if (!jwtUtil.isValidToken(token, userDetails)) {
-                    log.trace("validateToken() 토큰 유효성 검증 실패 !!");
-                    throw new CustomException(ErrorCode.WRONG_JWT_TOKEN);
-                } else {
-                    log.trace("여기 들어왔음.");
-                    UsernamePasswordAuthenticationToken authenticated
-                            = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
-                    SecurityContextHolder.getContext().setAuthentication(authenticated);
-                    log.trace("validateToken() userid : {}", userService.loadLoggedinUser().getUserId());
-                }
-//            }
+            // 토큰 유효성 검증
+            if (!jwtUtil.isValidToken(token, userDetails)) {
+                throw new CustomException(ErrorCode.WRONG_JWT_TOKEN);
+            } else {
+                UsernamePasswordAuthenticationToken authenticated
+                        = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
+                SecurityContextHolder.getContext().setAuthentication(authenticated);
+            }
         } catch (ExpiredJwtException e) {
             throw new CustomException(ErrorCode.JWT_EXPIRED);
         } catch (Exception e) {

diff --git a/src/main/java/com/book/backend/util/JwtUtil.java b/src/main/java/com/book/backend/util/JwtUtil.java
@@ -27,7 +27,6 @@
 @Service
 @RequiredArgsConstructor
 public class JwtUtil {
-    private final UserRepository userRepository;
     @Value("${jwt.secretKey}")
     private String secret;
     @Value("${jwt.accessTokenExpireTime}")