Feature/19 🚀 [feature] redis 설정 및 리프레쉬 토큰 관리 추가

build.gradle

@@ -25,6 +25,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     implementation 'io.springfox:springfox-swagger2:2.9.2'

src/main/java/briefing/exception/ErrorCode.java

@@ -44,8 +44,12 @@ public enum ErrorCode {
     FEIGN_METHOD_NOT_ALLOWED(BAD_REQUEST,"FEIGN_400_7" , "Feign server method not allowed"),
     FEIGN_SERVER_ERROR(BAD_REQUEST,"FEIGN_500" , "Feign server error"),
 
+
+    // member 관련 에러
+
+    MEMBER_NOT_FOUND(BAD_REQUEST, "MEMBER_400_1", "사용자가 없습니다"),
+
     // member 에러
-    MEMBER_NOT_FOUND(NOT_FOUND, "MEMBER_001", "존재하지 않는 사용자입니다."),
 
 
     // scrap 에러

src/main/java/briefing/exception/handler/MemberException.java

@@ -0,0 +1,10 @@
+package briefing.exception.handler;
+
+import briefing.exception.ErrorCode;
+import briefing.exception.GeneralException;
+
+public class MemberException extends GeneralException {
+    public MemberException(ErrorCode errorCode){
+        super(errorCode);
+    }
+}

src/main/java/briefing/exception/handler/RefreshTokenException.java

@@ -0,0 +1,10 @@
+package briefing.exception.handler;
+
+import briefing.exception.ErrorCode;
+import briefing.exception.GeneralException;
+
+public class RefreshTokenException extends GeneralException {
+    public RefreshTokenException(ErrorCode errorCode){
+        super(errorCode);
+    }
+}

src/main/java/briefing/member/api/MemberApi.java

@@ -7,12 +7,18 @@
 import briefing.member.application.dto.MemberResponse;
 import briefing.member.domain.Member;
 import briefing.member.domain.SocialType;
+import briefing.redis.service.RedisService;
+import briefing.security.provider.TokenProvider;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.UUID;
+
 @Tag(name = "02-Member \uD83D\uDC64",description = "사용자 관련 API")
 @RestController
 @RequestMapping("/members")
@@ -21,16 +27,29 @@ public class MemberApi {
     private final MemberQueryService memberQueryService;
     private final MemberCommandService memberCommandService;
 
+    private final TokenProvider tokenProvider;
+
+    private final RedisService redisService;
+
     @Operation(summary = "02-01 Member\uD83D\uDC64 소셜 로그인 #FRAME", description = "구글, 애플 소셜로그인 API입니다.")
     @PostMapping("/auth/{socialType}")
     public CommonResponse<MemberResponse.LoginDTO> login(
-        @Parameter(description = "소셜로그인 종류", example = "google") @PathVariable final SocialType socialType,
+        @Parameter(description = "소셜로그인 종류", example = "google")  @PathVariable final SocialType socialType,
         @RequestBody final MemberRequest.LoginDTO request
     ) {
         Member member = memberCommandService.login(socialType, request);
         // TODO - TokenProvider에서 발급해주도록 변경
-        String accessToken = "";
-        String refreshToken = "";
+        String accessToken = tokenProvider.createAccessToken(member.getId(),member.getSocialType().toString() ,member.getSocialId(), Arrays.asList(new SimpleGrantedAuthority("USER")));
+        String refreshToken = redisService.generateRefreshToken(member.getSocialId(),member.getSocialType());
         return CommonResponse.onSuccess(MemberConverter.toLoginDTO(member, accessToken, refreshToken));
     }
+
+    @Operation(summary = "토큰 잘 발급되나 테스트용API", description = "테스트 후 삭제합니다")
+    @GetMapping("/auth/test")
+    public CommonResponse<MemberResponse.LoginDTO> testGenerateToken(){
+        Member member = memberQueryService.findMember(1L);
+        String accessToken = tokenProvider.createAccessToken(member.getId(), member.getSocialType().toString() ,member.getSocialId(), Arrays.asList(new SimpleGrantedAuthority(member.getRole().name())));
+        String refreshToken = redisService.generateRefreshToken(member.getSocialId(), member.getSocialType());
+        return CommonResponse.onSuccess(MemberConverter.toLoginDTO(member,accessToken, refreshToken));
+    }
 }

src/main/java/briefing/member/application/MemberQueryService.java

@@ -1,5 +1,6 @@
 package briefing.member.application;
 
+import briefing.member.domain.Member;
 import briefing.member.domain.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -11,4 +12,7 @@
 public class MemberQueryService {
     private final MemberRepository memberRepository;
 
+    public Member findMember(Long memberId){
+        return memberRepository.findById(memberId).get();
+    }
 }

src/main/java/briefing/member/application/dto/MemberRequest.java

@@ -8,4 +8,9 @@ public class MemberRequest {
     public static class LoginDTO {
         private String identityToken;
     }
+
+    @Getter
+    public static class ReissueDTO{
+        private String refreshToken;
+    }
 }

src/main/java/briefing/redis/domain/RefreshToken.java

@@ -0,0 +1,22 @@
+package briefing.redis.domain;
+
+import lombok.*;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.redis.core.RedisHash;
+
+import java.time.LocalDateTime;
+
+@RedisHash(value = "refreshToken_Breifing", timeToLive = 1800000)
+@Builder
+@Getter
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class RefreshToken {
+
+    @Id
+    private Long memberId;
+
+    private String token;
+
+    private LocalDateTime expireTime;
+}

src/main/java/briefing/redis/repository/RefreshTokenRepository.java

@@ -0,0 +1,11 @@
+package briefing.redis.repository;
+
+import briefing.redis.domain.RefreshToken;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.Optional;
+
+public interface RefreshTokenRepository extends CrudRepository<RefreshToken, Long> {
+
+    Optional<RefreshToken> findByToken(String token);
+}

src/main/java/briefing/redis/service/RedisService.java

@@ -0,0 +1,15 @@
+package briefing.redis.service;
+
+import briefing.member.application.dto.MemberRequest;
+import briefing.member.domain.SocialType;
+import briefing.redis.domain.RefreshToken;
+
+public interface RedisService {
+
+    String generateRefreshToken(String socialId, SocialType socialType);
+
+    // accessToken 만료 시 발급 혹은 그대로 반환
+    String reGenerateRefreshToken(MemberRequest.ReissueDTO request);
+
+    void deleteRefreshToken(String refreshToken);
+}

src/main/java/briefing/redis/service/RedisServiceImpl.java

@@ -0,0 +1,91 @@
+package briefing.redis.service;
+
+import briefing.exception.ErrorCode;
+import briefing.exception.handler.MemberException;
+import briefing.exception.handler.RefreshTokenException;
+import briefing.member.application.dto.MemberRequest;
+import briefing.member.domain.Member;
+import briefing.member.domain.SocialType;
+import briefing.member.domain.repository.MemberRepository;
+import briefing.redis.domain.RefreshToken;
+import briefing.redis.repository.RefreshTokenRepository;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class RedisServiceImpl implements RedisService{
+
+    Logger logger =LoggerFactory.getLogger(RedisServiceImpl.class);
+
+    private final MemberRepository memberRepository;
+
+    private final RefreshTokenRepository refreshTokenRepository;
+
+    @Override
+    @Transactional
+    public String generateRefreshToken(String socialId, SocialType socialType) {
+        Member member = memberRepository.findBySocialIdAndSocialType(socialId, socialType).orElseThrow(() -> new RefreshTokenException(ErrorCode.MEMBER_NOT_FOUND));
+
+        // 이 부분 괜찮은지 리뷰
+        String token = UUID.randomUUID().toString();
+
+        Long memberId = member.getId();
+
+        LocalDateTime currentTime =LocalDateTime.now();
+
+        LocalDateTime expireTime = currentTime.plus(1000, ChronoUnit.MINUTES);
+
+        return refreshTokenRepository.save(
+            RefreshToken.builder()
+                    .memberId(memberId)
+                    .token(token)
+                    .expireTime(expireTime).build()
+        ).getToken();
+    }
+
+    @Override
+    public String reGenerateRefreshToken(MemberRequest.ReissueDTO request) {
+        if(request.getRefreshToken() == null)
+            throw new MemberException(ErrorCode.INVALID_TOKEN_EXCEPTION);
+        RefreshToken findRefreshToken = refreshTokenRepository.findByToken(request.getRefreshToken()).orElseThrow(() -> new RefreshTokenException(ErrorCode.INVALID_TOKEN_EXCEPTION));
+        LocalDateTime expireTime = findRefreshToken.getExpireTime();
+        LocalDateTime current = LocalDateTime.now();
+        // 테스트용, 실제로는 현재 시간 + accessToken 만료 시간
+        LocalDateTime expireDeadLine = current.plusSeconds(20);
+
+        Member member = memberRepository.findById(findRefreshToken.getMemberId()).orElseThrow(() -> new RefreshTokenException(ErrorCode.MEMBER_NOT_FOUND));
+
+        if(current.isAfter(expireTime)) {
+            logger.error("이미 만료된 리프레시 토큰 발견");
+            throw new RefreshTokenException(ErrorCode.RELOGIN_EXCEPTION);
+        }
+
+        // 새로 발급할 accessToken보다 refreshToken이 먼저 만료 될 경우인가?
+        if(expireTime.isAfter(expireDeadLine)) {
+            logger.info("기존 리프레시 토큰 발급");
+            return findRefreshToken.getToken();
+        }
+        else {
+            logger.info("accessToken보다 먼저 만료될 예정인 리프레시 토큰 발견");
+            deleteRefreshToken(request.getRefreshToken());
+            return generateRefreshToken(member.getSocialId(), member.getSocialType());
+        }
+    }
+
+    @Override
+    public void deleteRefreshToken(String refreshToken) {
+        Optional<RefreshToken> target = refreshTokenRepository.findByToken(refreshToken);
+        if(target.isPresent())
+            refreshTokenRepository.delete(target.get());
+    }
+}

src/main/resources/application.yml

@@ -23,6 +23,10 @@ spring:
   config:
     activate:
       on-profile: default
+  data:
+      host: 43.201.249.220
+      port : 6379
+      password: breifing
 jwt:
   header: Authorization
   # dev server