small fixes

add AuthService interface, adjust some data annotations, add correlation id to serilog logs

PriceNegotiationApp/Controllers/AuthenticationController.cs

@@ -14,9 +14,9 @@ namespace PriceNegotiationApp.Controllers
 {
 	public class AuthenticationController : ControllerBase
 	{
-		private readonly AuthService _authService;
+		private readonly IAuthService _authService;
 
-		public AuthenticationController(AuthService authService)
+		public AuthenticationController(IAuthService authService)
 		{
 			_authService = authService;
 		}
@@ -63,11 +63,21 @@ public async Task<IActionResult> Logout()
 		public async Task<IActionResult> RegisterUser([FromBody] RegisterUserDTO userForRegistration)
 		{
             var inputErrors = ModelStateHelper.GetErrors(ModelState);
+            bool isEmailInUse = await _authService.IsEmailInUse(userForRegistration.Email);
+			bool isUserNameInUse = await _authService.IsUsernameInUse(userForRegistration.UserName);
 
             if (userForRegistration == null || inputErrors.Any())
 			{
 				return BadRequest(inputErrors);
 			}
+            else if (isEmailInUse)
+			{
+				return BadRequest("The email is already in use");
+			}
+			else if (isUserNameInUse)
+			{
+                return BadRequest("The username is already in use");
+            }
 
 			var result = await _authService.RegisterUserAsync(userForRegistration);
 
@@ -78,7 +88,7 @@ public async Task<IActionResult> RegisterUser([FromBody] RegisterUserDTO userFor
 			return BadRequest(errors);
 		}
 
-		public class LoginModel
+        public class LoginModel
 		{
 			[Required]
 			public string Username { get; set; }

PriceNegotiationApp/Models/DTO/RegisterUserDTO.cs

@@ -9,13 +9,16 @@ public class RegisterUserDTO
 		[Required]
 		public string Name { get; set; }
 		[Required]
-		[RegularExpression(@"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$", ErrorMessage = "Invalid email address.")]
-		public string Email { get; set; }
+		[DataType(DataType.EmailAddress)]
+		[EmailAddress(ErrorMessage = "Invalid email address.")]
+        public string Email { get; set; }
 		public string? StreetAddress { get; set; }
 		public string? City { get; set; }
 		public string? State { get; set; }
-		public string? PostalCode { get; set; }
+        [DataType(DataType.PostalCode)]
+        public string? PostalCode { get; set; }
 		[Required]
+		[DataType(DataType.Password)]
 		public string? Password { get; set; }
 		[Required]
 		[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]

PriceNegotiationApp/PriceNegotiationApp.csproj

@@ -21,11 +21,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -34,6 +34,7 @@
     <PackageReference Include="NuGet.Common" Version="6.8.0" />
     <PackageReference Include="NuGet.Protocol" Version="6.8.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

PriceNegotiationApp/Program.cs

@@ -33,8 +33,7 @@ public static void Main(string[] args)
 			// configure Serilog
             var logger = new LoggerConfiguration()
 				.ReadFrom.Configuration(builder.Configuration)
-				.Enrich.FromLogContext()
-				.CreateLogger();
+                .CreateLogger();
 
             builder.Logging.ClearProviders();
             builder.Logging.AddSerilog(logger);
@@ -87,7 +86,7 @@ public static void Main(string[] args)
 						//	context.User.IsInRole("Staff") ||
 						//	(context.User.IsInRole("Customer") && context.User.));
 
-				opt.AddPolicy(OperationRequirements.UpdateRequirement.Name, policy => 
+				opt.AddPolicy(OperationRequirements.UpdateRequirement.Name, policy =>
 					policy.Requirements.Add(OperationRequirements.UpdateRequirement));
                 opt.AddPolicy(OperationRequirements.DeleteRequirement.Name, policy =>
 					policy.Requirements.Add(OperationRequirements.DeleteRequirement));
@@ -96,14 +95,15 @@ public static void Main(string[] args)
 			// add negotiation policies handler
 			builder.Services.AddSingleton<IAuthorizationHandler, NegotiationOperationsAuthorizationHandler>();
 
+			// add handling JWT
 			builder.Services.Configure<JwtSettings>(builder.Configuration.GetSection("JwtSettings"));
 			builder.Services.AddScoped<JwtManager>();
 
 			// add initializer
 			builder.Services.AddScoped<MainInitializer>();
 
 			// add services
-			builder.Services.AddScoped<AuthService>();
+			builder.Services.AddScoped<IAuthService, AuthService>();
 			builder.Services.AddScoped<IProductService, ProductService>();
 			builder.Services.AddScoped<INegotiationService, NegotiationService>();
 
@@ -118,9 +118,9 @@ public static void Main(string[] args)
 			using (var scope = serviceProvider.CreateScope())
 			{
 				var dbInitializer = scope.ServiceProvider.GetRequiredService<MainInitializer>();
-				dbInitializer.InitializeRolesAsync().Wait(); // Synchronously wait for completion
-				dbInitializer.InitializeAdminUserAsync().Wait();
-				dbInitializer.InitializeStaffUserAsync().Wait();
+				dbInitializer.InitializeRolesAsync().GetAwaiter().GetResult(); // Synchronously wait for completion
+				dbInitializer.InitializeAdminUserAsync().GetAwaiter().GetResult();
+				dbInitializer.InitializeStaffUserAsync().GetAwaiter().GetResult();
 			}
 
 			var app = builder.Build();

PriceNegotiationApp/Services/AuthService.cs

@@ -9,8 +9,17 @@
 
 namespace PriceNegotiationApp.Services
 {
-    public class AuthService
+	public interface IAuthService
 	{
+		Task<AuthResponseDTO> AuthenticateAsync(LoginModel model);
+		Task SignOutAsync();
+		Task<IdentityResult> RegisterUserAsync(RegisterUserDTO userForRegistration);
+		Task<bool> IsEmailInUse(string email);
+		Task<bool> IsUsernameInUse(string username);
+    }
+
+    public class AuthService : IAuthService
+    {
 		private readonly SignInManager<IdentityUser> _signInManager;
 		private readonly UserManager<IdentityUser> _userManager;
 		private readonly JwtManager _jwtHandler;
@@ -65,5 +74,29 @@ public async Task<IdentityResult> RegisterUserAsync(RegisterUserDTO userForRegis
 
 			return result;
 		}
-	}
+
+        public async Task<bool> IsEmailInUse(string email)
+        {
+            var user = await _userManager.FindByEmailAsync(email);
+
+			if (user == null)
+			{
+				return false;
+			}
+
+			return true;
+        }
+
+        public async Task<bool> IsUsernameInUse(string username)
+        {
+            var user = await _userManager.FindByNameAsync(username);
+
+            if (user == null)
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
 }

PriceNegotiationApp/appsettings.json

@@ -14,6 +14,7 @@
   },
   "Serilog": {
     "Using": [ "Serilog.Sinks.File", "Serilog.Sinks.Console" ],
+    "Enrich": [ "FromLogContext", "WithCorrelationId" ],
     "MinimumLevel": {
       "Default": "Information"
     },