Fixes #358 MockGeneratorPlugin errors if the response headers have a duplicate

dev-proxy-abstractions/GraphBatchResponsePayload.cs

@@ -20,7 +20,7 @@ public class GraphBatchResponsePayloadResponse
     [JsonPropertyName("body")]
     public dynamic? Body { get; set; }
     [JsonPropertyName("headers")]
-    public Dictionary<string, string>? Headers { get; set; }
+    public List<Dictionary<string, string>>? Headers { get; set; }
 }
 
 public class GraphBatchResponsePayloadResponseBody

dev-proxy-plugins/Behavior/RateLimitingPlugin.cs

@@ -202,9 +202,9 @@ _urlsToWatch is null ||
             {
                 if (_configuration.CustomResponse is not null)
                 {
-                    var headers = _configuration.CustomResponse.Headers is not null ?
-                        _configuration.CustomResponse.Headers.Select(h => new HttpHeader(h.Key, h.Value)) :
-                        Array.Empty<HttpHeader>();
+                    var headers = _configuration.CustomResponse.ResponseHeaders is not null ?
+                        _configuration.CustomResponse.ResponseHeaders.SelectMany(dict => dict.Select(kv => new HttpHeader(kv.Key, kv.Value))).ToArray():
+                    Array.Empty<HttpHeader>();
 
                     // allow custom throttling response
                     var responseCode = (HttpStatusCode)(_configuration.CustomResponse.StatusCode ?? 200);

dev-proxy-plugins/MockResponses/GraphMockResponsePlugin.cs

@@ -60,7 +60,7 @@ protected override async Task OnRequest(object? sender, ProxyRequestArgs e)
                 {
                     Id = request.Id,
                     Status = (int)HttpStatusCode.BadGateway,
-                    Headers = headersDictionary,
+                    Headers = new List<Dictionary<string, string>> { headersDictionary },
                     Body = new GraphBatchResponsePayloadResponseBody
                     {
                         Error = new GraphBatchResponsePayloadResponseBodyError
@@ -82,12 +82,9 @@ protected override async Task OnRequest(object? sender, ProxyRequestArgs e)
                     statusCode = (HttpStatusCode)mockResponse.Response.StatusCode;
                 }
 
-                if (mockResponse.Response?.Headers is not null)
+                if (mockResponse.Response?.ResponseHeaders is not null)
                 {
-                    foreach (var key in mockResponse.Response.Headers.Keys)
-                    {
-                        headersDictionary[key] = mockResponse.Response.Headers[key];
-                    }
+                    mockResponse.Response.ResponseHeaders.SelectMany(dict => dict.Select(kv => headersDictionary[kv.Key] = kv.Value));
                 }
                 // default the content type to application/json unless set in the mock response
                 if (!headersDictionary.Any(h => h.Key.Equals("content-type", StringComparison.OrdinalIgnoreCase)))
@@ -127,7 +124,7 @@ protected override async Task OnRequest(object? sender, ProxyRequestArgs e)
                 {
                     Id = request.Id,
                     Status = (int)statusCode,
-                    Headers = headersDictionary,
+                    Headers = new List<Dictionary<string, string>> { headersDictionary },
                     Body = body
                 };
 

dev-proxy-plugins/MockResponses/MockResponse.cs

@@ -30,5 +30,5 @@ public class MockResponseResponse
     [JsonPropertyName("body")]
     public dynamic? Body { get; set; }
     [JsonPropertyName("headers")]
-    public IDictionary<string, string>? Headers { get; set; }
+    public List<IDictionary<string, string>>? ResponseHeaders { get; set; }
 }

dev-proxy-plugins/MockResponses/MockResponsePlugin.cs

@@ -215,20 +215,14 @@ private void ProcessMockResponse(ProxyRequestArgs e, MockResponse matchingRespon
             statusCode = (HttpStatusCode)matchingResponse.Response.StatusCode;
         }
 
-        if (matchingResponse.Response?.Headers is not null)
+        if (matchingResponse.Response?.ResponseHeaders is not null)
         {
-            foreach (var key in matchingResponse.Response.Headers.Keys)
+            foreach (var key in matchingResponse.Response.ResponseHeaders.SelectMany(dict => dict.Select(kv => new HttpHeader(kv.Key, kv.Value))))
             {
-                // remove duplicate headers
-                var existingHeader = headers.FirstOrDefault(h => h.Name.Equals(key, StringComparison.OrdinalIgnoreCase));
-                if (existingHeader is not null)
-                {
-                    headers.Remove(existingHeader);
-                }
-
-                headers.Add(new HttpHeader(key, matchingResponse.Response.Headers[key]));
+                headers.Add(key);
             }
         }
+
         // default the content type to application/json unless set in the mock response
         if (!headers.Any(h => h.Name.Equals("content-type", StringComparison.OrdinalIgnoreCase)))
         {

dev-proxy-plugins/RandomErrors/GraphRandomErrorPlugin.cs

@@ -147,9 +147,9 @@ private void FailBatch(ProxyRequestArgs e)
                     var retryAfterDate = DateTime.Now.AddSeconds(retryAfterInSeconds);
                     var requestUrl = ProxyUtils.GetAbsoluteRequestUrlFromBatch(e.Session.HttpClient.Request.RequestUri, request.Url);
                     e.ThrottledRequests.Add(new ThrottlerInfo(GraphUtils.BuildThrottleKey(requestUrl), ShouldThrottle, retryAfterDate));
-                    response.Headers = new Dictionary<string, string>{
+                    response.Headers = new List<Dictionary<string, string>>{new Dictionary<string, string>{
                         { "Retry-After", retryAfterInSeconds.ToString() }
-                    };
+                    }};
                 }
 
                 responses.Add(response);

dev-proxy-plugins/RequestLogs/MockGeneratorPlugin.cs

@@ -61,9 +61,9 @@ request.Context is null ||
                 Response = new()
                 {
                     StatusCode = response.StatusCode,
-                    Headers = response.Headers
+                    ResponseHeaders = new List<IDictionary<string, string>> {response.Headers
                         .Select(h => new KeyValuePair<string, string>(h.Name, h.Value))
-                        .ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
+                        .ToDictionary(kvp => kvp.Key, kvp => kvp.Value) },
                     Body = GetResponseBody(request.Context.Session).Result
                 }
             };