[R9] Rename user dto so it can be used to perform auth operations
This commit is contained in:
parent
93dadf2913
commit
90301bd5fb
@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody;
|
|||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
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.entities.auth.User;
|
||||||
import com.mirna.hospitalmanagementapi.domain.services.auth.AuthService;
|
import com.mirna.hospitalmanagementapi.domain.services.auth.AuthService;
|
||||||
import com.mirna.hospitalmanagementapi.domain.services.auth.jwt.TokenService;
|
import com.mirna.hospitalmanagementapi.domain.services.auth.jwt.TokenService;
|
||||||
@ -36,14 +36,14 @@ public class AuthenticationController {
|
|||||||
/**
|
/**
|
||||||
* Performs the user login
|
* 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.
|
* @return The authorization token if successful, or an unauthorized status if there is an error.
|
||||||
*/
|
*/
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public ResponseEntity<Object> login(@RequestBody @Valid UserLoginDTO userLoginDTO) {
|
public ResponseEntity<Object> login(@RequestBody @Valid UserDTO userDTO) {
|
||||||
|
|
||||||
Authentication auth = authService.login(userLoginDTO);
|
Authentication auth = authService.login(userDTO);
|
||||||
|
|
||||||
User authenticatedUser = (User) auth.getPrincipal();
|
User authenticatedUser = (User) auth.getPrincipal();
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
|
|||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.stereotype.Service;
|
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;
|
import com.mirna.hospitalmanagementapi.domain.services.auth.AuthService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -26,16 +26,15 @@ public class AuthServiceImpl implements AuthService {
|
|||||||
/**
|
/**
|
||||||
* Performs the user login
|
* 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
|
* @return A fully authentication object including the credentials
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Authentication login(UserLoginDTO userLoginDTO) {
|
public Authentication login(UserDTO userDTO) {
|
||||||
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userLoginDTO.login(),
|
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userDTO.login(),
|
||||||
userLoginDTO.password());
|
userDTO.password());
|
||||||
|
|
||||||
return manager.authenticate(token);
|
return manager.authenticate(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,11 +4,11 @@ import jakarta.persistence.Column;
|
|||||||
import jakarta.validation.constraints.NotBlank;
|
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
|
* @author Mirna Gama
|
||||||
* @version 1.0
|
* @version 1.0
|
||||||
*/
|
*/
|
||||||
public record UserLoginDTO(
|
public record UserDTO(
|
||||||
@NotBlank(message="login cannot be blank")
|
@NotBlank(message="login cannot be blank")
|
||||||
@Column(name="login")
|
@Column(name="login")
|
||||||
String login,
|
String login,
|
||||||
@ -2,7 +2,7 @@ package com.mirna.hospitalmanagementapi.domain.services.auth;
|
|||||||
|
|
||||||
import org.springframework.security.core.Authentication;
|
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.
|
* Authentication service interface for managing authentication and registration.
|
||||||
@ -16,8 +16,8 @@ public interface AuthService {
|
|||||||
/**
|
/**
|
||||||
* Performs the user login
|
* 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
|
* @return A fully authentication object including the credentials
|
||||||
*/
|
*/
|
||||||
public Authentication login(UserLoginDTO userLoginDTO);
|
public Authentication login(UserDTO userDTO);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user