merge: 251209 배포

src/main/java/com/permitseoul/permitserver/domain/auth/api/controller/AuthController.java

@@ -5,6 +5,7 @@
 import com.permitseoul.permitserver.domain.auth.api.dto.SignUpRequest;
 import com.permitseoul.permitserver.domain.auth.core.jwt.CookieCreatorUtil;
 import com.permitseoul.permitserver.domain.auth.api.service.AuthService;
+import com.permitseoul.permitserver.domain.auth.core.jwt.JwtProperties;
 import com.permitseoul.permitserver.global.Constants;
 import com.permitseoul.permitserver.global.aop.resolver.user.UserIdHeader;
 import com.permitseoul.permitserver.global.response.ApiResponseUtil;
@@ -23,6 +24,7 @@
 @RequiredArgsConstructor
 public class AuthController {
     private final AuthService authService;
+    private final JwtProperties jwtProperties;
 
     //회원가입
     @PostMapping("/signup")
@@ -79,8 +81,8 @@ public ResponseEntity<BaseResponse<?>> logout(
 
     private ResponseEntity<BaseResponse<?>> responseWithGeneratedCookie(final HttpServletResponse response,
                                                                         final TokenDto tokenDto) {
-        final ResponseCookie accessTokenCookie = CookieCreatorUtil.createAccessTokenCookie(tokenDto.accessToken());
-        final ResponseCookie refreshTokenCookie = CookieCreatorUtil.createRefreshTokenCookie(tokenDto.refreshToken());
+        final ResponseCookie accessTokenCookie = CookieCreatorUtil.createAccessTokenCookie(tokenDto.accessToken(), jwtProperties.accessTokenExpirationTime());
+        final ResponseCookie refreshTokenCookie = CookieCreatorUtil.createRefreshTokenCookie(tokenDto.refreshToken(), jwtProperties.refreshTokenExpirationTime());
         response.setHeader(Constants.SET_COOKIE, accessTokenCookie.toString());
         response.addHeader(Constants.SET_COOKIE, refreshTokenCookie.toString());
 

src/main/java/com/permitseoul/permitserver/domain/auth/api/service/AuthService.java

@@ -7,14 +7,11 @@
 import com.permitseoul.permitserver.domain.auth.core.domain.Token;
 import com.permitseoul.permitserver.domain.auth.api.dto.TokenDto;
 import com.permitseoul.permitserver.domain.auth.core.dto.UserSocialInfoDto;
-import com.permitseoul.permitserver.domain.auth.core.exception.AuthRTNotFoundException;
+import com.permitseoul.permitserver.domain.auth.core.exception.*;
 import com.permitseoul.permitserver.domain.auth.core.jwt.JwtProperties;
 import com.permitseoul.permitserver.domain.auth.core.jwt.RefreshTokenManager;
 import com.permitseoul.permitserver.domain.user.core.domain.User;
 import com.permitseoul.permitserver.domain.user.core.exception.UserDuplicateException;
-import com.permitseoul.permitserver.domain.auth.core.exception.AuthPlatformFeignException;
-import com.permitseoul.permitserver.domain.auth.core.exception.AuthRTException;
-import com.permitseoul.permitserver.domain.auth.core.exception.AuthWrongJwtException;
 import com.permitseoul.permitserver.domain.auth.core.jwt.JwtProvider;
 import com.permitseoul.permitserver.domain.auth.core.strategy.LoginStrategyManager;
 import com.permitseoul.permitserver.domain.auth.api.exception.AuthSocialNotFoundApiException;
@@ -111,7 +108,7 @@ public TokenDto reissue(final String refreshToken) {
             return TokenDto.of(newToken.getAccessToken(), newToken.getRefreshToken());
         } catch (AuthWrongJwtException | AuthRTNotFoundException e) {
             throw new AuthUnAuthorizedException(ErrorCode.UNAUTHORIZED_WRONG_RT);
-        } catch (ExpiredJwtException e) {
+        } catch (AuthExpiredJwtException e) {
             throw new AuthUnAuthorizedException(ErrorCode.UNAUTHORIZED_RT_EXPIRED);
         } catch (AuthRTException e) {
             throw new AuthUnAuthorizedException(ErrorCode.INTERNAL_RT_REDIS_ERROR);

src/main/java/com/permitseoul/permitserver/domain/auth/core/jwt/CookieCreatorUtil.java

@@ -7,8 +7,9 @@
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class CookieCreatorUtil {
-    private static final long AT_MAX_AGE = 365L * 24 * 60 * 60 * 1000; // todo: 추후 변경
-    private static final long RT_MAX_AGE = 369L * 24 * 60 * 60 * 1000; // todo: 추후 변경
+    private static JwtProperties jwtProperties;
+    private static final long ACCESS_COOKIE_EXTRA_SECONDS = 5L * 60;   // 5분
+    private static final long REFRESH_COOKIE_EXTRA_SECONDS = 15L * 60; // 15분
     private static final long RESERVED_MAX_AGE = 10L * 60; // 10분(10분간 선점 가능)
 
     public static ResponseCookie createReservationSessionCookie(final String sessionKey) {
@@ -21,19 +22,21 @@ public static ResponseCookie createReservationSessionCookie(final String session
                 .build();
     }
 
-    public static ResponseCookie createAccessTokenCookie(final String accessToken) {
+    public static ResponseCookie createAccessTokenCookie(final String accessToken, final long accessTokenExpirationMillis) {
+        final long maxAgeSeconds = toCookieMaxAgeSeconds(accessTokenExpirationMillis, ACCESS_COOKIE_EXTRA_SECONDS);
         return ResponseCookie.from(Constants.ACCESS_TOKEN, accessToken)
-                .maxAge(AT_MAX_AGE)
+                .maxAge(maxAgeSeconds)
                 .path("/")
                 .httpOnly(true)
                 .secure(true)
                 .sameSite("None")
                 .build();
     }
 
-    public static ResponseCookie createRefreshTokenCookie(final String refreshToken) {
+    public static ResponseCookie createRefreshTokenCookie(final String refreshToken,  final long refreshTokenExpirationMillis) {
+        final long maxAgeSeconds = toCookieMaxAgeSeconds(refreshTokenExpirationMillis, REFRESH_COOKIE_EXTRA_SECONDS);
         return ResponseCookie.from(Constants.REFRESH_TOKEN, refreshToken)
-                .maxAge(RT_MAX_AGE)
+                .maxAge(maxAgeSeconds)
                 .path("/")
                 .httpOnly(true)
                 .secure(true)
@@ -60,4 +63,9 @@ public static ResponseCookie deleteRefreshTokenCookie() {
                 .sameSite("None")
                 .build();
     }
+
+    private static long toCookieMaxAgeSeconds(long jwtExpirationMillis, long extraSeconds) {
+        long baseSeconds = jwtExpirationMillis / 1000;
+        return baseSeconds + extraSeconds;
+    }
 }

src/main/java/com/permitseoul/permitserver/global/filter/JwtAuthenticationFilter.java

@@ -24,21 +24,24 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 
 @RequiredArgsConstructor
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
     private final JwtProvider jwtProvider;
     private final List<String> whiteURIList;
     private final AntPathMatcher pathMatcher = new AntPathMatcher();
+    private static final String REISSUE_URI = "/api/users/reissue";
+    private static final String LOGIN_URI   = "/api/users/login";
 
     @Override
     protected void doFilterInternal(@NonNull final HttpServletRequest request,
                                     @NonNull final HttpServletResponse response,
                                     @NonNull final FilterChain filterChain) throws ServletException, IOException {
         final String uri = request.getRequestURI();
         try {
-            if(isHealthCheckUri(uri)) {
+            if(isHealthCheckUri(uri) || isLoginOrReissue(uri)) {
                 filterChain.doFilter(request, response);
                 return;
             }
@@ -78,5 +81,10 @@ private boolean isWhiteListUrl(final String requestURI) {
     private boolean isHealthCheckUri(final String uri) {
         return pathMatcher.match(Constants.HEALTH_CHECK_URL, uri);
     }
+
+    private boolean isLoginOrReissue(final String uri) {
+        return pathMatcher.match(LOGIN_URI, uri)
+                || pathMatcher.match(REISSUE_URI, uri);
+    }
 }
 

src/main/java/com/permitseoul/permitserver/global/redis/RedisTicketTypeCountInitializer.java

@@ -28,8 +28,6 @@ public void run(ApplicationArguments args) {
         final List<String> createdKeys = new ArrayList<>(ticketTypes.size());
 
         try {
-            log.error("TESTTTTTTTTTTTTTTTTTTTT"); //todo: test용, 추후 삭제
-
             ticketTypes.forEach(ticketType -> {
                 final String key = Constants.REDIS_TICKET_TYPE_KEY_NAME + ticketType.getTicketTypeId() + Constants.REDIS_TICKET_TYPE_REMAIN;
                 final boolean isCreated = redisManager.setIfAbsent(key, String.valueOf(ticketType.getRemainTicketCount()));