Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class UserServiceImpl implements UserService{
private final ClubConverter clubConverter;

@Override
@Transactional
public UserResponse.LoginInfo joinUser(UserJoinRequest request) {
String providerIdWithProvider = request.getProviderId() + PROVIDER_ID_SEPARATOR + request.getProvider();
Club favoreiteClub = clubRepository.findById(request.getFavoriteClubId())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ public LoginInfo login(AuthRequest.LoginRequest loginRequest) {
// 결합한 문자열로 사용자 조회
Optional<User> findUserOptional = userRepository.findByProviderId(providerIdWithProvider);
boolean isFirstLogin = false;
LoginInfo loginResponse;
LoginInfo loginInfo;

if (findUserOptional.isEmpty()) {
// 사용자가 없으면 최초 회원가입 여부를 true 반환
isFirstLogin = true;
loginResponse = authConverter.toLoginInfo(null, null, isFirstLogin);
loginInfo = authConverter.toLoginInfo(null, null, isFirstLogin);
} else {
// 회원가입된 사용자가 있으면 AccessToken과 RefreshToken 반환
User user = findUserOptional.get();
Expand All @@ -61,10 +61,10 @@ public LoginInfo login(AuthRequest.LoginRequest loginRequest) {

// RefreshToken을 Redis에 저장
refreshTokenRedisRepository.save(RefreshToken.of(refreshToken, userId));
loginResponse = authConverter.toLoginInfo(accessToken, refreshToken, isFirstLogin);
loginInfo = authConverter.toLoginInfo(accessToken, refreshToken, isFirstLogin);
}

return loginResponse;
return loginInfo;
}

private void checkFcmToken(AuthRequest.LoginRequest loginRequest, User user) {
Expand Down
Loading