Merge branch 'develop' of https://github.com/f-lab-edu/Ticketing into feature/MovieTimeRegisterTest

server/src/main/java/com/ticketing/server/global/redis/RefreshToken.java

@@ -28,9 +28,8 @@ public class RefreshToken {
 		this.token = token;
 	}
 
-	public RefreshToken changeToken(String token) {
+	public void changeToken(String token) {
 		this.token = token;
-		return this;
 	}
 
 }

server/src/main/java/com/ticketing/server/global/security/jwt/JwtProvider.java

@@ -27,7 +27,6 @@ public class JwtProvider {
 
 	private static final String AUTHORITIES_KEY = "auth";
 	private static final String AUTHORITIES_DELIMITER = ",";
-	private static final String ROLE = "ROLE_";
 
 	private final Key key;
 	private final String prefix;
@@ -90,7 +89,7 @@ public class JwtProvider {
 	}
 
 	private String makeRoleName(String role) {
-		return role.contains(ROLE) ? role.toUpperCase() : ROLE + role.toUpperCase();
+		return "ROLE_" + role.toUpperCase();
 	}
 
 	public Authentication getAuthentication(String token) {

server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java

@@ -5,8 +5,8 @@ import com.ticketing.server.global.redis.RefreshRedisRepository;
 import com.ticketing.server.global.redis.RefreshToken;
 import com.ticketing.server.global.security.jwt.JwtProperties;
 import com.ticketing.server.global.security.jwt.JwtProvider;
-import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
 import com.ticketing.server.user.service.dto.TokenDTO;
+import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
 import com.ticketing.server.user.service.interfaces.AuthenticationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -40,14 +40,8 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 		// refresh 토큰이 있으면 수정, 없으면 생성
 		refreshRedisRepository.findByEmail(email)
 			.ifPresentOrElse(
-				tokenEntity -> refreshRedisRepository.save(
-					tokenEntity.changeToken(
-						tokenDto.getRefreshToken()
-					)
-				),
-				() -> refreshRedisRepository.save(
-					new RefreshToken(email, tokenDto.getRefreshToken())
-				)
+				tokenEntity -> tokenEntity.changeToken(tokenDto.getRefreshToken()),
+				() -> refreshRedisRepository.save(new RefreshToken(email, tokenDto.getRefreshToken()))
 			);
 
 		return tokenDto;