From 5e3d2d21dd6d9601d9dfbd9f4bb0ffeabb88ffa9 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 6 Aug 2019 17:20:25 +0800 Subject: [PATCH 1/2] Add the AbpExposeHeaders extension method. --- .../Cors/AbpCorsPolicyBuilderExtensions.cs | 12 ++++++++++++ .../Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj | 1 + 2 files changed, 13 insertions(+) create mode 100644 framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs new file mode 100644 index 0000000000..fbff6f5fd2 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Cors.Infrastructure; + +namespace Microsoft.AspNetCore.Cors +{ + public static class AbpCorsPolicyBuilderExtensions + { + public static CorsPolicyBuilder WithAbpExposeHeaders(this CorsPolicyBuilder corsPolicyBuilder) + { + return corsPolicyBuilder.WithExposedHeaders("_AbpErrorFormat"); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj b/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj index fb85cbb3ec..2584654ce8 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj +++ b/framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj @@ -32,6 +32,7 @@ + From 6b7dcab12e7eafe30b15b3725138c224ecdae6e9 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 6 Aug 2019 17:45:37 +0800 Subject: [PATCH 2/2] Rename the method and apply it to the template project. --- .../Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 ++ .../MyProjectNameHttpApiHostModule.cs | 2 ++ .../MyProjectNameIdentityServerModule.cs | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs index fbff6f5fd2..e466b1e058 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs @@ -4,7 +4,7 @@ namespace Microsoft.AspNetCore.Cors { public static class AbpCorsPolicyBuilderExtensions { - public static CorsPolicyBuilder WithAbpExposeHeaders(this CorsPolicyBuilder corsPolicyBuilder) + public static CorsPolicyBuilder WithAbpExposedHeaders(this CorsPolicyBuilder corsPolicyBuilder) { return corsPolicyBuilder.WithExposedHeaders("_AbpErrorFormat"); } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index cdf4e08d92..feef7b52bd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; @@ -134,6 +135,7 @@ namespace MyCompanyName.MyProjectName .Select(o => o.RemovePostFix("/")) .ToArray() ) + .WithAbpExposedHeaders() .SetIsOriginAllowedToAllowWildcardSubdomains() .AllowAnyHeader() .AllowAnyMethod() diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index 003edae216..979a3dd417 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Net.Http; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -133,6 +134,7 @@ namespace MyCompanyName.MyProjectName .Select(o => o.RemovePostFix("/")) .ToArray() ) + .WithAbpExposedHeaders() .SetIsOriginAllowedToAllowWildcardSubdomains() .AllowAnyHeader() .AllowAnyMethod() diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 959bea22bb..a3b3bf27aa 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -114,6 +115,7 @@ namespace MyCompanyName.MyProjectName .Select(o => o.RemovePostFix("/")) .ToArray() ) + .WithAbpExposedHeaders() .SetIsOriginAllowedToAllowWildcardSubdomains() .AllowAnyHeader() .AllowAnyMethod()