🐛 Fix: logout 버그 수정

olmangjolmang · Jul 24, 2024 · 6a4a4b0 · 6a4a4b0
1 parent 1b36c43
commit 6a4a4b0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/main/java/com/ticle/server/user/dto/response/JwtTokenResponse.java b/src/main/java/com/ticle/server/user/dto/response/JwtTokenResponse.java
@@ -5,7 +5,12 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-
-public record JwtTokenResponse(String grantType,String accessToken,String refreshToken) {
-
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class JwtTokenResponse {
+    private String grantType;
+    private String accessToken;
+    private String refreshToken;
 }
diff --git a/src/main/java/com/ticle/server/user/service/UserService.java b/src/main/java/com/ticle/server/user/service/UserService.java
@@ -25,6 +25,7 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -62,7 +63,7 @@ public JwtTokenResponse signIn(LoginRequest loginRequest){
 //        SecurityContextHolder.getContext().setAuthentication(authentication);
 
         JwtTokenResponse jwtTokenResponse = jwtTokenProvider.generateToken(authentication);
-        redisDao.setRefreshToken(email, jwtTokenResponse.refreshToken(), ExpireTime.REFRESH_TOKEN_EXPIRE_TIME);
+        redisDao.setRefreshToken(email, jwtTokenResponse.getRefreshToken(), ExpireTime.REFRESH_TOKEN_EXPIRE_TIME);
 
         return jwtTokenResponse;
     }
@@ -79,14 +80,16 @@ public UserResponse signUp(JoinRequest joinRequest){
     }
 
 
-    @CacheEvict(cacheNames = CacheNames.USERBYEMAIL, key = "#p1")
+//    @CacheEvict(cacheNames = CacheNames.USERBYEMAIL, key = "#p1")
     @Transactional
     public ResponseEntity logout(CustomUserDetails customUserDetails, HttpServletRequest request) {
-        String email = "";
         String accessToken = jwtTokenProvider.resolveToken(request);
-        if(userRepository.findById(customUserDetails.getUserId()).isPresent()){
-            email = userRepository.findById(customUserDetails.getUserId()).get().getEmail();
-        }
+        log.info("여기까진 실행함!");
+
+        User user = userRepository.findById(customUserDetails.getUserId()).orElseThrow(()-> {
+                log.info("useruseruser");
+                return new UserNotFoundException(USER_NOT_FOUND);});
+        String email = user.getEmail();
         // 레디스에 accessToken 사용못하도록 등록
         Long expiration = jwtTokenProvider.getExpiration(accessToken);
         redisDao.setBlackList(accessToken, "logout", expiration);
@@ -95,6 +98,9 @@ public ResponseEntity logout(CustomUserDetails customUserDetails, HttpServletReq
         } else {
             throw new IllegalArgumentException("이미 로그아웃한 유저입니다.");
         }
+
+        log.info("Logout successful for user with email: {}", email);
+
         return ResponseEntity.ok("로그아웃 완료");
     }
 
@@ -116,8 +122,8 @@ public JwtTokenResponse reissueAtk(CustomUserDetails customUserDetails,String re
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(email,null,user.get().getAuthorities());
 //        Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
         JwtTokenResponse jwtTokenResponse = jwtTokenProvider.generateToken(authenticationToken);
-        String newAccessToken = jwtTokenResponse.accessToken();
-        String newRefreshToken = jwtTokenResponse.refreshToken();
+        String newAccessToken = jwtTokenResponse.getAccessToken();
+        String newRefreshToken = jwtTokenResponse.getRefreshToken();
 
         redisDao.setRefreshToken(email, newRefreshToken, ExpireTime.REFRESH_TOKEN_EXPIRE_TIME);