Implement IAuthenticatedRequest interface and refactor clients

src/Voltiq.API/Program.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Asp.Versioning;
 using Microsoft.OpenApi;
 using Serilog;
@@ -17,7 +18,13 @@
 builder.Services.AddProblemDetails();
 builder.Services.AddExceptionHandler<GlobalExceptionHandler>();
 
-builder.Services.AddControllers();
+builder.Services.AddControllers()
+    .AddJsonOptions(options =>
+    {
+        options.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+        options.JsonSerializerOptions.DictionaryKeyPolicy = JsonNamingPolicy.CamelCase;
+    });
+
 builder.Services.AddRouting(options => options.LowercaseUrls = true);
 
 builder.Services.AddApiVersioning(options =>
@@ -49,11 +56,11 @@
                 """
                 Voltiq é uma aplicação para gerir orçamentos, clientes e materiais para
                 profissionais autônomos, principalmente eletricistas, oferecendo uma maneira
-                prática e eficiente de gerir seus clientes e orçamentos.
+                prática e eficiente de gerir seus serviços.
                 """,
             Contact = new OpenApiContact
             {
-                Name = "Team Voltiq",
+                Name = "Time Voltiq",
                 Email = "suporte@voltiq.com.br"
             }
         };
@@ -112,8 +119,10 @@ prática e eficiente de gerir seus clientes e orçamentos.
 
 app.UseHttpsRedirection();
 app.UseCors();
+
 app.UseAuthentication();
 app.UseAuthorization();
+
 app.MapControllers().RequireAuthorization();
 
 await app.RunAsync();

src/Voltiq.Application/Common/Behaviors/AuthorizationBehavior.cs

@@ -0,0 +1,29 @@
+using ErrorOr;
+using MediatR;
+using Voltiq.Application.Common.Interfaces;
+using Voltiq.Exceptions.Resources;
+
+namespace Voltiq.Application.Common.Behaviors;
+
+public sealed class AuthorizationBehavior<TRequest, TResponse>(ICurrentUserService currentUserService)
+    : IPipelineBehavior<TRequest, TResponse>
+    where TRequest : IAuthenticatedRequest<TResponse>
+    where TResponse : IErrorOr
+{
+    public async Task<TResponse> Handle(
+        TRequest request,
+        RequestHandlerDelegate<TResponse> next,
+        CancellationToken cancellationToken)
+    {
+        var userId = currentUserService.UserId;
+
+        if (userId == Guid.Empty)
+        {
+            var error = Error.Unauthorized(description: ResourceErrorMessages.TITULO_NAO_AUTORIZADO);
+            return (dynamic)error;
+        }
+
+        request.UserId = userId;
+        return await next(cancellationToken);
+    }
+}

src/Voltiq.Application/Common/Behaviors/ValidationBehavior.cs

@@ -1,11 +1,11 @@
-using System.Reflection;
 using ErrorOr;
 using FluentValidation;
 using MediatR;
 
 namespace Voltiq.Application.Common.Behaviors;
 
-public sealed class ValidationBehavior<TRequest, TResponse>(IEnumerable<IValidator<TRequest>> validators)
+public sealed class ValidationBehavior<TRequest, TResponse>(
+    IEnumerable<IValidator<TRequest>> validators)
     : IPipelineBehavior<TRequest, TResponse>
     where TRequest : IRequest<TResponse>
     where TResponse : IErrorOr
@@ -20,36 +20,16 @@ public async Task<TResponse> Handle(
 
         var context = new ValidationContext<TRequest>(request);
 
-        var failures = validators
+        var errors = validators
             .Select(v => v.Validate(context))
             .SelectMany(r => r.Errors)
             .Where(f => f is not null)
+            .Select(f => Error.Validation(f.PropertyName, f.ErrorMessage))
             .ToList();
 
-        if (failures.Count == 0)
+        if (errors.Count == 0)
             return await next(cancellationToken);
 
-        var errors = failures
-            .Select(f => Error.Validation(code: f.PropertyName, description: f.ErrorMessage))
-            .ToList();
-
-        return CreateFailure(errors);
-    }
-
-    private static TResponse CreateFailure(List<Error> errors)
-    {
-        var responseType = typeof(TResponse);
-
-        if (responseType.IsGenericType && responseType.GetGenericTypeDefinition() == typeof(ErrorOr<>))
-        {
-            var typeArg = responseType.GetGenericArguments()[0];
-            var implicitOp = typeof(ErrorOr<>)
-                .MakeGenericType(typeArg)
-                .GetMethod("op_Implicit", BindingFlags.Static | BindingFlags.Public, [typeof(List<Error>)])!;
-
-            return (TResponse)implicitOp.Invoke(null, [errors])!;
-        }
-
-        throw new InvalidOperationException($"Unexpected TResponse type: {responseType}");
+        return (dynamic)errors;
     }
 }

src/Voltiq.Application/Common/Interfaces/IAuthenticatedRequest.cs

@@ -0,0 +1,8 @@
+using MediatR;
+
+namespace Voltiq.Application.Common.Interfaces;
+
+public interface IAuthenticatedRequest<TResponse> : IRequest<TResponse>
+{
+    Guid UserId { get; set; }
+}

src/Voltiq.Application/DependencyInjection.cs

@@ -19,6 +19,7 @@ public static void AddApplication(this IServiceCollection services,
                 throw new InvalidOperationException("MediatR license key is not configured.");
             cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly());
             cfg.AddBehavior(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
+            cfg.AddBehavior(typeof(IPipelineBehavior<,>), typeof(AuthorizationBehavior<,>));
         });
 
         services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());

src/Voltiq.Application/Features/Auth/Commands/Login/LoginCommandHandler.cs

@@ -3,18 +3,18 @@
 using Voltiq.Application.Common.Interfaces;
 using Voltiq.Domain.Entities;
 using Voltiq.Domain.Interfaces;
-using Voltiq.Domain.Interfaces.Repositories;
+using Voltiq.Domain.Interfaces.Repositories.RefreshToken;
 using Voltiq.Domain.Interfaces.Repositories.User;
 using Voltiq.Domain.ValueObjects;
 using Voltiq.Exceptions.Resources;
 
 namespace Voltiq.Application.Features.Auth.Commands.Login;
 
 public sealed class LoginCommandHandler(
-    IUserRepository userRepository,
+    IUserReadOnlyRepository userRepository,
     IPasswordHasher passwordHasher,
     ITokenService tokenService,
-    IRefreshTokenRepository refreshTokenRepository,
+    IRefreshTokenWriteOnlyRepository refreshTokenRepository,
     IUnitOfWork unitOfWork)
     : IRequestHandler<LoginCommand, ErrorOr<LoginResponse>>
 {

src/Voltiq.Application/Features/Auth/Commands/Refresh/RefreshTokenCommandHandler.cs

@@ -3,22 +3,23 @@
 using Voltiq.Application.Common.Interfaces;
 using Voltiq.Domain.Entities;
 using Voltiq.Domain.Interfaces;
-using Voltiq.Domain.Interfaces.Repositories;
+using Voltiq.Domain.Interfaces.Repositories.RefreshToken;
 using Voltiq.Domain.Interfaces.Repositories.User;
 using Voltiq.Exceptions.Resources;
 
 namespace Voltiq.Application.Features.Auth.Commands.Refresh;
 
 public sealed class RefreshTokenCommandHandler(
-    IRefreshTokenRepository refreshTokenRepository,
-    IUserRepository userRepository,
+    IRefreshTokenReadOnlyRepository refreshTokenReadOnlyRepository,
+    IRefreshTokenWriteOnlyRepository refreshTokenWriteOnlyRepository,
+    IUserReadOnlyRepository userRepository,
     ITokenService tokenService,
     IUnitOfWork unitOfWork)
     : IRequestHandler<RefreshTokenCommand, ErrorOr<AuthResponse>>
 {
     public async Task<ErrorOr<AuthResponse>> Handle(RefreshTokenCommand request, CancellationToken cancellationToken)
     {
-        var refreshToken = await refreshTokenRepository.GetByTokenAsync(request.RefreshToken, cancellationToken);
+        var refreshToken = await refreshTokenReadOnlyRepository.GetByTokenAsync(request.RefreshToken, cancellationToken);
 
         if (refreshToken is null)
             return Error.Unauthorized(description: ResourceErrorMessages.REFRESH_TOKEN_NAO_ENCONTRADO);
@@ -40,7 +41,7 @@ public async Task<ErrorOr<AuthResponse>> Handle(RefreshTokenCommand request, Can
         var newRawRefreshToken = tokenService.GenerateRefreshToken();
 
         var newRefreshToken = RefreshToken.Create(newRawRefreshToken, user.Id, expiresInDays: 7);
-        await refreshTokenRepository.AddAsync(newRefreshToken, cancellationToken);
+        await refreshTokenWriteOnlyRepository.AddAsync(newRefreshToken, cancellationToken);
         await unitOfWork.SaveChangesAsync(cancellationToken);
 
         return new AuthResponse(newAccessToken, newRawRefreshToken);

src/Voltiq.Application/Features/Clients/Commands/DeleteClient/DeleteClientCommand.cs

@@ -1,6 +1,9 @@
 using ErrorOr;
-using MediatR;
+using Voltiq.Application.Common.Interfaces;
 
 namespace Voltiq.Application.Features.Clients.Commands.DeleteClient;
 
-public sealed record DeleteClientCommand(Guid Id) : IRequest<ErrorOr<Deleted>>;
+public sealed record DeleteClientCommand(Guid Id) : IAuthenticatedRequest<ErrorOr<Deleted>>
+{
+    public Guid UserId { get; set; }
+}

src/Voltiq.Application/Features/Clients/Commands/DeleteClient/DeleteClientCommandHandler.cs

@@ -1,28 +1,21 @@
 using ErrorOr;
 using MediatR;
-using Voltiq.Application.Common.Interfaces;
 using Voltiq.Domain.Interfaces;
 using Voltiq.Domain.Interfaces.Repositories.Client;
 using Voltiq.Exceptions.Resources;
 
 namespace Voltiq.Application.Features.Clients.Commands.DeleteClient;
 
 public sealed class DeleteClientCommandHandler(
-    IClientRepository clientRepository,
-    IUnitOfWork unitOfWork,
-    ICurrentUserService currentUserService)
+    IClientUpdateOnlyRepository clientRepository,
+    IUnitOfWork unitOfWork)
     : IRequestHandler<DeleteClientCommand, ErrorOr<Deleted>>
 {
     public async Task<ErrorOr<Deleted>> Handle(DeleteClientCommand request,
         CancellationToken cancellationToken)
     {
-        var userId = currentUserService.UserId;
-
-        if (userId == Guid.Empty)
-            return Error.Unauthorized(description: ResourceErrorMessages.TITULO_NAO_AUTORIZADO);
-
         var client =
-            await clientRepository.GetByIdAndUserIdAsync(request.Id, userId, cancellationToken);
+            await clientRepository.GetByIdAndUserIdAsync(request.Id, request.UserId, cancellationToken);
 
         if (client is null)
             return Error.NotFound(description: ResourceErrorMessages.CLIENTE_NAO_ENCONTRADO);

src/Voltiq.Application/Features/Clients/Commands/RegisterClient/RegisterClientCommand.cs

@@ -1,5 +1,5 @@
 using ErrorOr;
-using MediatR;
+using Voltiq.Application.Common.Interfaces;
 
 namespace Voltiq.Application.Features.Clients.Commands.RegisterClient;
 
@@ -11,4 +11,7 @@ public sealed record RegisterClientCommand(
     string Number,
     string City,
     string State,
-    string ZipCode) : IRequest<ErrorOr<ClientResponse>>;
+    string ZipCode) : IAuthenticatedRequest<ErrorOr<ClientResponse>>
+{
+    public Guid UserId { get; set; }
+}

src/Voltiq.Application/Features/Clients/Commands/RegisterClient/RegisterClientCommandHandler.cs

@@ -1,6 +1,5 @@
 using ErrorOr;
 using MediatR;
-using Voltiq.Application.Common.Interfaces;
 using Voltiq.Application.Mappings.Clients;
 using Voltiq.Domain.Entities;
 using Voltiq.Domain.Interfaces;
@@ -11,32 +10,27 @@
 namespace Voltiq.Application.Features.Clients.Commands.RegisterClient;
 
 public sealed class RegisterClientCommandHandler(
-    IClientRepository clientRepository,
-    IUnitOfWork unitOfWork,
-    ICurrentUserService currentUserService)
+    IClientReadOnlyRepository clientReadOnlyRepository,
+    IClientWriteOnlyRepository clientWriteOnlyRepository,
+    IUnitOfWork unitOfWork)
     : IRequestHandler<RegisterClientCommand, ErrorOr<ClientResponse>>
 {
     public async Task<ErrorOr<ClientResponse>> Handle(RegisterClientCommand request,
         CancellationToken cancellationToken)
     {
-        var userId = currentUserService.UserId;
-
-        if (userId == Guid.Empty)
-            return Error.Unauthorized(description: ResourceErrorMessages.TITULO_NAO_AUTORIZADO);
-
         var email = Email.Create(request.Email).Value;
 
-        var emailExists = await clientRepository.ExistsWithEmailForUserAsync(
-            email, userId, cancellationToken: cancellationToken);
+        var emailExists = await clientReadOnlyRepository.ExistsWithEmailForUserAsync(
+            email, request.UserId, cancellationToken: cancellationToken);
 
         if (emailExists)
             return Error.Conflict(description: ResourceErrorMessages.CLIENTE_EMAIL_JA_CADASTRADO);
 
         var address = Address.Create(request.Street, request.Number, request.City, request.State,
             request.ZipCode);
-        var client = Client.Register(userId, request.Name, request.Phone, email, address);
+        var client = Client.Register(request.UserId, request.Name, request.Phone, email, address);
 
-        await clientRepository.AddAsync(client, cancellationToken);
+        await clientWriteOnlyRepository.AddAsync(client, cancellationToken);
         await unitOfWork.SaveChangesAsync(cancellationToken);
 
         return client.ToResponse();

src/Voltiq.Application/Features/Clients/Commands/UpdateClient/UpdateClientCommand.cs

@@ -1,5 +1,5 @@
 using ErrorOr;
-using MediatR;
+using Voltiq.Application.Common.Interfaces;
 
 namespace Voltiq.Application.Features.Clients.Commands.UpdateClient;
 
@@ -12,4 +12,7 @@ public sealed record UpdateClientCommand(
     string Number,
     string City,
     string State,
-    string ZipCode) : IRequest<ErrorOr<Updated>>;
+    string ZipCode) : IAuthenticatedRequest<ErrorOr<Updated>>
+{
+    public Guid UserId { get; set; }
+}

src/Voltiq.Application/Features/Clients/Commands/UpdateClient/UpdateClientCommandHandler.cs

@@ -1,6 +1,5 @@
 using ErrorOr;
 using MediatR;
-using Voltiq.Application.Common.Interfaces;
 using Voltiq.Domain.Interfaces;
 using Voltiq.Domain.Interfaces.Repositories.Client;
 using Voltiq.Domain.ValueObjects;
@@ -9,29 +8,24 @@
 namespace Voltiq.Application.Features.Clients.Commands.UpdateClient;
 
 public sealed class UpdateClientCommandHandler(
-    IClientRepository clientRepository,
-    IUnitOfWork unitOfWork,
-    ICurrentUserService currentUserService)
+    IClientReadOnlyRepository clientReadOnlyRepository,
+    IClientUpdateOnlyRepository clientUpdateOnlyRepository,
+    IUnitOfWork unitOfWork)
     : IRequestHandler<UpdateClientCommand, ErrorOr<Updated>>
 {
     public async Task<ErrorOr<Updated>> Handle(UpdateClientCommand request,
         CancellationToken cancellationToken)
     {
-        var userId = currentUserService.UserId;
-
-        if (userId == Guid.Empty)
-            return Error.Unauthorized(description: ResourceErrorMessages.TITULO_NAO_AUTORIZADO);
-
         var client =
-            await clientRepository.GetByIdAndUserIdAsync(request.Id, userId, cancellationToken);
+            await clientUpdateOnlyRepository.GetByIdAndUserIdAsync(request.Id, request.UserId, cancellationToken);
 
         if (client is null)
             return Error.NotFound(description: ResourceErrorMessages.CLIENTE_NAO_ENCONTRADO);
 
         var email = Email.Create(request.Email).Value;
 
-        var emailExists = await clientRepository.ExistsWithEmailForUserAsync(
-            email, userId, request.Id, cancellationToken);
+        var emailExists = await clientReadOnlyRepository.ExistsWithEmailForUserAsync(
+            email, request.UserId, request.Id, cancellationToken);
 
         if (emailExists)
             return Error.Conflict(description: ResourceErrorMessages.CLIENTE_EMAIL_JA_CADASTRADO);

src/Voltiq.Application/Features/Clients/Queries/GetClientById/GetClientByIdQuery.cs

@@ -1,6 +1,9 @@
 using ErrorOr;
-using MediatR;
+using Voltiq.Application.Common.Interfaces;
 
 namespace Voltiq.Application.Features.Clients.Queries.GetClientById;
 
-public sealed record GetClientByIdQuery(Guid Id) : IRequest<ErrorOr<ClientResponse>>;
+public sealed record GetClientByIdQuery(Guid Id) : IAuthenticatedRequest<ErrorOr<ClientResponse>>
+{
+    public Guid UserId { get; set; }
+}