Browse Source

Merge pull request #26345 from johnkaram02/fix/multitenant-url-placeholder-dot

Do not append a dot to tenant placeholders that are not followed by one
pull/26464/head
Ma Liming 1 week ago
committed by GitHub
parent
commit
044cf313a2
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 14
      framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantUrlProvider.cs
  2. 28
      framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs

14
framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantUrlProvider.cs

@ -47,14 +47,14 @@ public class MultiTenantUrlProvider : IMultiTenantUrlProvider , ITransientDepend
var placeHolderValue = string.Empty;
if (CurrentTenant.IsAvailable)
{
placeHolderValue = (placeHolder == TenantIdPlaceHolder ? CurrentTenant.Id!.Value.ToString() : await GetCurrentTenantNameAsync()) + ".";
placeHolderValue = placeHolder == TenantIdPlaceHolder ? CurrentTenant.Id!.Value.ToString() : await GetCurrentTenantNameAsync();
}
if (templateUrl.Contains(placeHolder + '.'))
{
placeHolder += '.';
}
templateUrl = templateUrl.Replace(
placeHolder + '.',
placeHolderValue.IsNullOrEmpty() ? string.Empty : placeHolderValue + '.'
);
templateUrl = templateUrl.Replace(
placeHolder,
placeHolderValue

28
framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs

@ -53,5 +53,31 @@ public class MultiTenantUrlProivder_Tests : MultiTenancyTestBase
(await _multiTenantUrlProvider.GetUrlAsync(hostUrl)).ShouldBe(hostUrl);
}
}
[Fact]
public async Task GetUrlAsync_With_PlaceHolder_Not_Followed_By_Dot()
{
var tenantNameHolderUrl = "https://abp.io/{{tenantName}}/login";
var tenantIdHolderUrl = "https://abp.io/{{tenantId}}/login";
var tenantHolderUrl = "https://abp.io/{0}/login";
var mixedHolderUrl = "https://{0}.abp.io/{0}/login";
var mixedTenantNameHolderUrl = "https://{{tenantName}}.abp.io/{{tenantName}}/login";
var mixedTenantIdHolderUrl = "https://{{tenantId}}.abp.io/{{tenantId}}/login";
using (_currentTenant.Change(_tenantAId))
{
(await _multiTenantUrlProvider.GetUrlAsync(tenantNameHolderUrl)).ShouldBe("https://abp.io/TenantA/login");
(await _multiTenantUrlProvider.GetUrlAsync(tenantIdHolderUrl)).ShouldBe("https://abp.io/" + _tenantAId + "/login");
(await _multiTenantUrlProvider.GetUrlAsync(tenantHolderUrl)).ShouldBe("https://abp.io/TenantA/login");
(await _multiTenantUrlProvider.GetUrlAsync(mixedHolderUrl)).ShouldBe("https://TenantA.abp.io/TenantA/login");
(await _multiTenantUrlProvider.GetUrlAsync(mixedTenantNameHolderUrl)).ShouldBe("https://TenantA.abp.io/TenantA/login");
(await _multiTenantUrlProvider.GetUrlAsync(mixedTenantIdHolderUrl)).ShouldBe("https://" + _tenantAId + ".abp.io/" + _tenantAId + "/login");
}
(await _multiTenantUrlProvider.GetUrlAsync(tenantNameHolderUrl)).ShouldBe("https://abp.io//login");
(await _multiTenantUrlProvider.GetUrlAsync(tenantIdHolderUrl)).ShouldBe("https://abp.io//login");
(await _multiTenantUrlProvider.GetUrlAsync(tenantHolderUrl)).ShouldBe("https://abp.io//login");
(await _multiTenantUrlProvider.GetUrlAsync(mixedHolderUrl)).ShouldBe("https://abp.io//login");
}
}
Loading…
Cancel
Save