Merge pull request #216 from pticostaricags/development

Fixing authorization issue for MAUI app

Author: efonsecab

src/FairPlayCombinedSln/FairPlayTube.MAUI/Authentication/CustomAuthenticationStateProvider.cs

@@ -1,28 +1,54 @@
 using FairPlayTube.ClientServices.KiotaClient;
+using FairPlayTube.ClientServices.KiotaClient.Models;
+using FairPlayTube.MAUI.Helpers;
 using Microsoft.AspNetCore.Components.Authorization;
 using System.Security.Claims;
 
 namespace FairPlayTube.MAUI.Authentication
 {
     public class CustomAuthenticationStateProvider(
-        [FromKeyedServices("AuthenticatedApiClient")]
-        ApiClient authenticatedClient
-
+        IServiceProvider serviceProvider,
+        [FromKeyedServices("AnonymousApiClient")]
+        ApiClient anonymousApiClient
         ) : AuthenticationStateProvider
     {
-        public override async Task<AuthenticationState> GetAuthenticationStateAsync()
+        private ClaimsPrincipal currentUser = new ClaimsPrincipal(new ClaimsIdentity());
+
+        public Task LoginAsync(LoginRequest loginRequest)
         {
-            ClaimsIdentity identity = new();
-            if (UserContext.IsAuthenticated) {
-                var response = await authenticatedClient.Identity.GetMyRoles.GetAsync();
-                foreach (var singleUserRole in response!)
+
+            var loginTask = LogInAsyncCore();
+            NotifyAuthenticationStateChanged(loginTask);
+
+            return loginTask;
+
+            async Task<AuthenticationState> LogInAsyncCore()
+            {
+                var result = await anonymousApiClient!.Login.PostAsync(loginRequest);
+                UserContext.AccessToken = result.AccessToken;
+                UserContext.AccessTokenExpiresIn = result.ExpiresIn;
+                UserContext.RefreshToken = result.RefreshToken;
+                UserContext.TokenExpiraton = DateTimeOffset.UtcNow.AddMinutes(result!.ExpiresIn!.Value);
+                using var scope = serviceProvider.CreateScope();
+                var authenticatedClient = scope.ServiceProvider
+                    .GetRequiredKeyedService<ApiClient>("AuthenticatedApiClient");
+
+                ClaimsIdentity identity = new();
+                if (UserContext.IsAuthenticated)
                 {
-                    identity.AddClaim(new Claim(ClaimTypes.Role, singleUserRole));
+                    var response = await authenticatedClient.Identity.GetMyRoles.GetAsync();
+                    foreach (var singleUserRole in response!)
+                    {
+                        identity.AddClaim(new Claim(ClaimTypes.Role, singleUserRole));
+                    }
                 }
+                this.currentUser = new ClaimsPrincipal(identity);
+                var authenticationState = new AuthenticationState(this.currentUser);
+                return authenticationState;
             }
-            var user = new ClaimsPrincipal(identity);
-            var result = new AuthenticationState(user);
-            return result;
         }
+
+        public override Task<AuthenticationState> GetAuthenticationStateAsync() =>
+        Task.FromResult(new AuthenticationState(currentUser));
     }
 }

src/FairPlayCombinedSln/FairPlayTube.MAUI/Components/Pages/Login.razor

@@ -30,29 +30,16 @@
     private ApiClient? apiClient { get; set; }
     [Inject]
     private NavigationManager? navingationManager { get; set; }
+    [Inject] AuthenticationStateProvider? authenticationStateProvider { get; set; }
     private readonly LoginRequest loginRequest = new();
 
     private async Task OnValidSubmitAsync()
     {
         try
         {
-            var result = await this.apiClient!.Login.PostAsync(this.loginRequest);
-            if (!String.IsNullOrWhiteSpace(result!.AccessToken))
-            {
-                UserContext.AccessToken = result.AccessToken;
-                UserContext.AccessTokenExpiresIn = result.ExpiresIn;
-                UserContext.RefreshToken = result.RefreshToken;
-                UserContext.TokenExpiraton = DateTimeOffset.UtcNow.AddMinutes(result!.ExpiresIn!.Value);
-                ReloadService.IsReloading = true;
-                StateHasChanged();
-                this.navingationManager!.NavigateTo("/", false);
-                ReloadService.IsReloading = false;
-                StateHasChanged();
-            }
-            else
-            {
-                await Application.Current!.Windows[0].Page!.DisplayAlert("Error", "Unknown error", "OK");
-            }
+            var customAuthProvider = authenticationStateProvider as CustomAuthenticationStateProvider;
+            await customAuthProvider!.LoginAsync(this.loginRequest);
+            StateHasChanged();
         }
         catch (ApiException apiEx)
         {

src/FairPlayCombinedSln/FairPlayTube.MAUI/MauiProgram.cs

@@ -1,5 +1,4 @@
-using FairPlayCombined.Common.Identity;
-using FairPlayCombined.Interfaces.FairPlayTube;
+using FairPlayCombined.Interfaces.FairPlayTube;
 using FairPlayTube.ClientServices;
 using FairPlayTube.ClientServices.CustomLocalization;
 using FairPlayTube.ClientServices.KiotaClient;
@@ -8,7 +7,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Infrastructure;
-using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.FluentUI.AspNetCore.Components;
@@ -46,9 +45,8 @@ public static MauiApp CreateMauiApp()
             builder.Services.AddSingleton<IStringLocalizer, ApiLocalizer>();
             builder.Services.AddLocalization();
             builder.Services.AddOptions();
+            builder.Services.TryAddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
             builder.Services.AddAuthorizationCore();
-            builder.Services.AddCascadingAuthenticationState();
-            builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
             builder.Services.AddScoped<LocalizationMessageHandler>();
             builder.Services.AddSingleton<IAccessTokenProvider, CustomAccessTokenAuthenticationProvider>();
             builder.Services.AddKeyedSingleton<ApiClient>("AnonymousApiClient",

src/FairPlayCombinedSln/FairPlayTube.MAUI/Routes.razor

@@ -1,10 +1,7 @@
 @using FairPlayTube.MAUI.Helpers
 <Router AppAssembly="@typeof(MauiProgram).Assembly" AdditionalAssemblies="FairPlayTube.MAUI.AdditionalSetup.AdditionalAssemblies">
     <Found Context="routeData">
-        @if (!ReloadService.IsReloading)
-        {
-            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Components.Layout.MainLayout)" />
-            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-        }
+        <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(Components.Layout.MainLayout)" />
+        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
     </Found>
 </Router>