Respect SuppressInferBindingSourcesForParameters

Fixes #8657
aspnet · Oct 30, 2018 · 734b919 · 734b919
1 parent af6527d
commit 734b919
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 1 deletion.
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs b/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs
@@ -59,7 +59,10 @@ public void Apply(ControllerModel controller)
 
         internal void InferParameterBindingSources(ActionModel action)
         {
-            var inferredBindingSources = new BindingSource[action.Parameters.Count];
+            if (SuppressInferBindingSourcesForParameters)
+            {
+                return;
+            }
 
             for (var i = 0; i < action.Parameters.Count; i++)
             {

diff --git a/...oft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs b/...oft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs
@@ -93,6 +93,71 @@ public void InferParameterBindingSources_Throws_IfMultipleParametersAreFromBody(
             Assert.Equal(expected, ex.Message);
         }
 
+        [Fact]
+        public void InferParameterBindingSources_InfersSources()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ComplexTypeModelWithCancellationToken);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var convention = GetConvention(modelMetadataProvider);
+            var action = GetActionModel(typeof(ParameterBindingController), actionName, modelMetadataProvider);
+
+            // Act
+            convention.InferParameterBindingSources(action);
+
+            // Assert
+            Assert.Collection(
+                action.Parameters,
+                parameter =>
+                {
+                    Assert.Equal("model", parameter.Name);
+
+                    var bindingInfo = parameter.BindingInfo;
+                    Assert.NotNull(bindingInfo);
+                    Assert.Same(BindingSource.Body, bindingInfo.BindingSource);
+                },
+                parameter =>
+                {
+                    Assert.Equal("cancellationToken", parameter.Name);
+
+                    var bindingInfo = parameter.BindingInfo;
+                    Assert.NotNull(bindingInfo);
+                    Assert.Equal(BindingSource.Special, bindingInfo.BindingSource);
+                });
+        }
+
+        [Fact]
+        public void InferParameterBindingSources_DoesNotInferSources_IfSuppressInferBindingSourcesForParametersIsSet()
+        {
+            // Arrange
+            var actionName = nameof(ParameterBindingController.ComplexTypeModelWithCancellationToken);
+            var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+            var convention = GetConvention(modelMetadataProvider);
+            var action = GetActionModel(typeof(ParameterBindingController), actionName, modelMetadataProvider);
+
+            convention.SuppressInferBindingSourcesForParameters = true;
+
+            // Act
+            convention.InferParameterBindingSources(action);
+
+            // Assert
+            Assert.Collection(
+                action.Parameters,
+                parameter =>
+                {
+                    Assert.Equal("model", parameter.Name);
+                    Assert.Null(parameter.BindingInfo);
+                },
+                parameter =>
+                {
+                    Assert.Equal("cancellationToken", parameter.Name);
+
+                    var bindingInfo = parameter.BindingInfo;
+                    Assert.NotNull(bindingInfo);
+                    Assert.Equal(BindingSource.Special, bindingInfo.BindingSource);
+                });
+        }
+
         [Fact]
         public void Apply_PreservesBindingInfo_WhenInferringFor_ParameterWithModelBinder_AndExplicitName()
         {