Skip to content
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

Fix 126/유저 생성 #127

Merged
merged 2 commits into from
Sep 14, 2024
Merged

Fix 126/유저 생성 #127

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
6d5e2ce
[style] 공백처리
Ryeolee Sep 14, 2024
70ad5bb
[fix] 공백처리
Ryeolee Sep 14, 2024
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
10 changes: 2 additions & 8 deletions src/main/java/com/modernfarmer/farmusspring/domain/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,11 @@ public class AuthService {

@Transactional
public BaseResponseDto<LoginResponseDto> googleLogin(String googleAccessToken) {

return BaseResponseDto.of(SuccessCode.SUCCESS,
googleLogin.loginMethod(googleAccessToken));
return BaseResponseDto.of(SuccessCode.SUCCESS, googleLogin.loginMethod(googleAccessToken));
}
@Transactional
public BaseResponseDto<LoginResponseDto> kakaoLogin(String kakaoAccessToken) {

return BaseResponseDto.of(SuccessCode.SUCCESS,
kakaoLogin.loginMethod(kakaoAccessToken));


return BaseResponseDto.of(SuccessCode.SUCCESS, kakaoLogin.loginMethod(kakaoAccessToken));
}
@Transactional
public BaseResponseDto<Void> logout(Long userId) {
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/GoogleLogin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.modernfarmer.farmusspring.domain.auth.dto.LoginResponseDto;
import com.modernfarmer.farmusspring.domain.auth.repository.RedisManager;
import com.modernfarmer.farmusspring.domain.auth.util.social.dto.GoogleUserResponseDto;
import com.modernfarmer.farmusspring.domain.history.helper.HistoryHelper;
import com.modernfarmer.farmusspring.domain.user.repository.UserRepository;
import com.modernfarmer.farmusspring.global.common.security.JwtTokenProvider;
import com.modernfarmer.farmusspring.global.response.BaseResponseDto;
Expand All @@ -12,8 +13,8 @@
@Component
public class GoogleLogin extends SocialLogin{

public GoogleLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository) {
super(webClient, jwtTokenProvider, redisManager, userRepository);
public GoogleLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository, HistoryHelper historyHelper) {
super(webClient, jwtTokenProvider, redisManager, userRepository, historyHelper);
}

@Override
Expand All @@ -22,8 +23,6 @@ public LoginResponseDto loginMethod(String socialToken) {
socialToken,
"https://www.googleapis.com/oauth2/v2/userinfo",
GoogleUserResponseDto.class);


return login(socialUserData);
}

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/KakaoLogin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.modernfarmer.farmusspring.domain.auth.dto.LoginResponseDto;
import com.modernfarmer.farmusspring.domain.auth.repository.RedisManager;
import com.modernfarmer.farmusspring.domain.auth.util.social.dto.KakaoUserResponseDto;
import com.modernfarmer.farmusspring.domain.history.helper.HistoryHelper;
import com.modernfarmer.farmusspring.domain.user.repository.UserRepository;
import com.modernfarmer.farmusspring.global.common.security.JwtTokenProvider;
import com.modernfarmer.farmusspring.global.response.BaseResponseDto;
Expand All @@ -13,8 +14,8 @@
@Component
public class KakaoLogin extends SocialLogin {

public KakaoLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository) {
super(webClient, jwtTokenProvider, redisManager, userRepository);
public KakaoLogin(WebClient webClient, JwtTokenProvider jwtTokenProvider, RedisManager redisManager, UserRepository userRepository, HistoryHelper historyHelper) {
super(webClient, jwtTokenProvider, redisManager, userRepository, historyHelper);
}

@Override
Expand All @@ -23,8 +24,6 @@ public LoginResponseDto loginMethod(String socialToken) {
socialToken,
"https://kapi.kakao.com/v2/user/me",
KakaoUserResponseDto.class);


return login(socialUserData);
}
}
19 changes: 4 additions & 15 deletions src/main/java/com/modernfarmer/farmusspring/domain/auth/util/social/SocialLogin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.modernfarmer.farmusspring.domain.auth.dto.LoginResponseDto;
import com.modernfarmer.farmusspring.domain.auth.repository.RedisManager;
import com.modernfarmer.farmusspring.domain.auth.util.social.dto.SocialUserResponseDto;
import com.modernfarmer.farmusspring.domain.history.helper.HistoryHelper;
import com.modernfarmer.farmusspring.domain.user.entity.User;
import com.modernfarmer.farmusspring.domain.user.exception.custom.UserNotFoundException;
import com.modernfarmer.farmusspring.domain.user.repository.UserRepository;
Expand All @@ -28,30 +29,24 @@ abstract public class SocialLogin {
private final JwtTokenProvider jwtTokenProvider;
private final RedisManager redisManager;
private final UserRepository userRepository;
private final HistoryHelper historyHelper;


public abstract LoginResponseDto loginMethod(String socialToken);

public LoginResponseDto login(SocialUserResponseDto socialUserData){

verifySocialUserData(socialUserData);

userRepository.findByUserNumber(String.valueOf(socialUserData.getId()))
.orElseGet(() -> {

socialSignUp(socialUserData);
return null;
});

Optional<User> 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()));

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,
Expand All @@ -60,33 +55,27 @@ public LoginResponseDto login(SocialUserResponseDto socialUserData){
}

private <T> void verifySocialUserData(T data){

if(data == null){

BaseResponseDto.of(UserErrorCode.NOT_FOUND_USER, "요청한 소셜 유저 정보가 없습니다.");
}
}

private <T extends SocialUserResponseDto> void socialSignUp(T socialUserData) {

User user = User.createUser(
"USER",
String.valueOf(socialUserData.getId()),
true
);
userRepository.save(user);

}

public <T> T getUserData(String accessToken, String apiUrl, Class<T> responseType){

Mono<T> userInfoMono = webClient
.get()
.uri(apiUrl)
.headers(headers -> headers.set("Authorization", accessToken))
.retrieve()
.bodyToMono(responseType);

return userInfoMono.block();
}

Expand Down
Loading