Refactor user profile operations to UserProfileService

Centralized user profile related operations in `UserProfileService` by replacing `AuthenticationStateProvider` with `UserProfileService` in several files. Renamed `GetUserProfile()` to `GetUserProfileAsync()` to indicate its asynchronous nature. Moved `GetBuyerIdAsync()` and `GetUserNameAsync()` methods from `Extensions.cs` to `UserProfileService.cs`. Modified `UpdateProfile()` method in `UserProfileService.cs` to use `AccountController` for updating user profile. Added `GetUserAsync()` method and `UserProfile` class in `UserProfileService.cs`. Updated `BasketState.cs` to use `userProfileService.GetUserAsync()`. Added `Microsoft.AspNetCore.Authentication` namespace in `LogOutService.cs` and `System.Security.Claims`, `System.Text`, and `System.Text.Json` namespaces in `UserProfileService.cs`.

Author: Sntai20

WebApp/Components/Pages/User/OrdersRefreshOnStatusChange.razor

@@ -3,6 +3,7 @@
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject OrderStatusNotificationService OrderStatusNotificationService
 @inject NavigationManager Nav
+@inject UserProfileService ProfileService
 @implements IDisposable
 @code {
     private IDisposable? orderStatusChangedSubscription;
@@ -11,7 +12,7 @@
     {
         if (firstRender)
         {
-            var buyerId = await AuthenticationStateProvider.GetBuyerIdAsync();
+            var buyerId = await ProfileService.GetBuyerIdAsync();
             if (!string.IsNullOrEmpty(buyerId))
             {
                 orderStatusChangedSubscription = OrderStatusNotificationService.SubscribeToOrderStatusNotifications(

WebApp/Components/Pages/User/UserProfile.razor

@@ -47,7 +47,7 @@
 
     protected override async Task OnInitializedAsync()
     {
-        userProfile = await ProfileService.GetUserProfile();
+        userProfile = await ProfileService.GetUserProfileAsync();
     }
 
     private async Task UpdateProfile()
@@ -62,7 +62,7 @@
                 {
                     updateMessage = "Profile updated successfully!";
                     // Re-fetch the user profile to get the updated information
-                    userProfile = await ProfileService.GetUserProfile();
+                    userProfile = await ProfileService.GetUserProfileAsync();
                 }
             }
             catch (Exception)

WebApp/Extensions/Extensions.cs

@@ -103,18 +103,4 @@ private static void AddAIServices(this IHostApplicationBuilder builder)
             builder.Services.AddAzureOpenAIChatCompletion(deploymentName);
         }
     }
-
-    public static async Task<string?> GetBuyerIdAsync(this AuthenticationStateProvider authenticationStateProvider)
-    {
-        var authState = await authenticationStateProvider.GetAuthenticationStateAsync();
-        var user = authState.User;
-        return user.FindFirst("sub")?.Value;
-    }
-
-    public static async Task<string?> GetUserNameAsync(this AuthenticationStateProvider authenticationStateProvider)
-    {
-        var authState = await authenticationStateProvider.GetAuthenticationStateAsync();
-        var user = authState.User;
-        return user.FindFirst("name")?.Value;
-    }
 }

WebApp/Services/BasketState.cs

@@ -1,15 +1,14 @@
 namespace eShop.WebApp.Services;
-using System.Security.Claims;
+
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Authorization;
 using eShop.WebAppComponents.Catalog;
 using eShop.WebAppComponents.Services;
 
 public class BasketState(
     BasketService basketService,
     CatalogService catalogService,
     OrderingService orderingService,
-    AuthenticationStateProvider authenticationStateProvider)
+    UserProfileService userProfileService)
 {
     private Task<IReadOnlyCollection<BasketItem>>? _cachedBasket;
     private HashSet<BasketStateChangedSubscription> _changeSubscriptions = new();
@@ -18,7 +17,7 @@ public Task DeleteBasketAsync()
         => basketService.DeleteBasketAsync();
 
     public async Task<IReadOnlyCollection<BasketItem>> GetBasketItemsAsync()
-        => (await GetUserAsync()).Identity?.IsAuthenticated == true
+        => (await userProfileService.GetUserAsync()).Identity?.IsAuthenticated == true
         ? await FetchBasketItemsAsync()
         : [];
 
@@ -81,8 +80,8 @@ public async Task CheckoutAsync(BasketCheckoutInfo checkoutInfo)
             checkoutInfo.RequestId = Guid.NewGuid();
         }
 
-        var buyerId = await authenticationStateProvider.GetBuyerIdAsync() ?? throw new InvalidOperationException("User does not have a buyer ID");
-        var userName = await authenticationStateProvider.GetUserNameAsync() ?? throw new InvalidOperationException("User does not have a user name");
+        var buyerId = await userProfileService.GetBuyerIdAsync() ?? throw new InvalidOperationException("User does not have a buyer ID");
+        var userName = await userProfileService.GetUserNameAsync() ?? throw new InvalidOperationException("User does not have a user name");
 
         // Get details for the items in the basket
         var orderItems = await FetchBasketItemsAsync();
@@ -110,9 +109,6 @@ public async Task CheckoutAsync(BasketCheckoutInfo checkoutInfo)
     private Task NotifyChangeSubscribersAsync()
         => Task.WhenAll(_changeSubscriptions.Select(s => s.NotifyAsync()));
 
-    private async Task<ClaimsPrincipal> GetUserAsync()
-        => (await authenticationStateProvider.GetAuthenticationStateAsync()).User;
-
     private Task<IReadOnlyCollection<BasketItem>> FetchBasketItemsAsync()
     {
         return _cachedBasket ??= FetchCoreAsync();

WebApp/Services/LogOutService.cs

@@ -1,4 +1,5 @@
 namespace eShop.WebApp.Services;
+
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;

WebApp/Services/UserProfileService.cs

@@ -1,5 +1,8 @@
 namespace eShop.WebApp.Services;
 
+using System.Security.Claims;
+using System.Text;
+using System.Text.Json;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 
@@ -9,9 +12,10 @@ public class UserProfileService(HttpClient httpClient, AuthenticationStateProvid
     [CascadingParameter]
     public HttpContext HttpContext { get; set; } = default!;
 
-    public async Task<UserProfile> GetUserProfile()
+    public async Task<UserProfile> GetUserProfileAsync()
     {
         var authState = await authenticationStateProvider.GetAuthenticationStateAsync();
+        authState.User.Claims.ToList().ForEach(claim => Console.WriteLine($"{claim.Type}: {claim.Value}"));
         var user = authState.User;
 
         return new UserProfile
@@ -25,14 +29,42 @@ public async Task<UserProfile> GetUserProfile()
 
     private static string? ReadClaim(string type, System.Security.Claims.ClaimsPrincipal? user) => user.FindFirst(x => x.Type == type)?.Value;
 
-    public Task<HttpResponseMessage> UpdateProfile(UserProfile userProfile)
+    /*public Task<HttpResponseMessage> UpdateProfile(UserProfile userProfile)
     {
-        /*await httpClient.PutAsJsonAsync(userProfileApiUrl, userProfile);*/
+        *//*await httpClient.PutAsJsonAsync(userProfileApiUrl, userProfile);*//*
         httpClient.ToString();
         Console.WriteLine(userProfileApiUrl + userProfile);
         return Task.FromResult(new HttpResponseMessage(System.Net.HttpStatusCode.OK));
+    }*/
+
+    // Use the AccountController to update the user profile
+    public Task<HttpResponseMessage> UpdateProfile(UserProfile userProfile)
+    {
+        var request = new HttpRequestMessage(HttpMethod.Put, userProfileApiUrl)
+        {
+            Content = new StringContent(JsonSerializer.Serialize(userProfile), Encoding.UTF8, "application/json")
+        };
+
+        return httpClient.SendAsync(request);
+    }
+
+    public async Task<string?> GetBuyerIdAsync()
+    {
+        var authState = await authenticationStateProvider.GetAuthenticationStateAsync();
+        var user = authState.User;
+        return user.FindFirst("sub")?.Value;
     }
 
+    public async Task<string?> GetUserNameAsync()
+    {
+        var authState = await authenticationStateProvider.GetAuthenticationStateAsync();
+        var user = authState.User;
+        return user.FindFirst("name")?.Value;
+    }
+
+    public async Task<ClaimsPrincipal> GetUserAsync()
+        => (await authenticationStateProvider.GetAuthenticationStateAsync()).User;
+
     public class UserProfile
     {
         public string? Name { get; set; }