diff --git a/common/services/ASC.ApiSystem/ASC.ApiSystem.csproj b/common/services/ASC.ApiSystem/ASC.ApiSystem.csproj index 56e6587970..ca1ef0c086 100644 --- a/common/services/ASC.ApiSystem/ASC.ApiSystem.csproj +++ b/common/services/ASC.ApiSystem/ASC.ApiSystem.csproj @@ -21,6 +21,7 @@ + diff --git a/common/services/ASC.ApiSystem/Startup.cs b/common/services/ASC.ApiSystem/Startup.cs index 370290086f..023e263dfd 100644 --- a/common/services/ASC.ApiSystem/Startup.cs +++ b/common/services/ASC.ApiSystem/Startup.cs @@ -24,6 +24,7 @@ */ +using ASC.Api.Core; using ASC.ApiSystem.Classes; using ASC.ApiSystem.Controllers; using ASC.Common; @@ -35,7 +36,6 @@ using Autofac; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -44,20 +44,20 @@ using Microsoft.Extensions.Hosting; namespace ASC.ApiSystem { - public class Startup + public class Startup : BaseWorkerStartup { - public IConfiguration Configuration { get; } public IHostEnvironment HostEnvironment { get; } - public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment) + public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment) : base(configuration) { - Configuration = configuration; HostEnvironment = hostEnvironment; } // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) + public override void ConfigureServices(IServiceCollection services) { + base.ConfigureServices(services); + var diHelper = new DIHelper(services); services.AddHttpContextAccessor(); @@ -87,12 +87,9 @@ namespace ASC.ApiSystem } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } + public override void Configure(IApplicationBuilder app) + { + base.Configure(app); app.UseForwardedHeaders(new ForwardedHeadersOptions {