From a0144232d7e9d17e2514088bf094c813bf0ab6c2 Mon Sep 17 00:00:00 2001 From: John Karam <168653085+johnkaram02@users.noreply.github.com> Date: Tue, 27 Oct 2026 23:17:30 +0000 Subject: [PATCH 1/2] Do not append a dot to tenant placeholders that are not followed by one MultiTenantUrlProvider always appended "." to the tenant name or id. It removed the dot from the template only when the placeholder was followed by one, so a placeholder used outside a subdomain produced a stray dot. For example, "https://abp.io/{0}/login" became "https://abp.io/TenantA./login". Replace "{placeholder}." with "value." (or remove it for the host), then replace any remaining "{placeholder}" with the value alone. Subdomain templates keep their current output. --- .../MultiTenancy/MultiTenantUrlProvider.cs | 14 ++++++------- .../MultiTenantUrlProivder_Tests.cs | 21 ++++++++++++++++++- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantUrlProvider.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantUrlProvider.cs index 95339b726b..6a588780e3 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantUrlProvider.cs +++ b/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 diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs index 62a27ad059..e826b330a1 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs @@ -53,5 +53,24 @@ 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"; + + 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(mixedHolderUrl)).ShouldBe("https://abp.io//login"); + } + } \ No newline at end of file From df5f828e25fe9f340cf5c01a5af476d8996af323 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 28 Oct 2026 13:29:31 +0800 Subject: [PATCH 2/2] Cover tenant placeholders in paths for host and mixed templates --- .../Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs index e826b330a1..50de9f40b8 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantUrlProivder_Tests.cs @@ -61,6 +61,8 @@ public class MultiTenantUrlProivder_Tests : MultiTenancyTestBase 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)) { @@ -68,8 +70,13 @@ public class MultiTenantUrlProivder_Tests : MultiTenancyTestBase (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"); }