Skip to content

Commit e6fb59d

Browse files
authored
Merge pull request #101 from MT-TEAM-Org/fix/social-login
fix: 소셜로그인 대응
2 parents 0b0af8d + 9866cc5 commit e6fb59d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/org/myteam/server/oauth2/handler/CustomOauth2SuccessHandler.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
7777
log.warn("cookieValue PublicId 확인용: {}", member.getPublicId());
7878

7979
// 24 시간 유효한 리프레시 토큰을 생성
80-
response.addCookie(createCookie(REFRESH_TOKEN_KEY, refreshToken, TOKEN_REISSUE_PATH, 24 * 60 * 60, true, extractDomain(request.getServerName())));
81-
response.addCookie(createCookie(REFRESH_TOKEN_KEY, refreshToken, LOGOUT_PATH, 24 * 60 * 60, true, extractDomain(request.getServerName())));
82-
String redirectUrl = String.format("%s%s?status=%s&email=%s", frontUrl, frontSignUpPath, PENDING.name(), email);
80+
response.addCookie(createCookie(REFRESH_TOKEN_KEY, refreshToken, TOKEN_REISSUE_PATH, 24 * 60 * 60, true, request.getServerName()));
81+
response.addCookie(createCookie(REFRESH_TOKEN_KEY, refreshToken, LOGOUT_PATH, 24 * 60 * 60, true, request.getServerName()));
82+
// String redirectUrl = String.format("%s?status=%s&email=%s", frontUrl, PENDING.name(), email);
83+
String redirectUrl = String.format("%s?refreshToken=%s", frontUrl, refreshToken);
8384
log.info("redirectUrl: {}", redirectUrl);
8485
response.sendRedirect(redirectUrl);
8586
return;

src/main/java/org/myteam/server/oauth2/response/KakaoResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ private Map<String, Object> kakaoProfile(Map<String, Object> attr) {
5252

5353
@Override
5454
public String getProviderId() {
55-
return StringUtils.defaultString((String) attribute.get("id"), null);
55+
Object id = attribute.get("id");
56+
return id != null ? String.valueOf(id) : null;
5657
}
5758

5859
@Override

0 commit comments

Comments
 (0)