Merge pull request #7125 from abpframework/maliming/DomainTenantResolveContributor

Consider http port in DomainTenantResolveContributor.

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs

@@ -25,7 +25,12 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
         protected override Task<string> GetTenantIdOrNameFromHttpContextOrNullAsync(ITenantResolveContext context, HttpContext httpContext)
         {
-            var hostName = httpContext.Request.Host.Host.RemovePreFix(ProtocolPrefixes);
+            if (!httpContext.Request.Host.HasValue)
+            {
+                return Task.FromResult<string>(null);
+            }
+
+            var hostName = httpContext.Request.Host.Value.RemovePreFix(ProtocolPrefixes);
             var extractResult = FormattedStringValueExtracter.Extract(hostName, _domainFormat, ignoreCase: true);
 
             context.Handled = true;

framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs

@@ -38,7 +38,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
                 services.Configure<AbpTenantResolveOptions>(options =>
                 {
-                    options.AddDomainTenantResolver("{0}.abp.io");
+                    options.AddDomainTenantResolver("{0}.abp.io:8080");
                 });
             });
         }
@@ -46,14 +46,14 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         [Fact]
         public async Task Should_Use_Host_If_Tenant_Is_Not_Specified()
         {
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io");
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io:8080");
             result["TenantId"].ShouldBe("");
         }
 
         [Fact]
         public async Task Should_Use_Domain_If_Specified()
         {
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io:8080");
             result["TenantId"].ShouldBe(_testTenantId.ToString());
         }
 
@@ -62,8 +62,8 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             Client.DefaultRequestHeaders.Add(_options.TenantKey, Guid.NewGuid().ToString());
 
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io");
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://acme.abp.io:8080");
             result["TenantId"].ShouldBe(_testTenantId.ToString());
         }
     }
-}
+}