diff --git a/src/Vulder.Admin.Api/Program.cs b/src/Vulder.Admin.Api/Program.cs index 412e9d9..3b1165c 100644 --- a/src/Vulder.Admin.Api/Program.cs +++ b/src/Vulder.Admin.Api/Program.cs @@ -1,9 +1,10 @@ using Autofac; using Autofac.Extensions.DependencyInjection; +using NLog.Web; using Vulder.Admin.Application; using Vulder.Admin.Infrastructure; -using Vulder.Admin.Infrastructure.Middlewares; using Vulder.SharedKernel; +using Vulder.SharedKernel.Middlewares; AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true); @@ -21,6 +22,7 @@ containerBuild.RegisterModule(new ApplicationModule(builder.Configuration)); containerBuild.RegisterModule(new InfrastructureModule(builder.Configuration["PostgresConnectionString"])); })); +builder.Host.UseNLog(); var app = builder.Build(); @@ -31,6 +33,7 @@ } app.UseMiddleware(); +app.UseMiddleware(); app.UseHttpsRedirection(); diff --git a/src/Vulder.Admin.Api/Vulder.Admin.Api.csproj b/src/Vulder.Admin.Api/Vulder.Admin.Api.csproj old mode 100644 new mode 100755 index eb1e78f..d232c55 --- a/src/Vulder.Admin.Api/Vulder.Admin.Api.csproj +++ b/src/Vulder.Admin.Api/Vulder.Admin.Api.csproj @@ -7,18 +7,20 @@ - - - - - - + + + + + + + + - - - + + + diff --git a/src/Vulder.Admin.Api/nlog.config b/src/Vulder.Admin.Api/nlog.config new file mode 100755 index 0000000..acd427f --- /dev/null +++ b/src/Vulder.Admin.Api/nlog.config @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Vulder.Admin.Application/Vulder.Admin.Application.csproj b/src/Vulder.Admin.Application/Vulder.Admin.Application.csproj old mode 100644 new mode 100755 index b0742ad..776000d --- a/src/Vulder.Admin.Application/Vulder.Admin.Application.csproj +++ b/src/Vulder.Admin.Application/Vulder.Admin.Application.csproj @@ -7,14 +7,14 @@ - - - + + + - - + + diff --git a/src/Vulder.Admin.Core/Vulder.Admin.Core.csproj b/src/Vulder.Admin.Core/Vulder.Admin.Core.csproj old mode 100644 new mode 100755 index 840876c..d21885c --- a/src/Vulder.Admin.Core/Vulder.Admin.Core.csproj +++ b/src/Vulder.Admin.Core/Vulder.Admin.Core.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/src/Vulder.Admin.Infrastructure/Middlewares/GlobalExceptionHandlerMiddleware.cs b/src/Vulder.Admin.Infrastructure/Middlewares/GlobalExceptionHandlerMiddleware.cs deleted file mode 100644 index d6a8cef..0000000 --- a/src/Vulder.Admin.Infrastructure/Middlewares/GlobalExceptionHandlerMiddleware.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Net; -using Microsoft.AspNetCore.Http; -using Newtonsoft.Json; -using Vulder.Admin.Core.Exceptions; -using Vulder.Admin.Core.Models; - -namespace Vulder.Admin.Infrastructure.Middlewares; - -public class GlobalExceptionHandlerMiddleware -{ - private readonly RequestDelegate _next; - - public GlobalExceptionHandlerMiddleware(RequestDelegate next) - { - _next = next; - } - - public async Task Invoke(HttpContext context) - { - try - { - await _next.Invoke(context); - } - catch (Exception e) - { - var response = context.Response; - response.ContentType = "application/json"; - response.StatusCode = GetStatusCode(e); - - var responseBody = new ExceptionModel - { - StatusCode = response.StatusCode, - ErrorMessage = e.Message - }; - - await response.WriteAsync(JsonConvert.SerializeObject(responseBody)); - } - } - - private static int GetStatusCode(Exception exception) - { - return exception switch - { - AuthException => (int)HttpStatusCode.Unauthorized, - _ => (int)HttpStatusCode.InternalServerError - }; - } -} \ No newline at end of file diff --git a/src/Vulder.Admin.Infrastructure/Vulder.Admin.Infrastructure.csproj b/src/Vulder.Admin.Infrastructure/Vulder.Admin.Infrastructure.csproj old mode 100644 new mode 100755 index 315530d..af458c0 --- a/src/Vulder.Admin.Infrastructure/Vulder.Admin.Infrastructure.csproj +++ b/src/Vulder.Admin.Infrastructure/Vulder.Admin.Infrastructure.csproj @@ -7,22 +7,22 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + - +