Merge pull request #805 from neozhu/bugfix/httpcontext

Remove `IHttpContextAccessor` due to unnecessary use in Blazor Server

src/Server.UI/Components/Shared/Layout/PublicLayout.razor

@@ -1,9 +1,6 @@
-@using Microsoft.AspNetCore.Antiforgery
-@layout MainLayout
+@layout MainLayout
 @inherits LayoutComponentBase
 @inject LayoutService LayoutService
-@inject IAntiforgery _antiforgery;
-@inject IHttpContextAccessor _httpContextAccessor;
 @inject IStringLocalizer<SharedResource> L
 <MudLayout>
     <MudAppBar Elevation="0"
@@ -37,7 +34,6 @@
             <AuthorizeView>
                 <Authorized>
                     <form action="@IdentityComponentsEndpointRouteBuilderExtensions.Logout" method="post">
-                        <input type="hidden" name="__RequestVerificationToken" value="@antiforgeryToken" />
                         <input type="hidden" name="ReturnUrl" value="/"/>
                         <MudTooltip Text="@L["Logout"]">
                             <MudButton Style="text-transform:none"
@@ -66,7 +62,6 @@
             <AuthorizeView>
                 <Authorized>
                     <form action="@IdentityComponentsEndpointRouteBuilderExtensions.Logout" method="post">
-                        <input type="hidden" name="__RequestVerificationToken" value="@antiforgeryToken" />
                         <input type="hidden" name="ReturnUrl" value="/" />
                         <MudTooltip Text="@L["Logout"]">
                             <MudButton Style="text-transform:none"
@@ -101,19 +96,5 @@
 
 @code
 {
-    private string? antiforgeryToken;
-    protected override void OnInitialized()
-    {
-        antiforgeryToken = getAntiforgeryToken();
-    }
-    private string? getAntiforgeryToken()
-    {
-        var httpContext = _httpContextAccessor.HttpContext;
-        if (httpContext == null)
-        {
-            throw new InvalidOperationException("HttpContext is not available.");
-        }
-        var tokens = _antiforgery.GetAndStoreTokens(httpContext);
-        return tokens.RequestToken;
-    }
+
 }

src/Server.UI/Components/Shared/Layout/UserMenu.razor

@@ -1,71 +1,69 @@
-@using Microsoft.AspNetCore.Antiforgery
-@inject IStringLocalizer<HeaderMenu> L
+@inject IStringLocalizer<HeaderMenu> L
 @inject UserProfileStateService UserProfileStateService
-@inject IAntiforgery _antiforgery;
-@inject IHttpContextAccessor _httpContextAccessor;
 @implements IDisposable
 <MudTooltip Arrow="true" Text="@L["User Profile"]">
     <MudMenu AnchorOrigin="Origin.BottomRight"
-             Icon="@Icons.Material.Filled.PermIdentity"
-             Class="mx-1"
-             LockScroll="true"
-             TransformOrigin="Origin.TopRight">
+    Icon="@Icons.Material.Filled.PermIdentity"
+    Class="mx-1"
+    LockScroll="true"
+    TransformOrigin="Origin.TopRight">
         <ChildContent>
             <div class="pb-4"
-                 style="min-width: 260px;margin-bottom:0px!important">
+            style="min-width: 260px;margin-bottom:0px!important">
                 <MudStack Row="true" AlignItems="AlignItems.Center" Class="ma-4">
                     @if (UserProfile is null || string.IsNullOrEmpty(UserProfile.UserId))
                     {
-                        <MudProgressCircular Size="Size.Small" Color="Color.Default" Indeterminate="true"/>
+                        <MudProgressCircular Size="Size.Small" Color="Color.Default" Indeterminate="true" />
                         <MudStack Justify="Justify.Center" Spacing="0">
-                            <MudSkeleton Width="120px"/>
-                            <MudSkeleton Width="120px"/>
+                            <MudSkeleton Width="120px" />
+                            <MudSkeleton Width="120px" />
                         </MudStack>
                     }
                     else
                     {
-                        <MudAvatar>
-                            @if (string.IsNullOrEmpty(UserProfile.ProfilePictureDataUrl))
-                            {
-                                @(string.IsNullOrEmpty(UserProfile.UserName) ? "" : UserProfile.UserName.First())
-                            }
-                            else
-                            {
-                                <MudImage Src="@UserProfile.ProfilePictureDataUrl"></MudImage>
-                            }
-                        </MudAvatar>
-
+                        <div class="avatar-container">
+                            <div class="rotating-border"></div>
+                            <MudAvatar Style="width: 40px; height: 40px;">
+                                @if (string.IsNullOrEmpty(UserProfile.ProfilePictureDataUrl))
+                                {
+                                    @(string.IsNullOrEmpty(UserProfile.UserName) ? "" : UserProfile.UserName.First())
+                                }
+                                else
+                                {
+                                    <MudImage Src="@UserProfile.ProfilePictureDataUrl"></MudImage>
+                                }
+                            </MudAvatar>
+                        </div>
                         <MudStack Justify="Justify.SpaceBetween" Spacing="0">
                             <MudText Typo="Typo.body1">@UserProfile.DisplayName</MudText>
                             <MudText Typo="Typo.body2">@UserProfile.Email</MudText>
                         </MudStack>
                     }
                 </MudStack>
 
-                <MudDivider Class="my-2"/>
+                <MudDivider Class="my-2" />
                 <MudMenuItem Href="/user/profile">
                     <div class="d-flex align-center">
                         <MudIcon Class="mx-2"
-                                 Icon="@Icons.Material.Filled.Person"/>
+                        Icon="@Icons.Material.Filled.Person" />
                         <MudText>@L["Profile"]</MudText>
                     </div>
                 </MudMenuItem>
                 <MudMenuItem OnClick="OnSettingClick">
                     <div class="d-flex align-center">
                         <MudIcon Class="mx-2"
-                                 Icon="@Icons.Material.Filled.Settings"/>
+                        Icon="@Icons.Material.Filled.Settings" />
                         <MudText>@L["Settings"]</MudText>
                     </div>
                 </MudMenuItem>
                 <div class="mt-4 mx-4">
                     <form action="@IdentityComponentsEndpointRouteBuilderExtensions.Logout" method="post">
-                        <input type="hidden" name="__RequestVerificationToken" value="@antiforgeryToken" />
                         <input type="hidden" name="ReturnUrl" value="/pages/authentication/login" />
                         <MudButton Color="Color.Secondary"
-                                   ButtonType="ButtonType.Submit"
-                                   FullWidth="true"
-                                   StartIcon="@Icons.Material.Filled.Logout"
-                                   Variant="Variant.Outlined">
+                        ButtonType="ButtonType.Submit"
+                        FullWidth="true"
+                        StartIcon="@Icons.Material.Filled.Logout"
+                        Variant="Variant.Outlined">
                             @L["Logout"]
                         </MudButton>
                     </form>
@@ -80,28 +78,10 @@
 {
     [Parameter] public EventCallback<MouseEventArgs> OnSettingClick { get; set; }
     private UserProfile UserProfile => UserProfileStateService.UserProfile;
-    private string? antiforgeryToken = string.Empty;
     protected override void OnInitialized()
     {
         UserProfileStateService.OnChange += UserProfileStateService_OnChange;
     }
-    protected override void OnAfterRender(bool firstRender)
-    {
-        if (firstRender)
-        {
-            antiforgeryToken = getAntiforgeryToken();
-        }
-    }
-    private string? getAntiforgeryToken()
-    {
-        var httpContext = _httpContextAccessor.HttpContext;
-        if (httpContext == null)
-        {
-            throw new InvalidOperationException("HttpContext is not available.");
-        }
-        var tokens = _antiforgery.GetAndStoreTokens(httpContext);
-        return tokens.RequestToken;
-    }
     public void Dispose()
     {
         UserProfileStateService.OnChange -= UserProfileStateService_OnChange;

src/Server.UI/DependencyInjection.cs

@@ -96,7 +96,6 @@ public static IServiceCollection AddServerUI(this IServiceCollection services, I
             c.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
         });
         services.AddScoped<LocalTimeOffset>();
-        services.AddHttpContextAccessor();
         services.AddScoped<HubClient>();
         services
             .AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>()

src/Server.UI/Hubs/HubClient.cs

@@ -7,11 +7,8 @@ namespace CleanArchitecture.Blazor.Server.UI.Hubs;
 
 public sealed class HubClient : IAsyncDisposable
 {
-
-
     private readonly HubConnection _hubConnection;
     private bool _started;
-
     public HubClient(NavigationManager navigationManager, IHttpContextAccessor httpContextAccessor)
     {
         var uri = new UriBuilder(navigationManager.Uri);

src/Server.UI/Services/IdentityComponentsEndpointRouteBuilderExtensions.cs

@@ -58,7 +58,7 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
             await signInManager.SignOutAsync().ConfigureAwait(false);
             logger.LogInformation("{UserName} has logged out.", user.Identity?.Name);
             return TypedResults.LocalRedirect($"{returnUrl}");
-        });
+        }).RequireAuthorization().DisableAntiforgery();
 
         var manageGroup = accountGroup.MapGroup("/Manage").RequireAuthorization();
 

src/Server.UI/wwwroot/css/app.css

@@ -98,6 +98,11 @@
     height: auto !important;
     padding: 0rem !important;
 }
+
+
+
+
+
 .blazor-error-boundary {
     background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
     padding: 1rem 1rem 1rem 3.7rem;