fix: 카카오 로그인 api response에 회원 이메일, 닉네임 반환하도록 변경

Covigator · Oct 27, 2024 · 37beead · 37beead
1 parent a64778f
commit 37beead
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/main/java/com/ku/covigator/dto/response/KakaoSignInResponse.java b/src/main/java/com/ku/covigator/dto/response/KakaoSignInResponse.java
@@ -4,14 +4,14 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
-public record KakaoSignInResponse(String accessToken, String isNew, String refreshToken) {
+public record KakaoSignInResponse(String accessToken, String isNew, String refreshToken, String nickname, String email) {
 
-    public static KakaoSignInResponse fromNewMember(String accessToken, String refreshToken) {
-        return new KakaoSignInResponse(accessToken, "True", refreshToken);
+    public static KakaoSignInResponse fromNewMember(String accessToken, String refreshToken, String nickname, String email) {
+        return new KakaoSignInResponse(accessToken, "True", refreshToken, nickname, email);
     }
 
-    public static KakaoSignInResponse fromOldMember(String accessToken, String refreshToken) {
-        return new KakaoSignInResponse(accessToken, "False", refreshToken);
+    public static KakaoSignInResponse fromOldMember(String accessToken, String refreshToken, String nickname, String email) {
+        return new KakaoSignInResponse(accessToken, "False", refreshToken, nickname, email);
     }
 
 }
diff --git a/src/main/java/com/ku/covigator/service/AuthService.java b/src/main/java/com/ku/covigator/service/AuthService.java
@@ -112,7 +112,7 @@ public KakaoSignInResponse signInKakao(String code) {
             String accessToken = jwtProvider.createToken(savedMember.get().getId().toString());
             String refreshToken = createRefreshToken();
             redisUtil.setDataExpire(refreshToken, String.valueOf(savedMember.get().getId()), rtrProperties.getExpirationLength());
-            return KakaoSignInResponse.fromOldMember(accessToken, refreshToken);
+            return KakaoSignInResponse.fromOldMember(accessToken, refreshToken, savedMember.get().getNickname(), savedMember.get().getEmail());
         }
 
         // 신규 닉네임 생성
@@ -125,7 +125,7 @@ public KakaoSignInResponse signInKakao(String code) {
         String accessToken = jwtProvider.createToken(newMember.getId().toString());
         String refreshToken = createRefreshToken();
         redisUtil.setDataExpire(refreshToken, String.valueOf(newMember.getId()), rtrProperties.getExpirationLength());
-        return KakaoSignInResponse.fromNewMember(accessToken, refreshToken);
+        return KakaoSignInResponse.fromNewMember(accessToken, refreshToken, newMember.getNickname(), newMember.getEmail());
 
     }
 

diff --git a/src/test/java/com/ku/covigator/controller/AuthControllerTest.java b/src/test/java/com/ku/covigator/controller/AuthControllerTest.java
@@ -109,7 +109,7 @@ void signUp() throws Exception {
     @Test
     void signInKakaoNewMember() throws Exception {
         //given
-        KakaoSignInResponse response = KakaoSignInResponse.fromNewMember("access-token", "refresh-token");
+        KakaoSignInResponse response = KakaoSignInResponse.fromNewMember("access-token", "refresh-token", "covi", "covigator@naver.com");
         given(authService.signInKakao("code")).willReturn(response);
 
         //when //then
@@ -120,15 +120,17 @@ void signInKakaoNewMember() throws Exception {
                         status().isOk(),
                         jsonPath("$.access_token").value("access-token"),
                         jsonPath("$.refresh_token").value("refresh-token"),
-                        jsonPath("$.is_new").value("True")
+                        jsonPath("$.is_new").value("True"),
+                        jsonPath("$.nickname").value("covi"),
+                        jsonPath("$.email").value("covigator@naver.com")
                 );
     }
 
     @DisplayName("기존 회원에 대한 카카오 로그인을 요청한다.")
     @Test
     void signInKakaoOldMember() throws Exception {
         //given
-        KakaoSignInResponse response = KakaoSignInResponse.fromOldMember("access-token", "refresh-token");
+        KakaoSignInResponse response = KakaoSignInResponse.fromOldMember("access-token", "refresh-token", "covi", "covigator@naver.com");
         given(authService.signInKakao("code")).willReturn(response);
 
         //when //then
@@ -139,7 +141,9 @@ void signInKakaoOldMember() throws Exception {
                         status().isOk(),
                         jsonPath("$.access_token").value("access-token"),
                         jsonPath("$.refresh_token").value("refresh-token"),
-                        jsonPath("$.is_new").value("False")
+                        jsonPath("$.is_new").value("False"),
+                        jsonPath("$.nickname").value("covi"),
+                        jsonPath("$.email").value("covigator@naver.com")
                 );
     }