diff --git a/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/auth/AuthenticationController.java b/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/auth/AuthenticationController.java index 4810a8c..c86ab37 100644 --- a/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/auth/AuthenticationController.java +++ b/src/main/java/com/mirna/hospitalmanagementapi/application/controllers/auth/AuthenticationController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.mirna.hospitalmanagementapi.domain.dtos.auth.UserLoginDTO; +import com.mirna.hospitalmanagementapi.domain.dtos.auth.UserDTO; import com.mirna.hospitalmanagementapi.domain.entities.auth.User; import com.mirna.hospitalmanagementapi.domain.services.auth.AuthService; import com.mirna.hospitalmanagementapi.domain.services.auth.jwt.TokenService; @@ -36,14 +36,14 @@ public class AuthenticationController { /** * Performs the user login * - * @param userLoginDTO A data transfer object containing the user data to perform the login + * @param userDTO A data transfer object containing the user data to perform the login * * @return The authorization token if successful, or an unauthorized status if there is an error. */ @PostMapping - public ResponseEntity login(@RequestBody @Valid UserLoginDTO userLoginDTO) { + public ResponseEntity login(@RequestBody @Valid UserDTO userDTO) { - Authentication auth = authService.login(userLoginDTO); + Authentication auth = authService.login(userDTO); User authenticatedUser = (User) auth.getPrincipal(); diff --git a/src/main/java/com/mirna/hospitalmanagementapi/application/services/auth/AuthServiceImpl.java b/src/main/java/com/mirna/hospitalmanagementapi/application/services/auth/AuthServiceImpl.java index e93cd3f..cda74b4 100644 --- a/src/main/java/com/mirna/hospitalmanagementapi/application/services/auth/AuthServiceImpl.java +++ b/src/main/java/com/mirna/hospitalmanagementapi/application/services/auth/AuthServiceImpl.java @@ -6,7 +6,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; -import com.mirna.hospitalmanagementapi.domain.dtos.auth.UserLoginDTO; +import com.mirna.hospitalmanagementapi.domain.dtos.auth.UserDTO; import com.mirna.hospitalmanagementapi.domain.services.auth.AuthService; /** @@ -26,16 +26,15 @@ public class AuthServiceImpl implements AuthService { /** * Performs the user login * - * @param userLoginDTO Data transfer object containing user credentials for login + * @param userAuthDTO Data transfer object containing user credentials for authentication operations * @return A fully authentication object including the credentials */ @Override - public Authentication login(UserLoginDTO userLoginDTO) { - UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userLoginDTO.login(), - userLoginDTO.password()); + public Authentication login(UserDTO userDTO) { + UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userDTO.login(), + userDTO.password()); return manager.authenticate(token); } - } diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/auth/UserLoginDTO.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/auth/UserDTO.java similarity index 87% rename from src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/auth/UserLoginDTO.java rename to src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/auth/UserDTO.java index cb476b7..79f9b66 100644 --- a/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/auth/UserLoginDTO.java +++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/dtos/auth/UserDTO.java @@ -4,11 +4,11 @@ import jakarta.persistence.Column; import jakarta.validation.constraints.NotBlank; /** -* Data transfer object used to store the user information requested to perform the login +* Data transfer object used to store the user information requested to perform authentication operations * @author Mirna Gama * @version 1.0 */ -public record UserLoginDTO( +public record UserDTO( @NotBlank(message="login cannot be blank") @Column(name="login") String login, diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/services/auth/AuthService.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/services/auth/AuthService.java index 657d4d6..49c8505 100644 --- a/src/main/java/com/mirna/hospitalmanagementapi/domain/services/auth/AuthService.java +++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/services/auth/AuthService.java @@ -2,7 +2,7 @@ package com.mirna.hospitalmanagementapi.domain.services.auth; import org.springframework.security.core.Authentication; -import com.mirna.hospitalmanagementapi.domain.dtos.auth.UserLoginDTO; +import com.mirna.hospitalmanagementapi.domain.dtos.auth.UserDTO; /** * Authentication service interface for managing authentication and registration. @@ -16,8 +16,8 @@ public interface AuthService { /** * Performs the user login * - * @param userLoginDTO Data transfer object containing user credentials for login + * @param userDTO Data transfer object containing user credentials for authentication operations * @return A fully authentication object including the credentials */ - public Authentication login(UserLoginDTO userLoginDTO); + public Authentication login(UserDTO userDTO); }