Merge pull request #1 from SculptTechProject/feature/auth/identifier

Support login via username or email

Author: SculptTechProject

src/Controllers/AuthController.cs

@@ -32,7 +32,7 @@ public async Task<IActionResult> Register([FromBody] RegisterRequest request, Ca
         [HttpPost("login")]
         public async Task<IActionResult> Login([FromBody] LoginRequest request, CancellationToken ct)
         {
-            var result = await _authService.LoginAsync(request.Email, request.Password, ct);
+            var result = await _authService.LoginAsync(request.Identifier, request.Password, ct);
             if (result is null)
             {
                 return Unauthorized(new { message = "Invalid credentials" });

src/Controllers/ProfileController.cs

@@ -12,9 +12,6 @@ namespace sparkly_server.Controllers
     public class ProfileController : ControllerBase
     {
         private readonly ICurrentUser _currentUser;
-        private readonly IUserService _userService;
-        private readonly IJwtProvider _jwtProvider;
-        private readonly IAuthService _authService;
         private readonly AppDbContext _db;
 
         public ProfileController(ICurrentUser currentUser, AppDbContext db)

src/DTO/Auth.cs

@@ -1,6 +1,6 @@
 namespace sparkly_server.DTO
 {
     public record RegisterRequest(string Username, string Email, string Password);
-    public record LoginRequest(string Email, string Password);
+    public record LoginRequest(string Identifier, string Password);
     public record AuthResponse(string AccessToken, string RefreshToken);
 }

src/Services/Auth/AuthService.cs

@@ -13,9 +13,9 @@ public AuthService(IUserService userService, IJwtProvider jwtProvider)
             _jwtProvider = jwtProvider;
         }
 
-        public async Task<AuthResult?> LoginAsync(string email, string password, CancellationToken ct = default)
+        public async Task<AuthResult?> LoginAsync(string identifier, string password, CancellationToken ct = default)
         {
-            var user = await _userService.ValidateUserAsync(email, password, ct);
+            var user = await _userService.ValidateUserAsync(identifier, password, ct);
             if (user is null)
             {
                 return null;

src/Services/Auth/IAuthService.cs

@@ -9,7 +9,7 @@ DateTime RefreshTokenExpiresAt
 
     public interface IAuthService
     {
-        Task<AuthResult> LoginAsync(string email, string password, CancellationToken ct = default);
+        Task<AuthResult?> LoginAsync(string identifier, string password, CancellationToken ct = default);
         Task<AuthResult> RefreshAsync(string refreshToken, CancellationToken ct = default);
         Task LogoutAsync(string refreshToken, CancellationToken ct = default);
     }

src/Services/Users/IUserService.cs

@@ -5,6 +5,6 @@ namespace sparkly_server.Services.Users
     public interface IUserService
     {
         Task<User> RegisterAsync(string userName, string email, string password, CancellationToken ct = default);
-        Task<User?> ValidateUserAsync(string email, string password, CancellationToken ct = default);
+        Task<User?> ValidateUserAsync(string identifier, string password, CancellationToken ct = default);
     }
 }

src/Services/Users/UserService.cs

@@ -45,14 +45,31 @@ public async Task<User> RegisterAsync(string userName, string email, string pass
             return user;
         }
 
-        public async Task<User?> ValidateUserAsync(string email, string password, CancellationToken ct = default)
+        public async Task<User?> ValidateUserAsync(string identifier, string password, CancellationToken ct = default)
         {
-            var user = await _users.GetByEmailAsync(email, ct);
-            if (user is null)
+            if (string.IsNullOrWhiteSpace(identifier))
             {
                 return null;
             }
 
+            User? user;
+
+            if (identifier.Contains("@"))
+            {
+                // traktujemy jako email
+                user = await _users.GetByEmailAsync(identifier, ct);
+            }
+            else
+            {
+                // traktujemy jako username
+                user = await _users.GetByUserNameAsync(identifier, ct);
+            }
+
+            if (user is null)
+            {
+                return null;
+            }
+            
             var result = _passwordHasher.VerifyHashedPassword(user, user.PasswordHash, password);
             if (result is PasswordVerificationResult.Failed)
             {