From 44ded27a2f74227b686fc8c8363d41c39428d757 Mon Sep 17 00:00:00 2001 From: Veljko Tosic Date: Sat, 14 Feb 2026 22:40:57 +0100 Subject: [PATCH] Renamed to avoid confusion with domain model repositories --- ...eshTokenRepository.cs => IRefreshTokenManager.cs} | 2 +- .../User/Command/LogIn/LogInUserCommandHandler.cs | 8 ++++---- .../User/Command/LogOut/LogOutCommandHandler.cs | 8 ++++---- .../Command/LogOutAll/LogOutAllCommandHandler.cs | 8 ++++---- .../RefreshLogIn/RefreshLogInCommandHandler.cs | 12 ++++++------ .../DI/PersistenceRegistrationExtensions.cs | 2 +- ...reshTokenRepository.cs => RefreshTokenManager.cs} | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) rename dotnet/AipsCore/Application/Abstract/UserContext/{IRefreshTokenRepository.cs => IRefreshTokenManager.cs} (92%) rename dotnet/AipsCore/Infrastructure/Persistence/RefreshToken/{RefreshTokenRepository.cs => RefreshTokenManager.cs} (93%) diff --git a/dotnet/AipsCore/Application/Abstract/UserContext/IRefreshTokenRepository.cs b/dotnet/AipsCore/Application/Abstract/UserContext/IRefreshTokenManager.cs similarity index 92% rename from dotnet/AipsCore/Application/Abstract/UserContext/IRefreshTokenRepository.cs rename to dotnet/AipsCore/Application/Abstract/UserContext/IRefreshTokenManager.cs index a2b88dc..7610e12 100644 --- a/dotnet/AipsCore/Application/Abstract/UserContext/IRefreshTokenRepository.cs +++ b/dotnet/AipsCore/Application/Abstract/UserContext/IRefreshTokenManager.cs @@ -3,7 +3,7 @@ using AipsCore.Domain.Models.User.ValueObjects; namespace AipsCore.Application.Abstract.UserContext; -public interface IRefreshTokenRepository +public interface IRefreshTokenManager { Task AddAsync(string token, UserId userId, CancellationToken cancellationToken = default); Task GetByValueAsync(string token, CancellationToken cancellationToken = default); diff --git a/dotnet/AipsCore/Application/Models/User/Command/LogIn/LogInUserCommandHandler.cs b/dotnet/AipsCore/Application/Models/User/Command/LogIn/LogInUserCommandHandler.cs index 47abc89..6936746 100644 --- a/dotnet/AipsCore/Application/Models/User/Command/LogIn/LogInUserCommandHandler.cs +++ b/dotnet/AipsCore/Application/Models/User/Command/LogIn/LogInUserCommandHandler.cs @@ -9,18 +9,18 @@ namespace AipsCore.Application.Models.User.Command.LogIn; public class LogInUserCommandHandler : ICommandHandler { private readonly ITokenProvider _tokenProvider; - private readonly IRefreshTokenRepository _refreshTokenRepository; + private readonly IRefreshTokenManager _refreshTokenManager; private readonly IAuthService _authService; private readonly IUnitOfWork _unitOfWork; public LogInUserCommandHandler( ITokenProvider tokenProvider, - IRefreshTokenRepository refreshTokenRepository, + IRefreshTokenManager refreshTokenManager, IAuthService authService, IUnitOfWork unitOfWork) { _tokenProvider = tokenProvider; - _refreshTokenRepository = refreshTokenRepository; + _refreshTokenManager = refreshTokenManager; _authService = authService; _unitOfWork = unitOfWork; } @@ -32,7 +32,7 @@ public class LogInUserCommandHandler : ICommandHandler { - private readonly IRefreshTokenRepository _refreshTokenRepository; + private readonly IRefreshTokenManager _refreshTokenManager; - public LogOutCommandHandler(IRefreshTokenRepository refreshTokenRepository) + public LogOutCommandHandler(IRefreshTokenManager refreshTokenManager) { - _refreshTokenRepository = refreshTokenRepository; + _refreshTokenManager = refreshTokenManager; } public async Task Handle(LogOutCommand command, CancellationToken cancellationToken = default) { - await _refreshTokenRepository.RevokeAsync(command.RefreshToken, cancellationToken); + await _refreshTokenManager.RevokeAsync(command.RefreshToken, cancellationToken); } } \ No newline at end of file diff --git a/dotnet/AipsCore/Application/Models/User/Command/LogOutAll/LogOutAllCommandHandler.cs b/dotnet/AipsCore/Application/Models/User/Command/LogOutAll/LogOutAllCommandHandler.cs index c324d76..46ba9d3 100644 --- a/dotnet/AipsCore/Application/Models/User/Command/LogOutAll/LogOutAllCommandHandler.cs +++ b/dotnet/AipsCore/Application/Models/User/Command/LogOutAll/LogOutAllCommandHandler.cs @@ -5,12 +5,12 @@ namespace AipsCore.Application.Models.User.Command.LogOutAll; public class LogOutAllCommandHandler : ICommandHandler { - private readonly IRefreshTokenRepository _refreshTokenRepository; + private readonly IRefreshTokenManager _refreshTokenManager; private readonly IUserContext _userContext; - public LogOutAllCommandHandler(IRefreshTokenRepository refreshTokenRepository, IUserContext userContext) + public LogOutAllCommandHandler(IRefreshTokenManager refreshTokenManager, IUserContext userContext) { - _refreshTokenRepository = refreshTokenRepository; + _refreshTokenManager = refreshTokenManager; _userContext = userContext; } @@ -18,6 +18,6 @@ public class LogOutAllCommandHandler : ICommandHandler { var userId = _userContext.GetCurrentUserId(); - return _refreshTokenRepository.RevokeAllAsync(userId, cancellationToken); + return _refreshTokenManager.RevokeAllAsync(userId, cancellationToken); } } \ No newline at end of file diff --git a/dotnet/AipsCore/Application/Models/User/Command/RefreshLogIn/RefreshLogInCommandHandler.cs b/dotnet/AipsCore/Application/Models/User/Command/RefreshLogIn/RefreshLogInCommandHandler.cs index 6d1b568..e725d63 100644 --- a/dotnet/AipsCore/Application/Models/User/Command/RefreshLogIn/RefreshLogInCommandHandler.cs +++ b/dotnet/AipsCore/Application/Models/User/Command/RefreshLogIn/RefreshLogInCommandHandler.cs @@ -9,33 +9,33 @@ namespace AipsCore.Application.Models.User.Command.RefreshLogIn; public class RefreshLogInCommandHandler : ICommandHandler { private readonly ITokenProvider _tokenProvider; - private readonly IRefreshTokenRepository _refreshTokenRepository; + private readonly IRefreshTokenManager _refreshTokenManager; private readonly IAuthService _authService; private readonly IUnitOfWork _unitOfWork; public RefreshLogInCommandHandler( ITokenProvider tokenProvider, - IRefreshTokenRepository refreshTokenRepository, + IRefreshTokenManager refreshTokenManager, IAuthService authService, IUnitOfWork unitOfWork) { _tokenProvider = tokenProvider; - _refreshTokenRepository = refreshTokenRepository; + _refreshTokenManager = refreshTokenManager; _authService = authService; _unitOfWork = unitOfWork; } public async Task Handle(RefreshLogInCommand command, CancellationToken cancellationToken = default) { - var refreshToken = await _refreshTokenRepository.GetByValueAsync(command.RefreshToken, cancellationToken); + var refreshToken = await _refreshTokenManager.GetByValueAsync(command.RefreshToken, cancellationToken); var loginResult = await _authService.LoginWithRefreshTokenAsync(refreshToken, cancellationToken); var newAccessToken = _tokenProvider.GenerateAccessToken(loginResult.User, loginResult.Roles); var newRefreshToken = _tokenProvider.GenerateRefreshToken(); - await _refreshTokenRepository.RevokeAsync(refreshToken.Value, cancellationToken); - await _refreshTokenRepository.AddAsync(newRefreshToken, loginResult.User.Id, cancellationToken); + await _refreshTokenManager.RevokeAsync(refreshToken.Value, cancellationToken); + await _refreshTokenManager.AddAsync(newRefreshToken, loginResult.User.Id, cancellationToken); await _unitOfWork.SaveChangesAsync(cancellationToken); diff --git a/dotnet/AipsCore/Infrastructure/DI/PersistenceRegistrationExtensions.cs b/dotnet/AipsCore/Infrastructure/DI/PersistenceRegistrationExtensions.cs index f442a23..4a67c18 100644 --- a/dotnet/AipsCore/Infrastructure/DI/PersistenceRegistrationExtensions.cs +++ b/dotnet/AipsCore/Infrastructure/DI/PersistenceRegistrationExtensions.cs @@ -36,7 +36,7 @@ public static class PersistenceRegistrationExtensions services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); return services; } diff --git a/dotnet/AipsCore/Infrastructure/Persistence/RefreshToken/RefreshTokenRepository.cs b/dotnet/AipsCore/Infrastructure/Persistence/RefreshToken/RefreshTokenManager.cs similarity index 93% rename from dotnet/AipsCore/Infrastructure/Persistence/RefreshToken/RefreshTokenRepository.cs rename to dotnet/AipsCore/Infrastructure/Persistence/RefreshToken/RefreshTokenManager.cs index 30d73e2..29e0e7f 100644 --- a/dotnet/AipsCore/Infrastructure/Persistence/RefreshToken/RefreshTokenRepository.cs +++ b/dotnet/AipsCore/Infrastructure/Persistence/RefreshToken/RefreshTokenManager.cs @@ -6,12 +6,12 @@ using Microsoft.EntityFrameworkCore; namespace AipsCore.Infrastructure.Persistence.RefreshToken; -public class RefreshTokenRepository : IRefreshTokenRepository +public class RefreshTokenManager : IRefreshTokenManager { private readonly AipsDbContext _dbContext; private readonly JwtSettings _jwtSettings; - public RefreshTokenRepository(AipsDbContext dbContext, JwtSettings jwtSettings) + public RefreshTokenManager(AipsDbContext dbContext, JwtSettings jwtSettings) { _dbContext = dbContext; _jwtSettings = jwtSettings;