latest updates

Author: Mirazyzz

WMS.WebUI/WMS.WebUI/Configurations/ApiConfiguration.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace WMS.WebUI.Configurations;
+
+public sealed class ApiConfiguration
+{
+    public const string SectionName = "API";
+
+    [Required]
+    public string Url { get; init; }
+}

WMS.WebUI/WMS.WebUI/Controllers/AccountController.cs

@@ -1,8 +1,4 @@
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
-using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
 using WMS.WebUI.Services.Interfaces;
 using WMS.WebUI.ViewModels.Auth;
 
@@ -23,7 +19,7 @@ public AccountController(IUserAgentService userAgentService)
     public IActionResult Login()
     {
 
-    return View();
+        return View();
     }
 
     [HttpPost]
@@ -59,13 +55,13 @@ public async Task<IActionResult> Register(RegisterViewModel model)
             model.ClientUri = Url.Action("EmailConfirmed", "Account", null, Request.Scheme);
             var response = await _client.PostAsJsonAsync("auth/register", model);
 
-			if (response.IsSuccessStatusCode)
-			{
-				return RedirectToAction("ConfirmEmail");
-			}
+            if (response.IsSuccessStatusCode)
+            {
+                return RedirectToAction("ConfirmEmail");
+            }
 
-			ModelState.AddModelError(string.Empty, "Invalid login attempt.");
-		}
+            ModelState.AddModelError(string.Empty, "Invalid login attempt.");
+        }
 
         return View(model);
     }
@@ -74,7 +70,7 @@ public IActionResult Logout()
     {
         var cookies = HttpContext.Request.Cookies;
 
-        foreach(var cookie in cookies)
+        foreach (var cookie in cookies)
         {
             Response.Cookies.Delete(cookie.Key);
         }
@@ -154,7 +150,7 @@ public async Task<IActionResult> EmailConfirmed(string token, string email)
 
         if (response.IsSuccessStatusCode)
         {
-            return RedirectToAction("AccountConfirmation", new {isConfirmed = true, message = "You have successfully confirmed your email. Now, you can login to the system." });
+            return RedirectToAction("AccountConfirmation", new { isConfirmed = true, message = "You have successfully confirmed your email. Now, you can login to the system." });
         }
 
         return RedirectToAction("AccountConfirmation", new { isConfirmed = false, message = "There was an error confirming your email. Please, try again." });

WMS.WebUI/WMS.WebUI/Extensions/DependencyInjection.cs

@@ -1,22 +1,27 @@
 using Syncfusion.Licensing;
+using WMS.WebUI.Configurations;
 
-namespace WMS.WebUI.Extensions
+namespace WMS.WebUI.Extensions;
+
+public static class DependencyInjection
 {
-    public static class DependencyInjection
+    public static IServiceCollection AddSyncfusion(this IServiceCollection services, IConfiguration configuration)
     {
-        public static IServiceCollection AddSyncfusion(this IServiceCollection services, IConfiguration configuration)
+        var section = configuration.GetSection("Keys");
+        var key = section.GetValue<string>("Syncfusion");
+
+        if (string.IsNullOrEmpty(key))
         {
-            var section = configuration.GetSection("Keys");
-            var key = section.GetValue<string>("Syncfusion");
+            throw new InvalidOperationException("Cannot register Syncfusion without key.");
+        }
 
-            if (string.IsNullOrEmpty(key))
-            {
-                throw new InvalidOperationException("Cannot register Syncfusion without key.");
-            }
+        services.AddOptions<ApiConfiguration>()
+            .Bind(configuration.GetSection(ApiConfiguration.SectionName))
+            .ValidateDataAnnotations()
+            .ValidateOnStart();
 
-            SyncfusionLicenseProvider.RegisterLicense(key);
+        SyncfusionLicenseProvider.RegisterLicense(key);
 
-            return services;
-        }
+        return services;
     }
 }

WMS.WebUI/WMS.WebUI/Program.cs

@@ -1,9 +1,7 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
-using System.Text;
 using WMS.WebUI.Extensions;
 using WMS.WebUI.Filters;
-using WMS.WebUI.Helpers;
 using WMS.WebUI.Services;
 using WMS.WebUI.Services.Interfaces;
 using WMS.WebUI.Stores;
@@ -12,7 +10,7 @@
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-builder.Services.AddControllersWithViews(options => 
+builder.Services.AddControllersWithViews(options =>
     options.Filters.Add(new ExceptionFilter()));
 builder.Services.AddSingleton<ApiClient>();
 builder.Services.AddSingleton<RolesService>();
@@ -30,17 +28,6 @@
 })
     .AddJwtBearer(options =>
     {
-        options.TokenValidationParameters = new TokenValidationParameters
-        {
-            ValidateIssuer = true,
-            ValidateAudience = true,
-            ValidateLifetime = true,
-            ValidateIssuerSigningKey = true,
-            ValidIssuer = builder.Configuration["Jwt:Issuer"],
-            ValidAudience = builder.Configuration["Jwt:Audience"],
-            IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(builder.Configuration["Jwt:SecretKey"]))
-        };
-
         options.Events = new JwtBearerEvents
         {
             OnAuthenticationFailed = context =>

WMS.WebUI/WMS.WebUI/Services/ApiClient.cs

@@ -1,5 +1,7 @@
-using Newtonsoft.Json;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
 using System.Net.Http.Headers;
+using WMS.WebUI.Configurations;
 using WMS.WebUI.Exceptions;
 
 namespace WMS.WebUI.Services;
@@ -9,17 +11,14 @@ public class ApiClient
     private readonly HttpClient _client;
     private readonly IHttpContextAccessor _httpContextAccessor;
 
-    public ApiClient(IConfiguration configuration, IHttpContextAccessor httpContextAccessor)
+    public ApiClient(
+        IConfiguration configuration,
+        IHttpContextAccessor httpContextAccessor,
+        IOptions<ApiConfiguration> apiConfiguration)
     {
         _client = new HttpClient();
-        var url = configuration.GetValue<string>("API_URL");
 
-        if (string.IsNullOrEmpty(url))
-        {
-            throw new InvalidOperationException("Cannot setup API Client without URL.");
-        }
-
-        _client.BaseAddress = new Uri("https://localhost:7097/api/");
+        _client.BaseAddress = new Uri(apiConfiguration.Value.Url);
         _httpContextAccessor = httpContextAccessor;
     }
 
@@ -53,7 +52,7 @@ public async Task<Stream> GetAsStreamAsync(string url)
         return stream;
     }
 
-    public async Task<TResult> PostAsync<TResult, TBody>(string url, TBody body) 
+    public async Task<TResult> PostAsync<TResult, TBody>(string url, TBody body)
         where TBody : class
     {
         AddJwt();

WMS.WebUI/WMS.WebUI/appsettings.Development.json

@@ -9,7 +9,9 @@
     "ApiKey": "1234",
     "Syncfusion": "Mgo+DSMBMAY9C3t2U1hhQlJBfV5AQmBIYVp/TGpJfl96cVxMZVVBJAtUQF1hTX5UdkFiWH5ZcXVURWBU"
   },
-  "API_URL": "https://locahost:7097/api/",
+  "API": {
+    "Url": "https://w2sc5qx5-7097.inc1.devtunnels.ms/api/"
+  },
   "Jwt": {
     "ValidIssuer": "https://locahost:7097",
     "ValidAudience": "WMS.Api",