Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
20cf96f
fix(csharp): use numeric .NET version check to prevent double URL-enc…
sagadira Apr 24, 2026
b443ae3
Merge pull request #172 from sagadira/CSCwu08056
vvb Apr 29, 2026
9fbf404
Introducing Annotated Enum with const
nagabalaji-b May 22, 2026
51e0b0f
fix: support OpenAPI 3.1 const in annotated enum normalization
nagabalaji-b May 25, 2026
ba6d6a2
fix(docs): use forward slashes in path separators for cross-platform …
nagabalaji-b May 25, 2026
553b721
revert: remove unrelated doc file changes from PR scope
nagabalaji-b May 26, 2026
3496c3b
refactor(normalizer): extract definesEnum variable per reviewer sugge…
nagabalaji-b May 26, 2026
55450c4
fix(normalizer): preserve x-enum-deprecated for oneOf/anyOf const enums
nagabalaji-b Jun 5, 2026
b45f152
Merge remote-tracking branch 'upstream/master' into openapitools-master
nagabalaji-b Jun 17, 2026
7c97781
chore: regenerate samples after normalization improvements
nagabalaji-b Jun 18, 2026
ed13261
chore(samples): normalize generated samples for cross-platform output
nagabalaji-b Jun 18, 2026
887cc11
Merge origin/master into openapitools-master (resolved conflicts)
nagabalaji-b Jun 19, 2026
6ef74e7
adding samples
nagabalaji-b Jun 19, 2026
41a9373
chore(csharp): sync HttpSigningConfiguration.mustache from upstream/m…
nagabalaji-b Jun 19, 2026
f183516
Revert "adding samples"
nagabalaji-b Jun 26, 2026
5e4b895
add annotated enum csharp config and regenerate samples
nagabalaji-b Jun 26, 2026
d35f8b2
Revert "add annotated enum csharp config and regenerate samples"
nagabalaji-b Jun 28, 2026
6978533
add csharp generichost annotated enum config
nagabalaji-b Jun 28, 2026
fe94074
regenerate samples for csharp generichost annotated enum
nagabalaji-b Jun 28, 2026
43fa567
ci(csharp): add AnnotatedEnum sample to .NET 10 workflow
nagabalaji-b Jun 29, 2026
4e6cec9
Merge remote-tracking branch 'upstream/master' into openapitools-master
nagabalaji-b Jun 29, 2026
62e9f74
chore(samples): regenerate AnnotatedEnum after upstream merge
nagabalaji-b Jun 29, 2026
e6948a3
chore(samples): align AnnotatedEnum FILES manifest with double-regen …
nagabalaji-b Jun 29, 2026
d05fdf3
Merge remote-tracking branch 'origin/master' into sync/openapitools-m…
nagabalaji-b Aug 31, 2026
5d99e94
Merge remote-tracking branch 'upstream/master' into openapitools-master
nagabalaji-b Nov 15, 2026
b75c7e1
fix(csharp): encode httpclient query parameters once without changing…
nagabalaji-b Nov 15, 2026
fbd0851
fix(csharp): encode httpclient query parameters once without changing…
nagabalaji-b Nov 18, 2026
5c20477
[C#] httpclient: encode query parameters once and sign the sent URL
nagabalaji-b Nov 18, 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
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ namespace {{packageName}}.Client
{
HashAlgorithm = HashAlgorithmName.SHA256;
SigningAlgorithm = "PKCS1-v15";
{{^useHttpClient}}
_skipUrlEncode = RuntimeInformation.FrameworkDescription.StartsWith(".NET ") &&
int.TryParse(RuntimeInformation.FrameworkDescription.Substring(5).Split('.')[0], out int fwMajor) && fwMajor >= 9;
{{/useHttpClient}}
}

/// <summary>
Expand Down Expand Up @@ -69,13 +71,15 @@ namespace {{packageName}}.Client
/// </summary>
public int SignatureValidityPeriod { get; set; }

{{^useHttpClient}}
// On .NET 9+, HttpUtility.ParseQueryString already URL-encodes keys internally,
// so calling UrlEncode again would cause double-encoding and produce a signature
// that does not match the actual request sent by RestSharp 112+.
// On .NET 8 and earlier, keys must be explicitly URL-encoded so that special
// characters (e.g. '$' in OData params like $filter) are encoded the same way
// in the signature as they are in the outgoing HTTP request.
private readonly bool _skipUrlEncode;
{{/useHttpClient}}

private enum PrivateKeyType
{
Expand Down Expand Up @@ -139,6 +143,7 @@ namespace {{packageName}}.Client
}
}

{{^useHttpClient}}
var httpValues = HttpUtility.ParseQueryString(string.Empty);
foreach (var parameter in requestOptions.QueryParameters)
{
Expand Down Expand Up @@ -171,6 +176,18 @@ namespace {{packageName}}.Client
}
var uriBuilder = new UriBuilder(string.Concat(basePath, path));
uriBuilder.Query = httpValues.ToString().Replace("+", "%20");
{{/useHttpClient}}
{{#useHttpClient}}
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in requestOptions.QueryParameters)
{
foreach (var value in parameter.Value)
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
var uriBuilder = new UriBuilder(string.Concat(basePath, path));
uriBuilder.Query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");
{{/useHttpClient}}

var dateTime = DateTime.Now;
string Digest = string.Empty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{{>partial_header}}
using System;
using System.Collections.Generic;
{{#useHttpClient}}
using System.Web;
{{/useHttpClient}}

namespace {{packageName}}.Client
{
Expand Down Expand Up @@ -28,18 +31,37 @@ namespace {{packageName}}.Client

public void AddQueryParameters(Multimap<string, string> parameters)
{
{{#useHttpClient}}
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in parameters)
{
foreach (var value in parameter.Value)
{
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
}
_query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");
{{/useHttpClient}}
{{^useHttpClient}}
foreach (var parameter in parameters)
{
foreach (var value in parameter.Value)
{
_query = _query + parameter.Key + "=" + Uri.EscapeDataString(value) + "&";
}
}
{{/useHttpClient}}
}

public string GetFullUri()
{
{{#useHttpClient}}
return new UriBuilder(_baseUrl + _path) { Query = _query }.Uri.AbsoluteUri;
{{/useHttpClient}}
{{^useHttpClient}}
return _baseUrl + _path + _query.Substring(0, _query.Length - 1);
{{/useHttpClient}}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using System;
using System.Collections.Generic;
using System.Web;

namespace Org.OpenAPITools.Client
{
Expand Down Expand Up @@ -36,18 +37,21 @@ public void AddPathParameters(Dictionary<string, string> parameters)

public void AddQueryParameters(Multimap<string, string> parameters)
{
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in parameters)
{
foreach (var value in parameter.Value)
{
_query = _query + parameter.Key + "=" + Uri.EscapeDataString(value) + "&";
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
}
_query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");
}

public string GetFullUri()
{
return _baseUrl + _path + _query.Substring(0, _query.Length - 1);
return new UriBuilder(_baseUrl + _path) { Query = _query }.Uri.AbsoluteUri;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ public HttpSigningConfiguration()
{
HashAlgorithm = HashAlgorithmName.SHA256;
SigningAlgorithm = "PKCS1-v15";
_skipUrlEncode = RuntimeInformation.FrameworkDescription.StartsWith(".NET ") &&
int.TryParse(RuntimeInformation.FrameworkDescription.Substring(5).Split('.')[0], out int fwMajor) && fwMajor >= 9;
}

/// <summary>
Expand Down Expand Up @@ -77,13 +75,6 @@ public HttpSigningConfiguration()
/// </summary>
public int SignatureValidityPeriod { get; set; }

// On .NET 9+, HttpUtility.ParseQueryString already URL-encodes keys internally,
// so calling UrlEncode again would cause double-encoding and produce a signature
// that does not match the actual request sent by RestSharp 112+.
// On .NET 8 and earlier, keys must be explicitly URL-encoded so that special
// characters (e.g. '$' in OData params like $filter) are encoded the same way
// in the signature as they are in the outgoing HTTP request.
private readonly bool _skipUrlEncode;

private enum PrivateKeyType
{
Expand Down Expand Up @@ -147,38 +138,15 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
}
}

var httpValues = HttpUtility.ParseQueryString(string.Empty);
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in requestOptions.QueryParameters)
{
#if (NETCOREAPP)
string key = _skipUrlEncode ? parameter.Key : HttpUtility.UrlEncode(parameter.Key);
if (parameter.Value.Count > 1)
{ // array
foreach (var value in parameter.Value)
{
httpValues.Add(key + "[]", value);
}
}
else
{
httpValues.Add(key, parameter.Value[0]);
}
#else
if (parameter.Value.Count > 1)
{ // array
foreach (var value in parameter.Value)
{
httpValues.Add(parameter.Key + "[]", value);
}
}
else
{
httpValues.Add(parameter.Key, parameter.Value[0]);
}
#endif
foreach (var value in parameter.Value)
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
var uriBuilder = new UriBuilder(string.Concat(basePath, path));
uriBuilder.Query = httpValues.ToString().Replace("+", "%20");
uriBuilder.Query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");

var dateTime = DateTime.Now;
string Digest = string.Empty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using System;
using System.Collections.Generic;
using System.Web;

namespace Org.OpenAPITools.Client
{
Expand Down Expand Up @@ -36,18 +37,21 @@ public void AddPathParameters(Dictionary<string, string> parameters)

public void AddQueryParameters(Multimap<string, string> parameters)
{
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in parameters)
{
foreach (var value in parameter.Value)
{
_query = _query + parameter.Key + "=" + Uri.EscapeDataString(value) + "&";
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
}
_query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");
}

public string GetFullUri()
{
return _baseUrl + _path + _query.Substring(0, _query.Length - 1);
return new UriBuilder(_baseUrl + _path) { Query = _query }.Uri.AbsoluteUri;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using System;
using System.Collections.Generic;
using System.Web;

namespace Org.OpenAPITools.Client
{
Expand Down Expand Up @@ -36,18 +37,21 @@ public void AddPathParameters(Dictionary<string, string> parameters)

public void AddQueryParameters(Multimap<string, string> parameters)
{
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in parameters)
{
foreach (var value in parameter.Value)
{
_query = _query + parameter.Key + "=" + Uri.EscapeDataString(value) + "&";
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
}
_query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");
}

public string GetFullUri()
{
return _baseUrl + _path + _query.Substring(0, _query.Length - 1);
return new UriBuilder(_baseUrl + _path) { Query = _query }.Uri.AbsoluteUri;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ public HttpSigningConfiguration()
{
HashAlgorithm = HashAlgorithmName.SHA256;
SigningAlgorithm = "PKCS1-v15";
_skipUrlEncode = RuntimeInformation.FrameworkDescription.StartsWith(".NET ") &&
int.TryParse(RuntimeInformation.FrameworkDescription.Substring(5).Split('.')[0], out int fwMajor) && fwMajor >= 9;
}

/// <summary>
Expand Down Expand Up @@ -77,13 +75,6 @@ public HttpSigningConfiguration()
/// </summary>
public int SignatureValidityPeriod { get; set; }

// On .NET 9+, HttpUtility.ParseQueryString already URL-encodes keys internally,
// so calling UrlEncode again would cause double-encoding and produce a signature
// that does not match the actual request sent by RestSharp 112+.
// On .NET 8 and earlier, keys must be explicitly URL-encoded so that special
// characters (e.g. '$' in OData params like $filter) are encoded the same way
// in the signature as they are in the outgoing HTTP request.
private readonly bool _skipUrlEncode;

private enum PrivateKeyType
{
Expand Down Expand Up @@ -147,38 +138,15 @@ public Dictionary<string, string> GetHttpSignedHeader(string basePath,string met
}
}

var httpValues = HttpUtility.ParseQueryString(string.Empty);
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in requestOptions.QueryParameters)
{
#if (NETCOREAPP)
string key = _skipUrlEncode ? parameter.Key : HttpUtility.UrlEncode(parameter.Key);
if (parameter.Value.Count > 1)
{ // array
foreach (var value in parameter.Value)
{
httpValues.Add(key + "[]", value);
}
}
else
{
httpValues.Add(key, parameter.Value[0]);
}
#else
if (parameter.Value.Count > 1)
{ // array
foreach (var value in parameter.Value)
{
httpValues.Add(parameter.Key + "[]", value);
}
}
else
{
httpValues.Add(parameter.Key, parameter.Value[0]);
}
#endif
foreach (var value in parameter.Value)
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
var uriBuilder = new UriBuilder(string.Concat(basePath, path));
uriBuilder.Query = httpValues.ToString().Replace("+", "%20");
uriBuilder.Query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");

var dateTime = DateTime.Now;
string Digest = string.Empty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

using System;
using System.Collections.Generic;
using System.Web;

namespace Org.OpenAPITools.Client
{
Expand Down Expand Up @@ -36,18 +37,21 @@ public void AddPathParameters(Dictionary<string, string> parameters)

public void AddQueryParameters(Multimap<string, string> parameters)
{
// Build the pairs directly: HttpUtility.ParseQueryString is case-insensitive and would merge keys such as "tag" and "Tag".
var queryPairs = new List<string>();
foreach (var parameter in parameters)
{
foreach (var value in parameter.Value)
{
_query = _query + parameter.Key + "=" + Uri.EscapeDataString(value) + "&";
queryPairs.Add(HttpUtility.UrlEncode(parameter.Key) + "=" + HttpUtility.UrlEncode(value));
}
}
_query = string.Join("&", queryPairs).Replace("+", "%20").Replace("%24", "$");
}

public string GetFullUri()
{
return _baseUrl + _path + _query.Substring(0, _query.Length - 1);
return new UriBuilder(_baseUrl + _path) { Query = _query }.Uri.AbsoluteUri;
}
}
}
Loading
Loading