Merge remote-tracking branch 'origin/main'

Help-M-Ssaem · Sep 4, 2024 · 9c1ff7c · 9c1ff7c
2 parents dab94f9 + 3e9dc2a
commit 9c1ff7c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/config b/config
diff --git a/src/main/java/com/example/mssaembackendv2/domain/member/MemberService.java b/src/main/java/com/example/mssaembackendv2/domain/member/MemberService.java
@@ -58,10 +58,12 @@ public class MemberService {
     private final GoogleSocialLoginService googleSocialLoginService;
     private final NaverSocialLoginService naverSocialLoginService;
 
+    @Transactional
     public void save(Member member) {
         memberRepository.save(member);
     }
 
+    @Transactional
     public Member register(RegisterMember registerMember) {
         Member member = new Member(
                 registerMember.getEmail(),
@@ -72,6 +74,7 @@ public Member register(RegisterMember registerMember) {
         return member;
     }
 
+    @Transactional
     public TokenInfo registerMember(RegisterMember registerMember) {
         checkRegister(registerMember);
         Member member = register(registerMember);
@@ -82,6 +85,7 @@ public TokenInfo registerMember(RegisterMember registerMember) {
         return tokenInfo;
     }
 
+    @Transactional
     public TokenInfo socialLogin(SocialLoginType socialLoginType,
         SocialLoginToken socialLoginToken) throws BaseException, IOException {
         String idToken = socialLoginToken.getIdToken();
@@ -144,6 +148,7 @@ public List<TeacherInfo> findHotTeacherForHome() {
         return teacherInfos;
     }
 
+    @Transactional
     public String modifyProfile(Member member, ModifyProfile modifyProfile) {
         // 대표 뱃지 변경
         String badgeName = badgeService.changeRepresentativeBadge(member, modifyProfile.getBadgeId());
@@ -171,9 +176,12 @@ public MemberProfileInfo getProfile(Long memberId) {
     }
 
     public TokenInfo refreshAccessToken(Member member) {
+        String refreshToken = jwtTokenProvider.generateRefreshToken(member.getId());
+        member.changeRefreshToken(refreshToken);
+        save(member);
         return TokenInfo.builder()
                 .accessToken(jwtTokenProvider.generateAccessToken(member.getId()))
-                .refreshToken(member.getRefreshToken())
+                .refreshToken(refreshToken)
                 .build();
     }
 

diff --git a/src/main/java/com/example/mssaembackendv2/global/config/security/jwt/JwtTokenProvider.java b/src/main/java/com/example/mssaembackendv2/global/config/security/jwt/JwtTokenProvider.java
@@ -42,38 +42,42 @@ protected void init() {
     }
 
     public String generateAccessToken(Long memberId) {
-        Claims claims = Jwts.claims();
-        claims.put("memberId", memberId);
-
         Date now = new Date();
         Date accessTokenExpirationTime = new Date(now.getTime() + TOKEN_VALID_TIME);
 
         return Jwts.builder()
-                .setClaims(claims)
+                .setClaims(setClaims(memberId))
                 .setIssuedAt(now) // 토큰 발행 시간 정보
                 .setExpiration(accessTokenExpirationTime)
                 .signWith(SignatureAlgorithm.HS256, jwtSecretKey)
                 .compact();
     }
 
-    public MemberResponseDto.TokenInfo generateToken(Long memberId) {
-        Claims claims = Jwts.claims();
-        claims.put("memberId", memberId);
-
+    public String generateRefreshToken(Long memberId) {
         Date now = new Date();
         Date refreshTokenExpirationTime = new Date(now.getTime() + REF_TOKEN_VALID_TIME);
 
-        String accessToken = generateAccessToken(memberId);
-        String refreshToken = Jwts.builder()
-                .setClaims(claims)
-                .setIssuedAt(now) // 토큰 발행 시간 정보
-                .setExpiration(refreshTokenExpirationTime)
-                .signWith(SignatureAlgorithm.HS256, refreshSecretKey)
-                .compact();
+        return Jwts.builder()
+            .setClaims(setClaims(memberId))
+            .setIssuedAt(now) // 토큰 발행 시간 정보
+            .setExpiration(refreshTokenExpirationTime)
+            .signWith(SignatureAlgorithm.HS256, refreshSecretKey)
+            .compact();
+    }
 
+    public MemberResponseDto.TokenInfo generateToken(Long memberId) {
+        String accessToken = generateAccessToken(memberId);
+        String refreshToken = generateRefreshToken(memberId);
         return new MemberResponseDto.TokenInfo(accessToken, refreshToken);
     }
 
+    public Claims setClaims(Long memberId) {
+        Claims claims = Jwts.claims();
+        claims.put("memberId", memberId);
+
+        return claims;
+    }
+
     public Authentication getAuthentication(String token) {
         try {
             PrincipalDetails principalDetails = principalDetailsService.loadUserByUsername(