Merge branch 'LC/login-backend' into 'main'

Make login use email instead of username

See merge request ma03081/COM3014!15

GatewayAPI/Models/UserLogin.cs

@@ -2,7 +2,7 @@
 {
     public class UserLogin
     {
-        public required string Username { get; set; }
+        public required string Email { get; set; }
         public required string Password { get; set; }
 
     }

UserMicroservice/Controllers/UserController.cs

@@ -71,7 +71,7 @@ namespace UserMicroservice.Controllers
         [HttpPost("login")]
         public IActionResult Login([FromBody] LoginModel model)
         {
-            User? user = _userService.GetUser(model.Username, model.Password);
+            User? user = _userService.GetUser(model.Email, model.Password);
             if(user == null)
                 return Unauthorized();
 

UserMicroservice/Models/LoginModel.cs

@@ -2,7 +2,7 @@
 {
     public class LoginModel
     {
-        public required string Username { get; set; }
+        public required string Email { get; set; }
         public required string Password { get; set; }
     }
 }

UserMicroservice/Services/IUserService.cs

@@ -7,7 +7,7 @@ namespace UserMicroservice.Services
     {
         User? GetUser(string username);
         User? GetUser(int userId);
-        User? GetUser(string username, string password);
+        User? GetUser(string email, string password);
         List<User> GetUsers();
         User CreateUser(string email, string userName, string password, UserType UserType);
         void UpdateUser(int id, string? username, string? email, string? password);

UserMicroservice/Services/UserService.cs

@@ -45,9 +45,9 @@ namespace UserMicroservice.Services
             return user;
         }
 
-        public User? GetUser(string username, string password)
+        public User? GetUser(string email, string password)
         {
-            User? user = GetUser(username);
+            User? user = GetUserByEmail(email);
 
             if (user != null)
             {