Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add request content headers to cloned http request. #436

Merged
merged 2 commits into from
Apr 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,23 @@ internal static async Task<HttpRequestMessage> CloneAsync(this HttpRequestMessag
{
var newRequest = new HttpRequestMessage(originalRequest.Method, originalRequest.RequestUri);

// Copy request headers.
foreach (var header in originalRequest.Headers)
{
newRequest.Headers.TryAddWithoutValidation(header.Key, header.Value);
}

// Copy request properties.
foreach (var property in originalRequest.Properties)
{
newRequest.Properties.Add(property);
}

// Set Content if previous request contains
if (originalRequest.Content != null && originalRequest.Content.Headers.ContentLength != 0)
// Set Content if previous request had one.
if (originalRequest.Content != null)
{
newRequest.Content = new StreamContent(await originalRequest.Content.ReadAsStreamAsync());

// Copy content headers.
if (originalRequest.Content.Headers != null)
foreach (var contentHeader in originalRequest.Content.Headers)
newRequest.Content.Headers.TryAddWithoutValidation(contentHeader.Key, contentHeader.Value);
}

return newRequest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ namespace Microsoft.Graph.DotnetCore.Core.Test.Extensions
{
using Microsoft.Graph.DotnetCore.Core.Test.Requests;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using Xunit;
public class HttpRequestMessageExtensionsTests: BaseRequestTests
{
Expand Down Expand Up @@ -85,5 +87,33 @@ public void GetMiddlewareControl_ShouldReturnIMiddlewareOptionObject()

Assert.NotNull(httpRequestMessage.GetMiddlewareOption<AuthenticationHandlerOption>());
}

[Fact]
public async Task CloneAsync_WithEmptyHttpContent()
{
HttpRequestMessage originalRequest = new HttpRequestMessage(HttpMethod.Post, "http://example.com");

HttpRequestMessage clonedRequest = await originalRequest.CloneAsync();

Assert.NotNull(clonedRequest);
Assert.Equal(originalRequest.Method, clonedRequest.Method);
Assert.Equal(originalRequest.RequestUri, clonedRequest.RequestUri);
Assert.Null(clonedRequest.Content);
}

[Fact]
public async Task CloneAsync_WithHttpContent()
{
HttpRequestMessage originalRequest = new HttpRequestMessage(HttpMethod.Post, "http://example.com");
originalRequest.Content = new StringContent("Sample Content", Encoding.UTF8, "application/json");

HttpRequestMessage clonedRequest = await originalRequest.CloneAsync();

Assert.NotNull(clonedRequest);
Assert.Equal(originalRequest.Method, clonedRequest.Method);
Assert.Equal(originalRequest.RequestUri, clonedRequest.RequestUri);
Assert.Equal(await originalRequest.Content.ReadAsStringAsync(), await clonedRequest.Content.ReadAsStringAsync());
Assert.Equal(originalRequest.Content.Headers.ContentType, clonedRequest.Content.Headers.ContentType);
}
}
}