From 2207dcdea53d564110ab2a07f97aaca3ad2a9ce0 Mon Sep 17 00:00:00 2001
From: Yangdaehan <yangdh08@naver.com>
Date: Mon, 27 May 2024 23:40:17 +0900
Subject: [PATCH 1/6] =?UTF-8?q?6=EC=B0=A8=20=EC=84=B8=EB=AF=B8=EB=82=98=20?=
 =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EC=9E=85=EB=8B=88=EB=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

6차 세미나 과제
---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 week06/.idea/compiler.xml                     |   2 +-
 week06/.idea/gradle.xml                       |   1 +
 week06/practice/build.gradle                  |   4 +++
 .../filter/CustomAccessDeniedHandler.java     |   3 +-
 .../CustomJwtAuthenticationEntryPoint.java    |   3 +-
 .../auth/filter/JwtAuthenticationFilter.java  |   4 +--
 .../practice/auth/redis/domain/Token.java     |  32 ++++++++++++++++++
 .../practice/common/jwt/JwtTokenProvider.java |  26 ++++++++++++--
 .../practice/controller/BlogController.java   |   1 +
 .../sopt/practice/service/MemberService.java  |   5 ++-
 .../service/dto/UserJoinResponse.java         |   4 ++-
 12 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7e028f96c060f3be4fb58638f1135682a85f69f0
GIT binary patch
literal 6148
zcmeHKO;6iE5S<Nau!Sn+&`Mm8EOA8;k}7J|iwWVtp%;wkp`bLbqt?QBQ9ke?isW<q
zV|wi`>ECJJ>~0WgN-jtUp_yp*?asbg+i#s+FA=HEB-tmb6OjjJtoSJYW8BZaWEB^w
z0hJl!10B&WT~TtJEwLr=6cymP^XUZhc0gUaGk^L^oaq?7{AwJ)cmEheji^Qi4e-09
z2JIhb3*4V8xXneb+FHSF|HJ*UiW?WBYj?lD;_ECOjT?>Ms<KvnQCs)cy$$ao`lgF$
z+#gRyo&N9>w@$Ur;(5IvpQVGMSATV=^Kn1T2SbyPCIe8;Kc;!2i;kY;$;jkJw!`y1
zzgOR!PFrtVJHeY~d$toy-!&Vkx7xFr@4epMdw<fq%&v0%9rq7Y_@@|q>2MDGe0Ozi
z-$cVa)A?7#=Q(q(peP^;hyo8&z^y9Y#>0k@Y*9cIc!mn_`VhbwLx-hBvvi;^M*v_I
zVPmNC2P5YM4nv2fMfAXwO$FLi<&GH2rXwCWUg)s2Xwyl#!-sNLR_=tN%+)b|VCbYm
zi&BaLqQIg8YqnYE{r~9x^Z#O!v_t_>;8`i4s@<sD!6Ui7b?M=FuMOaz;cUz+E#9V}
iVzy#%c`M$88$&$c3NUn7T0{gU9|A@ODMW!sRp2keHF<3S

literal 0
HcmV?d00001

diff --git a/week06/.idea/compiler.xml b/week06/.idea/compiler.xml
index 028264f..14d0cb5 100644
--- a/week06/.idea/compiler.xml
+++ b/week06/.idea/compiler.xml
@@ -5,7 +5,7 @@
       <profile name="Gradle Imported" enabled="true">
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.30/f195ee86e6c896ea47a1d39defbe20eb59cd149d/lombok-1.18.30.jar" />
+          <entry name="$PROJECT_DIR$/../../KakaoPay-Server-main/kakaopay/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.30/f195ee86e6c896ea47a1d39defbe20eb59cd149d/lombok-1.18.30.jar" />
         </processorPath>
         <module name="practice.main" />
       </profile>
diff --git a/week06/.idea/gradle.xml b/week06/.idea/gradle.xml
index 07e02b8..519cc74 100644
--- a/week06/.idea/gradle.xml
+++ b/week06/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/week06/practice/build.gradle b/week06/practice/build.gradle
index ef61257..3b3f13c 100644
--- a/week06/practice/build.gradle
+++ b/week06/practice/build.gradle
@@ -42,6 +42,10 @@ dependencies {
 	//Security
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE'
+
+
+
 
 
 }
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomAccessDeniedHandler.java b/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomAccessDeniedHandler.java
index b8900be..e572164 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomAccessDeniedHandler.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomAccessDeniedHandler.java
@@ -11,7 +11,8 @@
 @Component
 public class CustomAccessDeniedHandler implements AccessDeniedHandler {
     @Override
-    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException {
+    public void handle(HttpServletRequest request, HttpServletResponse response,
+        AccessDeniedException accessDeniedException) throws IOException, ServletException {
         setResponse(response);
     }
 
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomJwtAuthenticationEntryPoint.java b/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomJwtAuthenticationEntryPoint.java
index 0f515f0..69d2e1f 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomJwtAuthenticationEntryPoint.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/filter/CustomJwtAuthenticationEntryPoint.java
@@ -19,7 +19,8 @@ public class CustomJwtAuthenticationEntryPoint implements AuthenticationEntryPoi
     private final ObjectMapper objectMapper;
 
     @Override
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
+    public void commence(HttpServletRequest request, HttpServletResponse response,
+        AuthenticationException authException) throws IOException {
         setResponse(response);
     }
 
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java b/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
index 9d50465..848bf96 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
@@ -27,8 +27,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     @Override
     protected void doFilterInternal(@NonNull HttpServletRequest request,
-        @NonNull HttpServletResponse response,
-        @NonNull FilterChain filterChain) throws ServletException, IOException {
+                                    @NonNull HttpServletResponse response,
+                                    @NonNull FilterChain filterChain) throws ServletException, IOException {
         try {
             final String token = getJwtFromRequest(request);
             if (jwtTokenProvider.validateToken(token) == VALID_JWT) {
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java b/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
new file mode 100644
index 0000000..a2ed55a
--- /dev/null
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
@@ -0,0 +1,32 @@
+/*
+package org.sopt.practice.auth.redis.domain;
+
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import org.springframework.data.redis.core.RedisHash;
+
+public class Token {
+
+    @RedisHash(value = "", timeToLive = 60 * 60 * 24 * 1000L * 14)
+
+    public class Token{
+
+        @Id
+        private Long id;
+
+        @Index()
+        private String refreshToken;
+
+        public static Token of(
+            final Long id;
+            final String RefreshToken;
+        ){
+            return Token.builder()
+                .id(id)
+                .refreshToken(refreshToken)
+                .build();
+        }
+    }
+
+}
+*/
diff --git a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
index 81e9ed5..8c77150 100644
--- a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
+++ b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
@@ -22,14 +22,36 @@ public class JwtTokenProvider {
 
     private static final String USER_ID = "userId";
 
-    private static final Long ACCESS_TOKEN_EXPIRATION_TIME = 24 * 60 * 60 * 1000L * 14;
+    private static final int ACCESS_TOKEN_EXPIRATION_TIME = 43200000; // 12시간
+    private static final int REFRESH_TOKEN_EXPIRATION_TIME = 604800000; // 7일
 
     @Value("${jwt.secret}")
     private String JWT_SECRET;
 
 
+
+    public String issueRefreshToken(Authentication authentication) {
+        return issueToken(authentication, (long) REFRESH_TOKEN_EXPIRATION_TIME);
+    }
+
+
     public String issueAccessToken(final Authentication authentication) {
-        return generateToken(authentication, ACCESS_TOKEN_EXPIRATION_TIME);
+        return generateToken(authentication, (long) ACCESS_TOKEN_EXPIRATION_TIME);
+    }
+
+    private String issueToken(Authentication authentication, Long refreshTokenExpirationTime) {
+        final Date now = new Date();
+        final Claims claims = Jwts.claims()
+            .setIssuedAt(now)
+            .setExpiration(new Date(now.getTime() + refreshTokenExpirationTime));      // 만료 시간
+
+        claims.put(USER_ID, authentication.getPrincipal());
+        return Jwts.builder()
+            .setHeaderParam(Header.TYPE, Header.JWT_TYPE) // Header
+            .setClaims(claims) // Claim
+            .signWith(getSigningKey()) // Signature
+            .compact();
+
     }
 
 
diff --git a/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java b/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
index a8242c9..fcdd2b2 100644
--- a/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
+++ b/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
@@ -21,6 +21,7 @@ public class BlogController {
     private final BlogService blogService;
 
 
+
     @PatchMapping("/blog/{blogId}/title")
     public ResponseEntity updateBlogTitle(
             @PathVariable Long blogId,
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java b/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
index 4404959..cc41dd2 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
@@ -43,7 +43,10 @@ public UserJoinResponse createMember(
         String accessToken = jwtTokenProvider.issueAccessToken(
             UserAuthentication.createUserAuthentication(memberId)
         );
-        return UserJoinResponse.of(accessToken, memberId.toString());
+        String refreshToken = jwtTokenProvider.issueRefreshToken(
+            UserAuthentication.createUserAuthentication(memberId)
+        );
+        return UserJoinResponse.of(accessToken,refreshToken, memberId.toString());
     }
 
     public MemberFindDto findMemberById(Long memberId) {
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/dto/UserJoinResponse.java b/week06/practice/src/main/java/org/sopt/practice/service/dto/UserJoinResponse.java
index 6c1025d..7eb49cd 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/dto/UserJoinResponse.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/dto/UserJoinResponse.java
@@ -2,14 +2,16 @@
 
 public record UserJoinResponse(
     String accessToken,
+    String refreshToken,
     String userId
 ) {
 
     public static UserJoinResponse of(
         String accessToken,
+        String refreshToken,
         String userId
     ) {
-        return new UserJoinResponse(accessToken, userId);
+        return new UserJoinResponse(accessToken,refreshToken,userId);
     }
 }
 

From ff87ee20671bcfa91a9db363832b28689d7f85ba Mon Sep 17 00:00:00 2001
From: Yangdaehan <yangdh08@naver.com>
Date: Sun, 2 Jun 2024 01:49:55 +0900
Subject: [PATCH 2/6] =?UTF-8?q?feat=20:=20Refresh=20Token=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../practice/auth/redis/domain/Token.java     | 43 ++++++++++--------
 .../practice/common/jwt/JwtTokenProvider.java |  1 -
 .../repository/RedisTokenRepository.java      | 12 +++++
 .../sopt/practice/service/BlogService.java    | 15 ++++++-
 .../sopt/practice/service/MemberService.java  | 20 +++++----
 .../sopt/practice/service/TokenService.java   | 45 +++++++++++++++++++
 .../service/UserAuthenticationService.java    |  5 +++
 7 files changed, 112 insertions(+), 29 deletions(-)
 create mode 100644 week06/practice/src/main/java/org/sopt/practice/repository/RedisTokenRepository.java
 create mode 100644 week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
 create mode 100644 week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java

diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java b/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
index a2ed55a..1289ab0 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
@@ -1,32 +1,39 @@
-/*
 package org.sopt.practice.auth.redis.domain;
 
+
 import jakarta.persistence.Id;
 import jakarta.persistence.Index;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
 import org.springframework.data.redis.core.RedisHash;
+import org.springframework.data.redis.core.index.Indexed;
+
 
+@RedisHash(value = "", timeToLive = 60 * 60 * 24 * 1000L * 14)
+@AllArgsConstructor
+@Getter
+@Builder
 public class Token {
 
-    @RedisHash(value = "", timeToLive = 60 * 60 * 24 * 1000L * 14)
+    @Id
+    private Long id;
+
+    @Indexed
+    private String refreshToken;
+
+    private static Token of(
+        final Long id,
+        final String refreshToken
+    ) {
+        return Token.builder()
+            .id(id)
+            .refreshToken(refreshToken)
+            .build();
+    }
 
-    public class Token{
 
-        @Id
-        private Long id;
 
-        @Index()
-        private String refreshToken;
 
-        public static Token of(
-            final Long id;
-            final String RefreshToken;
-        ){
-            return Token.builder()
-                .id(id)
-                .refreshToken(refreshToken)
-                .build();
-        }
-    }
 
 }
-*/
diff --git a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
index 8c77150..a87b3cd 100644
--- a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
+++ b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
@@ -11,7 +11,6 @@
 import java.util.Date;
 import javax.crypto.SecretKey;
 import lombok.RequiredArgsConstructor;
-import org.sopt.practice.common.jwt.JwtValidationType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
diff --git a/week06/practice/src/main/java/org/sopt/practice/repository/RedisTokenRepository.java b/week06/practice/src/main/java/org/sopt/practice/repository/RedisTokenRepository.java
new file mode 100644
index 0000000..63177be
--- /dev/null
+++ b/week06/practice/src/main/java/org/sopt/practice/repository/RedisTokenRepository.java
@@ -0,0 +1,12 @@
+package org.sopt.practice.repository;
+
+import java.util.Optional;
+import org.sopt.practice.auth.redis.domain.Token;
+import org.springframework.data.repository.CrudRepository;
+
+public interface RedisTokenRepository extends CrudRepository<Token, Long> {
+
+    Optional<Token> findByRefreshToken(final String refreshToken);
+    Optional<Token> findById(final Long id);
+
+}
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
index 356bbd7..1d3989d 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
@@ -7,8 +7,11 @@
 import org.sopt.practice.domain.Member;
 import org.sopt.practice.exception.NotFoundException;
 import org.sopt.practice.repository.BlogRepository;
+import org.sopt.practice.repository.RedisTokenRepository;
 import org.sopt.practice.service.dto.BlogCreateRequest;
 import org.sopt.practice.service.dto.BlogTitleUpdateRequest;
+import org.springframework.boot.autoconfigure.cache.CacheProperties.Redis;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -17,12 +20,20 @@ public class BlogService {
 
     private final BlogRepository blogRepository;
     private final MemberService memberService;
+    private final RedisTokenRepository redisTokenRepository;
 
 
-    public String create(Long memberId, BlogCreateRequest blogCreateRequest) {
-        //member찾기
+    public String create(Long memberId, BlogCreateRequest blogCreateRequest, String accessToken, String refreshToken) {
+        // 유효한 access token 확인 및 갱신
+        String validAccessToken = TokenService.validateAndRefreshAccessToken(accessToken, refreshToken);
+
+        // member 찾기
         Member member = memberService.findById(memberId);
+
+        // blog 생성 및 저장
         Blog blog = blogRepository.save(Blog.create(member, blogCreateRequest.title(), blogCreateRequest.description()));
+
+        // 블로그 ID 반환
         return blog.getId().toString();
     }
 
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java b/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
index cc41dd2..6299f62 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
@@ -5,11 +5,13 @@
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.sopt.practice.auth.UserAuthentication;
+import org.sopt.practice.auth.redis.domain.Token;
 import org.sopt.practice.common.dto.ErrorMessage;
 import org.sopt.practice.common.jwt.JwtTokenProvider;
 import org.sopt.practice.domain.Member;
 import org.sopt.practice.exception.NotFoundException;
 import org.sopt.practice.repository.MemberRepository;
+import org.sopt.practice.repository.RedisTokenRepository;
 import org.sopt.practice.service.dto.MemberCreateDto;
 import org.sopt.practice.service.dto.MemberFindDto;
 import org.sopt.practice.service.dto.UserJoinResponse;
@@ -22,15 +24,8 @@ public class MemberService {
 
     private final MemberRepository memberRepository;
     private final JwtTokenProvider jwtTokenProvider;
+    private final RedisTokenRepository redisTokenRepository;
 
-    //    @Transactional
-//    public String createMember(
-//            MemberCreateDto memberCreateDto
-//    ) {
-//        Member member = Member.create(memberCreateDto.name(), memberCreateDto.part(), memberCreateDto.age());
-//        memberRepository.save(member);
-//        return member.getId().toString();
-//    }
 
     @Transactional
     public UserJoinResponse createMember(
@@ -40,12 +35,21 @@ public UserJoinResponse createMember(
             Member.create(memberCreate.name(), memberCreate.part(), memberCreate.age())
         );
         Long memberId = member.getId();
+
         String accessToken = jwtTokenProvider.issueAccessToken(
             UserAuthentication.createUserAuthentication(memberId)
         );
         String refreshToken = jwtTokenProvider.issueRefreshToken(
             UserAuthentication.createUserAuthentication(memberId)
         );
+
+        // Redis에 refresh token 저장
+        Token token = Token.builder()
+            .id(memberId)
+            .refreshToken(refreshToken)
+            .build();
+        redisTokenRepository.save(token);
+
         return UserJoinResponse.of(accessToken,refreshToken, memberId.toString());
     }
 
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java b/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
new file mode 100644
index 0000000..5d92fac
--- /dev/null
+++ b/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
@@ -0,0 +1,45 @@
+package org.sopt.practice.service;
+
+import org.sopt.practice.auth.UserAuthentication;
+import org.sopt.practice.auth.redis.domain.Token;
+import org.sopt.practice.common.jwt.JwtTokenProvider;
+import org.sopt.practice.repository.RedisTokenRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class TokenService {
+
+    private final JwtTokenProvider jwtTokenProvider;
+    private final UserAuthenticationService userAuthenticationService;
+    private final RedisTokenRepository redisTokenRepository;
+
+    public TokenService(JwtTokenProvider jwtTokenProvider, UserAuthenticationService userAuthenticationService, RedisTokenRepository redisTokenRepository) {
+        this.jwtTokenProvider = jwtTokenProvider;
+        this.userAuthenticationService = userAuthenticationService;
+        this.redisTokenRepository = redisTokenRepository;
+    }
+
+    public String validateAndRefreshAccessToken(String accessToken, String refreshToken) {
+        if (jwtTokenProvider.validateToken(accessToken)) {
+            return accessToken;
+        }
+
+        Optional<Token> optionalToken = redisTokenRepository.findByRefreshToken(refreshToken);
+        if (optionalToken.isPresent() && jwtTokenProvider.validateToken(refreshToken)) {
+            Long memberId = jwtTokenProvider.getUserIdFromToken(refreshToken);
+            return jwtTokenProvider.issueAccessToken(UserAuthentication.createUserAuthentication(memberId));
+        }
+
+        throw new RuntimeException("Invalid or expired tokens");
+    }
+
+    public void storeRefreshToken(Long memberId, String refreshToken) {
+        Token token = Token.builder()
+            .id(memberId)
+            .refreshToken(refreshToken)
+            .build();
+        redisTokenRepository.save(token);
+    }
+}
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java b/week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java
new file mode 100644
index 0000000..7abef4e
--- /dev/null
+++ b/week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java
@@ -0,0 +1,5 @@
+package org.sopt.practice.service;
+
+public class UserAuthenticationService {
+
+}

From 6e89d2ccc260f87a8a741b2cc4ceb81184d411ff Mon Sep 17 00:00:00 2001
From: Yangdaehan <yangdh08@naver.com>
Date: Sun, 2 Jun 2024 02:14:06 +0900
Subject: [PATCH 3/6] =?UTF-8?q?fix=20:=20=ED=86=A0=ED=81=B0=EC=9D=B4=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=95=88=EB=90=98=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../practice/auth/UserAuthentication.java     |  2 +
 .../auth/filter/JwtAuthenticationFilter.java  |  8 ++--
 .../practice/common/jwt/JwtTokenProvider.java | 48 ++++++++++---------
 .../practice/controller/BlogController.java   |  4 +-
 .../sopt/practice/service/BlogService.java    |  8 ++--
 .../sopt/practice/service/TokenService.java   |  4 +-
 6 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java b/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java
index 14844b7..07410a5 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java
@@ -3,7 +3,9 @@
 import java.util.Collection;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.stereotype.Service;
 
+@Service
 public class UserAuthentication extends UsernamePasswordAuthenticationToken {
 
     public UserAuthentication(Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities) {
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java b/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
index 848bf96..472a676 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
@@ -1,7 +1,5 @@
 package org.sopt.practice.auth.filter;
 
-import static org.sopt.practice.common.jwt.JwtValidationType.VALID_JWT;
-
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -27,11 +25,11 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     @Override
     protected void doFilterInternal(@NonNull HttpServletRequest request,
-                                    @NonNull HttpServletResponse response,
-                                    @NonNull FilterChain filterChain) throws ServletException, IOException {
+        @NonNull HttpServletResponse response,
+        @NonNull FilterChain filterChain) throws ServletException, IOException {
         try {
             final String token = getJwtFromRequest(request);
-            if (jwtTokenProvider.validateToken(token) == VALID_JWT) {
+            if (token != null && jwtTokenProvider.validateToken(token)) {
                 Long memberId = jwtTokenProvider.getUserFromJwt(token);
                 UserAuthentication authentication = UserAuthentication.createUserAuthentication(memberId);
                 authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
diff --git a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
index a87b3cd..c1bc27e 100644
--- a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
+++ b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
@@ -7,14 +7,16 @@
 import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
-import java.util.Base64;
-import java.util.Date;
+import jakarta.annotation.PostConstruct;
 import javax.crypto.SecretKey;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
+import java.util.Base64;
+import java.util.Date;
+
 @Component
 @RequiredArgsConstructor
 public class JwtTokenProvider {
@@ -27,13 +29,17 @@ public class JwtTokenProvider {
     @Value("${jwt.secret}")
     private String JWT_SECRET;
 
+    private SecretKey key;
 
+    @PostConstruct
+    protected void init() {
+        key = Keys.hmacShaKeyFor(Base64.getDecoder().decode(JWT_SECRET));
+    }
 
     public String issueRefreshToken(Authentication authentication) {
         return issueToken(authentication, (long) REFRESH_TOKEN_EXPIRATION_TIME);
     }
 
-
     public String issueAccessToken(final Authentication authentication) {
         return generateToken(authentication, (long) ACCESS_TOKEN_EXPIRATION_TIME);
     }
@@ -42,56 +48,49 @@ private String issueToken(Authentication authentication, Long refreshTokenExpira
         final Date now = new Date();
         final Claims claims = Jwts.claims()
             .setIssuedAt(now)
-            .setExpiration(new Date(now.getTime() + refreshTokenExpirationTime));      // 만료 시간
+            .setExpiration(new Date(now.getTime() + refreshTokenExpirationTime)); // 만료 시간
 
         claims.put(USER_ID, authentication.getPrincipal());
         return Jwts.builder()
             .setHeaderParam(Header.TYPE, Header.JWT_TYPE) // Header
             .setClaims(claims) // Claim
-            .signWith(getSigningKey()) // Signature
+            .signWith(key) // Signature
             .compact();
-
     }
 
-
     public String generateToken(Authentication authentication, Long tokenExpirationTime) {
         final Date now = new Date();
         final Claims claims = Jwts.claims()
             .setIssuedAt(now)
-            .setExpiration(new Date(now.getTime() + tokenExpirationTime));      // 만료 시간
+            .setExpiration(new Date(now.getTime() + tokenExpirationTime)); // 만료 시간
 
         claims.put(USER_ID, authentication.getPrincipal());
 
         return Jwts.builder()
             .setHeaderParam(Header.TYPE, Header.JWT_TYPE) // Header
             .setClaims(claims) // Claim
-            .signWith(getSigningKey()) // Signature
+            .signWith(key) // Signature
             .compact();
     }
 
-    private SecretKey getSigningKey() {
-        String encodedKey = Base64.getEncoder().encodeToString(JWT_SECRET.getBytes()); //SecretKey 통해 서명 생성
-        return Keys.hmacShaKeyFor(encodedKey.getBytes());   //일반적으로 HMAC (Hash-based Message Authentication Code) 알고리즘 사용
-    }
-
-    public JwtValidationType validateToken(String token) {
+    public boolean validateToken(String token) {
         try {
             final Claims claims = getBody(token);
-            return JwtValidationType.VALID_JWT;
+            return true;
         } catch (MalformedJwtException ex) {
-            return JwtValidationType.INVALID_JWT_TOKEN;
+            return false;
         } catch (ExpiredJwtException ex) {
-            return JwtValidationType.EXPIRED_JWT_TOKEN;
+            return false;
         } catch (UnsupportedJwtException ex) {
-            return JwtValidationType.UNSUPPORTED_JWT_TOKEN;
+            return false;
         } catch (IllegalArgumentException ex) {
-            return JwtValidationType.EMPTY_JWT;
+            return false;
         }
     }
 
     private Claims getBody(final String token) {
         return Jwts.parserBuilder()
-            .setSigningKey(getSigningKey())
+            .setSigningKey(key)
             .build()
             .parseClaimsJws(token)
             .getBody();
@@ -101,4 +100,9 @@ public Long getUserFromJwt(String token) {
         Claims claims = getBody(token);
         return Long.valueOf(claims.get(USER_ID).toString());
     }
-}
\ No newline at end of file
+
+    public Long getUserIdFromToken(String token) {
+        Claims claims = getBody(token);
+        return Long.parseLong(claims.getSubject());
+    }
+}
diff --git a/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java b/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
index fcdd2b2..3bba54c 100644
--- a/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
+++ b/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
@@ -32,12 +32,12 @@ public ResponseEntity updateBlogTitle(
     }
 
     private final PrincipalHandler principalHandler;
-
+/*
     @PostMapping("/blog")
     public ResponseEntity createBlog(
         BlogCreateRequest blogCreateRequest
     ) {
         return ResponseEntity.created(URI.create(blogService.create(
             principalHandler.getUserIdFromPrincipal(), blogCreateRequest))).build();
-    }
+    }*/
 }
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
index 1d3989d..c1a9188 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
@@ -10,8 +10,6 @@
 import org.sopt.practice.repository.RedisTokenRepository;
 import org.sopt.practice.service.dto.BlogCreateRequest;
 import org.sopt.practice.service.dto.BlogTitleUpdateRequest;
-import org.springframework.boot.autoconfigure.cache.CacheProperties.Redis;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -21,11 +19,11 @@ public class BlogService {
     private final BlogRepository blogRepository;
     private final MemberService memberService;
     private final RedisTokenRepository redisTokenRepository;
-
+    private final TokenService tokenService;
 
     public String create(Long memberId, BlogCreateRequest blogCreateRequest, String accessToken, String refreshToken) {
         // 유효한 access token 확인 및 갱신
-        String validAccessToken = TokenService.validateAndRefreshAccessToken(accessToken, refreshToken);
+        String validAccessToken = tokenService.validateAndRefreshAccessToken(accessToken, refreshToken);
 
         // member 찾기
         Member member = memberService.findById(memberId);
@@ -40,7 +38,7 @@ public String create(Long memberId, BlogCreateRequest blogCreateRequest, String
     @Transactional
     public void updateTitle(Long blogId, BlogTitleUpdateRequest newTitle) {
         Blog target = blogRepository.findById(blogId)
-                .orElseThrow(() -> new NotFoundException(ErrorMessage.BLOG_NOT_FOUND));
+            .orElseThrow(() -> new NotFoundException(ErrorMessage.BLOG_NOT_FOUND));
         target.patch(newTitle);
         blogRepository.save(target);
     }
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java b/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
index 5d92fac..2841737 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
@@ -12,12 +12,10 @@
 public class TokenService {
 
     private final JwtTokenProvider jwtTokenProvider;
-    private final UserAuthenticationService userAuthenticationService;
     private final RedisTokenRepository redisTokenRepository;
 
-    public TokenService(JwtTokenProvider jwtTokenProvider, UserAuthenticationService userAuthenticationService, RedisTokenRepository redisTokenRepository) {
+    public TokenService(JwtTokenProvider jwtTokenProvider, RedisTokenRepository redisTokenRepository) {
         this.jwtTokenProvider = jwtTokenProvider;
-        this.userAuthenticationService = userAuthenticationService;
         this.redisTokenRepository = redisTokenRepository;
     }
 

From b158f5a16384707f4edeb7e1990c551b4c51dd40 Mon Sep 17 00:00:00 2001
From: Yangdaehan <yangdh08@naver.com>
Date: Sun, 2 Jun 2024 02:29:20 +0900
Subject: [PATCH 4/6] =?UTF-8?q?fix=20:=20refresh=20=ED=86=A0=ED=81=B0?=
 =?UTF-8?q?=EC=9D=B4=20redis=EC=97=90=20=EC=A0=80=EC=9E=A5=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EC=A7=81=EC=9D=B4=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=EB=90=98=EB=AF=80=EB=A1=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/sopt/practice/service/TokenService.java  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java b/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
index 2841737..e618146 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
@@ -33,11 +33,4 @@ public String validateAndRefreshAccessToken(String accessToken, String refreshTo
         throw new RuntimeException("Invalid or expired tokens");
     }
 
-    public void storeRefreshToken(Long memberId, String refreshToken) {
-        Token token = Token.builder()
-            .id(memberId)
-            .refreshToken(refreshToken)
-            .build();
-        redisTokenRepository.save(token);
-    }
 }

From 6ee4775951f19911360f64b3c6bee19abc38c77b Mon Sep 17 00:00:00 2001
From: Yangdaehan <yangdh08@naver.com>
Date: Sun, 2 Jun 2024 03:33:26 +0900
Subject: [PATCH 5/6] =?UTF-8?q?refactor=20:=20accessToken,=20refreshToken,?=
 =?UTF-8?q?=20userId=20=EC=A0=84=EB=B6=80=20=EC=B6=9C=EB=A0=A5=ED=95=98?=
 =?UTF-8?q?=EA=B2=8C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 week06/.idea/compiler.xml                     |  2 +-
 week06/practice/build.gradle                  |  1 +
 .../sopt/practice/auth/PrincipalHandler.java  |  2 +-
 .../sopt/practice/auth/SecurityConfig.java    |  8 +--
 .../practice/auth/UserAuthentication.java     |  8 +--
 .../auth/filter/JwtAuthenticationFilter.java  | 17 +++--
 .../auth/redis/config/RedisConfig.java        | 33 +++++++++
 .../practice/auth/redis/domain/Token.java     |  4 +-
 .../repository/RedisTokenRepository.java      |  9 ++-
 .../common/GlobalExceptionHandler.java        | 24 ++-----
 .../practice/common/dto/ErrorMessage.java     |  4 +-
 .../practice/common/jwt/JwtTokenProvider.java | 72 ++++++-------------
 .../practice/controller/BlogController.java   |  8 ++-
 .../practice/controller/MemberController.java | 43 +++++++----
 .../java/org/sopt/practice/domain/Blog.java   | 24 ++++---
 .../sopt/practice/service/BlogService.java    | 41 ++++++-----
 .../sopt/practice/service/MemberService.java  | 43 ++++++-----
 .../sopt/practice/service/TokenService.java   | 36 ----------
 .../service/UserAuthenticationService.java    |  5 --
 .../service/dto/BlogCreateRequest.java        |  9 ++-
 20 files changed, 199 insertions(+), 194 deletions(-)
 create mode 100644 week06/practice/src/main/java/org/sopt/practice/auth/redis/config/RedisConfig.java
 rename week06/practice/src/main/java/org/sopt/practice/{ => auth/redis}/repository/RedisTokenRepository.java (82%)
 delete mode 100644 week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
 delete mode 100644 week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java

diff --git a/week06/.idea/compiler.xml b/week06/.idea/compiler.xml
index 14d0cb5..028264f 100644
--- a/week06/.idea/compiler.xml
+++ b/week06/.idea/compiler.xml
@@ -5,7 +5,7 @@
       <profile name="Gradle Imported" enabled="true">
         <outputRelativeToContentRoot value="true" />
         <processorPath useClasspath="false">
-          <entry name="$PROJECT_DIR$/../../KakaoPay-Server-main/kakaopay/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.30/f195ee86e6c896ea47a1d39defbe20eb59cd149d/lombok-1.18.30.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.30/f195ee86e6c896ea47a1d39defbe20eb59cd149d/lombok-1.18.30.jar" />
         </processorPath>
         <module name="practice.main" />
       </profile>
diff --git a/week06/practice/build.gradle b/week06/practice/build.gradle
index 3b3f13c..2d8c825 100644
--- a/week06/practice/build.gradle
+++ b/week06/practice/build.gradle
@@ -42,6 +42,7 @@ dependencies {
 	//Security
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 
+	//redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE'
 
 
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/PrincipalHandler.java b/week06/practice/src/main/java/org/sopt/practice/auth/PrincipalHandler.java
index 8875551..0557a97 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/PrincipalHandler.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/PrincipalHandler.java
@@ -23,4 +23,4 @@ public void isPrincipalNull(
             throw new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/SecurityConfig.java b/week06/practice/src/main/java/org/sopt/practice/auth/SecurityConfig.java
index e3bd5c0..616c1ad 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/SecurityConfig.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/SecurityConfig.java
@@ -1,6 +1,7 @@
 package org.sopt.practice.auth;
 
 import lombok.RequiredArgsConstructor;
+
 import org.sopt.practice.auth.filter.CustomAccessDeniedHandler;
 import org.sopt.practice.auth.filter.CustomJwtAuthenticationEntryPoint;
 import org.sopt.practice.auth.filter.JwtAuthenticationFilter;
@@ -8,11 +9,10 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.annotation.web.configurers.RequestCacheConfigurer;
-
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 @Configuration
 @RequiredArgsConstructor
@@ -46,4 +46,4 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 
         return http.build();
     }
-}
\ No newline at end of file
+}
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java b/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java
index 07410a5..e8db84e 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/UserAuthentication.java
@@ -1,11 +1,9 @@
 package org.sopt.practice.auth;
-
-import java.util.Collection;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.stereotype.Service;
 
-@Service
+import java.util.Collection;
+
 public class UserAuthentication extends UsernamePasswordAuthenticationToken {
 
     public UserAuthentication(Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities) {
@@ -15,4 +13,4 @@ public UserAuthentication(Object principal, Object credentials, Collection<? ext
     public static UserAuthentication createUserAuthentication(Long userId) {
         return new UserAuthentication(userId, null, null);
     }
-}
+}
\ No newline at end of file
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java b/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
index 472a676..f38480c 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/filter/JwtAuthenticationFilter.java
@@ -4,12 +4,13 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+
 import org.sopt.practice.auth.UserAuthentication;
 import org.sopt.practice.common.dto.ErrorMessage;
 import org.sopt.practice.common.jwt.JwtTokenProvider;
+import org.sopt.practice.common.jwt.JwtValidationType;
 import org.sopt.practice.exception.UnauthorizedException;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
@@ -17,6 +18,9 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
+import java.io.IOException;
+
+
 @Component
 @RequiredArgsConstructor
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
@@ -29,12 +33,17 @@ protected void doFilterInternal(@NonNull HttpServletRequest request,
         @NonNull FilterChain filterChain) throws ServletException, IOException {
         try {
             final String token = getJwtFromRequest(request);
-            if (token != null && jwtTokenProvider.validateToken(token)) {
+            JwtValidationType validationType = jwtTokenProvider.validateToken(token);
+            if (validationType == JwtValidationType.VALID_JWT) {
                 Long memberId = jwtTokenProvider.getUserFromJwt(token);
-                UserAuthentication authentication = UserAuthentication.createUserAuthentication(memberId);
-                authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+                UserAuthentication authentication = UserAuthentication.createUserAuthentication(
+                    memberId);
+                authentication.setDetails(
+                    new WebAuthenticationDetailsSource().buildDetails(request));
                 SecurityContextHolder.getContext().setAuthentication(authentication);
             }
+        } catch (UnauthorizedException unauthorizedException) {
+            throw unauthorizedException;
         } catch (Exception exception) {
             throw new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION);
         }
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/redis/config/RedisConfig.java b/week06/practice/src/main/java/org/sopt/practice/auth/redis/config/RedisConfig.java
new file mode 100644
index 0000000..f5e35f5
--- /dev/null
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/redis/config/RedisConfig.java
@@ -0,0 +1,33 @@
+package org.sopt.practice.auth.redis.config;
+
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+
+    @Value("${spring.data.redis.host}")
+    private String host;
+
+    @Value("${spring.data.redis.port}")
+    private int port;
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        return new LettuceConnectionFactory(host, port);
+    }
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory());
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new StringRedisSerializer());
+        return redisTemplate;
+    }
+}
diff --git a/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java b/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
index 1289ab0..deec758 100644
--- a/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/redis/domain/Token.java
@@ -22,10 +22,10 @@ public class Token {
     @Indexed
     private String refreshToken;
 
-    private static Token of(
+    public static Token of(
         final Long id,
         final String refreshToken
-    ) {
+    ){
         return Token.builder()
             .id(id)
             .refreshToken(refreshToken)
diff --git a/week06/practice/src/main/java/org/sopt/practice/repository/RedisTokenRepository.java b/week06/practice/src/main/java/org/sopt/practice/auth/redis/repository/RedisTokenRepository.java
similarity index 82%
rename from week06/practice/src/main/java/org/sopt/practice/repository/RedisTokenRepository.java
rename to week06/practice/src/main/java/org/sopt/practice/auth/redis/repository/RedisTokenRepository.java
index 63177be..206ebaf 100644
--- a/week06/practice/src/main/java/org/sopt/practice/repository/RedisTokenRepository.java
+++ b/week06/practice/src/main/java/org/sopt/practice/auth/redis/repository/RedisTokenRepository.java
@@ -1,12 +1,11 @@
-package org.sopt.practice.repository;
+package org.sopt.practice.auth.redis.repository;
+
 
 import java.util.Optional;
 import org.sopt.practice.auth.redis.domain.Token;
 import org.springframework.data.repository.CrudRepository;
 
-public interface RedisTokenRepository extends CrudRepository<Token, Long> {
-
+public interface RedisTokenRepository extends CrudRepository<Token, String> {
     Optional<Token> findByRefreshToken(final String refreshToken);
     Optional<Token> findById(final Long id);
-
-}
+} 
diff --git a/week06/practice/src/main/java/org/sopt/practice/common/GlobalExceptionHandler.java b/week06/practice/src/main/java/org/sopt/practice/common/GlobalExceptionHandler.java
index 96578dc..f1b38af 100644
--- a/week06/practice/src/main/java/org/sopt/practice/common/GlobalExceptionHandler.java
+++ b/week06/practice/src/main/java/org/sopt/practice/common/GlobalExceptionHandler.java
@@ -1,38 +1,24 @@
 package org.sopt.practice.common;
 
 import org.sopt.practice.common.dto.ErrorResponse;
-import org.sopt.practice.exception.ForbiddenException;
 import org.sopt.practice.exception.NotFoundException;
 import org.sopt.practice.exception.UnauthorizedException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import java.util.Objects;
-
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    protected ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ErrorResponse.of(HttpStatus.BAD_REQUEST.value(), Objects.requireNonNull(e.getBindingResult().getFieldError().getDefaultMessage())));
-    } //메세지가 없을 수도 있으니 Objects
-
-    @ExceptionHandler(NotFoundException.class)
-    protected ResponseEntity<ErrorResponse> handleNotFoundException(NotFoundException e) {
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ErrorResponse.of(HttpStatus.NOT_FOUND.value(), e.getMessage()));
-    }
-
-    @ExceptionHandler(ForbiddenException.class)
-    protected ResponseEntity<ErrorResponse> handleForbiddenException(ForbiddenException e) {
-        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(ErrorResponse.of(HttpStatus.FORBIDDEN.value(), e.getMessage()));
-    }
-
     @ExceptionHandler(UnauthorizedException.class)
     protected ResponseEntity<ErrorResponse> handlerUnauthorizedException(UnauthorizedException e) {
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
             .body(ErrorResponse.of(e.getErrorMessage().getStatus(), e.getErrorMessage().getMessage()));
     }
+
+    @ExceptionHandler(NotFoundException.class)
+    protected ResponseEntity<ErrorResponse> handleNotFoundException(NotFoundException e) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ErrorResponse.of(e.getErrorMessage()));
+    }
 }
diff --git a/week06/practice/src/main/java/org/sopt/practice/common/dto/ErrorMessage.java b/week06/practice/src/main/java/org/sopt/practice/common/dto/ErrorMessage.java
index 4dc4e3a..ef0f149 100644
--- a/week06/practice/src/main/java/org/sopt/practice/common/dto/ErrorMessage.java
+++ b/week06/practice/src/main/java/org/sopt/practice/common/dto/ErrorMessage.java
@@ -13,9 +13,9 @@ public enum ErrorMessage {
 
     JWT_UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED.value(), "사용자의 로그인 검증을 실패했습니다."),
 
-    FORBIDDEN_MEMBER_ACCESS(HttpStatus.FORBIDDEN.value(), "이 멤버는 해당 블로그에 대한 접근 권한이 없습니다.")
+    FORBIDDEN_MEMBER_ACCESS(HttpStatus.FORBIDDEN.value(), "이 멤버는 해당 블로그에 대한 접근 권한이 없습니다."),
 
-    ;
+    INVALID_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED.value(), "유효하지 않은 refresh 토큰입니다.");
     private final int status;
 
     private final String message;
diff --git a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
index c1bc27e..a293c14 100644
--- a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
+++ b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
@@ -1,19 +1,12 @@
 package org.sopt.practice.common.jwt;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.Header;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.UnsupportedJwtException;
+import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;
-import jakarta.annotation.PostConstruct;
-import javax.crypto.SecretKey;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
-
+import org.springframework.beans.factory.annotation.Value;
+import javax.crypto.SecretKey;
 import java.util.Base64;
 import java.util.Date;
 
@@ -23,74 +16,59 @@ public class JwtTokenProvider {
 
     private static final String USER_ID = "userId";
 
-    private static final int ACCESS_TOKEN_EXPIRATION_TIME = 43200000; // 12시간
-    private static final int REFRESH_TOKEN_EXPIRATION_TIME = 604800000; // 7일
+    private static final Long ACCESS_TOKEN_EXPIRATION_TIME = 24 * 60 * 60 * 1000L * 14;
+    private static final Long REFRESH_TOKEN_EXPIRATION_TIME = 24 * 60 * 60 * 1000L * 14;
 
     @Value("${jwt.secret}")
     private String JWT_SECRET;
 
-    private SecretKey key;
-
-    @PostConstruct
-    protected void init() {
-        key = Keys.hmacShaKeyFor(Base64.getDecoder().decode(JWT_SECRET));
-    }
-
-    public String issueRefreshToken(Authentication authentication) {
-        return issueToken(authentication, (long) REFRESH_TOKEN_EXPIRATION_TIME);
-    }
 
     public String issueAccessToken(final Authentication authentication) {
-        return generateToken(authentication, (long) ACCESS_TOKEN_EXPIRATION_TIME);
+        return generateToken(authentication, ACCESS_TOKEN_EXPIRATION_TIME);
     }
 
-    private String issueToken(Authentication authentication, Long refreshTokenExpirationTime) {
-        final Date now = new Date();
-        final Claims claims = Jwts.claims()
-            .setIssuedAt(now)
-            .setExpiration(new Date(now.getTime() + refreshTokenExpirationTime)); // 만료 시간
-
-        claims.put(USER_ID, authentication.getPrincipal());
-        return Jwts.builder()
-            .setHeaderParam(Header.TYPE, Header.JWT_TYPE) // Header
-            .setClaims(claims) // Claim
-            .signWith(key) // Signature
-            .compact();
+    public String issueRefreshToken(final Authentication authentication) {
+        return generateToken(authentication, REFRESH_TOKEN_EXPIRATION_TIME);
     }
 
     public String generateToken(Authentication authentication, Long tokenExpirationTime) {
         final Date now = new Date();
         final Claims claims = Jwts.claims()
             .setIssuedAt(now)
-            .setExpiration(new Date(now.getTime() + tokenExpirationTime)); // 만료 시간
+            .setExpiration(new Date(now.getTime() + tokenExpirationTime));      // 만료 시간
 
         claims.put(USER_ID, authentication.getPrincipal());
 
         return Jwts.builder()
             .setHeaderParam(Header.TYPE, Header.JWT_TYPE) // Header
             .setClaims(claims) // Claim
-            .signWith(key) // Signature
+            .signWith(getSigningKey()) // Signature
             .compact();
     }
 
-    public boolean validateToken(String token) {
+    private SecretKey getSigningKey() {
+        String encodedKey = Base64.getEncoder().encodeToString(JWT_SECRET.getBytes()); //SecretKey 통해 서명 생성
+        return Keys.hmacShaKeyFor(encodedKey.getBytes());   //일반적으로 HMAC (Hash-based Message Authentication Code) 알고리즘 사용
+    }
+
+    public JwtValidationType validateToken(String token) {
         try {
             final Claims claims = getBody(token);
-            return true;
+            return JwtValidationType.VALID_JWT;
         } catch (MalformedJwtException ex) {
-            return false;
+            return JwtValidationType.INVALID_JWT_TOKEN;
         } catch (ExpiredJwtException ex) {
-            return false;
+            return JwtValidationType.EXPIRED_JWT_TOKEN;
         } catch (UnsupportedJwtException ex) {
-            return false;
+            return JwtValidationType.UNSUPPORTED_JWT_TOKEN;
         } catch (IllegalArgumentException ex) {
-            return false;
+            return JwtValidationType.EMPTY_JWT;
         }
     }
 
     private Claims getBody(final String token) {
         return Jwts.parserBuilder()
-            .setSigningKey(key)
+            .setSigningKey(getSigningKey())
             .build()
             .parseClaimsJws(token)
             .getBody();
@@ -100,9 +78,5 @@ public Long getUserFromJwt(String token) {
         Claims claims = getBody(token);
         return Long.valueOf(claims.get(USER_ID).toString());
     }
-
-    public Long getUserIdFromToken(String token) {
-        Claims claims = getBody(token);
-        return Long.parseLong(claims.getSubject());
-    }
 }
+
diff --git a/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java b/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
index 3bba54c..0074dd7 100644
--- a/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
+++ b/week06/practice/src/main/java/org/sopt/practice/controller/BlogController.java
@@ -20,7 +20,13 @@ public class BlogController {
 
     private final BlogService blogService;
 
-
+    @PostMapping("/blog")
+    public ResponseEntity createBlog(
+        @ModelAttribute BlogCreateRequest blogCreateRequest
+    ) {
+        return ResponseEntity.created(URI.create(blogService.create(
+            principalHandler.getUserIdFromPrincipal(), blogCreateRequest))).build();
+    }
 
     @PatchMapping("/blog/{blogId}/title")
     public ResponseEntity updateBlogTitle(
diff --git a/week06/practice/src/main/java/org/sopt/practice/controller/MemberController.java b/week06/practice/src/main/java/org/sopt/practice/controller/MemberController.java
index 06ba726..5cc48a4 100644
--- a/week06/practice/src/main/java/org/sopt/practice/controller/MemberController.java
+++ b/week06/practice/src/main/java/org/sopt/practice/controller/MemberController.java
@@ -1,6 +1,8 @@
 package org.sopt.practice.controller;
 
 import lombok.RequiredArgsConstructor;
+
+import org.sopt.practice.auth.PrincipalHandler;
 import org.sopt.practice.service.MemberService;
 import org.sopt.practice.service.dto.MemberCreateDto;
 import org.sopt.practice.service.dto.MemberFindDto;
@@ -13,23 +15,34 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+
 import org.springframework.web.bind.annotation.RestController;
 
+import java.net.URI;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/member")
 public class MemberController {
 
     private final MemberService memberService;
+    private final PrincipalHandler principalHandler;
 
-//    @PostMapping
-//    public ResponseEntity createMember(@RequestBody MemberCreateDto memberCreate) {
-//        return ResponseEntity.created(URI.create(memberService.createMember(memberCreate))).build();
-//    }
+    @PostMapping
+    public ResponseEntity<UserJoinResponse> postMember(
+        @RequestBody MemberCreateDto memberCreate
+    ) {
+        UserJoinResponse userJoinResponse = memberService.createMember(memberCreate);
+        return ResponseEntity.status(HttpStatus.CREATED)
+            .header("Location", userJoinResponse.userId())
+            .body(
+                userJoinResponse
+            );
+    }
 
     @GetMapping("/{memberId}")
-    public ResponseEntity<MemberFindDto> findMemberById(@PathVariable Long memberId){
-        return  ResponseEntity.ok(memberService.findMemberById(memberId));
+    public ResponseEntity<MemberFindDto> findMemberById(@PathVariable Long memberId) {
+        return ResponseEntity.ok(memberService.findMemberById(memberId));
     }
 
     @DeleteMapping("/{memberId}")
@@ -38,13 +51,19 @@ public ResponseEntity deleteMemberById(@PathVariable Long memberId){
         return ResponseEntity.noContent().build();
     }
 
-    @PostMapping
-    public ResponseEntity<UserJoinResponse> postMember(
-        @RequestBody MemberCreateDto memberCreate
-    ) {
-        UserJoinResponse userJoinResponse = memberService.createMember(memberCreate);
+    @PostMapping("/refresh")
+    public ResponseEntity<UserJoinResponse> refreshToken(){
+        UserJoinResponse userJoinResponse = memberService.refreshToken(
+            principalHandler.getUserIdFromPrincipal()
+        );
         return ResponseEntity.status(HttpStatus.CREATED)
             .header("Location", userJoinResponse.userId())
-            .body(userJoinResponse);
+            .body(
+                userJoinResponse
+            );
     }
+
+
+
+
 }
diff --git a/week06/practice/src/main/java/org/sopt/practice/domain/Blog.java b/week06/practice/src/main/java/org/sopt/practice/domain/Blog.java
index f47c03a..718d3fb 100644
--- a/week06/practice/src/main/java/org/sopt/practice/domain/Blog.java
+++ b/week06/practice/src/main/java/org/sopt/practice/domain/Blog.java
@@ -3,13 +3,14 @@
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.sopt.practice.service.dto.BlogCreateRequest;
 import org.sopt.practice.service.dto.BlogTitleUpdateRequest;
 
+
+
 @Entity
 @Getter
 @NoArgsConstructor
-public class Blog extends BaseTimeEntity{
+public class Blog extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -23,22 +24,25 @@ public class Blog extends BaseTimeEntity{
 
     private String description;
 
-    private Blog(Member member, String title, String description) {
+    private String imageUrl;
+
+    private Blog(Member member, String title, String imageUrl, String description) {
         this.member = member;
         this.title = title;
+        this.imageUrl = imageUrl;
         this.description = description;
     }
 
     public static Blog create(
-            Member member,
-            String title,
-            String description
+        Member member,
+        String title,
+        String description,
+        String imageUrl
     ) {
-        return new Blog(member, title, description);
+        return new Blog(member, title, imageUrl, description);
     }
 
-    public void patch(BlogTitleUpdateRequest blogTitleUpdateRequest) {
-        if(this.title != blogTitleUpdateRequest.title())
-            this.title = blogTitleUpdateRequest.title();
+    public void updateTitle(BlogTitleUpdateRequest blogTitleUpdateRequest) {
+        this.title = blogTitleUpdateRequest.title();
     }
 }
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
index c1a9188..2905469 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
@@ -1,13 +1,13 @@
 package org.sopt.practice.service;
 
 import jakarta.transaction.Transactional;
+import java.io.IOException;
 import lombok.RequiredArgsConstructor;
 import org.sopt.practice.common.dto.ErrorMessage;
 import org.sopt.practice.domain.Blog;
 import org.sopt.practice.domain.Member;
 import org.sopt.practice.exception.NotFoundException;
 import org.sopt.practice.repository.BlogRepository;
-import org.sopt.practice.repository.RedisTokenRepository;
 import org.sopt.practice.service.dto.BlogCreateRequest;
 import org.sopt.practice.service.dto.BlogTitleUpdateRequest;
 import org.springframework.stereotype.Service;
@@ -15,31 +15,36 @@
 @Service
 @RequiredArgsConstructor
 public class BlogService {
-
     private final BlogRepository blogRepository;
     private final MemberService memberService;
-    private final RedisTokenRepository redisTokenRepository;
-    private final TokenService tokenService;
 
-    public String create(Long memberId, BlogCreateRequest blogCreateRequest, String accessToken, String refreshToken) {
-        // 유효한 access token 확인 및 갱신
-        String validAccessToken = tokenService.validateAndRefreshAccessToken(accessToken, refreshToken);
 
-        // member 찾기
-        Member member = memberService.findById(memberId);
+    //private final S3Service s3Service;
+    private static final String BLOG_S3_UPLOAD_FOLER = "blog/";
+
 
-        // blog 생성 및 저장
-        Blog blog = blogRepository.save(Blog.create(member, blogCreateRequest.title(), blogCreateRequest.description()));
+    @Transactional
+    public String create(Long memberId, BlogCreateRequest createRequest) {
+        //member찾기
+        Member member = memberService.findById(memberId);
+        try {
+            Blog blog = blogRepository.save(Blog.create(member, createRequest.title(), createRequest.description(),
+                String.valueOf(createRequest.image())));
+            return blog.getId().toString();
+        } catch (RuntimeException e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
 
-        // 블로그 ID 반환
-        return blog.getId().toString();
+    protected Blog findById(Long blogId) {
+        return blogRepository.findById(blogId).orElseThrow(
+            () -> new NotFoundException(ErrorMessage.BLOG_NOT_FOUND)
+        );
     }
 
     @Transactional
-    public void updateTitle(Long blogId, BlogTitleUpdateRequest newTitle) {
-        Blog target = blogRepository.findById(blogId)
-            .orElseThrow(() -> new NotFoundException(ErrorMessage.BLOG_NOT_FOUND));
-        target.patch(newTitle);
-        blogRepository.save(target);
+    public void updateTitle(Long blogId, BlogTitleUpdateRequest blogTitleUpdateRequest) {
+        Blog blog = findById(blogId);
+        blog.updateTitle(blogTitleUpdateRequest);
     }
 }
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java b/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
index 6299f62..88dc487 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/MemberService.java
@@ -2,21 +2,22 @@
 
 
 import jakarta.persistence.EntityNotFoundException;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+
 import org.sopt.practice.auth.UserAuthentication;
 import org.sopt.practice.auth.redis.domain.Token;
+import org.sopt.practice.auth.redis.repository.RedisTokenRepository;
 import org.sopt.practice.common.dto.ErrorMessage;
 import org.sopt.practice.common.jwt.JwtTokenProvider;
 import org.sopt.practice.domain.Member;
 import org.sopt.practice.exception.NotFoundException;
+import org.sopt.practice.exception.UnauthorizedException;
 import org.sopt.practice.repository.MemberRepository;
-import org.sopt.practice.repository.RedisTokenRepository;
 import org.sopt.practice.service.dto.MemberCreateDto;
 import org.sopt.practice.service.dto.MemberFindDto;
 import org.sopt.practice.service.dto.UserJoinResponse;
 import org.springframework.stereotype.Service;
-
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
@@ -26,7 +27,6 @@ public class MemberService {
     private final JwtTokenProvider jwtTokenProvider;
     private final RedisTokenRepository redisTokenRepository;
 
-
     @Transactional
     public UserJoinResponse createMember(
         MemberCreateDto memberCreate
@@ -35,7 +35,6 @@ public UserJoinResponse createMember(
             Member.create(memberCreate.name(), memberCreate.part(), memberCreate.age())
         );
         Long memberId = member.getId();
-
         String accessToken = jwtTokenProvider.issueAccessToken(
             UserAuthentication.createUserAuthentication(memberId)
         );
@@ -43,16 +42,16 @@ public UserJoinResponse createMember(
             UserAuthentication.createUserAuthentication(memberId)
         );
 
-        // Redis에 refresh token 저장
-        Token token = Token.builder()
-            .id(memberId)
-            .refreshToken(refreshToken)
-            .build();
-        redisTokenRepository.save(token);
+        redisTokenRepository.save(Token.of(memberId, refreshToken));
 
-        return UserJoinResponse.of(accessToken,refreshToken, memberId.toString());
+        return UserJoinResponse.of(accessToken, refreshToken, memberId.toString());
     }
 
+    public Member findById(Long memberId) {
+        return memberRepository.findById(memberId).orElseThrow(
+            () -> new NotFoundException(ErrorMessage.MEMBER_NOT_FOUND)
+        );
+    }
     public MemberFindDto findMemberById(Long memberId) {
         return MemberFindDto.of(memberRepository.findById(memberId).orElseThrow(
             () -> new EntityNotFoundException("ID에 해당하는 사용자가 존재하지 않습니다.")
@@ -66,10 +65,20 @@ public void deleteMemberById(Long memberId) {
         memberRepository.delete(member);
     }
 
-    public Member findById(Long memberId) {
-        return memberRepository.findById(memberId).orElseThrow(
-            //() -> new NotFoundException(ErrorMessage.MEMBER_NOT_FOUND_BY_ID_EXCEPTION)
-            () -> new NotFoundException(ErrorMessage.BLOG_NOT_FOUND)
+    @Transactional
+    public UserJoinResponse refreshToken(Long memberId) {
+        if(!redisTokenRepository.existsById(String.valueOf(Long.valueOf(memberId.toString())))){
+            throw new UnauthorizedException(ErrorMessage.INVALID_REFRESH_TOKEN);
+        }
+        findById(memberId);
+
+        String accessToken = jwtTokenProvider.issueAccessToken(
+            UserAuthentication.createUserAuthentication(memberId)
+        );
+        String refreshToken = jwtTokenProvider.issueRefreshToken(
+            UserAuthentication.createUserAuthentication(memberId)
         );
+        redisTokenRepository.save(Token.of(memberId, refreshToken));
+        return UserJoinResponse.of(accessToken, refreshToken, memberId.toString());
     }
-}
\ No newline at end of file
+}
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java b/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
deleted file mode 100644
index e618146..0000000
--- a/week06/practice/src/main/java/org/sopt/practice/service/TokenService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.sopt.practice.service;
-
-import org.sopt.practice.auth.UserAuthentication;
-import org.sopt.practice.auth.redis.domain.Token;
-import org.sopt.practice.common.jwt.JwtTokenProvider;
-import org.sopt.practice.repository.RedisTokenRepository;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-@Service
-public class TokenService {
-
-    private final JwtTokenProvider jwtTokenProvider;
-    private final RedisTokenRepository redisTokenRepository;
-
-    public TokenService(JwtTokenProvider jwtTokenProvider, RedisTokenRepository redisTokenRepository) {
-        this.jwtTokenProvider = jwtTokenProvider;
-        this.redisTokenRepository = redisTokenRepository;
-    }
-
-    public String validateAndRefreshAccessToken(String accessToken, String refreshToken) {
-        if (jwtTokenProvider.validateToken(accessToken)) {
-            return accessToken;
-        }
-
-        Optional<Token> optionalToken = redisTokenRepository.findByRefreshToken(refreshToken);
-        if (optionalToken.isPresent() && jwtTokenProvider.validateToken(refreshToken)) {
-            Long memberId = jwtTokenProvider.getUserIdFromToken(refreshToken);
-            return jwtTokenProvider.issueAccessToken(UserAuthentication.createUserAuthentication(memberId));
-        }
-
-        throw new RuntimeException("Invalid or expired tokens");
-    }
-
-}
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java b/week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java
deleted file mode 100644
index 7abef4e..0000000
--- a/week06/practice/src/main/java/org/sopt/practice/service/UserAuthenticationService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.sopt.practice.service;
-
-public class UserAuthenticationService {
-
-}
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/dto/BlogCreateRequest.java b/week06/practice/src/main/java/org/sopt/practice/service/dto/BlogCreateRequest.java
index a965f8b..9cfa432 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/dto/BlogCreateRequest.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/dto/BlogCreateRequest.java
@@ -1,7 +1,10 @@
 package org.sopt.practice.service.dto;
 
+import org.springframework.web.multipart.MultipartFile;
+
 public record BlogCreateRequest(
-        String title,
-        String description
+    String title,
+    String description,
+    MultipartFile image
 ) {
-}
+}
\ No newline at end of file

From cf9ed14148c6c3074314a3c2d68813543ef88b69 Mon Sep 17 00:00:00 2001
From: Yangdaehan <yangdh08@naver.com>
Date: Sun, 2 Jun 2024 14:24:22 +0900
Subject: [PATCH 6/6] =?UTF-8?q?fix=20:=20accessToken=EA=B3=BC=20refreshTok?=
 =?UTF-8?q?en=EC=9D=98=20=EC=83=9D=EB=AA=85=20=EC=A3=BC=EA=B8=B0=EB=A5=BC?=
 =?UTF-8?q?=20=EB=8B=A4=EB=A5=B4=EA=B2=8C=20=EC=84=A4=EC=A0=95=ED=95=98?=
 =?UTF-8?q?=EC=98=80=EC=8A=B5=EB=8B=88=EB=8B=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/sopt/practice/common/jwt/JwtTokenProvider.java     | 2 +-
 .../src/main/java/org/sopt/practice/service/BlogService.java    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
index a293c14..dcdabb3 100644
--- a/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
+++ b/week06/practice/src/main/java/org/sopt/practice/common/jwt/JwtTokenProvider.java
@@ -16,7 +16,7 @@ public class JwtTokenProvider {
 
     private static final String USER_ID = "userId";
 
-    private static final Long ACCESS_TOKEN_EXPIRATION_TIME = 24 * 60 * 60 * 1000L * 14;
+    private static final Long ACCESS_TOKEN_EXPIRATION_TIME = 24 * 60 * 60 * 1000L;
     private static final Long REFRESH_TOKEN_EXPIRATION_TIME = 24 * 60 * 60 * 1000L * 14;
 
     @Value("${jwt.secret}")
diff --git a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
index 2905469..259a2bd 100644
--- a/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
+++ b/week06/practice/src/main/java/org/sopt/practice/service/BlogService.java
@@ -19,7 +19,6 @@ public class BlogService {
     private final MemberService memberService;
 
 
-    //private final S3Service s3Service;
     private static final String BLOG_S3_UPLOAD_FOLER = "blog/";