Merge branch 'feature/ISSUE-56' into staging

Gyeongdan · Jul 18, 2024 · b3a5a9f · b3a5a9f
2 parents 061cef2 + 083e9ee
commit b3a5a9f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/gyeongdan/user/controller/KakaoOauthController.java b/src/main/java/gyeongdan/user/controller/KakaoOauthController.java
@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,7 +39,16 @@ public ResponseEntity<?> kakaoOauthCallback(@RequestParam String code) {
         return ResponseEntity
             .ok()
             .body(new CommonResponse<>(
-                kakaoOauthService.processKakaoLogin(code), "카카오 로그인 성공", true
+                kakaoOauthService.processKakaoLoginAndGenerateAccessToken(code), "카카오 로그인 성공", true
+            ));
+    }
+
+    @PostMapping("/login/ok")
+    public ResponseEntity<?> loginOk(@RequestParam String code) {
+        return ResponseEntity
+            .ok()
+            .body(new CommonResponse<>(
+                kakaoOauthService.processKakaoLoginAndGenerateAccessToken(code), "카카오 로그인 성공", true
             ));
     }
 }
diff --git a/src/main/java/gyeongdan/user/service/KakaoOauthService.java b/src/main/java/gyeongdan/user/service/KakaoOauthService.java
@@ -94,7 +94,7 @@ public void getKakaoLogout(String accessToken) {
             .body(KakaoProfile.class);
     }
 
-    public TokenResponse processKakaoLogin(String code) {
+    public TokenResponse processKakaoLoginAndGenerateAccessToken(String code) {
         // 1. 카카오에서 액세스 토큰 획득
         KakaoLoginResponseDTO tokenResponse = getKakaoAccessToken(code);
         String accessToken = tokenResponse.getAccessToken();