Merge pull request #155 from dnd-side-project/feature/#154-reissue

[FEAT] 토큰(Access Token) 재발급 응답 수정
dnd-side-project · Nov 26, 2024 · 7ff4353 · 7ff4353
2 parents 32af1c4 + 38b9430
commit 7ff4353
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/src/main/java/com/dnd/jjakkak/domain/jwt/provider/JwtProvider.java b/src/main/java/com/dnd/jjakkak/domain/jwt/provider/JwtProvider.java
@@ -48,10 +48,7 @@ public JwtProvider(JjakkakProperties jjakkakProperties, TokenProperties tokenPro
      */
     public String createAccessToken(String kakaoId) {
 
-//        Date expiredDate = Date.from(Instant.now().plus(accessTokenExpirationDay, ChronoUnit.DAYS));
-
-        // fixme: 테스트를 위해 AT 만료시간 3분으로 설정함!
-        Date expiredDate = Date.from(Instant.now().plus(3, ChronoUnit.MINUTES));
+        Date expiredDate = Date.from(Instant.now().plus(accessTokenExpirationDay, ChronoUnit.DAYS));
 
         return Jwts.builder()
                 .signWith(key, SignatureAlgorithm.HS256)
@@ -70,10 +67,7 @@ public String createAccessToken(String kakaoId) {
      * @return JWT
      */
     public String createRefreshToken(String kakaoId) {
-//        Date expiredDate = Date.from(Instant.now().plus(refreshTokenExpirationDay, ChronoUnit.DAYS));
-
-        // fixme: 테스트를 위해 RT 만료시간 5분으로 설정
-        Date expiredDate = Date.from(Instant.now().plus(5, ChronoUnit.MINUTES));
+        Date expiredDate = Date.from(Instant.now().plus(refreshTokenExpirationDay, ChronoUnit.DAYS));
 
         return Jwts.builder()
                 .signWith(key, SignatureAlgorithm.HS256)

diff --git a/src/main/java/com/dnd/jjakkak/domain/member/controller/AuthController.java b/src/main/java/com/dnd/jjakkak/domain/member/controller/AuthController.java
@@ -1,5 +1,6 @@
 package com.dnd.jjakkak.domain.member.controller;
 
+import com.dnd.jjakkak.domain.member.dto.response.AccessTokenResponseDto;
 import com.dnd.jjakkak.domain.member.dto.response.ReissueResponseDto;
 import com.dnd.jjakkak.domain.member.exception.UnauthorizedException;
 import com.dnd.jjakkak.domain.member.service.AuthService;
@@ -57,22 +58,24 @@ public ResponseEntity<Map<String, Boolean>> checkAuth(@RequestHeader(value = "Au
      */
 
     @GetMapping("/reissue")
-    public ResponseEntity<Void> reissueToken(@CookieValue(value = "refresh_token", required = false) String refreshToken) {
+    public ResponseEntity<AccessTokenResponseDto> reissueToken(@CookieValue(value = "refresh_token", required = false) String refreshToken) {
 
         if (Strings.isEmpty(refreshToken)) {
             throw new UnauthorizedException();
         }
 
         ReissueResponseDto reissuedToken = authService.reissueToken(refreshToken);
 
+
         ResponseCookie refreshCookie = CookieUtils.createCookie(
                 "refresh_token",
                 reissuedToken.getRefreshToken(),
                 60 * 60 * 24 * 7);
 
+        AccessTokenResponseDto responseDto = new AccessTokenResponseDto(reissuedToken.getAccessToken());
+
         return ResponseEntity.ok()
-                .header(HttpHeaders.AUTHORIZATION, reissuedToken.getAccessToken())
                 .header(HttpHeaders.SET_COOKIE, refreshCookie.toString())
-                .build();
+                .body(responseDto);
     }
 }
diff --git a/src/main/java/com/dnd/jjakkak/domain/member/dto/response/AccessTokenResponseDto.java b/src/main/java/com/dnd/jjakkak/domain/member/dto/response/AccessTokenResponseDto.java
@@ -0,0 +1,19 @@
+package com.dnd.jjakkak.domain.member.dto.response;
+
+import lombok.Getter;
+
+/**
+ * {class name}.
+ *
+ * @author 정승조
+ * @version 2024. 11. 26.
+ */
+@Getter
+public class AccessTokenResponseDto {
+
+    private final String accessToken;
+
+    public AccessTokenResponseDto(String accessToken) {
+        this.accessToken = accessToken;
+    }
+}