From 6b0e4d8005b3911f78307ab52da6a5f5bad9dced Mon Sep 17 00:00:00 2001
From: "Cross, Liam (UG - Comp Sci & Elec Eng)" <lc01383@surrey.ac.uk>
Date: Tue, 2 Apr 2024 15:47:10 +0000
Subject: [PATCH] Make login use email instead of username
---
GatewayAPI/Models/UserLogin.cs | 2 +-
UserMicroservice/Controllers/UserController.cs | 2 +-
UserMicroservice/Models/LoginModel.cs | 2 +-
UserMicroservice/Services/IUserService.cs | 2 +-
UserMicroservice/Services/UserService.cs | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/GatewayAPI/Models/UserLogin.cs b/GatewayAPI/Models/UserLogin.cs
index 47ae2b3..46a3f30 100644
--- a/GatewayAPI/Models/UserLogin.cs
+++ b/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; }
}
diff --git a/UserMicroservice/Controllers/UserController.cs b/UserMicroservice/Controllers/UserController.cs
index 68e4dd2..889e1a3 100644
--- a/UserMicroservice/Controllers/UserController.cs
+++ b/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();
diff --git a/UserMicroservice/Models/LoginModel.cs b/UserMicroservice/Models/LoginModel.cs
index 961ae05..65d11d0 100644
--- a/UserMicroservice/Models/LoginModel.cs
+++ b/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; }
}
}
diff --git a/UserMicroservice/Services/IUserService.cs b/UserMicroservice/Services/IUserService.cs
index 0e6deff..518745a 100644
--- a/UserMicroservice/Services/IUserService.cs
+++ b/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);
diff --git a/UserMicroservice/Services/UserService.cs b/UserMicroservice/Services/UserService.cs
index 59c0f37..21b50b0 100644
--- a/UserMicroservice/Services/UserService.cs
+++ b/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)
{
--
GitLab