Convert to new namespace stuff and implicit usings

This commit is contained in:
AeonLucid
2022-01-07 06:07:05 +01:00
parent ce2ea7f295
commit 2f01cf7411
85 changed files with 2538 additions and 2696 deletions
@@ -1,64 +1,59 @@
using System.IO;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using System.Text;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace Prospect.Server.Api.Middleware
namespace Prospect.Server.Api.Middleware;
public class RequestLoggerMiddleware
{
public class RequestLoggerMiddleware
private readonly ILogger<RequestLoggerMiddleware> _logger;
private readonly RequestDelegate _next;
public RequestLoggerMiddleware(ILogger<RequestLoggerMiddleware> logger, RequestDelegate next)
{
private readonly ILogger<RequestLoggerMiddleware> _logger;
private readonly RequestDelegate _next;
_logger = logger;
_next = next;
}
public RequestLoggerMiddleware(ILogger<RequestLoggerMiddleware> logger, RequestDelegate next)
public async Task Invoke(HttpContext context)
{
var body = await RequestAsync(context.Request);
if (context.Request.Method == "POST")
{
_logger = logger;
_next = next;
}
public async Task Invoke(HttpContext context)
{
var body = await RequestAsync(context.Request);
if (context.Request.Method == "POST")
var requestId = "NULL";
if (context.Request.Headers.TryGetValue("X-RequestID", out var requestIdValues))
{
var requestId = "NULL";
if (context.Request.Headers.TryGetValue("X-RequestID", out var requestIdValues))
{
requestId = requestIdValues.ToString();
}
_logger.LogDebug("URL {Url} RequestId {RequestId} Body {Body}", context.Request.GetDisplayUrl(), requestId, body);
requestId = requestIdValues.ToString();
}
_logger.LogDebug("URL {Url} RequestId {RequestId} Body {Body}", context.Request.GetDisplayUrl(), requestId, body);
}
await _next(context);
}
await _next(context);
}
private static async Task<string> RequestAsync(HttpRequest request)
private static async Task<string> RequestAsync(HttpRequest request)
{
request.EnableBuffering();
try
{
request.EnableBuffering();
try
using (var reader = new StreamReader(request.Body, Encoding.UTF8, false, 4096, true))
{
using (var reader = new StreamReader(request.Body, Encoding.UTF8, false, 4096, true))
var body = await reader.ReadToEndAsync();
if (body.StartsWith("{"))
{
var body = await reader.ReadToEndAsync();
if (body.StartsWith("{"))
{
return JsonConvert.SerializeObject(JsonConvert.DeserializeObject(body), Formatting.Indented);
}
return body;
return JsonConvert.SerializeObject(JsonConvert.DeserializeObject(body), Formatting.Indented);
}
return body;
}
finally
{
request.Body.Position = 0;
}
}
finally
{
request.Body.Position = 0;
}
}
}