Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/320 auth memberid #355

Merged
merged 20 commits into from
Sep 15, 2022
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7c37505
chore: 불필요한 import 구문 제거
tco0427 Sep 7, 2022
1a54d82
refactor: MemberService memberId 받도록 변경 & MemberData `memberId` 를 담아서 반환
tco0427 Sep 7, 2022
13302c5
refactor: ReferenceRoom `memberId` 사용하도록 변경
tco0427 Sep 7, 2022
4283368
refactor: SearchingReferenceRoom `memberId` 사용하도록 변경
tco0427 Sep 7, 2022
55b994e
refactor: Review `memberId` 사용하도록 변경
tco0427 Sep 7, 2022
dd067ad
refactor: Study `memberId` 사용하도록 변경
tco0427 Sep 7, 2022
f842f38
refactor: AuthenticationPrincipal 제거
tco0427 Sep 7, 2022
4bb0cbf
refactor: 액세스 토큰 재발급 memberId 사용
tco0427 Sep 13, 2022
6452b45
refactor: token 엔티티 memberId 가지도록 수정
tco0427 Sep 13, 2022
965e9ee
fix: Auth 인수 테스트 수정
tco0427 Sep 13, 2022
30c3413
feat: 사용하지 않는 필드 제거 및 DB 조회 최소화
tco0427 Sep 14, 2022
9f57a82
refactor: orElseThrow 예외 타입 명시
tco0427 Sep 14, 2022
0cd2733
test: orElseThrow -> get 으로 수정
tco0427 Sep 14, 2022
624d511
refactor: 스터디장 Fixture 제거
tco0427 Sep 14, 2022
ae13bf9
chore: 코드 냄새 제거
tco0427 Sep 15, 2022
3a6aca7
feta: 충돌 해결
tco0427 Sep 15, 2022
bfad90d
Merge branch 'develop' into refactor/320-auth-memberid
tco0427 Sep 15, 2022
b52a673
Merge branch 'develop' of https://github.com/woowacourse-teams/2022-m…
tco0427 Sep 15, 2022
2c1dcd8
feat: 로그 추가
tco0427 Sep 15, 2022
a47f96c
test: 테스트 수정
tco0427 Sep 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: orElseThrow 예외 타입 명시
tco0427 committed Sep 14, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 9f57a82cfef7704dabefe47f6e3cd18491c1e93c
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
import com.woowacourse.moamoa.auth.service.response.AccessTokenResponse;
import com.woowacourse.moamoa.auth.service.response.TokensResponse;
import com.woowacourse.moamoa.common.exception.UnauthorizedException;
import com.woowacourse.moamoa.member.domain.repository.MemberRepository;
import com.woowacourse.moamoa.member.service.MemberService;
import com.woowacourse.moamoa.member.service.response.MemberResponse;
import java.util.Optional;
@@ -26,7 +25,6 @@ public class AuthService {
private final TokenProvider tokenProvider;
private final OAuthClient oAuthClient;
private final TokenRepository tokenRepository;
private final MemberRepository memberRepository;

@Transactional
public TokensResponse createToken(final String code) {
Original file line number Diff line number Diff line change
@@ -19,9 +19,11 @@
import com.woowacourse.acceptance.AcceptanceTest;
import com.woowacourse.moamoa.auth.domain.Token;
import com.woowacourse.moamoa.auth.domain.repository.TokenRepository;
import com.woowacourse.moamoa.auth.exception.TokenNotFoundException;
import com.woowacourse.moamoa.auth.service.oauthclient.response.GithubProfileResponse;
import com.woowacourse.moamoa.member.domain.Member;
import com.woowacourse.moamoa.member.domain.repository.MemberRepository;
import com.woowacourse.moamoa.member.service.exception.MemberNotFoundException;
import io.restassured.RestAssured;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
@@ -69,8 +71,10 @@ void getJwtToken() throws JsonProcessingException {
@Test
void refreshToken() {
final String token = getBearerTokenBySignInOrUp(new GithubProfileResponse(4L, "verus", "https://image", "github.com"));
final Member member = memberRepository.findByGithubId(4L).orElseThrow();
final Token foundToken = tokenRepository.findByMemberId(member.getId()).orElseThrow();
final Member member = memberRepository.findByGithubId(4L)
.orElseThrow(MemberNotFoundException::new);
final Token foundToken = tokenRepository.findByMemberId(member.getId())
.orElseThrow(TokenNotFoundException::new);

RestAssured.given(spec).log().all()
.filter(document("auth/refresh",
@@ -89,8 +93,10 @@ void refreshToken() {
@Test
void logout() {
final String token = getBearerTokenBySignInOrUp(new GithubProfileResponse(4L, "verus", "https://image", "github.com"));
final Member member = memberRepository.findByGithubId(4L).orElseThrow();
final Token foundToken = tokenRepository.findByMemberId(member.getId()).get();
final Member member = memberRepository.findByGithubId(4L)
.orElseThrow(MemberNotFoundException::new);
final Token foundToken = tokenRepository.findByMemberId(member.getId())
.orElseThrow(TokenNotFoundException::new);

RestAssured.given(spec).log().all()
.filter(document("auth/logout",
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@

import com.woowacourse.moamoa.auth.domain.Token;
import com.woowacourse.moamoa.auth.domain.repository.TokenRepository;
import com.woowacourse.moamoa.auth.exception.TokenNotFoundException;
import com.woowacourse.moamoa.auth.infrastructure.TokenProvider;
import com.woowacourse.moamoa.auth.service.oauthclient.OAuthClient;
import com.woowacourse.moamoa.auth.service.oauthclient.response.GithubProfileResponse;
@@ -19,6 +20,7 @@
import com.woowacourse.moamoa.member.domain.repository.MemberRepository;
import com.woowacourse.moamoa.member.query.MemberDao;
import com.woowacourse.moamoa.member.service.MemberService;
import com.woowacourse.moamoa.member.service.exception.MemberNotFoundException;
import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -51,7 +53,7 @@ void setUp() {
memberService = new MemberService(memberRepository, memberDao);
tokenProvider = Mockito.mock(TokenProvider.class);
oAuthClient = Mockito.mock(OAuthClient.class);
authService = new AuthService(memberService, tokenProvider, oAuthClient, tokenRepository, memberRepository);
authService = new AuthService(memberService, tokenProvider, oAuthClient, tokenRepository);

Mockito.when(oAuthClient.getAccessToken("authorization-code")).thenReturn("access-token");
Mockito.when(oAuthClient.getProfile("access-token"))
@@ -66,8 +68,10 @@ void setUp() {
@Test
void saveRefreshToken() {
authService.createToken("authorization-code");
final Member member = memberRepository.findByGithubId(1L).orElseThrow();
final Token token = tokenRepository.findByMemberId(member.getId()).orElseThrow();
final Member member = memberRepository.findByGithubId(1L)
.orElseThrow(MemberNotFoundException::new);
final Token token = tokenRepository.findByMemberId(member.getId())
.orElseThrow(TokenNotFoundException::new);

assertThat(token.getRefreshToken()).isEqualTo("refreshToken");
}
@@ -76,8 +80,10 @@ void saveRefreshToken() {
@Test
void updateRefreshToken() {
authService.createToken("authorization-code");
final Member member = memberRepository.findByGithubId(1L).orElseThrow();
final Token token = tokenRepository.findByMemberId(member.getId()).orElseThrow();
final Member member = memberRepository.findByGithubId(1L)
.orElseThrow(MemberNotFoundException::new);
final Token token = tokenRepository.findByMemberId(member.getId())
.orElseThrow(TokenNotFoundException::new);
final String refreshToken = token.getRefreshToken();

final AccessTokenResponse accessTokenResponse = authService.refreshToken(member.getId(), refreshToken);
@@ -96,8 +102,10 @@ void validateRefreshToken() {
@Test
void recreationAccessToken() {
authService.createToken("authorization-code");
final Member member = memberRepository.findByGithubId(1L).orElseThrow();
final Token token = tokenRepository.findByMemberId(member.getId()).orElseThrow();
final Member member = memberRepository.findByGithubId(1L)
.orElseThrow(MemberNotFoundException::new);
final Token token = tokenRepository.findByMemberId(member.getId())
.orElseThrow(TokenNotFoundException::new);

assertDoesNotThrow(() -> authService.refreshToken(member.getId(), token.getRefreshToken()));
}
@@ -106,8 +114,10 @@ void recreationAccessToken() {
@Test
void logout() {
authService.createToken("authorization-code");
final Member member = memberRepository.findByGithubId(1L).orElseThrow();
final Token token = tokenRepository.findByMemberId(member.getId()).orElseThrow();
final Member member = memberRepository.findByGithubId(1L)
.orElseThrow(MemberNotFoundException::new);
final Token token = tokenRepository.findByMemberId(member.getId())
.orElseThrow(TokenNotFoundException::new);

authService.logout(member.getId());