Evaluate BoundProperties when inferring BindindSource (#46228)

* Evaluate BoundProperties when inferring BindindSource

* Update src/Mvc/test/WebSites/BasicWebSite/Models/Contact.cs

Co-authored-by: Stephen Halter <[email protected]>

Co-authored-by: Stephen Halter <[email protected]>

Author: brunolins16

src/Mvc/Mvc.Core/src/ApplicationModels/InferParameterBindingInfoConvention.cs

@@ -84,10 +84,8 @@ internal void InferParameterBindingSources(ActionModel action)
             var bindingSource = parameter.BindingInfo?.BindingSource;
             if (bindingSource == null)
             {
-                bindingSource = InferBindingSourceForParameter(parameter);
-
-                parameter.BindingInfo = parameter.BindingInfo ?? new BindingInfo();
-                parameter.BindingInfo.BindingSource = bindingSource;
+                parameter.BindingInfo ??= new BindingInfo();
+                parameter.BindingInfo.BindingSource = InferBindingSourceForParameter(parameter);
             }
         }
 
@@ -113,16 +111,16 @@ internal void InferParameterBindingSources(ActionModel action)
     }
 
     // Internal for unit testing.
-    internal BindingSource InferBindingSourceForParameter(ParameterModel parameter)
+    internal BindingSource? InferBindingSourceForParameter(ParameterModel parameter)
     {
-        if (IsComplexTypeParameter(parameter))
+        if (IsComplexTypeParameter(parameter, out var metadata))
         {
             if (IsService(parameter.ParameterType))
             {
                 return BindingSource.Services;
             }
 
-            return BindingSource.Body;
+            return metadata.BoundProperties.Any(prop => prop.BindingSource is not null) ? null : BindingSource.Body;
         }
 
         if (ParameterExistsInAnyRoute(parameter.Action, parameter.ParameterName))
@@ -171,10 +169,10 @@ private static bool ParameterExistsInAnyRoute(ActionModel action, string paramet
         return false;
     }
 
-    private bool IsComplexTypeParameter(ParameterModel parameter)
+    private bool IsComplexTypeParameter(ParameterModel parameter, out ModelMetadata metadata)
     {
         // No need for information from attributes on the parameter. Just use its type.
-        var metadata = _modelMetadataProvider.GetMetadataForType(parameter.ParameterInfo.ParameterType);
+        metadata = _modelMetadataProvider.GetMetadataForType(parameter.ParameterInfo.ParameterType);
 
         return metadata.IsComplexType;
     }

src/Mvc/Mvc.Core/test/ApplicationModels/InferParameterBindingInfoConventionTest.cs

@@ -31,6 +31,24 @@ public void Apply_DoesNotInferBindingSourceForParametersWithBindingInfo()
         Assert.Same(BindingSource.Custom, parameterModel.BindingInfo.BindingSource);
     }
 
+    [Fact]
+    public void Apply_DoesNotInferBindingSourceFor_ComplexType_WithPropertiesWithBindingSource()
+    {
+        // Arrange
+        var actionName = nameof(ParameterBindingController.CompositeComplexTypeModel);
+        var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider();
+        var convention = GetConvention(modelMetadataProvider);
+        var action = GetActionModel(typeof(ParameterBindingController), actionName);
+
+        // Act
+        convention.Apply(action);
+
+        // Assert
+        var parameterModel = Assert.Single(action.Parameters);
+        Assert.NotNull(parameterModel.BindingInfo);
+        Assert.Null(parameterModel.BindingInfo.BindingSource);
+    }
+
     [Fact]
     public void InferParameterBindingSources_Throws_IfMultipleParametersAreInferredAsBodyBound()
     {
@@ -952,6 +970,9 @@ private class ParameterBindingController
         [HttpPut("put-action/{id}")]
         public IActionResult ComplexTypeModel(TestModel model) => null;
 
+        [HttpPut("put-action/{id}")]
+        public IActionResult CompositeComplexTypeModel(CompositeTestModel model) => null;
+
         [HttpPut("put-action/{id}")]
         public IActionResult SimpleTypeModel(ConvertibleFromString model) => null;
 
@@ -1094,6 +1115,14 @@ private class ParameterBindingNoRoutesOnController
 
     private class TestModel { }
 
+    private class CompositeTestModel
+    {
+        [FromQuery]
+        public int Id { get; set; }
+
+        public TestModel TestModel { get; set; }
+    }
+
     [TypeConverter(typeof(ConvertibleFromStringConverter))]
     private class ConvertibleFromString { }
 

src/Mvc/test/Mvc.FunctionalTests/ApiBehaviorTest.cs

@@ -1,12 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.Net;
 using System.Net.Http;
 using System.Text;
 using BasicWebSite.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.NewtonsoftJson;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -145,6 +147,28 @@ private async Task ActionsWithApiBehaviorInferFromBodyParameters(string action)
         Assert.Equal(input.Name, result.Name);
     }
 
+    [Fact]
+    public async Task ActionsWithApiBehavior_DoesNotInferFromBodyForCompositeComplexTypesParameters()
+    {
+        // Arrange
+        var input = new Contact
+        {
+            ContactId = 13,
+            Name = "Test123",
+        };
+        var requestId = 1;
+
+        // Act
+        var response = await Client.PostAsJsonAsync($"/contact/ActionWithCompositeComplexTypeParameter/{requestId}", input);
+
+        // Assert
+        await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+        var result = JsonConvert.DeserializeObject<ContactRequest>(await response.Content.ReadAsStringAsync());
+        Assert.Equal(input.ContactId, result.ContactInfo.ContactId);
+        Assert.Equal(input.Name, result.ContactInfo.Name);
+        Assert.Equal(requestId, result.Id);
+    }
+
     [Fact]
     public async Task ActionsWithApiBehavior_InferFromServicesParameters()
     {

src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs

@@ -87,6 +87,10 @@ public ActionResult<string> ActionWithInferredModelBinderTypeWithExplicitModelNa
     public ActionResult<Contact> ActionWithInferredFromServicesParameter(int id, ContactsRepository repository)
         => repository.GetContact(id) ?? new Contact() { ContactId = id };
 
+    [HttpPost("[action]/{id}")]
+    public ActionResult<ContactRequest> ActionWithCompositeComplexTypeParameter(ContactRequest request, ContactsRepository repository)
+        => Ok(request);
+
     [HttpGet("[action]")]
     public ActionResult<int> ActionReturningStatusCodeResult()
     {

src/Mvc/test/WebSites/BasicWebSite/Models/Contact.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
 
 namespace BasicWebSite.Models;
 
@@ -29,3 +30,12 @@ public class Contact
 
     public string Self { get; set; }
 }
+
+public class ContactRequest
+{
+    [FromRoute]
+    public int Id { get; set; }
+
+    [FromBody]
+    public Contact ContactInfo { get; set; }
+}