refactor/OPS-398: 인증/인가 오류 수정

Author: Kimgooner

src/main/java/org/tuna/zoopzoop/backend/domain/auth/controller/ApiV1AuthController.java

@@ -13,7 +13,7 @@
 import org.tuna.zoopzoop.backend.domain.auth.dto.AuthResultData;
 import org.tuna.zoopzoop.backend.domain.auth.entity.AuthResult;
 import org.tuna.zoopzoop.backend.domain.auth.entity.RefreshToken;
-import org.tuna.zoopzoop.backend.domain.auth.service.RefreshTokenService;
+import org.tuna.zoopzoop.backend.domain.auth.service.refresh.RefreshTokenService;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 import org.tuna.zoopzoop.backend.global.rsData.RsData;
 import org.tuna.zoopzoop.backend.global.security.jwt.JwtUtil;

src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java

@@ -15,7 +15,7 @@
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 import org.tuna.zoopzoop.backend.domain.auth.entity.AuthResult;
-import org.tuna.zoopzoop.backend.domain.auth.service.RefreshTokenService;
+import org.tuna.zoopzoop.backend.domain.auth.service.refresh.RefreshTokenService;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 import org.tuna.zoopzoop.backend.domain.member.repository.MemberRepository;
 import org.tuna.zoopzoop.backend.domain.member.service.MemberService;

src/main/java/org/tuna/zoopzoop/backend/domain/auth/repository/RefreshTokenRepository.java

@@ -5,6 +5,7 @@
 import org.tuna.zoopzoop.backend.domain.auth.entity.RefreshToken;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -13,4 +14,5 @@ public interface RefreshTokenRepository extends JpaRepository<RefreshToken, Inte
     Optional<RefreshToken> findBySessionId(String sessionId);
     Optional<RefreshToken> findByMember(Member member);
     List<RefreshToken> findAllByMember(Member member);
+    List<RefreshToken> findAllByExpiredAtBefore(LocalDateTime dateTime);
 }

src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/CustomOAuth2UserService.java renamed to src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/oauth2/CustomOAuth2UserService.java

@@ -1,4 +1,4 @@
-package org.tuna.zoopzoop.backend.domain.auth.service;
+package org.tuna.zoopzoop.backend.domain.auth.service.oauth2;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;

src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/GoogleUserInfoService.java renamed to src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/oauth2/GoogleUserInfoService.java

@@ -1,4 +1,4 @@
-package org.tuna.zoopzoop.backend.domain.auth.service;
+package org.tuna.zoopzoop.backend.domain.auth.service.oauth2;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/KakaoUserInfoService.java renamed to src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/oauth2/KakaoUserInfoService.java

@@ -1,4 +1,4 @@
-package org.tuna.zoopzoop.backend.domain.auth.service;
+package org.tuna.zoopzoop.backend.domain.auth.service.oauth2;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/OAuth2UserInfoService.java renamed to src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/oauth2/OAuth2UserInfoService.java

@@ -1,4 +1,4 @@
-package org.tuna.zoopzoop.backend.domain.auth.service;
+package org.tuna.zoopzoop.backend.domain.auth.service.oauth2;
 
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 

src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/refresh/RefreshTokenCleanupService.java

@@ -0,0 +1,24 @@
+package org.tuna.zoopzoop.backend.domain.auth.service.refresh;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.tuna.zoopzoop.backend.domain.auth.entity.RefreshToken;
+import org.tuna.zoopzoop.backend.domain.auth.repository.RefreshTokenRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class RefreshTokenCleanupService {
+    private final RefreshTokenRepository refreshTokenRepository;
+
+    @Scheduled(fixedRate = 60 * 60 * 1000) // 1시간마다 실행
+    public void deleteExpiredTokens() {
+        List<RefreshToken> expiredTokens = refreshTokenRepository.findAllByExpiredAtBefore(LocalDateTime.now());
+        if (!expiredTokens.isEmpty()) {
+            refreshTokenRepository.deleteAll(expiredTokens);
+        }
+    }
+}

src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/RefreshTokenService.java renamed to src/main/java/org/tuna/zoopzoop/backend/domain/auth/service/refresh/RefreshTokenService.java

@@ -1,4 +1,4 @@
-package org.tuna.zoopzoop.backend.domain.auth.service;
+package org.tuna.zoopzoop.backend.domain.auth.service.refresh;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -49,8 +49,9 @@ public RefreshToken getBySessionId(String sessionId) {
     }
 
     public void deleteBySessionId(String sessionId) {
-        refreshTokenRepository.findBySessionId(sessionId)
+        RefreshToken token = refreshTokenRepository.findBySessionId(sessionId)
                 .orElseThrow(() -> new BadCredentialsException("잘못된 요청입니다."));
+        refreshTokenRepository.delete(token);
     }
 
     public void deleteByMember(Member member) {

src/main/java/org/tuna/zoopzoop/backend/domain/member/controller/ApiV1MemberController.java

@@ -9,7 +9,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.tuna.zoopzoop.backend.domain.auth.service.RefreshTokenService;
+import org.tuna.zoopzoop.backend.domain.auth.service.refresh.RefreshTokenService;
 import org.tuna.zoopzoop.backend.domain.member.dto.req.ReqBodyForEditMember;
 import org.tuna.zoopzoop.backend.domain.member.dto.req.ReqBodyForEditMemberName;
 import org.tuna.zoopzoop.backend.domain.member.dto.res.*;