Fixing dynamic support for http binding

Author: mathewc

WebJobs.Script.sln

@@ -403,6 +403,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bot", "Bot", "{98DBDE0D-364
 		sample\Bot\run.js = sample\Bot\run.js
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebHook-Generic-CSharp-Dynamic", "WebHook-Generic-CSharp-Dynamic", "{2F6EF597-6586-4F59-BBB6-BA7146FEFD27}"
+	ProjectSection(SolutionItems) = preProject
+		sample\WebHook-Generic-CSharp-Dynamic\function.json = sample\WebHook-Generic-CSharp-Dynamic\function.json
+		sample\WebHook-Generic-CSharp-Dynamic\run.csx = sample\WebHook-Generic-CSharp-Dynamic\run.csx
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -506,5 +512,6 @@ Global
 		{ADE3C399-6996-4677-89A8-60EDA27BF9C2} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 		{EF36E33B-646C-4EF4-B0E2-517E14F6DC38} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 		{98DBDE0D-364C-4865-9A4A-B17410D771F6} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
+		{2F6EF597-6586-4F59-BBB6-BA7146FEFD27} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
 	EndGlobalSection
 EndGlobal

sample/WebHook-Generic-CSharp-Dynamic/function.json

@@ -0,0 +1,15 @@
+{
+    "bindings": [
+        {
+            "type": "httpTrigger",
+            "name": "payload",
+            "direction": "in",
+            "webHookType": "genericJson"
+        },
+        {
+            "type": "http",
+            "name": "res",
+            "direction": "out"
+        }
+    ]
+}

sample/WebHook-Generic-CSharp-Dynamic/run.csx

@@ -0,0 +1,4 @@
+public static string Run(dynamic payload)
+{
+    return $"Value: {payload.Value}";
+}

src/WebJobs.Script.WebHost/App_Data/secrets/webhook-generic-csharp-dynamic.json

@@ -0,0 +1,9 @@
+{
+  "keys": [
+    {
+      "name": "default",
+      "value": "88adV34UZhaydCLOjMzbMgUtXh3stBnL8LFcL9R17DL8HAY8PVhpZA==",
+      "encrypted": false
+    }
+  ]
+}

src/WebJobs.Script/Binding/Http/HttpTriggerAttributeBindingProvider.cs

@@ -37,10 +37,10 @@ public Task<ITriggerBinding> TryCreateAsync(TriggerBindingProviderContext contex
                 return Task.FromResult<ITriggerBinding>(null);
             }
 
-            // Can bind to user types, HttpRequestMessage and all the Read
+            // Can bind to user types, HttpRequestMessage, object (for dynamic binding support) and all the Read
             // Types supported by StreamValueBinder
             IEnumerable<Type> supportedTypes = StreamValueBinder.GetSupportedTypes(FileAccess.Read)
-                .Union(new Type[] { typeof(HttpRequestMessage) });
+                .Union(new Type[] { typeof(HttpRequestMessage), typeof(object) });
             bool isSupportedTypeBinding = ValueBinder.MatchParameterType(parameter, supportedTypes);
             bool isUserTypeBinding = !isSupportedTypeBinding && Utility.IsValidUserType(parameter.ParameterType);
             if (!isSupportedTypeBinding && !isUserTypeBinding)
@@ -313,6 +313,12 @@ public override object GetValue()
                     {
                         return _request;
                     }
+                    else if (_parameter.ParameterType == typeof(object))
+                    {
+                        // for dynamic, we read as an object, which will actually return
+                        // a JObject which is dynamic
+                        return _request.Content.ReadAsAsync<object>().GetAwaiter().GetResult();
+                    }
 
                     return base.GetValue();
                 }

src/WebJobs.Script/Binding/HttpBinding.cs

@@ -13,7 +13,6 @@
 using System.Reflection.Emit;
 using System.Threading.Tasks;
 using System.Web.Http;
-using System.Web.Http.Results;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

src/WebJobs.Script/Description/DotNet/DotNetFunctionDescriptorProvider.cs

@@ -157,7 +157,7 @@ protected override Collection<ParameterDescriptor> GetFunctionParameters(IFuncti
                 }
 
                 // If we have an HTTP trigger binding but no parameter binds to the raw HttpRequestMessage,
-                // add it as a system parameter
+                // add it as a system parameter so it is accessible later in the pipeline.
                 if (string.Compare(triggerMetadata.Type, "httptrigger", StringComparison.OrdinalIgnoreCase) == 0 &&
                     !descriptors.Any(p => p.Type == typeof(HttpRequestMessage)))
                 {

test/WebJobs.Script.Tests/CSharpEndToEndTests.cs

@@ -5,8 +5,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using System.Web.Http;
 using Microsoft.Azure.WebJobs.Script.Tests.ApiHub;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -248,6 +251,38 @@ public async Task Scenario_RandGuidBinding_GeneratesRandomIDs()
             }
         }
 
+        [Fact]
+        public async Task HttpTrigger_Post_Dynamic()
+        {
+            var input = new JObject
+            {
+                { "name", "Mathew Charles" },
+                { "location", "Seattle" }
+            };
+
+            HttpRequestMessage request = new HttpRequestMessage
+            {
+                RequestUri = new Uri(string.Format("http://localhost/api/httptrigger-dynamic")),
+                Method = HttpMethod.Post,
+                Content = new StringContent(input.ToString())
+            };
+            request.SetConfiguration(new HttpConfiguration());
+            request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+            Dictionary<string, object> arguments = new Dictionary<string, object>
+            {
+                { "input", request },
+                { ScriptConstants.SystemTriggerParameterName, request }
+            };
+            await Fixture.Host.CallAsync("HttpTrigger-Dynamic", arguments);
+
+            HttpResponseMessage response = (HttpResponseMessage)request.Properties[ScriptConstants.AzureFunctionsHttpResponseKey];
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+            string body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("Name: Mathew Charles, Location: Seattle", body);
+        }
+
         public class TestFixture : EndToEndTestFixture
         {
             private const string ScriptRoot = @"TestScripts\CSharp";

test/WebJobs.Script.Tests/SamplesEndToEndTests.cs

@@ -468,6 +468,21 @@ public async Task GenericWebHook_CSharp_Post_Succeeds()
             Assert.Equal("Value: Foobar Action: test", jsonObject["result"]);
         }
 
+        [Fact]
+        public async Task GenericWebHook_CSharp_Dynamic_Post_Succeeds()
+        {
+            string uri = "api/webhook-generic-csharp-dynamic?code=88adV34UZhaydCLOjMzbMgUtXh3stBnL8LFcL9R17DL8HAY8PVhpZA==";
+            HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, uri);
+            request.Content = new StringContent("{ 'Value': 'Foobar' }");
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/plain"));
+            request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+            HttpResponseMessage response = await this._fixture.HttpClient.SendAsync(request);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            string body = await response.Content.ReadAsStringAsync();
+            Assert.Equal("\"Value: Foobar\"", body);
+        }
+
         [Fact]
         public async Task AzureWebHook_CSharp_Post_Succeeds()
         {

test/WebJobs.Script.Tests/TestScripts/CSharp/HttpTrigger-Dynamic/function.json

@@ -0,0 +1,15 @@
+{
+    "bindings": [
+        {
+            "type": "httpTrigger",
+            "name": "input",
+            "direction": "in",
+            "methods": [ "post" ]
+        },
+        {
+            "type": "http",
+            "name": "$return",
+            "direction": "out"
+        }
+    ]
+}