From 00ab8c162e075c2576ae35d6dac0bafffd35587d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 15 Dec 2016 23:38:06 +0300 Subject: [PATCH] Added notes. --- .../AspNetCore/MultiTenancy/AbpAspNetMultiTenancyModule.cs | 7 +++++++ .../AspNetCore/MultiTenancy/QueryStringTenantResolver.cs | 2 +- .../MultiTenancy/AspNetCoreMultiTenancy_Tests.cs | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetMultiTenancyModule.cs b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetMultiTenancyModule.cs index 6c1ab1a1a1..d7f695d120 100644 --- a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetMultiTenancyModule.cs +++ b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetMultiTenancyModule.cs @@ -12,6 +12,13 @@ namespace Volo.Abp.AspNetCore.MultiTenancy services.Configure(options => { options.TenantResolvers.Insert(0, new QueryStringTenantResolver()); + //TODO: Web tenant resolvers: + // values can be tenant id or name, should be validated first by an abstraction (say, ITenantStore over ITenantManager)! + //- domain/subdomain (not added by default) + //- route {tenantId} + //+ querystring + //- header + //- cookie }); services.AddAssemblyOf(); diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolver.cs b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolver.cs index 0b54ed9d95..98c5887fb1 100644 --- a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolver.cs +++ b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolver.cs @@ -6,7 +6,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { public class QueryStringTenantResolver : ITenantResolver, ITransientDependency { - public const string TenantIdKey = "_Abp.TenantId"; + public const string TenantIdKey = "__tenantId"; public void Resolve(ICurrentTenantResolveContext context) { diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs index 74fc0aecfb..69962ecf01 100644 --- a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs +++ b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Tests.cs @@ -23,7 +23,5 @@ namespace Volo.Abp.AspNetCore.MultiTenancy var result = await GetResponseAsObjectAsync>($"http://abp.io?{QueryStringTenantResolver.TenantIdKey}={testTenantId}"); result["TenantId"].ShouldBe(testTenantId); } - - //TODO: Specify tenant in the header, cookie, domain, subdomain, route, querystring and so on... } }