Skip to content

Commit 550db0c

Browse files
Use RFC 1123 for HTTP headers and ISO 8601 for InnerError.Date
Co-authored-by: waldekmastykarz <[email protected]>
1 parent 40793bb commit 550db0c

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

DevProxy.Plugins/Behavior/GraphRandomErrorPlugin.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,11 @@ private void UpdateProxyResponse(ProxyRequestArgs e, HttpStatusCode errorStatus)
289289
{
290290
var session = e.Session;
291291
var requestId = Guid.NewGuid().ToString();
292-
var requestDate = DateTime.Now.ToString("r", CultureInfo.InvariantCulture);
292+
var now = DateTime.Now;
293+
var requestDateHeader = now.ToString("r", CultureInfo.InvariantCulture);
294+
var requestDateInnerError = now.ToString("o", CultureInfo.InvariantCulture);
293295
var request = session.HttpClient.Request;
294-
var headers = ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDate);
296+
var headers = ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDateHeader);
295297
if (errorStatus == HttpStatusCode.TooManyRequests)
296298
{
297299
var retryAfterDate = DateTime.Now.AddSeconds(Configuration.RetryAfterInSeconds);
@@ -314,7 +316,7 @@ private void UpdateProxyResponse(ProxyRequestArgs e, HttpStatusCode errorStatus)
314316
InnerError = new()
315317
{
316318
RequestId = requestId,
317-
Date = requestDate
319+
Date = requestDateInnerError
318320
}
319321
}),
320322
ProxyUtils.JsonSerializerOptions

DevProxy.Plugins/Behavior/RateLimitingPlugin.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,10 @@ private void UpdateProxyResponse(ProxyHttpEventArgsBase e, HttpStatusCode errorS
246246
if (ProxyUtils.IsGraphRequest(request))
247247
{
248248
var requestId = Guid.NewGuid().ToString();
249-
var requestDate = DateTime.Now.ToString("r", CultureInfo.InvariantCulture);
250-
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDate));
249+
var now = DateTime.Now;
250+
var requestDateHeader = now.ToString("r", CultureInfo.InvariantCulture);
251+
var requestDateInnerError = now.ToString("o", CultureInfo.InvariantCulture);
252+
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDateHeader));
251253

252254
body = JsonSerializer.Serialize(new GraphErrorResponseBody(
253255
new()
@@ -257,7 +259,7 @@ private void UpdateProxyResponse(ProxyHttpEventArgsBase e, HttpStatusCode errorS
257259
InnerError = new()
258260
{
259261
RequestId = requestId,
260-
Date = requestDate
262+
Date = requestDateInnerError
261263
}
262264
}),
263265
ProxyUtils.JsonSerializerOptions

DevProxy.Plugins/Behavior/RetryAfterPlugin.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,10 @@ private static void UpdateProxyResponse(ProxyRequestArgs e, ThrottlingInfo throt
108108
if (ProxyUtils.IsGraphRequest(request))
109109
{
110110
var requestId = Guid.NewGuid().ToString();
111-
var requestDate = DateTime.Now.ToString("r", CultureInfo.InvariantCulture);
112-
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDate));
111+
var now = DateTime.Now;
112+
var requestDateHeader = now.ToString("r", CultureInfo.InvariantCulture);
113+
var requestDateInnerError = now.ToString("o", CultureInfo.InvariantCulture);
114+
headers.AddRange(ProxyUtils.BuildGraphResponseHeaders(request, requestId, requestDateHeader));
113115

114116
body = JsonSerializer.Serialize(new GraphErrorResponseBody(
115117
new()
@@ -119,7 +121,7 @@ private static void UpdateProxyResponse(ProxyRequestArgs e, ThrottlingInfo throt
119121
InnerError = new()
120122
{
121123
RequestId = requestId,
122-
Date = requestDate
124+
Date = requestDateInnerError
123125
}
124126
}),
125127
ProxyUtils.JsonSerializerOptions

0 commit comments

Comments
 (0)