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.

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

Jump to bottom

kakao 사용자 정보 받아오는 response 변경 #772

Merged
merged 5 commits into from
Jan 4, 2024
Merged

kakao 사용자 정보 받아오는 response 변경 #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fe11b1
refactor: secure resources 쿼리 파라미터 설정
mcodnjs Dec 26, 2023
40721c9
refactor: 카카오 사용자 정보 가져오기 응답값 수정
mcodnjs Dec 26, 2023
40374e9
refactor: KakaoProfile 내부 클래스 추가
mcodnjs Jan 2, 2024
4d822b4
refactor: 쿼리 파라미터 값 타입 변경
mcodnjs Jan 2, 2024
9893238
refactor: 쿼리 파라미터 값 타입 변경
mcodnjs Jan 2, 2024
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
10 changes: 9 additions & 1 deletion backend/src/main/java/hanglog/login/infrastructure/oauthprovider/KakaoOauthProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

import static hanglog.global.exception.ExceptionCode.INVALID_AUTHORIZATION_CODE;
import static hanglog.global.exception.ExceptionCode.NOT_SUPPORTED_OAUTH_SERVICE;
import static java.lang.Boolean.TRUE;

import hanglog.global.exception.AuthException;
import hanglog.login.domain.OauthAccessToken;
import hanglog.login.domain.OauthProvider;
import hanglog.login.domain.OauthUserInfo;
import hanglog.login.infrastructure.oauthuserinfo.KakaoUserInfo;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
Expand All @@ -24,6 +27,7 @@ public class KakaoOauthProvider implements OauthProvider {

private static final String PROPERTIES_PATH = "${oauth2.provider.kakao.";
private static final String PROVIDER_NAME = "kakao";
private static final String SECURE_RESOURCE = "secure_resource";

protected final String clientId;
protected final String clientSecret;
Expand Down Expand Up @@ -57,11 +61,15 @@ public OauthUserInfo getUserInfo(final String code) {
headers.setBearerAuth(accessToken);
final HttpEntity<MultiValueMap<String, String>> userInfoRequestEntity = new HttpEntity<>(headers);

final Map<String, Boolean> queryParam = new HashMap<>();
queryParam.put(SECURE_RESOURCE, TRUE);

final ResponseEntity<KakaoUserInfo> response = restTemplate.exchange(
userUri,
HttpMethod.GET,
userInfoRequestEntity,
KakaoUserInfo.class
KakaoUserInfo.class,
queryParam
);

if (response.getStatusCode().is2xxSuccessful()) {
Expand Down
22 changes: 15 additions & 7 deletions backend/src/main/java/hanglog/login/infrastructure/oauthuserinfo/KakaoUserInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class KakaoUserInfo implements OauthUserInfo {

@JsonProperty("id")
private String socialLoginId;
@JsonProperty("properties")
private Properties properties;
@JsonProperty("kakao_account")
private KakaoAccount kakaoAccount;

@Override
public String getSocialLoginId() {
Expand All @@ -23,20 +23,28 @@ public String getSocialLoginId() {

@Override
public String getNickname() {
return properties.name;
return kakaoAccount.kakaoProfile.nickname;
}

@Override
public String getImageUrl() {
return properties.image;
return kakaoAccount.kakaoProfile.image;
}

@NoArgsConstructor(access = PRIVATE)
private static class Properties {
private static class KakaoAccount {

@JsonProperty("profile")
private KakaoProfile kakaoProfile;
}

@NoArgsConstructor(access = PRIVATE)
private static class KakaoProfile {

@JsonProperty("nickname")
private String name;
@JsonProperty("profile_image")
private String nickname;

@JsonProperty("profile_image_url")
private String image;
}
}