WrapExtensions

modules/mvc/Sanhe.Abp.AspNetCore.Mvc.Wrapper/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs

@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Cors.Infrastructure;
+using Sanhe.Abp.Wrapper;
+
+namespace Microsoft.AspNetCore.Cors;
+
+public static class AbpCorsPolicyBuilderExtensions
+{
+    public static CorsPolicyBuilder WithAbpWrapExposedHeaders(this CorsPolicyBuilder corsPolicyBuilder)
+    {
+        return corsPolicyBuilder
+            .WithExposedHeaders(
+                AbpHttpWrapConsts.AbpWrapResult,
+                AbpHttpWrapConsts.AbpDontWrapResult);
+    }
+}

modules/mvc/Sanhe.Abp.AspNetCore.Mvc.Wrapper/Microsoft/AspNetCore/Mvc/ActionContextExtensions.cs

@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Sanhe.Abp.Wrapper;
+
+namespace Microsoft.AspNetCore.Mvc;
+
+public static class ActionContextExtensions
+{
+    public static bool CanWarpRsult(this ActionDescriptor actionDescriptor)
+    {
+        if (actionDescriptor is ControllerActionDescriptor descriptor)
+        {
+            if (descriptor.MethodInfo.IsDefined(typeof(IgnoreWrapResultAttribute), true))
+            {
+                return false;
+            }
+
+            if (descriptor.ControllerTypeInfo.IsDefined(typeof(IgnoreWrapResultAttribute), true))
+            {
+                return false;
+            }
+
+            return true;
+        }
+        return false;
+    }
+}

modules/mvc/Sanhe.Abp.AspNetCore.Mvc.Wrapper/Sanhe.Abp.AspNetCore.Mvc.Wrapper.csproj

@@ -26,9 +26,4 @@
 	  <ProjectReference Include="..\..\common\Sanhe.Abp.Wrapper\Sanhe.Abp.Wrapper.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Microsoft\AspNetCore\Cors\" />
-	  <Folder Include="Microsoft\AspNetCore\Mvc\" />
-	</ItemGroup>
-
 </Project>

modules/mvc/Sanhe.Abp.AspNetCore.Mvc.Wrapper/Sanhe/Abp/AspNetCore/Mvc/Wrapper/AbpAspNetCoreMvcWrapperModule.cs

@@ -47,11 +47,10 @@ public class AbpAspNetCoreMvcWrapperModule : AbpModule
             options.IgnoreReturnTypes.Add<ApplicationApiDescriptionModel>();
             // api/abp/application-configuration
             options.IgnoreReturnTypes.Add<ApplicationConfigurationDto>();
-            // 流
+            // 流内容
             options.IgnoreReturnTypes.Add<IRemoteStreamContent>();
             // Abp/ServiceProxyScript
             options.IgnoreControllers.Add<AbpServiceProxyScriptController>();
-
             // 官方模块不包装结果
             options.IgnoreNamespaces.Add("Volo.Abp");
 

modules/mvc/Sanhe.Abp.AspNetCore.Mvc.Wrapper/Sanhe/Abp/AspNetCore/Mvc/Wrapper/ExceptionHandling/AbpExceptionPageWrapResultFilter.cs

@@ -17,72 +17,71 @@ using Volo.Abp.ExceptionHandling;
 using Volo.Abp.Http;
 using Volo.Abp.Json;
 
-namespace Sanhe.Abp.AspNetCore.Mvc.Wrapper.ExceptionHandling
+namespace Sanhe.Abp.AspNetCore.Mvc.Wrapper.ExceptionHandling;
+
+[Dependency(ReplaceServices = true)]
+[ExposeServices(typeof(AbpExceptionPageFilter))]
+public class AbpExceptionPageWrapResultFilter : AbpExceptionPageFilter, ITransientDependency
 {
-    [Dependency(ReplaceServices = true)]
-    [ExposeServices(typeof(AbpExceptionPageFilter))]
-    public class AbpExceptionPageWrapResultFilter : AbpExceptionPageFilter, ITransientDependency
+    protected async override Task HandleAndWrapException(PageHandlerExecutedContext context)
     {
-        protected async override Task HandleAndWrapException(PageHandlerExecutedContext context)
+        var wrapResultChecker = context.GetRequiredService<IWrapResultChecker>();
+        if (!wrapResultChecker.WrapOnException(context))
         {
-            var wrapResultChecker = context.GetRequiredService<IWrapResultChecker>();
-            if (!wrapResultChecker.WrapOnException(context))
-            {
-                await base.HandleAndWrapException(context);
-                return;
-            }
-
-            var wrapOptions = context.GetRequiredService<IOptions<AbpWrapperOptions>>().Value;
-            var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
-            var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
-            var remoteServiceErrorInfo = exceptionToErrorInfoConverter.Convert(context.Exception, options =>
-            {
-                options.SendExceptionsDetailsToClients = exceptionHandlingOptions.SendExceptionsDetailsToClients;
-                options.SendStackTraceToClients = exceptionHandlingOptions.SendStackTraceToClients;
-            });
+            await base.HandleAndWrapException(context);
+            return;
+        }
 
-            var logLevel = context.Exception.GetLogLevel();
+        var wrapOptions = context.GetRequiredService<IOptions<AbpWrapperOptions>>().Value;
+        var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
+        var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
+        var remoteServiceErrorInfo = exceptionToErrorInfoConverter.Convert(context.Exception, options =>
+        {
+            options.SendExceptionsDetailsToClients = exceptionHandlingOptions.SendExceptionsDetailsToClients;
+            options.SendStackTraceToClients = exceptionHandlingOptions.SendStackTraceToClients;
+        });
 
-            var remoteServiceErrorInfoBuilder = new StringBuilder();
-            remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
-            remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
+        var logLevel = context.Exception.GetLogLevel();
 
-            var logger = context.GetService<ILogger<AbpExceptionPageWrapResultFilter>>(NullLogger<AbpExceptionPageWrapResultFilter>.Instance);
-            logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
+        var remoteServiceErrorInfoBuilder = new StringBuilder();
+        remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
+        remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
 
-            logger.LogException(context.Exception, logLevel);
+        var logger = context.GetService<ILogger<AbpExceptionPageWrapResultFilter>>(NullLogger<AbpExceptionPageWrapResultFilter>.Instance);
+        logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
 
-            await context.GetRequiredService<IExceptionNotifier>().NotifyAsync(new ExceptionNotificationContext(context.Exception));
+        logger.LogException(context.Exception, logLevel);
 
+        await context.GetRequiredService<IExceptionNotifier>().NotifyAsync(new ExceptionNotificationContext(context.Exception));
 
-            if (context.Exception is AbpAuthorizationException)
-            {
-                await context.HttpContext.RequestServices.GetRequiredService<IAbpAuthorizationExceptionHandler>()
-                    .HandleAsync(context.Exception.As<AbpAuthorizationException>(), context.HttpContext);
-            }
-            else
-            {
-                var statusCodFinder = context.GetRequiredService<IHttpExceptionStatusCodeFinder>();
-                var exceptionWrapHandler = context.GetRequiredService<IExceptionWrapHandlerFactory>();
-                
-                var exceptionWrapContext = new ExceptionWrapContext(
-                    context.Exception,
-                    remoteServiceErrorInfo,
-                    context.HttpContext.RequestServices,
-                    statusCodFinder.GetStatusCode(context.HttpContext, context.Exception));
-                
-                exceptionWrapHandler.CreateFor(exceptionWrapContext).Wrap(exceptionWrapContext);
-                
-                context.Result = new ObjectResult(new WrapResult(
-                    exceptionWrapContext.ErrorInfo.Code,
-                    exceptionWrapContext.ErrorInfo.Message,
-                    exceptionWrapContext.ErrorInfo.Details));
 
-                context.HttpContext.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
-                context.HttpContext.Response.StatusCode = (int)wrapOptions.HttpStatusCode;
-            }
+        if (context.Exception is AbpAuthorizationException)
+        {
+            await context.HttpContext.RequestServices.GetRequiredService<IAbpAuthorizationExceptionHandler>()
+                .HandleAsync(context.Exception.As<AbpAuthorizationException>(), context.HttpContext);
+        }
+        else
+        {
+            var statusCodFinder = context.GetRequiredService<IHttpExceptionStatusCodeFinder>();
+            var exceptionWrapHandler = context.GetRequiredService<IExceptionWrapHandlerFactory>();
+            
+            var exceptionWrapContext = new ExceptionWrapContext(
+                context.Exception,
+                remoteServiceErrorInfo,
+                context.HttpContext.RequestServices,
+                statusCodFinder.GetStatusCode(context.HttpContext, context.Exception));
+            
+            exceptionWrapHandler.CreateFor(exceptionWrapContext).Wrap(exceptionWrapContext);
+            
+            context.Result = new ObjectResult(new WrapResult(
+                exceptionWrapContext.ErrorInfo.Code,
+                exceptionWrapContext.ErrorInfo.Message,
+                exceptionWrapContext.ErrorInfo.Details));
 
-            context.Exception = null; //Handled!
+            context.HttpContext.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
+            context.HttpContext.Response.StatusCode = (int)wrapOptions.HttpStatusCode;
         }
+
+        context.Exception = null; //Handled!
     }
 }

modules/mvc/Sanhe.Abp.AspNetCore.Mvc.Wrapper/Sanhe/Abp/AspNetCore/Mvc/Wrapper/ExceptionHandling/AbpExceptionWrapResultFilter.cs

@@ -17,74 +17,73 @@ using Volo.Abp.ExceptionHandling;
 using Volo.Abp.Http;
 using Volo.Abp.Json;
 
-namespace Sanhe.Abp.AspNetCore.Mvc.Wrapper.ExceptionHandling
+namespace Sanhe.Abp.AspNetCore.Mvc.Wrapper.ExceptionHandling;
+
+[Dependency(ReplaceServices = true)]
+[ExposeServices(typeof(AbpExceptionFilter))]
+public class AbpExceptionWrapResultFilter : AbpExceptionFilter, ITransientDependency
 {
-    [Dependency(ReplaceServices = true)]
-    [ExposeServices(typeof(AbpExceptionFilter))]
-    public class AbpExceptionWrapResultFilter : AbpExceptionFilter, ITransientDependency
+    protected async override Task HandleAndWrapException(ExceptionContext context)
     {
-        protected async override Task HandleAndWrapException(ExceptionContext context)
-        {
-            var wrapResultChecker = context.GetRequiredService<IWrapResultChecker>();
-
-            if (!wrapResultChecker.WrapOnException(context))
-            {
-                await base.HandleAndWrapException(context);
-                return;
-            }
+        var wrapResultChecker = context.GetRequiredService<IWrapResultChecker>();
 
-            //TODO: Trigger an AbpExceptionHandled event or something like that.
-            var wrapOptions = context.GetRequiredService<IOptions<AbpWrapperOptions>>().Value;
-            var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
-            var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
-            var remoteServiceErrorInfo = exceptionToErrorInfoConverter.Convert(context.Exception, options =>
-            {
-                options.SendExceptionsDetailsToClients = exceptionHandlingOptions.SendExceptionsDetailsToClients;
-                options.SendStackTraceToClients = exceptionHandlingOptions.SendStackTraceToClients;
-            });
+        if (!wrapResultChecker.WrapOnException(context))
+        {
+            await base.HandleAndWrapException(context);
+            return;
+        }
 
-            var logLevel = context.Exception.GetLogLevel();
+        //TODO: Trigger an AbpExceptionHandled event or something like that.
+        var wrapOptions = context.GetRequiredService<IOptions<AbpWrapperOptions>>().Value;
+        var exceptionHandlingOptions = context.GetRequiredService<IOptions<AbpExceptionHandlingOptions>>().Value;
+        var exceptionToErrorInfoConverter = context.GetRequiredService<IExceptionToErrorInfoConverter>();
+        var remoteServiceErrorInfo = exceptionToErrorInfoConverter.Convert(context.Exception, options =>
+        {
+            options.SendExceptionsDetailsToClients = exceptionHandlingOptions.SendExceptionsDetailsToClients;
+            options.SendStackTraceToClients = exceptionHandlingOptions.SendStackTraceToClients;
+        });
 
-            var remoteServiceErrorInfoBuilder = new StringBuilder();
-            remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
-            remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
+        var logLevel = context.Exception.GetLogLevel();
 
-            var logger = context.GetService<ILogger<AbpExceptionWrapResultFilter>>(NullLogger<AbpExceptionWrapResultFilter>.Instance);
+        var remoteServiceErrorInfoBuilder = new StringBuilder();
+        remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------");
+        remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService<IJsonSerializer>().Serialize(remoteServiceErrorInfo, indented: true));
 
-            logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
+        var logger = context.GetService<ILogger<AbpExceptionWrapResultFilter>>(NullLogger<AbpExceptionWrapResultFilter>.Instance);
 
-            logger.LogException(context.Exception, logLevel);
+        logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString());
 
-            await context.GetRequiredService<IExceptionNotifier>().NotifyAsync(new ExceptionNotificationContext(context.Exception));
+        logger.LogException(context.Exception, logLevel);
 
-            if (context.Exception is AbpAuthorizationException)
-            {
-                await context.GetRequiredService<IAbpAuthorizationExceptionHandler>()
-                    .HandleAsync(context.Exception.As<AbpAuthorizationException>(), context.HttpContext);
-            }
-            else
-            {
-                var statusCodFinder = context.GetRequiredService<IHttpExceptionStatusCodeFinder>();
-                var exceptionWrapHandler = context.GetRequiredService<IExceptionWrapHandlerFactory>();
-                
-                var exceptionWrapContext = new ExceptionWrapContext(
-                    context.Exception,
-                    remoteServiceErrorInfo,
-                    context.HttpContext.RequestServices,
-                    statusCodFinder.GetStatusCode(context.HttpContext, context.Exception));
-                
-                exceptionWrapHandler.CreateFor(exceptionWrapContext).Wrap(exceptionWrapContext);
-                
-                context.Result = new ObjectResult(new WrapResult(
-                    exceptionWrapContext.ErrorInfo.Code,
-                    exceptionWrapContext.ErrorInfo.Message,
-                    exceptionWrapContext.ErrorInfo.Details));
+        await context.GetRequiredService<IExceptionNotifier>().NotifyAsync(new ExceptionNotificationContext(context.Exception));
 
-                context.HttpContext.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
-                context.HttpContext.Response.StatusCode = (int)wrapOptions.HttpStatusCode;
-            }
+        if (context.Exception is AbpAuthorizationException)
+        {
+            await context.GetRequiredService<IAbpAuthorizationExceptionHandler>()
+                .HandleAsync(context.Exception.As<AbpAuthorizationException>(), context.HttpContext);
+        }
+        else
+        {
+            var statusCodFinder = context.GetRequiredService<IHttpExceptionStatusCodeFinder>();
+            var exceptionWrapHandler = context.GetRequiredService<IExceptionWrapHandlerFactory>();
+            
+            var exceptionWrapContext = new ExceptionWrapContext(
+                context.Exception,
+                remoteServiceErrorInfo,
+                context.HttpContext.RequestServices,
+                statusCodFinder.GetStatusCode(context.HttpContext, context.Exception));
+            
+            exceptionWrapHandler.CreateFor(exceptionWrapContext).Wrap(exceptionWrapContext);
+            
+            context.Result = new ObjectResult(new WrapResult(
+                exceptionWrapContext.ErrorInfo.Code,
+                exceptionWrapContext.ErrorInfo.Message,
+                exceptionWrapContext.ErrorInfo.Details));
 
-            context.Exception = null; //Handled!
+            context.HttpContext.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
+            context.HttpContext.Response.StatusCode = (int)wrapOptions.HttpStatusCode;
         }
+
+        context.Exception = null; //Handled!
     }
 }

modules/mvc/Sanhe.Abp.AspNetCore.Mvc.Wrapper/Sanhe/Abp/AspNetCore/Mvc/Wrapper/Filters/AbpWrapResultFilter.cs

@@ -6,36 +6,35 @@ using System.Threading.Tasks;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.DependencyInjection;
 
-namespace Sanhe.Abp.AspNetCore.Mvc.Wrapper.Filters
+namespace Sanhe.Abp.AspNetCore.Mvc.Wrapper.Filters;
+
+public class AbpWrapResultFilter : IAsyncResultFilter, ITransientDependency
 {
-    public class AbpWrapResultFilter : IAsyncResultFilter, ITransientDependency
+    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
+        if (ShouldWrapResult(context))
         {
-            if (ShouldWrapResult(context))
-            {
-                await HandleAndWrapResult(context);
-            }
-
-            await next();
+            await HandleAndWrapResult(context);
         }
 
-        protected virtual bool ShouldWrapResult(ResultExecutingContext context)
-        {
-            var wrapResultChecker = context.GetRequiredService<IWrapResultChecker>();
+        await next();
+    }
 
-            return wrapResultChecker.WrapOnExecution(context);
-        }
+    protected virtual bool ShouldWrapResult(ResultExecutingContext context)
+    {
+        var wrapResultChecker = context.GetRequiredService<IWrapResultChecker>();
 
-        protected virtual Task HandleAndWrapResult(ResultExecutingContext context)
-        {
-            var options = context.GetRequiredService<IOptions<AbpWrapperOptions>>().Value;
-            var actionResultWrapperFactory = context.GetRequiredService<IActionResultWrapperFactory>();
-            actionResultWrapperFactory.CreateFor(context).Wrap(context);
-            context.HttpContext.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
-            context.HttpContext.Response.StatusCode = (int)options.HttpStatusCode;
+        return wrapResultChecker.WrapOnExecution(context);
+    }
 
-            return Task.CompletedTask;
-        }
+    protected virtual Task HandleAndWrapResult(ResultExecutingContext context)
+    {
+        var options = context.GetRequiredService<IOptions<AbpWrapperOptions>>().Value;
+        var actionResultWrapperFactory = context.GetRequiredService<IActionResultWrapperFactory>();
+        actionResultWrapperFactory.CreateFor(context).Wrap(context);
+        context.HttpContext.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
+        context.HttpContext.Response.StatusCode = (int)options.HttpStatusCode;
+
+        return Task.CompletedTask;
     }
 }