Feat/#146/리프레쉬 토큰 도입

src/main/java/space/space_spring/config/WebConfig.java

@@ -22,11 +22,11 @@
 public class WebConfig implements WebMvcConfigurer {
 
     private final JwtLoginAuthInterceptor jwtLoginAuthInterceptor;
+    private final UserSpaceValidationInterceptor userSpaceValidationInterceptor;
 
     private final JwtLoginAuthHandlerArgumentResolver jwtLoginAuthHandlerArgumentResolver;
     private final UserSpaceIdHandlerArgumentResolver userSpaceIdHandlerArgumentResolver;
     private final UserSpaceAuthHandlerArgumentResolver userSpaceAuthHandlerArgumentResolver;
-    private final UserSpaceValidationInterceptor userSpaceValidationInterceptor;
 
 
     @Override
@@ -45,8 +45,6 @@ public void addInterceptors(InterceptorRegistry registry) {
         for(UserSpaceValidationInterceptorURL url:UserSpaceValidationInterceptorURL.values()) {
             userSpaceRegistration.addPathPatterns(url.getUrlPattern());
         }
-
-
     }
 
     @Override

src/main/java/space/space_spring/controller/OAuthController.java

@@ -1,16 +1,14 @@
 package space.space_spring.controller;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import space.space_spring.dto.jwt.TokenPairDTO;
 import space.space_spring.dto.oAuth.KakaoInfo;
-import space.space_spring.dto.oAuth.OAuthLoginResponse;
 import space.space_spring.entity.User;
 import space.space_spring.response.BaseResponse;
 import space.space_spring.service.OAuthService;
@@ -69,18 +67,53 @@ public void kakaoCallback(@RequestParam(name = "code") String code, HttpServletR
         User userByOAuthInfo = oAuthService.findUserByOAuthInfo(kakaoInfo);
 
         // TODO 5. 카카오 로그인 유저에게 jwt 발급
-        String jwtOAuthLogin = oAuthService.provideJwtToOAuthUser(userByOAuthInfo);
-        response.setHeader("Authorization", "Bearer " + jwtOAuthLogin);
-        log.info("jwtOAuthLogin = {}", jwtOAuthLogin);
+        TokenPairDTO tokenPairDTO = oAuthService.provideJwtToOAuthUser(userByOAuthInfo);
 
-        // Construct the redirect URL with the JWT and userId as query parameters
+        // TODO 6. 카카오 로그인 유저에게 발급한 refresh token을 db에 저장
+        oAuthService.updateRefreshToken(userByOAuthInfo, tokenPairDTO.getRefreshToken());
+
+        System.out.println("tokenPairDTO.getAccessToken() = " + tokenPairDTO.getAccessToken());
+        System.out.println("tokenPairDTO.getRefreshToken() = " + tokenPairDTO.getRefreshToken());
+
+        // 클라이언트로 response 전달
+        // -> 메서드 분리 ??
+        // 공백문자가 %20 으로 전달되는 듯 함 -> 프론트 분들과 협의 필요할 듯
         String redirectUrl = String.format(
-                "https://kuit-space.github.io/KUIT-Space-front/login?jwt=Bearer %s&userId=%s",
-                jwtOAuthLogin,
+                "https://kuit-space.github.io/KUIT-Space-front/login?access-token=%s&refresh-token=%s&userId=%s",
+                "Bearer " + tokenPairDTO.getAccessToken(),
+                "Bearer " + tokenPairDTO.getRefreshToken(),
                 userByOAuthInfo.getUserId()
         );
 
-        // Redirect to the specified URL
         response.sendRedirect(redirectUrl);
     }
+
+    /**
+     * 엑세스 토큰 갱신 요청 처리
+     * -> 엑세스 토큰, 리프레시 토큰 갱신 (RTR 패턴)
+     */
+    @PostMapping("/new-token")
+    public BaseResponse<String> updateAccessToken(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        // access token, refresh token 파싱
+        TokenPairDTO tokenPairDTO  = oAuthService.resolveTokenPair(request);
+
+        // access token 로부터 user find
+        User userByAccessToken = oAuthService.getUserByAccessToken(tokenPairDTO.getAccessToken());
+
+        // refresh token 유효성 검사
+        oAuthService.validateRefreshToken(userByAccessToken, tokenPairDTO.getRefreshToken());
+
+        // access token, refresh token 새로 발급
+        TokenPairDTO newTokenPairDTO = oAuthService.updateTokenPair(userByAccessToken);
+
+        // response header에 새로 발급한 token pair set
+        response.setHeader("Authorization-refresh", "Bearer " + newTokenPairDTO.getRefreshToken());
+        response.setHeader("Authorization", "Bearer " + newTokenPairDTO.getAccessToken());
+
+        System.out.println("tokenPairDTO.getAccessToken() = " + newTokenPairDTO.getAccessToken());
+        System.out.println("tokenPairDTO.getRefreshToken() = " + newTokenPairDTO.getRefreshToken());
+
+        // return
+        return new BaseResponse<>("토큰 갱신 요청 성공");
+    }
 }

src/main/java/space/space_spring/controller/TestController.java

@@ -1,6 +1,7 @@
 package space.space_spring.controller;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
@@ -52,6 +53,4 @@ public  BaseResponse<String> LoginPassAnnotaionTest(
                 +"");
     }
 
-
-
 }

src/main/java/space/space_spring/controller/UserController.java

@@ -3,23 +3,19 @@
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import space.space_spring.dto.user.GetUserProfileListDto;
 import space.space_spring.argumentResolver.jwtLogin.JwtLoginAuth;
 import space.space_spring.dto.user.PostLoginDto;
-import space.space_spring.dto.user.request.PostUserLoginRequest;
 import space.space_spring.dto.user.request.PostUserSignupRequest;
 import space.space_spring.dto.user.response.GetSpaceInfoForUserResponse;
 import space.space_spring.exception.CustomException;
 import space.space_spring.response.BaseResponse;
 import space.space_spring.service.UserService;
 import space.space_spring.util.userSpace.UserSpaceUtils;
 
-import java.util.stream.Collectors;
-
 import static space.space_spring.response.status.BaseExceptionResponseStatus.*;
 import static space.space_spring.util.bindingResult.BindingResultUtils.getErrorMessage;
 
@@ -56,7 +52,12 @@ public BaseResponse<PostLoginDto.Response> login(@Validated @RequestBody PostLog
         }
 
         PostLoginDto login = userService.login(request);
-        response.setHeader("Authorization", "Bearer " + login.getJwt());
+
+        System.out.println("login.getTokenPairDTO().getRefreshToken() = " + login.getTokenPairDTO().getRefreshToken());
+        System.out.println("login.getTokenPairDTO().getAccessToken() = " + login.getTokenPairDTO().getAccessToken());
+
+        response.setHeader("Authorization-refresh", "Bearer " + login.getTokenPairDTO().getRefreshToken());
+        response.setHeader("Authorization", "Bearer " + login.getTokenPairDTO().getAccessToken());
 
         return new BaseResponse<>(new PostLoginDto.Response(login.getUserId()));
     }
@@ -81,4 +82,5 @@ public BaseResponse<GetUserProfileListDto.Response> showUserProfileList(@JwtLogi
 
         return new BaseResponse<>(userService.getUserProfileList(userId));
     }
+
 }

src/main/java/space/space_spring/controller/TestOAuthController.java → src/main/java/space/space_spring/controller/ViewTestController.java

@@ -1,27 +1,27 @@
 package space.space_spring.controller;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-@RequestMapping("/oauth")
 @Slf4j
-public class TestOAuthController {
+public class ViewTestController {
 
+    /**
+     * 카카오 로그인 요청 처리
+     * 카카오 인증 서버의 인증 및 동의 요청 페이지로 redirect
+     */
     @Value("${oauth.kakao.client.id}")
     private String clientId;
 
     @Value("${oauth.kakao.redirect.uri}")
     private String redirectUri;
 
-    /**
-     * 카카오 로그인 요청 처리
-     * 카카오 인증 서버의 인증 및 동의 요청 페이지로 redirect
-     */
-    @GetMapping("/kakao")
+    @GetMapping("/oauth/kakao")
     public String kakaoConnect() {
         StringBuffer url = new StringBuffer();
         url.append("https://kauth.kakao.com/oauth/authorize?");

src/main/java/space/space_spring/dao/JwtRepository.java

@@ -0,0 +1,15 @@
+package space.space_spring.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import space.space_spring.entity.TokenStorage;
+import space.space_spring.entity.User;
+
+import java.util.Optional;
+
+@Repository
+public interface JwtRepository extends JpaRepository<TokenStorage, Long> {
+
+    Optional<TokenStorage> findByUser(User user);
+    void deleteByUser(User user);
+}

src/main/java/space/space_spring/dao/UserDao.java

@@ -8,6 +8,8 @@
 import space.space_spring.entity.User;
 import space.space_spring.entity.enumStatus.UserSignupType;
 
+import java.util.Optional;
+
 @Repository
 public class UserDao {
 
@@ -53,4 +55,15 @@ public User findUserByUserId(Long userId) {
         return em.find(User.class, userId);
     }
 
+    public Optional<User> findUserByRefreshToken(String refreshToken) {
+        String jpql = "SELECT u FROM User u WHERE u.refreshToken = :refreshToken AND u.status = 'ACTIVE'";
+        TypedQuery<User> query = em.createQuery(jpql, User.class);
+        query.setParameter("refreshToken", refreshToken);
+
+        try {
+            return Optional.of(query.getSingleResult());
+        } catch (NoResultException e) {
+            return Optional.empty();
+        }
+    }
 }

src/main/java/space/space_spring/dao/UserRepository.java

@@ -0,0 +1,15 @@
+package space.space_spring.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import space.space_spring.entity.User;
+
+import java.util.Optional;
+
+@Repository
+public interface UserRepository extends JpaRepository<User, Long> {
+
+    @Query("SELECT u FROM User u WHERE u.userId = :userId AND u.status = 'ACTIVE'")
+    Optional<User> findByUserId(Long userId);
+}

src/main/java/space/space_spring/dto/jwt/TokenPairDTO.java

@@ -0,0 +1,16 @@
+package space.space_spring.dto.jwt;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TokenPairDTO {
+
+    private String refreshToken;
+    private String accessToken;
+}

src/main/java/space/space_spring/dto/jwt/TokenType.java

@@ -0,0 +1,6 @@
+package space.space_spring.dto.jwt;
+
+public enum TokenType {
+    REFRESH,
+    ACCESS
+}

src/main/java/space/space_spring/dto/user/PostLoginDto.java

@@ -2,18 +2,16 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
+import space.space_spring.dto.jwt.TokenPairDTO;
 
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class PostLoginDto {
 
-    private String jwt;
-
+    private TokenPairDTO TokenPairDTO;
     private Long userId;
 
     @Getter

src/main/java/space/space_spring/entity/TokenStorage.java

@@ -0,0 +1,36 @@
+package space.space_spring.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(name = "Token_Storage")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TokenStorage {
+
+    @Id @GeneratedValue
+    @Column(name = "token_storage_id")
+    private Long tokenStorageId;
+
+    @OneToOne
+//    @Column(name = "user_id")
+    private User user;
+
+    @Column(name = "token_value")
+    private String tokenValue;
+
+    public void updateTokenValue(String tokenValue) {
+        this.tokenValue = tokenValue;
+    }
+
+    public boolean checkTokenValue(String tokenValue) {
+        return this.tokenValue.equals(tokenValue);
+    }
+
+}