Skip to content

Commit 33d70b2

Browse files
authored
Merge pull request #57 from noeyeyh/feat/profile
#56 Feat: 로그인 응답 형식에 닉네임 추가
2 parents b12f031 + 09275fd commit 33d70b2

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

src/main/java/com/memesphere/domain/user/dto/response/LoginResponse.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ public class LoginResponse {
1414

1515
@Schema(description = "리프레시 토큰", example = "dklksdfsdklkfds8326v5cf5d5d6s6flk9876542316468645")
1616
private String refreshToken;
17+
18+
@Schema(description = "닉네임", example = "홍길동")
19+
private String nickName;
1720
}

src/main/java/com/memesphere/domain/user/service/AuthServiceImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ public LoginResponse handleUserLogin(SignInRequest signInRequest) {
4949
accessToken = tokenProvider.createAccessToken(existingUser.getEmail(), existingUser.getLoginId());
5050
String refreshToken = tokenProvider.createRefreshToken(existingUser.getEmail());
5151

52+
String nickname = existingUser.getNickname();
53+
5254
existingUser.saveAccessToken(accessToken);
5355
existingUser.saveRefreshToken(refreshToken);
5456
userRepository.save(existingUser);
55-
return new LoginResponse(accessToken, refreshToken);
57+
return new LoginResponse(accessToken, refreshToken, nickname);
5658
} else {
5759
throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
5860
}

src/main/java/com/memesphere/domain/user/service/GoogleServiceImpl.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,27 @@ public LoginResponse handleUserLogin(GoogleUserInfoResponse googleUserInfoRespon
109109
accessToken = tokenProvider.createAccessToken(existingUser.getEmail(), existingUser.getLoginId());
110110
String refreshToken = tokenProvider.createRefreshToken(existingUser.getEmail());
111111

112+
String nickname = existingUser.getNickname();
113+
112114
existingUser.saveAccessToken(accessToken);
113115
existingUser.saveRefreshToken(refreshToken);
114116
userRepository.save(existingUser);
115117

116-
return new LoginResponse(accessToken, refreshToken);
118+
return new LoginResponse(accessToken, refreshToken, nickname);
117119
} else {
118120
User newUser = UserConverter.toGoogleUser(googleUserInfoResponse);
119121
newUser = userRepository.save(newUser);
120122

121123
accessToken = tokenProvider.createAccessToken(newUser.getEmail(), newUser.getLoginId());
122124
String refreshToken = tokenProvider.createRefreshToken(newUser.getEmail());
123125

126+
String nickname = newUser.getNickname();
127+
124128
newUser.saveAccessToken(accessToken);
125129
newUser.saveRefreshToken(refreshToken);
126130
userRepository.save(newUser);
127131

128-
return new LoginResponse(accessToken, refreshToken);
132+
return new LoginResponse(accessToken, refreshToken, nickname);
129133
}
130134
}
131135
}

src/main/java/com/memesphere/domain/user/service/KakaoServiceImpl.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,27 @@ public LoginResponse handleUserLogin(KakaoUserInfoResponse kakaoUserInfoResponse
9090
accessToken = tokenProvider.createAccessToken(existingUser.getEmail(), existingUser.getLoginId());
9191
String refreshToken = tokenProvider.createRefreshToken(existingUser.getEmail());
9292

93+
String nickname = existingUser.getNickname();
94+
9395
existingUser.saveAccessToken(accessToken);
9496
existingUser.saveRefreshToken(refreshToken);
9597
userRepository.save(existingUser);
9698

97-
return new LoginResponse(accessToken, refreshToken);
99+
return new LoginResponse(accessToken, refreshToken, nickname);
98100
} else {
99101
User newUser = UserConverter.toKakaoUser(kakaoUserInfoResponse);
100102
newUser = userRepository.save(newUser);
101103

102104
accessToken = tokenProvider.createAccessToken(newUser.getEmail(), newUser.getLoginId());
103105
String refreshToken = tokenProvider.createRefreshToken(newUser.getEmail());
104106

107+
String nickname = newUser.getNickname();
108+
105109
newUser.saveAccessToken(accessToken);
106110
newUser.saveRefreshToken(refreshToken);
107111
userRepository.save(newUser);
108112

109-
return new LoginResponse(accessToken, refreshToken);
113+
return new LoginResponse(accessToken, refreshToken, nickname);
110114
}
111115
}
112116
}

0 commit comments

Comments
 (0)