- renamed ConsumesFormUrlEncoded to ConsumesOnlyFormUrlEncoded in liquid templates (#5029)

- ConsumesOnlyFormUrlEncoded will be set to false if json is accepted

Author: ErikApption

src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid

@@ -212,7 +212,7 @@
 {%         elsif operation.HasXmlBodyParameter -%}
                 var content_ = new System.Net.Http.StringContent({{ operation.ContentParameter.VariableName }});
                 content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("{{ operation.Consumes }}");
-{%         elsif operation.ConsumesFormUrlEncoded -%}
+{%         elsif operation.ConsumesOnlyFormUrlEncoded -%}
                 var json_ = {% if UseSystemTextJson %}System.Text.Json.JsonSerializer.SerializeToUtf8Bytes{% else %}Newtonsoft.Json.JsonConvert.SerializeObject{% endif %}({{ operation.ContentParameter.VariableName }}, JsonSerializerSettings);
                 var dictionary_ = {% if UseSystemTextJson %}System.Text.Json.JsonSerializer.Deserialize{% else %}Newtonsoft.Json.JsonConvert.DeserializeObject{% endif %}<System.Collections.Generic.Dictionary<string, string>>(json_, JsonSerializerSettings);
                 var content_ = new System.Net.Http.FormUrlEncodedContent(dictionary_);
@@ -228,7 +228,7 @@
                 request_.Content = content_;
 {%     else -%}
 {%         if operation.HasFormParameters -%}
-{%             if operation.ConsumesFormUrlEncoded -%}
+{%             if operation.ConsumesOnlyFormUrlEncoded -%}
                 var keyValues_ = new System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<string, string>>();
 {%                 for parameter in operation.FormParameters -%}
 {%                     if parameter.IsNullable -%}

src/NSwag.CodeGeneration.TypeScript/Templates/AngularClient.liquid

@@ -69,7 +69,7 @@
 {%-    for parameter in operation.HeaderParameters -%}
                 "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "",
 {%-    endfor -%}
-{%-    if operation.HasContent or operation.ConsumesFormUrlEncoded -%}
+{%-    if operation.HasContent or operation.ConsumesOnlyFormUrlEncoded -%}
                 "Content-Type": "{{ operation.Consumes }}",
 {%-    endif -%}
 {%-    if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%}

src/NSwag.CodeGeneration.TypeScript/Templates/AngularJSClient.liquid

@@ -55,7 +55,7 @@
 {%-    for parameter in operation.HeaderParameters -%}
                 "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "",
 {%     endfor -%}
-{%     if operation.HasContent or operation.ConsumesFormUrlEncoded -%}
+{%     if operation.HasContent or operation.ConsumesOnlyFormUrlEncoded -%}
                 "Content-Type": "{{ operation.Consumes }}",
 {%     endif -%}
 {%     if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%}

src/NSwag.CodeGeneration.TypeScript/Templates/AxiosClient.liquid

@@ -52,7 +52,7 @@
 {%     for parameter in operation.HeaderParameters -%}
                 "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "",
 {%     endfor -%}
-{%     if operation.HasContent or operation.ConsumesFormUrlEncoded -%}
+{%     if operation.HasContent or operation.ConsumesOnlyFormUrlEncoded -%}
                 "Content-Type": "{{ operation.Consumes }}",
 {%     endif -%}
 {%     if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%}

src/NSwag.CodeGeneration.TypeScript/Templates/Client.RequestBody.liquid

@@ -1,5 +1,5 @@
 {%- if operation.HasFormParameters -%}
-{%-     if operation.ConsumesFormUrlEncoded -%}
+{%-     if operation.ConsumesOnlyFormUrlEncoded -%}
 let content_ = "";
 {%-         for parameter in operation.FormParameters -%}
 {%-             if parameter.IsRequired -%}

src/NSwag.CodeGeneration.TypeScript/Templates/FetchClient.liquid

@@ -55,7 +55,7 @@
 {%-    for parameter in operation.HeaderParameters -%}
                 "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "",
 {%-    endfor -%}
-{%-    if operation.HasContent or operation.ConsumesFormUrlEncoded -%}
+{%-    if operation.HasContent or operation.ConsumesOnlyFormUrlEncoded -%}
                 "Content-Type": "{{ operation.Consumes }}",
 {%-    endif -%}
 {%-    if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%}

src/NSwag.CodeGeneration.TypeScript/Templates/JQueryCallbacksClient.liquid

@@ -55,7 +55,7 @@
 {%    for parameter in operation.HeaderParameters -%}
                 "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "",
 {%    endfor -%}
-{%    if operation.HasContent or operation.ConsumesFormUrlEncoded -%}
+{%    if operation.HasContent or operation.ConsumesOnlyFormUrlEncoded -%}
                 "Content-Type": "{{ operation.Consumes }}",
 {%    endif -%}
 {%    if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%}

src/NSwag.CodeGeneration.TypeScript/Templates/JQueryPromisesClient.liquid

@@ -62,7 +62,7 @@
 {%-    for parameter in operation.HeaderParameters -%}
                 "{{ parameter.Name }}": {{ parameter.VariableName }} !== undefined && {{ parameter.VariableName }} !== null ? "" + {{ parameter.VariableName }} : "",
 {%     endfor -%}
-{%-    if operation.HasContent or operation.ConsumesFormUrlEncoded -%}
+{%-    if operation.HasContent or operation.ConsumesOnlyFormUrlEncoded -%}
                 "Content-Type": "{{ operation.Consumes }}",
 {%-    endif -%}
 {%-    if operation.HasResultType and operation.HasAcceptHeaderParameterParameter == false -%}

src/NSwag.CodeGeneration/Models/OperationModelBase.cs

@@ -207,10 +207,19 @@ public TParameterModel ContentParameter
         /// <summary>Gets a value indicating whether the operation has form parameters.</summary>
         public bool HasFormParameters => Parameters.Any(p => p.Kind == OpenApiParameterKind.FormData);
 
+        /// <summary>Gets a value indicating whether the operation consumes 'application/x-www-form-urlencoded'.</summary>
+        public bool ConsumesOnlyFormUrlEncoded =>
+            ConsumesFormUrlEncoded && !ConsumesJson;
+
         /// <summary>Gets a value indicating whether the operation consumes 'application/x-www-form-urlencoded'.</summary>
         public bool ConsumesFormUrlEncoded =>
-            _operation.ActualConsumes?.Any(c => c == "application/x-www-form-urlencoded") == true ||
-            _operation.ActualRequestBody?.Content.Any(mt => mt.Key == "application/x-www-form-urlencoded") == true;
+            (_operation.ActualConsumes?.Any(c => c == "application/x-www-form-urlencoded") == true ||
+            _operation.ActualRequestBody?.Content.Any(mt => mt.Key == "application/x-www-form-urlencoded") == true);
+
+        /// <summary>Gets a value indicating whether the operation consumes 'application/json'.</summary>
+        public bool ConsumesJson =>
+            (_operation.ActualConsumes?.Any(c => c == "application/json") == true ||
+            _operation.ActualRequestBody?.Content.Any(mt => mt.Key == "application/json") == true);
 
         /// <summary>Gets the form parameters.</summary>
         public IEnumerable<TParameterModel> FormParameters => Parameters.Where(p => p.Kind == OpenApiParameterKind.FormData);

src/NSwag.ConsoleCore/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "NSwag.ConsoleCore": {
       "commandName": "Project",
-      "commandLineArgs": "run \"C:\\Data\\Projects\\Picturepark.SDK.TypeScript\\src\\picturepark-sdk-v1-angular\\projects\\picturepark-sdk-v1-angular\\nswag.json\""
+      "commandLineArgs": "run \"D:\\pfsense\\pfsense.nswag\""
     }
   }
 }