Skip to content

Commit 6739e0d

Browse files
committed
refactor : 구글 email null일시 공백 수정, OAuth 리다이렉트 경로 수정
1 parent fda83f7 commit 6739e0d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/main/java/com/back/domain/user/service/UserAuthService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public User joinSocial(String oauthId, String email, String nickname){
9393
String uniqueNickname = generateNickname(nickname);
9494

9595
User user = User.builder()
96-
.email(email)
96+
.email(email != null ? email : "")
9797
.nickname(uniqueNickname)
9898
.abvDegree(0.0)
9999
.createdAt(LocalDateTime.now())
@@ -112,7 +112,8 @@ public RsData<User> findOrCreateOAuthUser(String oauthId, String email, String n
112112
if (existingUser.isPresent()) {
113113
// 기존 사용자 업데이트 (이메일만 업데이트)
114114
User user = existingUser.get();
115-
user.setEmail(email);
115+
// null 체크 후 빈 문자열로 대체
116+
user.setEmail(email != null ? email : "");
116117
return RsData.of(200, "회원 정보가 업데이트 되었습니다", user); //더티체킹
117118
} else {
118119
User newUser = joinSocial(oauthId, email, nickname);

src/main/java/com/back/global/security/CustomOAuth2LoginSuccessHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
3434
// DB에서 isFirstLogin을 false로 업데이트
3535
userAuthService.setFirstLoginFalse(securityUser.getId());
3636
// 첫 로그인이므로 first-user 페이지로 리다이렉트
37-
response.sendRedirect(frontendUrl + "/login/first-user");
37+
response.sendRedirect(frontendUrl + "/login/user/first-user");
3838
} else {
3939
// 기존 사용자는 success 페이지로 리다이렉트
40-
response.sendRedirect(frontendUrl + "/login/success");
40+
response.sendRedirect(frontendUrl + "/login/user/success");
4141
}
4242
}
4343
}

0 commit comments

Comments
 (0)