From 8ff27ff1be36c89692276d06ec61fd4939d13da7 Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Fri, 2 Apr 2021 18:46:00 +0300 Subject: [PATCH] added ControllerNameAttributeConvention --- .../ControllerNameAttributeConvention.cs | 2 -- common/ASC.Api.Core/Core/BaseStartup.cs | 18 +++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/ASC.Api.Core/Convention/ControllerNameAttributeConvention.cs b/common/ASC.Api.Core/Convention/ControllerNameAttributeConvention.cs index af35112c35..65af908c8b 100644 --- a/common/ASC.Api.Core/Convention/ControllerNameAttributeConvention.cs +++ b/common/ASC.Api.Core/Convention/ControllerNameAttributeConvention.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.ApplicationModels; diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs index 1146255bfa..7e257b224c 100644 --- a/common/ASC.Api.Core/Core/BaseStartup.cs +++ b/common/ASC.Api.Core/Core/BaseStartup.cs @@ -1,6 +1,7 @@ using System.Text.Json.Serialization; using ASC.Api.Core.Auth; +using ASC.Api.Core.Convention; using ASC.Api.Core.Core; using ASC.Api.Core.Middleware; using ASC.Common; @@ -81,13 +82,16 @@ namespace ASC.Api.Core DIHelper.RegisterProducts(Configuration, HostEnvironment.ContentRootPath); var builder = services.AddMvcCore(config => - { - var policy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build(); - config.Filters.Add(new AuthorizeFilter(policy)); - config.Filters.Add(new TypeFilterAttribute(typeof(TenantStatusFilter))); - config.Filters.Add(new TypeFilterAttribute(typeof(PaymentFilter))); - config.Filters.Add(new TypeFilterAttribute(typeof(IpSecurityFilter))); - config.Filters.Add(new TypeFilterAttribute(typeof(ProductSecurityFilter))); + { + config.Conventions.Add(new ControllerNameAttributeConvention()); + + var policy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build(); + + config.Filters.Add(new AuthorizeFilter(policy)); + config.Filters.Add(new TypeFilterAttribute(typeof(TenantStatusFilter))); + config.Filters.Add(new TypeFilterAttribute(typeof(PaymentFilter))); + config.Filters.Add(new TypeFilterAttribute(typeof(IpSecurityFilter))); + config.Filters.Add(new TypeFilterAttribute(typeof(ProductSecurityFilter))); config.Filters.Add(new CustomResponseFilterAttribute()); config.Filters.Add(new CustomExceptionFilterAttribute()); config.Filters.Add(new TypeFilterAttribute(typeof(FormatFilter)));