Feature/delete user

.gitignore

@@ -1,4 +1,5 @@
 HELP.md
+GEMINI.md
 .gradle
 build/
 !gradle/wrapper/gradle-wrapper.jar
@@ -25,6 +26,7 @@ bin/
 out/
 !**/src/main/**/out/
 !**/src/test/**/out/
+src/main/resources/keys/AuthKey.p8
 
 ### NetBeans ###
 /nbproject/private/

build.gradle

@@ -29,6 +29,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'

src/main/java/com/api/tokbaro/domain/auth/service/AuthService.java

@@ -6,5 +6,5 @@ public interface AuthService {
     SignInUserRes signIn(SignInUserReq signInUserReq);
     AppleLoginRes appleLogin(AppleIdReq appleIdReq);
     SignInUserRes reissue(ReissueReq reissueReq);
-    void logout(Long userId);
+    void logout(Long userId, String token);
 }

src/main/java/com/api/tokbaro/domain/auth/service/AuthServiceImpl.java

@@ -9,6 +9,7 @@
 import com.api.tokbaro.global.jwt.AppleJwtVerifier;
 import com.api.tokbaro.global.jwt.JwtTokenProvider;
 import com.api.tokbaro.global.jwt.UserPrincipal;
+import com.api.tokbaro.global.redis.RedisService;
 import com.api.tokbaro.global.response.code.user.UserErrorResponseCode;
 import com.nimbusds.jose.proc.BadJOSEException;
 import com.nimbusds.jwt.JWTClaimsSet;
@@ -21,6 +22,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Duration;
 import java.util.Collections;
 import java.util.Optional;
 
@@ -34,6 +36,8 @@ public class AuthServiceImpl implements AuthService {
     private final UserRepository userRepository;
     private final AppleJwtVerifier appleJwtVerifier;
     private final UserService userService;
+    private final RedisService redisService;
+    private static final String REFRESH_TOKEN_KEY_PREFIX = "RT:";
 
     //일반 로그인
     @Override
@@ -48,8 +52,8 @@ public SignInUserRes signIn(SignInUserReq signInUserReq) {
         UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
         User user = userRepository.findById(userPrincipal.getId())
                 .orElseThrow(()->new CustomException(UserErrorResponseCode.USER_NOT_FOUND_404));
-        user.setRefreshToken(tokens.refreshToken());
-        userRepository.save(user);
+
+        redisService.setValue(REFRESH_TOKEN_KEY_PREFIX + user.getId(), tokens.refreshToken(), Duration.ofMillis(jwtTokenProvider.getRefreshTokenValidity()));
         return tokens;
     }
 
@@ -102,8 +106,8 @@ public AppleLoginRes appleLogin(AppleIdReq appleIdReq) {
 
         //accessToken, refresh토큰 생성
         SignInUserRes tokens = jwtTokenProvider.createTokens(authentication);
-        user.setRefreshToken(tokens.refreshToken());
-        userRepository.save(user);
+        redisService.setValue(REFRESH_TOKEN_KEY_PREFIX + user.getId(), tokens.refreshToken(),
+                Duration.ofMillis(jwtTokenProvider.getRefreshTokenValidity()));
         return AppleLoginRes.builder()
                 .grantType(tokens.grantType())
                 .accessToken(tokens.accessToken())
@@ -121,9 +125,16 @@ public SignInUserRes reissue(ReissueReq reissueReq) {
             throw new CustomException(UserErrorResponseCode.INVALID_REFRESH_TOKEN_401);
         }
 
-        //2. RefreshToken으로 사용자 조회
-        User user = userRepository.findByRefreshToken(reissueReq.getRefreshToken())
-                .orElseThrow(()->new CustomException(UserErrorResponseCode.USER_NOT_FOUND_FOR_TOKEN_404));
+        //2. RefreshToken으로 사용자 ID 추출 및 Redis에서 검증
+        Long userId = jwtTokenProvider.getUserIdFromToken(reissueReq.getRefreshToken());
+        String storedRefreshToken = redisService.getValue(REFRESH_TOKEN_KEY_PREFIX + userId);
+
+        if(storedRefreshToken == null || !storedRefreshToken.equals(reissueReq.getRefreshToken())){
+            throw new CustomException(UserErrorResponseCode.INVALID_REFRESH_TOKEN_401);
+        }
+
+        User user = userRepository.findById(userId)
+                .orElseThrow( ()-> new CustomException(UserErrorResponseCode.USER_NOT_FOUND_404));
 
         //새로운 토큰을 위한 Authentication 객체 생성
         UserPrincipal userPrincipal = new UserPrincipal(
@@ -133,27 +144,34 @@ public SignInUserRes reissue(ReissueReq reissueReq) {
                 Collections.singleton(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()))
         );
 
+        redisService.deleteValue(REFRESH_TOKEN_KEY_PREFIX + userId);
+
         Authentication authentication = new UsernamePasswordAuthenticationToken(
                 userPrincipal,
                 null,
                 userPrincipal.getAuthorities());
 
         //새로운 토큰 생성
         SignInUserRes newTokens = jwtTokenProvider.createTokens(authentication);
-        user.setRefreshToken(newTokens.refreshToken());
-        userRepository.save(user);
+        redisService.setValue(REFRESH_TOKEN_KEY_PREFIX + user.getId(), newTokens.refreshToken(), Duration.ofMillis(jwtTokenProvider.getRefreshTokenValidity()));
 
         return newTokens;
     }
 
     //로그아웃
     @Override
     @Transactional
-    public void logout(Long userId) {
+    public void logout(Long userId, String accessToken) {
         User user = userRepository.findById(userId)
                 .orElseThrow(()->new CustomException(UserErrorResponseCode.USER_NOT_FOUND_404));
 
-        user.setRefreshToken(null);
-        userRepository.save(user);
+        log.info("로그아웃 요청 사용자: {}", user.getUsername());
+
+        redisService.deleteValue(REFRESH_TOKEN_KEY_PREFIX + userId);
+        log.info("Redis에서 사용자 {}의 Refresh Token을 제거 하였습니다.", user.getUsername());
+
+        Long expiration = jwtTokenProvider.getExpiration(accessToken);
+        redisService.addTokenToBlacklist(accessToken, expiration);
+        log.info("AccessToken을 블랙리스트에 추가했습니다. 만료 시간 : {}초", expiration);
     }
 }

src/main/java/com/api/tokbaro/domain/auth/web/controller/AuthController.java

@@ -3,17 +3,15 @@
 import com.api.tokbaro.domain.auth.service.AuthService;
 import com.api.tokbaro.domain.auth.web.dto.*;
 import com.api.tokbaro.domain.user.service.UserService;
+import com.api.tokbaro.global.jwt.JwtExtractor;
 import com.api.tokbaro.global.jwt.UserPrincipal;
 import com.api.tokbaro.global.response.SuccessResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -34,8 +32,10 @@ public ResponseEntity<SuccessResponse<?>> signIn(@RequestBody SignInUserReq sign
 
     //로그아웃
     @PostMapping("/logout")
-    public ResponseEntity<SuccessResponse<?>> logout(@AuthenticationPrincipal UserPrincipal userPrincipal) {
-        authService.logout(userPrincipal.getId());
+    public ResponseEntity<SuccessResponse<?>> logout(@AuthenticationPrincipal UserPrincipal userPrincipal,
+                                                     @RequestHeader("Authorization")String authorizationHeader) {
+        String accessToken = authorizationHeader.substring(JwtExtractor.BEARER_PREFIX.length());
+        authService.logout(userPrincipal.getId(),accessToken);
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(SuccessResponse.emptyCustom("로그아웃에 성공하였습니다."));

src/main/java/com/api/tokbaro/domain/content/entity/ContentData.java

@@ -7,6 +7,7 @@
 
 @Entity
 @Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/com/api/tokbaro/domain/user/entity/User.java

@@ -37,8 +37,6 @@ public class User extends BaseEntity {
     @Column(name = "apple_id")
     private String appleId; //애플 로그인 사용자 고유 ID
 
-    @Column(name = "refresh_token") //JWT 리프레쉬 토큰
-    private String refreshToken;
 
     @Enumerated(EnumType.STRING) //Enum값을 문자열로 저장
     private Role role;
@@ -47,10 +45,18 @@ public class User extends BaseEntity {
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Attendance> attendanceList;
 
+    @OneToOne(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    private ContentData contentData;
+
 
     //연관관계 편의 메서드
     public void addAttendance(Attendance attendance) {
         this.attendanceList.add(attendance);
         attendance.setUser(this);
     }
+
+    public void setContentData(ContentData contentData) {
+        this.contentData = contentData;
+        contentData.setUser(this);
+    }
 }

src/main/java/com/api/tokbaro/domain/user/repository/UserRepository.java

@@ -12,7 +12,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByAppleId(String appleId);
 
-    Optional<User> findByRefreshToken(String refreshToken);
 
     Boolean existsByEmail(String email);
 }

src/main/java/com/api/tokbaro/domain/user/service/UserService.java

@@ -12,5 +12,5 @@ public interface UserService {
 
     MyInfoRes getMyInfo(Long userId);
 
-    void deleteUser(Long userId);
+    void deleteUser(Long userId, String accessToken);
 }

src/main/java/com/api/tokbaro/domain/user/service/UserServiceImpl.java

@@ -10,6 +10,8 @@
 import com.api.tokbaro.domain.user.repository.UserRepository;
 import com.api.tokbaro.domain.user.web.dto.*;
 import com.api.tokbaro.global.exception.CustomException;
+import com.api.tokbaro.global.jwt.JwtTokenProvider;
+import com.api.tokbaro.global.redis.RedisService;
 import com.api.tokbaro.global.response.code.user.UserErrorResponseCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +29,8 @@ public class UserServiceImpl implements UserService {
     private final PasswordEncoder passwordEncoder;
     private final ContentDataRepository contentDataRepository;
     private final ApnsService apnsService;
+    private final JwtTokenProvider jwtTokenProvider;
+    private final RedisService redisService;
 
     @Override
     @Transactional
@@ -78,11 +82,18 @@ public MyInfoRes getMyInfo(Long userId) {
 
     @Override
     @Transactional
-    public void deleteUser(Long userId) {
+    public void deleteUser(Long userId, String accessToken) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(UserErrorResponseCode.USER_NOT_FOUND_404));
 
+        log.info("회원 탈퇴 요청 사용자 : {}", user.getUsername());
+        Long expiration = jwtTokenProvider.getExpiration(accessToken);
+        redisService.addTokenToBlacklist(accessToken, expiration);
+        redisService.deleteValue("RT:" + user.getId());
+        log.info("액세스 토큰이 블랙리스트에 추가 되었습니다. (만료시간 : {}초)", expiration);
+
         userRepository.delete(user);
+        log.info("유저 데이터가 성공적으로 삭제되었습니다.");
     }
 }
 

src/main/java/com/api/tokbaro/domain/user/web/controller/UserController.java

@@ -2,9 +2,11 @@
 
 import com.api.tokbaro.domain.user.service.UserService;
 import com.api.tokbaro.domain.user.web.dto.*;
+import com.api.tokbaro.global.jwt.JwtExtractor;
 import com.api.tokbaro.global.jwt.JwtTokenProvider;
 import com.api.tokbaro.global.jwt.UserPrincipal;
 import com.api.tokbaro.global.response.SuccessResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -23,6 +25,7 @@
 public class UserController {
 
     private final UserService userService;
+    private final JwtExtractor jwtExtractor;
 
     //회원가입
     @PostMapping("/users")
@@ -33,11 +36,23 @@ public ResponseEntity<SuccessResponse<?>> signUp(@RequestBody SignUpUserReq sign
                 .body(SuccessResponse.success("회원가입에 성공하였습니다."));
     }
 
+    //정보 조회
     @GetMapping("/users/me")
     public ResponseEntity<SuccessResponse<?>> getMyInfo(@AuthenticationPrincipal UserPrincipal userPrincipal){
         MyInfoRes myInfoRes = userService.getMyInfo(userPrincipal.getId());
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(SuccessResponse.ok(myInfoRes));
     }
+
+    //회원탈퇴
+    @DeleteMapping("/users")
+    public ResponseEntity<SuccessResponse<?>> deleteUser(@AuthenticationPrincipal UserPrincipal userPrincipal,
+                                                         @RequestHeader("Authorization")String authorizationHeader){
+        String accessToken = authorizationHeader.substring(JwtExtractor.BEARER_PREFIX.length());
+        userService.deleteUser(userPrincipal.getId(), accessToken);
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(SuccessResponse.okCustom(null,"회원탈퇴에 성공하였습니다"));
+    }
 }

src/main/java/com/api/tokbaro/global/config/ApnsConfig.java

@@ -6,6 +6,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,7 +17,7 @@
 public class ApnsConfig {
 
     @Value("${apns.p8-file-path}")
-    private String p8FilePath;
+    private Resource p8File;
 
     @Value("${apns.team-id}")
     private String teamId;
@@ -28,7 +29,7 @@ public class ApnsConfig {
     public ApnsClient apnsClient() throws IOException, NoSuchAlgorithmException, InvalidKeyException {
         final ApnsClient apnsClient = new ApnsClientBuilder()
                 .setApnsServer(ApnsClientBuilder.DEVELOPMENT_APNS_HOST)
-                .setSigningKey(ApnsSigningKey.loadFromPkcs8File(new File(p8FilePath), teamId, keyId))
+                .setSigningKey(ApnsSigningKey.loadFromInputStream(p8File.getInputStream(), teamId, keyId))
                 .build();
         return apnsClient;
     }

src/main/java/com/api/tokbaro/global/config/RedisConfig.java

@@ -0,0 +1,35 @@
+package com.api.tokbaro.global.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+
+    @Value("${REDIS_HOST}")
+    private String host;
+
+    @Value("${REDIS_PORT}")
+    private int port;
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        return new LettuceConnectionFactory(host, port);
+    }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+
+        // 일반적인 key:value의 경우 시리얼라이저
+        // 추가적으로 Hash를 사용할때는 추후에 추가하며 된다.
+        redisTemplate.setConnectionFactory(redisConnectionFactory());
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        return redisTemplate;
+    }
+}

src/main/java/com/api/tokbaro/global/config/SecurityConfig.java

@@ -1,7 +1,9 @@
 package com.api.tokbaro.global.config;
 
 import com.api.tokbaro.global.jwt.JwtAuthenticationFilter;
+import com.api.tokbaro.global.jwt.JwtExtractor;
 import com.api.tokbaro.global.jwt.JwtTokenProvider;
+import com.api.tokbaro.global.redis.RedisService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -22,6 +24,8 @@
 public class SecurityConfig {
 
     private final JwtTokenProvider jwtTokenProvider;
+    private final JwtExtractor jwtExtractor;
+    private final RedisService redisService;
 
     //비밀번호 암호화
     @Bean
@@ -57,7 +61,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 )
 
                 //JwtAuthenticationFilter를 필터체인에 추가
-                .addFilterBefore(new JwtAuthenticationFilter(jwtTokenProvider), UsernamePasswordAuthenticationFilter.class);
+                .addFilterBefore(new JwtAuthenticationFilter(jwtTokenProvider, jwtExtractor, redisService), UsernamePasswordAuthenticationFilter.class);
         return http.build();
     }
 }