Merge pull request #41 from SWEET-DEVELOPERS/feature/#40-member

[fix] 로그인 API 코드 수정
SWEET-DEVELOPERS · Jan 11, 2024 · 2fbb13d · 2fbb13d
2 parents 44d343b + 912c9d2
commit 2fbb13d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 30 deletions.
diff --git a/src/main/java/org/sopt/sweet/domain/member/controller/OAuthApi.java b/src/main/java/org/sopt/sweet/domain/member/controller/OAuthApi.java
@@ -49,13 +49,11 @@ ResponseEntity<SuccessResponse<?>> kakaoLogin(
     @Operation(summary = "카카오 로그아웃")
     @PostMapping("/api/oauth/kakao/logout")
     ResponseEntity<SuccessResponse<?>> kakaoLogout(
-            @RequestHeader("Authorization") String accessToken,
             @Parameter(
-                    description = "멤버 아이디",
+                    description = "authorization token에서 얻은 userId, 임의입력하면 대체됩니다.",
                     required = true,
-                    example = "1"
-            )
-            @RequestBody String memberId
+                    example = "12345"
+            ) @UserId Long userId
     );
 
 }
diff --git a/src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java b/src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java
@@ -5,6 +5,7 @@
 import org.sopt.sweet.domain.member.dto.response.MemberTokenResponseDto;
 import org.sopt.sweet.domain.member.service.OAuthService;
 import org.sopt.sweet.global.common.SuccessResponse;
+import org.sopt.sweet.global.config.auth.UserId;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +22,7 @@ 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.socialId());
+        MemberTokenResponseDto memberToken = oAuthService.saveToken(userInfo.memberId());
 
         Map<String, Object> loginResponse = new HashMap<>();
         loginResponse.put("userInfo", userInfo);
@@ -32,8 +33,8 @@ public ResponseEntity<SuccessResponse<?>> kakaoLogin(@RequestParam("code") Strin
 
 
     @PostMapping("/kakao/logout")
-    public ResponseEntity<SuccessResponse<?>> kakaoLogout(@RequestHeader("Authorization") String accessToken,@RequestBody String socialId) {
-        oAuthService.kakaoLogout(accessToken, socialId);
+    public ResponseEntity<SuccessResponse<?>> kakaoLogout(@UserId Long userId) {
+        oAuthService.kakaoLogout(userId);
         return SuccessResponse.ok("로그아웃 성공");
     }
 

diff --git a/src/main/java/org/sopt/sweet/domain/member/service/OAuthService.java b/src/main/java/org/sopt/sweet/domain/member/service/OAuthService.java
@@ -48,6 +48,9 @@ private String issueNewRefreshToken(Long memberId) {
     @Value("${spring.security.oauth2.client.registration.kakao.redirect-uri}")
     private String redirectUri;
 
+    @Value("${jwt.refresh-token-expire-time}")
+    private long REFRESH_TOKEN_EXPIRE_TIME;
+
     private final ObjectMapper objectMapper;
     private final RedisTemplate<String, String> redisTemplate;
 
@@ -122,6 +125,7 @@ public KakaoUserInfoResponseDto saveMember(Long socialId, String nickname, Strin
         return new KakaoUserInfoResponseDto(existMember.getId(), socialId, nickname, profileImage);
     }
 
+
     // 카카오 로그인 시 토큰 저장
     public MemberTokenResponseDto saveToken(Long memberId) {
         String refreshToken = null;
@@ -134,7 +138,7 @@ public MemberTokenResponseDto saveToken(Long memberId) {
             refreshToken = storedRefreshToken;
         } else {
             refreshToken = issueNewRefreshToken(memberId);
-            redisTemplate.opsForValue().set(redisKey, refreshToken, 7, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set(redisKey, refreshToken, REFRESH_TOKEN_EXPIRE_TIME, TimeUnit.SECONDS);
         }
 
         System.out.println("카카오 로그인 성공 memberId: " + memberId + " accessToken :" + accessToken + " refreshToken: " + refreshToken);
@@ -143,33 +147,18 @@ public MemberTokenResponseDto saveToken(Long memberId) {
     }
 
 
-    public void kakaoLogout(String accessToken, String memberId) {
-        RestTemplate restTemplate = new RestTemplate();
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Authorization", accessToken);
+    public void kakaoLogout(Long memberId) {
 
-        HttpEntity<String> request = new HttpEntity<>(headers);
+        String redisKey = "RT:" + memberId;
+        redisTemplate.delete(redisKey);
 
-        try {
-            restTemplate.exchange(
-                    "https://kapi.kakao.com/v1/user/logout",
-                    HttpMethod.POST,
-                    request,
-                    String.class
-            );
+        System.out.println("카카오 로그아웃 성공 :" + memberId);
+    }
 
-            String redisKey = "RT:" + memberId;
-            redisTemplate.delete(redisKey);
+}
 
-            System.out.println("카카오 로그아웃 성공");
-        } catch (HttpClientErrorException e) {
-            System.err.println("Kakao API 요청 실패. 응답 코드: " + e.getRawStatusCode() + ", 응답 내용: " + e.getResponseBodyAsString());
-        }
-    }
 
 
-}