Skip to content

Commit c5b83f2

Browse files
ksw733ksw733
committed
Merge branch 'feat/111-securityTest-ksw' of https://github.com/prgrms-be-devcourse/NBE5-7-2-Team02 into feat/111-securityTest-ksw
2 parents 3f0cb6d + a0c6747 commit c5b83f2

4 files changed

Lines changed: 76 additions & 86 deletions

File tree

‎NBE_5_7_2_02TEAM/src/main/java/io/twogether/nbe_5_7_2_02team/oauth/dao/RefreshTokenBlackListRepository.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import io.twogether.nbe_5_7_2_02team.oauth.domain.RefreshToken;
44
import io.twogether.nbe_5_7_2_02team.oauth.domain.RefreshTokenBlackList;
55

6-
import java.util.Optional;
76
import org.springframework.data.jpa.repository.JpaRepository;
87

8+
import java.util.Optional;
9+
910
public interface RefreshTokenBlackListRepository
1011
extends JpaRepository<RefreshTokenBlackList, Long> {
1112
void deleteByRefreshToken(RefreshToken refreshToken);

‎NBE_5_7_2_02TEAM/src/test/java/io/twogether/nbe_5_7_2_02team/oauth/api/TokenBrowserSuccessTest.java‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,33 @@
11
package io.twogether.nbe_5_7_2_02team.oauth.api;
22

33
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
4-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
54
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
5+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
66

7+
import com.fasterxml.jackson.databind.ObjectMapper;
78
import com.github.database.rider.core.api.dataset.DataSet;
9+
810
import io.twogether.nbe_5_7_2_02team.browser.template.BrowserTestTemplate;
911
import io.twogether.nbe_5_7_2_02team.global.annotation.FlywayReset;
1012
import io.twogether.nbe_5_7_2_02team.member.dao.MemberRepository;
1113
import io.twogether.nbe_5_7_2_02team.member.domain.Member;
14+
import io.twogether.nbe_5_7_2_02team.member.dto.request.SignUpRequest;
1215
import io.twogether.nbe_5_7_2_02team.oauth.dao.RefreshTokenBlackListRepository;
1316
import io.twogether.nbe_5_7_2_02team.oauth.dto.common.TokenPair;
1417
import io.twogether.nbe_5_7_2_02team.oauth.dto.request.LogoutRequest;
1518
import io.twogether.nbe_5_7_2_02team.oauth.dto.request.RefreshRequest;
16-
import io.twogether.nbe_5_7_2_02team.member.dto.request.SignUpRequest;
1719

1820
import org.junit.jupiter.api.DisplayName;
1921
import org.junit.jupiter.api.Test;
2022
import org.springframework.beans.factory.annotation.Autowired;
2123
import org.springframework.http.MediaType;
2224

23-
import com.fasterxml.jackson.databind.ObjectMapper;
24-
2525
@FlywayReset
2626
public class TokenBrowserSuccessTest extends BrowserTestTemplate {
2727

28-
@Autowired
29-
MemberRepository memberRepository;
30-
@Autowired
31-
ObjectMapper objectMapper;
32-
@Autowired
33-
RefreshTokenBlackListRepository refreshTokenBlackListRepository;
28+
@Autowired MemberRepository memberRepository;
29+
@Autowired ObjectMapper objectMapper;
30+
@Autowired RefreshTokenBlackListRepository refreshTokenBlackListRepository;
3431

3532
@Test
3633
@DataSet(value = "datasets/v2/member.yml", cleanBefore = true, cleanAfter = true)
@@ -41,12 +38,13 @@ void refreshToken() throws Exception {
4138
RefreshRequest request = new RefreshRequest(tokenPair.getRefreshToken());
4239

4340
// when & then
44-
mockMvc.perform(post("/api/token/refresh")
45-
.contentType(MediaType.APPLICATION_JSON)
46-
.content(objectMapper.writeValueAsString(request)))
47-
.andExpect(status().isOk())
48-
.andExpect(jsonPath("$.access_token").value(tokenPair.getAccessToken()))
49-
.andExpect(jsonPath("$.refresh_token").value(tokenPair.getRefreshToken()));
41+
mockMvc.perform(
42+
post("/api/token/refresh")
43+
.contentType(MediaType.APPLICATION_JSON)
44+
.content(objectMapper.writeValueAsString(request)))
45+
.andExpect(status().isOk())
46+
.andExpect(jsonPath("$.access_token").value(tokenPair.getAccessToken()))
47+
.andExpect(jsonPath("$.refresh_token").value(tokenPair.getRefreshToken()));
5048
}
5149

5250
@Test
@@ -58,11 +56,12 @@ void logout() throws Exception {
5856
LogoutRequest request = new LogoutRequest(tokenPair.getRefreshToken());
5957

6058
// when & then
61-
mockMvc.perform(post("/api/logout")
62-
.contentType(MediaType.APPLICATION_JSON)
63-
.content(objectMapper.writeValueAsString(request))
64-
.header("Authorization", "Bearer " + tokenPair.getAccessToken()))
65-
.andExpect(status().isOk());
59+
mockMvc.perform(
60+
post("/api/logout")
61+
.contentType(MediaType.APPLICATION_JSON)
62+
.content(objectMapper.writeValueAsString(request))
63+
.header("Authorization", "Bearer " + tokenPair.getAccessToken()))
64+
.andExpect(status().isOk());
6665
}
6766

6867
@Test
@@ -73,22 +72,20 @@ void signup() throws Exception {
7372
long memberId = 1L;
7473
TokenPair tokenPair = genTokenPair(memberId);
7574

76-
SignUpRequest request = SignUpRequest.builder()
77-
.name("신규가입자")
78-
.job("DEVELOPER")
79-
.course("SPRING")
80-
.build();
75+
SignUpRequest request =
76+
SignUpRequest.builder().name("신규가입자").job("DEVELOPER").course("SPRING").build();
8177

8278
// when & then
83-
mockMvc.perform(post("/api/signup")
84-
.header("Authorization", "Bearer " + tokenPair.getAccessToken())
85-
.contentType(MediaType.APPLICATION_JSON)
86-
.content(objectMapper.writeValueAsString(request)))
87-
.andExpect(status().isCreated())
88-
.andExpect(jsonPath("$.id").value(memberId))
89-
.andExpect(jsonPath("$.name").value(request.getName()))
90-
.andExpect(jsonPath("$.job").value(request.getJob()))
91-
.andExpect(jsonPath("$.course").value(request.getCourse()));
79+
mockMvc.perform(
80+
post("/api/signup")
81+
.header("Authorization", "Bearer " + tokenPair.getAccessToken())
82+
.contentType(MediaType.APPLICATION_JSON)
83+
.content(objectMapper.writeValueAsString(request)))
84+
.andExpect(status().isCreated())
85+
.andExpect(jsonPath("$.id").value(memberId))
86+
.andExpect(jsonPath("$.name").value(request.getName()))
87+
.andExpect(jsonPath("$.job").value(request.getJob()))
88+
.andExpect(jsonPath("$.course").value(request.getCourse()));
9289
}
9390

9491
private TokenPair genTokenPair(Long memberId) {

‎NBE_5_7_2_02TEAM/src/test/java/io/twogether/nbe_5_7_2_02team/oauth/service/OAuthServiceTest.java‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
//package io.twogether.nbe_5_7_2_02team.oauth.service;
2-
//
3-
//import static org.assertj.core.api.Assertions.assertThat;
4-
//import static org.junit.jupiter.api.Assertions.*;
5-
//import static org.mockito.ArgumentMatchers.eq;
6-
//import static org.mockito.Mockito.doReturn;
7-
//import static org.mockito.Mockito.when;
8-
//
9-
//import io.twogether.nbe_5_7_2_02team.browser.template.BrowserTestTemplate;
10-
//import io.twogether.nbe_5_7_2_02team.global.annotation.FlywayReset;
11-
//import io.twogether.nbe_5_7_2_02team.member.dao.MemberRepository;
12-
//import io.twogether.nbe_5_7_2_02team.member.domain.Member;
13-
//import io.twogether.nbe_5_7_2_02team.member.domain.Role;
14-
//import io.twogether.nbe_5_7_2_02team.member.dto.response.LoginResponse;
15-
//import io.twogether.nbe_5_7_2_02team.oauth.dto.response.GitHubUserInfoResponse;
16-
//import io.twogether.nbe_5_7_2_02team.oauth.jwt.JwtTokenProvider;
17-
//import java.util.List;
18-
//import java.util.Optional;
19-
//import org.junit.jupiter.api.BeforeEach;
20-
//import org.junit.jupiter.api.DisplayName;
21-
//import org.junit.jupiter.api.Test;
22-
//import org.springframework.beans.factory.annotation.Autowired;
23-
//import org.springframework.boot.test.context.SpringBootTest;
24-
//import org.springframework.test.context.bean.override.mockito.MockitoBean;
25-
//import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
26-
//import org.springframework.transaction.annotation.Transactional;
27-
//import org.springframework.web.client.RestTemplate;
28-
//import org.testcontainers.shaded.org.checkerframework.checker.units.qual.A;
29-
//
30-
//
31-
//@FlywayReset
32-
//@SpringBootTest
33-
//@Transactional
34-
//class OAuthServiceTest extends BrowserTestTemplate {
1+
// package io.twogether.nbe_5_7_2_02team.oauth.service;
2+
//
3+
// import static org.assertj.core.api.Assertions.assertThat;
4+
// import static org.junit.jupiter.api.Assertions.*;
5+
// import static org.mockito.ArgumentMatchers.eq;
6+
// import static org.mockito.Mockito.doReturn;
7+
// import static org.mockito.Mockito.when;
8+
//
9+
// import io.twogether.nbe_5_7_2_02team.browser.template.BrowserTestTemplate;
10+
// import io.twogether.nbe_5_7_2_02team.global.annotation.FlywayReset;
11+
// import io.twogether.nbe_5_7_2_02team.member.dao.MemberRepository;
12+
// import io.twogether.nbe_5_7_2_02team.member.domain.Member;
13+
// import io.twogether.nbe_5_7_2_02team.member.domain.Role;
14+
// import io.twogether.nbe_5_7_2_02team.member.dto.response.LoginResponse;
15+
// import io.twogether.nbe_5_7_2_02team.oauth.dto.response.GitHubUserInfoResponse;
16+
// import io.twogether.nbe_5_7_2_02team.oauth.jwt.JwtTokenProvider;
17+
// import java.util.List;
18+
// import java.util.Optional;
19+
// import org.junit.jupiter.api.BeforeEach;
20+
// import org.junit.jupiter.api.DisplayName;
21+
// import org.junit.jupiter.api.Test;
22+
// import org.springframework.beans.factory.annotation.Autowired;
23+
// import org.springframework.boot.test.context.SpringBootTest;
24+
// import org.springframework.test.context.bean.override.mockito.MockitoBean;
25+
// import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
26+
// import org.springframework.transaction.annotation.Transactional;
27+
// import org.springframework.web.client.RestTemplate;
28+
// import org.testcontainers.shaded.org.checkerframework.checker.units.qual.A;
29+
//
30+
//
31+
// @FlywayReset
32+
// @SpringBootTest
33+
// @Transactional
34+
// class OAuthServiceTest extends BrowserTestTemplate {
3535
//
3636
// @Autowired
3737
// JwtTokenProvider jwtTokenProvider;
@@ -75,4 +75,4 @@
7575
//
7676
// }
7777
//
78-
//}
78+
// }

‎NBE_5_7_2_02TEAM/src/test/java/io/twogether/nbe_5_7_2_02team/oauth/service/TokenServiceTest.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.junit.jupiter.api.Assertions.*;
44

55
import com.github.database.rider.core.api.dataset.DataSet;
6-
import com.github.database.rider.spring.api.DBRider;
6+
77
import io.twogether.nbe_5_7_2_02team.browser.template.BrowserTestTemplate;
88
import io.twogether.nbe_5_7_2_02team.global.annotation.FlywayReset;
99
import io.twogether.nbe_5_7_2_02team.member.dao.MemberRepository;
@@ -12,8 +12,7 @@
1212
import io.twogether.nbe_5_7_2_02team.oauth.dao.RefreshTokenRepository;
1313
import io.twogether.nbe_5_7_2_02team.oauth.domain.RefreshToken;
1414
import io.twogether.nbe_5_7_2_02team.oauth.dto.common.TokenPair;
15-
import io.twogether.nbe_5_7_2_02team.oauth.jwt.JwtTokenProvider;
16-
import org.junit.jupiter.api.DisplayName;
15+
1716
import org.junit.jupiter.api.Test;
1817
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.boot.test.context.SpringBootTest;
@@ -24,14 +23,10 @@
2423
@Transactional
2524
class TokenServiceTest extends BrowserTestTemplate {
2625

27-
@Autowired
28-
MemberRepository memberRepository;
29-
@Autowired
30-
TokenService tokenService;
31-
@Autowired
32-
RefreshTokenBlackListRepository refreshTokenBlackListRepository;
33-
@Autowired
34-
RefreshTokenRepository refreshTokenRepository;
26+
@Autowired MemberRepository memberRepository;
27+
@Autowired TokenService tokenService;
28+
@Autowired RefreshTokenBlackListRepository refreshTokenBlackListRepository;
29+
@Autowired RefreshTokenRepository refreshTokenRepository;
3530

3631
@Test
3732
@DataSet(value = "datasets/v2/member.yml", cleanBefore = true, cleanAfter = true)
@@ -55,13 +50,10 @@ void logout_success() throws Exception {
5550
RefreshToken refreshToken = refreshTokenRepository.findByMemberId(1L).orElseThrow();
5651

5752
assertNotNull(refreshTokenBlackListRepository.findByRefreshTokenId(refreshToken.getId()));
58-
59-
6053
}
6154

6255
private TokenPair genTokenPair(Long memberId) {
6356
Member member = memberRepository.findById(memberId).orElseThrow();
6457
return jwtTokenProvider.generateTokenPair(member);
6558
}
66-
67-
}
59+
}

0 commit comments

Comments
 (0)