Skip to content

Fix: oauth 로그인 시 회원을 찾지 못한 경우에 반환하는 에러 타입을 변경 #307

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Fix: oauth 로그인 시 회원을 찾지 못한 경우에 반환하는 에러 타입을 변경 #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/com/dnd/runus/application/oauth/SocialProfileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import com.dnd.runus.domain.member.SocialProfileRepository;
import com.dnd.runus.global.constant.MemberRole;
import com.dnd.runus.global.constant.SocialType;
import com.dnd.runus.global.exception.NotFoundException;
import com.dnd.runus.global.exception.BusinessException;
import com.dnd.runus.global.exception.type.ErrorType;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -30,7 +31,8 @@ public boolean isSocialMemberExists(SocialType socialType, String oauthId, long
public SocialProfile findOrThrow(SocialType socialType, String oauthId, String email) {
SocialProfile socialProfile = socialProfileRepository
.findBySocialTypeAndOauthId(socialType, oauthId)
.orElseThrow(() -> new NotFoundException(SocialProfile.class, oauthId));
.orElseThrow(() ->
new BusinessException(ErrorType.SOCIAL_MEMBER_NOT_FOUND, socialType + ", oauthId: " + oauthId));

updateEmailIfChanged(socialProfile, email);
return socialProfile;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dnd/runus/global/exception/type/ErrorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public enum ErrorType {
INVALID_CREDENTIALS(UNAUTHORIZED, DEBUG, "AUTH_008", "해당 사용자의 정보가 없거나 일치하지 않아 처리할 수 없습니다"),

// OauthErrorType
USER_NOT_FOUND(NOT_FOUND, DEBUG, "OAUTH_001", "존재하지 않은 사용자 입니다"),
SOCIAL_MEMBER_NOT_FOUND(NOT_FOUND, DEBUG, "OAUTH_001", "찾을 수 없는 소셜 회원입니다"),

// DatabaseErrorType
ENTITY_NOT_FOUND(NOT_FOUND, DEBUG, "DB_001", "해당 엔티티를 찾을 수 없습니다"),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dnd/runus/presentation/v1/oauth/OauthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class OauthController {
""")
@ApiErrorType({
ErrorType.UNSUPPORTED_SOCIAL_TYPE,
ErrorType.USER_NOT_FOUND,
ErrorType.SOCIAL_MEMBER_NOT_FOUND,
ErrorType.FAILED_AUTHENTICATION,
ErrorType.UNSUPPORTED_JWT_TOKEN
})
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/dnd/runus/application/oauth/OauthServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void socialProfile_exist_then_signIn_success() {
}

@Test
@DisplayName("sign-in 시 socialProfile이 없다면 에러 타입이 USER_NOT_FOUND인 BusinessException 에러 발생")
@DisplayName("sign-in 시 socialProfile이 없다면 에러 타입이 SOCIAL_MEMBER_NOT_FOUND인 BusinessException 에러 발생")
void socialProfile_not_exist_then_signIn_fail() {
// given
SignInRequest request = new SignInRequest(socialType, idToken);
Expand All @@ -117,11 +117,11 @@ void socialProfile_not_exist_then_signIn_fail() {
given(claims.getSubject()).willReturn(oauthId);
given(claims.get("email")).willReturn(email);
given(socialProfileService.findOrThrow(socialType, oauthId, email))
.willThrow(new BusinessException(ErrorType.USER_NOT_FOUND));
.willThrow(new BusinessException(ErrorType.SOCIAL_MEMBER_NOT_FOUND));

// when, then
BusinessException exception = assertThrows(BusinessException.class, () -> oauthService.signIn(request));
assertEquals(ErrorType.USER_NOT_FOUND, exception.getType());
assertEquals(ErrorType.SOCIAL_MEMBER_NOT_FOUND, exception.getType());
}

@Test
Expand Down