Merge pull request #37 from TP-RENTPLACE/feature/(TP-77)-add-auth-module

(TP-77) feat: temporally return refreshToken to responses

Author: Kattsyn

rentplace/src/main/java/kattsyn/dev/rentplace/controllers/AuthController.java

@@ -42,10 +42,11 @@ public ResponseEntity<JwtResponse> login(@RequestBody CodeRequest codeRequest) {
             description = "Получает email и код с почты. Возвращает JWT токены"
     )
     @PostMapping("/login")
-    public ResponseEntity<JwtResponse> login(@RequestBody JwtRequest authRequest,
-                                             HttpServletResponse response) throws AuthException {
+    public ResponseEntity<JwtResponse> login(@RequestBody JwtRequest authRequest/*,
+                                             HttpServletResponse response*/) throws AuthException {
         JwtResponse tokens = authService.login(authRequest);
 
+        /*
         ResponseCookie refreshCookie = ResponseCookie.from("refreshToken", tokens.getRefreshToken())
                 .httpOnly(true)
                 .secure(false) // на прод вернуть true
@@ -56,6 +57,8 @@ public ResponseEntity<JwtResponse> login(@RequestBody JwtRequest authRequest,
 
         response.addHeader(HttpHeaders.SET_COOKIE, refreshCookie.toString());
 
+         */
+
         /*
         // Настройка cookie для refresh token
         Cookie refreshTokenCookie = new Cookie("refreshToken", tokens.getRefreshToken());
@@ -69,7 +72,7 @@ public ResponseEntity<JwtResponse> login(@RequestBody JwtRequest authRequest,
          */
 
         return ResponseEntity.ok()
-                .body(new JwtResponse(tokens.getAccessToken(), null));
+                .body(tokens);
     }
 
     @Operation(
@@ -87,8 +90,8 @@ public ResponseEntity<JwtResponse> getNewAccessToken(@RequestBody RefreshJwtRequ
             description = "Принимает еще не истекший RefreshToken и возвращает новый, продленный."
     )
     @PostMapping("/refresh")
-    public ResponseEntity<JwtResponse> refresh(@CookieValue(name = "refreshToken") String refreshToken, HttpServletResponse response) throws AuthException {
-        JwtResponse jwtResponse = authService.refresh(refreshToken);
+    public ResponseEntity<JwtResponse> refresh(/*@CookieValue(name = "refreshToken") String refreshToken, HttpServletResponse response*/ @RequestBody RefreshJwtRequest request) throws AuthException {
+        JwtResponse jwtResponse = authService.refresh(request.getRefreshToken());
 
         /*
         Cookie refreshCookie = new Cookie("refreshToken", jwtResponse.getRefreshToken());
@@ -98,7 +101,7 @@ public ResponseEntity<JwtResponse> refresh(@CookieValue(name = "refreshToken") S
         refreshCookie.setMaxAge(30 * 24 * 60 * 60);
         response.addCookie(refreshCookie);
 
-         */
+
 
         ResponseCookie refreshCookie = ResponseCookie.from("refreshToken", jwtResponse.getRefreshToken())
                 .httpOnly(true)
@@ -109,10 +112,10 @@ public ResponseEntity<JwtResponse> refresh(@CookieValue(name = "refreshToken") S
                 .build();
 
         response.addHeader(HttpHeaders.SET_COOKIE, refreshCookie.toString());
-
+         */
 
         return ResponseEntity.ok()
-                .body(new JwtResponse(jwtResponse.getAccessToken(), null));
+                .body(jwtResponse);
     }
 
 }

rentplace/src/main/java/kattsyn/dev/rentplace/dtos/JwtResponse.java

@@ -15,7 +15,7 @@ public class JwtResponse {
     private final String type = "Bearer ";
     private String accessToken;
 
-    @JsonIgnore
+    //@JsonIgnore
     private String refreshToken;
 
 }