Introduce ITenantConfigurationProvider.

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

@@ -1,5 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
@@ -8,59 +7,24 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 {
     public class MultiTenancyMiddleware : IMiddleware, ITransientDependency
     {
-        private readonly ITenantResolver _tenantResolver;
+        private readonly ITenantConfigurationProvider _tenantConfigurationProvider;
-        private readonly ITenantStore _tenantStore;
         private readonly ICurrentTenant _currentTenant;
-        private readonly ITenantResolveResultAccessor _tenantResolveResultAccessor;
 
         public MultiTenancyMiddleware(
-            ITenantResolver tenantResolver,
+            ITenantConfigurationProvider tenantConfigurationProvider,
-            ITenantStore tenantStore,
+            ICurrentTenant currentTenant)
-            ICurrentTenant currentTenant,
-            ITenantResolveResultAccessor tenantResolveResultAccessor)
         {
-            _tenantResolver = tenantResolver;
+            _tenantConfigurationProvider = tenantConfigurationProvider;
-            _tenantStore = tenantStore;
             _currentTenant = currentTenant;
-            _tenantResolveResultAccessor = tenantResolveResultAccessor;
         }
 
         public async Task InvokeAsync(HttpContext context, RequestDelegate next)
         {
-            var resolveResult = _tenantResolver.ResolveTenantIdOrName();
+            var tenant = await _tenantConfigurationProvider.ResolverAndGet();
-            _tenantResolveResultAccessor.Result = resolveResult;
-
-            TenantConfiguration tenant = null;
-            if (resolveResult.TenantIdOrName != null)
-            {
-                tenant = await FindTenantAsync(resolveResult.TenantIdOrName);
-
-                if (tenant == null)
-                {
-                    throw new BusinessException(
-                        code: "Volo.AbpIo.MultiTenancy:010001",
-                        message: "Tenant not found!",
-                        details: "There is no tenant with the tenant id or name: " + resolveResult.TenantIdOrName
-                    );
-                }
-            }
-
             using (_currentTenant.Change(tenant?.Id, tenant?.Name))
             {
                 await next(context);
             }
         }
-
-        private async Task<TenantConfiguration> FindTenantAsync(string tenantIdOrName)
-        {
-            if (Guid.TryParse(tenantIdOrName, out var parsedTenantId))
-            {
-                return await _tenantStore.FindAsync(parsedTenantId);
-            }
-            else
-            {
-                return await _tenantStore.FindAsync(tenantIdOrName);
-            }
-        }
     }
 }

framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public interface ITenantConfigurationProvider
+    {
+        Task<TenantConfiguration> ResolverAndGet();
+    }
+}

framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.MultiTenancy
+{
+    public class TenantConfigurationProvider : ITenantConfigurationProvider, ITransientDependency
+    {
+        protected virtual ITenantResolver TenantResolver { get; }
+        protected virtual ITenantStore TenantStore { get; }
+        protected virtual ITenantResolveResultAccessor TenantResolveResultAccessor { get; }
+
+        public TenantConfigurationProvider(
+            ITenantResolver tenantResolver,
+            ITenantStore tenantStore,
+            ITenantResolveResultAccessor tenantResolveResultAccessor)
+        {
+            TenantResolver = tenantResolver;
+            TenantStore = tenantStore;
+            TenantResolveResultAccessor = tenantResolveResultAccessor;
+        }
+
+        public virtual async Task<TenantConfiguration> ResolverAndGet()
+        {
+            var resolveResult = TenantResolver.ResolveTenantIdOrName();
+            TenantResolveResultAccessor.Result = resolveResult;
+
+            TenantConfiguration tenant = null;
+            if (resolveResult.TenantIdOrName != null)
+            {
+                tenant = await FindTenantAsync(resolveResult.TenantIdOrName);
+
+                if (tenant == null)
+                {
+                    throw new BusinessException(
+                        code: "Volo.AbpIo.MultiTenancy:010001",
+                        message: "Tenant not found!",
+                        details: "There is no tenant with the tenant id or name: " + resolveResult.TenantIdOrName
+                    );
+                }
+            }
+
+            return tenant;
+        }
+
+        protected virtual async Task<TenantConfiguration> FindTenantAsync(string tenantIdOrName)
+        {
+            if (Guid.TryParse(tenantIdOrName, out var parsedTenantId))
+            {
+                return await TenantStore.FindAsync(parsedTenantId);
+            }
+            else
+            {
+                return await TenantStore.FindAsync(tenantIdOrName);
+            }
+        }
+    }
+}