Merge pull request #116 from EFUB4-Jukebox/develop

[Deploy] 배포 v0.4.3 - 내 프로필 조회 API 응답 DTO 수정
EFUB4-Jukebox · Jul 29, 2024 · b1f6aea · b1f6aea
2 parents 7f74c0d + 898a5a9
commit b1f6aea
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/main/java/sws/songpin/domain/member/dto/response/MyProfileResponseDto.java b/src/main/java/sws/songpin/domain/member/dto/response/MyProfileResponseDto.java
@@ -7,10 +7,11 @@ public record MyProfileResponseDto(
         ProfileImg profileImg,
         String nickname,
         String handle,
+        String email,
         long followerCount,
         long followingCount
 ) {
     public static MyProfileResponseDto from(Member member, long followerCount, long followingCount){
-        return new MyProfileResponseDto(member.getProfileImg(), member.getNickname(), member.getHandle(), followerCount, followingCount);
+        return new MyProfileResponseDto(member.getProfileImg(), member.getNickname(), member.getHandle(), member.getEmail(), followerCount, followingCount);
     }
 }
diff --git a/src/main/java/sws/songpin/global/auth/CookieUtil.java b/src/main/java/sws/songpin/global/auth/CookieUtil.java
@@ -24,21 +24,25 @@ public String getCookieValue(HttpServletRequest request, String name){
     }
 
     public void addCookie(HttpServletResponse response, String name, String value, int maxAge){
-        Cookie refreshTokenCookie = new Cookie(name, value);
-        refreshTokenCookie.setHttpOnly(true);
-        refreshTokenCookie.setSecure(true);
-        refreshTokenCookie.setPath("/");
-        refreshTokenCookie.setMaxAge(maxAge);
 
-        response.addCookie(refreshTokenCookie);
+        StringBuilder cookieHeader = new StringBuilder();
+        cookieHeader.append(name).append("=").append(value).append(";");
+        cookieHeader.append("Max-Age=").append(maxAge).append(";");
+        cookieHeader.append("Expires=").append(new java.util.Date(System.currentTimeMillis() + maxAge * 1000L)).append(";");
+        cookieHeader.append("Path=/;");
+        cookieHeader.append("HttpOnly;");
+        cookieHeader.append("Secure;");
+        cookieHeader.append("SameSite=None;");
+
+        response.addHeader("Set-Cookie", cookieHeader.toString());
+
     }
 
     public void deleteCookie(HttpServletResponse response, String name){
-        Cookie refreshTokenCookie = new Cookie(name,null);
-        refreshTokenCookie.setHttpOnly(true);
-        refreshTokenCookie.setPath("/");
-        refreshTokenCookie.setMaxAge(0);
+        Cookie cookie = new Cookie(name,null);
+        cookie.setHttpOnly(true);
+        cookie.setPath("/");
+        cookie.setMaxAge(0);
 
-        response.addCookie(refreshTokenCookie);
-    }
+        response.addCookie(cookie);}
 }
diff --git a/src/main/java/sws/songpin/global/auth/JwtUtil.java b/src/main/java/sws/songpin/global/auth/JwtUtil.java
@@ -21,7 +21,7 @@ public class JwtUtil {
     private final Key refreshKey;
     private final RedisService redisService;
     private final CustomUserDetailsService userDetailsService;
-    private static final Duration ACCESS_TOKEN_EXPIRE_TIME = Duration.ofMinutes(30); //30분
+    private static final Duration ACCESS_TOKEN_EXPIRE_TIME = Duration.ofDays(1); //30분
     private static final Duration REFRESH_TOKEN_EXPIRE_TIME = Duration.ofDays(7); //7일
 
     public JwtUtil(@Value("${jwt.secret.access}") String accessSecret, @Value("${jwt.secret.refresh}") String refreshSecret, CustomUserDetailsService userDetailsService, RedisService redisService){