code style improvements

Author: Mirazyzz

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

@@ -1,11 +1,8 @@
-using CheckDrive.Application.Constants;
-using CheckDrive.Application.DTOs.Identity;
-using CheckDrive.Application.Interfaces;
-using CheckDrive.Application.Interfaces.Authorization;
-using Microsoft.AspNetCore.Authorization;
+using CheckDrive.Application.DTOs.Identity;
+using CheckDrive.Application.Interfaces.Auth;
 using Microsoft.AspNetCore.Mvc;
 
-namespace CheckDrive.Api.Controllers.Authorization;
+namespace CheckDrive.Api.Controllers.Auth;
 
 [Route("api/auth")]
 [ApiController]
@@ -22,6 +19,7 @@ public AuthController(IAuthService authService)
     public async Task<IActionResult> LoginAsync([FromBody] LoginDto request)
     {
         var token = await _authService.LoginAsync(request);
+
         return Ok(token);
     }
 }

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

@@ -1,5 +1,3 @@
-using CheckDrive.Infrastructure.Persistence;
-using FluentEmail.MailKitSmtp;
 using CheckDrive.Application.Extensions;
 using CheckDrive.Infrastructure.Configurations;
 using CheckDrive.Infrastructure.Extensions;
@@ -11,7 +9,6 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using System.Text;
-using Microsoft.AspNetCore.Identity;
 using CheckDrive.Api.Filters;
 
 namespace CheckDrive.Api.Extensions;

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/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

@@ -1,6 +1,6 @@
 namespace CheckDrive.Application.Constants;
 
-public class Roles
+public static class Roles
 {
     public const string Administrator = nameof(Administrator);
     public const string Driver = nameof(Driver);

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

@@ -1,11 +1,10 @@
-using CheckDrive.Application.Interfaces.Authorization;
-using CheckDrive.Application.Interfaces.Review;
-using CheckDrive.Application.Services.Authorization;
-using CheckDrive.Application.Interfaces;
+using CheckDrive.Application.Interfaces.Review;
+using CheckDrive.Application.Interfaces;
 using CheckDrive.Application.Services;
 using CheckDrive.Application.Services.Review;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using CheckDrive.Application.Interfaces.Auth;
+using CheckDrive.Application.Services.Auth;
 
 namespace CheckDrive.Application.Extensions;
 

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/Authorization/IJwtTokenGenerator.cs CheckDrive.Api/CheckDrive.Application/Interfaces/Auth/IJwtTokenGenerator.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace CheckDrive.Application.Interfaces.Authorization;
+namespace CheckDrive.Application.Interfaces.Auth;
 
 public interface IJwtTokenGenerator
 {

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

@@ -1,9 +1,9 @@
 using CheckDrive.Application.DTOs.Identity;
-using CheckDrive.Application.Interfaces.Authorization;
+using CheckDrive.Application.Interfaces.Auth;
 using CheckDrive.Domain.Exceptions;
 using Microsoft.AspNetCore.Identity;
 
-namespace CheckDrive.Application.Services.Authorization;
+namespace CheckDrive.Application.Services.Auth;
 
 internal sealed class AuthService : IAuthService
 {
@@ -16,27 +16,18 @@ public AuthService(IJwtTokenGenerator jwtTokenGenerator, UserManager<IdentityUse
         _userManager = userManager ?? throw new ArgumentNullException(nameof(userManager));
     }
 
-    public async Task<string> LoginAsync(LoginDto loginDto)
+    public async Task<string> LoginAsync(LoginDto request)
     {
-        if (loginDto is null)
-        {
-            throw new ArgumentNullException(nameof(loginDto));
-        }
+        ArgumentNullException.ThrowIfNull(request);
 
-        var user = await _userManager.FindByNameAsync(loginDto.UserName);
+        var user = await _userManager.FindByNameAsync(request.UserName);
 
-        if (user is null)
+        if (user is null || !await _userManager.CheckPasswordAsync(user, request.Password))
         {
             throw new InvalidLoginAttemptException("Invalid email or password");
         }
 
-        if (!await _userManager.CheckPasswordAsync(user, loginDto.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/Authorization/AuthService.cs CheckDrive.Api/CheckDrive.Application/Services/Auth/AuthService.cs

@@ -1,5 +1,5 @@
 using CheckDrive.Domain.Interfaces;
-using CheckDrive.Application.Interfaces;
+using CheckDrive.Application.Interfaces;
 using CheckDrive.Infrastructure.Configurations;
 using CheckDrive.Infrastructure.Email;
 using CheckDrive.Infrastructure.Persistence;
@@ -9,8 +9,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using CheckDrive.Application.Interfaces.Authorization;
 using CheckDrive.Infrastructure.Helpers;
+using CheckDrive.Application.Interfaces.Auth;
 
 namespace CheckDrive.Infrastructure.Extensions;
 
@@ -20,7 +20,7 @@ public static IServiceCollection RegisterInfrastructure(this IServiceCollection
     {
         AddPersistence(services, configuration);
         AddConfigurations(services, configuration);
-        AddFluentEmail(services, configuration);
+        AddEmail(services, configuration);
         AddServices(services);
         AddIdentity(services);
 
@@ -49,14 +49,9 @@ private static void AddConfigurations(IServiceCollection services, IConfiguratio
             .Bind(configuration.GetSection(SmsConfigurations.SectionName))
             .ValidateDataAnnotations()
             .ValidateOnStart();
-
-        services.AddOptions<JwtOptions>()
-            .Bind(configuration.GetSection(JwtOptions.SectionName))
-            .ValidateDataAnnotations()
-            .ValidateOnStart();
     }
 
-    private static void AddFluentEmail(IServiceCollection services, IConfiguration configuration)
+    private static void AddEmail(IServiceCollection services, IConfiguration configuration)
     {
         var emailSettings = configuration
             .GetSection(EmailConfigurations.SectionName)

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

@@ -1,4 +1,4 @@
-using CheckDrive.Application.Interfaces.Authorization;
+using CheckDrive.Application.Interfaces.Auth;
 using CheckDrive.Infrastructure.Configurations;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
@@ -13,7 +13,7 @@ internal sealed class JwtTokenGenerator : IJwtTokenGenerator
 {
     private readonly JwtOptions _options;
 
-    public JwtTokenGenerator(IOptions<JwtOptions> options )
+    public JwtTokenGenerator(IOptions<JwtOptions> options)
     {
         _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
     }
@@ -46,7 +46,7 @@ private static List<Claim> GetClaims(IdentityUser user, IList<string> roles)
     {
         var claims = new List<Claim>()
         {
-            new(ClaimTypes.NameIdentifier, user.Id.ToString()),
+            new (ClaimTypes.NameIdentifier, user.Id.ToString()),
         };
 
         foreach (var role in roles)