Browse Source

Rename to `UrlHelper`.

pull/20628/head
maliming 2 years ago
parent
commit
270afea410
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 2
      framework/src/Volo.Abp.Core/Volo/Abp/Http/UrlHelpers.cs
  2. 2
      framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
  3. 8
      framework/test/Volo.Abp.Core.Tests/Volo/Abp/Http/UrlHelpers_Tests.cs

2
framework/src/Volo.Abp.Core/Volo/Abp/Http/UriHelpers.cs → framework/src/Volo.Abp.Core/Volo/Abp/Http/UrlHelpers.cs

@ -2,7 +2,7 @@ using System;
namespace Volo.Abp.Http;
public static class UriHelpers
public static class UrlHelpers
{
private const string WildcardSubdomain = "*.";

2
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs

@ -45,7 +45,7 @@ public class AppUrlProvider : IAppUrlProvider, ITransientDependency
redirectAllowedUrls.Add((await NormalizeUrlAsync(redirectAllowedUrl))!);
}
var allow = redirectAllowedUrls.Any(x => url.StartsWith(x, StringComparison.CurrentCultureIgnoreCase) ||
UriHelpers.IsSubdomainOf(url, x));
UrlHelpers.IsSubdomainOf(url, x));
if (!allow)
{
Logger.LogError($"Invalid RedirectUrl: {url}, Use {nameof(AppUrlProvider)} to configure it!");

8
framework/test/Volo.Abp.Core.Tests/Volo/Abp/Http/UriHelpers_Tests.cs → framework/test/Volo.Abp.Core.Tests/Volo/Abp/Http/UrlHelpers_Tests.cs

@ -3,7 +3,7 @@ using Xunit;
namespace Volo.Abp.Http;
public class UriHelpers_Tests
public class UrlHelpers_Tests
{
[Theory]
[InlineData(null)]
@ -14,7 +14,7 @@ public class UriHelpers_Tests
[InlineData("http://.domain/hello")]
public void IsSubdomainOf_ReturnsFalseIfDomainIsMalformedUri(string domain)
{
var actual = UriHelpers.IsSubdomainOf("http://*.domain", domain);
var actual = UrlHelpers.IsSubdomainOf("http://*.domain", domain);
actual.ShouldBeFalse();
}
@ -25,7 +25,7 @@ public class UriHelpers_Tests
[InlineData("http://sub.domain:4567", "http://*.domain:4567")]
public void IsSubdomainOf_ReturnsTrue_WhenASubdomain(string subdomain, string domain)
{
var actual = UriHelpers.IsSubdomainOf(subdomain, domain);
var actual = UrlHelpers.IsSubdomainOf(subdomain, domain);
actual.ShouldBeTrue();
}
@ -36,7 +36,7 @@ public class UriHelpers_Tests
[InlineData("https://sub.domain", "http://*.domain")]
public void IsSubdomainOf_ReturnsFalse_WhenNotASubdomain(string subdomain, string domain)
{
var actual = UriHelpers.IsSubdomainOf(subdomain, domain);
var actual = UrlHelpers.IsSubdomainOf(subdomain, domain);
actual.ShouldBeFalse();
}
}
Loading…
Cancel
Save