Merge branch 'develop' into feature/GETP-144

Principes-Artis-Mechanicae · Jul 9, 2024 · ed6834f · ed6834f
2 parents da2f37c + b0084e4
commit ed6834f
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/src/docs/asciidoc/auth/reissue-access-token.adoc b/src/docs/asciidoc/auth/reissue-access-token.adoc
@@ -0,0 +1 @@
+operation::/reissue-access-token/reissue-access-token[snippets="http-request,request-headers,http-response,response-fields-data"]
diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc
@@ -20,6 +20,7 @@ include::{docdir}/auth/login.adoc[]
 === 회원 가입 시 이메일 인증 코드 전송
 
 === Access Token 및 Refresh Token 재발급
+include::{docdir}/auth/reissue-access-token.adoc[]
 
 == 사용자
 

diff --git a/src/main/java/es/princip/getp/domain/auth/controller/AuthController.java b/src/main/java/es/princip/getp/domain/auth/controller/AuthController.java
@@ -5,12 +5,13 @@
 import es.princip.getp.domain.auth.service.AuthService;
 import es.princip.getp.global.util.ApiResponse;
 import es.princip.getp.global.util.ApiResponse.ApiSuccessResult;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,6 +45,7 @@ public ResponseEntity<ApiSuccessResult<Token>> login(@RequestBody @Valid LoginRe
      * @return 재발급 된 Access Token과 Refresh Token
      */
     @PostMapping("/reissue")
+    @PreAuthorize("isAuthenticated()")
     public ResponseEntity<ApiSuccessResult<Token>> reissueAccessToken(HttpServletRequest servletRequest) {
         Token token = authService.reissueAccessToken(servletRequest);
         String authorization = token.grantType() + " " + token.accessToken();

diff --git a/src/test/java/es/princip/getp/domain/auth/controller/AuthControllerTest.java b/src/test/java/es/princip/getp/domain/auth/controller/AuthControllerTest.java
@@ -7,7 +7,9 @@
 import es.princip.getp.domain.auth.service.AuthService;
 import es.princip.getp.global.controller.ErrorCodeController;
 import es.princip.getp.global.exception.BusinessLogicException;
+import es.princip.getp.global.mock.WithCustomMockUser;
 import es.princip.getp.global.support.AbstractControllerTest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -17,8 +19,11 @@
 
 import static es.princip.getp.global.support.ErrorCodeFields.errorCodeFields;
 import static es.princip.getp.global.support.FieldDescriptorHelper.getDescriptor;
+import static es.princip.getp.global.support.HeaderDescriptorHelper.authorizationHeaderDescriptor;
 import static es.princip.getp.global.support.PayloadDocumentationHelper.responseFields;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
+import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.restdocs.snippet.Attributes.key;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
@@ -84,4 +89,38 @@ void login_WhenEmailAndPasswordIsIncorrect_ShouldFail() throws Exception {
                 .andDo(print());
         }
     }
+
+    @DisplayName("사용자는")
+    @Nested
+    class ReissueAccessToken {
+
+        @DisplayName("로그인 유지를 할 수 있다.")
+        @Test
+        @WithCustomMockUser
+        void reissueAccessToken() throws Exception {
+            given(authService.reissueAccessToken(any(HttpServletRequest.class)))
+                .willReturn(Token.builder()
+                    .grantType("Bearer")
+                    .accessToken("access-token")
+                    .refreshToken("refresh-token")
+                    .build());
+
+            mockMvc.perform(post("/auth/reissue")
+                .header("Authorization", "Bearer ${ACCESS_TOKEN}")
+                .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isCreated())
+                .andDo(
+                    restDocs.document(
+                        requestHeaders(authorizationHeaderDescriptor()),
+                        responseFields(
+                            getDescriptor("grantType", "토큰 타입", Token.class)
+                                .attributes(key("format").value("Bearer")),
+                            getDescriptor("accessToken", "Access Token", Token.class),
+                            getDescriptor("refreshToken", "Refresh Token", Token.class)
+                        )
+                    )
+                )
+                .andDo(print());
+        }
+    }
 }