Changeset c7d4a59

Timestamp:

10/22/25 23:34:14 (11 months ago)

Author:

stefansaveski <stefansaveski19@…>

Branches:

master

Children:

9538edc

Parents:

277bd72

Message:

Refactor DTOs and remove user management

Updated AuthController to use RegisterDto and LoginDto for more specific DTO usage in registration and login methods. Removed UsersController and its methods, indicating a refactor or removal of user management functionality. Replaced UserDto with LoginDto, RegisterDto, and UserResponseDto in UserDTO.cs, and introduced a UserRole enum. Updated AuthService to use new DTOs and adjusted JWT token configuration. Removed UserService and IUserService, suggesting a redesign or deprecation of user service functionality. Updated IAuthService to align with AuthService changes.

Location:

iknow-api

Files:

• Controllers/AuthController.cs (modified) (3 diffs)
• Controllers/UsersControllers.cs (deleted)
• DTOs/UserDTO.cs (modified) (1 diff)
• Services/Implementations/AuthService.cs (modified) (4 diffs)
• Services/Implementations/UserService.cs (deleted)
• Services/Interfaces/IAuthService.cs (modified) (1 diff)
• Services/Interfaces/IUserService.cs (deleted)

iknow-api/Controllers/AuthController.cs

@@ -2 +2 @@
 using iknow_api.Services;
 using Microsoft.AspNetCore.Mvc;
-//test
+
 namespace iknow_api.Controllers
 {
@@ -31 +31 @@
 
         [HttpPost("register")]
-        public async Task<IActionResult> Register([FromBody] UserDto request)
+        public async Task<IActionResult> Register([FromBody] RegisterDto request)
         {
             var result = await _authService.RegisterAsync(request);
@@ -39 +39 @@
 
         [HttpPost("login")]
-        public async Task<IActionResult> Login([FromBody] UserDto request)
+        public async Task<IActionResult> Login([FromBody] LoginDto request)
         {
             var token = await _authService.LoginAsync(request);

iknow-api/DTOs/UserDTO.cs

@@ -1 +1 @@
 namespace iknow_api.DTOs
 {
-    public class UserDto
+    // Login DTO
+    public class LoginDto
     {
-        public string Username { get; set; } = null!;
-        public string Password { get; set; } = null!;
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+    }
+
+    // Registration DTO
+    public class RegisterDto
+    {
+        public string Name { get; set; } = string.Empty;
+        public string Surname { get; set; } = string.Empty;
+        public string? Index { get; set; }
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+        public DateTime Bday { get; set; }
+        public UserRole Role { get; set; }
+    }
+
+    // User response DTO (for returning user data without password)
+    public class UserResponseDto
+    {
+        public int Id { get; set; }
+        public string? Name { get; set; }
+        public string? Surname { get; set; }
+        public string? Index { get; set; }
+        public string? Email { get; set; }
+        public DateTime Bday { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public UserRole Role { get; set; }
+    }
+
+    // User role enum
+    public enum UserRole
+    {
+        Admin,
+        Professor,
+        Student
     }
 }

iknow-api/Services/Implementations/AuthService.cs

@@ -22 +22 @@
         }
 
-        public async Task<bool> RegisterAsync(UserDto userDto)
+        public async Task<bool> RegisterAsync(RegisterDto registerDto)
         {
-            if (await _userRepository.UserExistsAsync(userDto.Username))
+            if (await _userRepository.UserExistsAsync(registerDto.Email))
                 return false;
 
             var user = new User
             {
-                Email = userDto.Username,
-                PasswordHash = BCrypt.Net.BCrypt.HashPassword(userDto.Password)
+                Name = registerDto.Name,
+                Surname = registerDto.Surname,
+                Index = registerDto.Index,
+                Email = registerDto.Email,
+                PasswordHash = BCrypt.Net.BCrypt.HashPassword(registerDto.Password),
+                Bday = DateTime.SpecifyKind(registerDto.Bday, DateTimeKind.Utc),
+                CreatedAt = DateTime.UtcNow,
+                Role = (Core.Models.UserRole)registerDto.Role
             };
 
@@ -37 +43 @@
         }
 
-        public async Task<string?> LoginAsync(UserDto userDto)
+        public async Task<string?> LoginAsync(LoginDto loginDto)
         {
-            var user = await _userRepository.GetUserByUsernameAsync(userDto.Username);
-            if (user == null || !BCrypt.Net.BCrypt.Verify(userDto.Password, user.PasswordHash))
+            var user = await _userRepository.GetUserByUsernameAsync(loginDto.Email);
+            if (user == null || !BCrypt.Net.BCrypt.Verify(loginDto.Password, user.PasswordHash))
                 return null;
 
@@ -56 +62 @@
             {
                 new Claim("id", user.Id.ToString()),
-                new Claim("username", user.Email)
+                new Claim("username", user.Email ?? string.Empty),
+                new Claim("role", user.Role.ToString())
             };
 
@@ -67 +74 @@
 
             var token = new JwtSecurityToken(
-                issuer: "finxacces-api",
-                audience: "finxacces-api",
+                issuer: "iknow-api",
+                audience: "iknow-api",
                 claims: claims,
-                expires: DateTime.Now.AddHours(1),
+                expires: DateTime.UtcNow.AddHours(1),
                 signingCredentials: creds
             );

iknow-api/Services/Interfaces/IAuthService.cs

@@ -5 +5 @@
     public interface IAuthService
     {
-        Task<bool> RegisterAsync(UserDto userDto);
-        Task<string?> LoginAsync(UserDto userDto);
+        Task<bool> RegisterAsync(RegisterDto registerDto);
+        Task<string?> LoginAsync(LoginDto loginDto);
         Task<int> GetUsersCountAsync();
     }