[fix] logout 수정

Solux-KimGreen · Jan 23, 2024 · 76d4cdc · 76d4cdc
1 parent de63595
commit 76d4cdc
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 2 deletions.
diff --git a/src/main/java/com/kimgreen/backend/config/Security/SecurityConfig.java b/src/main/java/com/kimgreen/backend/config/Security/SecurityConfig.java
@@ -109,14 +109,16 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 //.addFilterBefore(new JwtExceptionFilter(),JwtFilter.class)
 
                 //로그아웃
-                .logout((logoutConfig) ->
+                /*.logout((logoutConfig) ->
                         logoutConfig
                                 .logoutUrl("/auth/logout")
                                 .logoutSuccessHandler((request, response, authentication)
                                         -> {response.sendRedirect("/auth/log-in");})
                                 .deleteCookies("remember-me")
                 )
 
+                 */
+
 
                 // 조건별로 요청 허용/제한 설정
                 .authorizeHttpRequests((authorizeRequests)-> authorizeRequests

diff --git a/src/main/java/com/kimgreen/backend/domain/member/controller/AuthController.java b/src/main/java/com/kimgreen/backend/domain/member/controller/AuthController.java
@@ -53,4 +53,12 @@ public Response changePassword(@RequestBody ChangePasswordDto changePasswordDto)
         return success(CHANGE_PASSWORD_SUCCESS);
     }
 
+    @PostMapping("/logout")
+    @ResponseStatus(OK)
+    @Operation(summary = "로그아웃")
+    public Response logout(@RequestHeader("Authorization") String token) {
+        authService.logout(token);
+        return success("로그아웃 성공");
+    }
+
 }
diff --git a/src/main/java/com/kimgreen/backend/domain/member/service/AuthService.java b/src/main/java/com/kimgreen/backend/domain/member/service/AuthService.java
@@ -22,7 +22,9 @@
 import com.kimgreen.backend.exception.LogInFailureEmail;
 import com.kimgreen.backend.exception.LogInFailurePassword;
 import com.kimgreen.backend.exception.RefreshTokenExpired;
+import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
@@ -60,6 +62,13 @@ public void signUp(SignUpRequestDto signUpRequestDto) {
         saveMember(signUpRequestDto,email, password, nickname);
     }
 
+    @Transactional
+    public void logout(String token) {
+        SecurityContextHolder.clearContext();
+        HttpHeaders responseHeaders = new HttpHeaders();
+        responseHeaders.add("Authorization", "");
+    }
+
     @Transactional
     public TokenDto logIn(LogInRequestDto dto) {
         String email = dto.getEmail();

diff --git a/src/main/java/com/kimgreen/backend/domain/member/service/MemberService.java b/src/main/java/com/kimgreen/backend/domain/member/service/MemberService.java
@@ -15,6 +15,7 @@
 import com.kimgreen.backend.domain.profile.repository.ProfileBadgeRepository;
 import com.kimgreen.backend.domain.profile.repository.RepresentativeBadgeRepository;
 import com.kimgreen.backend.exception.LogInFailurePassword;
+import com.kimgreen.backend.exception.LogInRequiredException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -43,7 +44,12 @@ public class MemberService {
 
 
     public Member getCurrentMember() {
-        return memberRepository.findByEmail(SecurityContextHolder.getContext().getAuthentication().getName());
+
+        Member member = memberRepository.findByEmail(SecurityContextHolder.getContext().getAuthentication().getName());
+        if(member==null) {
+            throw new LogInRequiredException();
+        }
+        return member;
     }
 
     @Transactional

diff --git a/src/main/java/com/kimgreen/backend/exception/LogInRequiredException.java b/src/main/java/com/kimgreen/backend/exception/LogInRequiredException.java
@@ -0,0 +1,4 @@
+package com.kimgreen.backend.exception;
+
+public class LogInRequiredException extends RuntimeException{
+}
diff --git a/src/main/java/com/kimgreen/backend/response/Advice.java b/src/main/java/com/kimgreen/backend/response/Advice.java
@@ -57,4 +57,10 @@ public Response WrongPath() {
         return Response.failure(HttpStatus.NOT_FOUND, "잘못된 경로입니다.");
     }
 
+    @ExceptionHandler(LogInRequiredException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public Response LogInRequiredResponse() {
+        return Response.failure(HttpStatus.NOT_FOUND, "토큰이 존재하지 않습니다. 로그인 후 이용해주세요.");
+    }
+
 }