Skip to content
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

Jump to bottom

[fix] 로그인 API 코드 수정 #42

Merged
merged 2 commits into from
Jan 11, 2024
Merged

[fix] 로그인 API 코드 수정 #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f26a64
[fix] 로그인 API 코드 수정
hysong4u Jan 11, 2024
71ebb99
Merge branch 'develop' into test
hysong4u Jan 11, 2024
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
16 changes: 10 additions & 6 deletions src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@ public class OAuthController implements OAuthApi {

@PostMapping("/kakao/login")
public ResponseEntity<SuccessResponse<?>> kakaoLogin(@RequestParam("code") String code) {
KakaoUserInfoResponseDto userInfo = oAuthService.kakaoCallback(code);
MemberTokenResponseDto memberToken = oAuthService.saveToken(userInfo.memberId());

Map<String, Object> loginResponse = new HashMap<>();
loginResponse.put("userInfo", userInfo);
loginResponse.put("memberToken", memberToken);
//KakaoUserInfoResponseDto userInfo = oAuthService.kakaoCallback(code);
//MemberTokenResponseDto memberToken = oAuthService.saveToken(userInfo.memberId());

//Map<String, Object> loginResponse = new HashMap<>();
//loginResponse.put("userInfo", userInfo);
//loginResponse.put("memberToken", memberToken);
//return SuccessResponse.ok(loginResponse);
String response = "code"+code;
return SuccessResponse.ok(response);

return SuccessResponse.ok(loginResponse);
}


Expand All @@ -39,4 +42,5 @@ public ResponseEntity<SuccessResponse<?>> kakaoLogout(@UserId Long userId) {
}



}