Skip to content

Commit

Permalink
[PC-440] fix: 패키지 위치 변경
Browse files Browse the repository at this point in the history
devchlee12 committed Jan 27, 2025
1 parent f33b4a3 commit aa43124
Showing 3 changed files with 62 additions and 62 deletions.
Original file line number Diff line number Diff line change
@@ -16,73 +16,73 @@
@RequiredArgsConstructor
public class OauthService {

private final OauthProviderResolver oauthProviderResolver;
private final JwtUtil jwtUtil;
private final UserRepository userRepository;

public OauthLoginResponse login(OauthLoginRequest request) {
OauthProvider oauthProvider = oauthProviderResolver.find(request.getProviderName());
String oauthId =
request.getProviderName() + oauthProvider.getOAuthProviderUserId(request.getToken());

//이미 가입된 유저인지 확인하고 가입되어 있지 않으면 회원가입 처리
Optional<User> userOptional = userRepository.findByOauthId(oauthId);
if (userOptional.isEmpty()) {
User newUser = User.builder().oauthId(oauthId).role(RoleStatus.NONE.getStatus())
.build();
User savedUser = userRepository.save(newUser);
Long userId = savedUser.getId();
String accessToken = jwtUtil.createJwt("access_token", userId, oauthId, "NONE",
600000L);
String refreshToken = jwtUtil.createJwt("refresh_token", userId, oauthId, "NONE",
864000000L);
return new OauthLoginResponse(RoleStatus.NONE.getStatus(), accessToken, refreshToken);
}

//이미 가입한 유저인 경우 로그인 처리
Long userId = userOptional.get().getId();
final User user = userOptional.get();

String accessToken = jwtUtil.createJwt("access_token", userId, oauthId, user.getRole(),
600000L);
String refreshToken = jwtUtil.createJwt("refresh_token", userId, oauthId, user.getRole(),
864000000L);

//아직 SMS 인증이 완료되지 않음
if (user.getRole().equals("NONE")) {
return new OauthLoginResponse(RoleStatus.NONE.getStatus(), accessToken, refreshToken);
}

// SMS 인증은 완료되었으나, 프로필 등록을 안함
if (user.getRole().equals("REGISTER")) {
return new OauthLoginResponse(RoleStatus.REGISTER.getStatus(), accessToken,
refreshToken);
}

//프로필 등록은 했지만, 심사중
if (user.getRole().equals("PENDING")) {
return new OauthLoginResponse(RoleStatus.PENDING.getStatus(), accessToken,
refreshToken);
}

// 가입과 프로필 등록까지 완료된 유저
return new OauthLoginResponse(user.getRole(), accessToken, refreshToken);
private final OauthProviderResolver oauthProviderResolver;
private final JwtUtil jwtUtil;
private final UserRepository userRepository;

public OauthLoginResponse login(OauthLoginRequest request) {
OauthProvider oauthProvider = oauthProviderResolver.find(request.getProviderName());
String oauthId =
request.getProviderName() + oauthProvider.getOAuthProviderUserId(request.getToken());

//이미 가입된 유저인지 확인하고 가입되어 있지 않으면 회원가입 처리
Optional<User> userOptional = userRepository.findByOauthId(oauthId);
if (userOptional.isEmpty()) {
User newUser = User.builder().oauthId(oauthId).role(RoleStatus.NONE.getStatus())
.build();
User savedUser = userRepository.save(newUser);
Long userId = savedUser.getId();
String accessToken = jwtUtil.createJwt("access_token", userId, oauthId, "NONE",
600000L);
String refreshToken = jwtUtil.createJwt("refresh_token", userId, oauthId, "NONE",
864000000L);
return new OauthLoginResponse(RoleStatus.NONE.getStatus(), accessToken, refreshToken);
}

//이미 가입한 유저인 경우 로그인 처리
Long userId = userOptional.get().getId();
final User user = userOptional.get();

public OauthLoginResponse tmpTokenGet(Long userId) {
//이미 가입된 유저인지 확인하고 가입되어 있지 않으면 회원가입 처리
Optional<User> userOptional = userRepository.findById(userId);
String accessToken = jwtUtil.createJwt("access_token", userId, oauthId, user.getRole(),
600000L);
String refreshToken = jwtUtil.createJwt("refresh_token", userId, oauthId, user.getRole(),
864000000L);

System.out.println("userOptional = " + userOptional);

User user = userOptional.get();
//아직 SMS 인증이 완료되지 않음
if (user.getRole().equals("NONE")) {
return new OauthLoginResponse(RoleStatus.NONE.getStatus(), accessToken, refreshToken);
}

String accessToken = jwtUtil.createJwt("access_token", userId, user.getOauthId(),
user.getRole(), 600000L);
String refreshToken = jwtUtil.createJwt("refresh_token", userId, user.getOauthId(),
user.getRole(), 864000000L);
// SMS 인증은 완료되었으나, 프로필 등록을 안함
if (user.getRole().equals("REGISTER")) {
return new OauthLoginResponse(RoleStatus.REGISTER.getStatus(), accessToken,
refreshToken);
}

return new OauthLoginResponse(RoleStatus.NONE.getStatus(), accessToken, refreshToken);
//프로필 등록은 했지만, 심사중
if (user.getRole().equals("PENDING")) {
return new OauthLoginResponse(RoleStatus.PENDING.getStatus(), accessToken,
refreshToken);
}

// 가입과 프로필 등록까지 완료된 유저
return new OauthLoginResponse(user.getRole(), accessToken, refreshToken);
}


public OauthLoginResponse tmpTokenGet(Long userId) {
//이미 가입된 유저인지 확인하고 가입되어 있지 않으면 회원가입 처리
Optional<User> userOptional = userRepository.findById(userId);

System.out.println("userOptional = " + userOptional);

User user = userOptional.get();

String accessToken = jwtUtil.createJwt("access_token", userId, user.getOauthId(),
user.getRole(), 600000L);
String refreshToken = jwtUtil.createJwt("refresh_token", userId, user.getOauthId(),
user.getRole(), 864000000L);

return new OauthLoginResponse(RoleStatus.NONE.getStatus(), accessToken, refreshToken);
}
}

0 comments on commit aa43124

Please sign in to comment.