Add query as property to HttpRequestData (#1408)

* added query property to http request * extract value, account for multiple queries of same key * does accessor throw if null? * added test case * use httputility parsing rather than parsing ourselves * Update release_notes.md * usings * unnecessary usings * build error * Query get method virtual rather than abstract * avoid unnecessary calls to ParseQueryString * fixes
Azure · Mar 17, 2023 · 37070d8 · 37070d8
1 parent d7baa52
commit 37070d8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/release_notes.md b/release_notes.md
@@ -2,3 +2,4 @@
 <!-- Please add your release notes in the following format:
 - My change description (#PR/#issue)
 -->
+- Add query as property to HttpRequestData (#1408)
diff --git a/src/DotNetWorker.Core/Http/HttpRequestData.cs b/src/DotNetWorker.Core/Http/HttpRequestData.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
 using System.Security.Claims;
+using System.Web;
 
 namespace Microsoft.Azure.Functions.Worker.Http
 {
@@ -13,6 +15,8 @@ namespace Microsoft.Azure.Functions.Worker.Http
     /// </summary>
     public abstract class HttpRequestData
     {
+        private NameValueCollection? _query;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpRequestData"/> class.
         /// </summary>
@@ -62,5 +66,10 @@ public HttpRequestData(FunctionContext functionContext)
         /// </summary>
         /// <returns>The response instance.</returns>
         public abstract HttpResponseData CreateResponse();
+
+        /// <summary>
+        /// Gets the <see cref="NameValueCollection"/> containing the request query. 
+        /// </summary>
+        public virtual NameValueCollection Query => _query ??= HttpUtility.ParseQueryString(Url.Query);
     }
 }
diff --git a/test/E2ETests/E2EApps/E2EApp/Http/BasicHttpFunctions.cs b/test/E2ETests/E2EApps/E2EApp/Http/BasicHttpFunctions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System.Net;
+using System.Net;
 using System.Text.Json;
 using System.Web;
 using Microsoft.Azure.Functions.Worker;
@@ -19,7 +19,8 @@ public static HttpResponseData HelloFromQuery(
         {
             var logger = context.GetLogger(nameof(HelloFromQuery));
             logger.LogInformation(".NET Worker HTTP trigger function processed a request");
-            var queryName = HttpUtility.ParseQueryString(req.Url.Query)["name"];
+
+            var queryName = req.Query["name"];
 
             if (!string.IsNullOrEmpty(queryName))
             {

diff --git a/test/E2ETests/E2EApps/E2EApp/Queue/QueueTestFunctions.cs b/test/E2ETests/E2EApps/E2EApp/Queue/QueueTestFunctions.cs
@@ -74,8 +74,7 @@ public HttpAndQueue QueueOutputPocoList(
         {
             context.GetLogger<QueueTestFunctions>().LogInformation(".NET HTTP trigger processed a request.");
 
-            var query = QueryHelpers.ParseQuery(request.Url.Query);
-            string queueMessageId = query["queueMessageId"];
+            string queueMessageId = request.Query["queueMessageId"];
             var outputItems = new List<TestData>();
 
             if (queueMessageId != null)

diff --git a/test/E2ETests/E2ETests/HttpEndToEndTests.cs b/test/E2ETests/E2ETests/HttpEndToEndTests.cs
@@ -25,6 +25,7 @@ public HttpEndToEndTests(FunctionAppFixture fixture)
         [InlineData("HelloFromQuery", "?name=Test", HttpStatusCode.OK, "Hello Test")]
         [InlineData("HelloFromQuery", "?name=John&lastName=Doe", HttpStatusCode.OK, "Hello John")]
         [InlineData("HelloFromQuery", "?emptyProperty=&name=Jane", HttpStatusCode.OK, "Hello Jane")]
+        [InlineData("HelloFromQuery", "?name=John&name=Jane", HttpStatusCode.OK, "Hello John,Jane")]
         [InlineData("ExceptionFunction", "", HttpStatusCode.InternalServerError, "")]
         [InlineData("HelloFromQuery", "", HttpStatusCode.BadRequest, "")]
         public async Task HttpTriggerTests(string functionName, string queryString, HttpStatusCode expectedStatusCode, string expectedMessage)