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/#121]: AuthServiceImpl 리팩토링: 메서드 명명 일관성 및 트랜잭션 관리 개선 #130

Merged
merged 2 commits into from
Sep 11, 2024
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,28 @@ public SignUpResponseDto signUp(String authId, SignUpRequestDto request) {

User user = createUser(requestDto);

Token token = getToken(user);
Token token = getFullToken(user);

return createSignUpResponseDto(token, user);
}

@Override
@Transactional
public void signOut(long userId) {
val user = findUser(userId);
val user = findUserById(userId);
user.resetRefreshToken();
}

@Override
@Transactional
public void withdraw(long userId) {
val user = findUser(userId);
val user = findUserById(userId);
deleteUser(user);
}

@Override
public AccessTokenGetResponseDto reissueToken(String refreshToken) {
val user = findUser(refreshToken);
val user = findUserByRefreshToken(refreshToken);
Token accessToken = getAccessToken(user);
return AccessTokenGetResponseDto.of(accessToken);
}
Expand All @@ -101,12 +101,13 @@ public void connectFilterToUser(long userId, long filterId) {
userRepository.save(user);
}

private Optional<User> findUserByAuthIdAndType(String authId, AuthType authType) {
protected Optional<User> findUserByAuthIdAndType(String authId, AuthType authType) {
return userRepository.findByAuthIdAndAuthType(authId, authType);
}

private SignInResponseDto createSignInResponseForExistingUser(User user, String authId, AuthType authType) {
Token token = getToken(user);
@Transactional
protected SignInResponseDto createSignInResponseForExistingUser(User user, String authId, AuthType authType) {
Token token = getFullToken(user);
user.updateRefreshToken(token.getRefreshToken());
return SignInResponseDto.of(
token,
Expand All @@ -127,7 +128,7 @@ private String getAuthId(AuthType authType, String authAccessToken) {
};
}

private Token getToken(User user) {
private Token getFullToken(User user) {
String accessToken = createAccessToken(new UserAuthentication(user.getId(), null, null));
String refreshToken = createRefreshToken(new UserAuthentication(user.getId(), null, null));

Expand Down Expand Up @@ -178,15 +179,16 @@ private String createRefreshToken(Authentication authentication) {
return jwtTokenProvider.generateToken(authentication, valueConfig.getRefreshTokenExpired());
}

private User findUser(long id) {
private User findUserById(long id) {
return userRepository.findById(id).orElseThrow(() -> new CustomException(INVALID_USER));
}

private User findUser(String refreshToken) {
private User findUserByRefreshToken(String refreshToken) {
return userRepository.findByRefreshToken(getTokenFromBearerString(refreshToken))
.orElseThrow(() -> new CustomException(INVALID_USER));
}


private String getTokenFromBearerString(String token) {
return token.replaceFirst(ValueConfig.BEARER_HEADER, ValueConfig.BLANK);
}
Expand Down
Loading