From 52c63bb325e41beb80a3e60249e3c835d39693bb Mon Sep 17 00:00:00 2001 From: Ghufran Zahidi <18732053+Ghufz@users.noreply.github.com> Date: Fri, 18 Dec 2020 10:05:05 +0530 Subject: [PATCH] Fixed the query string for HttpSigning core vs dotnet47 (#8189) * Fixed the query string for HttpSigning core vs dotnet47 * updated the sample * replace the tab with space * update samples Co-authored-by: William Cheng --- .../HttpSigningConfiguration.mustache | 21 +++++++++++++++---- .../Client/HttpSigningConfiguration.cs | 21 +++++++++++++++---- .../Client/HttpSigningConfiguration.cs | 21 +++++++++++++++---- .../Client/HttpSigningConfiguration.cs | 21 +++++++++++++++---- 4 files changed, 68 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache index cc932cf7ebc..b621c92d6bf 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache @@ -123,6 +123,7 @@ namespace {{packageName}}.Client var httpValues = HttpUtility.ParseQueryString(String.Empty); foreach (var parameter in requestOptions.QueryParameters) { +#if (NETCOREAPP) if (parameter.Value.Count > 1) { // array foreach (var value in parameter.Value) @@ -132,13 +133,25 @@ namespace {{packageName}}.Client } else { - httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]); - + httpValues.Add(HttpUtility.UrlEncode(parameter.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 } var uriBuilder = new UriBuilder(string.Concat(basePath, path)); - uriBuilder.Query = httpValues.ToString(); - + uriBuilder.Query = httpValues.ToString().Replace("+", "%20"); + var dateTime = DateTime.Now; String Digest = String.Empty; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index d39c892c7dc..584900d1a30 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -123,6 +123,7 @@ namespace Org.OpenAPITools.Client var httpValues = HttpUtility.ParseQueryString(String.Empty); foreach (var parameter in requestOptions.QueryParameters) { +#if (NETCOREAPP) if (parameter.Value.Count > 1) { // array foreach (var value in parameter.Value) @@ -132,13 +133,25 @@ namespace Org.OpenAPITools.Client } else { - httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]); - + httpValues.Add(HttpUtility.UrlEncode(parameter.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 } var uriBuilder = new UriBuilder(string.Concat(basePath, path)); - uriBuilder.Query = httpValues.ToString(); - + uriBuilder.Query = httpValues.ToString().Replace("+", "%20"); + var dateTime = DateTime.Now; String Digest = String.Empty; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index d39c892c7dc..584900d1a30 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -123,6 +123,7 @@ namespace Org.OpenAPITools.Client var httpValues = HttpUtility.ParseQueryString(String.Empty); foreach (var parameter in requestOptions.QueryParameters) { +#if (NETCOREAPP) if (parameter.Value.Count > 1) { // array foreach (var value in parameter.Value) @@ -132,13 +133,25 @@ namespace Org.OpenAPITools.Client } else { - httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]); - + httpValues.Add(HttpUtility.UrlEncode(parameter.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 } var uriBuilder = new UriBuilder(string.Concat(basePath, path)); - uriBuilder.Query = httpValues.ToString(); - + uriBuilder.Query = httpValues.ToString().Replace("+", "%20"); + var dateTime = DateTime.Now; String Digest = String.Empty; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs index d39c892c7dc..584900d1a30 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs @@ -123,6 +123,7 @@ namespace Org.OpenAPITools.Client var httpValues = HttpUtility.ParseQueryString(String.Empty); foreach (var parameter in requestOptions.QueryParameters) { +#if (NETCOREAPP) if (parameter.Value.Count > 1) { // array foreach (var value in parameter.Value) @@ -132,13 +133,25 @@ namespace Org.OpenAPITools.Client } else { - httpValues.Add(HttpUtility.UrlEncode(parameter.Key), parameter.Value[0]); - + httpValues.Add(HttpUtility.UrlEncode(parameter.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 } var uriBuilder = new UriBuilder(string.Concat(basePath, path)); - uriBuilder.Query = httpValues.ToString(); - + uriBuilder.Query = httpValues.ToString().Replace("+", "%20"); + var dateTime = DateTime.Now; String Digest = String.Empty;