Merge pull request #16 from Kyuwon-Choi/main

feat: 카카오 로그인 시 userId 도 가져오게 수정
9oormthon-univ · Nov 20, 2024 · 7e44b22 · 7e44b22
2 parents 1ffb72e + 457c7b3
commit 7e44b22
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/paperplane/src/main/java/com/example/paperplane/domain/auth/controller/KakaoController.java b/paperplane/src/main/java/com/example/paperplane/domain/auth/controller/KakaoController.java
@@ -40,11 +40,14 @@ public ResponseEntity<Map<String, Object>> login(@RequestParam("code") String co
             kakaoService.registerNewUser(userInfo);
         }
 
+        Long userId = kakaoService.getUserId(userInfo);
+
         // 응답 데이터 생성
         Map<String, Object> response = new HashMap<>();
         response.put("accessToken", accessToken);
         response.put("isFirstLogin", isFirstLogin);
         response.put("userInfo", userInfo);
+        response.put("userId", userId);
 
         return ResponseEntity.ok(response);
     }

diff --git a/paperplane/src/main/java/com/example/paperplane/domain/auth/service/KakaoService.java b/paperplane/src/main/java/com/example/paperplane/domain/auth/service/KakaoService.java
@@ -116,4 +116,11 @@ public String getKakaoLoginUrl() {
                 + "&redirect_uri=" + redirectUri
                 + "&response_type=code";
     }
+
+    public Long getUserId(KakaoUserInfoResponse userInfo) {
+        return userRepository.findByKakaoId(userInfo.id().toString())
+                .map(User::getUserId)
+                .orElseThrow(() -> new RuntimeException("User not found"));
+    }
+
 }