diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/SocialLogin.java b/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/SocialLogin.java index 1bac2e0..83041d5 100644 --- a/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/SocialLogin.java +++ b/src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/SocialLogin.java @@ -40,13 +40,14 @@ public LoginResponseDto login(SocialUserResponseDto socialUserData){ userRepository.findByUserNumber(String.valueOf(socialUserData.getId())) .orElseGet(() -> { socialSignUp(socialUserData); + return null; }); Optional userLoginData = Optional.ofNullable(userRepository.findByUserNumber(String.valueOf(socialUserData.getId())).orElseThrow(() -> new UserNotFoundException("해당 유저의 정보가 존재하지 않습니다.", UserErrorCode.NOT_FOUND_USER))); String refreshToken = jwtTokenProvider.createRefreshToken(userLoginData.get().getId()); String accessToken = jwtTokenProvider.createAccessToken(userLoginData.get().getId(), String.valueOf(userLoginData.get().getRole())); redisManager.setValueByKey(String.valueOf(userLoginData.get().getId()), refreshToken); - historyHelper.createUserHistory(userLoginData.get().getId()); + return LoginResponseDto.of( accessToken, refreshToken, @@ -67,6 +68,7 @@ private void socialSignUp(T socialUserData) { true ); userRepository.save(user); + historyHelper.createUserHistory(user.getId()); } public T getUserData(String accessToken, String apiUrl, Class responseType){