diff --git a/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCase.java b/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCase.java index 1fae2d00..e50b84a4 100644 --- a/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCase.java +++ b/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCase.java @@ -4,5 +4,5 @@ public interface OAuth2UseCase { - UserKakaoLoginResponse kakaoLogin(String code); + UserKakaoLoginResponse kakaoLogin(String code, String redirectUri); } diff --git a/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCaseImpl.java b/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCaseImpl.java index 19ab66cb..d6c503ea 100644 --- a/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCaseImpl.java +++ b/src/main/java/leets/bookmark/global/auth/oauth2/application/usecase/OAuth2UseCaseImpl.java @@ -26,8 +26,8 @@ public class OAuth2UseCaseImpl implements OAuth2UseCase { @Transactional @Override - public UserKakaoLoginResponse kakaoLogin(String code) { - KakaoTokenResponse kakaoToken = kakaoGetService.getTokenFromKakao(code); + public UserKakaoLoginResponse kakaoLogin(String code, String redirectUri) { + KakaoTokenResponse kakaoToken = kakaoGetService.getTokenFromKakao(code, redirectUri); KakaoUserInfoResponse kakaoUserInfo = kakaoGetService.getUserInfo(kakaoToken.accessToken()); User user = userSaveService.save(kakaoUserInfo); diff --git a/src/main/java/leets/bookmark/global/auth/oauth2/service/KakaoGetService.java b/src/main/java/leets/bookmark/global/auth/oauth2/service/KakaoGetService.java index e80495c3..cdb9fc29 100644 --- a/src/main/java/leets/bookmark/global/auth/oauth2/service/KakaoGetService.java +++ b/src/main/java/leets/bookmark/global/auth/oauth2/service/KakaoGetService.java @@ -6,7 +6,6 @@ import leets.bookmark.global.auth.oauth2.application.exception.KakaoAuthorizationCodeInvalidException; import leets.bookmark.global.auth.oauth2.application.exception.KakaoServerException; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatusCode; import org.springframework.stereotype.Service; @@ -15,15 +14,12 @@ import static org.springframework.http.HttpHeaders.*; -@Slf4j @Service @RequiredArgsConstructor public class KakaoGetService { @Value("${spring.security.oauth2.client.registration.kakao.client-id}") private String clientId; - @Value("${spring.security.oauth2.client.registration.kakao.redirect-uri}") - private String redirectUri; @Value("${spring.security.oauth2.client.provider.kakao.token-uri}") private String tokenUri; @Value("${spring.security.oauth2.client.provider.kakao.user-info-uri}") @@ -32,7 +28,7 @@ public class KakaoGetService { public static final String BEARER = "Bearer "; public static final String APPLICATION_X_WWW_FORM_URLENCODED_CHARSET_UTF_8 = "application/x-www-form-urlencoded;charset=utf-8"; - public KakaoTokenResponse getTokenFromKakao(String code) { + public KakaoTokenResponse getTokenFromKakao(String code, String redirectUri) { return WebClient.create(tokenUri).post() .uri(uriBuilder -> uriBuilder .queryParam("grant_type", "authorization_code") diff --git a/src/main/java/leets/bookmark/global/auth/presentation/AuthController.java b/src/main/java/leets/bookmark/global/auth/presentation/AuthController.java index 823a229f..39f702ab 100644 --- a/src/main/java/leets/bookmark/global/auth/presentation/AuthController.java +++ b/src/main/java/leets/bookmark/global/auth/presentation/AuthController.java @@ -29,8 +29,8 @@ public CommonResponse reissue(@Validated @RequestBody JwtTokenReiss } @GetMapping("/login/kakao") - public CommonResponse kakaoLogin(@RequestParam("code") String code) { - UserKakaoLoginResponse response = oAuth2UseCase.kakaoLogin(code); + public CommonResponse kakaoLogin(@RequestParam("code") String code, @RequestParam("redirectUri") String redirectUri) { + UserKakaoLoginResponse response = oAuth2UseCase.kakaoLogin(code, redirectUri); return CommonResponse.createSuccess(KAKAO_LOGIN_SUCCESS.getMessage(), response); } }