Browse Source

Merge remote-tracking branch 'origin/rel-10.7' into auto-merge-forward/rel-10.7-to-dev-92

pull/26302/head
github-actions[bot] 1 month ago
parent
commit
c432cc6aa3
  1. 1
      framework/Volo.Abp.slnx
  2. 25
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/AbpScripts.razor
  3. 27
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/AbpStyles.razor
  4. 62
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/ComponentBundleUrlBuilder.cs
  5. 8
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/IComponentBundleUrlBuilder.cs
  6. 20
      framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/MenuItemUrlHelper.cs
  7. 31
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs
  8. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs
  9. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs
  10. 3
      framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests.abppkg
  11. 17
      framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests.csproj
  12. 119
      framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests/Volo/Abp/AspNetCore/Components/Web/Theming/MudBlazor/Bundling/ComponentBundleUrlBuilder_Tests.cs
  13. 27
      framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.Tests/Volo/Abp/AspNetCore/Components/Web/MenuItemUrlHelper_Tests.cs
  14. 125
      framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService_ExternalFile_Tests.cs
  15. 3
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor
  16. 3
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor
  17. 4
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor
  18. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor
  19. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor
  20. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenuItem.razor
  21. 3
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs
  22. 5
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs

1
framework/Volo.Abp.slnx

@ -189,6 +189,7 @@
<Project Path="test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj" />
<Project Path="test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj" />
<Project Path="test/Volo.Abp.AspNetCore.Components.Web.Theming.Tests/Volo.Abp.AspNetCore.Components.Web.Theming.Tests.csproj" />
<Project Path="test/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests.csproj" />
<Project Path="test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj" />
<Project Path="test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj" />
<Project Path="test/Volo.Abp.AspNetCore.Mvc.Client.Tests/Volo.Abp.AspNetCore.Mvc.Client.Tests.csproj" />

25
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/AbpScripts.razor

@ -1,16 +1,14 @@
@using Microsoft.AspNetCore.Components
@implements IDisposable
@inject IComponentBundleManager BundleManager
@inject PersistentComponentState ApplicationState
@inject NavigationManager NavigationManager
@inject IComponentBundleUrlBuilder BundleUrlBuilder
@if (ScriptFiles != null)
{
foreach (var file in ScriptFiles)
{
var src = file;
if (!AppBasePath.IsNullOrWhiteSpace())
{
src = AppBasePath.EnsureEndsWith('/') + file.RemovePreFix("/");
}
<script src="@src"></script>
<script src="@file"></script>
}
}
@ -39,18 +37,29 @@
// We are in prerendering mode
if (!BundleName.IsNullOrWhiteSpace())
{
ScriptFiles = (await BundleManager.GetScriptBundleFilesAsync(BundleName!)).ToList();
var rawFiles = await BundleManager.GetScriptBundleFilesAsync(BundleName!);
ScriptFiles = await ResolveAsync(rawFiles);
}
}
else
{
if (OperatingSystem.IsBrowser() && WebAssemblyScriptFiles != null)
{
ScriptFiles = WebAssemblyScriptFiles;
ScriptFiles = await ResolveAsync(WebAssemblyScriptFiles);
}
}
}
private async Task<List<string>> ResolveAsync(IReadOnlyList<string> files)
{
var resolved = new List<string>(files.Count);
foreach (var file in files)
{
resolved.Add(await BundleUrlBuilder.BuildAsync(file, AppBasePath, NavigationManager.BaseUri));
}
return resolved;
}
private Task Callback()
{
ApplicationState.PersistAsJson(PrerenderedKey, PrerenderedKey);

27
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/AbpStyles.razor

@ -1,16 +1,14 @@
@using Microsoft.AspNetCore.Components
@implements IDisposable
@inject IComponentBundleManager BundleManager
@inject PersistentComponentState ApplicationState
@inject NavigationManager NavigationManager
@inject IComponentBundleUrlBuilder BundleUrlBuilder
@if (StyleFiles != null)
{
foreach (var file in StyleFiles)
{
var href = file;
if (!AppBasePath.IsNullOrWhiteSpace())
{
href = AppBasePath.EnsureEndsWith('/') + file.RemovePreFix("/");
}
<link rel="stylesheet" href="@href" />
<link rel="stylesheet" href="@file" />
}
}
@ -39,7 +37,8 @@
// We are in prerendering mode
if (!BundleName.IsNullOrWhiteSpace())
{
StyleFiles = (await BundleManager.GetStyleBundleFilesAsync(BundleName!)).ToList();
var rawFiles = await BundleManager.GetStyleBundleFilesAsync(BundleName!);
StyleFiles = await ResolveAsync(rawFiles);
}
}
else
@ -47,7 +46,7 @@
StyleFiles = scriptFiles;
if (OperatingSystem.IsBrowser() && StyleFiles != null && WebAssemblyStyleFiles != null)
{
StyleFiles.AddIfNotContains(WebAssemblyStyleFiles);
StyleFiles.AddIfNotContains(await ResolveAsync(WebAssemblyStyleFiles));
}
}
}
@ -60,11 +59,21 @@
{
_hasRemoveServerStyle = true;
await Task.Delay(3000);
StyleFiles = WebAssemblyStyleFiles;
StyleFiles = await ResolveAsync(WebAssemblyStyleFiles);
StateHasChanged();
}
}
private async Task<List<string>> ResolveAsync(IReadOnlyList<string> files)
{
var resolved = new List<string>(files.Count);
foreach (var file in files)
{
resolved.Add(await BundleUrlBuilder.BuildAsync(file, AppBasePath, NavigationManager.BaseUri));
}
return resolved;
}
private Task Callback()
{
ApplicationState.PersistAsJson(PrerenderedKey, StyleFiles);

62
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/ComponentBundleUrlBuilder.cs

@ -0,0 +1,62 @@
using System;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Volo.Abp.DependencyInjection;
namespace Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling;
public class ComponentBundleUrlBuilder : IComponentBundleUrlBuilder, ITransientDependency
{
public virtual Task<string> BuildAsync(
[NotNull] string fileName,
[CanBeNull] string? appBasePath,
[CanBeNull] string? navigationBaseUri)
{
Check.NotNull(fileName, nameof(fileName));
if (IsExternalUrl(fileName))
{
return Task.FromResult(fileName);
}
var pathBase = !string.IsNullOrWhiteSpace(appBasePath)
? appBasePath
: ExtractPathBaseFromNavigationBaseUri(navigationBaseUri);
if (string.IsNullOrWhiteSpace(pathBase))
{
return Task.FromResult(fileName);
}
var normalized = pathBase.EnsureEndsWith('/');
if (normalized == "/")
{
return Task.FromResult(fileName);
}
if (fileName.StartsWith(normalized, StringComparison.Ordinal))
{
return Task.FromResult(fileName);
}
return Task.FromResult(normalized + fileName.RemovePreFix("/"));
}
protected virtual bool IsExternalUrl([NotNull] string fileName)
{
return fileName.StartsWith("//", StringComparison.Ordinal) ||
(fileName.Contains(':') && Uri.TryCreate(fileName, UriKind.Absolute, out _));
}
protected virtual string? ExtractPathBaseFromNavigationBaseUri([CanBeNull] string? navigationBaseUri)
{
if (string.IsNullOrWhiteSpace(navigationBaseUri))
{
return null;
}
return Uri.TryCreate(navigationBaseUri, UriKind.Absolute, out var uri)
? uri.AbsolutePath
: null;
}
}

8
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Bundling/IComponentBundleUrlBuilder.cs

@ -0,0 +1,8 @@
using System.Threading.Tasks;
namespace Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling;
public interface IComponentBundleUrlBuilder
{
Task<string> BuildAsync(string fileName, string? appBasePath, string? navigationBaseUri);
}

20
framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/MenuItemUrlHelper.cs

@ -0,0 +1,20 @@
using System;
namespace Volo.Abp.AspNetCore.Components.Web;
public static class MenuItemUrlHelper
{
/// <summary>
/// Makes an app-local menu url ("/x" or "~/x") relative to the base href, so it keeps the PathBase.
/// Protocol-relative urls ("//host/x") point to another host and are returned as is.
/// </summary>
public static string? ToBaseRelativeUrl(string? url)
{
if (url == null || url.StartsWith("//", StringComparison.Ordinal))
{
return url;
}
return url.TrimStart('/', '~');
}
}

31
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs

@ -5,7 +5,9 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
@ -100,6 +102,35 @@ public abstract class AbpTagHelperResourceService : ITransientDependency
output.Content.AppendHtml($"<script>console.log(\"%cCould not find the bundle file '{file.FileName}' for the bundle '{bundleName}'!\", 'background: yellow; color: black; font-size:20px;');</script>{Environment.NewLine}");
}
/// <summary>
/// External files are not bundled, but an external file given as a local path ("/x" or "~/x")
/// is still served by this application, so it needs the request's PathBase like the other files.
/// A "/x" path that already starts with the PathBase is kept as is, so URLs that were prefixed manually keep working.
/// </summary>
protected virtual string GetExternalFileUrl(ViewContext viewContext, BundleFile file)
{
var fileName = file.FileName;
if (fileName.StartsWith("~/", StringComparison.Ordinal))
{
return viewContext.GetUrlHelper().Content(fileName);
}
if (fileName.StartsWith("/", StringComparison.Ordinal) && !fileName.StartsWith("//", StringComparison.Ordinal))
{
var pathBase = viewContext.HttpContext.Request.PathBase;
var queryIndex = fileName.IndexOfAny(['?', '#']);
var path = new PathString(queryIndex < 0 ? fileName : fileName.Substring(0, queryIndex));
if (pathBase.HasValue && path.StartsWithSegments(pathBase))
{
return fileName;
}
return viewContext.GetUrlHelper().Content("~" + fileName);
}
return fileName;
}
protected virtual string GenerateBundleName(List<BundleTagHelperItem> bundleItems)
{
return bundleItems.JoinAsString("|").ToMd5();

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs

@ -54,7 +54,7 @@ public class AbpTagHelperScriptService : AbpTagHelperResourceService
var nonceText = (viewContext.HttpContext.Items.TryGetValue(AbpAspNetCoreConsts.ScriptNonceKey, out var nonce) && nonce is string nonceString && !string.IsNullOrEmpty(nonceString))
? $"nonce=\"{nonceString}\" "
: string.Empty;
var src = file.IsExternalFile ? file.FileName : viewContext.GetUrlHelper().Content((file.FileName + "?_v=" + fileInfo!.LastModified.UtcTicks).EnsureStartsWith('~'));
var src = file.IsExternalFile ? GetExternalFileUrl(viewContext, file) : viewContext.GetUrlHelper().Content((file.FileName + "?_v=" + fileInfo!.LastModified.UtcTicks).EnsureStartsWith('~'));
output.Content.AppendHtml($"<script {deferText}{nonceText}src=\"{src}\"></script>{Environment.NewLine}");
}
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs

@ -52,7 +52,7 @@ public class AbpTagHelperStyleService : AbpTagHelperResourceService
_ => false
};
var href = file.IsExternalFile ? file.FileName : viewContext.GetUrlHelper().Content((file.FileName + "?_v=" + fileInfo!.LastModified.UtcTicks).EnsureStartsWith('~'));
var href = file.IsExternalFile ? GetExternalFileUrl(viewContext, file) : viewContext.GetUrlHelper().Content((file.FileName + "?_v=" + fileInfo!.LastModified.UtcTicks).EnsureStartsWith('~'));
if (preload || Options.PreloadStylesByDefault || Options.PreloadStyles.Any(x => file.FileName.StartsWith(x, StringComparison.OrdinalIgnoreCase)))
{
output.Content.AppendHtml(SecurityHeadersOptions.UseContentSecurityPolicyScriptNonce

3
framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests.abppkg

@ -0,0 +1,3 @@
{
"role": "lib.test"
}

17
framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests.csproj

@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.test.props" />
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace />
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
<ProjectReference Include="..\..\src\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor\Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.csproj" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
</ItemGroup>
</Project>

119
framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Tests/Volo/Abp/AspNetCore/Components/Web/Theming/MudBlazor/Bundling/ComponentBundleUrlBuilder_Tests.cs

@ -0,0 +1,119 @@
using System.Threading.Tasks;
using Shouldly;
using Xunit;
namespace Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling;
public class ComponentBundleUrlBuilder_Tests
{
private readonly IComponentBundleUrlBuilder _builder = new ComponentBundleUrlBuilder();
[Fact]
public async Task Should_Return_FileName_When_No_PathBase_Available()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: null, navigationBaseUri: null))
.ShouldBe("/__bundles/Global.css");
}
[Fact]
public async Task Should_Return_FileName_When_NavigationBaseUri_Has_Root_PathBase()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: null, navigationBaseUri: "https://localhost/"))
.ShouldBe("/__bundles/Global.css");
}
[Fact]
public async Task Should_Use_Explicit_AppBasePath_Over_NavigationBaseUri()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: "/explicit", navigationBaseUri: "https://localhost/from-nav/"))
.ShouldBe("/explicit/__bundles/Global.css");
}
[Fact]
public async Task Should_Resolve_PathBase_From_NavigationBaseUri()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: null, navigationBaseUri: "https://localhost/foo/"))
.ShouldBe("/foo/__bundles/Global.css");
}
[Fact]
public async Task Should_Resolve_PathBase_From_NavigationBaseUri_When_AppBasePath_Empty()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: "", navigationBaseUri: "https://localhost/foo/"))
.ShouldBe("/foo/__bundles/Global.css");
}
[Fact]
public async Task Should_Handle_Nested_PathBase()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: null, navigationBaseUri: "https://localhost/foo/bar/"))
.ShouldBe("/foo/bar/__bundles/Global.css");
}
[Fact]
public async Task Should_Normalize_AppBasePath_Without_Trailing_Slash()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: "/foo", navigationBaseUri: null))
.ShouldBe("/foo/__bundles/Global.css");
}
[Fact]
public async Task Should_Not_Duplicate_Leading_Slash()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: "/foo/", navigationBaseUri: null))
.ShouldBe("/foo/__bundles/Global.css");
}
[Fact]
public async Task Should_Handle_FileName_Without_Leading_Slash()
{
(await _builder.BuildAsync("__bundles/Global.css", appBasePath: "/foo", navigationBaseUri: null))
.ShouldBe("/foo/__bundles/Global.css");
}
[Fact]
public async Task Should_Return_FileName_When_NavigationBaseUri_Is_Invalid()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: null, navigationBaseUri: "not-a-uri"))
.ShouldBe("/__bundles/Global.css");
}
[Fact]
public async Task Should_Throw_When_FileName_Is_Null()
{
await Should.ThrowAsync<System.ArgumentNullException>(async () =>
await _builder.BuildAsync(null!, appBasePath: "/foo", navigationBaseUri: null));
}
[Theory]
[InlineData("https://cdn.example.com/foo.css")]
[InlineData("http://cdn.example.com/foo.css")]
[InlineData("//cdn.example.com/foo.css")]
[InlineData("data:text/css;base64,Zm9vIA==")]
public async Task Should_Not_Prefix_External_Urls(string externalUrl)
{
(await _builder.BuildAsync(externalUrl, appBasePath: "/foo", navigationBaseUri: "https://localhost/foo/"))
.ShouldBe(externalUrl);
}
[Fact]
public async Task Should_Treat_Whitespace_AppBasePath_As_Not_Provided()
{
(await _builder.BuildAsync("/__bundles/Global.css", appBasePath: " ", navigationBaseUri: "https://localhost/foo/"))
.ShouldBe("/foo/__bundles/Global.css");
}
[Fact]
public async Task Should_Be_Idempotent_For_Already_Prefixed_FileName()
{
(await _builder.BuildAsync("/foo/__bundles/Global.css", appBasePath: "/foo", navigationBaseUri: null))
.ShouldBe("/foo/__bundles/Global.css");
}
[Fact]
public async Task Should_Be_Idempotent_When_PathBase_Resolved_From_NavigationBaseUri()
{
(await _builder.BuildAsync("/foo/__bundles/Global.css", appBasePath: null, navigationBaseUri: "https://localhost/foo/"))
.ShouldBe("/foo/__bundles/Global.css");
}
}

27
framework/test/Volo.Abp.AspNetCore.Components.Web.Theming.Tests/Volo/Abp/AspNetCore/Components/Web/MenuItemUrlHelper_Tests.cs

@ -0,0 +1,27 @@
using Shouldly;
using Xunit;
namespace Volo.Abp.AspNetCore.Components.Web;
public class MenuItemUrlHelper_Tests
{
[Theory]
[InlineData("/", "")]
[InlineData("/books", "books")]
[InlineData("~/books", "books")]
[InlineData("books", "books")]
[InlineData("/identity/users?filter=a", "identity/users?filter=a")]
[InlineData("//cdn.example.com/help", "//cdn.example.com/help")]
[InlineData("https://docs.example.com/help", "https://docs.example.com/help")]
[InlineData("mailto:info@example.com", "mailto:info@example.com")]
public void Should_Make_Local_Urls_Relative_To_Base(string url, string expected)
{
MenuItemUrlHelper.ToBaseRelativeUrl(url).ShouldBe(expected);
}
[Fact]
public void Should_Return_Null_For_Null_Url()
{
MenuItemUrlHelper.ToBaseRelativeUrl(null).ShouldBeNull();
}
}

125
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService_ExternalFile_Tests.cs

@ -0,0 +1,125 @@
#nullable enable
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.Routing;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Shouldly;
using Volo.Abp.AspNetCore.Security;
using Xunit;
namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers;
public class AbpTagHelperResourceService_ExternalFile_Tests
{
[Theory]
[InlineData("/themes/basic/googlefonts.css", "", "/themes/basic/googlefonts.css")]
[InlineData("/themes/basic/googlefonts.css", "/foo", "/foo/themes/basic/googlefonts.css")]
[InlineData("~/themes/basic/googlefonts.css", "/foo", "/foo/themes/basic/googlefonts.css")]
[InlineData("/themes/basic/googlefonts.css", "/foo/bar", "/foo/bar/themes/basic/googlefonts.css")]
[InlineData("https://fonts.googleapis.com/css2?family=Lexend", "/foo", "https://fonts.googleapis.com/css2?family=Lexend")]
[InlineData("//cdn.example.com/foo.css", "/foo", "//cdn.example.com/foo.css")]
[InlineData("main.css", "/foo", "main.css")]
[InlineData("/foo/themes/basic/googlefonts.css", "/foo", "/foo/themes/basic/googlefonts.css")]
[InlineData("/foo/bar/themes/basic/googlefonts.css", "/foo/bar", "/foo/bar/themes/basic/googlefonts.css")]
[InlineData("/foo/themes/basic/googlefonts.css?v=1", "/foo", "/foo/themes/basic/googlefonts.css?v=1")]
[InlineData("/foobar/themes/basic/googlefonts.css", "/foo", "/foo/foobar/themes/basic/googlefonts.css")]
[InlineData("~/themes/basic/googlefonts.css", "", "/themes/basic/googlefonts.css")]
[InlineData("~/themes/basic/googlefonts.css", "/themes", "/themes/themes/basic/googlefonts.css")]
[InlineData("~/themes/basic/googlefonts.css", "/themes/basic", "/themes/basic/themes/basic/googlefonts.css")]
public void Style_Should_Resolve_Local_External_File_With_PathBase(string fileName, string pathBase, string expected)
{
var service = new TestStyleService();
var output = CreateOutput();
service.AddTag(CreateViewContext(pathBase), output, new BundleFile(fileName, true));
output.Content.GetContent().ShouldContain($"href=\"{expected}\"");
}
[Theory]
[InlineData("/libs/external.js", "", "/libs/external.js")]
[InlineData("/libs/external.js", "/foo", "/foo/libs/external.js")]
[InlineData("~/libs/external.js", "/foo", "/foo/libs/external.js")]
[InlineData("https://cdn.example.com/external.js", "/foo", "https://cdn.example.com/external.js")]
[InlineData("//cdn.example.com/external.js", "/foo", "//cdn.example.com/external.js")]
[InlineData("/foo/libs/external.js", "/foo", "/foo/libs/external.js")]
[InlineData("/foo/bar/libs/external.js", "/foo/bar", "/foo/bar/libs/external.js")]
[InlineData("/foobar/libs/external.js", "/foo", "/foo/foobar/libs/external.js")]
public void Script_Should_Resolve_Local_External_File_With_PathBase(string fileName, string pathBase, string expected)
{
var service = new TestScriptService();
var output = CreateOutput();
service.AddTag(CreateViewContext(pathBase), output, new BundleFile(fileName, true));
output.Content.GetContent().ShouldContain($"src=\"{expected}\"");
}
private static ViewContext CreateViewContext(string pathBase)
{
var httpContext = new DefaultHttpContext
{
RequestServices = new ServiceCollection()
.AddSingleton<IUrlHelperFactory, UrlHelperFactory>()
.BuildServiceProvider()
};
httpContext.Request.PathBase = new PathString(pathBase);
return new ViewContext
{
HttpContext = httpContext,
RouteData = new RouteData(),
ActionDescriptor = new ActionDescriptor()
};
}
private static TagHelperOutput CreateOutput()
{
return new TagHelperOutput(
"abp-test",
new TagHelperAttributeList(),
(_, _) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
}
private static TagHelperContext CreateContext()
{
return new TagHelperContext(new TagHelperAttributeList(), new Dictionary<object, object>(), "test");
}
private class TestTagHelper : TagHelper
{
}
private class TestStyleService : AbpTagHelperStyleService
{
public TestStyleService()
: base(null!, Microsoft.Extensions.Options.Options.Create(new AbpBundlingOptions()), null!, Microsoft.Extensions.Options.Options.Create(new AbpSecurityHeadersOptions()))
{
}
public void AddTag(ViewContext viewContext, TagHelperOutput output, BundleFile file)
{
AddHtmlTag(viewContext, new TestTagHelper(), CreateContext(), output, file, null);
}
}
private class TestScriptService : AbpTagHelperScriptService
{
public TestScriptService()
: base(null!, Microsoft.Extensions.Options.Options.Create(new AbpBundlingOptions()), null!)
{
}
public void AddTag(ViewContext viewContext, TagHelperOutput output, BundleFile file)
{
AddHtmlTag(viewContext, new TestTagHelper(), CreateContext(), output, file, null);
}
}
}

3
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor

@ -1,4 +1,5 @@
@namespace Volo.Abp.AspNetCore.Components.Server.BasicTheme.Themes.Basic
@using Volo.Abp.AspNetCore.Components.Web
@using Volo.Abp.Users
@using Volo.Abp.MultiTenancy
@using Volo.Abp.UI.Navigation
@ -34,7 +35,7 @@
}
else
{
<a class="dropdown-item" href="@menuItem.Url?.TrimStart('/', '~')" target="@menuItem.Target">@menuItem.DisplayName</a>
<a class="dropdown-item" href="@MenuItemUrlHelper.ToBaseRelativeUrl(menuItem.Url)" target="@menuItem.Target">@menuItem.DisplayName</a>
}
}
}

3
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor

@ -1,4 +1,5 @@
@namespace Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Themes.Basic
@using Volo.Abp.AspNetCore.Components.Web
@using Volo.Abp.Users
@using Volo.Abp.MultiTenancy
@using Microsoft.Extensions.Localization
@ -39,7 +40,7 @@
}
else
{
<MudMenuItem Href="@menuItem.Url?.TrimStart('/', '~')" Target="@menuItem.Target">@menuItem.DisplayName</MudMenuItem>
<MudMenuItem Href="@MenuItemUrlHelper.ToBaseRelativeUrl(menuItem.Url)" Target="@menuItem.Target">@menuItem.DisplayName</MudMenuItem>
}
}
}

4
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/FirstLevelNavMenuItem.razor

@ -17,7 +17,7 @@ else
<ChildContent>
@if (MenuItem.Url != null)
{
var url = MenuItem.Url == null ? "#" : MenuItem.Url.TrimStart('/', '~');
var url = MenuItemUrlHelper.ToBaseRelativeUrl(MenuItem.Url) ?? "#";
<a class="text-white text-decoration-none" href="@url" target="@MenuItem.Target">
@if (MenuItem.Icon != null && MenuItem.Icon.StartsWith("fa"))
{
@ -50,7 +50,7 @@ else
}
else
{
var itemUrl = item.Url == null ? "#" : item.Url.TrimStart('/', '~');
var itemUrl = MenuItemUrlHelper.ToBaseRelativeUrl(item.Url) ?? "#";
<a class="text-black text-decoration-none" href="@itemUrl">
@if (item.Icon != null)
{

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/Themes/Basic/SecondLevelNavMenuItem.razor

@ -31,7 +31,7 @@ else
}
else
{
var itemUrl = item.Url == null ? "#" : item.Url.TrimStart('/', '~');
var itemUrl = MenuItemUrlHelper.ToBaseRelativeUrl(item.Url) ?? "#";
<a class="text-black text-decoration-none" href="@itemUrl">
@if (item.Icon != null)
{

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenu.razor

@ -5,7 +5,7 @@
{
if (menuItem.Items.IsNullOrEmpty())
{
<MudNavLink Href="@menuItem.Url" Match="@(menuItem.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
<MudNavLink Href="@MenuItemUrlHelper.ToBaseRelativeUrl(menuItem.Url)" Match="@(menuItem.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
<MudIcon Icon="@menuItem.Icon" Size="Size.Small" />
<MudText Class="ms-1" Inline="true">@menuItem.DisplayName</MudText>
</MudNavLink>

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NavMenuItem.razor

@ -28,7 +28,7 @@ else
}
else
{
<MudNavLink Href="@(item.Url?.TrimStart('/', '~') ?? "#")" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
<MudNavLink Href="@(MenuItemUrlHelper.ToBaseRelativeUrl(item.Url) ?? "#")" Match="@(item.Url != null ? NavLinkMatch.All : NavLinkMatch.Prefix)">
<MudIcon Icon="@item.Icon" Size="Size.Small"/>
<MudText Class="ms-1" Inline="true">@item.DisplayName</MudText>
</MudNavLink>

3
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
using Microsoft.JSInterop;
using Volo.Abp.AspNetCore.Components.Web;
using Volo.Abp.AspNetCore.Components.Web.Security;
using Volo.Abp.AspNetCore.Components.WebAssembly;
using Volo.Abp.UI.Navigation;
@ -60,7 +61,7 @@ public partial class LoginDisplay : IDisposable
private async Task NavigateToAsync(string uri, string target = null)
{
uri = uri?.TrimStart('~', '/') ?? uri;
uri = MenuItemUrlHelper.ToBaseRelativeUrl(uri);
if (target == "_blank")
{

5
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs

@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
using Microsoft.JSInterop;
using Volo.Abp.AspNetCore.Components.Web;
using Volo.Abp.AspNetCore.Components.Web.Security;
using Volo.Abp.UI.Navigation;
@ -47,9 +48,11 @@ public partial class LoginDisplay : IDisposable
private async Task NavigateToAsync(string uri, string target = null)
{
uri = MenuItemUrlHelper.ToBaseRelativeUrl(uri);
if (target == "_blank")
{
await JsRuntime.InvokeVoidAsync("open", uri, target);
await JsRuntime.InvokeVoidAsync("open", Navigation.ToAbsoluteUri(uri).ToString(), target);
}
else
{

Loading…
Cancel
Save