removed double encoding (#14883)

This commit is contained in:
devhl-labs 2023-03-04 21:09:57 -05:00 committed by GitHub
parent 46fb49ecd0
commit 2a9fb7b6e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 59 additions and 59 deletions

View File

@ -302,10 +302,10 @@ namespace {{packageName}}.{{apiPackage}}
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/queryParams}}{{#queryParams}}{{#required}}{{#-first}} System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/queryParams}}{{#queryParams}}{{#required}}{{#-first}}
{{! all the redundant tags here are to get the spacing just right }} {{! all the redundant tags here are to get the spacing just right }}
{{/-first}}{{/required}}{{/queryParams}}{{#queryParams}}{{#required}}parseQueryString["{{baseName}}"] = Uri.EscapeDataString({{paramName}}.ToString(){{nrt!}}); {{/-first}}{{/required}}{{/queryParams}}{{#queryParams}}{{#required}}parseQueryString["{{baseName}}"] = {{paramName}}.ToString();
{{/required}}{{/queryParams}}{{#queryParams}}{{#-first}} {{/required}}{{/queryParams}}{{#queryParams}}{{#-first}}
{{/-first}}{{/queryParams}}{{#queryParams}}{{^required}}if ({{paramName}} != null) {{/-first}}{{/queryParams}}{{#queryParams}}{{^required}}if ({{paramName}} != null)
parseQueryString["{{baseName}}"] = Uri.EscapeDataString({{paramName}}.ToString(){{nrt!}}); parseQueryString["{{baseName}}"] = {{paramName}}.ToString();
{{/required}}{{#-last}}uriBuilder.Query = parseQueryString.ToString(); {{/required}}{{#-last}}uriBuilder.Query = parseQueryString.ToString();

View File

@ -1405,7 +1405,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["required_string_uuid"] = Uri.EscapeDataString(requiredStringUuid.ToString()!); parseQueryString["required_string_uuid"] = requiredStringUuid.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -1856,7 +1856,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["query"] = Uri.EscapeDataString(query.ToString()!); parseQueryString["query"] = query.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2516,16 +2516,16 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
if (enumQueryStringArray != null) if (enumQueryStringArray != null)
parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()!); parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString();
if (enumQueryDouble != null) if (enumQueryDouble != null)
parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()!); parseQueryString["enum_query_double"] = enumQueryDouble.ToString();
if (enumQueryInteger != null) if (enumQueryInteger != null)
parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()!); parseQueryString["enum_query_integer"] = enumQueryInteger.ToString();
if (enumQueryString != null) if (enumQueryString != null)
parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()!); parseQueryString["enum_query_string"] = enumQueryString.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2735,14 +2735,14 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["required_string_group"] = Uri.EscapeDataString(requiredStringGroup.ToString()!); parseQueryString["required_string_group"] = requiredStringGroup.ToString();
parseQueryString["required_int64_group"] = Uri.EscapeDataString(requiredInt64Group.ToString()!); parseQueryString["required_int64_group"] = requiredInt64Group.ToString();
if (stringGroup != null) if (stringGroup != null)
parseQueryString["string_group"] = Uri.EscapeDataString(stringGroup.ToString()!); parseQueryString["string_group"] = stringGroup.ToString();
if (int64Group != null) if (int64Group != null)
parseQueryString["int64_group"] = Uri.EscapeDataString(int64Group.ToString()!); parseQueryString["int64_group"] = int64Group.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -3257,11 +3257,11 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["pipe"] = Uri.EscapeDataString(pipe.ToString()!); parseQueryString["pipe"] = pipe.ToString();
parseQueryString["ioutil"] = Uri.EscapeDataString(ioutil.ToString()!); parseQueryString["ioutil"] = ioutil.ToString();
parseQueryString["http"] = Uri.EscapeDataString(http.ToString()!); parseQueryString["http"] = http.ToString();
parseQueryString["url"] = Uri.EscapeDataString(url.ToString()!); parseQueryString["url"] = url.ToString();
parseQueryString["context"] = Uri.EscapeDataString(context.ToString()!); parseQueryString["context"] = context.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -873,7 +873,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["status"] = Uri.EscapeDataString(status.ToString()!); parseQueryString["status"] = status.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -1046,7 +1046,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["tags"] = Uri.EscapeDataString(tags.ToString()!); parseQueryString["tags"] = tags.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -1227,8 +1227,8 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["username"] = Uri.EscapeDataString(username.ToString()!); parseQueryString["username"] = username.ToString();
parseQueryString["password"] = Uri.EscapeDataString(password.ToString()!); parseQueryString["password"] = password.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -1144,7 +1144,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["required_string_uuid"] = Uri.EscapeDataString(requiredStringUuid.ToString()); parseQueryString["required_string_uuid"] = requiredStringUuid.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -1595,7 +1595,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["query"] = Uri.EscapeDataString(query.ToString()); parseQueryString["query"] = query.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2255,16 +2255,16 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
if (enumQueryStringArray != null) if (enumQueryStringArray != null)
parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()); parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString();
if (enumQueryDouble != null) if (enumQueryDouble != null)
parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()); parseQueryString["enum_query_double"] = enumQueryDouble.ToString();
if (enumQueryInteger != null) if (enumQueryInteger != null)
parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()); parseQueryString["enum_query_integer"] = enumQueryInteger.ToString();
if (enumQueryString != null) if (enumQueryString != null)
parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()); parseQueryString["enum_query_string"] = enumQueryString.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2474,14 +2474,14 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["required_string_group"] = Uri.EscapeDataString(requiredStringGroup.ToString()); parseQueryString["required_string_group"] = requiredStringGroup.ToString();
parseQueryString["required_int64_group"] = Uri.EscapeDataString(requiredInt64Group.ToString()); parseQueryString["required_int64_group"] = requiredInt64Group.ToString();
if (stringGroup != null) if (stringGroup != null)
parseQueryString["string_group"] = Uri.EscapeDataString(stringGroup.ToString()); parseQueryString["string_group"] = stringGroup.ToString();
if (int64Group != null) if (int64Group != null)
parseQueryString["int64_group"] = Uri.EscapeDataString(int64Group.ToString()); parseQueryString["int64_group"] = int64Group.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2996,11 +2996,11 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["pipe"] = Uri.EscapeDataString(pipe.ToString()); parseQueryString["pipe"] = pipe.ToString();
parseQueryString["ioutil"] = Uri.EscapeDataString(ioutil.ToString()); parseQueryString["ioutil"] = ioutil.ToString();
parseQueryString["http"] = Uri.EscapeDataString(http.ToString()); parseQueryString["http"] = http.ToString();
parseQueryString["url"] = Uri.EscapeDataString(url.ToString()); parseQueryString["url"] = url.ToString();
parseQueryString["context"] = Uri.EscapeDataString(context.ToString()); parseQueryString["context"] = context.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -765,7 +765,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["status"] = Uri.EscapeDataString(status.ToString()); parseQueryString["status"] = status.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -938,7 +938,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["tags"] = Uri.EscapeDataString(tags.ToString()); parseQueryString["tags"] = tags.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -1114,8 +1114,8 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["username"] = Uri.EscapeDataString(username.ToString()); parseQueryString["username"] = username.ToString();
parseQueryString["password"] = Uri.EscapeDataString(password.ToString()); parseQueryString["password"] = password.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -1144,7 +1144,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["required_string_uuid"] = Uri.EscapeDataString(requiredStringUuid.ToString()); parseQueryString["required_string_uuid"] = requiredStringUuid.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -1595,7 +1595,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["query"] = Uri.EscapeDataString(query.ToString()); parseQueryString["query"] = query.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2255,16 +2255,16 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
if (enumQueryStringArray != null) if (enumQueryStringArray != null)
parseQueryString["enum_query_string_array"] = Uri.EscapeDataString(enumQueryStringArray.ToString()); parseQueryString["enum_query_string_array"] = enumQueryStringArray.ToString();
if (enumQueryDouble != null) if (enumQueryDouble != null)
parseQueryString["enum_query_double"] = Uri.EscapeDataString(enumQueryDouble.ToString()); parseQueryString["enum_query_double"] = enumQueryDouble.ToString();
if (enumQueryInteger != null) if (enumQueryInteger != null)
parseQueryString["enum_query_integer"] = Uri.EscapeDataString(enumQueryInteger.ToString()); parseQueryString["enum_query_integer"] = enumQueryInteger.ToString();
if (enumQueryString != null) if (enumQueryString != null)
parseQueryString["enum_query_string"] = Uri.EscapeDataString(enumQueryString.ToString()); parseQueryString["enum_query_string"] = enumQueryString.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2474,14 +2474,14 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["required_string_group"] = Uri.EscapeDataString(requiredStringGroup.ToString()); parseQueryString["required_string_group"] = requiredStringGroup.ToString();
parseQueryString["required_int64_group"] = Uri.EscapeDataString(requiredInt64Group.ToString()); parseQueryString["required_int64_group"] = requiredInt64Group.ToString();
if (stringGroup != null) if (stringGroup != null)
parseQueryString["string_group"] = Uri.EscapeDataString(stringGroup.ToString()); parseQueryString["string_group"] = stringGroup.ToString();
if (int64Group != null) if (int64Group != null)
parseQueryString["int64_group"] = Uri.EscapeDataString(int64Group.ToString()); parseQueryString["int64_group"] = int64Group.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -2996,11 +2996,11 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["pipe"] = Uri.EscapeDataString(pipe.ToString()); parseQueryString["pipe"] = pipe.ToString();
parseQueryString["ioutil"] = Uri.EscapeDataString(ioutil.ToString()); parseQueryString["ioutil"] = ioutil.ToString();
parseQueryString["http"] = Uri.EscapeDataString(http.ToString()); parseQueryString["http"] = http.ToString();
parseQueryString["url"] = Uri.EscapeDataString(url.ToString()); parseQueryString["url"] = url.ToString();
parseQueryString["context"] = Uri.EscapeDataString(context.ToString()); parseQueryString["context"] = context.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -765,7 +765,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["status"] = Uri.EscapeDataString(status.ToString()); parseQueryString["status"] = status.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();
@ -938,7 +938,7 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["tags"] = Uri.EscapeDataString(tags.ToString()); parseQueryString["tags"] = tags.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();

View File

@ -1114,8 +1114,8 @@ namespace Org.OpenAPITools.Api
System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty); System.Collections.Specialized.NameValueCollection parseQueryString = System.Web.HttpUtility.ParseQueryString(string.Empty);
parseQueryString["username"] = Uri.EscapeDataString(username.ToString()); parseQueryString["username"] = username.ToString();
parseQueryString["password"] = Uri.EscapeDataString(password.ToString()); parseQueryString["password"] = password.ToString();
uriBuilder.Query = parseQueryString.ToString(); uriBuilder.Query = parseQueryString.ToString();