From 01db29c208aa4d7291ff6022de1110abdcd17001 Mon Sep 17 00:00:00 2001 From: dongHyo Date: Tue, 28 Jun 2022 20:32:26 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EC=8B=9C=20refreshToken=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/user/application/AuthController.java | 11 +++++++++++ .../application/response/LogoutResponse.java | 17 +++++++++++++++++ .../user/service/AuthenticationServiceImpl.java | 14 ++++++++++++++ .../interfaces/AuthenticationService.java | 2 ++ 4 files changed, 44 insertions(+) create mode 100644 server/src/main/java/com/ticketing/server/user/application/response/LogoutResponse.java diff --git a/server/src/main/java/com/ticketing/server/user/application/AuthController.java b/server/src/main/java/com/ticketing/server/user/application/AuthController.java index 11d3243..589a8ed 100644 --- a/server/src/main/java/com/ticketing/server/user/application/AuthController.java +++ b/server/src/main/java/com/ticketing/server/user/application/AuthController.java @@ -1,6 +1,7 @@ package com.ticketing.server.user.application; import com.ticketing.server.user.application.request.LoginRequest; +import com.ticketing.server.user.application.response.LogoutResponse; import com.ticketing.server.user.application.response.TokenDto; import com.ticketing.server.user.service.interfaces.AuthenticationService; import lombok.RequiredArgsConstructor; @@ -8,6 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -40,6 +43,14 @@ public class AuthController { .body(tokenDto); } + @PostMapping("/logout") + public ResponseEntity logout(@AuthenticationPrincipal UserDetails userRequest) { + authenticationService.deleteRefreshToken(userRequest.getUsername()); + + return ResponseEntity.status(HttpStatus.OK) + .body(LogoutResponse.from(userRequest.getUsername())); + } + private HttpHeaders getHttpHeaders() { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.set(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate"); diff --git a/server/src/main/java/com/ticketing/server/user/application/response/LogoutResponse.java b/server/src/main/java/com/ticketing/server/user/application/response/LogoutResponse.java new file mode 100644 index 0000000..fcf7bed --- /dev/null +++ b/server/src/main/java/com/ticketing/server/user/application/response/LogoutResponse.java @@ -0,0 +1,17 @@ +package com.ticketing.server.user.application.response; + +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class LogoutResponse { + + private String email; + + public static LogoutResponse from(String email) { + return new LogoutResponse(email); + } + +} diff --git a/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java b/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java index 4915754..553817a 100644 --- a/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java +++ b/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java @@ -11,6 +11,7 @@ import com.ticketing.server.global.security.jwt.JwtProperties; import com.ticketing.server.global.security.jwt.JwtProvider; import com.ticketing.server.user.application.response.TokenDto; import com.ticketing.server.user.service.interfaces.AuthenticationService; +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; @@ -79,6 +80,19 @@ public class AuthenticationServiceImpl implements AuthenticationService { return tokenDto; } + @Override + @Transactional + public boolean deleteRefreshToken(String email) { + Optional findTokenEntity = refreshRedisRepository.findByEmail(email); + + if (findTokenEntity.isPresent()) { + refreshRedisRepository.delete(findTokenEntity.get()); + return true; + } + + return false; + } + private String resolveToken(String bearerToken) { if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) { return bearerToken.substring(7); diff --git a/server/src/main/java/com/ticketing/server/user/service/interfaces/AuthenticationService.java b/server/src/main/java/com/ticketing/server/user/service/interfaces/AuthenticationService.java index 7954395..d51d5eb 100644 --- a/server/src/main/java/com/ticketing/server/user/service/interfaces/AuthenticationService.java +++ b/server/src/main/java/com/ticketing/server/user/service/interfaces/AuthenticationService.java @@ -9,4 +9,6 @@ public interface AuthenticationService { TokenDto reissueTokenDto(String bearerRefreshToken); + boolean deleteRefreshToken(String email); + }