Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 @@ -54,10 +54,8 @@ public static UserResponseDTO.UserKaKaoOpenIdResultDTO toUserKaKaoOpenIdResultDT
.build();
}

public static UserResponseDTO.KaKaoFinalSignUpResultDTO toUserKaKaoFinalSignUpResultDTO(String accessToken, String refreshToken, Users users) {
public static UserResponseDTO.KaKaoFinalSignUpResultDTO toUserKaKaoFinalSignUpResultDTO(Users users) {
return UserResponseDTO.KaKaoFinalSignUpResultDTO.builder()
.accessToken(accessToken)
.refreshToken(refreshToken)
.userId(users.getId())
.nickname(users.getNickname())
.loginType(users.getLoginType())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ public UserResponseDTO.UserKaKaoOpenIdResultDTO openIdKakao(String openId) {
Optional<Users> userSub = userRepository.findByProviderId(sub);

// sub 추출 완료
// sub의 user 가 존재한다면 -> 로그인 처리 => access token, refresh token 리턴
// sub의 user 가 존재한다면 -> 로그인 처리 => Access Token, Refresh Token 리턴
if (userSub.isPresent()) {
Users ExistUser = userSub.get();
String key = ExistUser.getId().toString();
String key = "users:" + ExistUser.getId().toString();
String accessToken = generateAccessToken(userSub.get().getId(), accessExpTime);
String refreshToken = generateAndSaveRefreshToken(key, refreshExpTime);
Boolean isRegistered = ExistUser.getStatus().equals(UserStatus.PENDING) ? false : true;
Expand Down Expand Up @@ -190,11 +190,7 @@ public UserResponseDTO.KaKaoFinalSignUpResultDTO kakaoSignUp(UserRequestDTO.Sign
// 일상 카테고리 생성
createDefaultCategory(savedUser);

// 액세스 토큰 및 리프레시 토큰 생성
String key = "users:" + savedUser.getId().toString();
String accessToken = generateAccessToken(savedUser.getId(), accessExpTime);
String refreshToken = generateAndSaveRefreshToken(key, refreshExpTime);
return UserConverter.toUserKaKaoFinalSignUpResultDTO(accessToken, refreshToken, savedUser);
return UserConverter.toUserKaKaoFinalSignUpResultDTO(savedUser);
}

private void createDefaultCategory(Users newUser) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ public static class UserKaKaoOpenIdResultDTO {
@NoArgsConstructor
@AllArgsConstructor
public static class KaKaoFinalSignUpResultDTO {
String accessToken;
String refreshToken;
Long userId;
String nickname;
LoginType loginType;
Expand Down