From 06b5ded4a2e4c66da28619fd92cf239908816ec5 Mon Sep 17 00:00:00 2001
From: codeehh <hh950131@gmail.com>
Date: Thu, 30 Jun 2022 15:11:50 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=9C=A0=EC=A0=80=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95=20(#55)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/KakaoAuthServiceImpl.java    |  2 +-
 .../bouquet/api/user/web/UserController.java  | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/api/src/main/java/com/bouquet/api/user/service/KakaoAuthServiceImpl.java b/api/src/main/java/com/bouquet/api/user/service/KakaoAuthServiceImpl.java
index e9162b5..cb973b6 100644
--- a/api/src/main/java/com/bouquet/api/user/service/KakaoAuthServiceImpl.java
+++ b/api/src/main/java/com/bouquet/api/user/service/KakaoAuthServiceImpl.java
@@ -39,7 +39,7 @@ public KakaoTokenInfo sendCode(String code) throws Exception {
         StringBuilder sb = new StringBuilder();
         sb.append("grant_type=authorization_code");
         sb.append("&client_id=644f22ddf456df96ce3ac3e3b870991a");
-        sb.append("&redirect_uri=http://localhost:8080/kakaoLogin");
+        sb.append("&redirect_uri=http://localhost:3000/login/redirect");
         sb.append("&code=" + code);
         bw.write(sb.toString());
         bw.flush();
diff --git a/api/src/main/java/com/bouquet/api/user/web/UserController.java b/api/src/main/java/com/bouquet/api/user/web/UserController.java
index 31ff8c8..3a5ff1e 100644
--- a/api/src/main/java/com/bouquet/api/user/web/UserController.java
+++ b/api/src/main/java/com/bouquet/api/user/web/UserController.java
@@ -41,7 +41,7 @@ public class UserController {
     @ApiOperation(value = "카카오 로그인", notes = "code 값을 입력하여 로그인 후 기존 회원은 existingUser 값 true, jwt, user 정보 반환, 미가입 회원일 경우 existingUser 값 false로 반환")
     @GetMapping("kakaoLogin")
     public ResponseEntity<Object> kakaoLogin(String code, @ApiIgnore HttpSession httpSession) {
-        System.out.print(code);
+        System.out.println(code);
         HttpStatus status = null;
         try {
             KakaoTokenInfo kakaoTokenInfo = kakaoAuthService.sendCode(code);
@@ -54,12 +54,13 @@ public ResponseEntity<Object> kakaoLogin(String code, @ApiIgnore HttpSession htt
             if (userInfo != null) {
                 UserResponse.UserInfo response = UserResponse.UserInfo.build(userInfo);
                 hashMap.put("user", response);
+                hashMap.put("socialLoginType", 1);
                 hashMap.put("existingUser", "true");
-                try{
-                    hashMap.put("access-token", jwtUtil.createToken("email", userInfo.getEmail()));
-                    hashMap.put("message", SUCCESS );
+                try {
+                    hashMap.put("accessToken", jwtUtil.createToken("email", userInfo.getEmail()));
+                    hashMap.put("message", SUCCESS);
                     status = HttpStatus.ACCEPTED;
-                }catch(Exception e){
+                } catch (Exception e) {
                     hashMap.put("message", FAIL);
                     status = HttpStatus.INTERNAL_SERVER_ERROR;
                 }
@@ -70,6 +71,7 @@ public ResponseEntity<Object> kakaoLogin(String code, @ApiIgnore HttpSession htt
                 User user = new User();
                 user.setEmail(kakaoUserInfo.getEmail());
                 httpSession.setAttribute("user", user);
+                hashMap.put("socialLoginType", 1);
                 hashMap.put("existingUser", "false");
                 return ResponseEntity.status(HttpStatus.OK).body(hashMap);
             }
@@ -81,26 +83,28 @@ public ResponseEntity<Object> kakaoLogin(String code, @ApiIgnore HttpSession htt
 
     @ApiOperation(value = "닉네임 입력", notes = "nickname 값을 입력받아 유저 생성 후 jwt와 user 정보 반환")
     @GetMapping(value = "/login/user/nickname")
-    public ResponseEntity<Map<String, Object>> getUser(String nickname){
+    public ResponseEntity<Map<String, Object>> getUser(String nickname) {
         HttpStatus status = null;
         HashMap<String, Object> result = userService.create(nickname);
-        if(result.get("message").equals("success"))
+        if (result.get("message").equals("success"))
             status = HttpStatus.ACCEPTED;
         else status = status = HttpStatus.INTERNAL_SERVER_ERROR;
         return new ResponseEntity<Map<String, Object>>(result, status);
     }
+
     @ApiOperation(value = "구글 로그인 후 유저 정보 반환", notes = "기존 회원은 existingUser 값 true, jwt, user 정보 반환, 미가입 회원일 경우 existingUser 값 false로 반환 ")
     @GetMapping(value = "/login/sucess")
     public ResponseEntity<Map<String, Object>> loginComplete() {
         HttpStatus status = null;
         HashMap<String, Object> result = userService.checknick();
-        if(result.get("existingUser").equals("false"))
+        if (result.get("existingUser").equals("false"))
             status = HttpStatus.ACCEPTED;
-        else if(result.get("existingUser").equals("true") && result.get("message").equals("success"))
+        else if (result.get("existingUser").equals("true") && result.get("message").equals("success"))
             status = HttpStatus.ACCEPTED;
         else status = HttpStatus.INTERNAL_SERVER_ERROR;
         return new ResponseEntity<Map<String, Object>>(result, status);
     }
+
     @ApiOperation(value = "회원 탈퇴", notes = "userId 값을 입력받아 회원 탈퇴")
     @DeleteMapping(value = "/user/{userId}")
     public ResponseEntity<UserResponse.OnlyId> delete(@PathVariable Long userId) {