Skip to content

[USER] 유저 로그인 기능 수정 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghost wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[USER] 유저 로그인 기능 수정 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/com/bouquet/api/user/service/KakaoAuthServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
22 changes: 13 additions & 9 deletions api/src/main/java/com/bouquet/api/user/web/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand All @@ -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);
}
Expand All @@ -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) {
Expand Down