Fix null reference if content-type specified but no body

dotnet · Apr 4, 2023 · 9ca2fc3 · 9ca2fc3
1 parent 20680e2
commit 9ca2fc3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Microsoft.DotNet.Interactive.HttpRequest.Tests/HttpRequestKernelTests.cs b/src/Microsoft.DotNet.Interactive.HttpRequest.Tests/HttpRequestKernelTests.cs
@@ -192,6 +192,29 @@ public async Task can_set_body()
         bodyAsString.Should().Be("{ \"key\" : \"value\", \"list\": [1, 2, 3] }");
     }
 
+    [Fact]
+    public async Task can_set_contenttype_without_a_body()
+    {
+        HttpRequestMessage request = null;
+        var handler = new InterceptingHttpMessageHandler((message, _) =>
+        {
+            request = message;
+            var response = new HttpResponseMessage(HttpStatusCode.OK);
+            return Task.FromResult(response);
+        });
+        var client = new HttpClient(handler);
+        using var kernel = new HttpRequestKernel(client: client);
+
+        var result = await kernel.SendAsync(new SubmitCode(@"
+Get  https://location1.com:1200/endpoint
+Authorization: Basic username password
+Content-Type: application/json
+"));
+
+        result.Events.Should().NotContainErrors();
+        request.Content.Headers.ContentType.ToString().Should().Be("application/json");
+    }
+
     [Fact]
     public async Task can_use_symbols_in_body()
     {

diff --git a/src/Microsoft.DotNet.Interactive.HttpRequest/HttpRequestKernel.cs b/src/Microsoft.DotNet.Interactive.HttpRequest/HttpRequestKernel.cs
@@ -130,6 +130,10 @@ public async Task HandleAsync(SubmitCode command, KernelInvocationContext contex
                 switch (kvp.Key.ToLowerInvariant())
                 {
                     case "content-type":
+                        if (message.Content is null)
+                        {
+                            message.Content = new StringContent(httpRequest.Body);
+                        }
                         message.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(kvp.Value);
                         break;
                     case "accept":
@@ -275,7 +279,7 @@ private IEnumerable<HttpRequest> ParseRequests(string requests)
                     verb = parts[0].Trim();
                     address = parts[1].Trim();
                 }
-                else if (!string.IsNullOrWhiteSpace(line) && IsHeader.Matches(line) is { } matches)
+                else if (!string.IsNullOrWhiteSpace(line) && IsHeader.Matches(line) is { } matches && matches.Count != 0)
                 {
                     foreach (Match match in matches)
                     {