Skip to content

[REFAC] 로그인 처리 코드 서버 로그 찍기 #18

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
rhkr8521 merged 1 commit into from
Dec 17, 2025
Merged

[REFAC] 로그인 처리 코드 서버 로그 찍기 #18

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
26 changes: 4 additions & 22 deletions src/main/java/com/moongeul/backend/api/member/service/GoogleOAuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import com.moongeul.backend.api.member.dto.GoogleInfoResponseDTO;
import com.moongeul.backend.api.member.dto.AccessTokenResponseDTO;
import com.moongeul.backend.common.exception.BadRequestException;
import com.moongeul.backend.common.exception.InternalServerException;
import com.moongeul.backend.common.exception.UnauthorizedException;
import com.moongeul.backend.common.response.ErrorStatus;
import com.moongeul.backend.common.config.webclient.WebClientErrorHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
Expand All @@ -28,6 +25,7 @@ public class GoogleOAuthService {

private static final String GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token";
private static final String GOOGLE_USERINFO_URL = "https://www.googleapis.com/oauth2/v3/userinfo";

private final WebClient webClient;

@Value("${spring.security.oauth2.client.registration.google.client-id}")
Expand Down Expand Up @@ -64,15 +62,7 @@ public AccessTokenResponseDTO getGoogleToken(String code) {
.contentType(MediaType.APPLICATION_FORM_URLENCODED)
.body(BodyInserters.fromFormData(params))
.retrieve()
.onStatus(status -> status.value() == 401, response -> {
throw new UnauthorizedException(ErrorStatus.AUTH_UNAUTHORIZED.getMessage());
})
.onStatus(HttpStatusCode::is4xxClientError, response -> {
throw new BadRequestException(ErrorStatus.INVALID_TOKEN_REQUEST.getMessage());
})
.onStatus(HttpStatusCode::is5xxServerError, response -> {
throw new InternalServerException(ErrorStatus.SERVER_ERROR.getMessage());
})
.onStatus(HttpStatusCode::isError, res -> WebClientErrorHandler.handleApiError(res, "getGoogleToken"))
.bodyToMono(AccessTokenResponseDTO.class)
.block();
}
Expand All @@ -85,15 +75,7 @@ public GoogleInfoResponseDTO getGoogleUserInfo(String googleAccessToken) {
.header(HttpHeaders.AUTHORIZATION, "Bearer " + googleAccessToken)
.accept(MediaType.APPLICATION_JSON)
.retrieve()
.onStatus(status -> status.value() == 401, response -> {
throw new UnauthorizedException(ErrorStatus.AUTH_UNAUTHORIZED.getMessage());
})
.onStatus(HttpStatusCode::is4xxClientError, response -> {
throw new BadRequestException(ErrorStatus.INVALID_INFO_REQUEST.getMessage());
})
.onStatus(HttpStatusCode::is5xxServerError, response -> {
throw new InternalServerException(ErrorStatus.SERVER_ERROR.getMessage());
})
.onStatus(HttpStatusCode::isError, res -> WebClientErrorHandler.handleApiError(res, "getGoogleUserInfo"))
.bodyToMono(GoogleInfoResponseDTO.class)
.block(); // 동기 방식으로 결과 대기
}
Expand Down
25 changes: 3 additions & 22 deletions src/main/java/com/moongeul/backend/api/member/service/KakaoOAuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import com.moongeul.backend.api.member.dto.AccessTokenResponseDTO;
import com.moongeul.backend.api.member.dto.KakaoInfoResponseDTO;
import com.moongeul.backend.common.exception.BadRequestException;
import com.moongeul.backend.common.exception.InternalServerException;
import com.moongeul.backend.common.exception.UnauthorizedException;
import com.moongeul.backend.common.response.ErrorStatus;
import com.moongeul.backend.common.config.webclient.WebClientErrorHandler;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
Expand Down Expand Up @@ -51,15 +48,7 @@ public AccessTokenResponseDTO getKakaoToken(String code){
.contentType(MediaType.APPLICATION_FORM_URLENCODED)
.body(BodyInserters.fromFormData(params))
.retrieve()
.onStatus(status -> status.value() == 401, response -> {
throw new UnauthorizedException(ErrorStatus.AUTH_UNAUTHORIZED.getMessage());
})
.onStatus(HttpStatusCode::is4xxClientError, response -> {
throw new BadRequestException(ErrorStatus.INVALID_TOKEN_REQUEST.getMessage());
})
.onStatus(HttpStatusCode::is5xxServerError, response -> {
throw new InternalServerException(ErrorStatus.SERVER_ERROR.getMessage());
})
.onStatus(HttpStatusCode::isError, res -> WebClientErrorHandler.handleApiError(res, "getKakaoToken"))
.bodyToMono(AccessTokenResponseDTO.class)
.block();
}
Expand All @@ -72,15 +61,7 @@ public KakaoInfoResponseDTO getKakaoUserInfo(String kakaoAccessToken){
.header(HttpHeaders.AUTHORIZATION, "Bearer " + kakaoAccessToken)
.accept(MediaType.APPLICATION_JSON)
.retrieve()
.onStatus(status -> status.value() == 401, response -> {
throw new UnauthorizedException(ErrorStatus.AUTH_UNAUTHORIZED.getMessage());
})
.onStatus(HttpStatusCode::is4xxClientError, response -> {
throw new BadRequestException(ErrorStatus.INVALID_INFO_REQUEST.getMessage());
})
.onStatus(HttpStatusCode::is5xxServerError, response -> {
throw new InternalServerException(ErrorStatus.SERVER_ERROR.getMessage());
})
.onStatus(HttpStatusCode::isError, res -> WebClientErrorHandler.handleApiError(res, "getKakaoUserInfo"))
.bodyToMono(KakaoInfoResponseDTO.class)
.block(); // 동기 방식으로 결과 대기
}
Expand Down
29 changes: 29 additions & 0 deletions src/main/java/com/moongeul/backend/common/config/webclient/WebClientErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.moongeul.backend.common.config.webclient;

import com.moongeul.backend.common.exception.BadRequestException;
import com.moongeul.backend.common.exception.InternalServerException;
import com.moongeul.backend.common.exception.UnauthorizedException;
import com.moongeul.backend.common.response.ErrorStatus;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.reactive.function.client.ClientResponse;
import reactor.core.publisher.Mono;

@Slf4j
public class WebClientErrorHandler {

public static Mono<Throwable> handleApiError(ClientResponse response, String apiName) {
return response.bodyToMono(String.class)
.defaultIfEmpty("No error body content")
.flatMap(errorBody -> {
log.error("[{}] API Error: Status Code: {}, Body: {}", apiName, response.statusCode(), errorBody);

if (response.statusCode().value() == 401) {
return Mono.error(new UnauthorizedException(ErrorStatus.AUTH_UNAUTHORIZED.getMessage()));
} else if (response.statusCode().is4xxClientError()) {
return Mono.error(new BadRequestException(ErrorStatus.INVALID_TOKEN_REQUEST.getMessage()));
} else {
return Mono.error(new InternalServerException(ErrorStatus.SERVER_ERROR.getMessage()));
}
});
}
}