From 263b90d7c945ed25f24f3c5b4615986c987d57e0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 16 Aug 2025 21:53:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Layout/Layout.razor | 8 ++++---- src/BootstrapBlazor/Components/Layout/Layout.razor.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor index bd76cfaa9b6..08c6381d641 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor @@ -126,8 +126,8 @@ } else { - + @HandlerMain() } @@ -135,7 +135,7 @@ RenderFragment RenderTab => @ + EnableErrorLogger="@EnableLogger" ErrorLoggerToastTitle="@ErrorLoggerToastTitle"> ; RenderFragment RenderFooter => diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs index 477057934e6..b1e6bc153da 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs @@ -501,15 +501,15 @@ public partial class Layout : IHandlerException, ITabHeader private IOptionsMonitor? Options { get; set; } private bool _init; - private LayoutHeader? _layoutHeader = null; + private LayoutHeader? _layoutHeader; private ITabHeader? TabHeader => ShowTabInHeader ? this : null; - private bool _enableErrorLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger; + private bool EnableLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger; - private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast; + private bool ShowToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast; - private bool _enableILogger => EnableErrorLoggerILogger ?? Options.CurrentValue.EnableErrorLoggerILogger; + private bool EnableILogger => EnableErrorLoggerILogger ?? Options.CurrentValue.EnableErrorLoggerILogger; /// /// From dd304994d6d35e7e97f63da8bf35e8bf0d7b3bc3 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 17 Aug 2025 18:18:59 +0800 Subject: [PATCH 2/3] feat: add SkipAuthenticate parmeter --- .../Components/Layout/Layout.razor | 2 +- .../Components/Layout/Layout.razor.cs | 44 ++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor index 08c6381d641..65fd1443dee 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor @@ -5,7 +5,7 @@ @if (_init) { - @if (IsAuthenticated) + @if (_authenticated) {
@if (Side == null) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs index b1e6bc153da..32c498f9f52 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs @@ -361,6 +361,12 @@ public partial class Layout : IHandlerException, ITabHeader [Parameter] public bool ShowTabInHeader { get; set; } + /// + /// 获得/设置 是否跳过认证逻辑 默认 false + /// + [Parameter] + public bool SkipAuthenticate { get; set; } + [Inject] [NotNull] private NavigationManager? Navigation { get; set; } @@ -374,7 +380,7 @@ public partial class Layout : IHandlerException, ITabHeader /// /// 获得/设置 是否已授权 /// - private bool IsAuthenticated { get; set; } + private bool _authenticated; /// /// 获得 组件样式 @@ -535,30 +541,28 @@ protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - // 需要认证并且未认证 - if (AuthenticationStateTask != null) + if (SkipAuthenticate || AuthenticationStateTask == null) { - // wasm 模式下 开启权限必须提供 AdditionalAssemblies 参数 - AdditionalAssemblies ??= [Assembly.GetEntryAssembly()!]; + _authenticated = true; + _init = true; + return; + } - var url = Navigation.ToBaseRelativePathWithoutQueryAndFragment(); - var context = RouteTableFactory.Create(AdditionalAssemblies, url); - if (context.Handler != null) - { - IsAuthenticated = await context.Handler.IsAuthorizedAsync(ServiceProvider, AuthenticationStateTask, Resource); + // wasm 模式下 开启权限必须提供 AdditionalAssemblies 参数 + AdditionalAssemblies ??= [Assembly.GetEntryAssembly()!]; - // 检查当前 Url - if (OnAuthorizing != null) - { - IsAuthenticated = IsAuthenticated && await OnAuthorizing(Navigation.Uri); - } - } - } - else + var url = Navigation.ToBaseRelativePathWithoutQueryAndFragment(); + var context = RouteTableFactory.Create(AdditionalAssemblies, url); + if (context.Handler != null) { - IsAuthenticated = true; - } + _authenticated = await context.Handler.IsAuthorizedAsync(ServiceProvider, AuthenticationStateTask, Resource); + // 检查当前 Url + if (OnAuthorizing != null) + { + _authenticated = _authenticated && await OnAuthorizing(Navigation.Uri); + } + } _init = true; } From 1f091d27fffdc07a668cc9336fc33c9136db80dc Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sun, 17 Aug 2025 18:19:07 +0800 Subject: [PATCH 3/3] test: add unit test --- test/UnitTest/Components/LayoutTest.cs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs index e778aa92225..72682e31423 100644 --- a/test/UnitTest/Components/LayoutTest.cs +++ b/test/UnitTest/Components/LayoutTest.cs @@ -673,6 +673,23 @@ public void CollapseBarTemplate_Ok() Assert.Contains("CollapseBarTemplate-Content", cut.Markup); } + + [Fact] + public void SkipAuthenticate_Ok() + { + // 未授权，通过控制 SkipAuthenticate 属性跳过授权 + var cut = Context.RenderComponent>>(pb => + { + pb.Add(a => a.Value, Task.FromResult(new AuthenticationState(new ClaimsPrincipal()))); + pb.AddChildContent(pb => + { + pb.Add(a => a.SkipAuthenticate, true); + pb.Add(a => a.Main, builder => builder.AddContent(0, "Main")); + }); + }); + cut.MarkupMatches("
Main
"); + } + private static RenderFragment CreateHeader(string? content = "Header") => builder => builder.AddContent(0, content); private static RenderFragment CreateFooter(string? content = "Footer") => builder => builder.AddContent(0, content);