Changeset 561e9a6

Timestamp:

01/26/26 09:49:38 (6 months ago)

Author:

Filip Gavrilovski <filipgavrilovski28@…>

Branches:

main

Children:

62acea2

Parents:

b81f586

Message:

small refactor: remove redundant auth response dto

Location:

finkwave/src/main/java/com/ukim/finki/develop/finkwave

Files:

• controller/AuthController.java (modified) (3 diffs)
• dto/AuthResponseDto.java (deleted)
• service/AuthService.java (modified) (6 diffs)

finkwave/src/main/java/com/ukim/finki/develop/finkwave/controller/AuthController.java

@@ -17 +17 @@
 
 import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.AuthResponseDto;
 import com.ukim.finki.develop.finkwave.dto.LoginRequestDto;
 import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.service.AuthService;
 
-import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -39 +37 @@
             HttpServletResponse httpServletResponse){
         try {
-            AuthResponseDto authResponse = authService.registerAndLogIn(httpServletResponse, authRequestDto);
+            UserResponseDto userResponseDto = authService.registerAndLogIn(httpServletResponse, authRequestDto);
             return ResponseEntity.ok(Map.of(
-                    "user", authResponse.userResponseDto(),
+                    "user", userResponseDto,
                     "tokenExpiresIn", accessTokenMaxAge
             ));
@@ -56 +54 @@
             HttpServletResponse httpServletResponse){
         try {
-            AuthResponseDto authResponse = authService.login(httpServletResponse, loginRequestDto);
+            UserResponseDto userResponseDto = authService.login(httpServletResponse, loginRequestDto);
             return ResponseEntity.ok(Map.of(
-                    "user", authResponse.userResponseDto(),
+                    "user", userResponseDto,
                     "tokenExpiresIn", accessTokenMaxAge
                     )

finkwave/src/main/java/com/ukim/finki/develop/finkwave/service/AuthService.java

@@ -6 +6 @@
 
 import com.ukim.finki.develop.finkwave.dto.AuthRequestDto;
-import com.ukim.finki.develop.finkwave.dto.AuthResponseDto;
 import com.ukim.finki.develop.finkwave.dto.UserResponseDto;
 import com.ukim.finki.develop.finkwave.model.NonAdminUser;
@@ -32 +31 @@
     // todo: should it be transactional?
 //    @Transactional
-    public AuthResponseDto registerAndLogIn(HttpServletResponse response, AuthRequestDto authRequestDto){
+    public UserResponseDto registerAndLogIn(HttpServletResponse response, AuthRequestDto authRequestDto){
         if (userRepository.findByUsername(authRequestDto.username()).isPresent()){
             throw new RuntimeException("User already exists");
@@ -56 +55 @@
 
     // todo: dto in arguments or the standalone values?
-    public AuthResponseDto login(HttpServletResponse response, LoginRequestDto loginRequestDto){
+    public UserResponseDto login(HttpServletResponse response, LoginRequestDto loginRequestDto){
         User user = userRepository.findByUsername(loginRequestDto.username())
                 .orElseThrow(() -> new RuntimeException("Invalid credentials"));
@@ -67 +66 @@
 
         UserResponseDto userResponseDto = new UserResponseDto(user.getUsername(), user.getRole());
-        // todo: dto inside a dto??
-        AuthResponseDto authResponseDto = new AuthResponseDto(accessToken, refreshToken, userResponseDto);
-        addTokensToResponse(response, authResponseDto);
-        return authResponseDto;
+        addTokensToResponse(response, refreshToken, accessToken);
+        return userResponseDto;
     }
 
@@ -123 +120 @@
 
 
-    private void addTokensToResponse(HttpServletResponse response, AuthResponseDto authResponse){
-        Cookie refreshCookie = new Cookie("refreshToken", authResponse.refreshToken().getToken());
+    private void addTokensToResponse(HttpServletResponse response, RefreshToken refreshToken, String accessToken){
+        Cookie refreshCookie = new Cookie("refreshToken", refreshToken.getToken());
         refreshCookie.setSecure(false);
         refreshCookie.setHttpOnly(true);
@@ -131 +128 @@
         response.addCookie(refreshCookie);
 
-        addAccessCookieToResponse(response, authResponse.accessToken());
+        addAccessCookieToResponse(response, accessToken);
     }
 }