Skip to content

Fix/csharp reserved headers and file parameter not serialising correctly #23593

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.

Sign up for GitHub

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

Open
BottlecapDave wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix/csharp reserved headers and file parameter not serialising correctly #23593

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
44a20ed
fix: Fixed issue where reserved headers were added to the request ins…
BottlecapDave Apr 21, 2026
78b3384
fix: Fixed issue where file parameter object is incorrectly JSON seri…
BottlecapDave Apr 21, 2026
b7eee79
chore: Updated samples based on csharp changes
BottlecapDave Apr 21, 2026
7f890c1
fix: Moved content header checks to client utils
BottlecapDave Apr 22, 2026
210df50
fix: Fixed reference to new IsContentHeader static method
BottlecapDave Apr 22, 2026
99fbc55
chore: Added "content-disposition" to content header check
BottlecapDave Apr 22, 2026
dd199ab
fix: Updated ContentHeaders to be compatible with older versions of .NET
BottlecapDave Apr 23, 2026
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
28 changes: 28 additions & 0 deletions ...es/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,34 @@ using System.Net.Http.Headers;
throw new JsonException("The specified discriminator was not found.");
}

/// <summary>
/// Determines if the provided header is a content header
/// </summary>
/// <param name="header">The header to check</param>
/// <returns>True if a content header; False otherwise</returns>
public static bool IsContentHeader(string header)
{
return ContentHeaders.Contains(header.ToLowerInvariant());
}

/// <summary>
/// The collection of content headers as per
/// https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpcontent.headers
/// </summary>
private static readonly string[] ContentHeaders =
[
"allow",
"content-encoding",
"content-language",
"content-length",
"content-location",
"content-md5",
"content-range",
"content-type",
"expires",
"last-modified"
];

/// <summary>
/// The base path of the API
/// </summary>
Expand Down
76 changes: 53 additions & 23 deletions modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,23 +452,6 @@ namespace {{packageName}}.{{apiPackage}}

{{/-last}}
{{/queryParams}}
{{#constantParams}}
{{#isHeaderParam}}
// Set client side default value of Header Param "{{baseName}}".
httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{#_enum}}"{{{.}}}"{{/_enum}})); // Constant header parameter
{{/isHeaderParam}}
{{/constantParams}}
{{#headerParams}}
{{#required}}
httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}}));

{{/required}}
{{^required}}
if ({{paramName}}.IsSet)
httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}}.Value));

{{/required}}
{{/headerParams}}
{{#formParams}}
{{#-first}}
{{#isMultipart}}
Expand Down Expand Up @@ -561,18 +544,65 @@ namespace {{packageName}}.{{apiPackage}}
{{/formParams}}
{{#bodyParam}}
{{#required}}
httpRequestMessageLocalVar.Content = ({{paramName}}{{^required}}.Value{{/required}} as object) is System.IO.Stream stream
? httpRequestMessageLocalVar.Content = new StreamContent(stream)
httpRequestMessageLocalVar.Content = ({{paramName}}{{^required}}.Value{{/required}} as object) is {{packageName}}.{{clientPackage}}.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize({{paramName}}{{^required}}.Value{{/required}}, _jsonSerializerOptions));
{{/required}}
{{^required}}
if ({{paramName}}.IsSet)
httpRequestMessageLocalVar.Content = ({{paramName}}{{^required}}.Value{{/required}} as object) is System.IO.Stream stream
? httpRequestMessageLocalVar.Content = new StreamContent(stream)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize({{paramName}}{{^required}}.Value{{/required}}, _jsonSerializerOptions));
{
httpRequestMessageLocalVar.Content = ({{paramName}}{{^required}}.Value{{/required}} as object) is {{packageName}}.{{clientPackage}}.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize({{paramName}}{{^required}}.Value{{/required}}, _jsonSerializerOptions));
}
{{/required}}

{{/bodyParam}}

{{#constantParams}}
{{#isHeaderParam}}
// Set client side default value of Header Param "{{baseName}}".
if (ClientUtils.IsContentHeader("{{baseName}}"))
{
httpRequestMessageLocalVar.Content.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{#_enum}}"{{{.}}}"{{/_enum}})); // Constant header parameter
}
else
{
httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{#_enum}}"{{{.}}}"{{/_enum}})); // Constant header parameter
}

{{/isHeaderParam}}
{{/constantParams}}
{{#headerParams}}
{{#required}}
// Set client side default value of Header Param "{{baseName}}".
if (ClientUtils.IsContentHeader("{{baseName}}"))
{
httpRequestMessageLocalVar.Content.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}}));
}
else
{
httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}}));
}

{{/required}}
{{^required}}
if ({{paramName}}.IsSet)
{
// Set client side default value of Header Param "{{baseName}}".
if (_contentHeaders.Contains("{{baseName}}".ToLowerInvariant()))
{
httpRequestMessageLocalVar.Content.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}}.Value));
}
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
else
{
httpRequestMessageLocalVar.Headers.Add("{{baseName}}", ClientUtils.ParameterToString({{paramName}}.Value));
}
}

{{/required}}
{{/headerParams}}

{{#authMethods}}
{{#-first}}
List<TokenBase> tokenBaseLocalVars = new List<TokenBase>();
Expand Down Expand Up @@ -907,4 +937,4 @@ namespace {{packageName}}.{{apiPackage}}
}
{{/operations}}
}
{{/lambda.trimLineBreaks}}
{{/lambda.trimLineBreaks}}
28 changes: 28 additions & 0 deletions ...etstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,34 @@ public static bool IsJsonMime(string mime)
throw new JsonException("The specified discriminator was not found.");
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
}

/// <summary>
/// Determines if the provided header is a content header
/// </summary>
/// <param name="header">The header to check</param>
/// <returns>True if a content header; False otherwise</returns>
public static bool IsContentHeader(string header)
{
return ContentHeaders.Contains(header.ToLowerInvariant());
}

/// <summary>
/// The collection of content headers as per
/// https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpcontent.headers
/// </summary>
private static readonly string[] ContentHeaders =
[
"allow",
"content-encoding",
"content-language",
"content-length",
"content-location",
"content-md5",
"content-range",
"content-type",
"expires",
"last-modified"
];

/// <summary>
/// The base path of the API
/// </summary>
Expand Down
8 changes: 5 additions & 3 deletions ...ient/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,11 @@ public async Task<IHelloWorldPostApiResponse> HelloWorldPostAsync(Option<HelloWo
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/helloWorld");

if (helloWorldPostRequest.IsSet)
httpRequestMessageLocalVar.Content = (helloWorldPostRequest.Value as object) is System.IO.Stream stream
? httpRequestMessageLocalVar.Content = new StreamContent(stream)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(helloWorldPostRequest.Value, _jsonSerializerOptions));
{
httpRequestMessageLocalVar.Content = (helloWorldPostRequest.Value as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(helloWorldPostRequest.Value, _jsonSerializerOptions));
}

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down
28 changes: 28 additions & 0 deletions .../petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,34 @@ public static bool IsJsonMime(string mime)
throw new JsonException("The specified discriminator was not found.");
}

/// <summary>
/// Determines if the provided header is a content header
/// </summary>
/// <param name="header">The header to check</param>
/// <returns>True if a content header; False otherwise</returns>
public static bool IsContentHeader(string header)
{
return ContentHeaders.Contains(header.ToLowerInvariant());
}

/// <summary>
/// The collection of content headers as per
/// https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpcontent.headers
/// </summary>
private static readonly string[] ContentHeaders =
[
"allow",
"content-encoding",
"content-language",
"content-length",
"content-location",
"content-md5",
"content-range",
"content-type",
"expires",
"last-modified"
];

/// <summary>
/// The base path of the API
/// </summary>
Expand Down
28 changes: 28 additions & 0 deletions ...tore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,34 @@ public static bool IsJsonMime(string mime)
throw new JsonException("The specified discriminator was not found.");
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
}

/// <summary>
/// Determines if the provided header is a content header
/// </summary>
/// <param name="header">The header to check</param>
/// <returns>True if a content header; False otherwise</returns>
public static bool IsContentHeader(string header)
{
return ContentHeaders.Contains(header.ToLowerInvariant());
}

/// <summary>
/// The collection of content headers as per
/// https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpcontent.headers
/// </summary>
private static readonly string[] ContentHeaders =
[
"allow",
"content-encoding",
"content-language",
"content-length",
"content-location",
"content-md5",
"content-range",
"content-type",
"expires",
"last-modified"
];

/// <summary>
/// The base path of the API
/// </summary>
Expand Down
8 changes: 5 additions & 3 deletions ...lient/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,11 @@ public async Task<IOneOfArrayApiResponse> OneOfArrayAsync(Option<OneOfArrayReque
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/one-of-array");

if (oneOfArrayRequest.IsSet)
httpRequestMessageLocalVar.Content = (oneOfArrayRequest.Value as object) is System.IO.Stream stream
? httpRequestMessageLocalVar.Content = new StreamContent(stream)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(oneOfArrayRequest.Value, _jsonSerializerOptions));
{
httpRequestMessageLocalVar.Content = (oneOfArrayRequest.Value as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(oneOfArrayRequest.Value, _jsonSerializerOptions));
}

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;

Expand Down
28 changes: 28 additions & 0 deletions ...t/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,34 @@ public static bool IsJsonMime(string mime)
throw new JsonException("The specified discriminator was not found.");
}

/// <summary>
/// Determines if the provided header is a content header
/// </summary>
/// <param name="header">The header to check</param>
/// <returns>True if a content header; False otherwise</returns>
public static bool IsContentHeader(string header)
{
return ContentHeaders.Contains(header.ToLowerInvariant());
}

/// <summary>
/// The collection of content headers as per
/// https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpcontent.headers
/// </summary>
private static readonly string[] ContentHeaders =
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
[
"allow",
"content-encoding",
"content-language",
"content-length",
"content-location",
"content-md5",
"content-range",
"content-type",
"expires",
"last-modified"
];

/// <summary>
/// The base path of the API
/// </summary>
Expand Down
28 changes: 28 additions & 0 deletions ...client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/ClientUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,34 @@ public static bool IsJsonMime(string mime)
throw new JsonException("The specified discriminator was not found.");
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
}

/// <summary>
/// Determines if the provided header is a content header
/// </summary>
/// <param name="header">The header to check</param>
/// <returns>True if a content header; False otherwise</returns>
public static bool IsContentHeader(string header)
{
return ContentHeaders.Contains(header.ToLowerInvariant());
}

/// <summary>
/// The collection of content headers as per
/// https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpcontent.headers
/// </summary>
private static readonly string[] ContentHeaders =
[
"allow",
"content-encoding",
"content-language",
"content-length",
"content-location",
"content-md5",
"content-range",
"content-type",
"expires",
"last-modified"
];

/// <summary>
/// The base path of the API
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions ...re/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ public async Task<ICall123TestSpecialTagsApiResponse> Call123TestSpecialTagsAsyn
? "/another-fake/dummy"
: string.Concat(HttpClient.BaseAddress.AbsolutePath.TrimEnd('/'), "/another-fake/dummy");

httpRequestMessageLocalVar.Content = (modelClient as object) is System.IO.Stream stream
? httpRequestMessageLocalVar.Content = new StreamContent(stream)
httpRequestMessageLocalVar.Content = (modelClient as object) is Org.OpenAPITools.Client.FileParameter fileParameterLocalVar
? httpRequestMessageLocalVar.Content = new StreamContent(fileParameterLocalVar.Content)
: httpRequestMessageLocalVar.Content = new StringContent(JsonSerializer.Serialize(modelClient, _jsonSerializerOptions));

httpRequestMessageLocalVar.RequestUri = uriBuilderLocalVar.Uri;
Expand Down
Loading
Loading