Skip to content
Open
10 changes: 6 additions & 4 deletions DevProxy.Plugins/Behavior/GraphRandomErrorPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,11 @@ private void UpdateProxyResponse(ProxyRequestArgs e, HttpStatusCode errorStatus)
{
var session = e.Session;
var requestId = Guid.NewGuid().ToString();
var requestDate = DateTime.Now.ToString(CultureInfo.CurrentCulture);
var now = DateTime.Now;
var requestDateHeader = now.ToString("r", CultureInfo.InvariantCulture);
var requestDateInnerError = now.ToString("s", CultureInfo.InvariantCulture);
var request = session.HttpClient.Request;
var headers = ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDate);
var headers = ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDateHeader);
if (errorStatus == HttpStatusCode.TooManyRequests)
{
var retryAfterDate = DateTime.Now.AddSeconds(Configuration.RetryAfterInSeconds);
Expand All @@ -314,7 +316,7 @@ private void UpdateProxyResponse(ProxyRequestArgs e, HttpStatusCode errorStatus)
InnerError = new()
{
RequestId = requestId,
Date = requestDate
Date = requestDateInnerError
}
}),
ProxyUtils.JsonSerializerOptions
Expand All @@ -330,7 +332,7 @@ private void UpdateProxyBatchResponse(ProxyRequestArgs ev, GraphBatchResponsePay

var session = ev.Session;
var requestId = Guid.NewGuid().ToString();
var requestDate = DateTime.Now.ToString(CultureInfo.CurrentCulture);
var requestDate = DateTime.Now.ToString("r", CultureInfo.InvariantCulture);
var request = session.HttpClient.Request;
var headers = ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDate);

Expand Down
8 changes: 5 additions & 3 deletions DevProxy.Plugins/Behavior/RateLimitingPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,10 @@ private void UpdateProxyResponse(ProxyHttpEventArgsBase e, HttpStatusCode errorS
if (ProxyUtils.IsGraphRequest(request))
{
var requestId = Guid.NewGuid().ToString();
var requestDate = DateTime.Now.ToString(CultureInfo.CurrentCulture);
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDate));
var now = DateTime.Now;
var requestDateHeader = now.ToString("r", CultureInfo.InvariantCulture);
var requestDateInnerError = now.ToString("s", CultureInfo.InvariantCulture);
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDateHeader));

body = JsonSerializer.Serialize(new GraphErrorResponseBody(
new()
Expand All @@ -257,7 +259,7 @@ private void UpdateProxyResponse(ProxyHttpEventArgsBase e, HttpStatusCode errorS
InnerError = new()
{
RequestId = requestId,
Date = requestDate
Date = requestDateInnerError
}
}),
ProxyUtils.JsonSerializerOptions
Expand Down
8 changes: 5 additions & 3 deletions DevProxy.Plugins/Behavior/RetryAfterPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ private static void UpdateProxyResponse(ProxyRequestArgs e, ThrottlingInfo throt
if (ProxyUtils.IsGraphRequest(request))
{
var requestId = Guid.NewGuid().ToString();
var requestDate = DateTime.Now.ToString(CultureInfo.CurrentCulture);
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDate));
var now = DateTime.Now;
var requestDateHeader = now.ToString("r", CultureInfo.InvariantCulture);
var requestDateInnerError = now.ToString("s", CultureInfo.InvariantCulture);
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDateHeader));

body = JsonSerializer.Serialize(new GraphErrorResponseBody(
new()
Expand All @@ -119,7 +121,7 @@ private static void UpdateProxyResponse(ProxyRequestArgs e, ThrottlingInfo throt
InnerError = new()
{
RequestId = requestId,
Date = requestDate
Date = requestDateInnerError
}
}),
ProxyUtils.JsonSerializerOptions
Expand Down
4 changes: 2 additions & 2 deletions DevProxy.Plugins/Mocking/GraphMockResponsePlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public override async Task BeforeRequestAsync(ProxyRequestArgs e, CancellationTo
{
GraphBatchResponsePayloadResponse? response = null;
var requestId = Guid.NewGuid().ToString();
var requestDate = DateTime.Now.ToString(CultureInfo.CurrentCulture);
var requestDate = DateTime.Now.ToString("r", CultureInfo.InvariantCulture);
var headers = ProxyUtils
.BuildGraphResponseHeaders(e.Session.HttpClient.Request, requestId, requestDate);

Expand Down Expand Up @@ -155,7 +155,7 @@ public override async Task BeforeRequestAsync(ProxyRequestArgs e, CancellationTo
}

var batchRequestId = Guid.NewGuid().ToString();
var batchRequestDate = DateTime.Now.ToString(CultureInfo.CurrentCulture);
var batchRequestDate = DateTime.Now.ToString("r", CultureInfo.InvariantCulture);
var batchHeaders = ProxyUtils.BuildGraphResponseHeaders(e.Session.HttpClient.Request, batchRequestId, batchRequestDate);
var batchResponse = new GraphBatchResponsePayload
{
Expand Down
2 changes: 1 addition & 1 deletion DevProxy.Plugins/Mocking/MockResponsePlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ private void ProcessMockResponseInternal(ProxyRequestArgs e, MockResponse matchi
{
string? body = null;
var requestId = Guid.NewGuid().ToString();
var requestDate = DateTime.Now.ToString(CultureInfo.CurrentCulture);
var requestDate = DateTime.Now.ToString("r", CultureInfo.InvariantCulture);
var headers = ProxyUtils.BuildGraphResponseHeaders(e.Session.HttpClient.Request, requestId, requestDate);
var statusCode = HttpStatusCode.OK;
if (matchingResponse.Response?.StatusCode is not null)
Expand Down
Loading