경북대 BE_김은선 5주차 과제 (1단계) #339
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…xtraction from token
테스트 코드에 주석메세지 추가
gongdongho12
approved these changes
Jul 27, 2024
Comment on lines
+25
to
+49
| @GetMapping("/kakao/login") | ||
| public String login(Model model) { | ||
| model.addAttribute("kakaoClientId", kakaoProperties.clientId()); | ||
| model.addAttribute("kakaoRedirectUrl", kakaoProperties.redirectUrl()); | ||
| return "kakaoLogin"; | ||
| } | ||
|
|
||
| @GetMapping("/kakao/oauth2/callback") | ||
| public String callbackKakao(@RequestParam String code, Model model) { | ||
|
|
||
| try { | ||
| String accessToken = kakaoService.login(code); | ||
| model.addAttribute("accessToken", accessToken); | ||
| return "home"; | ||
| } catch (MemberNotFoundException e) { | ||
| model.addAttribute("member", new Member()); // Member 객체 추가 | ||
| return "register"; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @GetMapping("/kakao/loginSuccess") | ||
| public String loginSuccess() { | ||
| return "kakaoLoginSuccess"; | ||
| } |
There was a problem hiding this comment.
이렇게 전부 kakao를 prefix path로 사용한다면 컨트롤러 자체에 path 등록해두는게 좋지 않을까요?
There was a problem hiding this comment.
넵 @RequestMapping("/kakao") 로 따로 뺐습니다!
Comment on lines
+42
to
+44
| Map<String, String> response = restTemplate.postForObject(url, null, HashMap.class); | ||
|
|
||
| return response.get("access_token"); |
Comment on lines
+63
to
+80
| public String login(String code) throws MemberNotFoundException { | ||
| String accessToken = getKakaoAccessToken(code); | ||
| JSONObject userInfo = getUserInfo(accessToken); | ||
|
|
||
| String email= null; | ||
| if (userInfo.has("kakao_account")) { | ||
| JSONObject kakaoAccount = userInfo.getJSONObject("kakao_account"); | ||
| if (kakaoAccount.has("email")) { | ||
| email = kakaoAccount.getString("email"); | ||
| } | ||
| } | ||
|
|
||
| if (email == null) { | ||
| throw new MemberNotFoundException("Email not found"); | ||
| } | ||
| // 로그인 성공 처리 | ||
| return accessToken; | ||
| } |
There was a problem hiding this comment.
getKakaoAccessToken에서 리프레시토큰은 따로 가져오지 않아도 괜찮을까요?
There was a problem hiding this comment.
토큰 두 개 모두 받아오는 객체를 새로 정의해서 받아오도록 수정했습니다!
Comment on lines
+30
to
+64
| @Test | ||
| public void testLogin() { | ||
| String url = "http://localhost:" + port + "/kakao/login"; | ||
| ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); | ||
|
|
||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); | ||
| } | ||
|
|
||
| // 유효한 코드로 카카오 로그인을 시도 | ||
| @Test | ||
| public void testCallbackKakaoSuccess() { | ||
| String code = "valid_code"; | ||
| String accessToken = "valid_access_token"; | ||
|
|
||
| when(kakaoService.login(code)).thenReturn(accessToken); | ||
|
|
||
| String url = "http://localhost:" + port + "/kakao/oauth2/callback?code=" + code; | ||
| ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); | ||
|
|
||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); | ||
| } | ||
|
|
||
| // 회원을 찾을 수 없는 경우 | ||
| @Test | ||
| public void testCallbackKakaoMemberNotFound() { | ||
| String code = "valid_code"; | ||
|
|
||
| when(kakaoService.login(code)).thenThrow(MemberNotFoundException.class); // 메시지 없이 예외 타입만 설정 | ||
|
|
||
| String url = "http://localhost:" + port + "/kakao/oauth2/callback?code=" + code; | ||
| ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); | ||
|
|
||
| assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); | ||
| assertThat(response.getBody()).contains("register"); | ||
| } |
| @Test | ||
| void test1(){ | ||
| var url = "https://kauth.kakao.com/oauth/token"; | ||
| var code = "MZqnpa_Ch0moTrUURmm4PEi74CgD3sYdPdG1cJU4nnv4ilOioKXq5AAAAAQKPCQfAAABkPMfVqjNsk3jZ7dWzg"; |
There was a problem hiding this comment.
이 코드가 여기 있어도 괜찮을까요?
최소한 properties로 빼서 관리되면 좋을 것 같아요!
There was a problem hiding this comment.
넵 수정하고 서비스 내에서도 url 사용하도록 바꿨습니다!
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
안녕하세요 멘토님,
리뷰요청드립니다!
1단계 진행사항입니다