Compare commits
6 Commits
feature/Ti
...
feature/mo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49a88dbf5d | ||
|
|
fd5b443d48 | ||
|
|
975e03b7bd | ||
|
|
657c9e7f7d | ||
|
|
c5b779fda7 | ||
|
|
b7057cfc73 |
1
server/.gitignore
vendored
1
server/.gitignore
vendored
@@ -6,6 +6,7 @@
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
HELP.md
|
||||
bin/**
|
||||
|
||||
# User-specific stuff
|
||||
.idea/**/workspace.xml
|
||||
|
||||
12
server/Dockerfile
Normal file
12
server/Dockerfile
Normal file
@@ -0,0 +1,12 @@
|
||||
FROM openjdk:11-jre-slim
|
||||
|
||||
ENV APP_HOME=/usr/app/
|
||||
|
||||
WORKDIR $APP_HOME
|
||||
|
||||
COPY build/libs/server-0.0.1-SNAPSHOT.jar application.jar
|
||||
|
||||
EXPOSE 8443
|
||||
EXPOSE 8080
|
||||
|
||||
CMD ["java", "-jar", "application.jar"]
|
||||
@@ -43,6 +43,8 @@ dependencies {
|
||||
implementation("com.google.code.findbugs:jsr305:3.0.2")
|
||||
implementation ("org.springframework.cloud:spring-cloud-starter-config")
|
||||
implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
|
||||
implementation("io.micrometer:micrometer-core")
|
||||
implementation("io.micrometer:micrometer-registry-prometheus")
|
||||
|
||||
modules {
|
||||
module("org.springframework.boot:spring-boot-starter-logging") {
|
||||
|
||||
@@ -49,7 +49,7 @@ class TicketLockAspectTest {
|
||||
|
||||
assertAll(
|
||||
() -> assertThat(result1).isNotEqualTo(result2),
|
||||
() -> assertThat(unlockCount > 1).isTrue()
|
||||
() -> assertThat(unlockCount > 0).isTrue()
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,202 @@
|
||||
package com.ticketing.server.movie.application;
|
||||
|
||||
import static org.springframework.http.MediaType.APPLICATION_JSON;
|
||||
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.ticketing.server.global.config.WithAuthUser;
|
||||
import com.ticketing.server.movie.application.request.MovieDeleteRequest;
|
||||
import com.ticketing.server.movie.application.request.MovieRegisterRequest;
|
||||
import com.ticketing.server.user.domain.UserGrade.ROLES;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.MvcResult;
|
||||
import org.springframework.test.web.servlet.ResultActions;
|
||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.context.WebApplicationContext;
|
||||
|
||||
@SpringBootTest
|
||||
@Transactional
|
||||
public class MovieControllerTest {
|
||||
|
||||
@Autowired
|
||||
ObjectMapper mapper;
|
||||
|
||||
@Autowired
|
||||
WebApplicationContext context;
|
||||
|
||||
MockMvc mvc;
|
||||
|
||||
JSONParser jsonParser = new JSONParser();
|
||||
|
||||
private static final String MOVIES_URL = "/api/movies";
|
||||
|
||||
private static final Long RUNNING_TIME = 100L;
|
||||
private static final String MOVIE_TITLE = "등록할 영화";
|
||||
|
||||
private static final String TITLE = "$.title";
|
||||
private static final String MOVIE_DTOS = "$.movieDtos";
|
||||
|
||||
@BeforeEach
|
||||
void init() {
|
||||
mvc = MockMvcBuilders
|
||||
.webAppContextSetup(context)
|
||||
.apply(springSecurity())
|
||||
.build();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 성공")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.STAFF)
|
||||
void movieRegisterSuccess() throws Exception {
|
||||
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(MediaType.APPLICATION_JSON));
|
||||
|
||||
resultActions
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(content().contentType(APPLICATION_JSON))
|
||||
.andExpect(jsonPath(TITLE).value(MOVIE_TITLE));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 실패 - 권한 부족")
|
||||
@WithAuthUser(email = "user@ticketing.com", role = ROLES.USER)
|
||||
void movieRegisterFailWithLowAuthority() throws Exception {
|
||||
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isForbidden());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 실패 - 인자값 검증 실패")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.ADMIN)
|
||||
void movieRegisterFailWithWrongParameter() throws Exception {
|
||||
|
||||
MovieRegisterRequest requestWithNullRunningTime = new MovieRegisterRequest(MOVIE_TITLE, null);
|
||||
|
||||
// 1. 상영 시간 null
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(requestWithNullRunningTime))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isBadRequest());
|
||||
|
||||
// 2. 영화 제목 null
|
||||
MovieRegisterRequest requestWithNullTitle = new MovieRegisterRequest(null, RUNNING_TIME);
|
||||
|
||||
resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(requestWithNullTitle))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isBadRequest());
|
||||
|
||||
// 3. 영화 제목 ""
|
||||
MovieRegisterRequest requestWithoutTitle = new MovieRegisterRequest("", RUNNING_TIME);
|
||||
|
||||
resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(requestWithoutTitle))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isBadRequest());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 실패 - 같은 영화 중복 등록")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.ADMIN)
|
||||
void movieRegisterFailWithSameMovie() throws Exception {
|
||||
|
||||
// given
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
|
||||
// when
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
// then
|
||||
resultActions.andExpect(status().isConflict());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@DisplayName("영화 삭제 성공")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.ADMIN)
|
||||
void movieDeleteSuccess() throws Exception {
|
||||
|
||||
// given
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
|
||||
// when
|
||||
// 1. 영화 조회 - 삭제할 영화 ID 뽑기
|
||||
ResultActions resultActions = mvc.perform(get(MOVIES_URL)
|
||||
.contentType(APPLICATION_JSON));
|
||||
resultActions
|
||||
.andDo(print())
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath(MOVIE_DTOS).isNotEmpty());
|
||||
|
||||
MvcResult result = resultActions.andReturn();
|
||||
Object obj = jsonParser.parse(result.getResponse().getContentAsString());
|
||||
JSONObject jsonObject = (JSONObject) obj;
|
||||
|
||||
Object object = jsonObject.get("movieDtos");
|
||||
JSONArray jsonArray = (JSONArray) object;
|
||||
JSONObject jsonObj = (JSONObject) jsonArray.get(0);
|
||||
|
||||
Long movieId = (Long) jsonObj.get("movieId");
|
||||
|
||||
// 2. 영화 삭제 - 해당 ID
|
||||
MovieDeleteRequest movieDeleteRequest = new MovieDeleteRequest(movieId);
|
||||
|
||||
mvc.perform(delete(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(movieDeleteRequest))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
|
||||
// then - 삭제한 영화랑 같은 제목의 영화 등록이 성공하는지 확인
|
||||
mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.ticketing.server.user.application;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertAll;
|
||||
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||
@@ -9,8 +11,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.ticketing.server.global.redis.RefreshRedisRepository;
|
||||
import com.ticketing.server.user.application.request.LoginRequest;
|
||||
import com.ticketing.server.user.application.request.RefreshRequest;
|
||||
import com.ticketing.server.user.application.request.SignUpRequest;
|
||||
import com.ticketing.server.user.application.response.TokenResponse;
|
||||
import com.ticketing.server.user.service.interfaces.UserService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
@@ -30,8 +35,12 @@ import org.springframework.web.context.WebApplicationContext;
|
||||
class AuthControllerTest {
|
||||
|
||||
private static final String LOGIN_URL = "/api/auth/token";
|
||||
private static final String REFRESH_URL = "/api/auth/refresh";
|
||||
private static final String LOGOUT_URL = "/api/auth/logout";
|
||||
private static final String REGISTER_URL = "/api/users";
|
||||
|
||||
private static final String USER_EMAIL = "ticketing@gmail.com";
|
||||
private static final String USER_PW = "qwe123";
|
||||
|
||||
@Autowired
|
||||
WebApplicationContext context;
|
||||
@@ -54,7 +63,7 @@ class AuthControllerTest {
|
||||
@DisplayName("로그인 인증 성공")
|
||||
void loginSuccess() throws Exception {
|
||||
// given
|
||||
LoginRequest request = new LoginRequest(USER_EMAIL, "qwe123");
|
||||
LoginRequest request = new LoginRequest(USER_EMAIL, USER_PW);
|
||||
|
||||
// when
|
||||
ResultActions actions = mvc.perform(post(LOGIN_URL)
|
||||
@@ -82,6 +91,69 @@ class AuthControllerTest {
|
||||
.andExpect(status().isUnauthorized());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("리프레쉬 토큰 발급 성공")
|
||||
void refreshTokenSuccess() throws Exception {
|
||||
// given
|
||||
LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
|
||||
|
||||
// when
|
||||
// 로그인
|
||||
String loginResponseBody = mvc.perform(post(LOGIN_URL)
|
||||
.content(asJsonString(loginRequest))
|
||||
.contentType(MediaType.APPLICATION_JSON))
|
||||
.andReturn()
|
||||
.getResponse()
|
||||
.getContentAsString();
|
||||
|
||||
TokenResponse loginResponse = objectMapper.readValue(loginResponseBody, TokenResponse.class);
|
||||
RefreshRequest refreshRequest = new RefreshRequest(loginResponse.getRefreshToken());
|
||||
|
||||
// 토큰재발급
|
||||
String refreshResponseBody = mvc.perform(post(REFRESH_URL)
|
||||
.content(asJsonString(refreshRequest))
|
||||
.contentType(MediaType.APPLICATION_JSON))
|
||||
.andReturn()
|
||||
.getResponse()
|
||||
.getContentAsString();
|
||||
|
||||
TokenResponse refreshBody = objectMapper.readValue(refreshResponseBody, TokenResponse.class);
|
||||
|
||||
// then
|
||||
assertAll(
|
||||
() -> assertThat(refreshBody.getAccessToken()).isNotEmpty(),
|
||||
() -> assertThat(refreshBody.getRefreshToken()).isNotEmpty(),
|
||||
() -> assertThat(loginResponse.getTokenType()).isEqualTo(refreshBody.getTokenType()),
|
||||
() -> assertThat(loginResponse.getExpiresIn()).isEqualTo(refreshBody.getExpiresIn())
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("로그아웃 성공")
|
||||
void logoutSuccess() throws Exception {
|
||||
// given
|
||||
LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
|
||||
|
||||
// 로그인
|
||||
String loginResponseBody = mvc.perform(post(LOGIN_URL)
|
||||
.content(asJsonString(loginRequest))
|
||||
.contentType(MediaType.APPLICATION_JSON))
|
||||
.andReturn()
|
||||
.getResponse()
|
||||
.getContentAsString();
|
||||
|
||||
TokenResponse loginResponse = objectMapper.readValue(loginResponseBody, TokenResponse.class);
|
||||
String authorization = loginResponse.getTokenType() + " " + loginResponse.getAccessToken();
|
||||
|
||||
// 로그아웃
|
||||
ResultActions actions = mvc.perform(post(LOGOUT_URL)
|
||||
.header("Authorization", authorization));
|
||||
|
||||
// then
|
||||
actions.andDo(print())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void init() throws Exception {
|
||||
mvc = MockMvcBuilders
|
||||
@@ -89,7 +161,7 @@ class AuthControllerTest {
|
||||
.apply(springSecurity())
|
||||
.build();
|
||||
|
||||
SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, "qwe123", "010-1234-5678");
|
||||
SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, USER_PW, "010-1234-5678");
|
||||
|
||||
mvc.perform(post(REGISTER_URL)
|
||||
.content(asJsonString(signUpRequest))
|
||||
@@ -102,6 +174,7 @@ class AuthControllerTest {
|
||||
}
|
||||
|
||||
private String asJsonString(Object object) throws JsonProcessingException {
|
||||
|
||||
return objectMapper.writeValueAsString(object);
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,6 @@ class UserControllerTest {
|
||||
|
||||
SignUpRequest signUpRequest;
|
||||
|
||||
|
||||
@Test
|
||||
@DisplayName("회원가입 성공")
|
||||
void registerSuccess() throws Exception {
|
||||
|
||||
@@ -28,8 +28,9 @@ public class RefreshToken {
|
||||
this.token = token;
|
||||
}
|
||||
|
||||
public void changeToken(String token) {
|
||||
public RefreshToken changeToken(String token) {
|
||||
this.token = token;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ 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;
|
||||
@@ -89,7 +90,7 @@ public class JwtProvider {
|
||||
}
|
||||
|
||||
private String makeRoleName(String role) {
|
||||
return "ROLE_" + role.toUpperCase();
|
||||
return role.contains(ROLE) ? role.toUpperCase() : ROLE + role.toUpperCase();
|
||||
}
|
||||
|
||||
public Authentication getAuthentication(String token) {
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
package com.ticketing.server.user.application;
|
||||
|
||||
import com.ticketing.server.user.application.request.LoginRequest;
|
||||
import com.ticketing.server.user.application.request.RefreshRequest;
|
||||
import com.ticketing.server.user.application.response.LogoutResponse;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import com.ticketing.server.user.application.response.TokenResponse;
|
||||
import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import com.ticketing.server.user.service.interfaces.AuthenticationService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -16,7 +17,6 @@ import org.springframework.security.core.userdetails.UserDetails;
|
||||
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.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@@ -37,8 +37,8 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/refresh")
|
||||
public ResponseEntity<TokenResponse> refreshToken(@RequestParam("refreshToken") String refreshToken) {
|
||||
TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
|
||||
public ResponseEntity<TokenResponse> refreshToken(@RequestBody RefreshRequest request) {
|
||||
TokenDTO tokenDto = authenticationService.reissueTokenDto(request.getRefreshToken());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.headers(getHttpHeaders())
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.ticketing.server.user.application.request;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class RefreshRequest {
|
||||
|
||||
private String refreshToken;
|
||||
|
||||
}
|
||||
@@ -2,14 +2,16 @@ package com.ticketing.server.user.application.response;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class TokenResponse {
|
||||
|
||||
private final String accessToken;
|
||||
private final String refreshToken;
|
||||
private final String tokenType;
|
||||
private final long expiresIn;
|
||||
private String accessToken;
|
||||
private String refreshToken;
|
||||
private String tokenType;
|
||||
private long expiresIn;
|
||||
|
||||
}
|
||||
|
||||
@@ -3,10 +3,9 @@ package com.ticketing.server.user.service;
|
||||
import com.ticketing.server.global.exception.ErrorCode;
|
||||
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.TokenDTO;
|
||||
import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import com.ticketing.server.user.service.interfaces.AuthenticationService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
@@ -14,7 +13,6 @@ import org.springframework.security.config.annotation.authentication.builders.Au
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@@ -23,7 +21,6 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
||||
private final RefreshRedisRepository refreshRedisRepository;
|
||||
|
||||
private final JwtProvider jwtProvider;
|
||||
private final JwtProperties jwtProperties;
|
||||
private final AuthenticationManagerBuilder authenticationManagerBuilder;
|
||||
|
||||
@Override
|
||||
@@ -40,8 +37,14 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
||||
// refresh 토큰이 있으면 수정, 없으면 생성
|
||||
refreshRedisRepository.findByEmail(email)
|
||||
.ifPresentOrElse(
|
||||
tokenEntity -> tokenEntity.changeToken(tokenDto.getRefreshToken()),
|
||||
() -> refreshRedisRepository.save(new RefreshToken(email, tokenDto.getRefreshToken()))
|
||||
tokenEntity -> refreshRedisRepository.save(
|
||||
tokenEntity.changeToken(
|
||||
tokenDto.getRefreshToken()
|
||||
)
|
||||
),
|
||||
() -> refreshRedisRepository.save(
|
||||
new RefreshToken(email, tokenDto.getRefreshToken())
|
||||
)
|
||||
);
|
||||
|
||||
return tokenDto;
|
||||
@@ -49,9 +52,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public TokenDTO reissueTokenDto(String bearerRefreshToken) {
|
||||
String refreshToken = resolveToken(bearerRefreshToken);
|
||||
|
||||
public TokenDTO reissueTokenDto(String refreshToken) {
|
||||
// 토큰 검증
|
||||
jwtProvider.validateToken(refreshToken);
|
||||
|
||||
@@ -61,7 +62,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
||||
RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
|
||||
.orElseThrow(ErrorCode::throwRefreshTokenNotFound);
|
||||
|
||||
// redis 토큰과 input 토큰이 일치한지 확인
|
||||
// input 토큰이 최신 토큰이 아닐 경우 예외 처리
|
||||
if (!refreshToken.equals(findTokenEntity.getToken())) {
|
||||
throw ErrorCode.throwUnavailableRefreshToken();
|
||||
}
|
||||
@@ -88,11 +89,4 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
||||
);
|
||||
}
|
||||
|
||||
private String resolveToken(String bearerToken) {
|
||||
if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
|
||||
return bearerToken.substring(7);
|
||||
}
|
||||
throw ErrorCode.throwTokenType();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
server:
|
||||
port: 8443
|
||||
address: 0.0.0.0
|
||||
|
||||
http:
|
||||
port: 8080
|
||||
|
||||
ssl:
|
||||
key-store: classpath:keystore/ticketing.p12
|
||||
key-store-password: ENC(OMvGcpZLpggFTiGNkqNe66Zq/SmJXF6o)
|
||||
key-store-type: PKCS12
|
||||
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:mysql://ticketing-db/ticketing?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
|
||||
username: ENC(LowN1n4w0Ep/DqLD8+q5Bq6AXM4b8e3V)
|
||||
password: ENC(OMvGcpZLpggFTiGNkqNe66Zq/SmJXF6o)
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
|
||||
jpa:
|
||||
properties:
|
||||
hibernate:
|
||||
show_sql: true
|
||||
format_sql: true
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
|
||||
redis:
|
||||
host: 172.18.0.3
|
||||
port: 6379
|
||||
|
||||
application:
|
||||
name: monitoring
|
||||
|
||||
|
||||
@@ -26,6 +26,24 @@ spring:
|
||||
config:
|
||||
import: "optional:configserver:"
|
||||
|
||||
application:
|
||||
name: monitoring
|
||||
|
||||
management:
|
||||
endpoint:
|
||||
metrics:
|
||||
enabled: true
|
||||
prometheus:
|
||||
enabled: true
|
||||
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
include: health, info, metrics, prometheus
|
||||
|
||||
metrics:
|
||||
tags:
|
||||
application: ${spring.application.name}
|
||||
|
||||
jasypt:
|
||||
encryptor:
|
||||
|
||||
BIN
server/src/main/resources/keystore/ticketing.p12
Normal file
BIN
server/src/main/resources/keystore/ticketing.p12
Normal file
Binary file not shown.
@@ -10,8 +10,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.TokenDTO;
|
||||
import com.ticketing.server.user.domain.UserGrade;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import java.util.Collections;
|
||||
import java.util.Optional;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
@@ -62,7 +62,7 @@ class AuthenticationServiceImplTest {
|
||||
@DisplayName("토큰 재발급 성공")
|
||||
void reissueAccessToken() {
|
||||
// given
|
||||
String refreshToken = "Bearer eyJhbGciOiJIUzUxMiJ9";
|
||||
String refreshToken = "eyJhbGciOiJIUzUxMiJ9";
|
||||
when(jwtProvider.validateToken(any())).thenReturn(true);
|
||||
when(jwtProvider.getAuthentication(any())).thenReturn(authenticationToken);
|
||||
when(jwtProvider.generateTokenDto(any())).thenReturn(useJwtProvider.generateTokenDto(authenticationToken));
|
||||
|
||||
Reference in New Issue
Block a user