hotfix: ResponseEntity.BodyBuilder 선언 및 오타 수정

tukcomCD2024 · Jan 27, 2024 · a602c76 · a602c76
1 parent c968c00
commit a602c76
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 22 deletions.
diff --git a/.idea/sonarlint/issuestore/3/2/323482c68cf68aa6001a3280b1dbb38f31ee6cbc b/.idea/sonarlint/issuestore/3/2/323482c68cf68aa6001a3280b1dbb38f31ee6cbc
diff --git a/.idea/sonarlint/issuestore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb b/.idea/sonarlint/issuestore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb
diff --git a/.idea/sonarlint/issuestore/c/5/c50f0cf17624e9670cc09596eb1c566241c04477 b/.idea/sonarlint/issuestore/c/5/c50f0cf17624e9670cc09596eb1c566241c04477
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
diff --git a/.idea/sonarlint/securityhotspotstore/3/2/323482c68cf68aa6001a3280b1dbb38f31ee6cbc b/.idea/sonarlint/securityhotspotstore/3/2/323482c68cf68aa6001a3280b1dbb38f31ee6cbc
diff --git a/.idea/sonarlint/securityhotspotstore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb b/.idea/sonarlint/securityhotspotstore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb
diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb
diff --git a/backend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java b/backend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java
@@ -6,13 +6,10 @@
 import com.isp.backend.domain.member.dto.SignUpRequest;
 import com.isp.backend.domain.member.service.MemberService;
 import com.isp.backend.global.security.CustomUserDetails;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -31,7 +28,7 @@ public String testEndpoint() {
     *   로그인 API
      */
     @PostMapping("/login")
-    public ResponseEntity<String> memberLogin(@RequestBody GoogleLoginRequest request) {
+    public ResponseEntity.BodyBuilder memberLogin(@RequestBody GoogleLoginRequest request) {
         return memberService.memberLogin(request);
     }
 

diff --git a/backend/src/main/java/com/isp/backend/domain/member/service/MemberService.java b/backend/src/main/java/com/isp/backend/domain/member/service/MemberService.java
@@ -32,23 +32,22 @@ public class MemberService {
      *   로그인 메서드 - jwt 토큰 생성후 응답
      */
     @Transactional
-    public ResponseEntity<String> memberLogin(GoogleLoginRequest request) {
+    public ResponseEntity.BodyBuilder memberLogin(GoogleLoginRequest request) {
         Optional<Member> existingMember = memberRepository.findByUid(request.getUid());
 
         if (existingMember.isPresent()) {
 
-            Member activatedMemeber = existingMember
+            Member activatedMember = existingMember
                     .filter(Member::isActivated)
                     .orElseThrow(MemberNotActivatedException::new);
 
             // 기존 회원의 로그인
-            String accessToken = tokenProvider.createAccessToken(activatedMemeber.getUid());
-            String refreshToken = tokenProvider.createRefreshToken(activatedMemeber.getUid());
+            String accessToken = tokenProvider.createAccessToken(activatedMember.getUid());
+            String refreshToken = tokenProvider.createRefreshToken(activatedMember.getUid());
 
             return ResponseEntity.ok()
                     .header("Access-Token", accessToken)
-                    .header("Refresh-Token", refreshToken)
-                    .body("기존 멤버 로그인");
+                    .header("Refresh-Token", refreshToken);
         } else {
             // 신규 회원의 로그인 - db 저장
             Member newMember = Member.builder()
@@ -62,8 +61,7 @@ public ResponseEntity<String> memberLogin(GoogleLoginRequest request) {
 
             return ResponseEntity.status(HttpStatus.CREATED)
                     .header("Access-Token", accessToken)
-                    .header("Refresh-Token", refreshToken)
-                    .body("신규 멤버 로그인");
+                    .header("Refresh-Token", refreshToken);
             }
 
     }