Skip to content

Develop #94

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
yoursin0330 merged 2 commits into from
Aug 8, 2025
Merged

Develop #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3246cd7
[#73] feat: 카카오 로그인 요청, 저장값 수정
yoursin0330 Aug 8, 2025
bae3168
Merge pull request #93 from 1-team-zzang/feat/user
yoursin0330 Aug 8, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/com/example/calpick/domain/entity/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class User {
private String name;
private String profileUrl;
private String shareToken;
private String idToken; // 카카오 로그인에서 받은 ID 토큰
private Long kakaoId; // 카카오 로그인에서 받은 ID 토큰

@Enumerated(EnumType.STRING)
private UserStatus userStatus;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/example/calpick/domain/repository/UserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

public interface UserRepository extends JpaRepository<User, Long> {
@Query(
value = " select user_id, email, password, name, profile_url, user_status, login_types, created_at, modified_at, deleted_at, share_token, id_token " +
value = " select user_id, email, password, name, profile_url, user_status, login_types, created_at, modified_at, deleted_at, share_token, kakao_id " +
" from users where email=:email",
nativeQuery = true
)
Expand All @@ -21,9 +21,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
int existsByEmail(@Param("email") String email);

@Query(
value = " select user_id, email, password, name, profile_url, user_status, login_types, created_at, modified_at, deleted_at, share_token, id_token " +
" from users where id_token=:idToken",
value = " select user_id, email, password, name, profile_url, user_status, login_types, created_at, modified_at, deleted_at, share_token, kakao_id " +
" from users where kakao_id=:kakaoId",
nativeQuery = true
)
Optional<User> findByUid(@Param("idToken") String idToken);
Optional<User> findByUid(@Param("kakaoId") Long kakaoId);
}
58 changes: 22 additions & 36 deletions src/main/java/com/example/calpick/domain/service/impl/KakaoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
import java.time.LocalDateTime;
import java.util.Set;

@RequiredArgsConstructor
@Service
Expand All @@ -42,27 +41,16 @@ public class KakaoService{
public Mono<LoginResponse> kakaoAuthorize(KakaoCodeRequest request) {
return getKakaoToken(request.getCode()) // 1. 인증 코드로 토큰 발급
.flatMap(tokenResp -> {
String idToken = tokenResp.getIdToken();
if (idToken == null) {
return Mono.error(new CalPickException(ErrorCode.KAKAO_TOKEN_REQUEST_FAILED, "KAKAO Id Token이 없습니다."));
}
// 2. idToken으로 이미 존재하는 사용자인지 DB 조회
return Mono.just(idToken)
.flatMap(uid ->
Mono.justOrEmpty(userRepository.findByUid(uid))
// 3. 이미 존재하는 유저일 경우 로그인으로 넘어감
.flatMap(user -> Mono.just(kakaoLogin(user)))
// 4. 기존 카카오 로그인 유저가 아니므로 정보 받아와서 저장
.switchIfEmpty(
getKakaoUserInfo(tokenResp.getAccessToken())
.flatMap(userInfo->{
return Mono.fromCallable(()->kakaoSignIn(userInfo, idToken));
})
)
);
});


String accessToken = tokenResp.getAccessToken();
if (accessToken==null){
return Mono.error(new CalPickException(ErrorCode.KAKAO_TOKEN_REQUEST_FAILED, "Kakao AccessToken이 없습니다."));
}
// 2. accessToken으로 사용자 정보 요청
return getKakaoUserInfo(accessToken)
.flatMap(userInfo->
Mono.fromCallable(()->kakaoSignIn(userInfo))
);
});
}

// 인증 코드로 토큰 요청 받기
Expand All @@ -81,7 +69,7 @@ private Mono<KakaoTokenResponse> getKakaoToken(String code) {
.retrieve()
.bodyToMono(KakaoTokenResponse.class)
.onErrorMap(e ->
new CalPickException(ErrorCode.KAKAO_TOKEN_REQUEST_FAILED, "카카오 토큰 요청이 실패하였습니다.")
new CalPickException(ErrorCode.KAKAO_TOKEN_REQUEST_FAILED, "카카오 토큰 요청이 실패하였습니다."+e)
);
}

Expand All @@ -98,11 +86,10 @@ private Mono<KakaoUserInfoResponse> getKakaoUserInfo(String accessToken) {
.retrieve()
.bodyToMono(KakaoUserInfoResponse.class)
.onErrorMap(e ->
new CalPickException(ErrorCode.KAKAO_TOKEN_REQUEST_FAILED, "카카오 사용자 정보 조회에 실패하였습니다.")
new CalPickException(ErrorCode.KAKAO_TOKEN_REQUEST_FAILED, "카카오 사용자 정보 조회에 실패하였습니다."+e)
);
}

//idToken으로 조회된 유저 있을 경우 로그인으로 넘어감
public LoginResponse kakaoLogin(User user){
Long id = user.getUserId();
String email = user.getEmail();
Expand All @@ -118,25 +105,24 @@ public LoginResponse kakaoLogin(User user){
}

@Transactional
public LoginResponse kakaoSignIn(KakaoUserInfoResponse infoResponse, String idToken) {
public LoginResponse kakaoSignIn(KakaoUserInfoResponse infoResponse) {
// 이메일로 유저를 찾음 -> 없으면 입력받은 것으로 생성
User user = userRepository.findByEmail(infoResponse.getEmail())
.orElseGet(()->createNewUser(infoResponse, idToken));
Set<LoginType> loginTypes = user.getLoginTypes();
if(loginTypes.contains(LoginType.NORMAL)) {
user.setIdToken(idToken);
.orElseGet(()->createNewUser(infoResponse));
if (user.getKakaoId() == null){
// 카카오 로그인 한 적 없는 사람
user.setKakaoId(infoResponse.getKakaoId());
user.getLoginTypes().add(LoginType.KAKAO);
user.setModifiedAt(LocalDateTime.now());
user = userRepository.save(user);
}
loginTypes.add(LoginType.KAKAO);
user.setModifiedAt(LocalDateTime.now());
User savedUser = userRepository.save(user);
return kakaoLogin(savedUser);
return kakaoLogin(user);
}

public User createNewUser(KakaoUserInfoResponse request, String idToken){
public User createNewUser(KakaoUserInfoResponse request){
LocalDateTime now = LocalDateTime.now();
return User.builder()
.email(request.getEmail())
.idToken(idToken)
.name(request.getKakaoAccount().getProfile().getName())
.userStatus(UserStatus.ACTIVE)
.createdAt(now)
Expand Down