Skip to content

Commit 027ea66

Browse files
authored
Add CorsPolicyBuilder to WebApp/WebHost extensions (#1256)
* Add optional CorsPolicyBuilder parameters to extensions * Update XML docs and indentation
1 parent 1510dfe commit 027ea66

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/Management/src/EndpointCore/ManagementWebApplicationBuilderExtensions.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#if NET6_0_OR_GREATER
66
using Microsoft.AspNetCore.Builder;
7+
using Microsoft.AspNetCore.Cors.Infrastructure;
78
using Steeltoe.Common.HealthChecks;
89
using Steeltoe.Common.Hosting;
910
using Steeltoe.Extensions.Logging;
@@ -216,10 +217,11 @@ public static WebApplicationBuilder AddCloudFoundryActuator(this WebApplicationB
216217
/// <param name="applicationBuilder">Your <see cref="WebApplicationBuilder" /></param>
217218
/// <param name="configureEndpoints"><see cref="IEndpointConventionBuilder" /></param>
218219
/// <param name="mediaTypeVersion">Specify the media type version to use in the response</param>
219-
public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder applicationBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2)
220+
/// <param name="buildCorsPolicy">Customize the CORS policy. </param>
221+
public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder applicationBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2, Action<CorsPolicyBuilder> buildCorsPolicy = null)
220222
{
221223
applicationBuilder.Logging.AddDynamicConsole();
222-
applicationBuilder.Services.AddAllActuators(applicationBuilder.Configuration, mediaTypeVersion);
224+
applicationBuilder.Services.AddAllActuators(applicationBuilder.Configuration, mediaTypeVersion, buildCorsPolicy);
223225
applicationBuilder.AddCommonServices();
224226
return applicationBuilder;
225227
}

src/Management/src/EndpointCore/ManagementWebHostBuilderExtensions.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.AspNetCore.Builder;
6+
using Microsoft.AspNetCore.Cors.Infrastructure;
67
using Microsoft.AspNetCore.Hosting;
78
using Microsoft.Extensions.Configuration;
89
using Microsoft.Extensions.Hosting;
@@ -238,12 +239,13 @@ public static IWebHostBuilder AddCloudFoundryActuator(this IWebHostBuilder hostB
238239
/// <param name="hostBuilder">Your HostBuilder</param>
239240
/// <param name="configureEndpoints"><see cref="IEndpointConventionBuilder" /></param>
240241
/// <param name="mediaTypeVersion">Specify the media type version to use in the response</param>
241-
public static IWebHostBuilder AddAllActuators(this IWebHostBuilder hostBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2)
242+
/// <param name="buildCorsPolicy">Customize the CORS policy. </param>
243+
public static IWebHostBuilder AddAllActuators(this IWebHostBuilder hostBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2, Action<CorsPolicyBuilder> buildCorsPolicy = null)
242244
=> hostBuilder.AddManagementPort()
243245
.ConfigureLogging(builder => builder.AddDynamicConsole())
244246
.ConfigureServices((context, collection) =>
245247
{
246-
collection.AddAllActuators(context.Configuration, mediaTypeVersion);
248+
collection.AddAllActuators(context.Configuration, mediaTypeVersion, buildCorsPolicy);
247249
collection.ActivateActuatorEndpoints(configureEndpoints);
248250
});
249251

0 commit comments

Comments
 (0)