Added tenant resolvers.

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyConsts.cs

@@ -0,0 +1,8 @@
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public static class AbpAspNetCoreMultiTenancyConsts
+    {
+        //TODO: Get from an option instead of a constant!
+        public const string TenantIdKey = "__tenantId";
+    }
+}

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetMultiTenancyModule.cs

@@ -11,14 +11,11 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             services.Configure<MultiTenancyOptions>(options =>
             {
+                //TODO: domain/subdomain (not added by default) as first resolver!
                 options.TenantResolvers.Insert(0, new QueryStringTenantResolver());
-                //TODO: Web tenant resolvers:
+                options.TenantResolvers.Insert(1, new RouteTenantResolver());
-                // values can be tenant id or name, should be validated first by an abstraction (say, ITenantStore over ITenantManager)!
+                options.TenantResolvers.Insert(2, new HeaderTenantResolver());
-                //- domain/subdomain (not added by default)
+                options.TenantResolvers.Insert(3, new CookieTenantResolver());
-                //- route {tenantId}
-                //+ querystring
-                //- header
-                //- cookie
             });
 
             services.AddAssemblyOf<AbpAspNetMultiTenancyModule>();

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolver.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public class CookieTenantResolver : HttpTenantResolverBase
+    {
+        protected override string GetTenantIdFromHttpContextOrNull(HttpContext httpContext)
+        {
+            return httpContext.Request.Cookies[AbpAspNetCoreMultiTenancyConsts.TenantIdKey];
+        }
+    }
+}

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolver.cs

@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public class HeaderTenantResolver : HttpTenantResolverBase
+    {
+        protected override string GetTenantIdFromHttpContextOrNull(HttpContext httpContext)
+        {
+            //TODO: Get first one if provided multiple values and write a log
+            return httpContext.Request.Headers[AbpAspNetCoreMultiTenancyConsts.TenantIdKey];
+        }
+    }
+}

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolverBase.cs

@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Http;
+using Volo.Abp.MultiTenancy;
+using Volo.ExtensionMethods;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public abstract class HttpTenantResolverBase : ITenantResolver
+    {
+        public virtual void Resolve(ITenantResolveContext context)
+        {
+            var httpContext = context.GetHttpContext();
+            if (httpContext == null)
+            {
+                return;
+            }
+
+            var tenantId = GetTenantIdFromHttpContextOrNull(httpContext);
+            if (!tenantId.IsNullOrEmpty())
+            {
+                context.Tenant = new TenantInfo(tenantId);
+            }
+        }
+
+        protected abstract string GetTenantIdFromHttpContextOrNull(HttpContext httpContext);
+    }
+}

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolver.cs

@@ -1,30 +1,17 @@
-using Volo.Abp.MultiTenancy;
+using Microsoft.AspNetCore.Http;
-using Volo.ExtensionMethods.Collections.Generic;
 
 namespace Volo.Abp.AspNetCore.MultiTenancy
 {
-    public class QueryStringTenantResolver : ITenantResolver
+    public class QueryStringTenantResolver : HttpTenantResolverBase
     {
-        public const string TenantIdKey = "__tenantId";
+        protected override string GetTenantIdFromHttpContextOrNull(HttpContext httpContext)
-        
-        public void Resolve(ITenantResolveContext context)
         {
-            var httpContext = context.GetHttpContext();
-            if (httpContext == null)
-            {
-                return;
-            }
-
             if (!httpContext.Request.QueryString.HasValue)
             {
-                return;
+                return null;
             }
 
-            var tenantId = httpContext.Request.Query[TenantIdKey];
+            return httpContext.Request.Query[AbpAspNetCoreMultiTenancyConsts.TenantIdKey];
-            if (!tenantId.IsNullOrEmpty())
-            {
-                context.Tenant = new TenantInfo(tenantId);
-            }
         }
     }
 }

src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolver.cs

@@ -0,0 +1,20 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+
+namespace Volo.Abp.AspNetCore.MultiTenancy
+{
+    public class RouteTenantResolver : HttpTenantResolverBase
+    {
+        protected override string GetTenantIdFromHttpContextOrNull(HttpContext httpContext)
+        {
+            var tenantId = httpContext.GetRouteValue(AbpAspNetCoreMultiTenancyConsts.TenantIdKey);
+            if (tenantId == null)
+            {
+                return null;
+            }
+
+            return Convert.ToString(tenantId);
+        }
+    }
+}

src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs

@@ -48,6 +48,9 @@ namespace Volo.Abp.MultiTenancy
                 foreach (var tenantResolver in _options.TenantResolvers)
                 {
                     tenantResolver.Resolve(context);
+
+                    //TODO: Validate TenantId by a TenantStore (TenantId can be TenancyName, so also normalize it by tenant store)
+
                     if (context.IsHandled())
                     {
                         break;

test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.Net.Http.Headers;
 using Shouldly;
 using Volo.Abp.AspNetCore.App;
 using Xunit;
@@ -20,7 +21,29 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             const string testTenantId = "42";
 
-            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>($"http://abp.io?{QueryStringTenantResolver.TenantIdKey}={testTenantId}");
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>($"http://abp.io?{AbpAspNetCoreMultiTenancyConsts.TenantIdKey}={testTenantId}");
+            result["TenantId"].ShouldBe(testTenantId);
+        }
+
+        [Fact]
+        public async Task Should_Use_Header_Tenant_Id_If_Specified()
+        {
+            const string testTenantId = "42";
+
+            Client.DefaultRequestHeaders.Add(AbpAspNetCoreMultiTenancyConsts.TenantIdKey, testTenantId);
+
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io");
+            result["TenantId"].ShouldBe(testTenantId);
+        }
+
+        [Fact]
+        public async Task Should_Use_Cookie_Tenant_Id_If_Specified()
+        {
+            const string testTenantId = "42";
+            
+            Client.DefaultRequestHeaders.Add("Cookie", new CookieHeaderValue(AbpAspNetCoreMultiTenancyConsts.TenantIdKey, testTenantId).ToString());
+
+            var result = await GetResponseAsObjectAsync<Dictionary<string, string>>("http://abp.io");
             result["TenantId"].ShouldBe(testTenantId);
         }
     }