Merge pull request #35 from AmorGakCo/hotfix/#31

hotfix/#34
AmorGakCo · Aug 23, 2024 · 8314c01 · 8314c01
2 parents 6987dfd + f7f3efd
commit 8314c01
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/src/main/java/com/amorgakco/backend/global/oauth/handler/Oauth2SuccessHandler.java b/src/main/java/com/amorgakco/backend/global/oauth/handler/Oauth2SuccessHandler.java
@@ -1,10 +1,9 @@
 package com.amorgakco.backend.global.oauth.handler;
 
 import com.amorgakco.backend.jwt.controller.JwtCookieLoader;
-import com.amorgakco.backend.jwt.dto.AccessTokenResponse;
 import com.amorgakco.backend.jwt.dto.MemberJwt;
+import com.amorgakco.backend.jwt.service.JwtProperties;
 import com.amorgakco.backend.jwt.service.JwtService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -16,15 +15,14 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 @RequiredArgsConstructor
 @Component
 public class Oauth2SuccessHandler implements AuthenticationSuccessHandler {
 
     private final JwtService jwtService;
     private final JwtCookieLoader jwtCookieLoader;
-    private final ObjectMapper objectMapper;
+    private final JwtProperties jwtProperties;
 
     @Override
     public void onAuthenticationSuccess(
@@ -33,13 +31,7 @@ public void onAuthenticationSuccess(
             final Authentication authentication)
             throws IOException {
         final MemberJwt memberJwt = jwtService.createAndSaveMemberToken(authentication.getName());
-        jwtCookieLoader.loadCookie(response, memberJwt.refreshToken());
-        final String accessToken =
-                objectMapper.writeValueAsString(new AccessTokenResponse(memberJwt.accessToken()));
-        final PrintWriter writer = response.getWriter();
-        writer.write(accessToken);
-        //        프론트랑 붙일 때 필요함
-        //        response.sendRedirect(jwtProperties.redirectUri());
-        writer.flush();
+        jwtCookieLoader.loadCookies(response, memberJwt.refreshToken(), memberJwt.accessToken());
+        response.sendRedirect(jwtProperties.frontUrl());
     }
 }
diff --git a/src/main/java/com/amorgakco/backend/jwt/controller/JwtCookieLoader.java b/src/main/java/com/amorgakco/backend/jwt/controller/JwtCookieLoader.java
@@ -9,20 +9,29 @@
 @Component
 public class JwtCookieLoader {
 
-    private static final int COOKIE_AGE_SECONDS = 604800;
-    private static final String REFRESH_TOKEN_COOKIE_NAME = "refresh-token";
+    private static final int REFRESH_COOKIE_AGE_SECONDS = 604800;
+    private static final int ACCESS_COOKIE_AGE_SECONDS = 180;
+    private static final String REFRESH_COOKIE_NAME = "refresh-token";
+    private static final String ACCESS_COOKIE_NAME = "access-token";
 
-    public void loadCookie(final HttpServletResponse response, final String refreshToken) {
-        final ResponseCookie refreshTokenCookie = makeCookie(refreshToken);
+    public void loadCookies(
+            final HttpServletResponse response,
+            final String refreshToken,
+            final String accessToken) {
+        final ResponseCookie refreshTokenCookie =
+                makeCookie(REFRESH_COOKIE_NAME, REFRESH_COOKIE_AGE_SECONDS, refreshToken);
+        final ResponseCookie accessTokenCookie =
+                makeCookie(ACCESS_COOKIE_NAME, ACCESS_COOKIE_AGE_SECONDS, accessToken);
         response.setHeader(HttpHeaders.SET_COOKIE, refreshTokenCookie.toString());
+        response.setHeader(HttpHeaders.SET_COOKIE, accessTokenCookie.toString());
     }
 
-    private ResponseCookie makeCookie(final String token) {
-        return ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, token)
-                .maxAge(COOKIE_AGE_SECONDS)
+    private ResponseCookie makeCookie(
+            final String cookieName, final int cookieAge, final String token) {
+        return ResponseCookie.from(cookieName, token)
+                .maxAge(cookieAge)
                 .secure(false)
                 .httpOnly(true)
-                .path("/")
                 .build();
     }
 }
diff --git a/src/main/java/com/amorgakco/backend/jwt/service/JwtProperties.java b/src/main/java/com/amorgakco/backend/jwt/service/JwtProperties.java
@@ -3,4 +3,4 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "jwt")
-public record JwtProperties(Long accessExpiration, Long refreshExpiration, String redirectUri) {}
+public record JwtProperties(Long accessExpiration, Long refreshExpiration, String frontUrl) {}
diff --git a/src/main/java/com/amorgakco/backend/jwt/service/JwtService.java b/src/main/java/com/amorgakco/backend/jwt/service/JwtService.java
@@ -20,7 +20,6 @@
 @RequiredArgsConstructor
 public class JwtService {
     private final JwtProperties jwtProperties;
-    private final JwtValidator jwtValidator;
     private final JwtCreator jwtCreator;
     private final RefreshTokenRepository refreshTokenRepository;