[Fixes #33]AddCors should adopt new pattern

aspnet · Sep 11, 2015 · a5220ae · a5220ae
1 parent c2b9fc5
commit a5220ae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/samples/UseOptions/Startup.cs b/samples/UseOptions/Startup.cs
@@ -9,9 +9,7 @@ public class Startup
     {
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddCors();
-            services.ConfigureCors(
-                options =>
+            services.AddCors(options =>
                     options.AddPolicy("allowSingleOrigin", builder => builder.WithOrigins("http://example.com")));
         }
 

diff --git a/src/Microsoft.AspNet.Cors.Core/CorsServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Cors.Core/CorsServiceCollectionExtensions.cs
@@ -15,19 +15,6 @@ namespace Microsoft.Framework.DependencyInjection
     /// </summary>
     public static class CorsServiceCollectionExtensions
     {
-        /// <summary>
-        /// Can be used to configure services in the <paramref name="serviceCollection"/>.
-        /// </summary>
-        /// <param name="serviceCollection">The service collection which needs to be configured.</param>
-        /// <param name="configure">A delegate which is run to configure the services.</param>
-        /// <returns></returns>
-        public static IServiceCollection ConfigureCors(
-            [NotNull] this IServiceCollection serviceCollection,
-            [NotNull] Action<CorsOptions> configure)
-        {
-            return serviceCollection.Configure(configure);
-        }
-
         /// <summary>
         /// Add services needed to support CORS to the given <paramref name="serviceCollection"/>.
         /// </summary>
@@ -40,5 +27,19 @@ public static IServiceCollection AddCors(this IServiceCollection serviceCollecti
             serviceCollection.TryAdd(ServiceDescriptor.Transient<ICorsPolicyProvider, DefaultCorsPolicyProvider>());
             return serviceCollection;
         }
+
+        /// <summary>
+        /// Add services needed to support CORS to the given <paramref name="serviceCollection"/>.
+        /// </summary>
+        /// <param name="serviceCollection">The service collection to which CORS services are added.</param>
+        /// <param name="configure">A delegate which is run to configure the services.</param>
+        /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
+        public static IServiceCollection AddCors(
+            [NotNull] this IServiceCollection serviceCollection,
+            [NotNull] Action<CorsOptions> configure)
+        {
+            serviceCollection.Configure(configure);
+            return serviceCollection.AddCors();
+        }
     }
 }
diff --git a/test/Microsoft.AspNet.Cors.Test/CorsMiddlewareTests.cs b/test/Microsoft.AspNet.Cors.Test/CorsMiddlewareTests.cs
@@ -23,7 +23,7 @@ public async Task CorsRequest_MatchPolicy_SetsResponseHeaders()
             // Arrange
             using (var server = TestServer.Create(app =>
             {
-                app.UseCors(builder => 
+                app.UseCors(builder =>
                     builder.WithOrigins("http://localhost:5001")
                            .WithMethods("PUT")
                            .WithHeaders("Header1")
@@ -70,8 +70,7 @@ public async Task PreFlight_MatchesPolicy_SetsResponseHeaders()
             },
             services =>
             {
-                services.AddCors();
-                services.ConfigureCors(options =>
+                services.AddCors(options =>
                 {
                     options.AddPolicy("customPolicy", policy);
                 });
@@ -129,7 +128,7 @@ public async Task CorsRequest_DoesNotMatchPolicy_DoesNotSetHeaders()
             // Arrange
             using (var server = TestServer.Create(app =>
             {
-                app.UseCors(builder => 
+                app.UseCors(builder =>
                     builder.WithOrigins("http://localhost:5001")
                            .WithMethods("PUT")
                            .WithHeaders("Header1")
@@ -156,7 +155,7 @@ public async Task CorsRequest_DoesNotMatchPolicy_DoesNotSetHeaders()
         [Fact]
         public async Task Uses_PolicyProvider_AsFallback()
         {
-            // Arrange 
+            // Arrange
             var corsService = Mock.Of<ICorsService>();
             var mockProvider = new Mock<ICorsPolicyProvider>();
             mockProvider.Setup(o => o.GetPolicyAsync(It.IsAny<HttpContext>(), It.IsAny<string>()))
@@ -184,7 +183,7 @@ public async Task Uses_PolicyProvider_AsFallback()
         [Fact]
         public async Task DoesNotSetHeaders_ForNoPolicy()
         {
-            // Arrange 
+            // Arrange
             var corsService = Mock.Of<ICorsService>();
             var mockProvider = new Mock<ICorsPolicyProvider>();
             mockProvider.Setup(o => o.GetPolicyAsync(It.IsAny<HttpContext>(), It.IsAny<string>()))