Adding response headers to the generic RestResponse object

Author: ssethumavisa

generator/cybersource-csharp-template/ApiClient.mustache

@@ -373,12 +373,6 @@ namespace {{packageName}}.Client
                 {{/supportsUWP}}
                 {{/netStandard}}
                 InterceptResponse(request, response);
-            
-                Configuration.DefaultHeader.Clear();
-            
-                httpResponseStatusCode = (int)response.StatusCode;
-                httpResponseHeaders = response.Headers;
-                httpResponseData = response.Content;
             }
             {
                 //setting file name
@@ -406,16 +400,12 @@ namespace {{packageName}}.Client
                     }
                 }
 
-                httpResponseStatusCode = (int)responseT.StatusCode;
-                httpResponseHeaders = new List<Parameter>();
+                //setting the generic response with response headers
                 foreach (var header in responseT.Headers)
                 {
-                    string[] headerValue = responseT.Headers.GetValues(header.ToString());
-                    httpResponseHeaders.Add(new Parameter(header.ToString(), String.Join(",", headerValue.ToArray()), ParameterType.HttpHeader));
+                    response.Headers.Add(new Parameter(header.ToString(), String.Join(",", responseT.Headers.GetValues(header.ToString()).ToArray()), ParameterType.HttpHeader));
                 }
 
-                httpResponseData = "Custom Message: Response downloaded to file " + downloadReponseFileName;
-
                 //setting the generic RestResponse which is returned to the calling class
                 response.StatusCode = responseT.StatusCode;
                 if (responseT.StatusCode == HttpStatusCode.OK)
@@ -432,6 +422,12 @@ namespace {{packageName}}.Client
                 }
             }
 
+            Configuration.DefaultHeader.Clear();
+
+            httpResponseStatusCode = (int)response.StatusCode;
+            httpResponseHeaders = response.Headers;
+            httpResponseData = response.Content;
+
             Console.WriteLine($"\n");
             Console.WriteLine($"RESPONSE STATUS CODE: {httpResponseStatusCode}");