UDT-008: Gestión completa de usuarios #11
@@ -1,3 +1,4 @@
|
|||||||
|
using SIGCM2.Application.Common;
|
||||||
using SIGCM2.Domain.Entities;
|
using SIGCM2.Domain.Entities;
|
||||||
|
|
||||||
namespace SIGCM2.Application.Abstractions.Persistence;
|
namespace SIGCM2.Application.Abstractions.Persistence;
|
||||||
@@ -8,4 +9,12 @@ public interface IUsuarioRepository
|
|||||||
Task<Usuario?> GetByIdAsync(int id, CancellationToken ct = default);
|
Task<Usuario?> GetByIdAsync(int id, CancellationToken ct = default);
|
||||||
Task<bool> ExistsByUsernameAsync(string username, CancellationToken ct = default);
|
Task<bool> ExistsByUsernameAsync(string username, CancellationToken ct = default);
|
||||||
Task<int> AddAsync(Usuario usuario, CancellationToken ct = default);
|
Task<int> AddAsync(Usuario usuario, CancellationToken ct = default);
|
||||||
|
|
||||||
|
// UDT-008
|
||||||
|
Task UpdateUltimoLoginAsync(int id, DateTime utcNow, CancellationToken ct = default);
|
||||||
|
Task<PagedResult<UsuarioListItem>> GetPagedAsync(UsuariosQuery query, CancellationToken ct = default);
|
||||||
|
Task<Usuario?> GetDetailAsync(int id, CancellationToken ct = default);
|
||||||
|
Task UpdateAsync(int id, UpdateUsuarioFields fields, DateTime fechaModificacion, CancellationToken ct = default);
|
||||||
|
Task UpdatePasswordAsync(int id, string passwordHash, bool mustChangePassword, CancellationToken ct = default);
|
||||||
|
Task<int> CountActiveAdminsAsync(CancellationToken ct = default);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using SIGCM2.Application.Abstractions;
|
using SIGCM2.Application.Abstractions;
|
||||||
using SIGCM2.Application.Abstractions.Persistence;
|
using SIGCM2.Application.Abstractions.Persistence;
|
||||||
using SIGCM2.Application.Abstractions.Security;
|
using SIGCM2.Application.Abstractions.Security;
|
||||||
@@ -17,6 +18,7 @@ public sealed class LoginCommandHandler : ICommandHandler<LoginCommand, LoginRes
|
|||||||
private readonly IClientContext _clientContext;
|
private readonly IClientContext _clientContext;
|
||||||
private readonly AuthOptions _authOptions;
|
private readonly AuthOptions _authOptions;
|
||||||
private readonly IRolPermisoRepository _rolPermisoRepository;
|
private readonly IRolPermisoRepository _rolPermisoRepository;
|
||||||
|
private readonly ILogger<LoginCommandHandler> _logger;
|
||||||
|
|
||||||
public LoginCommandHandler(
|
public LoginCommandHandler(
|
||||||
IUsuarioRepository repository,
|
IUsuarioRepository repository,
|
||||||
@@ -26,7 +28,8 @@ public sealed class LoginCommandHandler : ICommandHandler<LoginCommand, LoginRes
|
|||||||
IRefreshTokenGenerator refreshGenerator,
|
IRefreshTokenGenerator refreshGenerator,
|
||||||
IClientContext clientContext,
|
IClientContext clientContext,
|
||||||
AuthOptions authOptions,
|
AuthOptions authOptions,
|
||||||
IRolPermisoRepository rolPermisoRepository)
|
IRolPermisoRepository rolPermisoRepository,
|
||||||
|
ILogger<LoginCommandHandler> logger)
|
||||||
{
|
{
|
||||||
_repository = repository;
|
_repository = repository;
|
||||||
_hasher = hasher;
|
_hasher = hasher;
|
||||||
@@ -36,6 +39,7 @@ public sealed class LoginCommandHandler : ICommandHandler<LoginCommand, LoginRes
|
|||||||
_clientContext = clientContext;
|
_clientContext = clientContext;
|
||||||
_authOptions = authOptions;
|
_authOptions = authOptions;
|
||||||
_rolPermisoRepository = rolPermisoRepository;
|
_rolPermisoRepository = rolPermisoRepository;
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<LoginResponseDto> Handle(LoginCommand command)
|
public async Task<LoginResponseDto> Handle(LoginCommand command)
|
||||||
@@ -61,8 +65,18 @@ public sealed class LoginCommandHandler : ICommandHandler<LoginCommand, LoginRes
|
|||||||
_clientContext.Ip, _clientContext.UserAgent);
|
_clientContext.Ip, _clientContext.UserAgent);
|
||||||
await _refreshRepository.AddAsync(entity);
|
await _refreshRepository.AddAsync(entity);
|
||||||
|
|
||||||
|
// UDT-008: update UltimoLogin best-effort — never block login on this
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _repository.UpdateUltimoLoginAsync(usuario.Id, now);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "Failed to update UltimoLogin for usuario {Id} — login proceeds", usuario.Id);
|
||||||
|
}
|
||||||
|
|
||||||
// UDT-006: permisos vienen de RolPermiso, no de Usuario.PermisosJson
|
// UDT-006: permisos vienen de RolPermiso, no de Usuario.PermisosJson
|
||||||
// Usuario.PermisosJson queda reservado para UDT-008 (overrides por usuario)
|
// Usuario.PermisosJson queda reservado para UDT-009 (overrides por usuario)
|
||||||
var permisoEntities = await _rolPermisoRepository.GetByRolCodigoAsync(usuario.Rol);
|
var permisoEntities = await _rolPermisoRepository.GetByRolCodigoAsync(usuario.Rol);
|
||||||
var permisos = permisoEntities.Select(p => p.Codigo).ToArray();
|
var permisos = permisoEntities.Select(p => p.Codigo).ToArray();
|
||||||
|
|
||||||
@@ -72,9 +86,11 @@ public sealed class LoginCommandHandler : ICommandHandler<LoginCommand, LoginRes
|
|||||||
ExpiresIn: _authOptions.AccessTokenMinutes * 60,
|
ExpiresIn: _authOptions.AccessTokenMinutes * 60,
|
||||||
Usuario: new UsuarioDto(
|
Usuario: new UsuarioDto(
|
||||||
Id: usuario.Id,
|
Id: usuario.Id,
|
||||||
|
Username: usuario.Username,
|
||||||
Nombre: $"{usuario.Nombre} {usuario.Apellido}".Trim(),
|
Nombre: $"{usuario.Nombre} {usuario.Apellido}".Trim(),
|
||||||
Rol: usuario.Rol,
|
Rol: usuario.Rol,
|
||||||
Permisos: permisos
|
Permisos: permisos,
|
||||||
|
MustChangePassword: usuario.MustChangePassword
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,9 @@ public sealed record LoginResponseDto(
|
|||||||
|
|
||||||
public sealed record UsuarioDto(
|
public sealed record UsuarioDto(
|
||||||
int Id,
|
int Id,
|
||||||
|
string Username, // UDT-008
|
||||||
string Nombre,
|
string Nombre,
|
||||||
string Rol,
|
string Rol,
|
||||||
string[] Permisos
|
string[] Permisos,
|
||||||
|
bool MustChangePassword // UDT-008
|
||||||
);
|
);
|
||||||
|
|||||||
9
src/api/SIGCM2.Application/Common/PagedResult.cs
Normal file
9
src/api/SIGCM2.Application/Common/PagedResult.cs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
namespace SIGCM2.Application.Common;
|
||||||
|
|
||||||
|
/// <summary>Generic paged result for list queries.</summary>
|
||||||
|
public sealed record PagedResult<T>(
|
||||||
|
IReadOnlyList<T> Items,
|
||||||
|
int Page,
|
||||||
|
int PageSize,
|
||||||
|
int Total
|
||||||
|
);
|
||||||
10
src/api/SIGCM2.Application/Common/UpdateUsuarioFields.cs
Normal file
10
src/api/SIGCM2.Application/Common/UpdateUsuarioFields.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
namespace SIGCM2.Application.Common;
|
||||||
|
|
||||||
|
/// <summary>Mutable fields for updating a usuario profile. Username and PasswordHash are immutable.</summary>
|
||||||
|
public sealed record UpdateUsuarioFields(
|
||||||
|
string Nombre,
|
||||||
|
string Apellido,
|
||||||
|
string? Email,
|
||||||
|
string Rol,
|
||||||
|
bool Activo
|
||||||
|
);
|
||||||
14
src/api/SIGCM2.Application/Common/UsuarioListItem.cs
Normal file
14
src/api/SIGCM2.Application/Common/UsuarioListItem.cs
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
namespace SIGCM2.Application.Common;
|
||||||
|
|
||||||
|
/// <summary>Light projection of a usuario for list views.</summary>
|
||||||
|
public sealed record UsuarioListItem(
|
||||||
|
int Id,
|
||||||
|
string Username,
|
||||||
|
string Nombre,
|
||||||
|
string Apellido,
|
||||||
|
string? Email,
|
||||||
|
string Rol,
|
||||||
|
bool Activo,
|
||||||
|
DateTime? UltimoLogin,
|
||||||
|
DateTime? FechaModificacion
|
||||||
|
);
|
||||||
10
src/api/SIGCM2.Application/Common/UsuariosQuery.cs
Normal file
10
src/api/SIGCM2.Application/Common/UsuariosQuery.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
namespace SIGCM2.Application.Common;
|
||||||
|
|
||||||
|
/// <summary>Query parameters for listing usuarios with optional filters and paging.</summary>
|
||||||
|
public sealed record UsuariosQuery(
|
||||||
|
int Page,
|
||||||
|
int PageSize,
|
||||||
|
string? Rol,
|
||||||
|
bool? Activo,
|
||||||
|
string? Search
|
||||||
|
);
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
|
using System.Text;
|
||||||
using Dapper;
|
using Dapper;
|
||||||
using SIGCM2.Application.Abstractions.Persistence;
|
using SIGCM2.Application.Abstractions.Persistence;
|
||||||
|
using SIGCM2.Application.Common;
|
||||||
using SIGCM2.Domain.Entities;
|
using SIGCM2.Domain.Entities;
|
||||||
|
|
||||||
namespace SIGCM2.Infrastructure.Persistence;
|
namespace SIGCM2.Infrastructure.Persistence;
|
||||||
@@ -19,7 +21,8 @@ public sealed class UsuarioRepository : IUsuarioRepository
|
|||||||
SELECT
|
SELECT
|
||||||
Id, Username, PasswordHash,
|
Id, Username, PasswordHash,
|
||||||
Nombre, Apellido, Email,
|
Nombre, Apellido, Email,
|
||||||
Rol, PermisosJson, Activo
|
Rol, PermisosJson, Activo,
|
||||||
|
FechaModificacion, UltimoLogin, MustChangePassword
|
||||||
FROM dbo.Usuario
|
FROM dbo.Usuario
|
||||||
WHERE Username = @Username
|
WHERE Username = @Username
|
||||||
AND Activo = 1
|
AND Activo = 1
|
||||||
@@ -41,7 +44,8 @@ public sealed class UsuarioRepository : IUsuarioRepository
|
|||||||
SELECT
|
SELECT
|
||||||
Id, Username, PasswordHash,
|
Id, Username, PasswordHash,
|
||||||
Nombre, Apellido, Email,
|
Nombre, Apellido, Email,
|
||||||
Rol, PermisosJson, Activo
|
Rol, PermisosJson, Activo,
|
||||||
|
FechaModificacion, UltimoLogin, MustChangePassword
|
||||||
FROM dbo.Usuario
|
FROM dbo.Usuario
|
||||||
WHERE Id = @Id
|
WHERE Id = @Id
|
||||||
""";
|
""";
|
||||||
@@ -94,6 +98,136 @@ public sealed class UsuarioRepository : IUsuarioRepository
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UDT-008 ─────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
public async Task UpdateUltimoLoginAsync(int id, DateTime utcNow, CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
const string sql = """
|
||||||
|
UPDATE dbo.Usuario SET UltimoLogin = @Utc WHERE Id = @Id
|
||||||
|
""";
|
||||||
|
|
||||||
|
await using var connection = _connectionFactory.CreateConnection();
|
||||||
|
await connection.OpenAsync(ct);
|
||||||
|
await connection.ExecuteAsync(sql, new { Utc = utcNow, Id = id });
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<PagedResult<UsuarioListItem>> GetPagedAsync(UsuariosQuery query, CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
// Clamp paging params
|
||||||
|
var page = Math.Max(1, query.Page);
|
||||||
|
var pageSize = Math.Clamp(query.PageSize, 1, 100);
|
||||||
|
var offset = (page - 1) * pageSize;
|
||||||
|
|
||||||
|
var where = new StringBuilder("WHERE 1=1");
|
||||||
|
var parameters = new DynamicParameters();
|
||||||
|
parameters.Add("PageSize", pageSize);
|
||||||
|
parameters.Add("Offset", offset);
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(query.Rol))
|
||||||
|
{
|
||||||
|
where.Append(" AND Rol = @Rol");
|
||||||
|
parameters.Add("Rol", query.Rol);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (query.Activo.HasValue)
|
||||||
|
{
|
||||||
|
where.Append(" AND Activo = @Activo");
|
||||||
|
parameters.Add("Activo", query.Activo.Value ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(query.Search))
|
||||||
|
{
|
||||||
|
where.Append(" AND (Username LIKE @Search OR Nombre LIKE @Search OR Apellido LIKE @Search OR Email LIKE @Search)");
|
||||||
|
parameters.Add("Search", $"%{query.Search}%");
|
||||||
|
}
|
||||||
|
|
||||||
|
var sql = $"""
|
||||||
|
SELECT
|
||||||
|
Id, Username, Nombre, Apellido, Email, Rol, Activo, UltimoLogin, FechaModificacion,
|
||||||
|
COUNT(*) OVER() AS TotalCount
|
||||||
|
FROM dbo.Usuario
|
||||||
|
{where}
|
||||||
|
ORDER BY Username
|
||||||
|
OFFSET @Offset ROWS FETCH NEXT @PageSize ROWS ONLY
|
||||||
|
""";
|
||||||
|
|
||||||
|
await using var connection = _connectionFactory.CreateConnection();
|
||||||
|
await connection.OpenAsync(ct);
|
||||||
|
|
||||||
|
var rows = await connection.QueryAsync<UsuarioPagedRow>(sql, parameters);
|
||||||
|
var list = rows.ToList();
|
||||||
|
|
||||||
|
var total = list.Count > 0 ? list[0].TotalCount : 0;
|
||||||
|
var items = list.Select(r => new UsuarioListItem(
|
||||||
|
r.Id, r.Username, r.Nombre, r.Apellido, r.Email, r.Rol, r.Activo, r.UltimoLogin, r.FechaModificacion
|
||||||
|
)).ToList();
|
||||||
|
|
||||||
|
return new PagedResult<UsuarioListItem>(items, page, pageSize, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<Usuario?> GetDetailAsync(int id, CancellationToken ct = default)
|
||||||
|
=> await GetByIdAsync(id, ct);
|
||||||
|
|
||||||
|
public async Task UpdateAsync(int id, UpdateUsuarioFields fields, DateTime fechaModificacion, CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
const string sql = """
|
||||||
|
UPDATE dbo.Usuario
|
||||||
|
SET Nombre = @Nombre,
|
||||||
|
Apellido = @Apellido,
|
||||||
|
Email = @Email,
|
||||||
|
Rol = @Rol,
|
||||||
|
Activo = @Activo,
|
||||||
|
FechaModificacion = @FechaModificacion
|
||||||
|
WHERE Id = @Id
|
||||||
|
""";
|
||||||
|
|
||||||
|
await using var connection = _connectionFactory.CreateConnection();
|
||||||
|
await connection.OpenAsync(ct);
|
||||||
|
await connection.ExecuteAsync(sql, new
|
||||||
|
{
|
||||||
|
fields.Nombre,
|
||||||
|
fields.Apellido,
|
||||||
|
fields.Email,
|
||||||
|
fields.Rol,
|
||||||
|
fields.Activo,
|
||||||
|
FechaModificacion = fechaModificacion,
|
||||||
|
Id = id
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UpdatePasswordAsync(int id, string passwordHash, bool mustChangePassword, CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
const string sql = """
|
||||||
|
UPDATE dbo.Usuario
|
||||||
|
SET PasswordHash = @PasswordHash,
|
||||||
|
MustChangePassword = @MustChangePassword,
|
||||||
|
FechaModificacion = SYSUTCDATETIME()
|
||||||
|
WHERE Id = @Id
|
||||||
|
""";
|
||||||
|
|
||||||
|
await using var connection = _connectionFactory.CreateConnection();
|
||||||
|
await connection.OpenAsync(ct);
|
||||||
|
await connection.ExecuteAsync(sql, new
|
||||||
|
{
|
||||||
|
PasswordHash = passwordHash,
|
||||||
|
MustChangePassword = mustChangePassword ? 1 : 0,
|
||||||
|
Id = id
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<int> CountActiveAdminsAsync(CancellationToken ct = default)
|
||||||
|
{
|
||||||
|
const string sql = """
|
||||||
|
SELECT COUNT(1) FROM dbo.Usuario WITH (NOLOCK) WHERE Activo = 1 AND Rol = 'admin'
|
||||||
|
""";
|
||||||
|
|
||||||
|
await using var connection = _connectionFactory.CreateConnection();
|
||||||
|
await connection.OpenAsync(ct);
|
||||||
|
return await connection.ExecuteScalarAsync<int>(sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── mapping ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
private static Usuario MapRow(UsuarioRow row)
|
private static Usuario MapRow(UsuarioRow row)
|
||||||
=> new(
|
=> new(
|
||||||
id: row.Id,
|
id: row.Id,
|
||||||
@@ -104,7 +238,10 @@ public sealed class UsuarioRepository : IUsuarioRepository
|
|||||||
email: row.Email,
|
email: row.Email,
|
||||||
rol: row.Rol,
|
rol: row.Rol,
|
||||||
permisosJson: row.PermisosJson,
|
permisosJson: row.PermisosJson,
|
||||||
activo: row.Activo
|
activo: row.Activo,
|
||||||
|
fechaModificacion: row.FechaModificacion,
|
||||||
|
ultimoLogin: row.UltimoLogin,
|
||||||
|
mustChangePassword: row.MustChangePassword
|
||||||
);
|
);
|
||||||
|
|
||||||
// Flat DTO for Dapper mapping (avoids polluting domain entity with Dapper attributes)
|
// Flat DTO for Dapper mapping (avoids polluting domain entity with Dapper attributes)
|
||||||
@@ -117,6 +254,22 @@ public sealed class UsuarioRepository : IUsuarioRepository
|
|||||||
string? Email,
|
string? Email,
|
||||||
string Rol,
|
string Rol,
|
||||||
string PermisosJson,
|
string PermisosJson,
|
||||||
bool Activo
|
bool Activo,
|
||||||
|
DateTime? FechaModificacion,
|
||||||
|
DateTime? UltimoLogin,
|
||||||
|
bool MustChangePassword
|
||||||
|
);
|
||||||
|
|
||||||
|
private sealed record UsuarioPagedRow(
|
||||||
|
int Id,
|
||||||
|
string Username,
|
||||||
|
string Nombre,
|
||||||
|
string Apellido,
|
||||||
|
string? Email,
|
||||||
|
string Rol,
|
||||||
|
bool Activo,
|
||||||
|
DateTime? UltimoLogin,
|
||||||
|
DateTime? FechaModificacion,
|
||||||
|
int TotalCount
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using NSubstitute;
|
using NSubstitute;
|
||||||
using SIGCM2.Application.Abstractions;
|
using SIGCM2.Application.Abstractions;
|
||||||
using SIGCM2.Application.Abstractions.Persistence;
|
using SIGCM2.Application.Abstractions.Persistence;
|
||||||
@@ -19,6 +20,7 @@ public class LoginCommandHandlerTests
|
|||||||
private readonly IRefreshTokenGenerator _refreshGenerator = Substitute.For<IRefreshTokenGenerator>();
|
private readonly IRefreshTokenGenerator _refreshGenerator = Substitute.For<IRefreshTokenGenerator>();
|
||||||
private readonly IClientContext _clientCtx = Substitute.For<IClientContext>();
|
private readonly IClientContext _clientCtx = Substitute.For<IClientContext>();
|
||||||
private readonly IRolPermisoRepository _rolPermisoRepo = Substitute.For<IRolPermisoRepository>();
|
private readonly IRolPermisoRepository _rolPermisoRepo = Substitute.For<IRolPermisoRepository>();
|
||||||
|
private readonly ILogger<LoginCommandHandler> _logger = Substitute.For<ILogger<LoginCommandHandler>>();
|
||||||
private readonly AuthOptions _authOptions = new() { AccessTokenMinutes = 60, RefreshTokenDays = 7 };
|
private readonly AuthOptions _authOptions = new() { AccessTokenMinutes = 60, RefreshTokenDays = 7 };
|
||||||
private readonly LoginCommandHandler _handler;
|
private readonly LoginCommandHandler _handler;
|
||||||
|
|
||||||
@@ -29,6 +31,10 @@ public class LoginCommandHandlerTests
|
|||||||
_refreshGenerator.Generate().Returns("raw_refresh_token_value");
|
_refreshGenerator.Generate().Returns("raw_refresh_token_value");
|
||||||
_refreshRepo.AddAsync(Arg.Any<RefreshToken>()).Returns(1);
|
_refreshRepo.AddAsync(Arg.Any<RefreshToken>()).Returns(1);
|
||||||
|
|
||||||
|
// Default: UpdateUltimoLoginAsync succeeds silently
|
||||||
|
_repository.UpdateUltimoLoginAsync(Arg.Any<int>(), Arg.Any<DateTime>(), Arg.Any<CancellationToken>())
|
||||||
|
.Returns(Task.CompletedTask);
|
||||||
|
|
||||||
// Default: repo devuelve lista vacía — tests que necesitan permisos la sobreescriben
|
// Default: repo devuelve lista vacía — tests que necesitan permisos la sobreescriben
|
||||||
_rolPermisoRepo.GetByRolCodigoAsync(Arg.Any<string>(), Arg.Any<CancellationToken>())
|
_rolPermisoRepo.GetByRolCodigoAsync(Arg.Any<string>(), Arg.Any<CancellationToken>())
|
||||||
.Returns(new List<Permiso>().AsReadOnly());
|
.Returns(new List<Permiso>().AsReadOnly());
|
||||||
@@ -36,7 +42,7 @@ public class LoginCommandHandlerTests
|
|||||||
_handler = new LoginCommandHandler(
|
_handler = new LoginCommandHandler(
|
||||||
_repository, _hasher, _jwtService,
|
_repository, _hasher, _jwtService,
|
||||||
_refreshRepo, _refreshGenerator, _clientCtx, _authOptions,
|
_refreshRepo, _refreshGenerator, _clientCtx, _authOptions,
|
||||||
_rolPermisoRepo);
|
_rolPermisoRepo, _logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scenario: valid credentials → returns token response with usuario populated
|
// Scenario: valid credentials → returns token response with usuario populated
|
||||||
@@ -243,4 +249,78 @@ public class LoginCommandHandlerTests
|
|||||||
t.ExpiresAt >= before.AddDays(6).AddHours(23) &&
|
t.ExpiresAt >= before.AddDays(6).AddHours(23) &&
|
||||||
t.ExpiresAt <= after.AddDays(7).AddSeconds(5)));
|
t.ExpiresAt <= after.AddDays(7).AddSeconds(5)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── UDT-008: username + mustChangePassword + UltimoLogin ─────────────────
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Handle_PopulatesUsername_InUsuarioDto()
|
||||||
|
{
|
||||||
|
var usuario = new Usuario(1, "jperez", "$2a$12$hash", "Juan", "Pérez", null, "cajero", "[]", true);
|
||||||
|
_repository.GetByUsernameAsync("jperez").Returns(usuario);
|
||||||
|
_hasher.Verify(Arg.Any<string>(), Arg.Any<string>()).Returns(true);
|
||||||
|
_jwtService.GenerateAccessToken(Arg.Any<Usuario>()).Returns("jwt");
|
||||||
|
|
||||||
|
var result = await _handler.Handle(new LoginCommand("jperez", "pass"));
|
||||||
|
|
||||||
|
Assert.Equal("jperez", result.Usuario.Username);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Handle_PopulatesMustChangePassword_False_WhenZero()
|
||||||
|
{
|
||||||
|
var usuario = new Usuario(1, "jperez", "$2a$12$hash", "Juan", "Pérez", null, "cajero", "[]", true,
|
||||||
|
mustChangePassword: false);
|
||||||
|
_repository.GetByUsernameAsync("jperez").Returns(usuario);
|
||||||
|
_hasher.Verify(Arg.Any<string>(), Arg.Any<string>()).Returns(true);
|
||||||
|
_jwtService.GenerateAccessToken(Arg.Any<Usuario>()).Returns("jwt");
|
||||||
|
|
||||||
|
var result = await _handler.Handle(new LoginCommand("jperez", "pass"));
|
||||||
|
|
||||||
|
Assert.False(result.Usuario.MustChangePassword);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Handle_PopulatesMustChangePassword_True_WhenSet()
|
||||||
|
{
|
||||||
|
var usuario = new Usuario(1, "jperez", "$2a$12$hash", "Juan", "Pérez", null, "cajero", "[]", true,
|
||||||
|
mustChangePassword: true);
|
||||||
|
_repository.GetByUsernameAsync("jperez").Returns(usuario);
|
||||||
|
_hasher.Verify(Arg.Any<string>(), Arg.Any<string>()).Returns(true);
|
||||||
|
_jwtService.GenerateAccessToken(Arg.Any<Usuario>()).Returns("jwt");
|
||||||
|
|
||||||
|
var result = await _handler.Handle(new LoginCommand("jperez", "pass"));
|
||||||
|
|
||||||
|
Assert.True(result.Usuario.MustChangePassword);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Handle_CallsUpdateUltimoLoginAsync_AfterSuccessfulAuth()
|
||||||
|
{
|
||||||
|
var usuario = new Usuario(1, "jperez", "$2a$12$hash", "Juan", "Pérez", null, "cajero", "[]", true);
|
||||||
|
_repository.GetByUsernameAsync("jperez").Returns(usuario);
|
||||||
|
_hasher.Verify(Arg.Any<string>(), Arg.Any<string>()).Returns(true);
|
||||||
|
_jwtService.GenerateAccessToken(Arg.Any<Usuario>()).Returns("jwt");
|
||||||
|
|
||||||
|
await _handler.Handle(new LoginCommand("jperez", "pass"));
|
||||||
|
|
||||||
|
await _repository.Received(1).UpdateUltimoLoginAsync(1, Arg.Any<DateTime>(), Arg.Any<CancellationToken>());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task Handle_Succeeds_EvenIf_UpdateUltimoLogin_Throws()
|
||||||
|
{
|
||||||
|
var usuario = new Usuario(1, "jperez", "$2a$12$hash", "Juan", "Pérez", null, "cajero", "[]", true);
|
||||||
|
_repository.GetByUsernameAsync("jperez").Returns(usuario);
|
||||||
|
_hasher.Verify(Arg.Any<string>(), Arg.Any<string>()).Returns(true);
|
||||||
|
_jwtService.GenerateAccessToken(Arg.Any<Usuario>()).Returns("jwt");
|
||||||
|
|
||||||
|
// Simulate DB hiccup on UltimoLogin update
|
||||||
|
_repository.UpdateUltimoLoginAsync(Arg.Any<int>(), Arg.Any<DateTime>(), Arg.Any<CancellationToken>())
|
||||||
|
.Returns(Task.FromException(new Exception("DB timeout")));
|
||||||
|
|
||||||
|
// Login must still succeed
|
||||||
|
var result = await _handler.Handle(new LoginCommand("jperez", "pass"));
|
||||||
|
Assert.NotNull(result);
|
||||||
|
Assert.NotNull(result.AccessToken);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user