Rework auth

Author: MD-V

NetEvent/Client/Models/User.cs

@@ -28,8 +28,4 @@
 		<ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Folder Include="Models\" />
-	</ItemGroup>
-
 </Project>

NetEvent/Client/NetEvent.Client.csproj

@@ -0,0 +1,17 @@
+@page "/login"
+
+<h3>Login</h3>
+
+<EditForm Model="LoginRequest" OnValidSubmit="ExecuteLogin">
+    <DataAnnotationsValidator />
+    <MudCard >
+        <MudCardContent>         
+            <MudTextField id="Input.Email" Label="Email" @bind-Value="LoginRequest.UserName" For="@(() => LoginRequest.UserName)" />
+            <MudTextField id="Input.Password" Label="Password" @bind-Value="LoginRequest.Password" For="@(() => LoginRequest.Password)" InputType="InputType.Password" />
+             <MudCheckBox id="Input.Remember" Label="Remember Me" @bind-Checked="LoginRequest.RememberMe" />
+        </MudCardContent>
+        <MudCardActions>
+            <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Outlined" Color="Color.Primary" Class="ma-2 py-2">Login</MudButton>
+        </MudCardActions>
+    </MudCard>    
+</EditForm>

NetEvent/Client/Pages/Authentication.razor

@@ -0,0 +1,43 @@
+using Microsoft.AspNetCore.Components;
+using NetEvent.Client.Services;
+using NetEvent.Shared.Dto;
+
+namespace NetEvent.Client.Pages
+{
+    public partial class Login
+    {
+        [Inject]
+        public CustomStateProvider AuthenticationStateProvider { get; set; }
+
+        [Inject]
+        public NavigationManager NavigationManager { get; set; }
+
+
+        public LoginRequest LoginRequest { get; set; } = new ();
+
+
+        public string Error { get; set; }
+
+
+        protected override async Task OnAfterRenderAsync(bool firstRender)
+        {
+            if (firstRender)
+            {
+
+            }
+        }
+
+        public async Task ExecuteLogin()
+        {
+            try
+            {
+                await AuthenticationStateProvider.Login(LoginRequest);
+                NavigationManager.NavigateTo("");
+            }
+            catch (Exception ex)
+            {
+                Error = ex.Message;
+            }
+        }
+    }
+}

NetEvent/Client/Pages/Login.razor

@@ -1,40 +1,29 @@
+using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using MudBlazor.Services;
 using NetEvent.Client;
+using NetEvent.Client.Services;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");
 
+
+builder.Services.AddOptions();
+builder.Services.AddAuthorizationCore();
+builder.Services.AddScoped<CustomStateProvider>();
+builder.Services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<CustomStateProvider>());
+builder.Services.AddScoped<IAuthService, AuthService>();
+builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+
+
 builder.Services.AddHttpClient("NetEvent.ServerAPI")
+    .ConfigureHttpClient(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress));
+
+builder.Services.AddHttpClient("NetEvent.ServerAPI.Secure")
     .ConfigureHttpClient(client => client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress))
     .AddHttpMessageHandler<BaseAddressAuthorizationMessageHandler>();
 
-// Supply HttpClient instances that include access tokens when making requests to the server project.
-builder.Services.AddScoped(provider =>
-{
-    var factory = provider.GetRequiredService<IHttpClientFactory>();
-    return factory.CreateClient("NetEvent.ServerAPI");
-});
-
-builder.Services.AddOidcAuthentication(options =>
-{
-    options.ProviderOptions.ClientId = "NetEvent-blazor-client";
-    options.ProviderOptions.Authority = "https://localhost:44310/";
-    options.ProviderOptions.ResponseType = "code";
-
-    options.UserOptions.RoleClaim = "role";
-    options.ProviderOptions.DefaultScopes.Add("roles");
-
-    // Note: response_mode=fragment is the best option for a SPA. Unfortunately, the Blazor WASM
-    // authentication stack is impacted by a bug that prevents it from correctly extracting
-    // authorization error responses (e.g error=access_denied responses) from the URL fragment.
-    // For more information about this bug, visit https://github.com/dotnet/aspnetcore/issues/28344.
-    //
-    options.ProviderOptions.ResponseMode = "query";
-    options.AuthenticationPaths.RemoteRegisterPath = "https://localhost:44310/Identity/Account/Register";
-});
-
 builder.Services.AddMudServices();
 
 await builder.Build().RunAsync();

NetEvent/Client/Pages/Login.razor.cs

@@ -0,0 +1,53 @@
+using NetEvent.Shared.Dto;
+using System.Net.Http.Json;
+
+namespace NetEvent.Client.Services
+{
+    public class AuthService : IAuthService
+    {
+        private const string _HttpClientName = "NetEvent.ServerAPI";
+
+        private readonly IHttpClientFactory _HttpClientFactory;
+        public AuthService(IHttpClientFactory httpClientFactory)
+        {
+            _HttpClientFactory = httpClientFactory;
+        }
+        public async Task<CurrentUser> CurrentUserInfo()
+        {
+            try
+            {
+                var client = _HttpClientFactory.CreateClient(_HttpClientName);
+
+                var result = await client.GetFromJsonAsync<CurrentUser>("api/auth/user/current");
+                return result;
+            }
+            catch (Exception ex)
+            {
+
+                return new CurrentUser() { IsAuthenticated = false};
+            }
+        }
+
+        public async Task Login(LoginRequest loginRequest)
+        {
+            var client = _HttpClientFactory.CreateClient(_HttpClientName);
+
+            var result = await client.PostAsJsonAsync("api/auth/login", loginRequest);
+            if (result.StatusCode == System.Net.HttpStatusCode.BadRequest) throw new Exception(await result.Content.ReadAsStringAsync());
+            result.EnsureSuccessStatusCode();
+        }
+        public async Task Logout()
+        {
+            var client = _HttpClientFactory.CreateClient(_HttpClientName);
+            var result = await client.PostAsync("api/auth/logout", null);
+            result.EnsureSuccessStatusCode();
+        }
+        public async Task Register(RegisterRequest registerRequest)
+        {
+            var client = _HttpClientFactory.CreateClient(_HttpClientName);
+            var result = await client.PostAsJsonAsync("api/auth/register", registerRequest);
+            if (result.StatusCode == System.Net.HttpStatusCode.BadRequest) throw new Exception(await result.Content.ReadAsStringAsync());
+            result.EnsureSuccessStatusCode();
+        }
+    }
+}

NetEvent/Client/Pages/Profile/Manage.razor

@@ -0,0 +1,58 @@
+using Microsoft.AspNetCore.Components.Authorization;
+using NetEvent.Shared.Dto;
+using System.Security.Claims;
+
+namespace NetEvent.Client.Services
+{
+    public class CustomStateProvider : AuthenticationStateProvider
+    {
+        private readonly IAuthService api;
+        private CurrentUser _currentUser;
+        public CustomStateProvider(IAuthService api)
+        {
+            this.api = api;
+        }
+        public override async Task<AuthenticationState> GetAuthenticationStateAsync()
+        {
+            var identity = new ClaimsIdentity();
+            try
+            {
+                var userInfo = await GetCurrentUser();
+                if (userInfo.IsAuthenticated)
+                {
+                    var claims = new[] { new Claim(ClaimTypes.Name, _currentUser.UserName) }.Concat(_currentUser.Claims.Select(c => new Claim(c.Key, c.Value)));
+                    identity = new ClaimsIdentity(claims, "Server authentication");
+                }
+            }
+            catch (HttpRequestException ex)
+            {
+                Console.WriteLine("Request failed:" + ex.ToString());
+            }
+            return new AuthenticationState(new ClaimsPrincipal(identity));
+        }
+        private async Task<CurrentUser> GetCurrentUser()
+        {
+            if (_currentUser != null && _currentUser.IsAuthenticated) return _currentUser;
+            _currentUser = await api.CurrentUserInfo();
+            return _currentUser;
+        }
+        public async Task Logout()
+        {
+            await api.Logout();
+            _currentUser = null;
+            NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
+        }
+
+        public async Task Login(LoginRequest loginParameters)
+        {
+            await api.Login(loginParameters);
+            NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
+        }
+
+        public async Task Register(RegisterRequest registerParameters)
+        {
+            await api.Register(registerParameters);
+            NotifyAuthenticationStateChanged(GetAuthenticationStateAsync());
+        }
+    }
+}