🚀 Merge pull request #37 from local-mood/fix/33-auth-api

Fix: 회원 API 미작동 오류 수정 (1차)
local-mood · Dec 22, 2023 · f2792fb · f2792fb
2 parents f362569 + 8632130
commit f2792fb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/main/java/com/ceos/vote/auth/controller/AuthController.java b/src/main/java/com/ceos/vote/auth/controller/AuthController.java
@@ -6,6 +6,7 @@
 import com.ceos.vote.auth.dto.SignupRequestDto;
 
 import com.ceos.vote.common.dto.ResponseDto;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.web.server.Cookie;
@@ -23,9 +24,9 @@ public class AuthController {
 
     // 회원가입
     @PostMapping("/signup")
-    public ResponseEntity<?> join(@RequestBody @Valid SignupRequestDto requestDto) {
-        authService.joinMember(requestDto);
-        return ResponseDto.ok();
+    public ResponseEntity<?> join(@RequestBody @Valid SignupRequestDto signupRequest) {
+
+        return ResponseDto.ok(authService.joinMember(signupRequest));
     }
 
     // 로그인
@@ -40,15 +41,16 @@ public ResponseEntity<?> login(@RequestBody LoginRequestDto loginRequest) {
                 .secure(true)
                 .sameSite(Cookie.SameSite.NONE.attributeValue())    //서드파티 쿠키 사용 허용
                 .build();
-        return ResponseEntity.ok()
-                .header(HttpHeaders.SET_COOKIE, httpCookie.toString())
-                .header(HttpHeaders.AUTHORIZATION, "Bearer " + tokenDto.getAccessToken())
-                .build();
+
+        return ResponseDto.ok(tokenDto);
     }
 
     // 토큰 유효성 검사
     @PostMapping("/validate")
-    public ResponseEntity<?> validate(@RequestHeader("Authorization") String requestAccessToken) {
+    public ResponseEntity<?> validate(HttpServletRequest request) {
+
+        String requestAccessToken = request.getHeader(HttpHeaders.AUTHORIZATION);
+
         if (!authService.validate(requestAccessToken)) {
             return ResponseEntity.ok().build();
         } else {
@@ -58,8 +60,9 @@ public ResponseEntity<?> validate(@RequestHeader("Authorization") String request
 
     // 토큰 재발급
     @PostMapping("/reissue")
-    public ResponseEntity<?> reissue(@CookieValue(name = "refresh-token") String requestRefreshToken,
-                                     @RequestHeader("Authorization") String requestAccessToken) {
+    public ResponseEntity<?> reissue(@CookieValue(name = "refresh-token") String requestRefreshToken, HttpServletRequest request) {
+
+        String requestAccessToken = request.getHeader(HttpHeaders.AUTHORIZATION);
 
         TokenDto newAuthToken = authService.reissue(requestAccessToken, requestRefreshToken);
 
@@ -90,7 +93,9 @@ public ResponseEntity<?> reissue(@CookieValue(name = "refresh-token") String req
 
     // 로그아웃
     @PostMapping("/logout")
-    public ResponseEntity<?> logout(@RequestHeader("Authorization") String requestAccessToken) {
+    public ResponseEntity<?> logout(HttpServletRequest request) {
+
+        String requestAccessToken = request.getHeader(HttpHeaders.AUTHORIZATION);
 
         // Access Token을 무효화하여 로그아웃 처리
         authService.logout(requestAccessToken);
@@ -100,7 +105,6 @@ public ResponseEntity<?> logout(@RequestHeader("Authorization") String requestAc
                 .path("/")
                 .build();
 
-
         return ResponseEntity.status(HttpStatus.OK)
                 .header(HttpHeaders.SET_COOKIE, responseCookie.toString())
                 .build();

diff --git a/src/main/java/com/ceos/vote/auth/service/AuthService.java b/src/main/java/com/ceos/vote/auth/service/AuthService.java
@@ -38,7 +38,7 @@ public class AuthService {
 
     // 회원가입
     @Transactional
-    public void joinMember(SignupRequestDto requestDto) {
+    public Member joinMember(SignupRequestDto requestDto) {
 
         // 이메일, ID 중복 검사
         if (findUserByEmail(requestDto.getEmail()))
@@ -49,6 +49,8 @@ public void joinMember(SignupRequestDto requestDto) {
 
         Member member = requestDto.toMember(passwordEncoder, teamRepository);
         memberRepository.save(member);
+
+        return member;
     }