DI: filters and handlers

common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs

@@ -10,6 +10,7 @@ using ASC.Core;
 using ASC.Security.Cryptography;
 using ASC.Web.Studio.Core;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -105,4 +106,19 @@ namespace ASC.Api.Core.Auth
             return Task.FromResult(result);
         }
     }
+
+    public static class ConfirmAuthHandlerExtension
+    {
+        public static IServiceCollection AddConfirmAuthHandler(this IServiceCollection services)
+        {
+            return services
+                .AddSecurityContextService()
+                .AddEmailValidationKeyProviderService()
+                .AddSetupInfo()
+                .AddTenantManagerService()
+                .AddUserManagerService()
+                .AddAuthManager()
+                .AddAuthContextService();
+        }
+    }
 }

common/ASC.Api.Core/Auth/CookieAuthHandler.cs

@@ -4,6 +4,7 @@ using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using ASC.Core;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -35,4 +36,12 @@ namespace ASC.Api.Core.Auth
                      );
         }
     }
+
+    public static class CookieAuthHandlerExtension
+    {
+        public static IServiceCollection AddCookieAuthHandler(this IServiceCollection services)
+        {
+            return services.AddSecurityContextService();
+        }
+    }
 }

common/ASC.Api.Core/Middleware/CultureMiddleware.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using ASC.Core;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Api.Core.Middleware
 {
@@ -48,5 +49,13 @@ namespace ASC.Api.Core.Middleware
         {
             return builder.UseMiddleware<CultureMiddleware>();
         }
+
+        public static IServiceCollection AddCultureMiddleware(this IServiceCollection services)
+        {
+            return services
+                .AddUserManagerService()
+                .AddTenantManagerService()
+                .AddAuthContextService();
+        }
     }
 }

common/ASC.Api.Core/Middleware/IpSecurityFilter.cs

@@ -4,6 +4,7 @@ using ASC.Core;
 using ASC.IPSecurity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
@@ -40,4 +41,15 @@ namespace ASC.Api.Core.Middleware
             }
         }
     }
+
+    public static class IpSecurityFilterExtension
+    {
+        public static IServiceCollection AddIpSecurityFilter(this IServiceCollection services)
+        {
+            return services
+                .AddIPRestrictionsSettingsService()
+                .AddAuthContextService()
+                .AddIPSecurityService();
+        }
+    }
 }

common/ASC.Api.Core/Middleware/PaymentFilter.cs

@@ -7,6 +7,7 @@ using ASC.Web.Studio.Utility;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
@@ -46,4 +47,13 @@ namespace ASC.Api.Core.Middleware
             }
         }
     }
+
+    public static class PaymentFilterExtension
+    {
+        public static IServiceCollection AddPaymentFilter(this IServiceCollection services)
+        {
+            return services
+                .AddTenantExtraService();
+        }
+    }
 }

common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs

@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
@@ -119,4 +120,16 @@ namespace ASC.Api.Core.Middleware
             return default;
         }
     }
+
+    public static class ProductSecurityFilterExtension
+    {
+        public static IServiceCollection AddProductSecurityFilter(this IServiceCollection services)
+        {
+            return services
+                .AddUserManagerService()
+                .AddTenantManagerService()
+                .AddWebItemSecurity()
+                .AddAuthContextService();
+        }
+    }
 }

common/ASC.Api.Core/Middleware/TenantStatusFilter.cs

@@ -4,6 +4,7 @@ using ASC.Core;
 using ASC.Core.Tenants;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
@@ -42,4 +43,13 @@ namespace ASC.Api.Core.Middleware
             }
         }
     }
+
+    public static class TenantStatusFilterExtension
+    {
+        public static IServiceCollection AddTenantStatusFilter(this IServiceCollection services)
+        {
+            return services
+                .AddTenantManagerService();
+        }
+    }
 }

common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs

@@ -88,7 +88,7 @@ namespace ASC.Core.Security.Authorizing
     {
         public static IServiceCollection AddRoleProviderService(this IServiceCollection services)
         {
-            services.TryAddSingleton(typeof(IRoleProvider), typeof(RoleProvider));
+            services.TryAddScoped(typeof(IRoleProvider), typeof(RoleProvider));
             return services;
         }
     }

products/ASC.People/Server/Startup.cs

@@ -72,6 +72,15 @@ namespace ASC.People
 
             var container = services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
 
+            services
+                .AddConfirmAuthHandler()
+                .AddCookieAuthHandler()
+                .AddCultureMiddleware()
+                .AddIpSecurityFilter()
+                .AddPaymentFilter()
+                .AddProductSecurityFilter()
+                .AddTenantStatusFilter();
+
             services.Configure<LogNLog>(r => r.Name = "ASC");
             services.Configure<LogNLog>("ASC", r => r.Name = "ASC");
             services.Configure<LogNLog>("ASC.Api", r => r.Name = "ASC.Api");

web/ASC.Web.Api/Startup.cs

@@ -71,6 +71,15 @@ namespace ASC.Web.Api
 
             var container = services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
 
+            services
+                .AddConfirmAuthHandler()
+                .AddCookieAuthHandler()
+                .AddCultureMiddleware()
+                .AddIpSecurityFilter()
+                .AddPaymentFilter()
+                .AddProductSecurityFilter()
+                .AddTenantStatusFilter();
+
             services.Configure<LogNLog>(r => r.Name = "ASC");
             services.Configure<LogNLog>("ASC", r => r.Name = "ASC");
             services.Configure<LogNLog>("ASC.Api", r => r.Name = "ASC.Api");

web/ASC.Web.Studio/Startup.cs

@@ -54,6 +54,7 @@ namespace ASC.Web.Studio
             services.Configure<DbManager>("default", r => { });
 
             services
+                .AddCookieAuthHandler()
                 .AddStorage()
                 .AddPathUtilsService()
                 .AddStorageHandlerService();