Add CorsPolicyBuilder to WebApp/WebHost extensions (#1256)

* Add optional CorsPolicyBuilder parameters to extensions * Update XML docs and indentation
SteeltoeOSS · Jan 30, 2024 · 027ea66 · 027ea66
1 parent 1510dfe
commit 027ea66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Management/src/EndpointCore/ManagementWebApplicationBuilderExtensions.cs b/src/Management/src/EndpointCore/ManagementWebApplicationBuilderExtensions.cs
@@ -4,6 +4,7 @@
 
 #if NET6_0_OR_GREATER
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Steeltoe.Common.HealthChecks;
 using Steeltoe.Common.Hosting;
 using Steeltoe.Extensions.Logging;
@@ -216,10 +217,11 @@ public static WebApplicationBuilder AddCloudFoundryActuator(this WebApplicationB
         /// <param name="applicationBuilder">Your <see cref="WebApplicationBuilder" /></param>
         /// <param name="configureEndpoints"><see cref="IEndpointConventionBuilder" /></param>
         /// <param name="mediaTypeVersion">Specify the media type version to use in the response</param>
-        public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder applicationBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2)
+        /// <param name="buildCorsPolicy">Customize the CORS policy. </param>
+        public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder applicationBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2, Action<CorsPolicyBuilder> buildCorsPolicy = null)
         {
             applicationBuilder.Logging.AddDynamicConsole();
-            applicationBuilder.Services.AddAllActuators(applicationBuilder.Configuration, mediaTypeVersion);
+            applicationBuilder.Services.AddAllActuators(applicationBuilder.Configuration, mediaTypeVersion, buildCorsPolicy);
             applicationBuilder.AddCommonServices();
             return applicationBuilder;
         }

diff --git a/src/Management/src/EndpointCore/ManagementWebHostBuilderExtensions.cs b/src/Management/src/EndpointCore/ManagementWebHostBuilderExtensions.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
@@ -238,12 +239,13 @@ public static IWebHostBuilder AddCloudFoundryActuator(this IWebHostBuilder hostB
     /// <param name="hostBuilder">Your HostBuilder</param>
     /// <param name="configureEndpoints"><see cref="IEndpointConventionBuilder" /></param>
     /// <param name="mediaTypeVersion">Specify the media type version to use in the response</param>
-    public static IWebHostBuilder AddAllActuators(this IWebHostBuilder hostBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2)
+    /// <param name="buildCorsPolicy">Customize the CORS policy. </param>
+    public static IWebHostBuilder AddAllActuators(this IWebHostBuilder hostBuilder, Action<IEndpointConventionBuilder> configureEndpoints = null, MediaTypeVersion mediaTypeVersion = MediaTypeVersion.V2, Action<CorsPolicyBuilder> buildCorsPolicy = null)
         => hostBuilder.AddManagementPort()
             .ConfigureLogging(builder => builder.AddDynamicConsole())
             .ConfigureServices((context, collection) =>
             {
-                collection.AddAllActuators(context.Configuration, mediaTypeVersion);
+                collection.AddAllActuators(context.Configuration, mediaTypeVersion, buildCorsPolicy);
                 collection.ActivateActuatorEndpoints(configureEndpoints);
             });