Adding HttpMethod and Header support

mathewc · mathewc · commit b0228ef111bb · 2016-03-04T16:59:21.000-08:00
diff --git a/sample/HttpTrigger-Batch/function.json b/sample/HttpTrigger-Batch/function.json
@@ -2,7 +2,8 @@
   "bindings": [
     {
       "type": "httpTrigger",
-      "direction": "in"
+      "direction": "in",
+      "methods": [ "get" ]
     },
     {
       "type": "http",
diff --git a/sample/HttpTrigger-CSharp/function.json b/sample/HttpTrigger-CSharp/function.json
@@ -2,7 +2,8 @@
   "bindings": [
     {
       "type": "httpTrigger",
-      "direction": "in"
+      "direction": "in",
+      "methods": [ "get" ]
     },
     {
       "type": "http",
diff --git a/sample/HttpTrigger/function.json b/sample/HttpTrigger/function.json
@@ -2,7 +2,8 @@
   "bindings": [
     {
       "type": "httpTrigger",
-      "direction": "in"
+      "direction": "in",
+      "methods": [ "get" ]
     },
     {
       "type": "http",
diff --git a/sample/HttpTrigger/index.js b/sample/HttpTrigger/index.js
@@ -1,6 +1,11 @@
 ﻿module.exports = function (req, context) {
     context.log('Node.js HTTP trigger function processed a request. Name=' + req.query.name);
 
+    var headerValue = req.headers['test-header'];
+    if (headerValue) {
+        context.log('test-header=' + headerValue);
+    }
+
     if (typeof req.query.name == 'undefined') {
         context.done(null, "Please pass a name on the query string");
     }
diff --git a/src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs b/src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs
@@ -42,7 +42,7 @@ public override async Task<HttpResponseMessage> ExecuteAsync(HttpControllerConte
 
             // Authorize the request
             SecretManager secretManager = (SecretManager)controllerContext.Configuration.DependencyResolver.GetService(typeof(SecretManager));
-            HttpBindingMetadata httpFunctionMetadata = (HttpBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);
+            HttpTriggerBindingMetadata httpFunctionMetadata = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);
             bool isWebHook = !string.IsNullOrEmpty(httpFunctionMetadata.WebHookType);
             if (!isWebHook && !AuthorizationLevelAttribute.IsAuthorized(request, httpFunctionMetadata.AuthLevel, secretManager, functionName: function.Name))
             {
@@ -63,6 +63,13 @@ public override async Task<HttpResponseMessage> ExecuteAsync(HttpControllerConte
             }
             else
             {
+                // Validate the HttpMethod
+                // Note that for WebHook requests, WebHook receiver does its own validation
+                if (httpFunctionMetadata.Methods != null && !httpFunctionMetadata.Methods.Contains(request.Method))
+                {
+                    return new HttpResponseMessage(HttpStatusCode.MethodNotAllowed);
+                }
+
                 // Not a WebHook request so dispatch directly
                 response = await _scriptHostManager.HandleRequestAsync(function, request, cancellationToken);
             }
diff --git a/src/WebJobs.Script.WebHost/WebHooks/WebHookReceiverManager.cs b/src/WebJobs.Script.WebHost/WebHooks/WebHookReceiverManager.cs
@@ -49,7 +49,7 @@ public async Task<HttpResponseMessage> HandleRequestAsync(FunctionDescriptor fun
         {
             // First check if there is a registered WebHook Receiver for this request, and if
             // so use it
-            HttpBindingMetadata httpFunctionMetadata = (HttpBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);
+            HttpTriggerBindingMetadata httpFunctionMetadata = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);
             string webHookReceiver = httpFunctionMetadata.WebHookType;
             IWebHookReceiver receiver = null;
             if (string.IsNullOrEmpty(webHookReceiver) || !_receiverLookup.TryGetValue(webHookReceiver, out receiver))
diff --git a/src/WebJobs.Script.WebHost/WebScriptHostManager.cs b/src/WebJobs.Script.WebHost/WebScriptHostManager.cs
@@ -83,7 +83,7 @@ protected override void OnHostStarted()
             HttpFunctions = new Dictionary<string, FunctionDescriptor>();
             foreach (var function in Instance.Functions)
             {
-                HttpBindingMetadata httpTriggerBinding = (HttpBindingMetadata)function.Metadata.InputBindings.SingleOrDefault(p => p.Type == BindingType.HttpTrigger);
+                HttpTriggerBindingMetadata httpTriggerBinding = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.SingleOrDefault(p => p.Type == BindingType.HttpTrigger);
                 if (httpTriggerBinding != null)
                 {
                     string route = httpTriggerBinding.Route;
diff --git a/src/WebJobs.Script/Binding/HttpBinding.cs b/src/WebJobs.Script/Binding/HttpBinding.cs
@@ -55,10 +55,22 @@ public override async Task BindAsync(BindingContext context)
                 if (jsonObject["status"] != null && jsonObject["body"] != null)
                 {
                     HttpStatusCode statusCode = (HttpStatusCode)jsonObject.Value<int>("status");
-                    string body = jsonObject.Value<string>("body");
+                    string body = jsonObject["body"].ToString();
 
                     response = new HttpResponseMessage(statusCode);
                     response.Content = new StringContent(body);
+
+                    JObject headers = (JObject)jsonObject["headers"];
+                    if (headers != null)
+                    {
+                        foreach (var header in headers)
+                        {
+                            if (header.Value != null)
+                            {
+                                response.Headers.Add(header.Key, header.Value.ToString());
+                            }
+                        }
+                    }
                 }
             }
             catch (JsonException)
diff --git a/src/WebJobs.Script/Description/CSharp/CSharpFunctionDescriptionProvider.cs b/src/WebJobs.Script/Description/CSharp/CSharpFunctionDescriptionProvider.cs
@@ -174,7 +174,7 @@ private ParameterDescriptor CreateTriggerParameterDescriptor(ParameterInfo param
                     {
                         triggerMetadata.Name = "req";
                     }
-                    triggerParameter = ParseHttpTrigger((HttpBindingMetadata)triggerMetadata, methodAttributes, parameter.ParameterType);
+                    triggerParameter = ParseHttpTrigger((HttpTriggerBindingMetadata)triggerMetadata, methodAttributes, parameter.ParameterType);
                     break;
                 case BindingType.ManualTrigger:
                     triggerParameter = ParseManualTrigger(triggerMetadata, methodAttributes, parameter.ParameterType);
diff --git a/src/WebJobs.Script/Description/FunctionDescriptorProvider.cs b/src/WebJobs.Script/Description/FunctionDescriptorProvider.cs
@@ -113,7 +113,7 @@ protected virtual Collection<ParameterDescriptor> GetFunctionParameters(IFunctio
                     {
                         triggerMetadata.Name = triggerParameterName = "req";
                     }
-                    triggerParameter = ParseHttpTrigger((HttpBindingMetadata)triggerMetadata, methodAttributes, typeof(HttpRequestMessage));
+                    triggerParameter = ParseHttpTrigger((HttpTriggerBindingMetadata)triggerMetadata, methodAttributes, typeof(HttpRequestMessage));
                     break;
                 case BindingType.ManualTrigger:
                     triggerParameter = ParseManualTrigger(triggerMetadata, methodAttributes);
@@ -285,7 +285,7 @@ protected ParameterDescriptor ParseTimerTrigger(TimerBindingMetadata trigger, Ty
             return new ParameterDescriptor(parameterName, triggerParameterType, attributes);
         }
 
-        protected ParameterDescriptor ParseHttpTrigger(HttpBindingMetadata trigger, Collection<CustomAttributeBuilder> methodAttributes, Type triggerParameterType = null)
+        protected ParameterDescriptor ParseHttpTrigger(HttpTriggerBindingMetadata trigger, Collection<CustomAttributeBuilder> methodAttributes, Type triggerParameterType = null)
         {
             if (trigger == null)
             {
diff --git a/src/WebJobs.Script/Description/HttpBindingMetadata.cs b/src/WebJobs.Script/Description/HttpBindingMetadata.cs
@@ -1,23 +1,9 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
 namespace Microsoft.Azure.WebJobs.Script.Description
 {
     public class HttpBindingMetadata : BindingMetadata
     {
-        public HttpBindingMetadata()
-        {
-            AuthLevel = AuthorizationLevel.Function;
-        }
-
-        public string Route { get; set; }
-
-        [JsonConverter(typeof(StringEnumConverter))]
-        public AuthorizationLevel AuthLevel { get; set; }
-
-        public string WebHookType { get; set; }
     }
 }
diff --git a/src/WebJobs.Script/Description/HttpTriggerBindingMetadata.cs b/src/WebJobs.Script/Description/HttpTriggerBindingMetadata.cs
@@ -0,0 +1,28 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Collections.ObjectModel;
+using System.Net.Http;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Microsoft.Azure.WebJobs.Script.Description
+{
+    public class HttpTriggerBindingMetadata : BindingMetadata
+    {
+        public HttpTriggerBindingMetadata()
+        {
+            AuthLevel = AuthorizationLevel.Function;
+        }
+
+        public string Route { get; set; }
+
+        [JsonProperty(ItemConverterType = typeof(HttpMethodJsonConverter))]
+        public Collection<HttpMethod> Methods { get; set; }
+
+        [JsonConverter(typeof(StringEnumConverter))]
+        public AuthorizationLevel AuthLevel { get; set; }
+
+        public string WebHookType { get; set; }
+    }
+}
diff --git a/src/WebJobs.Script/Description/NodeFunctionInvoker.cs b/src/WebJobs.Script/Description/NodeFunctionInvoker.cs
@@ -270,7 +270,7 @@ private Dictionary<string, object> CreateScriptExecutionContext(object input, Tr
 
                 // If this is a WebHook function, the input should be the
                 // request body
-                HttpBindingMetadata httpBinding = _trigger as HttpBindingMetadata;
+                HttpTriggerBindingMetadata httpBinding = _trigger as HttpTriggerBindingMetadata;
                 if (httpBinding != null &&
                     !string.IsNullOrEmpty(httpBinding.WebHookType))
                 {
@@ -297,6 +297,15 @@ private Dictionary<string, object> CreateRequestObject(HttpRequestMessage reques
             inputDictionary["method"] = request.Method.ToString().ToUpperInvariant();
             inputDictionary["query"] = request.GetQueryNameValuePairs().ToDictionary(kv => kv.Key, kv => kv.Value, StringComparer.OrdinalIgnoreCase);
 
+            Dictionary<string, string> headers = new Dictionary<string, string>();
+            foreach (var header in request.Headers)
+            {
+                // since HTTP headers are case insensitive, we lower-case the keys
+                // as does Node.js request object
+                headers.Add(header.Key.ToLowerInvariant(), header.Value.First());
+            }
+            inputDictionary["headers"] = headers;
+
             // if the request includes a body, add it to the request object 
             if (request.Content != null && request.Content.Headers.ContentLength > 0)
             {
diff --git a/src/WebJobs.Script/Description/ScriptFunctionInvoker.cs b/src/WebJobs.Script/Description/ScriptFunctionInvoker.cs
@@ -180,6 +180,12 @@ private void InitializeEnvironmentVariables(Dictionary<string, string> environme
                     string varName = string.Format(CultureInfo.InvariantCulture, "REQ_QUERY_{0}", queryParam.Key.ToUpperInvariant());
                     environmentVariables[varName] = queryParam.Value;
                 }
+
+                foreach (var header in request.Headers)
+                {
+                    string varName = string.Format(CultureInfo.InvariantCulture, "REQ_HEADERS_{0}", header.Key.ToUpperInvariant());
+                    environmentVariables[varName] = header.Value.First();
+                }
             }
         }
 
diff --git a/src/WebJobs.Script/GlobalSuppressions.cs b/src/WebJobs.Script/GlobalSuppressions.cs
diff --git a/src/WebJobs.Script/Host/ScriptHost.cs b/src/WebJobs.Script/Host/ScriptHost.cs
@@ -282,6 +282,8 @@ private static bool TryParseBindingMetadata(JObject binding, INameResolver appse
                         bindingMetadata = binding.ToObject<ServiceBusBindingMetadata>();
                         break;
                     case BindingType.HttpTrigger:
+                        bindingMetadata = binding.ToObject<HttpTriggerBindingMetadata>();
+                        break;
                     case BindingType.Http:
                         bindingMetadata = binding.ToObject<HttpBindingMetadata>();
                         break;
diff --git a/src/WebJobs.Script/HttpMethodJsonConverter.cs b/src/WebJobs.Script/HttpMethodJsonConverter.cs
@@ -0,0 +1,43 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Net.Http;
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.WebJobs.Script
+{
+    public class HttpMethodJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            if (objectType == typeof(HttpMethod))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (reader == null)
+            {
+                throw new ArgumentNullException("reader");
+            }
+
+            HttpMethod method = null;
+            string value = reader.Value as string;
+            if (value != null)
+            {
+                method = new HttpMethod(value);
+            }
+
+            return method;
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -242,6 +242,7 @@
     <Compile Include="Description\CSharp\PackageManager.cs" />
     <Compile Include="Description\EventHubBindingMetadata.cs" />
     <Compile Include="Description\HttpBindingMetadata.cs" />
+    <Compile Include="Description\HttpTriggerBindingMetadata.cs" />
     <Compile Include="Description\QueueBindingMetadata.cs" />
     <Compile Include="Description\ServiceBusBindingMetadata.cs" />
     <Compile Include="Description\TableBindingMetadata.cs" />
@@ -264,6 +265,7 @@
     <Compile Include="DictionaryJsonConverter.cs" />
     <Compile Include="Extensions\ActionExtensions.cs" />
     <Compile Include="FileTraceWriter.cs" />
+    <Compile Include="HttpMethodJsonConverter.cs" />
     <Compile Include="NullTraceWriter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Config\ScriptHostConfiguration.cs" />
diff --git a/test/WebJobs.Script.Tests/NodeEndToEndTests.cs b/test/WebJobs.Script.Tests/NodeEndToEndTests.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -67,6 +68,7 @@ public async Task HttpTrigger_Get()
                 RequestUri = new Uri(string.Format("http://localhost/api/httptrigger")),
                 Method = HttpMethod.Get,
             };
+            request.Headers.Add("test-header", "Test Request Header");
 
             Dictionary<string, object> arguments = new Dictionary<string, object>
             {
@@ -77,10 +79,16 @@ public async Task HttpTrigger_Get()
             HttpResponseMessage response = (HttpResponseMessage)request.Properties["MS_AzureFunctionsHttpResponse"];
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
+            Assert.Equal("Test Response Header", response.Headers.GetValues("test-header").SingleOrDefault());
+
             string body = await response.Content.ReadAsStringAsync();
             JObject resultObject = JObject.Parse(body);
-            Assert.Equal((string)resultObject["type"], "undefined");
-            Assert.Null((string)resultObject["body"]);
+            Assert.Equal((string)resultObject["reqBodyType"], "undefined");
+            Assert.Null((string)resultObject["reqBody"]);
+
+            // validate input headers
+            JObject reqHeaders = (JObject)resultObject["reqHeaders"];
+            Assert.Equal("Test Request Header", reqHeaders["test-header"]);
         }
 
         [Fact]
@@ -105,8 +113,8 @@ public async Task HttpTrigger_Post_PlainText()
 
             string body = await response.Content.ReadAsStringAsync();
             JObject resultObject = JObject.Parse(body);
-            Assert.Equal((string)resultObject["type"], "string");
-            Assert.Equal((string)resultObject["body"], testData);
+            Assert.Equal((string)resultObject["reqBodyType"], "string");
+            Assert.Equal((string)resultObject["reqBody"], testData);
         }
 
         [Fact]
@@ -136,8 +144,8 @@ public async Task HttpTrigger_Post_Json()
 
             string body = await response.Content.ReadAsStringAsync();
             JObject resultObject = JObject.Parse(body);
-            Assert.Equal((string)resultObject["type"], "object");
-            Assert.Equal((string)resultObject["body"]["testData"], testData);
+            Assert.Equal((string)resultObject["reqBodyType"], "object");
+            Assert.Equal((string)resultObject["reqBody"]["testData"], testData);
         }
 
         [Fact]
diff --git a/test/WebJobs.Script.Tests/NodeFunctionGenerationTests.cs b/test/WebJobs.Script.Tests/NodeFunctionGenerationTests.cs
@@ -85,7 +85,7 @@ public void GenerateBlobTriggerFunction()
         [Fact]
         public void GenerateHttpTriggerFunction()
         {
-            HttpBindingMetadata trigger = new HttpBindingMetadata
+            HttpTriggerBindingMetadata trigger = new HttpTriggerBindingMetadata
             {
                 Type = BindingType.HttpTrigger
             };
diff --git a/test/WebJobs.Script.Tests/TestScripts/Node/HttpTrigger/function.json b/test/WebJobs.Script.Tests/TestScripts/Node/HttpTrigger/function.json
@@ -2,7 +2,8 @@
   "bindings": [
     {
       "type": "httpTrigger",
-      "direction": "in"
+      "direction": "in",
+      "methods": [ "get", "post" ]
     },
     {
       "type": "http",
diff --git a/test/WebJobs.Script.Tests/TestScripts/Node/HttpTrigger/index.js b/test/WebJobs.Script.Tests/TestScripts/Node/HttpTrigger/index.js
@@ -2,8 +2,15 @@
     context.log('Node.js HttpTrigger function invoked.');
 
     var res = {
-        type: typeof req.body,
-        body: req.body
+        status: 200,
+        body: {
+            reqBodyType: typeof req.body,
+            reqBody: req.body,
+            reqHeaders: req.headers
+        },
+        headers: {
+            'test-header': 'Test Response Header'
+        }
     };
 
     context.done(null, res);
diff --git a/test/WebJobs.Script.Tests/TestScripts/WindowsBatch/HttpTrigger/run.bat b/test/WebJobs.Script.Tests/TestScripts/WindowsBatch/HttpTrigger/run.bat
diff --git a/test/WebJobs.Script.Tests/WindowsBatchEndToEndTests.cs b/test/WebJobs.Script.Tests/WindowsBatchEndToEndTests.cs

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`"bindings": [`
`3`	`3`	`{`
`4`	`4`	`"type": "httpTrigger",`
`5`		`- "direction": "in"`
	`5`	`+ "direction": "in",`
	`6`	`+ "methods": [ "get" ]`
`6`	`7`	`},`
`7`	`8`	`{`
`8`	`9`	`"type": "http",`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public override async Task<HttpResponseMessage> ExecuteAsync(HttpControllerConte`
`42`	`42`
`43`	`43`	`// Authorize the request`
`44`	`44`	`SecretManager secretManager = (SecretManager)controllerContext.Configuration.DependencyResolver.GetService(typeof(SecretManager));`
`45`		`- HttpBindingMetadata httpFunctionMetadata = (HttpBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);`
	`45`	`+ HttpTriggerBindingMetadata httpFunctionMetadata = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);`
`46`	`46`	`bool isWebHook = !string.IsNullOrEmpty(httpFunctionMetadata.WebHookType);`
`47`	`47`	`if (!isWebHook && !AuthorizationLevelAttribute.IsAuthorized(request, httpFunctionMetadata.AuthLevel, secretManager, functionName: function.Name))`
`48`	`48`	`{`
`@@ -63,6 +63,13 @@ public override async Task<HttpResponseMessage> ExecuteAsync(HttpControllerConte`
`63`	`63`	`}`
`64`	`64`	`else`
`65`	`65`	`{`
	`66`	`+ // Validate the HttpMethod`
	`67`	`+ // Note that for WebHook requests, WebHook receiver does its own validation`
	`68`	`+ if (httpFunctionMetadata.Methods != null && !httpFunctionMetadata.Methods.Contains(request.Method))`
	`69`	`+ {`
	`70`	`+ return new HttpResponseMessage(HttpStatusCode.MethodNotAllowed);`
	`71`	`+ }`
	`72`	`+`
`66`	`73`	`// Not a WebHook request so dispatch directly`
`67`	`74`	`response = await _scriptHostManager.HandleRequestAsync(function, request, cancellationToken);`
`68`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public async Task<HttpResponseMessage> HandleRequestAsync(FunctionDescriptor fun`
`49`	`49`	`{`
`50`	`50`	`// First check if there is a registered WebHook Receiver for this request, and if`
`51`	`51`	`// so use it`
`52`		`- HttpBindingMetadata httpFunctionMetadata = (HttpBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);`
	`52`	`+ HttpTriggerBindingMetadata httpFunctionMetadata = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.FirstOrDefault(p => p.Type == BindingType.HttpTrigger);`
`53`	`53`	`string webHookReceiver = httpFunctionMetadata.WebHookType;`
`54`	`54`	`IWebHookReceiver receiver = null;`
`55`	`55`	`if (string.IsNullOrEmpty(webHookReceiver) \|\| !_receiverLookup.TryGetValue(webHookReceiver, out receiver))`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ protected override void OnHostStarted()`
`83`	`83`	`HttpFunctions = new Dictionary<string, FunctionDescriptor>();`
`84`	`84`	`foreach (var function in Instance.Functions)`
`85`	`85`	`{`
`86`		`- HttpBindingMetadata httpTriggerBinding = (HttpBindingMetadata)function.Metadata.InputBindings.SingleOrDefault(p => p.Type == BindingType.HttpTrigger);`
	`86`	`+ HttpTriggerBindingMetadata httpTriggerBinding = (HttpTriggerBindingMetadata)function.Metadata.InputBindings.SingleOrDefault(p => p.Type == BindingType.HttpTrigger);`
`87`	`87`	`if (httpTriggerBinding != null)`
`88`	`88`	`{`
`89`	`89`	`string route = httpTriggerBinding.Route;`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private ParameterDescriptor CreateTriggerParameterDescriptor(ParameterInfo param`
`174`	`174`	`{`
`175`	`175`	`triggerMetadata.Name = "req";`
`176`	`176`	`}`
`177`		`- triggerParameter = ParseHttpTrigger((HttpBindingMetadata)triggerMetadata, methodAttributes, parameter.ParameterType);`
	`177`	`+ triggerParameter = ParseHttpTrigger((HttpTriggerBindingMetadata)triggerMetadata, methodAttributes, parameter.ParameterType);`
`178`	`178`	`break;`
`179`	`179`	`case BindingType.ManualTrigger:`
`180`	`180`	`triggerParameter = ParseManualTrigger(triggerMetadata, methodAttributes, parameter.ParameterType);`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ protected virtual Collection<ParameterDescriptor> GetFunctionParameters(IFunctio`
`113`	`113`	`{`
`114`	`114`	`triggerMetadata.Name = triggerParameterName = "req";`
`115`	`115`	`}`
`116`		`- triggerParameter = ParseHttpTrigger((HttpBindingMetadata)triggerMetadata, methodAttributes, typeof(HttpRequestMessage));`
	`116`	`+ triggerParameter = ParseHttpTrigger((HttpTriggerBindingMetadata)triggerMetadata, methodAttributes, typeof(HttpRequestMessage));`
`117`	`117`	`break;`
`118`	`118`	`case BindingType.ManualTrigger:`
`119`	`119`	`triggerParameter = ParseManualTrigger(triggerMetadata, methodAttributes);`
`@@ -285,7 +285,7 @@ protected ParameterDescriptor ParseTimerTrigger(TimerBindingMetadata trigger, Ty`
`285`	`285`	`return new ParameterDescriptor(parameterName, triggerParameterType, attributes);`
`286`	`286`	`}`
`287`	`287`
`288`		`- protected ParameterDescriptor ParseHttpTrigger(HttpBindingMetadata trigger, Collection<CustomAttributeBuilder> methodAttributes, Type triggerParameterType = null)`
	`288`	`+ protected ParameterDescriptor ParseHttpTrigger(HttpTriggerBindingMetadata trigger, Collection<CustomAttributeBuilder> methodAttributes, Type triggerParameterType = null)`
`289`	`289`	`{`
`290`	`290`	`if (trigger == null)`
`291`	`291`	`{`