Compare commits

...

33 Commits

Author SHA1 Message Date
dongHyo
98f67f1bbc refactor: 규칙에 맞게 수정 2022-06-05 17:40:58 +09:00
dongHyo
ae136bea44 Merge branch 'feature/securitySetUp' of https://github.com/f-lab-edu/Ticketing into feature/securitySetUp 2022-06-05 17:34:07 +09:00
dongHyo
485894cdb1 refactor: 피드백 반영 2022-06-05 17:32:53 +09:00
Kim DongHyo
ef2c61d3f2 Merge branch 'develop' into feature/securitySetUp 2022-06-04 23:54:35 +09:00
손창현
2b249e3be9 Feature/reserve movie (#18)
* add: swagger implementation 추가

* add: SwaggerConfig

* feat: MovieRepositoryTest - save, find with title

* refactor: Movie Entity - 영화 제목 unique 설정

* feat: TheaterRepositoryTest - save
2022-06-02 18:13:54 +09:00
dongHyo
a446c62643 refactor: 주석코드 제거 2022-06-01 02:06:36 +09:00
dongHyo
bda4384795 refactor: 하단 공백 추가 2022-06-01 02:06:14 +09:00
dongHyo
08522a2ff2 refactor: string 수기 작성한 json DTO로 테스트하도록 변경 2022-06-01 01:34:01 +09:00
dongHyo
a67e446f43 feat: UserController login 메서드 테스트 구현 2022-06-01 01:22:26 +09:00
dongHyo
435484cc13 feat: SecurityContextHolder Test 코드 작성 2022-06-01 00:26:27 +09:00
dongHyo
57c58ea5cc feat: @PreAuthorize("hasRole('GUEST')") 추가 2022-06-01 00:12:55 +09:00
dongHyo
477ff38a0a fix: health check permitAll 추가 2022-06-01 00:01:56 +09:00
dongHyo
0dd0c18c6e feat: UserController Login 메서드 구현 2022-05-31 20:06:23 +09:00
dongHyo
1866b88bc5 feat: Spring Security - Costom JWT 적용 2022-05-31 20:06:02 +09:00
dongHyo
09d2a5b68c feat: SecurityContextHolder 에서 email 리턴 메서드 구현 2022-05-31 20:05:09 +09:00
dongHyo
ed0f7b4b24 feat: Jwt Filter configure 등록 2022-05-31 20:04:00 +09:00
dongHyo
e608cc0a6b feat: JwtFilter 구현 2022-05-31 20:00:51 +09:00
dongHyo
1b43ebd628 feat: JwtProvider 구현 2022-05-31 20:00:22 +09:00
dongHyo
eed262f54a refactor: header -> accessHeader 네이밍 변경 2022-05-31 19:44:32 +09:00
dongHyo
9fea91e887 feat: Jwt 예외 핸들러 구현 2022-05-31 19:43:52 +09:00
dongHyo
c7bcca4836 feat: UserDetailsService CustomService 구현 2022-05-31 19:43:28 +09:00
dongHyo
eeaaafe991 refactor: UserSservice login 메소드 AuthenticationManagerBuilder 사용으로 변경 2022-05-31 19:42:48 +09:00
dongHyo
e3bd2f2671 refactor: @Getter 추가 2022-05-31 18:32:37 +09:00
dongHyo
d1d7f13c60 feat: jwt 설정파일 Loading 추가 2022-05-31 16:14:32 +09:00
dongHyo
b804c2bf25 feat: configuration-processor 추가 2022-05-31 16:11:02 +09:00
dongHyo
90b2abc988 refactor: checkPassword private -> public 범위변경 2022-05-27 18:30:14 +09:00
dongHyo
34bbe0ec7f refactor: findNotDeletedUserByEmail 메소드 추가 2022-05-27 18:26:49 +09:00
dongHyo
6259218422 feat: login 서비스 구현 2022-05-27 18:16:22 +09:00
dongHyo
07aa667326 fix: jjwt version 명시 2022-05-27 18:15:47 +09:00
dongHyo
3c9545fe82 feat: jwt 의존성 추가 2022-05-27 14:18:25 +09:00
Kim DongHyo
0c26555665 #3 회원탈퇴 및 패스워드 변경 구현 (#16)
* feat: user delete 메소드 구현 및 테스트 객체 MethodSource 형식으로 분리

* feat: 회원탈퇴 구현

* refactor: PasswordMismatchException 패키지 위치 변경

* feat: oldpassword, newpassword properties 추가

* test: 패스워드 변경 메소드 테스트 코드 작성

* feat: 패스워드 변경 메소드 구현

* feat: 패스워드 변경 서비스 구현

* feat: 패스워드 변경 컨트롤러 구현

* refactor: controller log 추가

* feat: UserPasswordModifyRequest -> UserModifyPasswordRequest 네이밍 변경

* refactor: param name 변경

* refactor: 패스워드 변경 시 삭제된 이메일 제외하고 불러오는 형식으로 변경

* refactor: 메소드 네이밍 수정

* feat: User ResponseDTO 작성

* refactor: controller delete -> deleteUser 메소드 명 변경

* refactor: modifyPassword @Transactional 적용

* refactor: dto 객체 명 DTO 붙여서 구분

* refactor: register method Optional 반환 -> Exception 처리

Optional 반환과 Exception 반환이 혼용되어 사용되고 있어, Exception 으로 통일

* refactor: NotFoundEmailException 구현

* refactor: User delete method Optional 반환 -> Exception 처리 

Optional 반환과 Exception 반환이 혼용되어 사용되고 있어, Exception 으로 통일

* refactor: modifyPassword method Optional 반환 -> Exception 처리

Optional 반환과 Exception 반환이 혼용되어 사용되고 있어, Exception 으로 통일

* refactor: comparePassword -> checkPassword 메서드 네이밍 변경

* refactor: modifyPassword -> changePassword 네이밍 변경

* refactor: provide 메소드 선언 위치 하단으로 변경 및 users Map 추가

정상적인 users 를 재사용하기 위해 분리하여 선언

* refactor: provideDeleteUsers 공통 users 사용하는 방식으로 수정

* refactor: changePassword 공통 users 사용하는 방식으로 수정

* refactor: UserModifyPasswordResponse -> UserChangePasswordResponse

* refactor: dto 클래스 네이밍 변경으로 인한 인수, 변수, 메소드 네이밍 수정
2022-05-26 10:51:38 +09:00
Kim DongHyo
9f70ee0ed9 #3 회원가입 기능 구현 (#15)
* feat: Create Phone validator annotation

* feat: validation annotation 변경 및 @Builder 제거

* refactor: builder 에서 생성자로 변경

* refactor: value null or empty 시 true 반환

* test: user validator 테스트 코드 작성

* refactor: grade @NotNull message 추가

* feat: spring-boot-starter-security 주석해제

* feat: 시큐리티 disable 및 psswordEncoder 빈등록

* feat: 회원가입 Service 메소드 구현

* feat: findByEmail Repository add

* feat: email 중복 시 예외 클래스 생성

* feat: 회원가입 컨트롤러 생성

* test: 회원가입 서비스 테스트 코드 작성

* docs: logs 디렉토리 추가

* refactor: 맨 하단 공백 추가

* refactor: properties message 다국어 적용

* refactor: 재정렬

* fix: @EnableJpaAuditing 중복 선언 제거

* fix: service 구현체와 동일하게 파라미터 수정

* refactor: validateEmail 메소드 병합

* refactor: SignUp 에서 UserEntity 생성하도록 변경

* refactor: message 외부로 분리

* refactor: 중복 이메일일 경우 Exception 대신 Optional 처리

* test: signUp toUser 메소드 테스트

* refactor: Phone 애노테이션 적용 부분 message 제거

* refactor: email error log add

* refactor: PasswordEncoder 를 SignUp 생성 시 적용

서비스에서는 파라미터로 넘어온 SignUp을 바로 엔티티로 저장하는 구조로 변경
2022-05-21 00:43:14 +09:00
Kim DongHyo
38365de76c Update pull_request_template.md 2022-05-17 00:56:42 +09:00
70 changed files with 2137 additions and 56 deletions

9
.idea/Ticketing.iml generated Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Ticketing.iml" filepath="$PROJECT_DIR$/.idea/Ticketing.iml" />
</modules>
</component>
</project>

10
.idea/runConfigurations.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

36
.idea/workspace.xml generated Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="2a93e153-a90c-44db-b1da-6c4424693422" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/server/src/main/java/com/ticketing/server/global/config/SwaggerConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/server/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/server/build.gradle.kts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="29uM8tIDp7UqdPYE3auX216NPaN" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="2a93e153-a90c-44db-b1da-6c4424693422" name="Changes" comment="" />
<created>1653958362269</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1653958362269</updated>
</task>
<servers />
</component>
</project>

View File

@@ -1,4 +1,4 @@
## 작업 내용
## 작업 분류
- [ ] 기능 추가
- [ ] 코드 수정
- [ ] 환경 설정
@@ -30,4 +30,3 @@
- [ ] 구현 사항에 대한 테스트를 완료했습니다.
- [ ] 의도한 내용 이외에 다른 코드에는 변경 사항이 없는지 확인했습니다.
- [ ] 코드 스타일을 적용하여 팀 코딩 컨벤션에 맞게 작성했습니다.
- [ ] 팀원 모두 구현 내용 및 코드에 대해 이해하고 있습니다.

3
server/.gitignore vendored
View File

@@ -200,4 +200,7 @@ gradle-app.setting
# JDT-specific (Eclipse Java Development Tools)
.classpath
# log
/logs
# End of https://www.toptal.com/developers/gitignore/api/macos,windows,intellij+all,gradle,visualstudiocode

View File

@@ -1,7 +1,7 @@
plugins {
java
id ("org.springframework.boot") version "2.6.7"
id ("io.spring.dependency-management") version "1.0.11.RELEASE"
id("org.springframework.boot") version "2.6.7"
id("io.spring.dependency-management") version "1.0.11.RELEASE"
}
group = "com.ticketing"
@@ -26,14 +26,18 @@ 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-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 ("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
implementation ("org.springframework.boot:spring-boot-starter-log4j2")
implementation ("com.lmax:disruptor:3.4.2")
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")
modules {
module("org.springframework.boot:spring-boot-starter-logging") {
@@ -41,12 +45,20 @@ dependencies {
}
}
compileOnly ("org.projectlombok:lombok")
runtimeOnly ("mysql:mysql-connector-java")
annotationProcessor ("org.projectlombok:lombok")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testImplementation ("org.springframework.boot:spring-boot-starter-test")
testImplementation ("org.springframework.security:spring-security-test")
compileOnly("org.projectlombok:lombok")
runtimeOnly("mysql:mysql-connector-java")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.2")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.2")
annotationProcessor("org.projectlombok:lombok")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
}
tasks.withType<Test> {

View File

@@ -1,11 +1,14 @@
package com.ticketing.server;
import com.ticketing.server.global.jwt.JwtProperties;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@EnableJpaAuditing
@SpringBootApplication
@EnableConfigurationProperties(JwtProperties.class)
public class ServerApplication {
public static void main(String[] args) {

View File

@@ -0,0 +1,28 @@
package com.ticketing.server.global.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
@Configuration
public class MessagesConfig {
@Bean
public ResourceBundleMessageSource messageSource() {
ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
messageSource.setBasename("i18n/messages");
messageSource.setDefaultEncoding("UTF-8");
return messageSource;
}
@Bean
public LocalValidatorFactoryBean getValidator() {
LocalValidatorFactoryBean factoryBean = new LocalValidatorFactoryBean();
factoryBean.setValidationMessageSource(messageSource());
return factoryBean;
}
}

View File

@@ -0,0 +1,69 @@
package com.ticketing.server.global.config;
import java.util.Arrays;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.SecurityReference;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger.web.UiConfiguration;
import springfox.documentation.swagger.web.UiConfigurationBuilder;
@Configuration
@RequiredArgsConstructor
public class SwaggerConfig {
public static final String SECURITY_SCHEMA_NAME = "Authorization";
public static final String AUTHORIZATION_SCOPE_GLOBAL = "global";
public static final String AUTHORIZATION_SCOPE_GLOBAL_DESC = "accessEverything";
@Bean
public Docket api() {
return new Docket(DocumentationType.OAS_30)
.useDefaultResponseMessages(false)
.select()
.apis(RequestHandlerSelectors.any())
.paths(PathSelectors.ant("/api/**")).build()
.apiInfo(apiInfo())
.securityContexts(Arrays.asList(securityContext()))
.securitySchemes(Arrays.asList(apiKey()));
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("Ticketing REST API Document")
.version("v1")
.description("Ticketing REST API 문서").build();
}
private ApiKey apiKey() {
return new ApiKey(SECURITY_SCHEMA_NAME, "Authorization", "header");
}
private SecurityContext securityContext() {
return SecurityContext.builder().securityReferences(defaultAuth()).build();
}
private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope(AUTHORIZATION_SCOPE_GLOBAL,
AUTHORIZATION_SCOPE_GLOBAL_DESC);
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
return Arrays.asList(new SecurityReference(SECURITY_SCHEMA_NAME, authorizationScopes));
}
@Bean
UiConfiguration uiConfig() {
return UiConfigurationBuilder.builder()
.build();
}
}

View File

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

View File

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

View File

@@ -0,0 +1,11 @@
package com.ticketing.server.global.exception;
public class PasswordMismatchException extends RuntimeException {
private static final String MESSAGE = "패스워드가 일치하지 않습니다";
public PasswordMismatchException() {
super(MESSAGE);
}
}

View File

@@ -0,0 +1,23 @@
package com.ticketing.server.global.factory;
import java.util.Objects;
import java.util.Properties;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertySourceFactory;
public class YamlPropertySourceFactory implements PropertySourceFactory {
@Override
public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource) {
Resource resource = encodedResource.getResource();
YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
factoryBean.setResources(resource);
Properties properties = factoryBean.getObject();
return new PropertiesPropertySource(Objects.requireNonNull(resource.getFilename()), Objects.requireNonNull(properties));
}
}

View File

@@ -0,0 +1,51 @@
package com.ticketing.server.global.jwt;
import java.io.IOException;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.util.StringUtils;
import org.springframework.web.filter.OncePerRequestFilter;
@Slf4j
@Configuration
public class JwtFilter extends OncePerRequestFilter {
private final JwtProvider tokenProvider;
private final String accessHeader;
private final String tokenPrefix;
public JwtFilter(JwtProperties jwtProperties, JwtProvider tokenProvider) {
this.accessHeader = jwtProperties.getAccessHeader();
this.tokenPrefix = jwtProperties.getPrefix();
this.tokenProvider = tokenProvider;
}
@Override
public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
String jwt = resolveToken(request);
// 토큰이 정상이면 Authentication 을 가져와서 SecurityContext 에 저장
if (StringUtils.hasText(jwt) && tokenProvider.validateToken(jwt)) {
Authentication authentication = tokenProvider.getAuthentication(jwt);
SecurityContextHolder.getContext().setAuthentication(authentication);
}
chain.doFilter(request, response);
}
private String resolveToken(HttpServletRequest request) {
String bearerToken = request.getHeader(accessHeader);
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(tokenPrefix)) {
return bearerToken.substring(7);
}
return null;
}
}

View File

@@ -0,0 +1,22 @@
package com.ticketing.server.global.jwt;
import com.ticketing.server.global.factory.YamlPropertySourceFactory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConstructorBinding;
import org.springframework.context.annotation.PropertySource;
@Getter
@RequiredArgsConstructor
@ConstructorBinding
@ConfigurationProperties("jwt")
@PropertySource(value = "classpath:application.yml", factory = YamlPropertySourceFactory.class)
public class JwtProperties {
private final String accessHeader;
private final String prefix;
private final String secretKey;
private final Integer tokenValidityInSeconds;
}

View File

@@ -0,0 +1,114 @@
package com.ticketing.server.global.jwt;
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;
import java.util.List;
import java.util.StringJoiner;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;
@Component
@Slf4j
public class JwtProvider {
private static final String AUTHORITIES_KEY = "auth";
private static final String AUTHORITIES_DELIMITER = ",";
private final long tokenValidityInMilliseconds;
private final Key key;
public JwtProvider(JwtProperties jwtProperties) {
this.tokenValidityInMilliseconds = jwtProperties.getTokenValidityInSeconds();
byte[] keyBytes = Decoders.BASE64.decode(jwtProperties.getSecretKey());
this.key = Keys.hmacShaKeyFor(keyBytes);
}
public String createToken(Authentication authentication) {
// 권한 정보 가져오기
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) // 만료일
.signWith(key, SignatureAlgorithm.HS512) // 서명 키 값
.compact();
}
private String generateStringToAuthorities(Authentication authentication) {
StringJoiner authorities = new StringJoiner(AUTHORITIES_DELIMITER);
for (GrantedAuthority grantedAuthority : authentication.getAuthorities()) {
String roleName = makeRoleName(grantedAuthority.getAuthority());
authorities.add(roleName);
}
return authorities.toString();
}
private String makeRoleName(String role) {
return "ROLE_" + role.toUpperCase();
}
public Authentication getAuthentication(String token) {
// 토큰 복호화
Claims claims = parseClaims(token);
List<SimpleGrantedAuthority> authorities =
Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(AUTHORITIES_DELIMITER))
.map(SimpleGrantedAuthority::new)
.collect(Collectors.toList());
UserDetails principal = new User(claims.getSubject(), "", authorities);
return new UsernamePasswordAuthenticationToken(principal, token, authorities);
}
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;
}
private Claims parseClaims(String token) {
return Jwts
.parserBuilder()
.setSigningKey(key)
.build()
.parseClaimsJws(token)
.getBody();
}
}

View File

@@ -0,0 +1,18 @@
package com.ticketing.server.global.jwt;
import lombok.RequiredArgsConstructor;
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.web.DefaultSecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
@RequiredArgsConstructor
public class JwtSecurityConfig extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSecurity> {
private final JwtFilter jwtFilter;
@Override
public void configure(HttpSecurity builder) {
builder.addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class);
}
}

View File

@@ -0,0 +1,17 @@
package com.ticketing.server.global.jwt.handle;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.web.access.AccessDeniedHandler;
import org.springframework.stereotype.Component;
@Component
public class JwtAccessDeniedHandler implements AccessDeniedHandler {
@Override
public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
}
}

View File

@@ -0,0 +1,17 @@
package com.ticketing.server.global.jwt.handle;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
@Component
public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
@Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
}
}

View File

@@ -0,0 +1,21 @@
package com.ticketing.server.global.security;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
public class SecurityUtil {
private SecurityUtil() {
}
public static String getCurrentUserEmail() {
final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null || authentication.getName() == null) {
throw new IllegalStateException("Security Context 에 인증 정보가 없습니다.");
}
return authentication.getName();
}
}

View File

@@ -0,0 +1,65 @@
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 lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(securedEnabled = true)
@RequiredArgsConstructor
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
private final JwtFilter jwtFilter;
private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
private final JwtAccessDeniedHandler jwtAccessDeniedHandler;
@Bean
public PasswordEncoder passwordEncoder() {
return PasswordEncoderFactories.createDelegatingPasswordEncoder();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
http
.csrf().disable()
.exceptionHandling()
.authenticationEntryPoint(jwtAuthenticationEntryPoint)
.accessDeniedHandler(jwtAccessDeniedHandler)
.and()
.headers()
.frameOptions()
.sameOrigin()
// 시큐리티는 기본적으로 세션을 사용하지만, jwt 을 위해 세션을 Stateless 로 설정
.and()
.sessionManagement()
.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.and()
.authorizeRequests()
.antMatchers(HttpMethod.POST, "/user").permitAll()
.antMatchers(HttpMethod.POST, "/user/login").permitAll()
.antMatchers("/l7check").permitAll()
.antMatchers("/actuator/health").permitAll()
.anyRequest().authenticated()
.and()
.apply(new JwtSecurityConfig(jwtFilter));
}
}

View File

@@ -0,0 +1,35 @@
package com.ticketing.server.global.service;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
import java.util.Collections;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class CustomUserDetailsService implements UserDetailsService {
private final UserRepository userRepository;
@Override
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
return userRepository.findByEmailAndIsDeletedFalse(email)
.map(this::createUserDetails)
.orElseThrow(() -> new UsernameNotFoundException("존재하지 않는 email 입니다. :: " + email));
}
private UserDetails createUserDetails(User user) {
SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(user.getGrade().name());
return new org.springframework.security.core.userdetails.User(
user.getEmail()
, user.getPassword()
, Collections.singleton(grantedAuthority)
);
}
}

View File

@@ -0,0 +1,24 @@
package com.ticketing.server.global.validator.constraints;
import com.ticketing.server.global.validator.constraintvalidators.PhoneValidator;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = {PhoneValidator.class})
@Documented
public @interface Phone {
String message() default "{validation.phone}";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
}

View File

@@ -0,0 +1,21 @@
package com.ticketing.server.global.validator.constraintvalidators;
import com.ticketing.server.global.validator.constraints.Phone;
import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
public class PhoneValidator implements ConstraintValidator<Phone, String> {
private static final String PATTERN = "\\d{3}-\\d{4}-\\d{4}";
@Override
public boolean isValid(String value, ConstraintValidatorContext context) {
if (value == null || value.isEmpty()) {
return true;
}
return Pattern.matches(PATTERN, value);
}
}

View File

@@ -1,18 +1,24 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class Movie extends AbstractEntity {
@NotNull
private String title;
@NotNull
@Column(unique = true)
private String title;
@NotNull
private Integer runningTime;
@NotNull
private Integer runningTime;
}

View File

@@ -3,10 +3,14 @@ package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import javax.persistence.Entity;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class Theater extends AbstractEntity {
@NotNull

View File

@@ -6,10 +6,10 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum TicketStatus {
SALE("판매가능"),
SCHEDULED("환불"),
SOLD("판매완료");
SALE("판매가능"),
SCHEDULED("환불"),
SOLD("판매완료");
private String name;
private String name;
}

View File

@@ -1,10 +1,13 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.Movie;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface MovieRepository extends JpaRepository<Movie, Long> {
Optional<Movie> findByTitle(String title);
}

View File

@@ -1,10 +1,13 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.Theater;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface TheaterRepository extends JpaRepository<Theater, Long> {
Optional<Theater> findByTheaterNumber(Integer theaterNumber);
}

View File

@@ -1,8 +1,73 @@
package com.ticketing.server.user.application;
import com.ticketing.server.global.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.UserChangePasswordResponse;
import com.ticketing.server.user.application.response.UserDeleteResponse;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.UserServiceImpl;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/user")
@Slf4j
public class UserController {
private final UserServiceImpl userService;
private final PasswordEncoder passwordEncoder;
private final JwtProperties jwtProperties;
@PostMapping
public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
User user = userService.register(request.toSignUpDto(passwordEncoder));
return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.of(user));
}
@DeleteMapping
@Secured("ROLE_GUEST")
public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.of(user));
}
@PatchMapping("/password")
@Secured("ROLE_GUEST")
public ResponseEntity<UserChangePasswordResponse> changePassword(@RequestBody @Valid UserModifyPasswordRequest request) {
if (request.oldEqualNew()) {
log.error("기존 패스워드와 동일한 패스워드로 변경할 수 없습니다.");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
}
User user = userService.changePassword(request.toChangePasswordDto(passwordEncoder));
return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.of(user));
}
@PostMapping("/login")
public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest loginRequest, HttpServletResponse response) {
String accessToken = userService.login(loginRequest.toAuthentication());
response.setHeader(jwtProperties.getAccessHeader(), accessToken);
return ResponseEntity.status(HttpStatus.OK).body(LoginResponse.of(accessToken));
}
}

View File

@@ -0,0 +1,26 @@
package com.ticketing.server.user.application.request;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class LoginRequest {
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
public UsernamePasswordAuthenticationToken toAuthentication() {
return new UsernamePasswordAuthenticationToken(email, password);
}
}

View File

@@ -0,0 +1,39 @@
package com.ticketing.server.user.application.request;
import com.ticketing.server.global.validator.constraints.Phone;
import com.ticketing.server.user.service.dto.SignUpDTO;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class SignUpRequest {
@NotEmpty(message = "{validation.not.empty.name}")
private String name;
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
@NotEmpty(message = "{validation.not.empty.phone}")
@Phone
private String phone;
public SignUpDTO toSignUpDto(PasswordEncoder passwordEncoder) {
return new SignUpDTO(name, email, getEncodePassword(passwordEncoder), phone);
}
private String getEncodePassword(PasswordEncoder passwordEncoder) {
return passwordEncoder.encode(password);
}
}

View File

@@ -0,0 +1,27 @@
package com.ticketing.server.user.application.request;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class UserDeleteRequest {
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
public DeleteUserDTO toDeleteUserDto(PasswordEncoder passwordEncoder) {
return new DeleteUserDTO(email, password, passwordEncoder);
}
}

View File

@@ -0,0 +1,34 @@
package com.ticketing.server.user.application.request;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class UserModifyPasswordRequest {
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.oldpassword}")
private String oldPassword;
@NotEmpty(message = "{validation.not.empty.newpassword}")
private String newPassword;
public ChangePasswordDTO toChangePasswordDto(PasswordEncoder passwordEncoder) {
return new ChangePasswordDTO(email, oldPassword, newPassword, passwordEncoder);
}
public boolean oldEqualNew() {
return oldPassword.equals(newPassword);
}
}

View File

@@ -0,0 +1,17 @@
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 com.ticketing.server.user.domain.User;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class SignUpResponse {
private String name;
private String email;
public static SignUpResponse of(User user) {
return new SignUpResponse(user.getName(), user.getEmail());
}
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.user.application.response;
import com.ticketing.server.user.domain.User;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class UserChangePasswordResponse {
private String name;
private String email;
public static UserChangePasswordResponse of(User user) {
return new UserChangePasswordResponse(user.getName(), user.getEmail());
}
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.user.application.response;
import com.ticketing.server.user.domain.User;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class UserDeleteResponse {
private String name;
private String email;
public static UserDeleteResponse of(User user) {
return new UserDeleteResponse(user.getName(), user.getEmail());
}
}

View File

@@ -1,12 +1,20 @@
package com.ticketing.server.user.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.global.exception.AlreadyDeletedException;
import com.ticketing.server.global.exception.PasswordMismatchException;
import com.ticketing.server.global.validator.constraints.Phone;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.PasswordMatches;
import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -15,28 +23,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class User extends AbstractEntity {
@NotNull
private String name;
@NotNull
private String email;
@NotNull
private String password;
@NotNull
@Enumerated(value = EnumType.STRING)
private UserGrade grade;
@NotNull
private String phone;
private boolean isDeleted = false;
private LocalDateTime deletedAt;
@Builder
protected User(String name, String email, String password, UserGrade grade, String phone) {
public User(String name, String email, String password, UserGrade grade, String phone) {
this.name = name;
this.email = email;
this.password = password;
@@ -44,4 +31,56 @@ public class User extends AbstractEntity {
this.phone = phone;
}
@Column(name = "name")
@NotEmpty(message = "{validation.not.empty.name}")
private String name;
@Column(name = "email")
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@Column(name = "password")
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
@Column(name = "grade")
@NotNull(message = "{validation.not.empty.grade}")
@Enumerated(value = EnumType.STRING)
private UserGrade grade = UserGrade.GUEST;
@Column(name = "phone")
@NotEmpty(message = "{validation.not.empty.phone}")
@Phone
private String phone;
private boolean isDeleted = false;
private LocalDateTime deletedAt;
public User delete(DeleteUserDTO deleteUser) {
if (isDeleted) {
throw new AlreadyDeletedException("이미 탈퇴된 회원 입니다.");
}
checkPassword(deleteUser);
isDeleted = true;
deletedAt = LocalDateTime.now();
return this;
}
public User changePassword(ChangePasswordDTO changePassword) {
checkPassword(changePassword);
this.password = changePassword.getEncodePassword();
return this;
}
public void checkPassword(PasswordMatches passwordMatches) {
if (!passwordMatches.passwordMatches(password)) {
throw new PasswordMismatchException();
}
}
}

View File

@@ -1,10 +1,15 @@
package com.ticketing.server.user.domain.repository;
import com.ticketing.server.user.domain.User;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByEmail(String email);
Optional<User> findByEmailAndIsDeletedFalse(String email);
}

View File

@@ -1,9 +1,79 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.NotFoundEmailException;
import com.ticketing.server.global.jwt.JwtProvider;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
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 com.ticketing.server.user.service.interfaces.UserService;
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;
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
@Validated
@Slf4j
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
public User register(@Valid SignUpDTO signUpDto) {
Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
if (user.isPresent()) {
log.error("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다. :: {}", signUpDto);
throw new IllegalArgumentException("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다.");
}
return userRepository.save(signUpDto.toUser());
}
@Override
@Transactional
public User delete(@Valid DeleteUserDTO deleteUserDto) {
User user = userRepository.findByEmail(deleteUserDto.getEmail())
.orElseThrow(() -> {
log.error("존재하지 않는 이메일 입니다. :: {}", deleteUserDto.getEmail());
throw new NotFoundEmailException();
}
);
return user.delete(deleteUserDto);
}
@Override
@Transactional
public User changePassword(@Valid ChangePasswordDTO changePasswordDto) {
User user = findNotDeletedUserByEmail(changePasswordDto.getEmail());
return user.changePassword(changePasswordDto);
}
private User findNotDeletedUserByEmail(String email) {
return userRepository.findByEmailAndIsDeletedFalse(email)
.orElseThrow(() -> {
log.error("존재하지 않는 이메일 입니다. :: {}", email);
throw new NotFoundEmailException();
});
}
}

View File

@@ -0,0 +1,47 @@
package com.ticketing.server.user.service.dto;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import org.springframework.security.crypto.password.PasswordEncoder;
public class ChangePasswordDTO implements PasswordMatches {
public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) {
this.email = email;
this.oldPassword = oldPassword;
this.newPassword = newPassword;
this.passwordEncoder = passwordEncoder;
}
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.oldpassword}")
private String oldPassword;
@NotEmpty(message = "{validation.not.empty.newpassword}")
private String newPassword;
private PasswordEncoder passwordEncoder;
public String getEmail() {
return email;
}
@Override
public boolean passwordMatches(String password) {
return passwordEncoder.matches(oldPassword, password);
}
public String getEncodePassword() {
return passwordEncoder.encode(newPassword);
}
@Override
public String toString() {
return "ChangePassword{" +
"email='" + email + '\'' +
'}';
}
}

View File

@@ -0,0 +1,40 @@
package com.ticketing.server.user.service.dto;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import org.springframework.security.crypto.password.PasswordEncoder;
public class DeleteUserDTO implements PasswordMatches {
public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) {
this.email = email;
this.inputPassword = inputPassword;
this.passwordEncoder = passwordEncoder;
}
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String inputPassword;
private PasswordEncoder passwordEncoder;
@Override
public boolean passwordMatches(String password) {
return passwordEncoder.matches(this.inputPassword, password);
}
public String getEmail() {
return email;
}
@Override
public String toString() {
return "DeleteUser{" +
"email='" + email + '\'' +
'}';
}
}

View File

@@ -0,0 +1,7 @@
package com.ticketing.server.user.service.dto;
@FunctionalInterface
public interface PasswordMatches {
boolean passwordMatches(String password);
}

View File

@@ -0,0 +1,47 @@
package com.ticketing.server.user.service.dto;
import com.ticketing.server.global.validator.constraints.Phone;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.Getter;
@Getter
public class SignUpDTO {
@NotEmpty(message = "{validation.not.empty.name}")
private String name;
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
@NotEmpty(message = "{validation.not.empty.phone}")
@Phone
private String phone;
public SignUpDTO(String name, String email, String password, String phone) {
this.name = name;
this.email = email;
this.password = password;
this.phone = phone;
}
public User toUser() {
return new User(this.name, this.email, password, UserGrade.GUEST, this.phone);
}
@Override
public String toString() {
return "SignUp{" +
"name='" + name + '\'' +
", email='" + email + '\'' +
", phone='" + phone + '\'' +
'}';
}
}

View File

@@ -1,5 +1,21 @@
package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.domain.User;
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);
User changePassword(@Valid ChangePasswordDTO changePasswordDto);
}

View File

@@ -18,3 +18,9 @@ spring:
jasypt:
encryptor:
bean: jasyptStringEncryptor
jwt:
access-header: ACCESS_TOKEN
prefix: Bearer
secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
token-validity-in-seconds: 86400

View File

@@ -0,0 +1,9 @@
validation.not.empty.name="\uC774\uB984\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.email="\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.password="\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.oldpassword="\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.newpassword="\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.email="\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."
validation.phone="\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."

View File

@@ -0,0 +1,9 @@
validation.not.empty.name="name is required."
validation.not.empty.email="email is required."
validation.not.empty.password="password is required."
validation.not.empty.oldpassword="Old Password is required."
validation.not.empty.newpassword="New Password is required."
validation.not.empty.grade="user grade is required."
validation.not.empty.phone="phone is required."
validation.email="email is not valid."
validation.phone="phone is not valid."

View File

@@ -0,0 +1,9 @@
validation.not.empty.name="\uC774\uB984\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.email="\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.password="\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.oldpassword="\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.newpassword="\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.email="\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."
validation.phone="\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."

View File

@@ -2,10 +2,8 @@ package com.ticketing.server;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@SpringBootTest
@EnableJpaAuditing
class ServerApplicationTests {
@Test

View File

@@ -0,0 +1,36 @@
package com.ticketing.server.global.jwt;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import com.ticketing.server.global.factory.YamlPropertySourceFactory;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.PropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ExtendWith(SpringExtension.class)
@EnableConfigurationProperties(value = JwtProperties.class)
@PropertySource(value = "classpath:application.yml", factory = YamlPropertySourceFactory.class)
class JwtPropertiesTest {
@Autowired
private JwtProperties jwtProperties;
@Test
@DisplayName("yml - jwt 설정파일 체크")
void jwtPropertiesCheck() {
// given
// when
// then
assertAll(
() -> assertThat(jwtProperties.getAccessHeader()).isEqualTo("ACCESS_TOKEN")
, () -> assertThat(jwtProperties.getPrefix()).isEqualTo("Bearer")
, () -> assertThat(jwtProperties.getTokenValidityInSeconds()).isEqualTo(86400)
, () -> assertThat(jwtProperties.getSecretKey()).isNotEmpty());
}
}

View File

@@ -0,0 +1,67 @@
package com.ticketing.server.global.jwt;
import static org.assertj.core.api.Assertions.assertThat;
import com.ticketing.server.global.factory.YamlPropertySourceFactory;
import com.ticketing.server.user.domain.UserGrade;
import java.util.Collections;
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.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.Authentication;
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 TokenProviderTest {
@Autowired
private JwtProperties jwtProperties;
JwtProvider tokenProvider;
@BeforeEach
void init() {
tokenProvider = new JwtProvider(jwtProperties);
}
@Test
@DisplayName("토큰 생성 성공")
void createTokenSuccess() {
// given
SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(UserGrade.GUEST.name());
UsernamePasswordAuthenticationToken authenticationToken =
new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
// when
String token = tokenProvider.createToken(authenticationToken);
// then
assertThat(token).isNotEmpty();
}
@Test
@DisplayName("토큰 복호화 성공")
void getAuthentication() {
// given
SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(UserGrade.GUEST.name());
UsernamePasswordAuthenticationToken authenticationToken =
new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
// when
String token = tokenProvider.createToken(authenticationToken);
Authentication authentication = tokenProvider.getAuthentication(token);
// then
assertThat(authentication.getName()).isEqualTo("ticketing@gmail.com");
}
}

View File

@@ -0,0 +1,66 @@
package com.ticketing.server.global.security;
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.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
@ExtendWith(MockitoExtension.class)
class SecurityContextHolderTest {
private static final String ANY_USER = "ticketing";
private static final String ANY_PASSWORD = "password";
private static final String ROLE_GUEST = "ROLE_GUEST";
@BeforeEach
void init() {
SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_THREADLOCAL);
setMockAuthentication();
}
@AfterEach
void clear() {
SecurityContextHolder.clearContext();
}
@Test
@DisplayName("SecurityContextHolder 에 현재 인증된 사용자 정보를 확인한다.")
void SecurityContextHolder() {
// given
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
// when
// then
assertAll(
() -> assertThat(authentication.isAuthenticated()).isTrue()
, () -> assertThat(authentication.getName()).isEqualTo(ANY_USER)
, () -> assertThat(authentication.getCredentials()).isEqualTo(ANY_PASSWORD)
, () -> assertThat(authentication.getAuthorities())
.extracting(GrantedAuthority::getAuthority)
.contains(ROLE_GUEST)
);
}
private void setMockAuthentication() {
SecurityContext context = SecurityContextHolder.createEmptyContext();
TestingAuthenticationToken mockAuthentication
= new TestingAuthenticationToken(SecurityContextHolderTest.ANY_USER, SecurityContextHolderTest.ANY_PASSWORD, SecurityContextHolderTest.ROLE_GUEST);
context.setAuthentication(mockAuthentication);
SecurityContextHolder.setContext(context);
}
}

View File

@@ -0,0 +1,5 @@
package com.ticketing.server.movie.domain;
public class MovieTest {
}

View File

@@ -0,0 +1,63 @@
package com.ticketing.server.movie.domain.repository;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.ticketing.server.movie.domain.Movie;
import java.util.Optional;
import javax.transaction.Transactional;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Rollback;
@SpringBootTest
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class MovieRepositoryTest {
@Autowired
MovieRepository movieRepository;
@Order(1)
@Test
@Rollback(value = false)
@DisplayName("Movie Repository - test saving movie")
void shouldAbleToSaveMovie() {
// given
Movie movie = new Movie("범죄도시 2", 106);
// when
Movie savedMovie = movieRepository.save(movie);
// then
assertEquals(movie.getTitle(), savedMovie.getTitle());
}
@Order(2)
@Test
@DisplayName("Movie Repository Test - finding movie with title")
void ShouldAbleToFindMovieWithTitle() {
// given, when
Optional<Movie> optionalMovie = movieRepository.findByTitle("범죄도시 2");
// then
assertTrue(optionalMovie.isPresent());
}
@Order(3)
@Test
@DisplayName("Movie Repository Test - finding movie that doesn't exist")
void ShouldNotAbleToFindMovie() {
// given, when
Optional<Movie> optionalMovie = movieRepository.findByTitle("존재하지 않는 영화");
// then
assertFalse(optionalMovie.isPresent());
}
}

View File

@@ -0,0 +1,5 @@
package com.ticketing.server.movie.domain.repository;
public class MovieTimesRepositoryTest {
}

View File

@@ -0,0 +1,5 @@
package com.ticketing.server.movie.domain.repository;
public class SeatRepositoryTest {
}

View File

@@ -0,0 +1,32 @@
package com.ticketing.server.movie.domain.repository;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.ticketing.server.movie.domain.Theater;
import javax.transaction.Transactional;
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
@Transactional
public class TheaterRepositoryTest {
@Autowired
TheaterRepository theaterRepository;
@Test
@DisplayName("Theater Repository Test - saving theater")
void ShouldAbleToSaveTheater() {
// given
Theater theater = new Theater(1, 100);
// when
Theater savedTheater = theaterRepository.save(theater);
// then
assertEquals(theater.getTheaterNumber(), savedTheater.getTheaterNumber());
}
}

View File

@@ -0,0 +1,5 @@
package com.ticketing.server.movie.domain.repository;
public class TicketRepositoryTest {
}

View File

@@ -0,0 +1,9 @@
package com.ticketing.server.movie.service;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
public class MovieServiceImplTest {
}

View File

@@ -0,0 +1,96 @@
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.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.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.security.crypto.password.PasswordEncoder;
import org.springframework.test.web.servlet.MockMvc;
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
class UserControllerTest {
@Autowired
WebApplicationContext context;
@Autowired
UserService userService;
@Autowired
PasswordEncoder passwordEncoder;
@Autowired
ObjectMapper objectMapper;
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 {
// given
LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe123");
// when
ResultActions actions = mvc.perform(post("/user/login")
.content(asJsonString(request))
.contentType(MediaType.APPLICATION_JSON));
// then
actions.andDo(print())
.andExpect(status().isOk())
.andExpect(header().exists("ACCESS_TOKEN"));
}
@Test
@DisplayName("로그인 패스워드 인증 실패")
void loginPasswordFail() throws Exception {
// given
LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe1234");
// when
ResultActions actions = mvc.perform(post("/user/login")
.content(asJsonString(request))
.contentType(MediaType.APPLICATION_JSON));
// then
actions.andDo(print())
.andExpect(status().isUnauthorized());
}
private String asJsonString(Object object) throws JsonProcessingException {
return objectMapper.writeValueAsString(object);
}
}

View File

@@ -0,0 +1,280 @@
package com.ticketing.server.user.domain;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;
import com.ticketing.server.global.exception.AlreadyDeletedException;
import com.ticketing.server.global.exception.PasswordMismatchException;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
class UserTest {
private Validator validator;
private Map<String, User> users;
@BeforeEach
void init() {
ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
validator = factory.getValidator();
users = provideCorrectUsers().collect(Collectors.toMap(User::getEmail, user -> user));
}
@ParameterizedTest
@MethodSource("provideDifferentPasswordDeleteUsers")
@DisplayName("입력된 패스워드가 다를 경우")
void passwordMismatchException(DeleteUserDTO deleteUser) {
// given
User user = users.get(deleteUser.getEmail());
// when
// then
assertThatThrownBy(() -> user.delete(deleteUser))
.isInstanceOf(PasswordMismatchException.class);
}
@ParameterizedTest
@MethodSource("provideDeleteUsers")
@DisplayName("이미 회원탈퇴 되어 있는 경우")
void alreadyDeletedException(DeleteUserDTO deleteUserDto) {
// given
User user = users.get(deleteUserDto.getEmail());
// when
user.delete(deleteUserDto);
// then
assertThatThrownBy(() -> user.delete(deleteUserDto))
.isInstanceOf(AlreadyDeletedException.class);
}
@ParameterizedTest
@MethodSource("provideDeleteUsers")
@DisplayName("회원탈퇴 성공")
void deleteSuccess(DeleteUserDTO deleteUserDto) {
// given
User user = users.get(deleteUserDto.getEmail());
// when
User deletedUser = user.delete(deleteUserDto);
// then
assertAll(
() -> assertThat(deletedUser.getDeletedAt()).isNotNull()
, () -> assertThat(deletedUser.isDeleted()).isTrue()
);
}
@Test
@DisplayName("입력받은 패스워드와 불일치로 변경 실패")
void changePasswordFail() {
// given
ChangePasswordDTO changePasswordDto = new ChangePasswordDTO("ticketing1@gmail.com", "1234567", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
User user = users.get(changePasswordDto.getEmail());
// when
// then
assertThatThrownBy(() -> user.changePassword(changePasswordDto))
.isInstanceOf(PasswordMismatchException.class);
}
@Test
@DisplayName("패스워드 변경 성공")
void changePasswordSuccess() {
// given
ChangePasswordDTO changePasswordDto = new ChangePasswordDTO("ticketing1@gmail.com", "123456", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
User user = users.get(changePasswordDto.getEmail());
String oldPassword = user.getPassword();
// when
User modifiedUser = user.changePassword(changePasswordDto);
// then
assertThat(modifiedUser.getPassword()).isNotEqualTo(oldPassword);
}
@ParameterizedTest
@MethodSource("provideCorrectUsers")
@DisplayName("유저 검증 성공")
void validateSuccess(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).isEmpty();
}
@ParameterizedTest
@MethodSource("provideNullOrEmptyOfName")
@DisplayName("name null 혹은 빈값 검증")
void nameNullOrEmpty(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideNullOrEmptyOfEmail")
@DisplayName("email null or empty 검증")
void emailNullOrEmpty(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideValidationFailedOfEmail")
@DisplayName("email 실패 검증")
void emailValid(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideNullOrEmptyOfPassword")
@DisplayName("password null 혹은 빈값 검증")
void passwordNullOrEmpty(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@Test
@DisplayName("grade null 검증")
void gradeNull() {
// given
User user = new User("유저1", "email@gmail.com", "testPassword01", null, "010-1234-5678");
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideNullOrEmptyOfPhone")
@DisplayName("phone null or empty 검증")
void phoneNullOrEmpty(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideValidationFailedOfPhone")
@DisplayName("phone 실패 검증")
void phoneValid(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
public static Stream<User> provideCorrectUsers() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
, new User("유저3", "ticketing3@gmail.com", "ticketing", UserGrade.STAFF, "010-3234-5678")
, new User("유저4", "ticketing4@gmail.com", "ticketing123456", UserGrade.STAFF, "010-4234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfName() {
return Stream.of(
new User(null, "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678")
, new User("", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfEmail() {
return Stream.of(
new User("유저1", null, "123456", UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "", "qwe123", UserGrade.GUEST, "010-2234-5678")
);
}
public static Stream<User> provideValidationFailedOfEmail() {
return Stream.of(
new User("유저1", "email", "123456", UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
, new User("유저3", "12Bye#domain.com", "ticketing", UserGrade.STAFF, "010-3234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfPassword() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", null, UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "ticketing2@gmail.com", "", UserGrade.GUEST, "010-2234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfPhone() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, null)
, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "")
);
}
public static Stream<User> provideValidationFailedOfPhone() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-123-1234")
, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "02-0444-4044")
, new User("유저3", "ticketing3@gmail.com", "ticketing", UserGrade.STAFF, "033-7953")
, new User("유저4", "ticketing4@gmail.com", "ticketing123456", UserGrade.STAFF, "033-0455-504")
);
}
public static Stream<DeleteUserDTO> provideDifferentPasswordDeleteUsers() {
return Stream.of(
new DeleteUserDTO("ticketing1@gmail.com", "1234561", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing2@gmail.com", "qwe1231", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing3@gmail.com", "ticketing1", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing4@gmail.com", "ticketing1234561", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
);
}
public static Stream<DeleteUserDTO> provideDeleteUsers() {
return Stream.of(
new DeleteUserDTO("ticketing1@gmail.com", "123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing2@gmail.com", "qwe123", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing3@gmail.com", "ticketing", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing4@gmail.com", "ticketing123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
);
}
}

View File

@@ -19,13 +19,7 @@ class UserRepositoryTest {
@Test
void 유저레포지토리테스트() {
// given
User user = User.builder()
.name("동효")
.password("test")
.email("test@test.com")
.grade(UserGrade.GUEST)
.phone("010-1234-5678")
.build();
User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, "010-1234-5678");
// when
userRepository.save(user);

View File

@@ -0,0 +1,123 @@
package com.ticketing.server.user.service;
import static org.assertj.core.api.Assertions.assertThat;
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.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
import com.ticketing.server.user.service.dto.SignUpDTO;
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.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
class UserServiceImplTest {
User user;
SignUpDTO signUpDto;
DeleteUserDTO deleteUserDto;
ChangePasswordDTO changePasswordDto;
@Mock
UserRepository userRepository;
@InjectMocks
UserServiceImpl userService;
@BeforeEach
void init() {
signUpDto = new SignUpDTO("유저", "ticketing@gmail.com", "123456", "010-1234-5678");
user = new User("유저", "ticketing@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678");
deleteUserDto = new DeleteUserDTO("ticketing@gmail.com", "123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
changePasswordDto = new ChangePasswordDTO("ticketing@gmail.com", "123456", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
}
@Test
@DisplayName("이미 동일한 이메일이 있을 경우")
void duplicateEmailException() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
// when
// then
assertThatThrownBy(() -> userService.register(signUpDto))
.isInstanceOf(IllegalArgumentException.class);
}
@Test
@DisplayName("회원가입 성공했을 경우")
void registerSuccess() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
when(userRepository.save(any())).thenReturn(user);
// when
User user = userService.register(signUpDto);
// then
assertThat(user).isNotNull();
}
@Test
@DisplayName("회원탈퇴 시 이메일이 존재하지 않을 경우")
void deleteFail() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
// when
// then
assertThatThrownBy(() -> userService.delete(deleteUserDto))
.isInstanceOf(NotFoundEmailException.class);
}
@Test
@DisplayName("회원탈퇴 성공했을 경우")
void deleteSuccess() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
// when
User user = userService.delete(deleteUserDto);
// then
assertThat(user).isNotNull();
}
@Test
@DisplayName("패스워드 변경 시 이메일이 존재하지 않을 경우")
void changePasswordFail() {
// given
when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.empty());
// when
// then
assertThatThrownBy(() -> userService.changePassword(changePasswordDto))
.isInstanceOf(NotFoundEmailException.class);
}
@Test
@DisplayName("패스워드 변경 성공했을 경우")
void changePasswordSuccess() {
// given
when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.of(user));
// when
User user = userService.changePassword(changePasswordDto);
// then
assertThat(user).isNotNull();
}
}

View File

@@ -0,0 +1,37 @@
package com.ticketing.server.user.service.dto;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.security.crypto.password.PasswordEncoder;
public class DeleteUserDtoTest {
public static PasswordEncoder CUSTOM_PASSWORD_ENCODER = new CustomPasswordEncoder();
public static class CustomPasswordEncoder implements PasswordEncoder {
@Override
public String encode(CharSequence rawPassword) {
return null;
}
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
return rawPassword.toString().equals(encodedPassword);
}
}
@Test
@DisplayName("CustomPasswordEncoder matches 테스트")
void customPasswordEncoderMatches() {
// given
DeleteUserDTO deleteUserDto = new DeleteUserDTO("ticketing@gmail.com", "123456", CUSTOM_PASSWORD_ENCODER);
// when
// then
assertThat(deleteUserDto.passwordMatches("123456")).isTrue();
}
}

View File

@@ -0,0 +1,24 @@
package com.ticketing.server.user.service.dto;
import static org.assertj.core.api.Assertions.assertThat;
import com.ticketing.server.user.domain.User;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
class SignUpDtoTest {
@Test
@DisplayName("toUser 메소드로 User 객체 생성")
void toUser() {
// given
SignUpDTO signUp = new SignUpDTO("유저1", "ticketing@gmail.com", "123456", "010-1234-5678");
// when
User user = signUp.toUser();
// then
assertThat(user).isInstanceOf(User.class);
}
}

View File

@@ -16,3 +16,9 @@ spring:
jasypt:
encryptor:
bean: jasyptStringEncryptor
jwt:
access-header: ACCESS_TOKEN
prefix: Bearer
secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
token-validity-in-seconds: 86400