Compare commits

...

5 Commits

33 changed files with 590 additions and 144 deletions

View File

@@ -26,19 +26,20 @@ repositories {
dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-security")
implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-log4j2")
implementation("org.projectlombok:lombok:1.18.20")
implementation("io.springfox:springfox-swagger2:3.0.0")
implementation("io.springfox:springfox-swagger-ui:3.0.0")
implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
implementation("com.lmax:disruptor:3.4.2")
implementation("io.jsonwebtoken:jjwt-api:0.11.2")
implementation("com.googlecode.json-simple:json-simple:1.1.1")
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-security")
implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-log4j2")
implementation("org.projectlombok:lombok:1.18.20")
implementation("io.springfox:springfox-swagger2:3.0.0")
implementation("io.springfox:springfox-swagger-ui:3.0.0")
implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
implementation("com.lmax:disruptor:3.4.2")
implementation("io.jsonwebtoken:jjwt-api:0.11.2")
implementation("com.googlecode.json-simple:json-simple:1.1.1")
implementation("org.springframework.boot:spring-boot-starter-data-redis")
modules {
module("org.springframework.boot:spring-boot-starter-logging") {

View File

@@ -1,6 +1,6 @@
package com.ticketing.server;
import com.ticketing.server.global.jwt.JwtProperties;
import com.ticketing.server.global.security.jwt.JwtProperties;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

View File

@@ -1,10 +1,10 @@
package com.ticketing.server.global.exception;
public class NotFoundEmailException extends IllegalArgumentException {
public class EmailNotFoundException extends IllegalArgumentException {
private static final String MESSAGE = "존재하지 않는 이메일 입니다.";
public NotFoundEmailException() {
public EmailNotFoundException() {
super(MESSAGE);
}

View File

@@ -0,0 +1,9 @@
package com.ticketing.server.global.exception.token;
public class TokenException extends RuntimeException {
public TokenException(String message) {
super(message);
}
}

View File

@@ -0,0 +1,10 @@
package com.ticketing.server.global.exception.token;
public class TokenNotFindException extends TokenException {
private static final String MESSAGE = "일치하는 토큰을 찾지 못하였습니다.";
public TokenNotFindException() {
super(MESSAGE);
}
}

View File

@@ -0,0 +1,10 @@
package com.ticketing.server.global.exception.token;
public class TokenTypeException extends TokenException {
private static final String MESSAGE = "토큰 타입이 일치하지 않습니다.";
public TokenTypeException() {
super(MESSAGE);
}
}

View File

@@ -0,0 +1,11 @@
package com.ticketing.server.global.exception.token;
public class UnavailableRefreshTokenException extends TokenException {
private static final String MESSAGE = "사용할 수 없는 refresh Token 입니다.";
public UnavailableRefreshTokenException() {
super(MESSAGE);
}
}

View File

@@ -0,0 +1,44 @@
package com.ticketing.server.global.redis;
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.repository.configuration.EnableRedisRepositories;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
@Configuration
@EnableRedisRepositories
public class RedisConfig {
@Value("${spring.redis.host}")
private String host;
@Value("${spring.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;
}
@Bean
public PlatformTransactionManager transactionManager() {
return new JpaTransactionManager();
}
}

View File

@@ -0,0 +1,10 @@
package com.ticketing.server.global.redis;
import java.util.Optional;
import org.springframework.data.repository.CrudRepository;
public interface RefreshRedisRepository extends CrudRepository<RefreshToken, Long> {
Optional<RefreshToken> findByEmail(String email);
}

View File

@@ -0,0 +1,35 @@
package com.ticketing.server.global.redis;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.data.redis.core.RedisHash;
import org.springframework.data.redis.core.index.Indexed;
@Getter
@RedisHash("RefreshToken")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class RefreshToken {
@Id
@GeneratedValue
@Column(name = "refresh_token_id")
private Long id;
@Indexed
private String email;
private String token;
public RefreshToken(String email, String token) {
this.email = email;
this.token = token;
}
public void changeToken(String token) {
this.token = token;
}
}

View File

@@ -1,9 +1,9 @@
package com.ticketing.server.global.security;
import com.ticketing.server.global.jwt.JwtFilter;
import com.ticketing.server.global.jwt.JwtSecurityConfig;
import com.ticketing.server.global.jwt.handle.JwtAccessDeniedHandler;
import com.ticketing.server.global.jwt.handle.JwtAuthenticationEntryPoint;
import com.ticketing.server.global.security.jwt.JwtFilter;
import com.ticketing.server.global.security.jwt.JwtSecurityConfig;
import com.ticketing.server.global.security.jwt.handle.JwtAccessDeniedHandler;
import com.ticketing.server.global.security.jwt.handle.JwtAuthenticationEntryPoint;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -52,8 +52,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.and()
.authorizeRequests()
.antMatchers(HttpMethod.POST, "/user").permitAll()
.antMatchers(HttpMethod.POST, "/user/login").permitAll()
.antMatchers(HttpMethod.POST, "/api/user/login").permitAll()
.antMatchers(HttpMethod.POST, "/api/user/refresh").permitAll()
.antMatchers(HttpMethod.POST, "/api/user").permitAll()
.antMatchers("/l7check").permitAll()
.antMatchers("/actuator/health").permitAll()
.anyRequest().authenticated()

View File

@@ -1,4 +1,4 @@
package com.ticketing.server.global.jwt;
package com.ticketing.server.global.security.jwt;
import java.io.IOException;
import javax.servlet.FilterChain;
@@ -17,12 +17,10 @@ import org.springframework.web.filter.OncePerRequestFilter;
public class JwtFilter extends OncePerRequestFilter {
private final JwtProvider tokenProvider;
private final String accessHeader;
private final String tokenPrefix;
private final JwtProperties jwtProperties;
public JwtFilter(JwtProperties jwtProperties, JwtProvider tokenProvider) {
this.accessHeader = jwtProperties.getAccessHeader();
this.tokenPrefix = jwtProperties.getPrefix();
this.jwtProperties = jwtProperties;
this.tokenProvider = tokenProvider;
}
@@ -40,11 +38,10 @@ public class JwtFilter extends OncePerRequestFilter {
}
private String resolveToken(HttpServletRequest request) {
String bearerToken = request.getHeader(accessHeader);
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(tokenPrefix)) {
String bearerToken = request.getHeader(jwtProperties.getAccessHeader());
if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
return bearerToken.substring(7);
}
return null;
}

View File

@@ -1,4 +1,4 @@
package com.ticketing.server.global.jwt;
package com.ticketing.server.global.security.jwt;
import com.ticketing.server.global.factory.YamlPropertySourceFactory;
import lombok.Getter;
@@ -15,8 +15,13 @@ import org.springframework.context.annotation.PropertySource;
public class JwtProperties {
private final String accessHeader;
private final String refreshHeader;
private final String prefix;
private final String secretKey;
private final Integer tokenValidityInSeconds;
private final Integer accessTokenValidityInSeconds;
private final Integer refreshTokenValidityInSeconds;
public boolean hasTokenStartsWith(String token) {
return token.startsWith(prefix);
}
}

View File

@@ -1,14 +1,11 @@
package com.ticketing.server.global.jwt;
package com.ticketing.server.global.security.jwt;
import com.ticketing.server.user.application.response.TokenDto;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.ExpiredJwtException;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.MalformedJwtException;
import io.jsonwebtoken.SignatureAlgorithm;
import io.jsonwebtoken.UnsupportedJwtException;
import io.jsonwebtoken.io.Decoders;
import io.jsonwebtoken.security.Keys;
import io.jsonwebtoken.security.SecurityException;
import java.security.Key;
import java.util.Arrays;
import java.util.Date;
@@ -31,29 +28,53 @@ public class JwtProvider {
private static final String AUTHORITIES_KEY = "auth";
private static final String AUTHORITIES_DELIMITER = ",";
private final long tokenValidityInMilliseconds;
private final Key key;
private final String prefix;
private final long accessTokenValidityInMilliseconds;
private final long refreshTokenValidityInMilliseconds;
public JwtProvider(JwtProperties jwtProperties) {
this.tokenValidityInMilliseconds = jwtProperties.getTokenValidityInSeconds();
byte[] keyBytes = Decoders.BASE64.decode(jwtProperties.getSecretKey());
this.key = Keys.hmacShaKeyFor(keyBytes);
this.prefix = jwtProperties.getPrefix();
this.accessTokenValidityInMilliseconds = jwtProperties.getAccessTokenValidityInSeconds() * 1000L;
this.refreshTokenValidityInMilliseconds = jwtProperties.getRefreshTokenValidityInSeconds() * 1000L;
}
public String createToken(Authentication authentication) {
public TokenDto generateTokenDto(Authentication authentication) {
String accessToken = createAccessToken(authentication);
String refreshToken = createRefreshToken(authentication);
long expiresIn = accessTokenValidityInMilliseconds / 1000L;
return TokenDto.of(accessToken, refreshToken, prefix, expiresIn);
}
private String createAccessToken(Authentication authentication) {
// 만료시간 계산
long now = (new Date()).getTime();
Date accessTokenExpiresIn = new Date(now + this.accessTokenValidityInMilliseconds);
return createToken(authentication, accessTokenExpiresIn);
}
private String createRefreshToken(Authentication authentication) {
// 만료시간 계산
long now = (new Date()).getTime();
Date refreshTokenExpiresIn = new Date(now + this.refreshTokenValidityInMilliseconds);
return createToken(authentication, refreshTokenExpiresIn);
}
private String createToken(Authentication authentication, Date expiration) {
// 권한 정보 가져오기
String authorities = generateStringToAuthorities(authentication);
// 만료시간 계산
long now = new Date().getTime();
Date accessTokenExpiresIn = new Date(now + this.tokenValidityInMilliseconds);
// JWT 생성
return Jwts.builder()
.setSubject(authentication.getName()) // email
.claim(AUTHORITIES_KEY, authorities) // payload
.setExpiration(accessTokenExpiresIn) // 만료일
.setExpiration(expiration) // 만료일
.signWith(key, SignatureAlgorithm.HS512) // 서명
.compact();
}
@@ -75,6 +96,7 @@ public class JwtProvider {
// 토큰 복호화
Claims claims = parseClaims(token);
// 권한조회
List<SimpleGrantedAuthority> authorities =
Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(AUTHORITIES_DELIMITER))
.map(SimpleGrantedAuthority::new)
@@ -85,25 +107,12 @@ public class JwtProvider {
}
public boolean validateToken(String token) {
try {
parseClaims(token);
return true;
} catch (SecurityException | MalformedJwtException exception) {
log.info("잘못된 JWT 서명입니다.");
} catch (ExpiredJwtException e) {
log.info("잘못된 JWT 토큰입니다.");
} catch (UnsupportedJwtException e) {
log.info("지원되지 않는 JWT 토큰입니다.");
} catch (IllegalArgumentException e) {
log.info("JWT 토큰이 잘못되었습니다.");
}
return false;
parseClaims(token);
return true;
}
private Claims parseClaims(String token) {
return Jwts
.parserBuilder()
return Jwts.parserBuilder()
.setSigningKey(key)
.build()
.parseClaimsJws(token)

View File

@@ -1,4 +1,4 @@
package com.ticketing.server.global.jwt;
package com.ticketing.server.global.security.jwt;
import lombok.RequiredArgsConstructor;
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;

View File

@@ -1,4 +1,4 @@
package com.ticketing.server.global.jwt.handle;
package com.ticketing.server.global.security.jwt.handle;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;

View File

@@ -1,4 +1,4 @@
package com.ticketing.server.global.jwt.handle;
package com.ticketing.server.global.security.jwt.handle;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;

View File

@@ -1,4 +1,4 @@
package com.ticketing.server.global.service;
package com.ticketing.server.global.security.service;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;

View File

@@ -1,16 +1,17 @@
package com.ticketing.server.user.application;
import com.ticketing.server.global.jwt.JwtProperties;
import com.ticketing.server.global.security.jwt.JwtProperties;
import com.ticketing.server.user.application.request.LoginRequest;
import com.ticketing.server.user.application.request.SignUpRequest;
import com.ticketing.server.user.application.request.UserDeleteRequest;
import com.ticketing.server.user.application.request.UserModifyPasswordRequest;
import com.ticketing.server.user.application.response.LoginResponse;
import com.ticketing.server.user.application.response.SignUpResponse;
import com.ticketing.server.user.application.response.TokenDto;
import com.ticketing.server.user.application.response.UserChangePasswordResponse;
import com.ticketing.server.user.application.response.UserDeleteResponse;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.UserServiceImpl;
import com.ticketing.server.user.service.interfaces.AuthenticationService;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -20,10 +21,11 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
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
@@ -34,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
public class UserController {
private final UserServiceImpl userService;
private final AuthenticationService authenticationService;
private final PasswordEncoder passwordEncoder;
private final JwtProperties jwtProperties;
@@ -50,7 +53,7 @@ public class UserController {
return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.of(user));
}
@PatchMapping("/password")
@PutMapping("/password")
@Secured("ROLE_GUEST")
public ResponseEntity<UserChangePasswordResponse> changePassword(@RequestBody @Valid UserModifyPasswordRequest request) {
if (request.oldEqualNew()) {
@@ -63,11 +66,21 @@ public class UserController {
}
@PostMapping("/login")
public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest loginRequest, HttpServletResponse response) {
String accessToken = userService.login(loginRequest.toAuthentication());
public ResponseEntity<TokenDto> login(@RequestBody LoginRequest loginRequest, HttpServletResponse response) {
TokenDto tokenDto = authenticationService.login(loginRequest.toAuthentication());
response.setHeader(jwtProperties.getAccessHeader(), accessToken);
return ResponseEntity.status(HttpStatus.OK).body(LoginResponse.of(accessToken));
response.setHeader("Cache-Control", "no-store");
response.setHeader("Pragma", "no-store");
return ResponseEntity.status(HttpStatus.OK).body(tokenDto);
}
@PostMapping("/refresh")
public ResponseEntity<TokenDto> refreshToken(@RequestParam("refreshToken") String refreshToken, HttpServletResponse response) {
TokenDto tokenDto = authenticationService.reissueAccessToken(refreshToken);
response.setHeader(jwtProperties.getAccessHeader(), tokenDto.getAccessToken());
response.setHeader(jwtProperties.getRefreshHeader(), tokenDto.getRefreshToken());
return ResponseEntity.status(HttpStatus.OK).body(tokenDto);
}
}

View File

@@ -1,17 +0,0 @@
package com.ticketing.server.user.application.response;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class LoginResponse {
private String accessToken;
public static LoginResponse of(String accessToken) {
return new LoginResponse(accessToken);
}
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.user.application.response;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class TokenDto {
private final String accessToken;
private final String refreshToken;
private final String tokenType;
private final long expiresIn;
public static TokenDto of(String accessToken, String refreshToken, String tokenType, long expiresIn) {
return new TokenDto(accessToken, refreshToken, tokenType, expiresIn);
}
}

View File

@@ -0,0 +1,87 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.token.TokenNotFindException;
import com.ticketing.server.global.exception.token.TokenTypeException;
import com.ticketing.server.global.exception.token.UnavailableRefreshTokenException;
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.application.response.TokenDto;
import com.ticketing.server.user.service.interfaces.AuthenticationService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@Service
@RequiredArgsConstructor
public class AuthenticationServiceImpl implements AuthenticationService {
private final RefreshRedisRepository refreshRedisRepository;
private final JwtProvider jwtProvider;
private final JwtProperties jwtProperties;
private final AuthenticationManagerBuilder authenticationManagerBuilder;
@Override
@Transactional
public TokenDto login(UsernamePasswordAuthenticationToken authenticationToken) {
// 회원인증
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
String email = authenticationToken.getName();
// 토큰 발급
TokenDto tokenDto = jwtProvider.generateTokenDto(authentication);
// refresh 토큰이 있으면 수정, 없으면 생성
refreshRedisRepository.findByEmail(email)
.ifPresentOrElse(
tokenEntity -> tokenEntity.changeToken(tokenDto.getRefreshToken()),
() -> refreshRedisRepository.save(new RefreshToken(email, tokenDto.getRefreshToken()))
);
return tokenDto;
}
@Override
@Transactional
public TokenDto reissueAccessToken(String bearerRefreshToken) {
String refreshToken = resolveToken(bearerRefreshToken);
// 토큰 검증
jwtProvider.validateToken(refreshToken);
Authentication authentication = jwtProvider.getAuthentication(refreshToken);
// Redis 에 토큰이 있는지 검증
RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
.orElseThrow(TokenNotFindException::new);
// redis 토큰과 input 토큰이 일치한지 확인
if (!refreshToken.equals(findTokenEntity.getToken())) {
throw new UnavailableRefreshTokenException();
}
// 토큰 발급
TokenDto tokenDto = jwtProvider.generateTokenDto(authentication);
// 토큰 최신화
findTokenEntity.changeToken(tokenDto.getRefreshToken());
refreshRedisRepository.save(findTokenEntity);
return tokenDto;
}
private String resolveToken(String bearerToken) {
if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
return bearerToken.substring(7);
}
throw new TokenTypeException();
}
}

View File

@@ -1,7 +1,6 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.NotFoundEmailException;
import com.ticketing.server.global.jwt.JwtProvider;
import com.ticketing.server.global.exception.EmailNotFoundException;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
@@ -12,9 +11,6 @@ import java.util.Optional;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -27,14 +23,6 @@ import org.springframework.validation.annotation.Validated;
public class UserServiceImpl implements UserService {
private final UserRepository userRepository;
private final AuthenticationManagerBuilder authenticationManagerBuilder;
private final JwtProvider jwtProvider;
@Override
public String login(UsernamePasswordAuthenticationToken authenticationToken) {
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
return jwtProvider.createToken(authentication);
}
@Override
@Transactional
@@ -54,7 +42,7 @@ public class UserServiceImpl implements UserService {
User user = userRepository.findByEmail(deleteUserDto.getEmail())
.orElseThrow(() -> {
log.error("존재하지 않는 이메일 입니다. :: {}", deleteUserDto.getEmail());
throw new NotFoundEmailException();
throw new EmailNotFoundException();
}
);
@@ -72,7 +60,7 @@ public class UserServiceImpl implements UserService {
return userRepository.findByEmailAndIsDeletedFalse(email)
.orElseThrow(() -> {
log.error("존재하지 않는 이메일 입니다. :: {}", email);
throw new NotFoundEmailException();
throw new EmailNotFoundException();
});
}

View File

@@ -0,0 +1,12 @@
package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.application.response.TokenDto;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
public interface AuthenticationService {
TokenDto login(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
TokenDto reissueAccessToken(String bearerRefreshToken);
}

View File

@@ -5,13 +5,9 @@ import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.SignUpDTO;
import javax.validation.Valid;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
public interface UserService {
String login(UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken);
User register(@Valid SignUpDTO signUpDto);
User delete(@Valid DeleteUserDTO deleteUserDto);

View File

@@ -4,6 +4,9 @@ server:
spring:
profiles:
active: local
redis:
host: localhost
port: 6379
jpa:
hibernate:
@@ -21,6 +24,8 @@ jasypt:
jwt:
access-header: ACCESS_TOKEN
refresh-header: REFRESH_TOKEN
prefix: Bearer
secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
token-validity-in-seconds: 86400
access-token-validity-in-seconds: 60 # 1분
refresh-token-validity-in-seconds: 259200 # 3일

View File

@@ -0,0 +1,75 @@
package com.ticketing.server.global.redis;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import org.junit.jupiter.api.AfterEach;
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;
@SpringBootTest
class RefreshRedisRepositoryTest {
@Autowired
RefreshRedisRepository refreshRedisRepository;
@AfterEach
void tearDown() {
refreshRedisRepository.deleteAll();
}
@Test
@DisplayName("기본 등록 및 조회기능")
void saveAndFind() {
// given
RefreshToken refreshToken = new RefreshToken("ticketing@gmail.com", "refreshToken");
// when
refreshRedisRepository.save(refreshToken);
// then
RefreshToken findRefreshToken = refreshRedisRepository.findById(refreshToken.getId()).get();
assertAll(
() -> assertThat(findRefreshToken.getEmail()).isEqualTo("ticketing@gmail.com")
, () -> assertThat(findRefreshToken.getToken()).isEqualTo("refreshToken")
);
}
@Test
@DisplayName("기본 등록 및 이메일 조회")
void saveAndFindByEmail() {
// given
RefreshToken refreshToken = new RefreshToken("ticketing@gmail.com", "refreshToken");
// when
refreshRedisRepository.save(refreshToken);
// then
RefreshToken findRefreshToken = refreshRedisRepository.findByEmail(refreshToken.getEmail()).get();
assertAll(
() -> assertThat(findRefreshToken.getEmail()).isEqualTo("ticketing@gmail.com")
, () -> assertThat(findRefreshToken.getToken()).isEqualTo("refreshToken")
);
}
@Test
@DisplayName("기본 등록 및 수정기능")
void saveAndSave() {
// given
RefreshToken refreshToken = new RefreshToken("ticketing@gmail.com", "refreshToken");
refreshRedisRepository.save(refreshToken);
Long id = refreshToken.getId();
// when
RefreshToken savedRefreshToken = refreshRedisRepository.findById(id).get();
savedRefreshToken.changeToken("refreshToken2");
refreshRedisRepository.save(savedRefreshToken);
// then
RefreshToken lastSavedRefreshToken = refreshRedisRepository.findById(id).get();
assertThat(lastSavedRefreshToken.getToken()).isEqualTo("refreshToken2");
}
}

View File

@@ -1,4 +1,4 @@
package com.ticketing.server.global.jwt;
package com.ticketing.server.global.security.jwt;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
@@ -28,9 +28,37 @@ class JwtPropertiesTest {
// then
assertAll(
() -> assertThat(jwtProperties.getAccessHeader()).isEqualTo("ACCESS_TOKEN")
, () -> assertThat(jwtProperties.getRefreshHeader()).isEqualTo("REFRESH_TOKEN")
, () -> assertThat(jwtProperties.getPrefix()).isEqualTo("Bearer")
, () -> assertThat(jwtProperties.getTokenValidityInSeconds()).isEqualTo(86400)
, () -> assertThat(jwtProperties.getAccessTokenValidityInSeconds()).isEqualTo(60)
, () -> assertThat(jwtProperties.getRefreshTokenValidityInSeconds()).isEqualTo(259200)
, () -> assertThat(jwtProperties.getSecretKey()).isNotEmpty());
}
@Test
@DisplayName("token prefix 가 일치할 경우")
void hasTokenStartsWithTrue() {
// given
String token = jwtProperties.getPrefix() + " " + "tokenPrefixTest";
// when
boolean result = jwtProperties.hasTokenStartsWith(token);
// then
assertThat(result).isTrue();
}
@Test
@DisplayName("token prefix 가 일치하지 않을 경우")
void hasTokenStartsWithFalse() {
// given
String token = "tokenPrefixTest";
// when
boolean result = jwtProperties.hasTokenStartsWith(token);
// then
assertThat(result).isFalse();
}
}

View File

@@ -1,8 +1,9 @@
package com.ticketing.server.global.jwt;
package com.ticketing.server.global.security.jwt;
import static org.assertj.core.api.Assertions.assertThat;
import com.ticketing.server.global.factory.YamlPropertySourceFactory;
import com.ticketing.server.user.application.response.TokenDto;
import com.ticketing.server.user.domain.UserGrade;
import java.util.Collections;
import org.junit.jupiter.api.BeforeEach;
@@ -25,12 +26,12 @@ class TokenProviderTest {
@Autowired
private JwtProperties jwtProperties;
JwtProvider tokenProvider;
JwtProvider jwtProvider;
@BeforeEach
void init() {
tokenProvider = new JwtProvider(jwtProperties);
jwtProvider = new JwtProvider(jwtProperties);
}
@Test
@@ -42,10 +43,10 @@ class TokenProviderTest {
new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
// when
String token = tokenProvider.createToken(authenticationToken);
TokenDto tokenDto = jwtProvider.generateTokenDto(authenticationToken);
// then
assertThat(token).isNotEmpty();
assertThat(tokenDto).isInstanceOf(TokenDto.class);
}
@Test
@@ -57,8 +58,8 @@ class TokenProviderTest {
new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
// when
String token = tokenProvider.createToken(authenticationToken);
Authentication authentication = tokenProvider.getAuthentication(token);
TokenDto tokenDto = jwtProvider.generateTokenDto(authenticationToken);
Authentication authentication = jwtProvider.getAuthentication(tokenDto.getAccessToken());
// then
assertThat(authentication.getName()).isEqualTo("ticketing@gmail.com");

View File

@@ -3,14 +3,15 @@ package com.ticketing.server.user.application;
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;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
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.SignUpRequest;
import com.ticketing.server.user.service.interfaces.UserService;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
@@ -40,22 +41,11 @@ class UserControllerTest {
@Autowired
ObjectMapper objectMapper;
@Autowired
RefreshRedisRepository refreshRedisRepository;
MockMvc mvc;
@BeforeEach
void init() throws Exception {
mvc = MockMvcBuilders
.webAppContextSetup(context)
.apply(springSecurity())
.build();
SignUpRequest signUpRequest = new SignUpRequest("ticketing", "ticketing@gmail.com", "qwe123", "010-2240-7920");
mvc.perform(post("/user")
.content(asJsonString(signUpRequest))
.contentType(MediaType.APPLICATION_JSON));
}
@Test
@DisplayName("로그인 인증 성공")
void loginSuccess() throws Exception {
@@ -63,14 +53,13 @@ class UserControllerTest {
LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe123");
// when
ResultActions actions = mvc.perform(post("/user/login")
ResultActions actions = mvc.perform(post("/api/user/login")
.content(asJsonString(request))
.contentType(MediaType.APPLICATION_JSON));
// then
actions.andDo(print())
.andExpect(status().isOk())
.andExpect(header().exists("ACCESS_TOKEN"));
.andExpect(status().isOk());
}
@Test
@@ -80,7 +69,7 @@ class UserControllerTest {
LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe1234");
// when
ResultActions actions = mvc.perform(post("/user/login")
ResultActions actions = mvc.perform(post("/api/user/login")
.content(asJsonString(request))
.contentType(MediaType.APPLICATION_JSON));
@@ -93,4 +82,23 @@ class UserControllerTest {
return objectMapper.writeValueAsString(object);
}
@BeforeEach
void init() throws Exception {
mvc = MockMvcBuilders
.webAppContextSetup(context)
.apply(springSecurity())
.build();
SignUpRequest signUpRequest = new SignUpRequest("ticketing", "ticketing@gmail.com", "qwe123", "010-2240-7920");
mvc.perform(post("/api/user")
.content(asJsonString(signUpRequest))
.contentType(MediaType.APPLICATION_JSON));
}
@AfterEach
void tearDown() {
refreshRedisRepository.deleteAll();
}
}

View File

@@ -0,0 +1,84 @@
package com.ticketing.server.user.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import com.ticketing.server.global.factory.YamlPropertySourceFactory;
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.application.response.TokenDto;
import com.ticketing.server.user.domain.UserGrade;
import java.util.Collections;
import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.PropertySource;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ExtendWith(SpringExtension.class)
@EnableConfigurationProperties(value = JwtProperties.class)
@PropertySource(value = "classpath:application.yml", factory = YamlPropertySourceFactory.class)
class AuthenticationServiceImplTest {
@Autowired
private JwtProperties useJwtProperties;
private JwtProvider useJwtProvider;
@Mock
JwtProperties jwtProperties;
@Mock
JwtProvider jwtProvider;
@Mock
RefreshRedisRepository redisRepository;
@InjectMocks
AuthenticationServiceImpl authenticationService;
UsernamePasswordAuthenticationToken authenticationToken;
@BeforeEach
void init() {
useJwtProvider = new JwtProvider(useJwtProperties);
SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(UserGrade.GUEST.name());
authenticationToken =
new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
}
@Test
@DisplayName("토큰 재발급 성공")
void reissueAccessToken() {
// given
String refreshToken = "Bearer eyJhbGciOiJIUzUxMiJ9";
when(jwtProvider.validateToken(any())).thenReturn(true);
when(jwtProvider.getAuthentication(any())).thenReturn(authenticationToken);
when(jwtProvider.generateTokenDto(any())).thenReturn(useJwtProvider.generateTokenDto(authenticationToken));
when(redisRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(new RefreshToken("ticketing@gmail.com", "eyJhbGciOiJIUzUxMiJ9")));
when(jwtProperties.hasTokenStartsWith(refreshToken)).thenReturn(true);
// when
TokenDto tokenDto = authenticationService.reissueAccessToken(refreshToken);
// then
assertAll(
() -> assertThat(tokenDto.getAccessToken()).isNotEmpty()
, () -> assertThat(tokenDto.getRefreshToken()).isNotEmpty()
, () -> assertThat(tokenDto.getTokenType()).isEqualTo("Bearer")
, () -> assertThat(tokenDto.getExpiresIn()).isEqualTo(60)
);
}
}

View File

@@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import com.ticketing.server.global.exception.NotFoundEmailException;
import com.ticketing.server.global.exception.EmailNotFoundException;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.domain.repository.UserRepository;
@@ -79,7 +79,7 @@ class UserServiceImplTest {
// when
// then
assertThatThrownBy(() -> userService.delete(deleteUserDto))
.isInstanceOf(NotFoundEmailException.class);
.isInstanceOf(EmailNotFoundException.class);
}
@Test
@@ -104,7 +104,7 @@ class UserServiceImplTest {
// when
// then
assertThatThrownBy(() -> userService.changePassword(changePasswordDto))
.isInstanceOf(NotFoundEmailException.class);
.isInstanceOf(EmailNotFoundException.class);
}
@Test

View File

@@ -4,6 +4,9 @@ spring:
username: ENC(LowN1n4w0Ep/DqLD8+q5Bq6AXM4b8e3V)
password: ENC(OMvGcpZLpggFTiGNkqNe66Zq/SmJXF6o)
driver-class-name: com.mysql.cj.jdbc.Driver
redis:
host: localhost
port: 6379
jpa:
properties:
@@ -19,11 +22,12 @@ jasypt:
jwt:
access-header: ACCESS_TOKEN
refresh-header: REFRESH_TOKEN
prefix: Bearer
secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
token-validity-in-seconds: 86400
access-token-validity-in-seconds: 60
refresh-token-validity-in-seconds: 259200
tmdb:
api-key: 0d1503b6dcbfe1c514299b5564c649b8
read-access-token: eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwZDE1MDNiNmRjYmZlMWM1MTQyOTliNTU2NGM2NDliOCIsInN1YiI6IjYyOWYwODRlNzI2ZmIxMTA2NDA4MjI2NCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.rs8KZea8QLyashILiggWFx2s46lgUtzo-xSWoDgE58A