Refactor: 로그인 방식 수정

GDGoC-KNU-10 · Nov 15, 2024 · 866bae3 · 866bae3
1 parent f62743c
commit 866bae3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/src/main/java/com/hackathon/nullnullteam/member/controller/MemberController.java b/src/main/java/com/hackathon/nullnullteam/member/controller/MemberController.java
@@ -21,20 +21,20 @@ public class MemberController {
 
     private final MemberService memberService;
 
-    @GetMapping("/login")
+    /*@GetMapping("/login")
     public ResponseEntity<Void> login() {
         String loginUrl = memberService.getCodeUrl();
 
         return ResponseEntity.status(HttpStatus.SEE_OTHER)
                 .header("location", loginUrl)
                 .build();
-    }
+    }*/
 
     @GetMapping("/callback")
     public ResponseEntity<MemberResponse.Login> registerMember(
-            @RequestParam("code") String code
+            @RequestParam("token") String token
     ) {
-        MemberModel.Login memberInfo = memberService.register(code);
+        MemberModel.Login memberInfo = memberService.register(token);
 
 
         return ResponseEntity.status(HttpStatus.CREATED)

diff --git a/src/main/java/com/hackathon/nullnullteam/member/service/MemberService.java b/src/main/java/com/hackathon/nullnullteam/member/service/MemberService.java
@@ -26,12 +26,12 @@ public String getCodeUrl() {
     }
 
     @Transactional
-    public MemberModel.Login register(String code) {
+    public MemberModel.Login register(String token) {
         // 토큰 발급
-        TokenInfoResponse tokenResponse = memberApiCaller.getAccessToken(code);
-        String accessToken = tokenResponse.accessToken();
+        String kakaoToken = token;
+
         // 카카오 사용자 정보 요청
-        UserInfoResponse userInfoResponse = memberApiCaller.extractUserInfo(accessToken);
+        UserInfoResponse userInfoResponse = memberApiCaller.extractUserInfo(kakaoToken);
         KakaoAccount kakaoAccount = userInfoResponse.kakaoAccount();
 
         // Users 저장 및 중복 체크
@@ -41,10 +41,10 @@ public MemberModel.Login register(String code) {
                     return newMember;
                 });
 
-        String token = jwtProvider.createToken(member.getId(), member.getEmail());
-        System.out.println(token);
+        String accessToken = jwtProvider.createToken(member.getId(), member.getEmail());
+        System.out.println(accessToken);
 
-        return MemberModel.Login.from(token);
+        return MemberModel.Login.from(accessToken);
     }
 
     public MemberModel.Info getMemberInfo(Long memberId) {

diff --git a/src/main/java/com/hackathon/nullnullteam/ocr/OcrService.java b/src/main/java/com/hackathon/nullnullteam/ocr/OcrService.java
@@ -72,6 +72,12 @@ public List<String> extractTextFromImage(MultipartFile file) {
         ResponseEntity<String> response = restTemplate.exchange(ocrUrl, HttpMethod.POST, requestEntity, String.class);
         JSONObject object = new JSONObject(response.getBody());
         List<String> text = extractInferText(object);
+
+        StringBuilder sb = new StringBuilder();
+        for (String t : text) {
+            sb.append(t + " ");
+        }
+        System.out.println(sb.toString());
         return text;
     }