Merge pull request #13245 from abpframework/MultiTenancyMiddlewareErrorPageBuilder-bool

Add bool return value to `MultiTenancyMiddlewareErrorPageBuilder` decide to continue the pipeline.

docs/en/Multi-Tenancy.md

@@ -44,6 +44,9 @@ Configure<AbpMultiTenancyOptions>(options =>
     options.MultiTenancyMiddlewareErrorPageBuilder = async (context, exception) =>
     {
         // Handle the exception.
+
+        // Return true to stop the pipeline, false to continue.
+        return true;
     };
 });
 ```

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

@@ -16,7 +16,10 @@ public class AbpAspNetCoreMultiTenancyOptions
     /// </summary>
     public string TenantKey { get; set; }
 
-    public Func<HttpContext, Exception, Task> MultiTenancyMiddlewareErrorPageBuilder { get; set; }
+    /// <summary>
+    /// Return true to stop the pipeline, false to continue.
+    /// </summary>
+    public Func<HttpContext, Exception, Task<bool>> MultiTenancyMiddlewareErrorPageBuilder { get; set; }
 
     public AbpAspNetCoreMultiTenancyOptions()
     {
@@ -44,6 +47,8 @@ public class AbpAspNetCoreMultiTenancyOptions
 
             // Note the 500 spaces are to work around an IE 'feature'
             await context.Response.WriteAsync(new string(' ', 500));
+
+            return true;
         };
     }
 }

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

@@ -34,15 +34,17 @@ public class MultiTenancyMiddleware : IMiddleware, ITransientDependency
 
     public async Task InvokeAsync(HttpContext context, RequestDelegate next)
     {
-        TenantConfiguration tenant;
+        TenantConfiguration tenant = null;
         try
         {
             tenant = await _tenantConfigurationProvider.GetAsync(saveResolveResult: true);
         }
         catch (Exception e)
         {
-            await _options.MultiTenancyMiddlewareErrorPageBuilder(context, e);
-            return;
+            if (await _options.MultiTenancyMiddlewareErrorPageBuilder(context, e))
+            {
+                return;
+            }
         }
 
         if (tenant?.Id != _currentTenant.Id)