Merge branch 'master' into ValidationForCreateDTOs

Author: SharifovDeveloper

CheckDrive.Api/CheckDrive.Api/Controllers/AccountsController.cs

@@ -1,5 +1,7 @@
-using CheckDrive.Application.DTOs.Account;
+using CheckDrive.Application.Constants;
+using CheckDrive.Application.DTOs.Account;
 using CheckDrive.Application.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace CheckDrive.Api.Controllers;
@@ -32,6 +34,7 @@ public async Task<ActionResult<AccountDto>> GetAccountByIdAsync(string id)
     }
 
     [HttpPost]
+    [Authorize(Roles = $"{Roles.Manager},{Roles.Administrator}")]
     public async Task<ActionResult<AccountDto>> CreateAsync([FromBody] CreateAccountDto account)
     {
         var createdAccount = await _service.CreateAsync(account);

CheckDrive.Api/CheckDrive.Api/Controllers/Auth/AuthController.cs

@@ -0,0 +1,25 @@
+using CheckDrive.Application.DTOs.Identity;
+using CheckDrive.Application.Interfaces.Auth;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CheckDrive.Api.Controllers.Auth;
+
+[Route("api/auth")]
+[ApiController]
+public class AuthController : ControllerBase
+{
+    private readonly IAuthService _authService;
+
+    public AuthController(IAuthService authService)
+    {
+        _authService = authService ?? throw new ArgumentNullException(nameof(authService));
+    }
+
+    [HttpPost("login")]
+    public async Task<IActionResult> LoginAsync([FromBody] LoginDto request)
+    {
+        var token = await _authService.LoginAsync(request);
+
+        return Ok(token);
+    }
+}

CheckDrive.Api/CheckDrive.Api/Extensions/DependencyInjection.cs

@@ -13,6 +13,7 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using System.Text;
+using CheckDrive.Api.Filters;
 
 namespace CheckDrive.Api.Extensions;
 
@@ -172,3 +173,4 @@ public static void AddValidators(IServiceCollection services)
         services.AddValidatorsFromAssemblyContaining<CreateDispatcherReviewDtoValidator>();
     }
 }
+

CheckDrive.Api/CheckDrive.Api/Extensions/StartupExtensions.cs

@@ -1,7 +1,6 @@
-
-
-using CheckDrive.Api.Helpers;
+using CheckDrive.Api.Helpers;
 using CheckDrive.Api.Middlewares;
+using CheckDrive.Application.Constants;
 using CheckDrive.Domain.Interfaces;
 using CheckDrive.TestDataCreator.Configurations;
 using Microsoft.AspNetCore.Identity;

CheckDrive.Api/CheckDrive.Api/Helpers/CustomJsonFormatter.cs

@@ -2,6 +2,8 @@
 using Serilog.Formatting;
 using System.Text.Json;
 
+namespace CheckDrive.Api.Helpers;
+
 public class CustomJsonFormatter : ITextFormatter
 {
     public void Format(LogEvent logEvent, TextWriter output)

CheckDrive.Api/CheckDrive.Api/Middlewares/ErrorHandlerMiddleware.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Http.HttpResults;
+using CheckDrive.Domain.Exceptions;
+using Microsoft.AspNetCore.Http.HttpResults;
 using System.Net;
 
 namespace CheckDrive.Api.Middlewares;
@@ -37,6 +38,18 @@ private async Task HandleAsync(HttpContext context, Exception exception)
             message = exception.Message;
         }
 
+        if (exception is InvalidLoginAttemptException)
+        {
+            context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+            message = exception.Message;
+        }
+
+        if (exception is RegistrationFailedException)
+        {
+            context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+            message = exception.Message;
+        }
+
         await context.Response.WriteAsync(message);
         _logger.LogError($"{message}. {exception.Message}");
     }

CheckDrive.Api/CheckDrive.Api/Program.cs

@@ -1,4 +1,5 @@
 using CheckDrive.Api.Extensions;
+using CheckDrive.Api.Helpers;
 using Microsoft.AspNetCore.CookiePolicy;
 using Serilog;
 

CheckDrive.Api/CheckDrive.Application/Constants/Roles.cs

@@ -0,0 +1,12 @@
+namespace CheckDrive.Application.Constants;
+
+public static class Roles
+{
+    public const string Administrator = nameof(Administrator);
+    public const string Driver = nameof(Driver);
+    public const string Doctor = nameof(Doctor);
+    public const string Manager = nameof(Manager);
+    public const string Operator = nameof(Operator);
+    public const string Mechanic = nameof(Mechanic);
+    public const string Dispatcher = nameof(Dispatcher);
+}

CheckDrive.Api/CheckDrive.Application/DTOs/Identity/LoginDto.cs

@@ -0,0 +1,7 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace CheckDrive.Application.DTOs.Identity;
+
+public sealed record LoginDto(
+    string UserName,
+    string Password);

CheckDrive.Api/CheckDrive.Application/Extensions/DependencyInjection.cs

@@ -1,8 +1,10 @@
-using CheckDrive.Application.Interfaces;
-using CheckDrive.Application.Interfaces.Review;
+using CheckDrive.Application.Interfaces.Review;
+using CheckDrive.Application.Interfaces;
 using CheckDrive.Application.Services;
 using CheckDrive.Application.Services.Review;
 using Microsoft.Extensions.DependencyInjection;
+using CheckDrive.Application.Interfaces.Auth;
+using CheckDrive.Application.Services.Auth;
 
 namespace CheckDrive.Application.Extensions;
 
@@ -11,14 +13,14 @@ public static class DependencyInjection
     public static IServiceCollection RegisterApplication(this IServiceCollection services)
     {
         AddServices(services);
-
         services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
         return services;
     }
 
     private static void AddServices(IServiceCollection services)
     {
+        services.AddScoped<IAuthService, AuthService>();
         services.AddScoped<IDoctorReviewService, DoctorReviewService>();
         services.AddScoped<IMechanicHandoverService, MechanicHandoverService>();
         services.AddScoped<IOperatorReviewService, OperatorReviewService>();

CheckDrive.Api/CheckDrive.Application/Interfaces/Auth/IAuthService.cs

@@ -0,0 +1,8 @@
+using CheckDrive.Application.DTOs.Identity;
+
+namespace CheckDrive.Application.Interfaces.Auth;
+
+public interface IAuthService
+{
+    Task<string> LoginAsync(LoginDto request);
+}

CheckDrive.Api/CheckDrive.Application/Interfaces/Auth/IJwtTokenGenerator.cs

@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Identity;
+
+namespace CheckDrive.Application.Interfaces.Auth;
+
+public interface IJwtTokenGenerator
+{
+    string GenerateToken(IdentityUser user, IList<string> roles);
+}

CheckDrive.Api/CheckDrive.Application/Services/Auth/AuthService.cs

@@ -0,0 +1,35 @@
+using CheckDrive.Application.DTOs.Identity;
+using CheckDrive.Application.Interfaces.Auth;
+using CheckDrive.Domain.Exceptions;
+using Microsoft.AspNetCore.Identity;
+
+namespace CheckDrive.Application.Services.Auth;
+
+internal sealed class AuthService : IAuthService
+{
+    private readonly IJwtTokenGenerator _jwtTokenGenerator;
+    private readonly UserManager<IdentityUser> _userManager;
+
+    public AuthService(IJwtTokenGenerator jwtTokenGenerator, UserManager<IdentityUser> userManager)
+    {
+        _jwtTokenGenerator = jwtTokenGenerator ?? throw new ArgumentNullException(nameof(jwtTokenGenerator));
+        _userManager = userManager ?? throw new ArgumentNullException(nameof(userManager));
+    }
+
+    public async Task<string> LoginAsync(LoginDto request)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+
+        var user = await _userManager.FindByNameAsync(request.UserName);
+
+        if (user is null || !await _userManager.CheckPasswordAsync(user, request.Password))
+        {
+            throw new InvalidLoginAttemptException("Invalid email or password");
+        }
+
+        var roles = await _userManager.GetRolesAsync(user);
+        var token = _jwtTokenGenerator.GenerateToken(user, roles);
+
+        return token;
+    }
+}

CheckDrive.Api/CheckDrive.Application/Services/Review/MechanicHandoverService.cs

@@ -57,6 +57,7 @@ private async Task<Mechanic> GetAndValidateMechanicAsync(int mechanicId)
     private async Task<CheckPoint> GetAndValidateCheckPointAsync(int checkPointId)
     {
         var checkPoint = await _context.CheckPoints
+            .Include(x => x.DoctorReview)
             .FirstOrDefaultAsync(x => x.Id == checkPointId);
 
         if (checkPoint == null)

CheckDrive.Api/CheckDrive.Domain/Exceptions/InvalidLoginAttemptException.cs

@@ -0,0 +1,7 @@
+namespace CheckDrive.Domain.Exceptions;
+
+public class InvalidLoginAttemptException : Exception
+{
+    public InvalidLoginAttemptException() : base() { }
+    public InvalidLoginAttemptException(string message) : base(message) { }
+}

CheckDrive.Api/CheckDrive.Domain/Exceptions/RegistrationFailedException.cs

@@ -0,0 +1,7 @@
+namespace CheckDrive.Domain.Exceptions;
+
+public class RegistrationFailedException : Exception
+{
+    public RegistrationFailedException() { }
+    public RegistrationFailedException(string message) : base(message) { }
+}

CheckDrive.Api/CheckDrive.Infrastructure/Configurations/EmailConfiguration.cs

@@ -5,20 +5,20 @@ namespace CheckDrive.Infrastructure.Configurations;
 public class EmailConfigurations
 {
     public const string SectionName = nameof(EmailConfigurations);
-
-    [Required]
+    
+    [Required(ErrorMessage = "From is required")]
     [EmailAddress]
-    public required string From { get; set; }
-
-    [Required]
-    public required string Server { get; set; }
-
-    [Required]
-    public required int Port { get; set; }
-
-    [Required]
-    public required string UserName { get; set; }
-
-    [Required]
-    public required string Password { get; set; }
+    public required string From { get; init; }
+    
+    [Required(ErrorMessage = "Server is required")]
+    public required string Server { get; init; }
+    
+    [Required(ErrorMessage = "Port is required")]
+    public required int Port { get; init; }
+    
+    [Required(ErrorMessage = "Username is required")]
+    public required string UserName { get; init; }
+    
+    [Required(ErrorMessage = "Password is required")]
+    public required string Password { get; init; }
 }

CheckDrive.Api/CheckDrive.Infrastructure/Extensions/DependencyInjection.cs

@@ -1,5 +1,5 @@
-using CheckDrive.Application.Interfaces;
-using CheckDrive.Domain.Interfaces;
+using CheckDrive.Domain.Interfaces;
+using CheckDrive.Application.Interfaces;
 using CheckDrive.Infrastructure.Configurations;
 using CheckDrive.Infrastructure.Email;
 using CheckDrive.Infrastructure.Persistence;
@@ -9,6 +9,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using CheckDrive.Infrastructure.Helpers;
+using CheckDrive.Application.Interfaces.Auth;
 
 namespace CheckDrive.Infrastructure.Extensions;
 
@@ -18,8 +20,9 @@ public static IServiceCollection RegisterInfrastructure(this IServiceCollection
     {
         AddPersistence(services, configuration);
         AddConfigurations(services, configuration);
-        AddFluentEmail(services, configuration);
+        AddEmail(services, configuration);
         AddServices(services);
+        AddIdentity(services);
 
         return services;
     }
@@ -28,10 +31,6 @@ private static void AddPersistence(IServiceCollection services, IConfiguration c
     {
         services.AddDbContext<ICheckDriveDbContext, CheckDriveDbContext>(options =>
             options.UseSqlServer(configuration.GetConnectionString("DefaultConnection")));
-
-        services.AddIdentity<IdentityUser, IdentityRole>()
-            .AddEntityFrameworkStores<CheckDriveDbContext>()
-            .AddDefaultTokenProviders();
     }
 
     private static void AddConfigurations(IServiceCollection services, IConfiguration configuration)
@@ -52,7 +51,7 @@ private static void AddConfigurations(IServiceCollection services, IConfiguratio
             .ValidateOnStart();
     }
 
-    private static void AddFluentEmail(IServiceCollection services, IConfiguration configuration)
+    private static void AddEmail(IServiceCollection services, IConfiguration configuration)
     {
         var emailSettings = configuration
             .GetSection(EmailConfigurations.SectionName)
@@ -82,5 +81,25 @@ private static void AddServices(IServiceCollection services)
     {
         services.AddScoped<IEmailService, EmailService>();
         services.AddScoped<ISmsService, SmsService>();
+        services.AddSingleton<IJwtTokenGenerator, JwtTokenGenerator>();
+    }
+
+    private static void AddIdentity(IServiceCollection services)
+    {
+        services.AddIdentity<IdentityUser, IdentityRole>(options =>
+        {
+            options.Password.RequiredLength = 7;
+            options.Password.RequireUppercase = false;
+            options.Password.RequireLowercase = false;
+            options.Password.RequireNonAlphanumeric = false;
+            options.Password.RequireDigit = false;
+        })
+            .AddEntityFrameworkStores<CheckDriveDbContext>()
+            .AddDefaultTokenProviders();
+
+        services.Configure<DataProtectionTokenProviderOptions>(options =>
+        {
+            options.TokenLifespan = TimeSpan.FromHours(12);
+        });
     }
 }