From a4eb45f1ab0aa7b4baf10d4e5b1cdcc5b8218a23 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Sun, 18 Oct 2020 19:03:14 +0300
Subject: [PATCH 01/22] Scope: refactoring

---
 .../ASC.Api.Core/Auth/ConfirmAuthHandler.cs   |   1 +
 common/ASC.Common/ASC.Common.csproj           |   1 +
 common/ASC.Common/DIHelper.cs                 | 185 ++++++++++++++++++
 .../Caching/CachedTenantService.cs            |   4 +-
 .../Caching/CachedUserService.cs              |  10 +-
 .../Context/Impl/UserManager.cs               |  10 +-
 .../Context/SecurityContext.cs                |   2 +
 common/ASC.Core.Common/Core/IUserService.cs   |   6 +-
 common/ASC.Core.Common/Data/DbUserService.cs  |   6 +-
 .../EF/Context/DbContextManager.cs            |   3 +-
 common/ASC.Core.Common/EF/JsonExtensions.cs   |   9 +-
 .../Security/Authorizing/AzManager.cs         |   3 +-
 .../Authorizing/IPermissionResolver.cs        |   4 +-
 .../Authorizing/PermissionResolver.cs         |   3 +-
 .../Security/EmailValidationKeyProvider.cs    |   1 +
 .../Tests/HostedSolutionTest.cs               |   2 +
 common/ASC.Data.Reassigns/QueueWorker.cs      |   1 +
 common/ASC.Data.Storage/Extensions.cs         |   2 +
 common/ASC.FederatedLogin/AccountLinker.cs    |   1 +
 common/ASC.Notify.Textile/JabberStyler.cs     |   2 +
 common/ASC.Notify.Textile/PushStyler.cs       |   5 +
 .../Controllers/SettingsController.cs         |   1 +
 .../ASC.ApiSystem/Models/CoreSettingsModel.cs |   1 +
 .../ASC.ElasticSearch/Engine/BaseIndexer.cs   |   1 +
 products/ASC.Files/Server/Startup.cs          |   4 +
 .../Controllers/ModulesController.cs          |   1 +
 .../Controllers/SmtpSettingsController.cs     |   8 +-
 .../Core/FirstTimeTenantSettings.cs           |   1 +
 web/ASC.Web.Core/QuotaSync.cs                 |   1 +
 web/ASC.Web.Core/Sms/SmsManager.cs            |   3 +
 web/ASC.Web.Studio/Startup.cs                 |   2 +
 31 files changed, 265 insertions(+), 19 deletions(-)

diff --git a/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs b/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
index ea2a35017d..c3c8b35312 100644
--- a/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
+++ b/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using ASC.Common;
 using ASC.Core;
 using ASC.Security.Cryptography;
+using ASC.Web.Studio.Core;
 
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/common/ASC.Common/ASC.Common.csproj b/common/ASC.Common/ASC.Common.csproj
index b6b657bd36..6c7708ffc0 100644
--- a/common/ASC.Common/ASC.Common.csproj
+++ b/common/ASC.Common/ASC.Common.csproj
@@ -49,6 +49,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.9" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.1.1" />
 <!-- <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 51492c5587..5250b8f1a7 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -1,14 +1,75 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 
 using ASC.Common.Threading.Progress;
 using ASC.Common.Threading.Workers;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 
 namespace ASC.Common
 {
+    public class ScopeAttribute : DIAttribute
+    {
+
+
+        public ScopeAttribute()
+        {
+
+        }
+
+        public ScopeAttribute(Type type) : base(type)
+        {
+        }
+
+        public ScopeAttribute(Type type, Type cachedType) : base(type, cachedType)
+        {
+
+        }
+    }
+
+    public class SingletoneAttribute : DIAttribute
+    {
+        public SingletoneAttribute()
+        {
+
+        }
+
+        public SingletoneAttribute(Type type) : base(type)
+        {
+        }
+
+        public SingletoneAttribute(Type type, Type cachedType) : base(type, cachedType)
+        {
+
+        }
+    }
+
+    public class DIAttribute : Attribute
+    {
+        public Type CachedType { get; }
+        public Type Type { get; }
+
+        public DIAttribute()
+        {
+
+        }
+
+        public DIAttribute(Type type)
+        {
+            Type = type;
+        }
+
+        public DIAttribute(Type type, Type cachedType)
+        {
+            CachedType = cachedType;
+            Type = type;
+        }
+    }
+
     public class DIHelper
     {
         public List<string> Singleton { get; set; }
@@ -38,6 +99,130 @@ namespace ASC.Common
             return false;
         }
 
+        public bool TryAdd<TService>() where TService : class
+        {
+            return TryAdd(typeof(TService));
+        }
+
+        public bool TryAdd(Type service, Type implementation = null)
+        {
+            var di = service.GetCustomAttribute<DIAttribute>();
+            var isnew = false;
+
+            if (di != null)
+            {
+                if (service.IsInterface && implementation == null)
+                {
+                    var a = di.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                    if (a != null)
+                    {
+                        var b = a.GetGenericArguments();
+
+                        foreach (var g in b)
+                        {
+                            TryAdd(g);
+                        }
+
+                        TryAdd(a, di.Type);
+                    }
+                    else
+                    {
+                        Register(service, di.Type);
+                    }
+
+                    if (di.CachedType != null)
+                    {
+                        a = di.CachedType.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                        if (a != null)
+                        {
+                            var b = a.GetGenericArguments();
+
+                            foreach (var g in b)
+                            {
+                                TryAdd(service, g);
+                            }
+
+                            TryAdd(a, di.CachedType);
+                        }
+                    }
+
+                }
+                else
+                {
+                    isnew = implementation != null ? Register(service, implementation) : Register(service);
+                }
+            }
+
+            if (isnew)
+            {
+                var props = service.GetConstructors();
+
+                foreach (var p in props)
+                {
+                    var par = p.GetParameters();
+
+                    foreach (var p1 in par)
+                    {
+                        TryAdd(p1.ParameterType);
+                    }
+                }
+            }
+
+            return isnew;
+        }
+
+        private bool Register(Type service)
+        {
+            var c = service.GetCustomAttribute<DIAttribute>();
+            var serviceName = $"{service}";
+            if (c is ScopeAttribute)
+            {
+                if (!Scoped.Contains(serviceName))
+                {
+                    Scoped.Add(serviceName);
+                    ServiceCollection.TryAddScoped(service);
+                    return true;
+                }
+            }
+            else if (c is SingletoneAttribute)
+            {
+                if (!Singleton.Contains(serviceName))
+                {
+                    Singleton.Add(serviceName);
+                    ServiceCollection.TryAddSingleton(service);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool Register(Type service, Type implementation)
+        {
+            var c = service.GetCustomAttribute<DIAttribute>();
+            var serviceName = $"{service}{implementation}";
+            if (c is ScopeAttribute)
+            {
+                if (!Scoped.Contains(serviceName))
+                {
+                    Scoped.Add(serviceName);
+                    ServiceCollection.TryAddScoped(service, implementation);
+                    return true;
+                }
+            }
+            else if (c is SingletoneAttribute)
+            {
+                if (!Singleton.Contains(serviceName))
+                {
+                    Singleton.Add(serviceName);
+                    ServiceCollection.TryAddSingleton(service, implementation);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public bool TryAddScoped<TService, TImplementation>() where TService : class where TImplementation : class, TService
         {
             var serviceName = $"{typeof(TService)}{typeof(TImplementation)}";
diff --git a/common/ASC.Core.Common/Caching/CachedTenantService.cs b/common/ASC.Core.Common/Caching/CachedTenantService.cs
index 7eec4423f3..9749303331 100644
--- a/common/ASC.Core.Common/Caching/CachedTenantService.cs
+++ b/common/ASC.Core.Common/Caching/CachedTenantService.cs
@@ -309,9 +309,9 @@ namespace ASC.Core.Caching
         {
             if (services.TryAddScoped<DbTenantService>())
             {
-                services.TryAddScoped<ITenantService, CachedTenantService>();
-
                 services.TryAddScoped<IConfigureOptions<DbTenantService>, ConfigureDbTenantService>();
+
+                services.TryAddScoped<ITenantService, CachedTenantService>();
                 services.TryAddScoped<IConfigureOptions<CachedTenantService>, ConfigureCachedTenantService>();
 
                 services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
diff --git a/common/ASC.Core.Common/Caching/CachedUserService.cs b/common/ASC.Core.Common/Caching/CachedUserService.cs
index d0779d5419..fb63f9f131 100644
--- a/common/ASC.Core.Common/Caching/CachedUserService.cs
+++ b/common/ASC.Core.Common/Caching/CachedUserService.cs
@@ -138,6 +138,7 @@ namespace ASC.Core.Caching
         }
     }
 
+    [Scope]
     class ConfigureCachedUserService : IConfigureNamedOptions<CachedUserService>
     {
         internal IOptionsSnapshot<EFUserService> Service { get; }
@@ -173,7 +174,8 @@ namespace ASC.Core.Caching
             options.TrustInterval = UserServiceCache.TrustInterval;
         }
     }
-
+
+    [Scope]
     public class CachedUserService : IUserService, ICachedService
     {
         internal IUserService Service { get; set; }
@@ -524,11 +526,11 @@ namespace ASC.Core.Caching
     {
         public static DIHelper AddUserService(this DIHelper services)
         {
-            if (services.TryAddScoped<EFUserService>())
+            if (services.TryAddScoped<EFUserService>())//
             {
-                services.TryAddScoped<IUserService, CachedUserService>();
+                services.TryAddScoped<IConfigureOptions<EFUserService>, ConfigureEFUserService>();//
 
-                services.TryAddScoped<IConfigureOptions<EFUserService>, ConfigureEFUserService>();
+                services.TryAddScoped<IUserService, CachedUserService>();
                 services.TryAddScoped<IConfigureOptions<CachedUserService>, ConfigureCachedUserService>();
 
                 services.TryAddSingleton<UserServiceCache>();
diff --git a/common/ASC.Core.Common/Context/Impl/UserManager.cs b/common/ASC.Core.Common/Context/Impl/UserManager.cs
index 24643cbf39..264b026a00 100644
--- a/common/ASC.Core.Common/Context/Impl/UserManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/UserManager.cs
@@ -39,7 +39,8 @@ using ASC.Core.Users;
 using Microsoft.AspNetCore.Http;
 
 namespace ASC.Core
-{
+{
+    [Singletone]
     public class UserManagerConstants
     {
         public IDictionary<Guid, UserInfo> SystemUsers { get; }
@@ -54,7 +55,8 @@ namespace ASC.Core
             Constants = constants;
         }
     }
-
+
+    [Scope]
     public class UserManager
     {
         private IDictionary<Guid, UserInfo> SystemUsers { get => UserManagerConstants.SystemUsers; }
@@ -656,7 +658,9 @@ namespace ASC.Core
     public static class UserManagerConfigExtension
     {
         public static DIHelper AddUserManagerService(this DIHelper services)
-        {
+        {
+            services.TryAdd(typeof(UserManager));
+
             if (services.TryAddScoped<UserManager>())
             {
                 services.TryAddSingleton<UserManagerConstants>();
diff --git a/common/ASC.Core.Common/Context/SecurityContext.cs b/common/ASC.Core.Common/Context/SecurityContext.cs
index 57c0597756..6a5291cade 100644
--- a/common/ASC.Core.Common/Context/SecurityContext.cs
+++ b/common/ASC.Core.Common/Context/SecurityContext.cs
@@ -290,6 +290,7 @@ namespace ASC.Core
         }
     }
 
+    [Scope]
     public class PermissionContext
     {
         public IPermissionResolver PermissionResolver { get; set; }
@@ -332,6 +333,7 @@ namespace ASC.Core
         }
     }
 
+    [Scope]
     public class AuthContext
     {
         private IHttpContextAccessor HttpContextAccessor { get; }
diff --git a/common/ASC.Core.Common/Core/IUserService.cs b/common/ASC.Core.Common/Core/IUserService.cs
index 46958b5a2f..d7bcdfd307 100644
--- a/common/ASC.Core.Common/Core/IUserService.cs
+++ b/common/ASC.Core.Common/Core/IUserService.cs
@@ -29,11 +29,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 
+using ASC.Common;
+using ASC.Core.Caching;
 using ASC.Core.Common.EF;
+using ASC.Core.Data;
 using ASC.Core.Users;
 
 namespace ASC.Core
-{
+{
+    [Scope(typeof(ConfigureEFUserService), typeof(ConfigureCachedUserService))]
     public interface IUserService
     {
         IDictionary<Guid, UserInfo> GetUsers(int tenant, DateTime from);
diff --git a/common/ASC.Core.Common/Data/DbUserService.cs b/common/ASC.Core.Common/Data/DbUserService.cs
index eeaefd3ff5..8093ed0fb3 100644
--- a/common/ASC.Core.Common/Data/DbUserService.cs
+++ b/common/ASC.Core.Common/Data/DbUserService.cs
@@ -30,6 +30,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Tenants;
 using ASC.Core.Users;
@@ -38,7 +39,8 @@ using ASC.Security.Cryptography;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Data
-{
+{
+    [Scope]
     public class ConfigureEFUserService : IConfigureNamedOptions<EFUserService>
     {
         private DbContextManager<UserDbContext> DbContextManager { get; }
@@ -63,7 +65,7 @@ namespace ASC.Core.Data
         }
     }
 
-
+    [Scope]
     public class EFUserService : IUserService
     {
         public Expression<Func<User, UserInfo>> FromUserToUserInfo { get; set; }
diff --git a/common/ASC.Core.Common/EF/Context/DbContextManager.cs b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
index 5ce802a159..eee57e8122 100644
--- a/common/ASC.Core.Common/EF/Context/DbContextManager.cs
+++ b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
@@ -86,8 +86,9 @@ namespace ASC.Core.Common.EF
         {
             if (services.TryAddScoped<DbContextManager<T>>())
             {
-                services.TryAddScoped<MultiRegionalDbContextManager<T>>();
                 services.TryAddScoped<IConfigureOptions<T>, ConfigureDbContext>();
+
+                services.TryAddScoped<MultiRegionalDbContextManager<T>>();
                 services.TryAddScoped<IConfigureOptions<MultiRegionalDbContext<T>>, ConfigureMultiRegionalDbContext<T>>();
                 return services.AddLoggerService();
             }
diff --git a/common/ASC.Core.Common/EF/JsonExtensions.cs b/common/ASC.Core.Common/EF/JsonExtensions.cs
index 6dd38db363..1470a2cf73 100644
--- a/common/ASC.Core.Common/EF/JsonExtensions.cs
+++ b/common/ASC.Core.Common/EF/JsonExtensions.cs
@@ -1,4 +1,11 @@
-using Microsoft.EntityFrameworkCore.Query;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+using ASC.Core.Common.EF.Model;
+
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 
 namespace ASC.Core.Common.EF
 {
diff --git a/common/ASC.Core.Common/Security/Authorizing/AzManager.cs b/common/ASC.Core.Common/Security/Authorizing/AzManager.cs
index deee2238bc..7b222a6e03 100644
--- a/common/ASC.Core.Common/Security/Authorizing/AzManager.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/AzManager.cs
@@ -30,7 +30,8 @@ using System.Collections.Generic;
 using ASC.Core.Security.Authorizing;
 
 namespace ASC.Common.Security.Authorizing
-{
+{
+    [Scope]
     public class AzManager
     {
         private readonly IPermissionProvider permissionProvider;
diff --git a/common/ASC.Core.Common/Security/Authorizing/IPermissionResolver.cs b/common/ASC.Core.Common/Security/Authorizing/IPermissionResolver.cs
index 5edc633c30..3ae0fb56a8 100644
--- a/common/ASC.Core.Common/Security/Authorizing/IPermissionResolver.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/IPermissionResolver.cs
@@ -25,9 +25,11 @@
 
 
 using ASC.Common.Security.Authorizing;
+using ASC.Core.Security.Authorizing;
 
 namespace ASC.Common.Security
-{
+{
+    [Scope(typeof(PermissionResolver))]
     public interface IPermissionResolver
     {
         bool Check(ISubject subject, params IAction[] actions);
diff --git a/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs b/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs
index 704de4da8b..68cf66d1d1 100644
--- a/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs
@@ -36,7 +36,8 @@ using ASC.Common.Security.Authorizing;
 using Constants = ASC.Core.Configuration.Constants;
 
 namespace ASC.Core.Security.Authorizing
-{
+{
+    [Scope]
     class PermissionResolver : IPermissionResolver
     {
         private readonly AzManager azManager;
diff --git a/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs b/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
index cada7de16d..a453821de9 100644
--- a/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
+++ b/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
@@ -31,6 +31,7 @@ using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Users;
+using ASC.Security.Cryptography;
 using ASC.Web.Studio.Utility;
 
 using Microsoft.AspNetCore.Http;
diff --git a/common/ASC.Core.Common/Tests/HostedSolutionTest.cs b/common/ASC.Core.Common/Tests/HostedSolutionTest.cs
index 4058dd105b..e78c7f5c4a 100644
--- a/common/ASC.Core.Common/Tests/HostedSolutionTest.cs
+++ b/common/ASC.Core.Common/Tests/HostedSolutionTest.cs
@@ -31,6 +31,8 @@ namespace ASC.Core.Common.Tests
 
     using ASC.Core.Tenants;
 
+    using Microsoft.Extensions.Configuration;
+
     using NUnit.Framework;
 
     [TestFixture]
diff --git a/common/ASC.Data.Reassigns/QueueWorker.cs b/common/ASC.Data.Reassigns/QueueWorker.cs
index 178b69ece5..aa0bf53815 100644
--- a/common/ASC.Data.Reassigns/QueueWorker.cs
+++ b/common/ASC.Data.Reassigns/QueueWorker.cs
@@ -32,6 +32,7 @@ using ASC.Common.Threading.Progress;
 using ASC.Core.Users;
 
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
 namespace ASC.Data.Reassigns
diff --git a/common/ASC.Data.Storage/Extensions.cs b/common/ASC.Data.Storage/Extensions.cs
index c40ad7cbd5..a1f626b1e5 100644
--- a/common/ASC.Data.Storage/Extensions.cs
+++ b/common/ASC.Data.Storage/Extensions.cs
@@ -28,6 +28,8 @@ using System;
 using System.IO;
 using System.Threading;
 
+using ASC.Data.Storage;
+
 namespace ASC.Data.Storage
 {
     public static class Extensions
diff --git a/common/ASC.FederatedLogin/AccountLinker.cs b/common/ASC.FederatedLogin/AccountLinker.cs
index 0151d5e762..3e1e1711f5 100644
--- a/common/ASC.FederatedLogin/AccountLinker.cs
+++ b/common/ASC.FederatedLogin/AccountLinker.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
 
 using ASC.Common;
diff --git a/common/ASC.Notify.Textile/JabberStyler.cs b/common/ASC.Notify.Textile/JabberStyler.cs
index be493b43fb..bac4bda928 100644
--- a/common/ASC.Notify.Textile/JabberStyler.cs
+++ b/common/ASC.Notify.Textile/JabberStyler.cs
@@ -36,6 +36,8 @@ using ASC.Notify.Patterns;
 using ASC.Security.Cryptography;
 using ASC.Web.Core.WhiteLabel;
 
+using Microsoft.Extensions.Configuration;
+
 namespace ASC.Notify.Textile
 {
     public class JabberStyler : IPatternStyler
diff --git a/common/ASC.Notify.Textile/PushStyler.cs b/common/ASC.Notify.Textile/PushStyler.cs
index e11e4f17b6..44f728d3e1 100644
--- a/common/ASC.Notify.Textile/PushStyler.cs
+++ b/common/ASC.Notify.Textile/PushStyler.cs
@@ -29,8 +29,13 @@ using System.Text.RegularExpressions;
 
 using ASC.Common;
 using ASC.Common.Notify.Patterns;
+using ASC.Core;
 using ASC.Notify.Messages;
 using ASC.Notify.Patterns;
+using ASC.Security.Cryptography;
+using ASC.Web.Core.WhiteLabel;
+
+using Microsoft.Extensions.Configuration;
 
 namespace ASC.Notify.Textile
 {
diff --git a/common/services/ASC.ApiSystem/Controllers/SettingsController.cs b/common/services/ASC.ApiSystem/Controllers/SettingsController.cs
index c14ce90a41..d7ebbb87d7 100644
--- a/common/services/ASC.ApiSystem/Controllers/SettingsController.cs
+++ b/common/services/ASC.ApiSystem/Controllers/SettingsController.cs
@@ -28,6 +28,7 @@ using ASC.ApiSystem.Models;
 using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
+using ASC.Core.Tenants;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
diff --git a/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs b/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs
index a0468dc8d8..2e286d5dbf 100644
--- a/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs
+++ b/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs
@@ -24,6 +24,7 @@
 */
 
 
+using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace ASC.ApiSystem.Models
diff --git a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
index 21765de361..8f10fad534 100644
--- a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
+++ b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
@@ -40,6 +40,7 @@ using ASC.Core;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Context;
 using ASC.Core.Common.EF.Model;
+using ASC.ElasticSearch.Core;
 using ASC.ElasticSearch.Service;
 
 using Autofac;
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
index be4fcf329b..cc056f9deb 100644
--- a/products/ASC.Files/Server/Startup.cs
+++ b/products/ASC.Files/Server/Startup.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Text;
 using System.Text.Json.Serialization;
 
@@ -35,6 +36,8 @@ namespace ASC.Files
 
             var diHelper = new DIHelper(services);
 
+            Stopwatch stopwatch = Stopwatch.StartNew();
+
             diHelper
                 .AddApiProductEntryPointService()
                 .AddDocumentsControllerService()
@@ -45,6 +48,7 @@ namespace ASC.Files
                 .AddDocuSignHandlerService()
                 .AddNotifyConfiguration();
 
+            var a = stopwatch.ElapsedMilliseconds;
             base.ConfigureServices(services);
         }
 
diff --git a/web/ASC.Web.Api/Controllers/ModulesController.cs b/web/ASC.Web.Api/Controllers/ModulesController.cs
index 00b44cd684..d9a821ebc8 100644
--- a/web/ASC.Web.Api/Controllers/ModulesController.cs
+++ b/web/ASC.Web.Api/Controllers/ModulesController.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using ASC.Common;
+using ASC.Core;
 using ASC.Web.Api.Routing;
 using ASC.Web.Core;
 using ASC.Web.Core.WebZones;
diff --git a/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs b/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs
index ba5928722f..b209fecccd 100644
--- a/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs
+++ b/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs
@@ -33,12 +33,16 @@ using ASC.Core;
 using ASC.Core.Billing;
 using ASC.Core.Configuration;
 using ASC.Core.Tenants;
+using ASC.MessagingSystem;
 using ASC.Web.Api.Routing;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Studio.Core;
-using ASC.Web.Studio.Utility;
-
+using ASC.Web.Studio.Core.Notify;
+using ASC.Web.Studio.Utility;
+
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 
 namespace ASC.Api.Settings
 {
diff --git a/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs b/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
index f60a023352..8278d8985b 100644
--- a/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
+++ b/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
@@ -43,6 +43,7 @@ using ASC.Core.Tenants;
 using ASC.Core.Users;
 using ASC.MessagingSystem;
 using ASC.Web.Api.Models;
+using ASC.Web.Core;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Core.Users;
 using ASC.Web.Core.Utility.Settings;
diff --git a/web/ASC.Web.Core/QuotaSync.cs b/web/ASC.Web.Core/QuotaSync.cs
index bfe2b7a48f..564bdc1388 100644
--- a/web/ASC.Web.Core/QuotaSync.cs
+++ b/web/ASC.Web.Core/QuotaSync.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Linq;
+using System.Threading;
 
 using ASC.Common.Threading;
 using ASC.Core;
diff --git a/web/ASC.Web.Core/Sms/SmsManager.cs b/web/ASC.Web.Core/Sms/SmsManager.cs
index a406442a87..4314324576 100644
--- a/web/ASC.Web.Core/Sms/SmsManager.cs
+++ b/web/ASC.Web.Core/Sms/SmsManager.cs
@@ -32,6 +32,9 @@ using ASC.Core.Tenants;
 using ASC.Core.Users;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Core.Sms;
+using ASC.Web.Studio.Utility;
+
+using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Studio.Core.SMS
 {
diff --git a/web/ASC.Web.Studio/Startup.cs b/web/ASC.Web.Studio/Startup.cs
index d6408fa034..5a57412f76 100644
--- a/web/ASC.Web.Studio/Startup.cs
+++ b/web/ASC.Web.Studio/Startup.cs
@@ -1,6 +1,8 @@
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Common.DependencyInjection;
+using ASC.Core.Common.EF;
+using ASC.Core.Common.EF.Context;
 using ASC.Data.Storage;
 using ASC.Data.Storage.Configuration;
 using ASC.Data.Storage.DiscStorage;

From 9fe6fc38320fbe1952140bd1c7e0f87009026b06 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 19 Oct 2020 10:19:32 +0300
Subject: [PATCH 02/22] Refactoring: scope

---
 common/ASC.Common/DIHelper.cs                 | 48 +++++++++++--------
 .../EF/Context/ConfigureDbContext.cs          |  2 +
 .../EF/Context/DbContextManager.cs            |  1 +
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 15a25eedc4..e2becd51e8 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -115,33 +115,41 @@ namespace ASC.Common
 
         public bool TryAdd(Type service, Type implementation = null)
         {
-            var di = service.GetCustomAttribute<DIAttribute>();
+            var di = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var isnew = false;
 
             if (di != null)
             {
-                if (service.IsInterface && implementation == null)
+                if (!service.IsInterface || implementation != null)
                 {
-                    var a = di.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
-                    if (a != null)
-                    {
-                        var b = a.GetGenericArguments();
+                    isnew = implementation != null ? Register(service, implementation) : Register(service);
+                }
 
-                        foreach (var g in b)
+                if (service.IsInterface && implementation == null || !service.IsInterface)
+                {
+                    if (di.Type != null)
+                    {
+                        var a = di.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                        if (a != null)
                         {
-                            TryAdd(g);
-                        }
+                            var b = a.GetGenericArguments();
 
-                        TryAdd(a, di.Type);
-                    }
-                    else
-                    {
-                        Register(service, di.Type);
+                            foreach (var g in b)
+                            {
+                                TryAdd(g);
+                            }
+
+                            TryAdd(a, di.Type);
+                        }
+                        else
+                        {
+                            Register(service, di.Type);
+                        }
                     }
 
                     if (di.CachedType != null)
                     {
-                        a = di.CachedType.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                        var a = di.CachedType.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
                         if (a != null)
                         {
                             var b = a.GetGenericArguments();
@@ -153,13 +161,13 @@ namespace ASC.Common
 
                             TryAdd(a, di.CachedType);
                         }
+                        else
+                        {
+                            Register(service, di.CachedType);
+                        }
                     }
 
                 }
-                else
-                {
-                    isnew = implementation != null ? Register(service, implementation) : Register(service);
-                }
             }
 
             if (isnew)
@@ -208,7 +216,7 @@ namespace ASC.Common
 
         private bool Register(Type service, Type implementation)
         {
-            var c = service.GetCustomAttribute<DIAttribute>();
+            var c = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var serviceName = $"{service}{implementation}";
             if (c is ScopeAttribute)
             {
diff --git a/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs b/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
index e2858b180d..ad9782edc2 100644
--- a/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
+++ b/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Common.Utils;
 
@@ -9,6 +10,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Common.EF
 {
+    [Scope]
     public class ConfigureDbContext : IConfigureNamedOptions<BaseDbContext>
     {
         public const string baseName = "default";
diff --git a/common/ASC.Core.Common/EF/Context/DbContextManager.cs b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
index eee57e8122..478f1ba7ef 100644
--- a/common/ASC.Core.Common/EF/Context/DbContextManager.cs
+++ b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
@@ -66,6 +66,7 @@ namespace ASC.Core.Common.EF
         }
     }
 
+    [Scope(typeof(ConfigureDbContext))]
     public class DbContextManager<T> : BaseDbContextManager<T> where T : BaseDbContext, new()
     {
         public DbContextManager(IOptionsFactory<T> factory, IConfiguration configuration) : base(factory, configuration)

From 830c73a13473c98104eacfa6c1d9a0722daf6988 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 19 Oct 2020 18:53:15 +0300
Subject: [PATCH 03/22] Scope: refactoring

---
 .../ASC.Api.Core/Auth/ConfirmAuthHandler.cs   |  11 --
 common/ASC.Api.Core/Auth/CookieAuthHandler.cs |   9 --
 common/ASC.Api.Core/Core/ApiContext.cs        |  16 +--
 common/ASC.Api.Core/Core/ApiDateTime.cs       |  15 +--
 common/ASC.Api.Core/Core/BaseStartup.cs       |  13 +-
 .../Middleware/CultureMiddleware.cs           |   9 --
 .../Middleware/IpSecurityFilter.cs            |  13 --
 .../ASC.Api.Core/Middleware/PaymentFilter.cs  |  10 --
 .../Middleware/ProductSecurityFilter.cs       |  11 --
 .../Middleware/TenantStatusFilter.cs          |  10 --
 common/ASC.Api.Core/Model/EmployeeWraper.cs   |  18 +--
 .../ASC.Api.Core/Model/EmployeeWraperFull.cs  |  19 +--
 common/ASC.Common/Caching/AscCache.cs         |   1 +
 common/ASC.Common/Caching/KafkaCache.cs       |  10 --
 common/ASC.Common/DIHelper.cs                 |  49 +++++--
 common/ASC.Common/Logging/EFLoggerFactory.cs  |  15 +--
 .../Security/Cryptography/InstanceCrypto.cs   |  11 +-
 .../Cryptography/MachinePseudoKeys.cs         |  10 +-
 .../Security/Cryptography/PasswordHasher.cs   |  10 +-
 .../Threading/DistributedTaskQueue.cs         |   1 +
 common/ASC.Common/Utils/Signature.cs          |  10 +-
 .../TimeZoneConverter/TimeZoneConverter.cs    |   3 +-
 .../ASC.Core.Common/BaseCommonLinkUtility.cs  |  18 +--
 .../ASC.Core.Common/Billing/CouponManager.cs  |   4 +-
 .../ASC.Core.Common/Billing/ITariffService.cs |   9 +-
 .../Billing/License/LicenseReader.cs          |  20 +--
 .../ASC.Core.Common/Billing/TariffService.cs  |  18 +--
 .../Caching/CachedAzService.cs                |  23 +---
 .../Caching/CachedQuotaService.cs             |  28 +---
 .../Caching/CachedSubscriptionService.cs      |  19 +--
 .../Caching/CachedTenantService.cs            |  32 +----
 .../Caching/CachedUserService.cs              |  29 +----
 .../ASC.Core.Common/Configuration/Consumer.cs |  12 +-
 .../Context/Impl/AuthManager.cs               |  19 +--
 .../Context/Impl/AuthorizationManager.cs      |  18 +--
 .../Context/Impl/CoreConfiguration.cs         |  37 +-----
 .../Context/Impl/PaymentManager.cs            |  20 +--
 .../Context/Impl/SubscriptionManager.cs       |  19 +--
 .../Context/Impl/TenantManager.cs             |  23 +---
 .../Context/Impl/UserManager.cs               |  21 ---
 .../Context/SecurityContext.cs                |  39 +-----
 .../ASC.Core.Common/Core/DBResourceManager.cs |  12 +-
 common/ASC.Core.Common/Core/IAzService.cs     |  11 +-
 common/ASC.Core.Common/Core/IQuotaService.cs  |   6 +-
 .../Core/ISubscriptionService.cs              |  11 +-
 common/ASC.Core.Common/Core/ITenantService.cs |   6 +-
 common/ASC.Core.Common/Data/DbAzService.cs    |   4 +-
 common/ASC.Core.Common/Data/DbQuotaService.cs |   4 +-
 .../ASC.Core.Common/Data/DbSettingsManager.cs |  22 +---
 .../Data/DbSubscriptionService.cs             |   4 +-
 .../ASC.Core.Common/Data/DbTenantService.cs   |   4 +-
 .../EF/Context/CoreDbContext.cs               |  16 +--
 .../EF/Context/DbContextManager.cs            |  11 +-
 common/ASC.Core.Common/EF/JsonExtensions.cs   |   9 +-
 common/ASC.Core.Common/HostedSolution.cs      |  11 +-
 .../Notify/Jabber/JabberServiceClient.cs      |  19 +--
 .../Notify/NotifyServiceClient.cs             |   4 +-
 .../Notify/Senders/AWSSender.cs               |   8 +-
 .../Notify/Senders/JabberSender.cs            |  12 +-
 .../Notify/Senders/SmtpSender.cs              |   8 +-
 .../Notify/Signalr/SignalrServiceClient.cs    |  21 +--
 .../Notify/Telegram/Dao/CachedTelegramDao.cs  |  23 +---
 .../Notify/Telegram/Dao/TelegramDao.cs        |   2 +
 .../Notify/Telegram/TelegramHelper.cs         |  16 +--
 .../Notify/Telegram/TelegramServiceClient.cs  |  12 +-
 .../Security/Authentication/CookieStorage.cs  |  16 +--
 .../Security/Authorizing/AzManager.cs         |  17 ---
 .../Authorizing}/IPermissionProvider.cs       |   6 +-
 .../Authorizing/PermissionProvider.cs         |  12 +-
 .../Authorizing/PermissionResolver.cs         |   9 --
 .../Security/EmailValidationKeyProvider.cs    |  22 +---
 .../Settings/SettingsManager.cs               |  18 +--
 .../Tenants/TenantCookieSettings.cs           |  14 +-
 .../Tenants/TenantDomainValidator.cs          |   5 +-
 common/ASC.Core.Common/Tenants/TenantUtil.cs  |  17 +--
 .../Tests/HostedSolutionTest.cs               |   2 -
 common/ASC.Core.Common/Users/Constants.cs     |  12 +-
 .../Users/DisplayUserSettings.cs              |  16 +--
 common/ASC.Core.Common/Users/UserFormatter.cs |  11 +-
 .../WhiteLabel/MailWhiteLabelSettings.cs      |  12 +-
 common/ASC.Data.Reassigns/QueueWorker.cs      |  28 +---
 .../Configuration/StorageSettings.cs          |  16 +--
 common/ASC.Data.Storage/Encryption/Crypt.cs   |   9 +-
 .../Encryption/EncryptionFactory.cs           |  14 +-
 .../Encryption/EncryptionServiceClient.cs     |  12 +-
 .../Encryption/EncryptionServiceNotifier.cs   |  10 +-
 .../Encryption/EncryptionSettings.cs          |  14 +-
 .../ASC.Data.Storage/Encryption/Metadata.cs   |   9 +-
 common/ASC.Data.Storage/Extensions.cs         |   2 -
 .../Migration/MigrateServiceClient.cs         |  17 +--
 common/ASC.Data.Storage/PathUtils.cs          |  11 +-
 common/ASC.Data.Storage/StaticUploader.cs     |  13 +-
 common/ASC.Data.Storage/StorageFactory.cs     |  36 +----
 common/ASC.Data.Storage/StorageHandler.cs     |   6 +-
 common/ASC.Data.Storage/StorageUploader.cs    |   4 +-
 common/ASC.Data.Storage/WebPath.cs            |  26 +---
 common/ASC.FederatedLogin/AccountLinker.cs    |  33 +----
 common/ASC.FederatedLogin/Login.cs            |  14 +-
 .../LoginProviders/BoxLoginProvider.cs        |  17 +--
 .../LoginProviders/DocuSignLoginProvider.cs   |  16 +--
 .../LoginProviders/DropboxLoginProvider.cs    |  16 +--
 .../LoginProviders/EncryptionLoginProvider.cs |  20 +--
 .../LoginProviders/GoogleLoginProvider.cs     |  17 ---
 .../LoginProviders/OneDriveLoginProvider.cs   |  15 ---
 .../LoginProviders/ProviderManager.cs         |  17 +--
 .../LoginProviders/TelegramLoginProvider.cs   |  12 --
 .../Data/FeedAggregateDataProvider.cs         |  15 +--
 .../ASC.Feed/Data/FeedReadedDataProvider.cs   |  12 --
 .../IPRestrictionsRepository.cs               |  13 +-
 .../ASC.IPSecurity/IPRestrictionsService.cs   |  18 +--
 common/ASC.IPSecurity/IPSecurity.cs           |  18 +--
 .../DbSender/DbMessageSender.cs               |  13 +-
 .../DbSender/MessagesRepository.cs            |   2 +
 common/ASC.MessagingSystem/MessageFactory.cs  |  15 +--
 common/ASC.MessagingSystem/MessagePolicy.cs   |  11 +-
 common/ASC.MessagingSystem/MessageService.cs  |  18 +--
 common/ASC.MessagingSystem/MessageTarget.cs   |  13 +-
 common/ASC.Notify.Textile/JabberStyler.cs     |  27 +---
 common/ASC.Notify.Textile/PushStyler.cs       |  18 +--
 common/ASC.Notify.Textile/TextileStyler.cs    |  14 +-
 common/ASC.VoipService/Dao/CachedVoipDao.cs   |  22 +---
 common/ASC.VoipService/Dao/VoipDao.cs         |   2 +
 .../ASC.ApiSystem/Classes/AuthHandler.cs      |  11 +-
 .../ASC.ApiSystem/Classes/CommonConstants.cs  |  13 +-
 .../ASC.ApiSystem/Classes/CommonMethods.cs    |  30 +----
 .../Classes/TimeZonesProvider.cs              |  13 +-
 .../Controllers/CalDavController.cs           |  15 +--
 .../Controllers/CoreSettingsController.cs     |  11 +-
 .../Controllers/PortalController.cs           |  23 +---
 .../Controllers/RegistrationController.cs     |  23 +---
 .../Controllers/SettingsController.cs         |  14 +-
 .../Controllers/TariffController.cs           |  14 +-
 .../ASC.ApiSystem/Models/CoreSettingsModel.cs |   1 -
 common/services/ASC.ApiSystem/Startup.cs      |  11 +-
 .../ASC.AuditTrail/AuditEventsRepository.cs   |  16 +--
 .../ASC.AuditTrail/AuditReportCreator.cs      |  16 +--
 .../ASC.AuditTrail/LoginEventsRepository.cs   |  19 +--
 .../Mappers/AuditActionMapper.cs              |  22 ++--
 .../ASC.Data.Backup/BackupAjaxHandler.cs      |  26 +---
 .../ASC.Data.Backup/BackupServiceLauncher.cs  |  16 +--
 .../Controllers/BackupController.cs           |  13 +-
 .../ASC.Data.Backup/Core/BackupHelper.cs      |  18 +--
 .../ASC.Data.Backup/Core/BackupManager.cs     |  12 +-
 .../ASC.Data.Backup/Core/DbBackupProvider.cs  |  13 +-
 .../Core/FileBackupProvider.cs                |  17 +--
 .../ASC.Data.Backup/Core/NotifyHelper.cs      |  13 +-
 .../services/ASC.Data.Backup/Core/Schedule.cs |  20 +--
 .../Listerners/BackupListener.cs              |  12 +-
 .../Service/BackupCleanerService.cs           |  22 +---
 .../Service/BackupSchedulerService.cs         |  26 +---
 .../ASC.Data.Backup/Service/BackupService.cs  |  22 +---
 .../ASC.Data.Backup/Service/BackupWorker.cs   |  24 +---
 common/services/ASC.Data.Backup/Startup.cs    |   6 +-
 .../Storage/BackupRepository.cs               |  17 +--
 .../Storage/BackupStorageFactory.cs           |  22 +---
 .../Storage/ConsumerBackupStorage.cs          |  16 +--
 .../Storage/DataStoreBackupStorage.cs         |  17 +--
 .../Storage/DocumentsBackupStorage.cs         |  19 +--
 .../Storage/LocalBackupStorage.cs             |  11 +-
 .../ASC.Data.Backup/Tasks/BackupPortalTask.cs |  21 +--
 .../ASC.Data.Backup/Tasks/DbFactory.cs        |  11 +-
 .../ASC.Data.Backup/Tasks/Modules/Helpers.cs  |  16 +--
 .../Tasks/Modules/ModuleProvider.cs           |  17 +--
 .../Tasks/RestorePortalTask.cs                |  23 +---
 .../Tasks/TransferPortalTask.cs               |  16 +--
 .../EncryptionOperation.cs                    |  10 +-
 .../EncryptionServiceLauncher.cs              |  12 +-
 .../EncryptionServiceListener.cs              |  14 +-
 .../EncryptionWorker.cs                       |  16 +--
 .../NotifyHelper.cs                           |  14 +-
 .../MigrationService.cs                       |  24 +---
 .../MigrationServiceLauncher.cs               |   9 --
 .../ASC.Data.Storage.Migration/Program.cs     |   5 +-
 .../ASC.ElasticSearch/Core/SearchSettings.cs  |  20 +--
 .../ASC.ElasticSearch/Core/Selector.cs        |   7 +-
 .../ASC.ElasticSearch/Engine/BaseIndexer.cs   |  32 +----
 .../ASC.ElasticSearch/Engine/Client.cs        |  18 +--
 .../Engine/FactoryIndexer.cs                  |  45 +------
 .../ASC.ElasticSearch/Service/Launcher.cs     |   8 +-
 .../ASC.ElasticSearch/Service/Service.cs      |   7 +-
 .../ASC.ElasticSearch/Service/Settings.cs     |  12 +-
 .../Service/FeedAggregatorService.cs          |  20 +--
 common/services/ASC.Notify/DbWorker.cs        |  12 +-
 common/services/ASC.Notify/NotifyCleaner.cs   |  13 +-
 common/services/ASC.Notify/NotifySender.cs    |  14 +-
 common/services/ASC.Notify/NotifyService.cs   |   6 +-
 .../ASC.Notify/NotifyServiceLauncher.cs       |  15 ---
 common/services/ASC.Notify/Program.cs         |   7 +-
 common/services/ASC.Socket.IO.Svc/Program.cs  |   4 +-
 .../SocketServiceLauncher.cs                  |  14 +-
 common/services/ASC.Studio.Notify/Program.cs  |   2 +-
 .../ASC.Studio.Notify/ServiceLauncher.cs      |  14 --
 .../Commands/UserCommands.cs                  |  12 +-
 .../services/ASC.TelegramService/Core/Core.cs |  21 +--
 .../ASC.TelegramService/TelegramHandler.cs    |  14 +-
 .../ASC.TelegramService/TelegramLauncher.cs   |  16 +--
 .../ASC.TelegramService/TelegramListener.cs   |  12 +-
 .../ASC.TelegramService/TelegramService.cs    |  12 +-
 common/services/ASC.Thumbnails.Svc/Program.cs |   2 +-
 .../ThumbnailsServiceLauncher.cs              |  11 +-
 .../services/ASC.UrlShortener.Svc/Program.cs  |   2 +-
 .../UrlShortenerService.cs                    |  13 +-
 .../UrlShortenerServiceLauncher.cs            |   8 --
 .../Core/Configuration/FilesSettings.cs       |  18 +--
 .../FilesSpaceUsageStatManager.cs             |  46 +------
 .../Core/Configuration/ProductEntryPoint.cs   |  19 +--
 .../Core/Configuration/SubscriptionManager.cs |  22 +---
 .../Core/Core/Dao/Interfaces/IDaoFactory.cs   |   5 +-
 .../Core/Core/Dao/Interfaces/IProviderDao.cs  |  10 +-
 .../Core/Core/Dao/TeamlabDao/DaoFactory.cs    |  23 ----
 .../Core/Core/Dao/TeamlabDao/FileDao.cs       |  53 +++-----
 .../Core/Core/Dao/TeamlabDao/FolderDao.cs     |  23 +---
 .../Core/Core/Dao/TeamlabDao/SecurityDao.cs   |  24 +---
 .../Core/Core/Dao/TeamlabDao/TagDao.cs        |  21 +--
 products/ASC.Files/Core/Core/EF/DbFile.cs     |   4 +-
 products/ASC.Files/Core/Core/EF/DbFolder.cs   |   4 +-
 .../Core/Core/Entries/ChunkedUploadSession.cs |  16 +--
 .../Core/Core/Entries/EncryptionKeyPair.cs    |  20 +--
 products/ASC.Files/Core/Core/Entries/File.cs  |   8 +-
 .../ASC.Files/Core/Core/Entries/Folder.cs     |   8 +-
 .../ASC.Files/Core/Core/FileStorageService.cs |  87 +++----------
 .../ASC.Files/Core/Core/FilesIntegration.cs   |  17 +--
 .../Core/Core/Search/FactoryIndexerFile.cs    |   7 +-
 .../Core/Core/Search/FactoryIndexerFolder.cs  |   9 +-
 .../Core/Core/Security/FileSecurity.cs        |  41 +-----
 .../Core/Core/Security/IFileSecurity.cs       |   9 +-
 .../Core/Core/Security/ISecurityDao.cs        |   4 +-
 .../Core/Thirdparty/Box/BoxDaoSelector.cs     |  20 +--
 .../Core/Core/Thirdparty/Box/BoxFileDao.cs    |  13 +-
 .../Core/Core/Thirdparty/Box/BoxFolderDao.cs  |  13 +-
 .../Core/Thirdparty/Box/BoxProviderInfo.cs    |  25 +---
 .../Core/Thirdparty/Box/BoxSecurityDao.cs     |  13 +-
 .../Core/Core/Thirdparty/Box/BoxTagDao.cs     |  13 +-
 .../Thirdparty/CachedProviderAccountDao.cs    |  18 +--
 .../Core/Core/Thirdparty/CrossDao.cs          |   8 +-
 .../Thirdparty/Dropbox/DropboxDaoSelector.cs  |  20 +--
 .../Core/Thirdparty/Dropbox/DropboxFileDao.cs |  13 +-
 .../Thirdparty/Dropbox/DropboxFolderDao.cs    |  13 +-
 .../Thirdparty/Dropbox/DropboxProviderInfo.cs |  23 +---
 .../Thirdparty/Dropbox/DropboxSecurityDao.cs  |  13 +-
 .../Core/Thirdparty/Dropbox/DropboxTagDao.cs  |  13 +-
 .../GoogleDrive/GoogleDriveDaoSelector.cs     |  20 +--
 .../GoogleDrive/GoogleDriveFileDao.cs         |  13 +-
 .../GoogleDrive/GoogleDriveFolderDao.cs       |  13 +-
 .../GoogleDrive/GoogleDriveProviderInfo.cs    |  24 +---
 .../GoogleDrive/GoogleDriveSecurityDao.cs     |  13 +-
 .../GoogleDrive/GoogleDriveStorage.cs         |   8 +-
 .../GoogleDrive/GoogleDriveTagDao.cs          |  13 +-
 .../OneDrive/OneDriveDaoSelector.cs           |  20 +--
 .../Thirdparty/OneDrive/OneDriveFileDao.cs    |  13 +-
 .../Thirdparty/OneDrive/OneDriveFolderDao.cs  |  13 +-
 .../OneDrive/OneDriveProviderInfo.cs          |  24 +---
 .../OneDrive/OneDriveSecurityDao.cs           |  13 +-
 .../Thirdparty/OneDrive/OneDriveStorage.cs    |   8 +-
 .../Thirdparty/OneDrive/OneDriveTagDao.cs     |  13 +-
 .../Core/Thirdparty/ProviderAccountDao.cs     |  27 +---
 .../Thirdparty/ProviderDao/ProviderDaoBase.cs |  24 +---
 .../Thirdparty/ProviderDao/ProviderFileDao.cs |  11 +-
 .../ProviderDao/ProviderFolderDao.cs          |  14 +-
 .../ProviderDao/ProviderSecutiryDao.cs        |   3 +-
 .../Thirdparty/ProviderDao/ProviderTagDao.cs  |   3 +-
 .../SharePoint/SharePointDaoSelector.cs       |  20 +--
 .../SharePoint/SharePointFileDao.cs           |  13 +-
 .../SharePoint/SharePointFolderDao.cs         |  13 +-
 .../SharePoint/SharePointProviderInfo.cs      |  17 +--
 .../SharePoint/SharePointSecurityDao.cs       |  13 +-
 .../Thirdparty/SharePoint/SharePointTagDao.cs |  13 +-
 .../Sharpbox/SharpBoxDaoSelector.cs           |  20 +--
 .../Thirdparty/Sharpbox/SharpBoxFileDao.cs    |  13 +-
 .../Thirdparty/Sharpbox/SharpBoxFolderDao.cs  |  15 +--
 .../Sharpbox/SharpBoxProviderInfo.cs          |  17 +--
 .../Sharpbox/SharpBoxSecurityDao.cs           |  13 +-
 .../Thirdparty/Sharpbox/SharpBoxTagDao.cs     |  13 +-
 .../ASC.Files/Core/Helpers/DocuSignHelper.cs  |  43 +-----
 .../ASC.Files/Core/Helpers/EasyBibHelper.cs   |  21 +--
 .../Core/Helpers/FilesMessageService.cs       |  18 +--
 products/ASC.Files/Core/Helpers/Global.cs     | 103 ++-------------
 .../ASC.Files/Core/Helpers/PathProvider.cs    |  24 +---
 .../Core/Helpers/ThirdpartyConfiguration.cs   |  23 +---
 .../ASC.Files/Core/Helpers/WordpressHelper.cs |  27 +---
 .../HttpHandlers/ChunkedUploaderHandler.cs    |  22 +---
 .../Core/HttpHandlers/FileHandler.ashx.cs     |  36 +----
 .../HttpHandlers/ThirdPartyAppHandler.ashx.cs |  16 +--
 .../Core/HttpHandlers/docusignhandler.ashx.cs |  24 +---
 .../ASC.Files/Core/Model/FileEntryWrapper.cs  |  18 +--
 .../Core/Model/FileOperationWraper.cs         |  20 +--
 .../ASC.Files/Core/Model/FileShareParams.cs   |  17 +--
 .../ASC.Files/Core/Model/FileShareWrapper.cs  |  17 +--
 products/ASC.Files/Core/Model/FileWrapper.cs  |  26 +---
 .../Core/Model/FolderContentWrapper.cs        |  18 +--
 .../ASC.Files/Core/Model/FolderWrapper.cs     |  22 +---
 .../Services/DocumentService/Configuration.cs | 123 ++----------------
 .../DocumentServiceConnector.cs               |  24 +---
 .../DocumentService/DocumentServiceHelper.cs  |  28 +---
 .../DocumentService/DocumentServiceTracker.cs |  33 +----
 .../Core/Services/FFmpegService/FFmpeg.cs     |  11 +-
 .../Services/NotifyService/NotifyClient.cs    |  22 +---
 .../Services/NotifyService/NotifySource.cs    |  20 +--
 .../FileOperations/FileOperationsManager.cs   |  11 +-
 .../ASC.Files/Core/ThirdPartyApp/Token.cs     |  20 +--
 .../Core/Utils/ChunkedUploadSessionHolder.cs  |  18 +--
 products/ASC.Files/Core/Utils/EntryManager.cs |  75 +----------
 .../ASC.Files/Core/Utils/FileConverter.cs     |  34 +----
 products/ASC.Files/Core/Utils/FileMarker.cs   |  24 ++--
 .../ASC.Files/Core/Utils/FileShareLink.cs     |  20 +--
 products/ASC.Files/Core/Utils/FileSharing.cs  |  66 +---------
 products/ASC.Files/Core/Utils/FileUploader.cs |  36 +----
 .../ASC.Files/Core/Utils/MailMergeTask.cs     |  19 +--
 .../ASC.Files/Core/Utils/SocketManager.cs     |  17 +--
 .../Server/Controllers/FilesController.cs     |   8 --
 .../Controllers/PrivacyRoomController.cs      |  20 +--
 .../Server/Helpers/FilesControllerHelper.cs   |  48 +------
 .../ASC.Files/Server/ProductEntryPoint.cs     |  16 +--
 products/ASC.Files/Server/Startup.cs          |  15 ---
 products/ASC.Files/Service/Program.cs         |   9 --
 .../Server/Controllers/GroupController.cs     |  22 +---
 .../Server/Controllers/PeopleController.cs    |  44 +------
 .../Server/Models/GroupWrapperFull.cs         |  17 +--
 products/ASC.People/Server/Startup.cs         |   7 +-
 .../Controllers/AuthenticationController.cs   |  14 +-
 .../Controllers/ModulesController.cs          |  11 +-
 .../Controllers/PortalController.cs           |  26 +---
 .../Controllers/SecurityController.cs         |  20 +--
 .../Controllers/SettingsController.cs         |  93 +++----------
 .../Controllers/SmtpSettingsController.cs     |  24 +---
 .../Core/FirstTimeTenantSettings.cs           |  23 +---
 web/ASC.Web.Api/Models/BuildVersion.cs        |  13 +-
 web/ASC.Web.Api/Startup.cs                    |  13 +-
 web/ASC.Web.Core/CookiesManager.cs            |  18 +--
 web/ASC.Web.Core/FileSizeComment.cs           |  16 +--
 web/ASC.Web.Core/Files/FileUtility.cs         |  16 +--
 web/ASC.Web.Core/Files/FilesLinkUtility.cs    |  18 +--
 web/ASC.Web.Core/Helpers/ApiSystemHelper.cs   |  12 +-
 web/ASC.Web.Core/LogoUploader.cs              |  19 +--
 web/ASC.Web.Core/Mobile/MobileDetector.cs     |  10 +-
 .../Notify/NotifyConfiguration.cs             |  20 +--
 web/ASC.Web.Core/Notify/StudioNotifyHelper.cs |  25 +---
 .../Notify/StudioNotifyService.cs             |  21 +--
 .../Notify/StudioNotifyServiceHelper.cs       |  11 +-
 .../Notify/StudioNotifyServiceSender.cs       |  15 +--
 web/ASC.Web.Core/Notify/StudioNotifySource.cs |  18 +--
 .../Notify/StudioPeriodicNotify.cs            |  23 +---
 .../Notify/StudioWhatsNewNotify.cs            |  23 +---
 web/ASC.Web.Core/PersonalSettings.cs          |  15 +--
 web/ASC.Web.Core/QuotaSync.cs                 |   1 -
 web/ASC.Web.Core/SetupInfo.cs                 |  11 +-
 web/ASC.Web.Core/Sms/SmsManager.cs            |   3 -
 web/ASC.Web.Core/Sms/SmsProvider.cs           |  27 +---
 .../Sms/StudioSmsNotificationSettings.cs      |  17 +--
 .../Statistic/StatisticManager.cs             |  14 +-
 web/ASC.Web.Core/Tfa/TfaManager.cs            |  20 +--
 web/ASC.Web.Core/Users/CustomNamingPeople.cs  |  14 +-
 web/ASC.Web.Core/Users/UserManagerWrapper.cs  |  27 +---
 web/ASC.Web.Core/Users/UserPhotoManager.cs    |  23 +---
 .../Utility/ColorThemesSettings.cs            |  14 +-
 web/ASC.Web.Core/Utility/CommonLinkUtility.cs |  19 +--
 .../Utility/Skins/WebImageSupplier.cs         |  16 +--
 web/ASC.Web.Core/Utility/TenantExtra.cs       |  24 +---
 web/ASC.Web.Core/Utility/TenantLogoHelper.cs  |  20 +--
 .../Utility/TenantStatisticsProvider.cs       |  16 +--
 web/ASC.Web.Core/Utility/UrlShortener.cs      |  18 +--
 web/ASC.Web.Core/WebItemManager.cs            |  23 +---
 web/ASC.Web.Core/WebItemSecurity.cs           |  31 +----
 .../AdditionalWhiteLabelSettings.cs           |  14 +-
 .../WhiteLabel/TenantInfoSettings.cs          |  21 +--
 .../WhiteLabel/TenantLogoManager.cs           |  20 +--
 .../WhiteLabel/TenantWhiteLabelSettings.cs    |  21 +--
 web/ASC.Web.Studio/Startup.cs                 |  12 --
 368 files changed, 905 insertions(+), 5503 deletions(-)
 rename common/{ASC.Common/Security => ASC.Core.Common/Security/Authorizing}/IPermissionProvider.cs (95%)

diff --git a/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs b/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
index c3c8b35312..d01446177f 100644
--- a/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
+++ b/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
@@ -6,10 +6,8 @@ using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Core;
 using ASC.Security.Cryptography;
-using ASC.Web.Studio.Core;
 
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
@@ -96,13 +94,4 @@ namespace ASC.Api.Core.Auth
             return Task.FromResult(result);
         }
     }
-
-    public static class ConfirmAuthHandlerExtension
-    {
-        public static DIHelper AddConfirmAuthHandler(this DIHelper services)
-        {
-            return services
-                .AddSecurityContextService();
-        }
-    }
 }
diff --git a/common/ASC.Api.Core/Auth/CookieAuthHandler.cs b/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
index ed6845f265..3bfd28109c 100644
--- a/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
+++ b/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
@@ -3,7 +3,6 @@ using System.Security.Authentication;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Core;
 
 using Microsoft.AspNetCore.Authentication;
@@ -38,12 +37,4 @@ namespace ASC.Api.Core.Auth
                      );
         }
     }
-
-    public static class CookieAuthHandlerExtension
-    {
-        public static DIHelper AddCookieAuthHandler(this DIHelper services)
-        {
-            return services.AddSecurityContextService();
-        }
-    }
 }
diff --git a/common/ASC.Api.Core/Core/ApiContext.cs b/common/ASC.Api.Core/Core/ApiContext.cs
index 8d668b1906..67757429c9 100644
--- a/common/ASC.Api.Core/Core/ApiContext.cs
+++ b/common/ASC.Api.Core/Core/ApiContext.cs
@@ -36,6 +36,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace ASC.Api.Core
 {
+    [Scope]
     public class ApiContext : ICloneable
     {
         public IHttpContextAccessor HttpContextAccessor { get; set; }
@@ -268,19 +269,4 @@ namespace ASC.Api.Core
             return context?.Fields == null || (context.Fields != null && context.Fields.Contains(field, StringComparer.InvariantCultureIgnoreCase));
         }
     }
-
-    public static class ApiContextConfigExtension
-    {
-        public static DIHelper AddApiContextService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ApiContext>())
-            {
-                services
-                    .AddTenantManagerService()
-                    .AddSecurityContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Api.Core/Core/ApiDateTime.cs b/common/ASC.Api.Core/Core/ApiDateTime.cs
index 3ecc94fbb3..8a4e79495e 100644
--- a/common/ASC.Api.Core/Core/ApiDateTime.cs
+++ b/common/ASC.Api.Core/Core/ApiDateTime.cs
@@ -348,6 +348,7 @@ namespace ASC.Api.Core
         }
     }
 
+    [Scope]
     public class ApiDateTimeHelper
     {
         private TenantManager TenantManager { get; }
@@ -364,18 +365,4 @@ namespace ASC.Api.Core
             return ApiDateTime.FromDate(TenantManager, TimeZoneConverter, from);
         }
     }
-
-    public static class ApiDateTimeHelperExtension
-    {
-        public static DIHelper AddApiDateTimeHelper(this DIHelper services)
-        {
-            if (services.TryAddScoped<ApiDateTimeHelper>())
-            {
-                return services
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs
index 5c23ebf891..1cfb7f7e29 100644
--- a/common/ASC.Api.Core/Core/BaseStartup.cs
+++ b/common/ASC.Api.Core/Core/BaseStartup.cs
@@ -64,12 +64,11 @@ namespace ASC.Api.Core
                     });
             }
 
-            DIHelper
-                .AddCultureMiddleware()
-                .AddIpSecurityFilter()
-                .AddPaymentFilter()
-                .AddProductSecurityFilter()
-                .AddTenantStatusFilter();
+            DIHelper.TryAdd<CultureMiddleware>();
+            DIHelper.TryAdd<IpSecurityFilter>();
+            DIHelper.TryAdd<PaymentFilter>();
+            DIHelper.TryAdd<ProductSecurityFilter>();
+            DIHelper.TryAdd<TenantStatusFilter>();
 
             var builder = services.AddMvcCore(config =>
             {
@@ -87,7 +86,7 @@ namespace ASC.Api.Core
                 config.OutputFormatters.Add(new XmlOutputFormatter());
             });
 
-            DIHelper.AddCookieAuthHandler();
+            DIHelper.TryAdd<CookieAuthHandler>();
             var authBuilder = services.AddAuthentication("cookie")
                 .AddScheme<AuthenticationSchemeOptions, CookieAuthHandler>("cookie", a => { });
 
diff --git a/common/ASC.Api.Core/Middleware/CultureMiddleware.cs b/common/ASC.Api.Core/Middleware/CultureMiddleware.cs
index 33e20a5022..146cef9d44 100644
--- a/common/ASC.Api.Core/Middleware/CultureMiddleware.cs
+++ b/common/ASC.Api.Core/Middleware/CultureMiddleware.cs
@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Core;
 
 using Microsoft.AspNetCore.Builder;
@@ -51,13 +50,5 @@ namespace ASC.Api.Core.Middleware
         {
             return builder.UseMiddleware<CultureMiddleware>();
         }
-
-        public static DIHelper AddCultureMiddleware(this DIHelper services)
-        {
-            return services
-                .AddUserManagerService()
-                .AddTenantManagerService()
-                .AddAuthContextService();
-        }
     }
 }
diff --git a/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs b/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
index 003dae8696..8b7aba26f9 100644
--- a/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
+++ b/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
@@ -1,9 +1,7 @@
 using System.Net;
 
-using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
-using ASC.Core.Common.Settings;
 using ASC.IPSecurity;
 
 using Microsoft.AspNetCore.Mvc;
@@ -44,15 +42,4 @@ namespace ASC.Api.Core.Middleware
             }
         }
     }
-
-    public static class IpSecurityFilterExtension
-    {
-        public static DIHelper AddIpSecurityFilter(this DIHelper services)
-        {
-            return services
-                .AddSettingsManagerService()
-                .AddAuthContextService()
-                .AddIPSecurityService();
-        }
-    }
 }
diff --git a/common/ASC.Api.Core/Middleware/PaymentFilter.cs b/common/ASC.Api.Core/Middleware/PaymentFilter.cs
index 99e186b7f0..69fa747f43 100644
--- a/common/ASC.Api.Core/Middleware/PaymentFilter.cs
+++ b/common/ASC.Api.Core/Middleware/PaymentFilter.cs
@@ -2,7 +2,6 @@
 using System.Net;
 using System.Web;
 
-using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Web.Api.Routing;
 using ASC.Web.Studio.Utility;
@@ -49,13 +48,4 @@ namespace ASC.Api.Core.Middleware
             }
         }
     }
-
-    public static class PaymentFilterExtension
-    {
-        public static DIHelper AddPaymentFilter(this DIHelper services)
-        {
-            return services
-                .AddTenantExtraService();
-        }
-    }
 }
diff --git a/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs b/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
index 10c81d878a..14717360d6 100644
--- a/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
+++ b/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 
-using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Common.Notify.Engine;
 using ASC.Core;
@@ -116,14 +115,4 @@ namespace ASC.Api.Core.Middleware
             return default;
         }
     }
-
-    public static class ProductSecurityFilterExtension
-    {
-        public static DIHelper AddProductSecurityFilter(this DIHelper services)
-        {
-            return services
-                .AddWebItemSecurity()
-                .AddAuthContextService();
-        }
-    }
 }
diff --git a/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs b/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
index d1d51382d4..75fb7f2610 100644
--- a/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
+++ b/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
@@ -1,6 +1,5 @@
 using System.Net;
 
-using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Tenants;
@@ -45,13 +44,4 @@ namespace ASC.Api.Core.Middleware
             }
         }
     }
-
-    public static class TenantStatusFilterExtension
-    {
-        public static DIHelper AddTenantStatusFilter(this DIHelper services)
-        {
-            return services
-                .AddTenantManagerService();
-        }
-    }
 }
diff --git a/common/ASC.Api.Core/Model/EmployeeWraper.cs b/common/ASC.Api.Core/Model/EmployeeWraper.cs
index 3b2647b7e2..781275a0e2 100644
--- a/common/ASC.Api.Core/Model/EmployeeWraper.cs
+++ b/common/ASC.Api.Core/Model/EmployeeWraper.cs
@@ -60,6 +60,7 @@ namespace ASC.Web.Api.Models
         }
     }
 
+    [Scope]
     public class EmployeeWraperHelper
     {
         private ApiContext HttpContext { get; }
@@ -124,21 +125,4 @@ namespace ASC.Web.Api.Models
             return result;
         }
     }
-
-    public static class EmployeeWraperExtension
-    {
-        public static DIHelper AddEmployeeWraper(this DIHelper services)
-        {
-            if (services.TryAddScoped<EmployeeWraperHelper>())
-            {
-                return services
-                    .AddApiContextService()
-                    .AddDisplayUserSettingsService()
-                    .AddUserPhotoManagerService()
-                    .AddCommonLinkUtilityService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Api.Core/Model/EmployeeWraperFull.cs b/common/ASC.Api.Core/Model/EmployeeWraperFull.cs
index 0d2f4f2177..aafc1dd727 100644
--- a/common/ASC.Api.Core/Model/EmployeeWraperFull.cs
+++ b/common/ASC.Api.Core/Model/EmployeeWraperFull.cs
@@ -131,6 +131,7 @@ namespace ASC.Web.Api.Models
         }
     }
 
+    [Scope]
     public class EmployeeWraperFullHelper : EmployeeWraperHelper
     {
         private ApiContext Context { get; }
@@ -288,22 +289,4 @@ namespace ASC.Web.Api.Models
             }
         }
     }
-
-    public static class EmployeeWraperFullExtension
-    {
-        public static DIHelper AddEmployeeWraperFull(this DIHelper services)
-        {
-            if (services.TryAddScoped<EmployeeWraperFullHelper>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddWebItemSecurity()
-                    .AddUserManagerService()
-                    .AddEmployeeWraper()
-                    .AddApiDateTimeHelper();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Common/Caching/AscCache.cs b/common/ASC.Common/Caching/AscCache.cs
index 470b064bf3..a80c67df80 100644
--- a/common/ASC.Common/Caching/AscCache.cs
+++ b/common/ASC.Common/Caching/AscCache.cs
@@ -34,6 +34,7 @@ using Google.Protobuf;
 
 namespace ASC.Common.Caching
 {
+    [Singletone]
     public class AscCacheNotify
     {
         private ICacheNotify<AscCacheItem> CacheNotify { get; }
diff --git a/common/ASC.Common/Caching/KafkaCache.cs b/common/ASC.Common/Caching/KafkaCache.cs
index c888609364..e464b86c16 100644
--- a/common/ASC.Common/Caching/KafkaCache.cs
+++ b/common/ASC.Common/Caching/KafkaCache.cs
@@ -238,14 +238,4 @@ namespace ASC.Common.Caching
             return $"{typeof(T).Name}{cacheNotifyAction}";
         }
     }
-
-    public static class KafkaExtention
-    {
-        public static DIHelper AddKafkaService(this DIHelper services)
-        {
-            services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index e2becd51e8..b99598e8be 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -12,10 +12,25 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Common
 {
+    public class TransientAttribute : DIAttribute
+    {
+        public TransientAttribute()
+        {
+
+        }
+
+        public TransientAttribute(Type type) : base(type)
+        {
+        }
+
+        public TransientAttribute(Type type, Type cachedType) : base(type, cachedType)
+        {
+
+        }
+    }
+
     public class ScopeAttribute : DIAttribute
     {
-
-
         public ScopeAttribute()
         {
 
@@ -210,6 +225,15 @@ namespace ASC.Common
                     return true;
                 }
             }
+            else if (c is TransientAttribute)
+            {
+                if (!Transient.Contains(serviceName))
+                {
+                    Transient.Add(serviceName);
+                    ServiceCollection.TryAddTransient(service);
+                    return true;
+                }
+            }
 
             return false;
         }
@@ -236,6 +260,15 @@ namespace ASC.Common
                     return true;
                 }
             }
+            else if (c is TransientAttribute)
+            {
+                if (!Transient.Contains(serviceName))
+                {
+                    Transient.Add(serviceName);
+                    ServiceCollection.TryAddTransient(service, implementation);
+                    return true;
+                }
+            }
 
             return false;
         }
@@ -291,18 +324,6 @@ namespace ASC.Common
             return this;
         }
 
-        public DIHelper TryAddSingleton<TService>(TService t) where TService : class
-        {
-            var serviceName = $"{typeof(TService)}";
-            if (!Singleton.Contains(serviceName))
-            {
-                Singleton.Add(serviceName);
-                ServiceCollection.TryAddSingleton(t);
-            }
-
-            return this;
-        }
-
         public DIHelper TryAddSingleton<TService, TImplementation>() where TService : class where TImplementation : class, TService
         {
             var serviceName = $"{typeof(TService)}{typeof(TImplementation)}";
diff --git a/common/ASC.Common/Logging/EFLoggerFactory.cs b/common/ASC.Common/Logging/EFLoggerFactory.cs
index 9e55ea3818..f2c8ada58b 100644
--- a/common/ASC.Common/Logging/EFLoggerFactory.cs
+++ b/common/ASC.Common/Logging/EFLoggerFactory.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Common.Logging
 {
+    [Scope]
     public class EFLoggerFactory : ILoggerFactory
     {
         Dictionary<string, ILogger> Loggers { get; set; }
@@ -34,6 +35,7 @@ namespace ASC.Common.Logging
         }
     }
 
+    [Scope]
     public class EFLoggerProvider : ILoggerProvider
     {
         private IOptionsMonitor<ILog> Option { get; }
@@ -122,17 +124,4 @@ namespace ASC.Common.Logging
                 string.Empty;
         }
     }
-
-    public static class LoggerExtension
-    {
-        public static DIHelper AddLoggerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<EFLoggerFactory>())
-            {
-                services.TryAddScoped<EFLoggerProvider>();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Common/Security/Cryptography/InstanceCrypto.cs b/common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
index 6cbbc58bd8..4fc1f342a8 100644
--- a/common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
+++ b/common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
@@ -33,6 +33,7 @@ using ASC.Common;
 
 namespace ASC.Security.Cryptography
 {
+    [Singletone]
     public class InstanceCrypto
     {
         private MachinePseudoKeys MachinePseudoKeys { get; }
@@ -86,14 +87,4 @@ namespace ASC.Security.Cryptography
             return MachinePseudoKeys.GetMachineConstant(32);
         }
     }
-    public static class InstanceCryptoExtension
-    {
-        public static DIHelper AddInstanceCryptoService(this DIHelper services)
-        {
-            services.TryAddSingleton<InstanceCrypto>();
-
-            return services
-                .AddMachinePseudoKeysService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Common/Security/Cryptography/MachinePseudoKeys.cs b/common/ASC.Common/Security/Cryptography/MachinePseudoKeys.cs
index 9096b9d89d..faed193f6d 100644
--- a/common/ASC.Common/Security/Cryptography/MachinePseudoKeys.cs
+++ b/common/ASC.Common/Security/Cryptography/MachinePseudoKeys.cs
@@ -36,6 +36,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.Security.Cryptography
 {
+    [Singletone]
     public class MachinePseudoKeys
     {
         private readonly byte[] confkey = null;
@@ -76,13 +77,4 @@ namespace ASC.Security.Cryptography
             return buff;
         }
     }
-    public static class MachinePseudoKeysExtension
-    {
-        public static DIHelper AddMachinePseudoKeysService(this DIHelper services)
-        {
-            services.TryAddSingleton<MachinePseudoKeys>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Common/Security/Cryptography/PasswordHasher.cs b/common/ASC.Common/Security/Cryptography/PasswordHasher.cs
index 03331ee500..fd4269c384 100644
--- a/common/ASC.Common/Security/Cryptography/PasswordHasher.cs
+++ b/common/ASC.Common/Security/Cryptography/PasswordHasher.cs
@@ -34,6 +34,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.Security.Cryptography
 {
+    [Singletone]
     public class PasswordHasher
     {
         public PasswordHasher(IConfiguration configuration, MachinePseudoKeys machinePseudoKeys)
@@ -95,14 +96,5 @@ namespace ASC.Security.Cryptography
             return hash;
         }
     }
-    public static class PasswordHasherExtension
-    {
-        public static DIHelper AddPasswordHasherService(this DIHelper services)
-        {
-            services.TryAddSingleton<PasswordHasher>();
-
-            return services.AddMachinePseudoKeysService();
-        }
-    }
 
 }
\ No newline at end of file
diff --git a/common/ASC.Common/Threading/DistributedTaskQueue.cs b/common/ASC.Common/Threading/DistributedTaskQueue.cs
index b2749bf516..868042b43d 100644
--- a/common/ASC.Common/Threading/DistributedTaskQueue.cs
+++ b/common/ASC.Common/Threading/DistributedTaskQueue.cs
@@ -36,6 +36,7 @@ using ASC.Common.Caching;
 
 namespace ASC.Common.Threading
 {
+    [Singletone]
     public class DistributedTaskCacheNotify
     {
         public ConcurrentDictionary<string, CancellationTokenSource> Cancelations { get; }
diff --git a/common/ASC.Common/Utils/Signature.cs b/common/ASC.Common/Utils/Signature.cs
index 981c3fc91a..ad39e10752 100644
--- a/common/ASC.Common/Utils/Signature.cs
+++ b/common/ASC.Common/Utils/Signature.cs
@@ -36,6 +36,7 @@ using Newtonsoft.Json;
 
 namespace ASC.Common.Utils
 {
+    [Singletone]
     public class Signature
     {
         public Signature(MachinePseudoKeys machinePseudoKeys)
@@ -91,13 +92,4 @@ namespace ASC.Common.Utils
             return Convert.ToBase64String(md5.ComputeHash(Encoding.UTF8.GetBytes(str)));
         }
     }
-
-    public static class SignatureExtension
-    {
-        public static DIHelper AddSignatureService(this DIHelper services)
-        {
-            services.TryAddSingleton<Signature>();
-            return services.AddMachinePseudoKeysService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs b/common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
index bde8cd77f1..44df144bdc 100644
--- a/common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
+++ b/common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
@@ -40,7 +40,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Common.Utils
-{
+{
+    [Singletone]
     public class TimeZoneConverter
     {
         private TimeZoneInfo defaultTimeZone;
diff --git a/common/ASC.Core.Common/BaseCommonLinkUtility.cs b/common/ASC.Core.Common/BaseCommonLinkUtility.cs
index abfacf3048..8cd0e43486 100644
--- a/common/ASC.Core.Common/BaseCommonLinkUtility.cs
+++ b/common/ASC.Core.Common/BaseCommonLinkUtility.cs
@@ -38,12 +38,14 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Common
 {
+    [Singletone]
     public class CommonLinkUtilitySettings
     {
         public string ServerUri { get; set; }
     }
 
 
+    [Scope]
     public class BaseCommonLinkUtility
     {
         private const string LOCALHOST = "localhost";
@@ -243,20 +245,4 @@ namespace ASC.Core.Common
             _vpath = "/" + uri.AbsolutePath.Trim('/');
         }
     }
-
-    public static class BaseCommonLinkUtilityExtension
-    {
-        public static DIHelper AddBaseCommonLinkUtilityService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BaseCommonLinkUtility>())
-            {
-                return services
-                    .AddCoreBaseSettingsService()
-                    .AddCoreSettingsService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Billing/CouponManager.cs b/common/ASC.Core.Common/Billing/CouponManager.cs
index 4916984af5..dae8278791 100644
--- a/common/ASC.Core.Common/Billing/CouponManager.cs
+++ b/common/ASC.Core.Common/Billing/CouponManager.cs
@@ -35,6 +35,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Common.Logging;
 
 using Microsoft.Extensions.Options;
@@ -42,7 +43,8 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace ASC.Core.Common.Billing
-{
+{
+    [Singletone]
     public class CouponManager
     {
         private IEnumerable<AvangateProduct> Products { get; set; }
diff --git a/common/ASC.Core.Common/Billing/ITariffService.cs b/common/ASC.Core.Common/Billing/ITariffService.cs
index 2c6a09086d..0246ef4fed 100644
--- a/common/ASC.Core.Common/Billing/ITariffService.cs
+++ b/common/ASC.Core.Common/Billing/ITariffService.cs
@@ -25,10 +25,13 @@
 
 
 using System;
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
+using ASC.Common;
+
 namespace ASC.Core.Billing
-{
+{
+    [Scope(typeof(ConfigureTariffService))]
     public interface ITariffService
     {
         Tariff GetTariff(int tenantId, bool withRequestToPaymentSystem = true);
diff --git a/common/ASC.Core.Common/Billing/License/LicenseReader.cs b/common/ASC.Core.Common/Billing/License/LicenseReader.cs
index b62a494873..cb4411d74a 100644
--- a/common/ASC.Core.Common/Billing/License/LicenseReader.cs
+++ b/common/ASC.Core.Common/Billing/License/LicenseReader.cs
@@ -37,7 +37,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Billing
-{
+{
+    [Scope]
     public class LicenseReader
     {
         private readonly ILog Log;
@@ -340,21 +341,4 @@ namespace ASC.Core.Billing
         private CoreSettings CoreSettings { get; }
         private IConfiguration Configuration { get; }
     }
-
-    public static class LicenseReaderExtension
-    {
-        public static DIHelper AddLicenseReaderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<LicenseReader>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddPaymentManagerService()
-                    .AddTenantManagerService()
-                    .AddCoreSettingsService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Billing/TariffService.cs b/common/ASC.Core.Common/Billing/TariffService.cs
index b5442aec69..8ca0305b58 100644
--- a/common/ASC.Core.Common/Billing/TariffService.cs
+++ b/common/ASC.Core.Common/Billing/TariffService.cs
@@ -42,7 +42,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Billing
-{
+{
+    [Singletone]
     public class TariffServiceStorage
     {
         public ICache Cache { get; }
@@ -686,19 +687,4 @@ namespace ASC.Core.Billing
             }
         }
     }
-
-    public static class TariffConfigExtension
-    {
-        public static DIHelper AddTariffService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ITariffService, TariffService>())
-            {
-                services.AddCoreDbContextService();
-                services.TryAddSingleton<TariffServiceStorage>();
-                services.TryAddScoped<IConfigureOptions<TariffService>, ConfigureTariffService>();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Caching/CachedAzService.cs b/common/ASC.Core.Common/Caching/CachedAzService.cs
index 16edfd09df..a6eea72708 100644
--- a/common/ASC.Core.Common/Caching/CachedAzService.cs
+++ b/common/ASC.Core.Common/Caching/CachedAzService.cs
@@ -29,11 +29,11 @@ using System.Collections.Generic;
 
 using ASC.Common;
 using ASC.Common.Caching;
-using ASC.Core.Common.EF;
 using ASC.Core.Data;
 
 namespace ASC.Core.Caching
-{
+{
+    [Singletone]
     class AzServiceCache
     {
         internal ICache Cache { get; }
@@ -72,7 +72,8 @@ namespace ASC.Core.Caching
             return "acl" + tenant.ToString();
         }
     }
-
+
+    [Scope]
     class CachedAzService : IAzService
     {
         private readonly IAzService service;
@@ -118,20 +119,4 @@ namespace ASC.Core.Caching
             cacheNotify.Publish(r, CacheNotifyAction.Remove);
         }
     }
-
-    public static class AzConfigExtension
-    {
-        public static DIHelper AddAzService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DbAzService>())
-            {
-                services.TryAddScoped<IAzService, CachedAzService>();
-                services.TryAddSingleton<AzServiceCache>();
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                services.AddCoreDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Caching/CachedQuotaService.cs b/common/ASC.Core.Common/Caching/CachedQuotaService.cs
index d02fe23525..c034666d35 100644
--- a/common/ASC.Core.Common/Caching/CachedQuotaService.cs
+++ b/common/ASC.Core.Common/Caching/CachedQuotaService.cs
@@ -30,7 +30,6 @@ using System.Linq;
 
 using ASC.Common;
 using ASC.Common.Caching;
-using ASC.Core.Common.EF;
 using ASC.Core.Data;
 using ASC.Core.Tenants;
 
@@ -38,7 +37,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Caching
-{
+{
+    [Singletone]
     class QuotaServiceCache
     {
         internal const string KEY_QUOTA = "quota";
@@ -106,7 +106,8 @@ namespace ASC.Core.Caching
             options.CacheNotify = QuotaServiceCache.CacheNotify;
         }
     }
-
+
+    [Scope]
     class CachedQuotaService : IQuotaService
     {
         internal IQuotaService Service { get; set; }
@@ -237,25 +238,4 @@ namespace ASC.Core.Caching
             }
         }
     }
-
-    public static class QuotaConfigExtension
-    {
-        public static DIHelper AddQuotaService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DbQuotaService>())
-            {
-                services.TryAddScoped<IQuotaService, CachedQuotaService>();
-
-                services.TryAddScoped<IConfigureOptions<DbQuotaService>, ConfigureDbQuotaService>();
-                services.TryAddScoped<IConfigureOptions<CachedQuotaService>, ConfigureCachedQuotaService>();
-
-                services.AddCoreDbContextService();
-
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                services.TryAddSingleton<QuotaServiceCache>();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Caching/CachedSubscriptionService.cs b/common/ASC.Core.Common/Caching/CachedSubscriptionService.cs
index 64903940b3..194bd48cc5 100644
--- a/common/ASC.Core.Common/Caching/CachedSubscriptionService.cs
+++ b/common/ASC.Core.Common/Caching/CachedSubscriptionService.cs
@@ -30,11 +30,11 @@ using System.Linq;
 
 using ASC.Common;
 using ASC.Common.Caching;
-using ASC.Core.Common.EF;
 using ASC.Core.Data;
 
 namespace ASC.Core.Caching
 {
+    [Singletone]
     class SubscriptionServiceCache
     {
         internal ICache Cache { get; }
@@ -102,6 +102,7 @@ namespace ASC.Core.Caching
         }
     }
 
+    [Scope]
     class CachedSubscriptionService : ISubscriptionService
     {
         private readonly ISubscriptionService service;
@@ -285,20 +286,4 @@ namespace ASC.Core.Caching
             methodsByRec = methods.GroupBy(r => r.RecipientId).ToDictionary(g => g.Key, g => g.ToList());
         }
     }
-
-    public static class SubscriptionConfigExtension
-    {
-        public static DIHelper AddSubscriptionService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DbSubscriptionService>())
-            {
-                services.TryAddScoped<ISubscriptionService, CachedSubscriptionService>();
-                services.TryAddSingleton<SubscriptionServiceCache>();
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                services.AddUserDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Caching/CachedTenantService.cs b/common/ASC.Core.Common/Caching/CachedTenantService.cs
index 9749303331..5ce4090763 100644
--- a/common/ASC.Core.Common/Caching/CachedTenantService.cs
+++ b/common/ASC.Core.Common/Caching/CachedTenantService.cs
@@ -30,14 +30,14 @@ using System.Collections.Generic;
 using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.Utils;
-using ASC.Core.Common.EF.Context;
 using ASC.Core.Data;
 using ASC.Core.Tenants;
 
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Caching
-{
+{
+    [Singletone]
     class TenantServiceCache
     {
         private const string KEY = "tenants";
@@ -151,7 +151,8 @@ namespace ASC.Core.Caching
             }
         }
     }
-
+
+    [Scope]
     class ConfigureCachedTenantService : IConfigureNamedOptions<CachedTenantService>
     {
         private IOptionsSnapshot<DbTenantService> Service { get; }
@@ -302,29 +303,4 @@ namespace ASC.Core.Caching
             CacheNotifySettings.Publish(new TenantSetting { Key = cacheKey }, CacheNotifyAction.Remove);
         }
     }
-
-    public static class TenantConfigExtension
-    {
-        public static DIHelper AddTenantService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DbTenantService>())
-            {
-                services.TryAddScoped<IConfigureOptions<DbTenantService>, ConfigureDbTenantService>();
-
-                services.TryAddScoped<ITenantService, CachedTenantService>();
-                services.TryAddScoped<IConfigureOptions<CachedTenantService>, ConfigureCachedTenantService>();
-
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                services.TryAddSingleton<TenantDomainValidator>();
-                services.TryAddSingleton<TimeZoneConverter>();
-                services.TryAddSingleton<TenantServiceCache>();
-
-                return services
-                    .AddCoreBaseSettingsService()
-                    .AddTenantDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Caching/CachedUserService.cs b/common/ASC.Core.Common/Caching/CachedUserService.cs
index fb63f9f131..9d4665a8bf 100644
--- a/common/ASC.Core.Common/Caching/CachedUserService.cs
+++ b/common/ASC.Core.Common/Caching/CachedUserService.cs
@@ -32,17 +32,16 @@ using System.Threading;
 
 using ASC.Common;
 using ASC.Common.Caching;
-using ASC.Common.Logging;
 using ASC.Core.Common.EF;
 using ASC.Core.Data;
 using ASC.Core.Tenants;
 using ASC.Core.Users;
-using ASC.Security.Cryptography;
 
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Caching
-{
+{
+    [Singletone]
     public class UserServiceCache
     {
         public const string USERS = "users";
@@ -522,28 +521,4 @@ namespace ASC.Core.Caching
             public string Key { get; set; }
         }
     }
-    public static class UserConfigExtension
-    {
-        public static DIHelper AddUserService(this DIHelper services)
-        {
-            if (services.TryAddScoped<EFUserService>())//
-            {
-                services.TryAddScoped<IConfigureOptions<EFUserService>, ConfigureEFUserService>();//
-
-                services.TryAddScoped<IUserService, CachedUserService>();
-                services.TryAddScoped<IConfigureOptions<CachedUserService>, ConfigureCachedUserService>();
-
-                services.TryAddSingleton<UserServiceCache>();
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-
-                services
-                    .AddCoreSettingsService()
-                    .AddLoggerService()
-                    .AddUserDbContextService()
-                    .AddPasswordHasherService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Configuration/Consumer.cs b/common/ASC.Core.Common/Configuration/Consumer.cs
index f77f77639f..b88b19aae4 100644
--- a/common/ASC.Core.Common/Configuration/Consumer.cs
+++ b/common/ASC.Core.Common/Configuration/Consumer.cs
@@ -377,7 +377,8 @@ namespace ASC.Core.Common.Configuration
             return new DataStoreConsumer(TenantManager, CoreBaseSettings, CoreSettings, Configuration, Cache, ConsumerFactory, Name, Order, Props.ToDictionary(r => r.Key, r => r.Value), Additional.ToDictionary(r => r.Key, r => r.Value));
         }
     }
-
+
+    [Scope]
     public class ConsumerFactory : IDisposable
     {
         public ILifetimeScope Builder { get; set; }
@@ -432,13 +433,4 @@ namespace ASC.Core.Common.Configuration
             Builder.Dispose();
         }
     }
-
-    public static class ConsumerFactoryExtension
-    {
-        public static DIHelper AddConsumerFactoryService(this DIHelper services)
-        {
-            services.TryAddScoped<ConsumerFactory>();
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Context/Impl/AuthManager.cs b/common/ASC.Core.Common/Context/Impl/AuthManager.cs
index c3ef0e7c60..d079dda0c0 100644
--- a/common/ASC.Core.Common/Context/Impl/AuthManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/AuthManager.cs
@@ -29,13 +29,13 @@ using System.Linq;
 
 using ASC.Common;
 using ASC.Common.Security.Authentication;
-using ASC.Core.Caching;
 using ASC.Core.Security.Authentication;
 using ASC.Core.Tenants;
 using ASC.Core.Users;
 
 namespace ASC.Core
-{
+{
+    [Scope]
     public class AuthManager
     {
         private readonly IUserService userService;
@@ -83,19 +83,4 @@ namespace ASC.Core
             return new UserAccount(u, tenantId, UserFormatter);
         }
     }
-    public static class AuthManagerExtension
-    {
-        public static DIHelper AddAuthManager(this DIHelper services)
-        {
-            if (services.TryAddScoped<AuthManager>())
-            {
-                return services
-                    .AddUserService()
-                    .AddUserFormatter()
-                    .AddUserManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Context/Impl/AuthorizationManager.cs b/common/ASC.Core.Common/Context/Impl/AuthorizationManager.cs
index 93f0b032fd..5f0e9609f5 100644
--- a/common/ASC.Core.Common/Context/Impl/AuthorizationManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/AuthorizationManager.cs
@@ -34,7 +34,8 @@ using ASC.Common.Security.Authorizing;
 using ASC.Core.Caching;
 
 namespace ASC.Core
-{
+{
+    [Scope]
     public class AuthorizationManager
     {
         private readonly IAzService service;
@@ -128,19 +129,4 @@ namespace ASC.Core
                 aces.Where(a => (a.SubjectId == subjectId || subjectId == Guid.Empty) && (a.ActionId == actionId || actionId == Guid.Empty) && a.ObjectId == objId);
         }
     }
-
-    public static class AuthorizationManagerConfigExtension
-    {
-        public static DIHelper AddAuthorizationManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<AuthorizationManager>())
-            {
-                return services
-                    .AddAzService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs b/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
index b8dabf8e48..73b0373e31 100644
--- a/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
+++ b/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
@@ -103,7 +103,8 @@ namespace ASC.Core
             options.TenantService = TenantService.Value;
         }
     }
-
+
+    [Scope(typeof(ConfigureCoreSettings))]
     public class CoreSettings
     {
         private string basedomain;
@@ -242,7 +243,8 @@ namespace ASC.Core
             return null;
         }
     }
-
+
+    [Scope]
     public class CoreConfiguration
     {
         private long? personalMaxSpace;
@@ -373,35 +375,4 @@ namespace ASC.Core
 
         #endregion
     }
-
-    public static class CoreSettingsConfigExtension
-    {
-        public static DIHelper AddCoreBaseSettingsService(this DIHelper services)
-        {
-            services.TryAddSingleton<CoreBaseSettings>();
-            return services;
-        }
-
-        public static DIHelper AddCoreSettingsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<CoreSettings>())
-            {
-                services.TryAddScoped<CoreConfiguration>();
-                services.TryAddScoped<IConfigureOptions<CoreSettings>, ConfigureCoreSettings>();
-
-                return services
-                    .AddCoreBaseSettingsService()
-                    .AddTenantService();
-            }
-
-            return services;
-        }
-        public static DIHelper AddCoreConfigurationService(this DIHelper services)
-        {
-            services.TryAddScoped<CoreConfiguration>();
-            return services
-                .AddTenantManagerService()
-                .AddCoreSettingsService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Context/Impl/PaymentManager.cs b/common/ASC.Core.Common/Context/Impl/PaymentManager.cs
index 8501cbcc5d..8701ef2c92 100644
--- a/common/ASC.Core.Common/Context/Impl/PaymentManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/PaymentManager.cs
@@ -36,7 +36,6 @@ using System.Web;
 
 using ASC.Common;
 using ASC.Core.Billing;
-using ASC.Core.Caching;
 
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Configuration;
@@ -45,7 +44,8 @@ using Newtonsoft.Json;
 
 
 namespace ASC.Core
-{
+{
+    [Scope]
     public class PaymentManager
     {
         private readonly ITariffService tariffService;
@@ -182,20 +182,4 @@ namespace ASC.Core
             public string stackTrace = null;
         }
     }
-
-    public static class PaymentManagerExtension
-    {
-        public static DIHelper AddPaymentManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<PaymentManager>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddQuotaService()
-                    .AddTariffService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs b/common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
index 11728eef80..f801a1639a 100644
--- a/common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
@@ -28,10 +28,10 @@ using System;
 using System.Linq;
 
 using ASC.Common;
-using ASC.Core.Caching;
 
 namespace ASC.Core
-{
+{
+    [Scope]
     public class SubscriptionManager
     {
         private readonly ISubscriptionService service;
@@ -148,19 +148,4 @@ namespace ASC.Core
             return TenantManager.GetCurrentTenant().TenantId;
         }
     }
-
-    public static class SubscriptionConfigExtension
-    {
-        public static DIHelper AddSubscriptionManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SubscriptionManager>())
-            {
-                return services
-                        .AddSubscriptionService()
-                        .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Context/Impl/TenantManager.cs b/common/ASC.Core.Common/Context/Impl/TenantManager.cs
index af149e7588..5a8bea8173 100644
--- a/common/ASC.Core.Common/Context/Impl/TenantManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/TenantManager.cs
@@ -88,7 +88,8 @@ namespace ASC.Core
             options.TariffService = TariffService.Value;
         }
     }
-
+
+    [Scope(typeof(ConfigureTenantManager))]
     public class TenantManager
     {
         private class TenantHolder
@@ -380,24 +381,4 @@ namespace ASC.Core
             return QuotaService.FindTenantQuotaRows(query).ToList();
         }
     }
-
-    public static class TenantManagerConfigExtension
-    {
-        public static DIHelper AddTenantManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantManager>())
-            {
-                services.TryAddScoped<IConfigureOptions<TenantManager>, ConfigureTenantManager>();
-
-                return services
-                    .AddTenantService()
-                    .AddQuotaService()
-                    .AddTariffService()
-                    .AddCoreBaseSettingsService()
-                    .AddCoreSettingsService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Context/Impl/UserManager.cs b/common/ASC.Core.Common/Context/Impl/UserManager.cs
index 264b026a00..59304570b8 100644
--- a/common/ASC.Core.Common/Context/Impl/UserManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/UserManager.cs
@@ -654,25 +654,4 @@ namespace ASC.Core
             };
         }
     }
-
-    public static class UserManagerConfigExtension
-    {
-        public static DIHelper AddUserManagerService(this DIHelper services)
-        {
-            services.TryAdd(typeof(UserManager));
-
-            if (services.TryAddScoped<UserManager>())
-            {
-                services.TryAddSingleton<UserManagerConstants>();
-
-                return services
-                    .AddUserService()
-                    .AddTenantManagerService()
-                    .AddConstantsService()
-                    .AddPermissionContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Context/SecurityContext.cs b/common/ASC.Core.Common/Context/SecurityContext.cs
index 6a5291cade..6c7de5c04f 100644
--- a/common/ASC.Core.Common/Context/SecurityContext.cs
+++ b/common/ASC.Core.Common/Context/SecurityContext.cs
@@ -41,7 +41,6 @@ using ASC.Common.Security.Authorizing;
 using ASC.Core.Billing;
 using ASC.Core.Common.Security;
 using ASC.Core.Security.Authentication;
-using ASC.Core.Security.Authorizing;
 using ASC.Core.Tenants;
 using ASC.Core.Users;
 
@@ -50,6 +49,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Core
 {
+    [Scope]
     public class SecurityContext
     {
         private readonly ILog log;
@@ -373,41 +373,4 @@ namespace ASC.Core
             }
         }
     }
-
-    public static class AuthContextConfigExtension
-    {
-        public static DIHelper AddSecurityContextService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SecurityContext>())
-            {
-                return services
-                    .AddCookieStorageService()
-                    .AddTenantCookieSettingsService()
-                    .AddAuthManager()
-                    .AddUserFormatter()
-                    .AddAuthContextService()
-                    .AddUserManagerService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-        public static DIHelper AddAuthContextService(this DIHelper services)
-        {
-            services.TryAddScoped<AuthContext>();
-            return services;
-        }
-
-        public static DIHelper AddPermissionContextService(this DIHelper services)
-        {
-            if (services.TryAddScoped<PermissionContext>())
-            {
-                return services
-                    .AddAuthContextService()
-                    .AddPermissionResolverService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Core/DBResourceManager.cs b/common/ASC.Core.Common/Core/DBResourceManager.cs
index d003bc3f9b..0a0395a6a0 100644
--- a/common/ASC.Core.Common/Core/DBResourceManager.cs
+++ b/common/ASC.Core.Common/Core/DBResourceManager.cs
@@ -277,7 +277,8 @@ namespace TMResourceData
             }
         }
     }
-
+
+    [Singletone]
     public class WhiteLabelHelper
     {
         private readonly ILog log;
@@ -366,13 +367,4 @@ namespace TMResourceData
             return resourceValue;
         }
     }
-
-    public static class WhiteLabelHelperExtension
-    {
-        public static DIHelper AddWhiteLabelHelperService(this DIHelper services)
-        {
-            services.TryAddSingleton<WhiteLabelHelper>();
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Core/IAzService.cs b/common/ASC.Core.Common/Core/IAzService.cs
index 094dc7c9d2..b2d37e65dc 100644
--- a/common/ASC.Core.Common/Core/IAzService.cs
+++ b/common/ASC.Core.Common/Core/IAzService.cs
@@ -25,10 +25,15 @@
 
 
 using System;
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
+using ASC.Common;
+using ASC.Core.Caching;
+using ASC.Core.Data;
+
 namespace ASC.Core
-{
+{
+    [Scope(typeof(DbAzService), typeof(CachedAzService))]
     public interface IAzService
     {
         IEnumerable<AzRecord> GetAces(int tenant, DateTime from);
diff --git a/common/ASC.Core.Common/Core/IQuotaService.cs b/common/ASC.Core.Common/Core/IQuotaService.cs
index 1549d2082b..1eee276e51 100644
--- a/common/ASC.Core.Common/Core/IQuotaService.cs
+++ b/common/ASC.Core.Common/Core/IQuotaService.cs
@@ -26,10 +26,14 @@
 
 using System.Collections.Generic;
 
+using ASC.Common;
+using ASC.Core.Caching;
+using ASC.Core.Data;
 using ASC.Core.Tenants;
 
 namespace ASC.Core
-{
+{
+    [Scope(typeof(ConfigureDbQuotaService), typeof(ConfigureCachedQuotaService))]
     public interface IQuotaService
     {
         IEnumerable<TenantQuota> GetTenantQuotas();
diff --git a/common/ASC.Core.Common/Core/ISubscriptionService.cs b/common/ASC.Core.Common/Core/ISubscriptionService.cs
index 1ff5db4be5..fef9770d33 100644
--- a/common/ASC.Core.Common/Core/ISubscriptionService.cs
+++ b/common/ASC.Core.Common/Core/ISubscriptionService.cs
@@ -24,10 +24,15 @@
 */
 
 
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
+using ASC.Common;
+using ASC.Core.Caching;
+using ASC.Core.Data;
+
 namespace ASC.Core
-{
+{
+    [Scope(typeof(DbSubscriptionService), typeof(CachedSubscriptionService))]
     public interface ISubscriptionService
     {
         IEnumerable<SubscriptionRecord> GetSubscriptions(int tenant, string sourceId, string actionId);
diff --git a/common/ASC.Core.Common/Core/ITenantService.cs b/common/ASC.Core.Common/Core/ITenantService.cs
index 358d6ae352..7c913d957f 100644
--- a/common/ASC.Core.Common/Core/ITenantService.cs
+++ b/common/ASC.Core.Common/Core/ITenantService.cs
@@ -27,10 +27,14 @@
 using System;
 using System.Collections.Generic;
 
+using ASC.Common;
+using ASC.Core.Caching;
+using ASC.Core.Data;
 using ASC.Core.Tenants;
 
 namespace ASC.Core
-{
+{
+    [Scope(typeof(ConfigureDbTenantService), typeof(ConfigureCachedTenantService))]
     public interface ITenantService
     {
         void ValidateDomain(string domain);
diff --git a/common/ASC.Core.Common/Data/DbAzService.cs b/common/ASC.Core.Common/Data/DbAzService.cs
index 0c4f24e27d..f4553e7026 100644
--- a/common/ASC.Core.Common/Data/DbAzService.cs
+++ b/common/ASC.Core.Common/Data/DbAzService.cs
@@ -29,11 +29,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Tenants;
 
 namespace ASC.Core.Data
-{
+{
+    [Scope]
     class DbAzService : IAzService
     {
         public Expression<Func<Acl, AzRecord>> FromAclToAzRecord { get; set; }
diff --git a/common/ASC.Core.Common/Data/DbQuotaService.cs b/common/ASC.Core.Common/Data/DbQuotaService.cs
index eb28fbc8e9..b4cf619800 100644
--- a/common/ASC.Core.Common/Data/DbQuotaService.cs
+++ b/common/ASC.Core.Common/Data/DbQuotaService.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Tenants;
 
@@ -56,7 +57,8 @@ namespace ASC.Core.Data
             options.LazyCoreDbContext = new Lazy<CoreDbContext>(() => DbContextManager.Value);
         }
     }
-
+
+    [Scope]
     class DbQuotaService : IQuotaService
     {
         private Expression<Func<DbQuota, TenantQuota>> FromDbQuotaToTenantQuota { get; set; }
diff --git a/common/ASC.Core.Common/Data/DbSettingsManager.cs b/common/ASC.Core.Common/Data/DbSettingsManager.cs
index 1a508f82bc..ae782d8f89 100644
--- a/common/ASC.Core.Common/Data/DbSettingsManager.cs
+++ b/common/ASC.Core.Common/Data/DbSettingsManager.cs
@@ -41,7 +41,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Data
-{
+{
+    [Singletone]
     public class DbSettingsManagerCache
     {
         public ICache Cache { get; }
@@ -105,7 +106,8 @@ namespace ASC.Core.Data
             options.LazyWebstudioDbContext = new Lazy<WebstudioDbContext>(() => DbContextManager.Value);
         }
     }
-
+
+    [Scope(typeof(ConfigureDbSettingsManager))]
     public class DbSettingsManager
     {
         private readonly TimeSpan expirationTimeout = TimeSpan.FromMinutes(5);
@@ -330,20 +332,4 @@ namespace ASC.Core.Data
         }
 
     }
-
-    public static class DbSettingsManagerExtension
-    {
-        public static DIHelper AddDbSettingsManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DbSettingsManager>())
-            {
-                services.TryAddScoped<IConfigureOptions<DbSettingsManager>, ConfigureDbSettingsManager>();
-                services.TryAddSingleton<DbSettingsManagerCache>();
-
-                return services.AddWebstudioDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Data/DbSubscriptionService.cs b/common/ASC.Core.Common/Data/DbSubscriptionService.cs
index 358951d275..c6402155df 100644
--- a/common/ASC.Core.Common/Data/DbSubscriptionService.cs
+++ b/common/ASC.Core.Common/Data/DbSubscriptionService.cs
@@ -29,11 +29,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Tenants;
 
 namespace ASC.Core.Data
-{
+{
+    [Scope]
     class DbSubscriptionService : ISubscriptionService
     {
         private Expression<Func<Subscription, SubscriptionRecord>> FromSubscriptionToSubscriptionRecord { get; set; }
diff --git a/common/ASC.Core.Common/Data/DbTenantService.cs b/common/ASC.Core.Common/Data/DbTenantService.cs
index de84bddf85..4fe9a072af 100644
--- a/common/ASC.Core.Common/Data/DbTenantService.cs
+++ b/common/ASC.Core.Common/Data/DbTenantService.cs
@@ -30,6 +30,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Context;
 using ASC.Core.Common.EF.Model;
@@ -41,7 +42,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Data
-{
+{
+    [Scope]
     public class ConfigureDbTenantService : IConfigureNamedOptions<DbTenantService>
     {
         private TenantDomainValidator TenantDomainValidator { get; }
diff --git a/common/ASC.Core.Common/EF/Context/CoreDbContext.cs b/common/ASC.Core.Common/EF/Context/CoreDbContext.cs
index 256ee18629..0eac5e468e 100644
--- a/common/ASC.Core.Common/EF/Context/CoreDbContext.cs
+++ b/common/ASC.Core.Common/EF/Context/CoreDbContext.cs
@@ -1,12 +1,11 @@
 
-using ASC.Common;
+using System;
+using System.Collections.Generic;
+
 using ASC.Core.Common.EF.Model;
 
 using Microsoft.EntityFrameworkCore;
 
-using System;
-using System.Collections.Generic;
-
 namespace ASC.Core.Common.EF
 {
     public class MySqlCoreDbContext : CoreDbContext { }
@@ -40,13 +39,4 @@ namespace ASC.Core.Common.EF
                   .AddDbTariff();
         }
     }
-
-
-    public static class CoreDbExtension
-    {
-        public static DIHelper AddCoreDbContextService(this DIHelper services)
-        {
-            return services.AddDbContextManagerService<CoreDbContext>();
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/EF/Context/DbContextManager.cs b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
index 478f1ba7ef..de70cc4c70 100644
--- a/common/ASC.Core.Common/EF/Context/DbContextManager.cs
+++ b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 
 using ASC.Common;
-using ASC.Common.Logging;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
@@ -85,14 +84,8 @@ namespace ASC.Core.Common.EF
     {
         public static DIHelper AddDbContextManagerService<T>(this DIHelper services) where T : BaseDbContext, new()
         {
-            if (services.TryAddScoped<DbContextManager<T>>())
-            {
-                services.TryAddScoped<IConfigureOptions<T>, ConfigureDbContext>();
-
-                services.TryAddScoped<MultiRegionalDbContextManager<T>>();
-                services.TryAddScoped<IConfigureOptions<MultiRegionalDbContext<T>>, ConfigureMultiRegionalDbContext<T>>();
-                return services.AddLoggerService();
-            }
+            services.TryAddScoped<MultiRegionalDbContextManager<T>>();
+            services.TryAddScoped<IConfigureOptions<MultiRegionalDbContext<T>>, ConfigureMultiRegionalDbContext<T>>();
             return services;
         }
     }
diff --git a/common/ASC.Core.Common/EF/JsonExtensions.cs b/common/ASC.Core.Common/EF/JsonExtensions.cs
index 1470a2cf73..6dd38db363 100644
--- a/common/ASC.Core.Common/EF/JsonExtensions.cs
+++ b/common/ASC.Core.Common/EF/JsonExtensions.cs
@@ -1,11 +1,4 @@
-using System.Collections.Generic;
-using System.Linq.Expressions;
-
-using ASC.Core.Common.EF.Model;
-
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace ASC.Core.Common.EF
 {
diff --git a/common/ASC.Core.Common/HostedSolution.cs b/common/ASC.Core.Common/HostedSolution.cs
index 33952c985d..2d0c210d8d 100644
--- a/common/ASC.Core.Common/HostedSolution.cs
+++ b/common/ASC.Core.Common/HostedSolution.cs
@@ -291,16 +291,7 @@ namespace ASC.Core
         {
             if (services.TryAddScoped<IConfigureOptions<HostedSolution>, ConfigureHostedSolution>())
             {
-                return services
-                    .AddUserFormatter()
-                    .AddTenantService()
-                    .AddUserService()
-                    .AddQuotaService()
-                    .AddTariffService()
-                    .AddTenantManagerService()
-                    .AddTenantUtilService()
-                    .AddDbSettingsManagerService()
-                    .AddCoreSettingsService();
+                return services;
             }
 
             return services;
diff --git a/common/ASC.Core.Common/Notify/Jabber/JabberServiceClient.cs b/common/ASC.Core.Common/Notify/Jabber/JabberServiceClient.cs
index 4b43a231e2..38cca0061c 100644
--- a/common/ASC.Core.Common/Notify/Jabber/JabberServiceClient.cs
+++ b/common/ASC.Core.Common/Notify/Jabber/JabberServiceClient.cs
@@ -32,7 +32,8 @@ using ASC.Common;
 using ASC.Core.Common.Notify.Jabber;
 
 namespace ASC.Core.Notify.Jabber
-{
+{
+    [Scope]
     public class JabberServiceClient
     {
         private static readonly TimeSpan Timeout = TimeSpan.FromMinutes(2);
@@ -239,20 +240,4 @@ namespace ASC.Core.Notify.Jabber
             return new JabberServiceClientWcf();
         }
     }
-
-    public static class JabberServiceClientExtension
-    {
-        public static DIHelper AddJabberServiceClient(this DIHelper services)
-        {
-            if (services.TryAddScoped<JabberServiceClient>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddAuthContextService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Notify/NotifyServiceClient.cs b/common/ASC.Core.Common/Notify/NotifyServiceClient.cs
index 11d972583c..f14c39a7b5 100644
--- a/common/ASC.Core.Common/Notify/NotifyServiceClient.cs
+++ b/common/ASC.Core.Common/Notify/NotifyServiceClient.cs
@@ -24,12 +24,14 @@
 */
 
 
+using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Notify;
 using ASC.Notify.Messages;
 
 namespace ASC.Core.Notify
-{
+{
+    [Scope]
     public class NotifyServiceClient : INotifyService
     {
         private readonly ICacheNotify<NotifyMessage> СacheNotify;
diff --git a/common/ASC.Core.Common/Notify/Senders/AWSSender.cs b/common/ASC.Core.Common/Notify/Senders/AWSSender.cs
index 8fa982ad3c..d9297f9e9b 100644
--- a/common/ASC.Core.Common/Notify/Senders/AWSSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/AWSSender.cs
@@ -45,7 +45,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Notify.Senders
-{
+{
+    [Singletone]
     class AWSSender : SmtpSender
     {
         private readonly object locker = new object();
@@ -251,11 +252,8 @@ namespace ASC.Core.Notify.Senders
     {
         public static DIHelper AddAWSSenderService(this DIHelper services)
         {
-            services.TryAddSingleton<AWSSender>();
             services.TryAddScoped<AWSSenderScope>();
-            return services
-                .AddTenantManagerService()
-                .AddCoreSettingsService();
+            return services;
         }
     }
 }
diff --git a/common/ASC.Core.Common/Notify/Senders/JabberSender.cs b/common/ASC.Core.Common/Notify/Senders/JabberSender.cs
index 90800df283..3f8cc6bafb 100644
--- a/common/ASC.Core.Common/Notify/Senders/JabberSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/JabberSender.cs
@@ -37,7 +37,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Notify.Senders
-{
+{
+    [Singletone]
     public class JabberSender : INotifySender
     {
         private readonly ILog log;
@@ -76,13 +77,4 @@ namespace ASC.Core.Notify.Senders
             return NoticeSendResult.OK;
         }
     }
-
-    public static class JabberSenderExtension
-    {
-        public static DIHelper AddJabberSenderService(this DIHelper services)
-        {
-            services.TryAddSingleton<JabberSender>();
-            return services.AddJabberServiceClient();
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs b/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
index ded2fc9a87..bc0ac61e16 100644
--- a/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
@@ -45,7 +45,8 @@ using Microsoft.Extensions.Options;
 using MimeKit;
 
 namespace ASC.Core.Notify.Senders
-{
+{
+    [Singletone]
     internal class SmtpSender : INotifySender
     {
         private const string HTML_FORMAT =
@@ -343,11 +344,8 @@ namespace ASC.Core.Notify.Senders
     {
         public static DIHelper AddSmtpSenderService(this DIHelper services)
         {
-            services.TryAddSingleton<SmtpSender>();
             services.TryAddScoped<SmtpSenderScope>();
-            return services
-                .AddTenantManagerService()
-                .AddCoreSettingsService();
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs b/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
index e071d09079..84950222dc 100644
--- a/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
+++ b/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
@@ -100,7 +100,8 @@ namespace ASC.Core.Notify.Signalr
             Configure("default", options);
         }
     }
-
+
+    [Scope(typeof(ConfigureSignalrServiceClient))]
     public class SignalrServiceClient
     {
         private static readonly TimeSpan Timeout;
@@ -394,22 +395,4 @@ namespace ASC.Core.Notify.Signalr
             return string.Format("ASC {0}:{1}:{2}", pkey, now, hash);
         }
     }
-
-    public static class SignalrServiceClientExtension
-    {
-        public static DIHelper AddSignalrServiceClient(this DIHelper services)
-        {
-            if (services.TryAddScoped<SignalrServiceClient>())
-            {
-                services.TryAddScoped<IConfigureNamedOptions<SignalrServiceClient>, ConfigureSignalrServiceClient>();
-
-                return services
-                    .AddTenantManagerService()
-                    .AddCoreSettingsService()
-                    .AddMachinePseudoKeysService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs b/common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
index 6076ca54f4..b642a31151 100644
--- a/common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
+++ b/common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
@@ -30,7 +30,6 @@ using System.Linq;
 
 using ASC.Common;
 using ASC.Common.Caching;
-using ASC.Core.Common.EF.Context;
 using ASC.Core.Common.EF.Model;
 
 using Microsoft.Extensions.Options;
@@ -62,7 +61,8 @@ namespace ASC.Core.Common.Notify.Telegram
             options.SingleKeyFormat = "tgUser:{0}";
         }
     }
-
+
+    [Scope(typeof(ConfigureCachedTelegramDao))]
     public class CachedTelegramDao
     {
         public TelegramDao TgDao { get; set; }
@@ -116,24 +116,5 @@ namespace ASC.Core.Common.Notify.Telegram
             var key = string.Format(PairKeyFormat, userId, tenantId);
             Cache.Insert(key, new TelegramUser { PortalUserId = userId, TenantId = tenantId, TelegramUserId = telegramId }, Expiration);
         }
-    }
-
-    public static class CachedTelegramDaoExtension
-    {
-        public static DIHelper AddCachedTelegramDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TelegramDao>())
-            {
-
-                services.TryAddScoped<IConfigureOptions<TelegramDao>, ConfigureTelegramDaoService>();
-                services.TryAddScoped<IConfigureOptions<CachedTelegramDao>, ConfigureCachedTelegramDao>();
-
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-
-                return services.AddTelegramDbContextService();
-            }
-
-            return services;
-        }
     }
 }
diff --git a/common/ASC.Core.Common/Notify/Telegram/Dao/TelegramDao.cs b/common/ASC.Core.Common/Notify/Telegram/Dao/TelegramDao.cs
index feb0605841..1446c4260e 100644
--- a/common/ASC.Core.Common/Notify/Telegram/Dao/TelegramDao.cs
+++ b/common/ASC.Core.Common/Notify/Telegram/Dao/TelegramDao.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Context;
 using ASC.Core.Common.EF.Model;
@@ -58,6 +59,7 @@ namespace ASC.Core.Common.Notify.Telegram
         }
     }
 
+    [Scope(typeof(ConfigureTelegramDaoService))]
     public class TelegramDao
     {
         public TelegramDbContext TelegramDbContext { get; set; }
diff --git a/common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs b/common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
index e38bf5301f..dce8ccbb1f 100644
--- a/common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
+++ b/common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
@@ -40,7 +40,8 @@ using Microsoft.Extensions.Options;
 using Telegram.Bot;
 
 namespace ASC.Core.Common.Notify
-{
+{
+    [Scope]
     public class TelegramHelper
     {
         public enum RegStatus
@@ -169,18 +170,5 @@ namespace ASC.Core.Common.Notify
         {
             return string.IsNullOrEmpty(proxy) ? new TelegramBotClient(token) : new TelegramBotClient(token, new WebProxy(proxy));
         }
-    }
-
-    public static class TelegramHelperExtension
-    {
-        public static DIHelper AddTelegramHelperSerivce(this DIHelper services)
-        {
-            if (services.TryAddScoped<TelegramHelper>())
-            {
-                return services.AddTelegramServiceClient()
-                    .AddCachedTelegramDaoService();
-            }
-            return services;
-        }
     }
 }
diff --git a/common/ASC.Core.Common/Notify/Telegram/TelegramServiceClient.cs b/common/ASC.Core.Common/Notify/Telegram/TelegramServiceClient.cs
index b1ef55a4e1..f93c695db2 100644
--- a/common/ASC.Core.Common/Notify/Telegram/TelegramServiceClient.cs
+++ b/common/ASC.Core.Common/Notify/Telegram/TelegramServiceClient.cs
@@ -31,7 +31,8 @@ using ASC.Common.Caching;
 using ASC.Notify.Messages;
 
 namespace ASC.Core.Common.Notify
-{
+{
+    [Singletone]
     public class TelegramServiceClient : ITelegramService
     {
         private ICacheNotify<NotifyMessage> CacheMessage { get; }
@@ -95,13 +96,4 @@ namespace ASC.Core.Common.Notify
             return "Token" + userId + tenantId;
         }
     }
-
-    public static class TelegramServiceClientExtension
-    {
-        public static DIHelper AddTelegramServiceClient(this DIHelper services)
-        {
-            services.TryAddSingleton<TelegramServiceClient>();
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Security/Authentication/CookieStorage.cs b/common/ASC.Core.Common/Security/Authentication/CookieStorage.cs
index ca6c607f59..c968d83d38 100644
--- a/common/ASC.Core.Common/Security/Authentication/CookieStorage.cs
+++ b/common/ASC.Core.Common/Security/Authentication/CookieStorage.cs
@@ -38,6 +38,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Security.Authentication
 {
+    [Scope]
     public class CookieStorage
     {
         private const string DateTimeFormat = "yyyy-MM-dd HH:mm:ss,fff";
@@ -141,19 +142,4 @@ namespace ASC.Core.Security.Authentication
             return Hasher.Base64Hash(data ?? string.Empty, HashAlg.SHA256);
         }
     }
-
-    public static class CookieStorageExtension
-    {
-        public static DIHelper AddCookieStorageService(this DIHelper services)
-        {
-            if (services.TryAddScoped<CookieStorage>())
-            {
-                return services
-                    .AddTenantCookieSettingsService()
-                    .AddInstanceCryptoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Security/Authorizing/AzManager.cs b/common/ASC.Core.Common/Security/Authorizing/AzManager.cs
index 7b222a6e03..61283bf637 100644
--- a/common/ASC.Core.Common/Security/Authorizing/AzManager.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/AzManager.cs
@@ -26,8 +26,6 @@
 
 using System;
 using System.Collections.Generic;
-
-using ASC.Core.Security.Authorizing;
 
 namespace ASC.Common.Security.Authorizing
 {
@@ -147,19 +145,4 @@ namespace ASC.Common.Security.Authorizing
 
         #endregion
     }
-
-    public static class AzManagerConfigExtension
-    {
-        public static DIHelper AddAzManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<AzManager>())
-            {
-                return services
-                    .AddPermissionProviderService()
-                    .AddRoleProviderService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Common/Security/IPermissionProvider.cs b/common/ASC.Core.Common/Security/Authorizing/IPermissionProvider.cs
similarity index 95%
rename from common/ASC.Common/Security/IPermissionProvider.cs
rename to common/ASC.Core.Common/Security/Authorizing/IPermissionProvider.cs
index 159c1c2d0c..38893d4f80 100644
--- a/common/ASC.Common/Security/IPermissionProvider.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/IPermissionProvider.cs
@@ -27,9 +27,11 @@
 using System.Collections.Generic;
 
 using ASC.Common.Security.Authorizing;
-
+using ASC.Core.Security.Authorizing;
+
 namespace ASC.Common.Security
-{
+{
+    [Scope(typeof(PermissionProvider))]
     public interface IPermissionProvider
     {
         IEnumerable<Ace> GetAcl(ISubject subject, IAction action, ISecurityObjectId objectId, ISecurityObjectProvider secObjProvider);
diff --git a/common/ASC.Core.Common/Security/Authorizing/PermissionProvider.cs b/common/ASC.Core.Common/Security/Authorizing/PermissionProvider.cs
index c00e884998..878e65d4b8 100644
--- a/common/ASC.Core.Common/Security/Authorizing/PermissionProvider.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/PermissionProvider.cs
@@ -26,9 +26,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 
-using ASC.Common;
 using ASC.Common.Security;
 using ASC.Common.Security.Authorizing;
 
@@ -53,13 +52,4 @@ namespace ASC.Core.Security.Authorizing
                 .Select(r => new Ace(r.ActionId, r.Reaction));
         }
     }
-
-    public static class PermissionProviderConfigExtension
-    {
-        public static DIHelper AddPermissionProviderService(this DIHelper services)
-        {
-            services.TryAddScoped(typeof(IPermissionProvider), typeof(PermissionProvider));
-            return services.AddAuthorizationManagerService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs b/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs
index 68cf66d1d1..4d7cc57b1f 100644
--- a/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/PermissionResolver.cs
@@ -124,13 +124,4 @@ namespace ASC.Core.Security.Authorizing
             }
         }
     }
-
-    public static class PermissionResolverConfigExtention
-    {
-        public static DIHelper AddPermissionResolverService(this DIHelper services)
-        {
-            services.TryAddScoped(typeof(IPermissionResolver), typeof(PermissionResolver));
-            return services.AddAzManagerService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs b/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
index a453821de9..373bd3ab0b 100644
--- a/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
+++ b/common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
@@ -31,7 +31,6 @@ using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Users;
-using ASC.Security.Cryptography;
 using ASC.Web.Studio.Utility;
 
 using Microsoft.AspNetCore.Http;
@@ -42,7 +41,8 @@ using Microsoft.Extensions.Options;
 using static ASC.Security.Cryptography.EmailValidationKeyProvider;
 
 namespace ASC.Security.Cryptography
-{
+{
+    [Scope]
     public class EmailValidationKeyProvider
     {
         public enum ValidationResult
@@ -165,6 +165,7 @@ namespace ASC.Security.Cryptography
         }
     }
 
+    [Transient]
     public class EmailValidationKeyModelHelper
     {
         private IHttpContextAccessor HttpContextAccessor { get; }
@@ -273,21 +274,4 @@ namespace ASC.Security.Cryptography
             return checkKeyResult;
         }
     }
-
-    public static class EmailValidationKeyProviderExtension
-    {
-        public static DIHelper AddEmailValidationKeyProviderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<EmailValidationKeyProvider>())
-            {
-                services.TryAddTransient<EmailValidationKeyModelHelper>();
-
-                return services
-                    .AddTenantManagerService()
-                    .AddMachinePseudoKeysService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Settings/SettingsManager.cs b/common/ASC.Core.Common/Settings/SettingsManager.cs
index d0c125f6d6..ce17f2465b 100644
--- a/common/ASC.Core.Common/Settings/SettingsManager.cs
+++ b/common/ASC.Core.Common/Settings/SettingsManager.cs
@@ -35,7 +35,8 @@ using ASC.Core.Data;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Common.Settings
-{
+{
+    [Scope]
     public class SettingsManager : DbSettingsManager
     {
         public SettingsManager(
@@ -50,19 +51,4 @@ namespace ASC.Core.Common.Settings
 
         }
     }
-
-    public static class SettingsManagerExtention
-    {
-        public static DIHelper AddSettingsManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SettingsManager>())
-            {
-                return services
-                    .AddAuthContextService()
-                    .AddDbSettingsManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs b/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
index db8b19ad2d..e2ce90f933 100644
--- a/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
+++ b/common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
@@ -65,6 +65,7 @@ namespace ASC.Core.Tenants
         }
     }
 
+    [Scope]
     public class TenantCookieSettingsHelper
     {
         public bool IsVisibleSettings { get; internal set; }
@@ -119,18 +120,5 @@ namespace ASC.Core.Tenants
             var expires = settingsTenant.IsDefault() ? DateTime.UtcNow.AddYears(1) : DateTime.UtcNow.AddMinutes(settingsTenant.LifeTime);
             return expires;
         }
-    }
-
-    public static class TenantCookieSettingsExtention
-    {
-        public static DIHelper AddTenantCookieSettingsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantCookieSettingsHelper>())
-            {
-                return services.AddSettingsManagerService();
-            }
-
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Tenants/TenantDomainValidator.cs b/common/ASC.Core.Common/Tenants/TenantDomainValidator.cs
index afbfa03786..b0e145e911 100644
--- a/common/ASC.Core.Common/Tenants/TenantDomainValidator.cs
+++ b/common/ASC.Core.Common/Tenants/TenantDomainValidator.cs
@@ -27,10 +27,13 @@
 using System;
 using System.Text.RegularExpressions;
 
+using ASC.Common;
+
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.Core.Tenants
-{
+{
+    [Singletone]
     public class TenantDomainValidator
     {
         private static readonly Regex ValidDomain = new Regex("^[a-z0-9]([a-z0-9-]){1,98}[a-z0-9]$",
diff --git a/common/ASC.Core.Common/Tenants/TenantUtil.cs b/common/ASC.Core.Common/Tenants/TenantUtil.cs
index 5e7806e70e..fe7a9bfc6d 100644
--- a/common/ASC.Core.Common/Tenants/TenantUtil.cs
+++ b/common/ASC.Core.Common/Tenants/TenantUtil.cs
@@ -59,7 +59,8 @@ namespace ASC.Core.Tenants
             options.TenantManager = TenantManager.Value;
         }
     }
-
+
+    [Scope(typeof(ConfigureTenantUtil))]
     public class TenantUtil
     {
         internal TenantManager TenantManager { get; set; }
@@ -146,18 +147,4 @@ namespace ASC.Core.Tenants
             return DateTimeNow(TimeZoneConverter.GetTimeZone(timeZone));
         }
     }
-
-    public static class TenantUtilExtention
-    {
-        public static DIHelper AddTenantUtilService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantUtil>())
-            {
-                services.TryAddScoped<IConfigureOptions<TenantUtil>, ConfigureTenantUtil>();
-                return services.AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Tests/HostedSolutionTest.cs b/common/ASC.Core.Common/Tests/HostedSolutionTest.cs
index e78c7f5c4a..4058dd105b 100644
--- a/common/ASC.Core.Common/Tests/HostedSolutionTest.cs
+++ b/common/ASC.Core.Common/Tests/HostedSolutionTest.cs
@@ -31,8 +31,6 @@ namespace ASC.Core.Common.Tests
 
     using ASC.Core.Tenants;
 
-    using Microsoft.Extensions.Configuration;
-
     using NUnit.Framework;
 
     [TestFixture]
diff --git a/common/ASC.Core.Common/Users/Constants.cs b/common/ASC.Core.Common/Users/Constants.cs
index 70e26f80c4..6d725b460e 100644
--- a/common/ASC.Core.Common/Users/Constants.cs
+++ b/common/ASC.Core.Common/Users/Constants.cs
@@ -34,7 +34,8 @@ using Action = ASC.Common.Security.Authorizing.Action;
 using AuthConst = ASC.Common.Security.Authorizing.Constants;
 
 namespace ASC.Core.Users
-{
+{
+    [Singletone]
     public sealed class Constants
     {
         public Constants(IConfiguration configuration)
@@ -144,13 +145,4 @@ namespace ASC.Core.Users
 
         #endregion
     }
-
-    public static class ConstantsConfigFactory
-    {
-        public static DIHelper AddConstantsService(this DIHelper services)
-        {
-            services.TryAddSingleton<Constants>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Users/DisplayUserSettings.cs b/common/ASC.Core.Common/Users/DisplayUserSettings.cs
index 5f237be8a3..987116fe18 100644
--- a/common/ASC.Core.Common/Users/DisplayUserSettings.cs
+++ b/common/ASC.Core.Common/Users/DisplayUserSettings.cs
@@ -56,6 +56,7 @@ namespace ASC.Web.Core.Users
         }
     }
 
+    [Scope]
     public class DisplayUserSettingsHelper
     {
         private readonly string RemovedProfileName;
@@ -108,19 +109,4 @@ namespace ASC.Web.Core.Users
             return !string.IsNullOrEmpty(str) ? HttpUtility.HtmlEncode(str) : str;
         }
     }
-
-    public static class DisplayUserSettingsExtention
-    {
-        public static DIHelper AddDisplayUserSettingsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DisplayUserSettingsHelper>())
-            {
-                return services
-                    .AddUserFormatter()
-                    .AddUserManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Users/UserFormatter.cs b/common/ASC.Core.Common/Users/UserFormatter.cs
index bcc5426276..e83283c905 100644
--- a/common/ASC.Core.Common/Users/UserFormatter.cs
+++ b/common/ASC.Core.Common/Users/UserFormatter.cs
@@ -34,7 +34,8 @@ using ASC.Common;
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.Core.Users
-{
+{
+    [Singletone]
     public class UserFormatter : IComparer<UserInfo>
     {
         private readonly DisplayUserNameFormat format;
@@ -147,12 +148,4 @@ namespace ASC.Core.Users
             return UserNameRegex.IsMatch(firstName + lastName);
         }
     }
-    public static class UserFormatterExtension
-    {
-        public static DIHelper AddUserFormatter(this DIHelper services)
-        {
-            services.TryAddSingleton<UserFormatter>();
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs b/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs
index f3ba395c97..3967623241 100644
--- a/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs
+++ b/common/ASC.Core.Common/WhiteLabel/MailWhiteLabelSettings.cs
@@ -100,7 +100,8 @@ namespace ASC.Web.Core.WhiteLabel
             return GetDefault(serviceProvider.GetService<IConfiguration>());
         }
     }
-
+
+    [Singletone]
     public class MailWhiteLabelSettingsHelper
     {
         public MailWhiteLabelSettingsHelper(IConfiguration configuration)
@@ -155,13 +156,4 @@ namespace ASC.Web.Core.WhiteLabel
 
         private IConfiguration Configuration { get; }
     }
-
-    public static class MailWhiteLabelSettingsExtention
-    {
-        public static DIHelper AddMailWhiteLabelSettingsService(this DIHelper services)
-        {
-            services.TryAddSingleton<MailWhiteLabelSettingsHelper>();
-            return services.AddSettingsManagerService();
-        }
-    }
 }
diff --git a/common/ASC.Data.Reassigns/QueueWorker.cs b/common/ASC.Data.Reassigns/QueueWorker.cs
index aa0bf53815..22ce015179 100644
--- a/common/ASC.Data.Reassigns/QueueWorker.cs
+++ b/common/ASC.Data.Reassigns/QueueWorker.cs
@@ -32,7 +32,6 @@ using ASC.Common.Threading.Progress;
 using ASC.Core.Users;
 
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
 namespace ASC.Data.Reassigns
@@ -106,6 +105,7 @@ namespace ASC.Data.Reassigns
         }
     }
 
+    [Scope]
     public class QueueWorkerReassign : QueueWorker<ReassignProgressItem>
     {
         private QueueWorkerRemove QueueWorkerRemove { get; }
@@ -124,6 +124,8 @@ namespace ASC.Data.Reassigns
             return Start(tenantId, fromUserId, () => new ReassignProgressItem(ServiceProvider, HttpContextAccessor.HttpContext, this, QueueWorkerRemove, tenantId, fromUserId, toUserId, currentUserId, deleteProfile)) as ReassignProgressItem;
         }
     }
+
+    [Scope]
     public class QueueWorkerRemove : QueueWorker<RemoveProgressItem>
     {
         public QueueWorkerRemove(
@@ -139,28 +141,4 @@ namespace ASC.Data.Reassigns
             return Start(tenantId, user.ID, () => new RemoveProgressItem(ServiceProvider, HttpContextAccessor.HttpContext, this, tenantId, user, currentUserId, notify)) as RemoveProgressItem;
         }
     }
-
-    public static class QueueExtension
-    {
-        public static DIHelper AddQueueWorkerRemoveService(this DIHelper services)
-        {
-            if (services.TryAddScoped<QueueWorkerRemove>())
-            {
-                services.AddRemoveProgressItemService();
-            }
-
-            return services;
-        }
-        public static DIHelper AddQueueWorkerReassignService(this DIHelper services)
-        {
-            if (services.TryAddScoped<QueueWorkerReassign>())
-            {
-                return services
-                    .AddReassignProgressItemService()
-                    .AddQueueWorkerRemoveService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Data.Storage/Configuration/StorageSettings.cs b/common/ASC.Data.Storage/Configuration/StorageSettings.cs
index b8464f1d2f..3980d4f216 100644
--- a/common/ASC.Data.Storage/Configuration/StorageSettings.cs
+++ b/common/ASC.Data.Storage/Configuration/StorageSettings.cs
@@ -40,6 +40,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage.Configuration
 {
+    [Singletone]
     public class BaseStorageSettingsListener
     {
         private IServiceProvider ServiceProvider { get; }
@@ -112,6 +113,7 @@ namespace ASC.Data.Storage.Configuration
         }
     }
 
+    [Scope]
     [Serializable]
     public class CdnStorageSettings : BaseStorageSettings<CdnStorageSettings>
     {
@@ -123,6 +125,7 @@ namespace ASC.Data.Storage.Configuration
         public override Func<DataStoreConsumer, DataStoreConsumer> Switch { get { return d => d.Cdn; } }
     }
 
+    [Scope]
     public class StorageSettingsHelper
     {
         private StorageFactoryConfig StorageFactoryConfig { get; }
@@ -249,18 +252,7 @@ namespace ASC.Data.Storage.Configuration
     {
         public static DIHelper AddStorageSettingsService(this DIHelper services)
         {
-            if (services.TryAddScoped<StorageSettingsHelper>())
-            {
-                services.TryAddSingleton<BaseStorageSettingsListener>();
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                services.TryAddScoped<BaseStorageSettingsListenerScope>();
-                services.TryAddScoped<CdnStorageSettings>();
-                return services
-                    .AddSettingsManagerService()
-                    .AddConsumerFactoryService()
-                    .AddStorageFactoryConfigService()
-                    .AddPathUtilsService();
-            }
+            services.TryAddScoped<BaseStorageSettingsListenerScope>();
 
             return services;
         }
diff --git a/common/ASC.Data.Storage/Encryption/Crypt.cs b/common/ASC.Data.Storage/Encryption/Crypt.cs
index 64f0b4cae1..517e2f54ce 100644
--- a/common/ASC.Data.Storage/Encryption/Crypt.cs
+++ b/common/ASC.Data.Storage/Encryption/Crypt.cs
@@ -26,12 +26,15 @@
 
 using System;
 using System.IO;
-using System.Security.Cryptography;
-
+using System.Security.Cryptography;
+
+using ASC.Common;
+
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Transient]
     public class Crypt : ICrypt
     {
         private string Storage { get; set; }
diff --git a/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs b/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
index 03ae080574..5fa4ced3b0 100644
--- a/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
+++ b/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
@@ -31,7 +31,8 @@ using ASC.Common;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Singletone]
     public class EncryptionFactory
     {
         private IServiceProvider ServiceProvider { get; }
@@ -53,15 +54,4 @@ namespace ASC.Data.Storage.Encryption
             return ServiceProvider.GetService<Metadata>();
         }
     }
-
-    public static class EncryptionFactoryExtension
-    {
-        public static DIHelper AddEncryptionFactoryService(this DIHelper services)
-        {
-            services.TryAddSingleton<EncryptionFactory>();
-            services.TryAddTransient<Crypt>();
-            services.TryAddTransient<Metadata>();
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs b/common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
index 9a986beabb..2d13e2674b 100644
--- a/common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
+++ b/common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
@@ -28,7 +28,8 @@ using ASC.Common;
 using ASC.Common.Caching;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Scope]
     public class EncryptionServiceClient : IEncryptionService
     {
 
@@ -53,13 +54,4 @@ namespace ASC.Data.Storage.Encryption
         }
 
     }
-
-    public static class EncryptionServiceClientExtension
-    {
-        public static DIHelper AddEncryptionServiceClient(this DIHelper services)
-        {
-            services.TryAddScoped<EncryptionServiceClient>();
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs b/common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
index 6b6c2e26c7..525f5365f9 100644
--- a/common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
+++ b/common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
@@ -5,6 +5,7 @@ using ASC.Common.Caching;
 
 namespace ASC.Data.Storage.Encryption
 {
+    [Singletone]
     public class EncryptionServiceNotifier
     {
         private ICacheNotify<ProgressEncryption> СacheBackupProgress { get; }
@@ -32,13 +33,4 @@ namespace ASC.Data.Storage.Encryption
             return $"encryption{tenantId}";
         }
     }
-
-    public static class EncryptionServiceNotifierExtension
-    {
-        public static DIHelper AddEncryptionServiceNotifierService(this DIHelper services)
-        {
-            services.TryAddSingleton<EncryptionServiceNotifier>();
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Data.Storage/Encryption/EncryptionSettings.cs b/common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
index 79c479caf6..7ed55435dc 100644
--- a/common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
+++ b/common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
@@ -63,7 +63,8 @@ namespace ASC.Data.Storage.Encryption
             NotifyUsers = true;
         }
     }
-
+
+    [Scope]
     public class EncryptionSettingsHelper
     {
         private const string key = "EncryptionSettings";
@@ -191,15 +192,4 @@ namespace ASC.Data.Storage.Encryption
             return new string(array2);
         }
     }
-
-    public static class EncryptionSettingsHelperExtension
-    {
-        public static DIHelper AddEncryptionSettingsHelperService(this DIHelper services)
-        {
-            services.TryAddScoped<EncryptionSettingsHelper>();
-            services.TryAddSingleton<AscCacheNotify>();
-            return services
-                .AddCoreConfigurationService();
-        }
-    }
 }
diff --git a/common/ASC.Data.Storage/Encryption/Metadata.cs b/common/ASC.Data.Storage/Encryption/Metadata.cs
index 702bf25121..9e1cc26102 100644
--- a/common/ASC.Data.Storage/Encryption/Metadata.cs
+++ b/common/ASC.Data.Storage/Encryption/Metadata.cs
@@ -28,12 +28,15 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
-
+using System.Text;
+
+using ASC.Common;
+
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Transient]
     public class Metadata : IMetadata
     {
         private const string prefixString = "AscEncrypted";
diff --git a/common/ASC.Data.Storage/Extensions.cs b/common/ASC.Data.Storage/Extensions.cs
index a1f626b1e5..c40ad7cbd5 100644
--- a/common/ASC.Data.Storage/Extensions.cs
+++ b/common/ASC.Data.Storage/Extensions.cs
@@ -28,8 +28,6 @@ using System;
 using System.IO;
 using System.Threading;
 
-using ASC.Data.Storage;
-
 namespace ASC.Data.Storage
 {
     public static class Extensions
diff --git a/common/ASC.Data.Storage/Migration/MigrateServiceClient.cs b/common/ASC.Data.Storage/Migration/MigrateServiceClient.cs
index edb5844517..d82ae4f530 100644
--- a/common/ASC.Data.Storage/Migration/MigrateServiceClient.cs
+++ b/common/ASC.Data.Storage/Migration/MigrateServiceClient.cs
@@ -32,7 +32,8 @@ using ASC.Data.Storage.Configuration;
 using ASC.Migration;
 
 namespace ASC.Data.Storage.Migration
-{
+{
+    [Singletone]
     public class ServiceClientListener
     {
         public ICacheNotify<MigrationProgress> ProgressMigrationNotify { get; }
@@ -77,7 +78,8 @@ namespace ASC.Data.Storage.Migration
             return typeof(MigrationProgress).FullName + tenantId;
         }
     }
-
+
+    [Scope]
     public class ServiceClient : IService
     {
         public ServiceClientListener ServiceClientListener { get; }
@@ -135,15 +137,4 @@ namespace ASC.Data.Storage.Migration
             CacheMigrationNotify.Publish(new MigrationCache(), CacheNotifyAction.InsertOrUpdate);
         }
     }
-
-    public static class ServiceClientExtension
-    {
-        public static DIHelper AddServiceClient(this DIHelper services)
-        {
-            services.TryAddScoped<ServiceClient>();
-            services.TryAddSingleton<ServiceClientListener>();
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Data.Storage/PathUtils.cs b/common/ASC.Data.Storage/PathUtils.cs
index 0ebbb5d3d3..00076f729e 100644
--- a/common/ASC.Data.Storage/PathUtils.cs
+++ b/common/ASC.Data.Storage/PathUtils.cs
@@ -36,6 +36,7 @@ using Microsoft.Extensions.Hosting;
 
 namespace ASC.Data.Storage
 {
+    [Singletone]
     public class PathUtils
     {
         private string StorageRoot { get; }
@@ -117,14 +118,4 @@ namespace ASC.Data.Storage
             return physPath;
         }
     }
-
-    public static class PathUtilsExtension
-    {
-        public static DIHelper AddPathUtilsService(this DIHelper services)
-        {
-            services.TryAddSingleton<PathUtils>();
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Data.Storage/StaticUploader.cs b/common/ASC.Data.Storage/StaticUploader.cs
index c7bc77f30c..be158adbc8 100644
--- a/common/ASC.Data.Storage/StaticUploader.cs
+++ b/common/ASC.Data.Storage/StaticUploader.cs
@@ -44,7 +44,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage
-{
+{
+    [Scope]
     public class StaticUploader
     {
         private static readonly TaskScheduler Scheduler;
@@ -317,14 +318,8 @@ namespace ASC.Data.Storage
     public static class StaticUploaderExtension
     {
         public static DIHelper AddStaticUploaderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<StaticUploader>())
-            {
-                services.TryAddScoped<StaticUploaderScope>();
-                return services
-                    .AddTenantManagerService()
-                    .AddStorageSettingsService();
-            }
+        {
+            services.TryAddScoped<StaticUploaderScope>();
 
             return services;
         }
diff --git a/common/ASC.Data.Storage/StorageFactory.cs b/common/ASC.Data.Storage/StorageFactory.cs
index d69f91996b..9c29884041 100644
--- a/common/ASC.Data.Storage/StorageFactory.cs
+++ b/common/ASC.Data.Storage/StorageFactory.cs
@@ -46,6 +46,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage
 {
+    [Singletone]
     public class StorageFactoryListener
     {
         private volatile bool Subscribed;
@@ -72,6 +73,7 @@ namespace ASC.Data.Storage
         }
     }
 
+    [Singletone]
     public class StorageFactoryConfig
     {
         public Configuration.Storage Section { get; }
@@ -172,7 +174,7 @@ namespace ASC.Data.Storage
         }
     }
 
-
+    [Scope]
     public class StorageFactory
     {
         private const string DefaultTenantName = "default";
@@ -334,36 +336,4 @@ namespace ASC.Data.Storage
                 /*don't count quota if specified on module*/);
         }
     }
-
-
-    public static class StorageFactoryExtension
-    {
-        public static DIHelper AddStorageFactoryConfigService(this DIHelper services)
-        {
-            services.TryAddSingleton<StorageFactoryConfig>();
-
-            return services;
-        }
-
-        public static DIHelper AddStorageFactoryService(this DIHelper services)
-        {
-            if (services.TryAddScoped<StorageFactory>())
-            {
-                services.TryAddSingleton<StorageFactoryListener>();
-
-                return services
-                    .AddConsumerFactoryService()
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddPathUtilsService()
-                    .AddEmailValidationKeyProviderService()
-                    .AddStorageSettingsService()
-                    .AddStorage()
-                    .AddEncryptionFactoryService()
-                    .AddEncryptionSettingsHelperService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Data.Storage/StorageHandler.cs b/common/ASC.Data.Storage/StorageHandler.cs
index afe1929740..02c08e39a4 100644
--- a/common/ASC.Data.Storage/StorageHandler.cs
+++ b/common/ASC.Data.Storage/StorageHandler.cs
@@ -204,11 +204,7 @@ namespace ASC.Data.Storage.DiscStorage
         public static DIHelper AddStorageHandlerService(this DIHelper services)
         {
             services.TryAddScoped<StorageHandlerScope>();
-            return services
-                .AddTenantManagerService()
-                .AddSecurityContextService()
-                .AddStorageFactoryService()
-                .AddEmailValidationKeyProviderService();
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Data.Storage/StorageUploader.cs b/common/ASC.Data.Storage/StorageUploader.cs
index f7a9399616..8777c38293 100644
--- a/common/ASC.Data.Storage/StorageUploader.cs
+++ b/common/ASC.Data.Storage/StorageUploader.cs
@@ -30,6 +30,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.Logging;
 using ASC.Common.Threading.Progress;
@@ -43,7 +44,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage
-{
+{
+    [Singletone]
     public class StorageUploader
     {
         private static readonly TaskScheduler Scheduler;
diff --git a/common/ASC.Data.Storage/WebPath.cs b/common/ASC.Data.Storage/WebPath.cs
index fb97f8801a..bbe2ec5281 100644
--- a/common/ASC.Data.Storage/WebPath.cs
+++ b/common/ASC.Data.Storage/WebPath.cs
@@ -43,6 +43,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage
 {
+    [Singletone]
     public class WebPathSettings
     {
         private readonly IEnumerable<Appender> Appenders;
@@ -141,6 +142,7 @@ namespace ASC.Data.Storage
         }
     }
 
+    [Scope]
     public class WebPath
     {
         private static readonly IDictionary<string, bool> Existing = new ConcurrentDictionary<string, bool>();
@@ -243,28 +245,4 @@ namespace ASC.Data.Storage
             }
         }
     }
-
-    public static class WebPathExtension
-    {
-        public static DIHelper AddWebPathService(this DIHelper services)
-        {
-            if (services.TryAddScoped<WebPath>())
-            {
-                return services
-                    .AddStaticUploaderService()
-                    .AddStorageSettingsService()
-                    .AddWebPathSettingsService()
-                    .AddCoreBaseSettingsService();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddWebPathSettingsService(this DIHelper services)
-        {
-            services.TryAddSingleton<WebPathSettings>();
-
-            return services.AddStorage();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/AccountLinker.cs b/common/ASC.FederatedLogin/AccountLinker.cs
index 3e1e1711f5..b4f6719418 100644
--- a/common/ASC.FederatedLogin/AccountLinker.cs
+++ b/common/ASC.FederatedLogin/AccountLinker.cs
@@ -26,7 +26,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 
 using ASC.Common;
@@ -44,6 +43,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.FederatedLogin
 {
+    [Singletone]
     public class AccountLinkerStorage
     {
         private readonly ICache cache;
@@ -107,6 +107,7 @@ namespace ASC.FederatedLogin
         }
     }
 
+    [Scope(typeof(ConfigureAccountLinker))]
     public class AccountLinker
     {
         public string DbId { get; set; }
@@ -219,34 +220,4 @@ namespace ASC.FederatedLogin
             AccountLinkerStorage.RemoveFromCache(obj);
         }
     }
-
-    public static class AccountLinkerStorageExtension
-    {
-        public static DIHelper AddAccountLinkerStorageService(this DIHelper services)
-        {
-            services.TryAddSingleton<AccountLinkerStorage>();
-            services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-
-            return services;
-        }
-    }
-
-    public static class AccountLinkerExtension
-    {
-        public static DIHelper AddAccountLinker(this DIHelper services)
-        {
-            if (services.TryAddScoped<AccountLinker>())
-            {
-                services.TryAddScoped<IConfigureOptions<AccountLinker>, ConfigureAccountLinker>();
-
-                return services
-                    .AddAccountLinkContextService()
-                    .AddSignatureService()
-                    .AddInstanceCryptoService()
-                    .AddAccountLinkerStorageService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/Login.cs b/common/ASC.FederatedLogin/Login.cs
index 23bfc0be46..8905c5732e 100644
--- a/common/ASC.FederatedLogin/Login.cs
+++ b/common/ASC.FederatedLogin/Login.cs
@@ -48,6 +48,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.FederatedLogin
 {
+    [Scope]
     public class Login
     {
         private Dictionary<string, string> _params;
@@ -245,19 +246,6 @@ namespace ASC.FederatedLogin
 
     public static class LoginHandlerExtensions
     {
-        public static DIHelper AddLoginHandlerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<Login>())
-            {
-                return services
-                    .AddSignatureService()
-                    .AddInstanceCryptoService()
-                    .AddProviderManagerService();
-            }
-
-            return services;
-        }
-
         public static IApplicationBuilder UseLoginHandler(this IApplicationBuilder builder)
         {
             return builder.UseMiddleware<LoginHandler>();
diff --git a/common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs b/common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
index c30784a677..476d1108da 100644
--- a/common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
@@ -24,9 +24,8 @@
 */
 
 
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
@@ -68,18 +67,4 @@ namespace ASC.FederatedLogin.LoginProviders
         {
         }
     }
-
-    public static class BoxLoginProviderExtension
-    {
-        public static DIHelper AddBoxLoginProviderService(this DIHelper services)
-        {
-            //services.TryAddScoped<BoxLoginProvider>();
-            return services
-                .AddConsumerFactoryService()
-                .AddKafkaService()
-                .AddTenantManagerService()
-                .AddCoreBaseSettingsService()
-                .AddCoreSettingsService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs b/common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
index 25711f1ad9..ca8b4d9395 100644
--- a/common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
@@ -26,9 +26,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Text;
 
-using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
@@ -129,17 +128,4 @@ namespace ASC.FederatedLogin.LoginProviders
             return refreshed;
         }
     }
-    public static class DocuSignLoginProviderExtension
-    {
-        public static DIHelper AddDocuSignLoginProviderService(this DIHelper services)
-        {
-            //services.TryAddScoped<DocuSignLoginProvider>();
-            return services
-                .AddConsumerFactoryService()
-                .AddKafkaService()
-                .AddTenantManagerService()
-                .AddCoreBaseSettingsService()
-                .AddCoreSettingsService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs b/common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
index 31b4873aa8..926dfe1123 100644
--- a/common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
@@ -24,9 +24,8 @@
 */
 
 
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
@@ -68,17 +67,4 @@ namespace ASC.FederatedLogin.LoginProviders
         {
         }
     }
-    public static class DropboxLoginProviderExtension
-    {
-        public static DIHelper AddDropboxLoginProviderService(this DIHelper services)
-        {
-            //services.TryAddScoped<DropboxLoginProvider>();
-            return services
-                .AddConsumerFactoryService()
-                .AddKafkaService()
-                .AddTenantManagerService()
-                .AddCoreBaseSettingsService()
-                .AddCoreSettingsService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/LoginProviders/EncryptionLoginProvider.cs b/common/ASC.FederatedLogin/LoginProviders/EncryptionLoginProvider.cs
index 9d6c9fb58c..eaf925c063 100644
--- a/common/ASC.FederatedLogin/LoginProviders/EncryptionLoginProvider.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/EncryptionLoginProvider.cs
@@ -29,7 +29,6 @@ using System.Linq;
 
 using ASC.Common;
 using ASC.Common.Utils;
-using ASC.Core;
 using ASC.FederatedLogin;
 using ASC.FederatedLogin.Profile;
 using ASC.Security.Cryptography;
@@ -39,7 +38,8 @@ using Microsoft.Extensions.Options;
 using SecurityContext = ASC.Core.SecurityContext;
 
 namespace ASC.Web.Studio.Core
-{
+{
+    [Scope]
     public class EncryptionLoginProvider
     {
         private SecurityContext SecurityContext { get; }
@@ -90,20 +90,4 @@ namespace ASC.Web.Studio.Core
             return keys;
         }
     }
-    public static class EncryptionLoginProviderExtension
-    {
-        public static DIHelper AddEncryptionLoginProviderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<EncryptionLoginProvider>())
-            {
-                return services
-                    .AddSecurityContextService()
-                    .AddSignatureService()
-                    .AddInstanceCryptoService()
-                    .AddAccountLinker();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs b/common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
index 627a5ff4bc..a8b0d9e303 100644
--- a/common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;
 using System.Web;
 
-using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.Utils;
 using ASC.Core;
@@ -181,20 +180,4 @@ namespace ASC.FederatedLogin.LoginProviders
             public bool primary = false;
         }
     }
-
-    public static class GoogleLoginProviderExtension
-    {
-        public static DIHelper AddGoogleLoginProviderService(this DIHelper services)
-        {
-            //services.TryAddScoped<GoogleLoginProvider>();
-            return services
-                .AddConsumerFactoryService()
-                .AddKafkaService()
-                .AddTenantManagerService()
-                .AddCoreBaseSettingsService()
-                .AddCoreSettingsService()
-                .AddSignatureService()
-                .AddInstanceCryptoService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs b/common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
index 2871ca74cf..5eadb36117 100644
--- a/common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
@@ -26,7 +26,6 @@
 
 using System.Collections.Generic;
 
-using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
@@ -71,18 +70,4 @@ namespace ASC.FederatedLogin.LoginProviders
         {
         }
     }
-
-    public static class OneDriveLoginProviderExtension
-    {
-        public static DIHelper AddOneDriveLoginProviderService(this DIHelper services)
-        {
-            //services.TryAddScoped<OneDriveLoginProvider>();
-            return services
-                .AddConsumerFactoryService()
-                .AddKafkaService()
-                .AddTenantManagerService()
-                .AddCoreBaseSettingsService()
-                .AddCoreSettingsService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/LoginProviders/ProviderManager.cs b/common/ASC.FederatedLogin/LoginProviders/ProviderManager.cs
index 05641da802..b7abd411b1 100644
--- a/common/ASC.FederatedLogin/LoginProviders/ProviderManager.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/ProviderManager.cs
@@ -38,6 +38,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace ASC.FederatedLogin.LoginProviders
 {
+    [Scope]
     public class ProviderManager
     {
         public static List<string> AuthProviders = new List<string>
@@ -100,20 +101,4 @@ namespace ASC.FederatedLogin.LoginProviders
             }
         }
     }
-
-    public static class ProviderManagerServiceExtension
-    {
-        public static DIHelper AddProviderManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ProviderManager>())
-            {
-                return services
-                    .AddSignatureService()
-                    .AddInstanceCryptoService()
-                    .AddConsumerFactoryService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.FederatedLogin/LoginProviders/TelegramLoginProvider.cs b/common/ASC.FederatedLogin/LoginProviders/TelegramLoginProvider.cs
index 196c28fac6..3a86305340 100644
--- a/common/ASC.FederatedLogin/LoginProviders/TelegramLoginProvider.cs
+++ b/common/ASC.FederatedLogin/LoginProviders/TelegramLoginProvider.cs
@@ -26,7 +26,6 @@
 
 using System.Collections.Generic;
 
-using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
@@ -95,15 +94,4 @@ namespace ASC.FederatedLogin.LoginProviders
             }
         }
     }
-
-    public static class TelegramLoginProviderExtension
-    {
-        public static DIHelper AddTelegramLoginProviderService(this DIHelper services)
-        {
-            return services.AddTelegramHelperSerivce()
-                .AddTenantManagerService()
-                .AddCoreBaseSettingsService()
-                .AddCoreSettingsService();
-        }
-    }
 }
diff --git a/common/ASC.Feed/Data/FeedAggregateDataProvider.cs b/common/ASC.Feed/Data/FeedAggregateDataProvider.cs
index 3be64ba8ca..3eebdc826b 100644
--- a/common/ASC.Feed/Data/FeedAggregateDataProvider.cs
+++ b/common/ASC.Feed/Data/FeedAggregateDataProvider.cs
@@ -42,6 +42,7 @@ using Newtonsoft.Json;
 
 namespace ASC.Feed.Data
 {
+    [Scope]
     public class FeedAggregateDataProvider
     {
         private AuthContext AuthContext { get; }
@@ -381,18 +382,4 @@ namespace ASC.Feed.Data
             return feedMin;
         }
     }
-
-    public static class FeedAggregateDataProviderExtension
-    {
-        public static DIHelper AddFeedAggregateDataProvider(this DIHelper services)
-        {
-            services.TryAddScoped<FeedAggregateDataProvider>();
-
-            return services
-                .AddAuthContextService()
-                .AddTenantManagerService()
-                .AddTenantUtilService()
-                .AddFeedDbService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Feed/Data/FeedReadedDataProvider.cs b/common/ASC.Feed/Data/FeedReadedDataProvider.cs
index 1c7c7e64f2..59ccc9c42f 100644
--- a/common/ASC.Feed/Data/FeedReadedDataProvider.cs
+++ b/common/ASC.Feed/Data/FeedReadedDataProvider.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-using ASC.Common;
 using ASC.Core;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Context;
@@ -126,15 +125,4 @@ namespace ASC.Feed.Data
             return AuthContext.CurrentAccount.ID;
         }
     }
-
-    public static class FeedReadedDataProviderExtension
-    {
-        public static DIHelper AddFeedReadedDataProvider(this DIHelper services)
-        {
-            return services
-                .AddAuthContextService()
-                .AddTenantManagerService()
-                .AddFeedDbService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.IPSecurity/IPRestrictionsRepository.cs b/common/ASC.IPSecurity/IPRestrictionsRepository.cs
index a9c4561c0b..a8b62155b3 100644
--- a/common/ASC.IPSecurity/IPRestrictionsRepository.cs
+++ b/common/ASC.IPSecurity/IPRestrictionsRepository.cs
@@ -34,6 +34,7 @@ using ASC.Core.Common.EF.Model;
 
 namespace ASC.IPSecurity
 {
+    [Scope]
     public class IPRestrictionsRepository
     {
         private const string dbId = "core";
@@ -77,16 +78,4 @@ namespace ASC.IPSecurity
             return ips.ToList();
         }
     }
-    public static class IPRestrictionsRepositoryExtension
-    {
-        public static DIHelper AddIPRestrictionsRepositoryService(this DIHelper services)
-        {
-            if (services.TryAddScoped<IPRestrictionsRepository>())
-            {
-                return services.AddTenantDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.IPSecurity/IPRestrictionsService.cs b/common/ASC.IPSecurity/IPRestrictionsService.cs
index f2f2e71d72..6b25f51e46 100644
--- a/common/ASC.IPSecurity/IPRestrictionsService.cs
+++ b/common/ASC.IPSecurity/IPRestrictionsService.cs
@@ -32,6 +32,7 @@ using ASC.Common.Caching;
 
 namespace ASC.IPSecurity
 {
+    [Singletone]
     public class IPRestrictionsServiceCache
     {
         private const string cacheKey = "iprestrictions";
@@ -51,6 +52,8 @@ namespace ASC.IPSecurity
             return cacheKey + tenant;
         }
     }
+
+    [Scope]
     public class IPRestrictionsService
     {
         private readonly ICache cache;
@@ -86,19 +89,4 @@ namespace ASC.IPSecurity
             return restrictions;
         }
     }
-
-    public static class IPRestrictionsServiceExtension
-    {
-        public static DIHelper AddIPRestrictionsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<IPRestrictionsService>())
-            {
-                services.TryAddSingleton<IPRestrictionsServiceCache>();
-
-                return services.AddIPRestrictionsRepositoryService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.IPSecurity/IPSecurity.cs b/common/ASC.IPSecurity/IPSecurity.cs
index 454897403b..a9c2cea17c 100644
--- a/common/ASC.IPSecurity/IPSecurity.cs
+++ b/common/ASC.IPSecurity/IPSecurity.cs
@@ -41,6 +41,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.IPSecurity
 {
+    [Scope]
     public class IPSecurity
     {
         private readonly ILog Log;
@@ -139,21 +140,4 @@ namespace ASC.IPSecurity
             return portIdx > 0 ? ip.Substring(0, portIdx) : ip;
         }
     }
-
-    public static class IPSecurityExtension
-    {
-        public static DIHelper AddIPSecurityService(this DIHelper services)
-        {
-            if (services.TryAddScoped<IPSecurity>())
-            {
-                return services
-                    .AddIPRestrictionsService()
-                    .AddSettingsManagerService()
-                    .AddAuthContextService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs b/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs
index ee0f610b0f..41b48782fd 100644
--- a/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs
+++ b/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs
@@ -35,6 +35,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.MessagingSystem.DbSender
 {
+    [Singletone]
     public class DbMessageSender : IMessageSender
     {
         private readonly ILog log;
@@ -67,16 +68,4 @@ namespace ASC.MessagingSystem.DbSender
             }
         }
     }
-
-    public static class DbMessageSenderExtension
-    {
-        public static DIHelper AddDbMessageSenderService(this DIHelper services)
-        {
-            services.TryAddSingleton<DbMessageSender>();
-            services.TryAddSingleton<MessagesRepository>();
-            services.AddMessagesContextService();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs b/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
index f5770bd064..619c75aa7c 100644
--- a/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
+++ b/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
@@ -30,6 +30,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Context;
@@ -48,6 +49,7 @@ using IsolationLevel = System.Data.IsolationLevel;
 
 namespace ASC.MessagingSystem.DbSender
 {
+    [Singletone]
     public class MessagesRepository
     {
         private static DateTime lastSave = DateTime.UtcNow;
diff --git a/common/ASC.MessagingSystem/MessageFactory.cs b/common/ASC.MessagingSystem/MessageFactory.cs
index 119d251bea..2bf1429307 100644
--- a/common/ASC.MessagingSystem/MessageFactory.cs
+++ b/common/ASC.MessagingSystem/MessageFactory.cs
@@ -39,6 +39,7 @@ using Microsoft.Extensions.Primitives;
 
 namespace ASC.MessagingSystem
 {
+    [Scope]
     public class MessageFactory
     {
         private readonly ILog log;
@@ -138,18 +139,4 @@ namespace ASC.MessagingSystem
             }
         }
     }
-    public static class MessageFactoryExtension
-    {
-        public static DIHelper AddMessageFactoryService(this DIHelper services)
-        {
-            if (services.TryAddScoped<MessageFactory>())
-            {
-                return services
-                    .AddAuthContextService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.MessagingSystem/MessagePolicy.cs b/common/ASC.MessagingSystem/MessagePolicy.cs
index fe776b7d55..5ea1803eeb 100644
--- a/common/ASC.MessagingSystem/MessagePolicy.cs
+++ b/common/ASC.MessagingSystem/MessagePolicy.cs
@@ -34,6 +34,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.MessagingSystem
 {
+    [Singletone]
     public class MessagePolicy
     {
         private readonly IEnumerable<string> secretIps;
@@ -63,14 +64,4 @@ namespace ASC.MessagingSystem
             return portIdx > -1 ? ip.Substring(0, portIdx) : ip;
         }
     }
-
-    public static class MessagePolicyExtension
-    {
-        public static DIHelper AddMessagePolicyService(this DIHelper services)
-        {
-            services.TryAddSingleton<MessagePolicy>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.MessagingSystem/MessageService.cs b/common/ASC.MessagingSystem/MessageService.cs
index 7f3df763fa..bf5a692789 100644
--- a/common/ASC.MessagingSystem/MessageService.cs
+++ b/common/ASC.MessagingSystem/MessageService.cs
@@ -38,6 +38,7 @@ using Microsoft.Extensions.Primitives;
 
 namespace ASC.MessagingSystem
 {
+    [Scope]
     public class MessageService
     {
         private readonly ILog log;
@@ -297,21 +298,4 @@ namespace ASC.MessagingSystem
             sender.Send(message);
         }
     }
-
-    public static class MessageServiceExtension
-    {
-        public static DIHelper AddMessageServiceService(this DIHelper services)
-        {
-            if (services.TryAddScoped<MessageService>())
-            {
-
-                return services
-                    .AddMessagePolicyService()
-                    .AddDbMessageSenderService()
-                    .AddMessageFactoryService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.MessagingSystem/MessageTarget.cs b/common/ASC.MessagingSystem/MessageTarget.cs
index 89519a956d..c27d472045 100644
--- a/common/ASC.MessagingSystem/MessageTarget.cs
+++ b/common/ASC.MessagingSystem/MessageTarget.cs
@@ -34,7 +34,8 @@ using ASC.Common.Logging;
 using Microsoft.Extensions.Options;
 
 namespace ASC.MessagingSystem
-{
+{
+    [Singletone]
     public class MessageTarget
     {
         private IEnumerable<string> _items;
@@ -111,14 +112,4 @@ namespace ASC.MessagingSystem
             return string.Join(",", _items);
         }
     }
-
-    public static class MessageTargetExtension
-    {
-        public static DIHelper AddMessageTargetService(this DIHelper services)
-        {
-            services.TryAddSingleton<MessageTarget>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Notify.Textile/JabberStyler.cs b/common/ASC.Notify.Textile/JabberStyler.cs
index bac4bda928..5a4265e0d5 100644
--- a/common/ASC.Notify.Textile/JabberStyler.cs
+++ b/common/ASC.Notify.Textile/JabberStyler.cs
@@ -30,16 +30,12 @@ using System.Web;
 
 using ASC.Common;
 using ASC.Common.Notify.Patterns;
-using ASC.Core;
 using ASC.Notify.Messages;
 using ASC.Notify.Patterns;
-using ASC.Security.Cryptography;
-using ASC.Web.Core.WhiteLabel;
-
-using Microsoft.Extensions.Configuration;
 
 namespace ASC.Notify.Textile
 {
+    [Scope]
     public class JabberStyler : IPatternStyler
     {
         static readonly Regex VelocityArguments = new Regex(NVelocityPatternFormatter.NoStylePreffix + "(?<arg>.*?)" + NVelocityPatternFormatter.NoStyleSuffix, RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled);
@@ -97,25 +93,4 @@ namespace ASC.Notify.Textile
             return match.Result("${arg}");
         }
     }
-
-    public static class StylerExtension
-    {
-        public static DIHelper AddStylerService(this DIHelper services)
-        {
-            return services
-                .AddCoreBaseSettingsService()
-                .AddInstanceCryptoService()
-                .AddMailWhiteLabelSettingsService()
-                ;
-        }
-        public static DIHelper AddJabberStylerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<JabberStyler>())
-            {
-                return services.AddStylerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Notify.Textile/PushStyler.cs b/common/ASC.Notify.Textile/PushStyler.cs
index 44f728d3e1..2c45c034ec 100644
--- a/common/ASC.Notify.Textile/PushStyler.cs
+++ b/common/ASC.Notify.Textile/PushStyler.cs
@@ -29,16 +29,12 @@ using System.Text.RegularExpressions;
 
 using ASC.Common;
 using ASC.Common.Notify.Patterns;
-using ASC.Core;
 using ASC.Notify.Messages;
 using ASC.Notify.Patterns;
-using ASC.Security.Cryptography;
-using ASC.Web.Core.WhiteLabel;
-
-using Microsoft.Extensions.Configuration;
 
 namespace ASC.Notify.Textile
 {
+    [Scope]
     public class PushStyler : IPatternStyler
     {
         private static readonly Regex VelocityArgumentsRegex = new Regex(NVelocityPatternFormatter.NoStylePreffix + "(?'arg'.*?)" + NVelocityPatternFormatter.NoStyleSuffix, RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled);
@@ -57,16 +53,4 @@ namespace ASC.Notify.Textile
             }
         }
     }
-    public static class PushStylerExtension
-    {
-        public static DIHelper AddPushStylerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<PushStyler>())
-            {
-                return services.AddStylerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/ASC.Notify.Textile/TextileStyler.cs b/common/ASC.Notify.Textile/TextileStyler.cs
index a0c53b437b..69ac49a273 100644
--- a/common/ASC.Notify.Textile/TextileStyler.cs
+++ b/common/ASC.Notify.Textile/TextileStyler.cs
@@ -48,6 +48,7 @@ using Textile.Blocks;
 
 namespace ASC.Notify.Textile
 {
+    [Scope]
     public class TextileStyler : IPatternStyler
     {
         private static readonly Regex VelocityArguments = new Regex(NVelocityPatternFormatter.NoStylePreffix + "(?<arg>.*?)" + NVelocityPatternFormatter.NoStyleSuffix, RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled);
@@ -325,17 +326,4 @@ namespace ASC.Notify.Textile
                                          Encoding.UTF8.GetBytes(mail.ToLowerInvariant()))));
         }
     }
-
-    public static class TextileStylerExtension
-    {
-        public static DIHelper AddTextileStylerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TextileStyler>())
-            {
-                return services.AddStylerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.VoipService/Dao/CachedVoipDao.cs b/common/ASC.VoipService/Dao/CachedVoipDao.cs
index b8320a6526..741d5b7ae4 100644
--- a/common/ASC.VoipService/Dao/CachedVoipDao.cs
+++ b/common/ASC.VoipService/Dao/CachedVoipDao.cs
@@ -40,6 +40,7 @@ using ASC.Core.Tenants;
 
 namespace ASC.VoipService.Dao
 {
+    [Singletone]
     public class VoipDaoCache
     {
         public ICache Cache { get; }
@@ -109,26 +110,5 @@ namespace ASC.VoipService.Dao
         {
             return "voip" + tenant.ToString(CultureInfo.InvariantCulture);
         }
-    }
-
-    public static class VoipDaoExtention
-    {
-        public static DIHelper AddVoipDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<VoipDao, CachedVoipDao>())
-            {
-                services.TryAddSingleton<VoipDaoCache>();
-
-                return services
-                    .AddDbContextManagerService<VoipDbContext>()
-                    .AddAuthContextService()
-                    .AddTenantUtilService()
-                    .AddSecurityContextService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddConsumerFactoryService();
-            }
-
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.VoipService/Dao/VoipDao.cs b/common/ASC.VoipService/Dao/VoipDao.cs
index fe987059d5..f28f7792b6 100644
--- a/common/ASC.VoipService/Dao/VoipDao.cs
+++ b/common/ASC.VoipService/Dao/VoipDao.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
+using ASC.Common;
 using ASC.Core;
 using ASC.Core.Common;
 using ASC.Core.Common.Configuration;
@@ -39,6 +40,7 @@ using ASC.VoipService.Twilio;
 
 namespace ASC.VoipService.Dao
 {
+    [Scope(typeof(CachedVoipDao))]
     public class VoipDao : AbstractDao
     {
         public VoipDao(
diff --git a/common/services/ASC.ApiSystem/Classes/AuthHandler.cs b/common/services/ASC.ApiSystem/Classes/AuthHandler.cs
index cb8a1d8f3d..f40bf699bb 100644
--- a/common/services/ASC.ApiSystem/Classes/AuthHandler.cs
+++ b/common/services/ASC.ApiSystem/Classes/AuthHandler.cs
@@ -32,9 +32,8 @@ using System.Security.Authentication;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Encodings.Web;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Security.Cryptography;
 using ASC.Web.Core.Helpers;
@@ -165,12 +164,4 @@ namespace ASC.ApiSystem.Classes
             return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(Context.User, new AuthenticationProperties(), Scheme.Name)));
         }
     }
-
-    public static class AuthAllowskipHandlerExtension
-    {
-        public static DIHelper AddAuthAllowskipHandler(this DIHelper services)
-        {
-            return services.AddApiSystemHelper();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Classes/CommonConstants.cs b/common/services/ASC.ApiSystem/Classes/CommonConstants.cs
index a676455d8b..66abd3d46a 100644
--- a/common/services/ASC.ApiSystem/Classes/CommonConstants.cs
+++ b/common/services/ASC.ApiSystem/Classes/CommonConstants.cs
@@ -34,7 +34,8 @@ using ASC.Common;
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.ApiSystem.Classes
-{
+{
+    [Singletone]
     public class CommonConstants
     {
         public CommonConstants(IConfiguration configuration)
@@ -84,14 +85,4 @@ namespace ASC.ApiSystem.Classes
 
         public string WebApiBaseUrl { get; }
     }
-
-    public static class CommonControllerExtention
-    {
-        public static DIHelper AddCommonConstants(this DIHelper services)
-        {
-            services.TryAddSingleton<CommonConstants>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Classes/CommonMethods.cs b/common/services/ASC.ApiSystem/Classes/CommonMethods.cs
index 265a9e2f56..7168f9a4a0 100644
--- a/common/services/ASC.ApiSystem/Classes/CommonMethods.cs
+++ b/common/services/ASC.ApiSystem/Classes/CommonMethods.cs
@@ -39,12 +39,8 @@ using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Common.Utils;
 using ASC.Core;
-using ASC.Core.Common.Settings;
 using ASC.Core.Tenants;
-using ASC.Core.Users;
 using ASC.Security.Cryptography;
-using ASC.Web.Core.Helpers;
-using ASC.Web.Core.Users;
 using ASC.Web.Studio.Utility;
 
 using Microsoft.AspNetCore.Http;
@@ -56,7 +52,8 @@ using Newtonsoft.Json.Linq;
 
 
 namespace ASC.ApiSystem.Controllers
-{
+{
+    [Scope]
     public class CommonMethods
     {
         private IHttpContextAccessor HttpContextAccessor { get; }
@@ -342,27 +339,4 @@ namespace ASC.ApiSystem.Controllers
             return false;
         }
     }
-
-    public static class CommonMethodsExtention
-    {
-        public static DIHelper AddCommonMethods(this DIHelper services)
-        {
-            if (services.TryAddScoped<CommonMethods>())
-            {
-                return services
-                    .AddCoreSettingsService()
-                    .AddCommonLinkUtilityService()
-                    .AddEmailValidationKeyProviderService()
-                    .AddApiSystemHelper()
-                    .AddTenantManagerService()
-                    .AddUserFormatter()
-                    .AddUserManagerWrapperService()
-                    .AddSettingsManagerService()
-                    .AddSecurityContextService()
-                    .AddHostedSolutionService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Classes/TimeZonesProvider.cs b/common/services/ASC.ApiSystem/Classes/TimeZonesProvider.cs
index 6f774fbdce..6d30f9f2fe 100644
--- a/common/services/ASC.ApiSystem/Classes/TimeZonesProvider.cs
+++ b/common/services/ASC.ApiSystem/Classes/TimeZonesProvider.cs
@@ -34,7 +34,8 @@ using ASC.Common.Logging;
 using Microsoft.Extensions.Options;
 
 namespace ASC.ApiSystem.Classes
-{
+{
+    [Singletone]
     public class TimeZonesProvider
     {
         public ILog Log { get; }
@@ -141,14 +142,4 @@ namespace ASC.ApiSystem.Classes
 
         #endregion
     }
-
-    public static class TimeZonesProviderExtention
-    {
-        public static DIHelper AddTimeZonesProvider(this DIHelper services)
-        {
-            services.TryAddSingleton<TimeZonesProvider>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Controllers/CalDavController.cs b/common/services/ASC.ApiSystem/Controllers/CalDavController.cs
index 146f23c11e..74f8e7c35b 100644
--- a/common/services/ASC.ApiSystem/Controllers/CalDavController.cs
+++ b/common/services/ASC.ApiSystem/Controllers/CalDavController.cs
@@ -46,7 +46,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
 namespace ASC.ApiSystem.Controllers
-{
+{
+    [Scope]
     [ApiController]
     [Route("[controller]")]
     public class CalDavController : ControllerBase
@@ -363,17 +364,5 @@ namespace ASC.ApiSystem.Controllers
             public string User { get; set; }
             public string Password { get; set; }
         }
-    }
-
-    public static class CalDavControllerExtention
-    {
-        public static DIHelper AddCalDavController(this DIHelper services)
-        {
-            return services
-                .AddCommonMethods()
-                .AddEmailValidationKeyProviderService()
-                .AddCommonConstants()
-                .AddCoreSettingsService();
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Controllers/CoreSettingsController.cs b/common/services/ASC.ApiSystem/Controllers/CoreSettingsController.cs
index d9380b7b1a..b59e22d14b 100644
--- a/common/services/ASC.ApiSystem/Controllers/CoreSettingsController.cs
+++ b/common/services/ASC.ApiSystem/Controllers/CoreSettingsController.cs
@@ -38,7 +38,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.ApiSystem.Controllers
 {
-
+    [Scope]
     [Obsolete("CoreSettingsController is deprecated, please use SettingsController instead.")]
     [ApiController]
     [Route("[controller]")]
@@ -187,14 +187,5 @@ namespace ASC.ApiSystem.Controllers
         }
 
         #endregion
-    }
-
-    public static class ControllerExtention
-    {
-        public static DIHelper AddCoreSettingsController(this DIHelper services)
-        {
-            return services
-                .AddCoreSettingsService();
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Controllers/PortalController.cs b/common/services/ASC.ApiSystem/Controllers/PortalController.cs
index f832395f7a..bc215bbc64 100644
--- a/common/services/ASC.ApiSystem/Controllers/PortalController.cs
+++ b/common/services/ASC.ApiSystem/Controllers/PortalController.cs
@@ -56,7 +56,8 @@ using Newtonsoft.Json.Linq;
 
 
 namespace ASC.ApiSystem.Controllers
-{
+{
+    [Scope]
     [ApiController]
     [Route("[controller]")]
     public class PortalController : ControllerBase
@@ -696,24 +697,4 @@ namespace ASC.ApiSystem.Controllers
 
         #endregion
     }
-
-    public static class PortalControllerExtention
-    {
-        public static DIHelper AddPortalController(this DIHelper services)
-        {
-            return services
-                .AddCommonMethods()
-                .AddTimeZonesProvider()
-                .AddCommonConstants()
-                .AddUserManagerService()
-                .AddUserFormatter()
-                .AddCoreSettingsService()
-                .AddHostedSolutionService()
-                .AddApiSystemHelper()
-                .AddSettingsManagerService()
-                .AddTenantManagerService()
-                .AddSecurityContextService()
-                ;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Controllers/RegistrationController.cs b/common/services/ASC.ApiSystem/Controllers/RegistrationController.cs
index 8d87689cd0..aabb9448e2 100644
--- a/common/services/ASC.ApiSystem/Controllers/RegistrationController.cs
+++ b/common/services/ASC.ApiSystem/Controllers/RegistrationController.cs
@@ -53,7 +53,8 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
 
 namespace ASC.ApiSystem.Controllers
-{
+{
+    [Scope]
     [Obsolete("Registration is deprecated, please use PortalController or TariffController instead.")]
     [ApiController]
     [Route("[controller]")]
@@ -783,25 +784,5 @@ namespace ASC.ApiSystem.Controllers
         }
 
         #endregion
-    }
-
-    public static class RegistrationControllerExtention
-    {
-        public static DIHelper AddRegistrationController(this DIHelper services)
-        {
-            return services
-                .AddCommonMethods()
-                .AddTimeZonesProvider()
-                .AddCommonConstants()
-                .AddUserManagerService()
-                .AddUserFormatter()
-                .AddCoreSettingsService()
-                .AddHostedSolutionService()
-                .AddApiSystemHelper()
-                .AddSettingsManagerService()
-                .AddTenantManagerService()
-                .AddSecurityContextService()
-                ;
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Controllers/SettingsController.cs b/common/services/ASC.ApiSystem/Controllers/SettingsController.cs
index d7ebbb87d7..ada6ae2888 100644
--- a/common/services/ASC.ApiSystem/Controllers/SettingsController.cs
+++ b/common/services/ASC.ApiSystem/Controllers/SettingsController.cs
@@ -28,14 +28,14 @@ using ASC.ApiSystem.Models;
 using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
-using ASC.Core.Tenants;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
 namespace ASC.ApiSystem.Controllers
-{
+{
+    [Scope]
     [ApiController]
     [Route("[controller]")]
     public class SettingsController : ControllerBase
@@ -193,15 +193,5 @@ namespace ASC.ApiSystem.Controllers
         }
 
         #endregion
-    }
-
-    public static class SettingsControllerExtention
-    {
-        public static DIHelper AddSettingsController(this DIHelper services)
-        {
-            return services
-                .AddCommonMethods()
-                .AddCoreSettingsService();
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Controllers/TariffController.cs b/common/services/ASC.ApiSystem/Controllers/TariffController.cs
index bcdc21480c..3efce22785 100644
--- a/common/services/ASC.ApiSystem/Controllers/TariffController.cs
+++ b/common/services/ASC.ApiSystem/Controllers/TariffController.cs
@@ -40,7 +40,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
 namespace ASC.ApiSystem.Controllers
-{
+{
+    [Scope]
     [ApiController]
     [Route("[controller]")]
     public class TariffController : ControllerBase
@@ -215,16 +216,5 @@ namespace ASC.ApiSystem.Controllers
         }
 
         #endregion
-    }
-
-    public static class TariffControllerExtention
-    {
-        public static DIHelper AddTariffController(this DIHelper services)
-        {
-            return services
-                .AddCommonMethods()
-                .AddHostedSolutionService()
-                .AddCoreSettingsService();
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs b/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs
index 2e286d5dbf..a0468dc8d8 100644
--- a/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs
+++ b/common/services/ASC.ApiSystem/Models/CoreSettingsModel.cs
@@ -24,7 +24,6 @@
 */
 
 
-using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace ASC.ApiSystem.Models
diff --git a/common/services/ASC.ApiSystem/Startup.cs b/common/services/ASC.ApiSystem/Startup.cs
index b818968d2a..0dfb54b8f7 100644
--- a/common/services/ASC.ApiSystem/Startup.cs
+++ b/common/services/ASC.ApiSystem/Startup.cs
@@ -25,7 +25,6 @@
 
 
 using ASC.ApiSystem.Classes;
-using ASC.ApiSystem.Controllers;
 using ASC.Common;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
@@ -72,15 +71,7 @@ namespace ASC.ApiSystem
                 .AddScheme<AuthenticationSchemeOptions, AuthHandler>("auth.allowskip", _ => { })
                 .AddScheme<AuthenticationSchemeOptions, AuthHandler>("auth.allowskip.registerportal", _ => { });
 
-            diHelper.AddNLogManager("ASC.Apisystem");
-
-            diHelper
-                .AddPortalController()
-                .AddCoreSettingsController()
-                .AddCalDavController()
-                .AddRegistrationController()
-                .AddSettingsController()
-                .AddTariffController();
+            diHelper.AddNLogManager("ASC.Apisystem");
 
             services.AddAutofac(Configuration, HostEnvironment.ContentRootPath, false);
         }
diff --git a/common/services/ASC.AuditTrail/AuditEventsRepository.cs b/common/services/ASC.AuditTrail/AuditEventsRepository.cs
index a9d4b8cdce..217862bd10 100644
--- a/common/services/ASC.AuditTrail/AuditEventsRepository.cs
+++ b/common/services/ASC.AuditTrail/AuditEventsRepository.cs
@@ -38,7 +38,8 @@ using ASC.MessagingSystem;
 using Newtonsoft.Json;
 
 namespace ASC.AuditTrail
-{
+{
+    [Scope]
     public class AuditEventsRepository
     {
         private MessageTarget MessageTarget { get; set; }
@@ -152,17 +153,4 @@ namespace ASC.AuditTrail
             return null;
         }
     }
-
-    public static class AuditEventsRepositoryExtension
-    {
-        public static DIHelper AddAuditEventsRepositoryService(this DIHelper services)
-        {
-            _ = services.TryAddScoped<AuditEventsRepository>();
-            return services
-                .AddUserFormatter()
-                .AddAuditTrailContextService()
-                .AddMessageTargetService()
-                .AddAuditActionMapperService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.AuditTrail/AuditReportCreator.cs b/common/services/ASC.AuditTrail/AuditReportCreator.cs
index 55c788b131..40daf083fd 100644
--- a/common/services/ASC.AuditTrail/AuditReportCreator.cs
+++ b/common/services/ASC.AuditTrail/AuditReportCreator.cs
@@ -43,7 +43,8 @@ using CsvHelper;
 using Microsoft.Extensions.Options;
 
 namespace ASC.AuditTrail
-{
+{
+    [Scope]
     public class AuditReportCreator
     {
         private ILog Log { get; }
@@ -92,17 +93,4 @@ namespace ASC.AuditTrail
             }
         }
     }
-
-    public static class AuditReportCreatorExtension
-    {
-        public static DIHelper AddAuditReportCreatorService(this DIHelper services)
-        {
-            _ = services.TryAddScoped<AuditReportCreator>();
-            return services
-                .AddGlobalFolderHelperService()
-                .AddFileUploaderService()
-                .AddFilesLinkUtilityService()
-                .AddCommonLinkUtilityService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.AuditTrail/LoginEventsRepository.cs b/common/services/ASC.AuditTrail/LoginEventsRepository.cs
index cca10bbdae..34ef9f12fe 100644
--- a/common/services/ASC.AuditTrail/LoginEventsRepository.cs
+++ b/common/services/ASC.AuditTrail/LoginEventsRepository.cs
@@ -39,7 +39,8 @@ using ASC.Core.Users;
 using Newtonsoft.Json;
 
 namespace ASC.AuditTrail.Data
-{
+{
+    [Scope]
     public class LoginEventsRepository
     {
         private UserFormatter UserFormatter { get; }
@@ -136,20 +137,4 @@ namespace ASC.AuditTrail.Data
             return evt;
         }
     }
-
-    public static class LoginEventsRepositoryExtension
-    {
-        public static DIHelper AddLoginEventsRepositoryService(this DIHelper services)
-        {
-            if (services.TryAddScoped<LoginEventsRepository>())
-            {
-                return services
-                    .AddUserFormatter()
-                    .AddAuditTrailContextService()
-                    .AddAuditActionMapperService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs b/common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
index 4aa6d79f2a..d6d6be2612 100644
--- a/common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
+++ b/common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
@@ -26,14 +26,17 @@
 
 using System;
 using System.Collections.Generic;
-using ASC.MessagingSystem;
 using System.Linq;
-using Microsoft.Extensions.Options;
-using ASC.Common.Logging;
+
 using ASC.Common;
+using ASC.Common.Logging;
+using ASC.MessagingSystem;
+
+using Microsoft.Extensions.Options;
 
 namespace ASC.AuditTrail.Mappers
-{
+{
+    [Singletone]
     public class AuditActionMapper
     {
         private Dictionary<MessageAction, MessageMaps> Actions { get; }
@@ -71,7 +74,7 @@ namespace ASC.AuditTrail.Mappers
                 if (evt.Description == null || !evt.Description.Any()) return actionText;
 
                 var description = evt.Description
-                                     .Select(t => t.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries))
+                                     .Select(t => t.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
                                      .Select(split => string.Join(", ", split.Select(ToLimitedText))).ToArray();
 
 
@@ -142,13 +145,4 @@ namespace ASC.AuditTrail.Mappers
             return text.Length < 50 ? text : string.Format("{0}...", text.Substring(0, 47));
         }
     }
-
-    public static class AuditActionMapperExtension
-    {
-        public static DIHelper AddAuditActionMapperService(this DIHelper services)
-        {
-            _ = services.TryAddSingleton<AuditActionMapper>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Data.Backup/BackupAjaxHandler.cs b/common/services/ASC.Data.Backup/BackupAjaxHandler.cs
index 87673db2b8..f42a83f8fd 100644
--- a/common/services/ASC.Data.Backup/BackupAjaxHandler.cs
+++ b/common/services/ASC.Data.Backup/BackupAjaxHandler.cs
@@ -17,10 +17,10 @@ using ASC.Web.Studio.Core;
 using ASC.Web.Studio.Utility;
 
 namespace ASC.Data.Backup
-{
+{
+    [Scope]
     public class BackupAjaxHandler
     {
-
         private TenantManager TenantManager { get; }
         private MessageService MessageService { get; }
         private CoreBaseSettings CoreBaseSettings { get; }
@@ -399,26 +399,4 @@ namespace ASC.Data.Backup
             EveryMonth = 2
         }
     }
-    public static class BackupAjaxHandlerExtension
-    {
-        public static DIHelper AddBackupAjaxHandler(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupAjaxHandler>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddMessageServiceService()
-                    .AddCoreSettingsService()
-                    .AddPermissionContextService()
-                    .AddSecurityContextService()
-                    .AddUserManagerService()
-                    .AddTenantExtraService()
-                    .AddConsumerFactoryService()
-                    .AddBackupHelperService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/BackupServiceLauncher.cs b/common/services/ASC.Data.Backup/BackupServiceLauncher.cs
index 5a102b3f2a..b57b514272 100644
--- a/common/services/ASC.Data.Backup/BackupServiceLauncher.cs
+++ b/common/services/ASC.Data.Backup/BackupServiceLauncher.cs
@@ -37,7 +37,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 
 namespace ASC.Data.Backup.Service
-{
+{
+    [Singletone]
     internal class BackupServiceLauncher : IHostedService
     {
         private IServiceProvider ServiceProvider { get; }
@@ -98,17 +99,4 @@ namespace ASC.Data.Backup.Service
             return Task.CompletedTask;
         }
     }
-    public static class BackupServiceLauncherExtension
-    {
-        public static DIHelper AddBackupServiceLauncher(this DIHelper services)
-        {
-            services.TryAddSingleton<BackupServiceLauncher>();
-            return services
-                .AddBackupCleanerService()
-                .AddBackupSchedulerService()
-                .AddBackupWorkerService()
-                .AddBackupService()
-                .AddBackupListenerService();
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Controllers/BackupController.cs b/common/services/ASC.Data.Backup/Controllers/BackupController.cs
index 21a40dcf29..9c8ca37d1f 100644
--- a/common/services/ASC.Data.Backup/Controllers/BackupController.cs
+++ b/common/services/ASC.Data.Backup/Controllers/BackupController.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 
-using ASC.Api.Core.Middleware;
 using ASC.Common;
 using ASC.Core;
 using ASC.Data.Backup.Contracts;
@@ -14,6 +13,7 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace ASC.Data.Backup.Controllers
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class BackupController
@@ -214,15 +214,4 @@ namespace ASC.Data.Backup.Controllers
             return BackupHandler.GetTmpFolder();
         }
     }
-    public static class BackupControllerExtension
-    {
-        public static DIHelper AddBackupController(this DIHelper services)
-        {
-            return services
-                .AddBackupAjaxHandler()
-                .AddIpSecurityFilter()
-                .AddCoreBaseSettingsService()
-                .AddTenantExtraService();
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Core/BackupHelper.cs b/common/services/ASC.Data.Backup/Core/BackupHelper.cs
index 52f4a11268..4daaebca60 100644
--- a/common/services/ASC.Data.Backup/Core/BackupHelper.cs
+++ b/common/services/ASC.Data.Backup/Core/BackupHelper.cs
@@ -8,7 +8,7 @@ using ASC.Web.Studio.UserControls.Statistics;
 
 namespace ASC.Data.Backup
 {
-
+    [Scope]
     public class BackupHelper
     {
         public const long AvailableZipSize = 10 * 1024 * 1024 * 1024L;
@@ -58,21 +58,5 @@ namespace ASC.Data.Backup
         Available,
         WithoutMail,
         NotAvailable,
-    }
-
-    public static class BackupHelperExtension
-    {
-        public static DIHelper AddBackupHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupHelper>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddTenantStatisticsProviderService();
-            }
-
-            return services;
-        }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Core/BackupManager.cs b/common/services/ASC.Data.Backup/Core/BackupManager.cs
index 5d5254e063..df3be3b74c 100644
--- a/common/services/ASC.Data.Backup/Core/BackupManager.cs
+++ b/common/services/ASC.Data.Backup/Core/BackupManager.cs
@@ -32,7 +32,8 @@ using System.Xml.Linq;
 using ASC.Common;
 
 namespace ASC.Data.Backup
-{
+{
+    [Singletone]
     public class BackupManager
     {
         private const string ROOT = "backup";
@@ -119,14 +120,5 @@ namespace ASC.Data.Backup
         {
             ProgressChanged?.Invoke(this, e);
         }
-    }
-
-    public static class BackupManagerExtension
-    {
-        public static DIHelper AddBackupManager(this DIHelper services)
-        {
-            services.TryAddSingleton<BackupManager>();
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Data.Backup/Core/DbBackupProvider.cs b/common/services/ASC.Data.Backup/Core/DbBackupProvider.cs
index 8b6b364dc8..b3c7dc4e7f 100644
--- a/common/services/ASC.Data.Backup/Core/DbBackupProvider.cs
+++ b/common/services/ASC.Data.Backup/Core/DbBackupProvider.cs
@@ -36,7 +36,8 @@ using System.Xml.Linq;
 using ASC.Common;
 
 namespace ASC.Data.Backup
-{
+{
+    [Scope]
     public class DbBackupProvider : IBackupProvider
     {
         private readonly List<string> processedTables = new List<string>();
@@ -224,15 +225,5 @@ namespace ASC.Data.Backup
                 }
             }
         }
-
-
-    }
-    public static class DbBackupProviderExtension
-    {
-        public static DIHelper AddDbBackupProvider(this DIHelper services)
-        {
-            services.TryAddScoped<DbBackupProvider>();
-            return services;
-        }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Core/FileBackupProvider.cs b/common/services/ASC.Data.Backup/Core/FileBackupProvider.cs
index 4de1481720..5dff3755e4 100644
--- a/common/services/ASC.Data.Backup/Core/FileBackupProvider.cs
+++ b/common/services/ASC.Data.Backup/Core/FileBackupProvider.cs
@@ -37,7 +37,8 @@ using ASC.Data.Storage;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup
-{
+{
+    [Scope]
     public class FileBackupProvider : IBackupProvider
     {
         private readonly IEnumerable<string> allowedModules;
@@ -252,18 +253,4 @@ namespace ASC.Data.Backup
             }
         }
     }
-    public static class FileBackupProviderExtension
-    {
-        public static DIHelper AddFileBackupProviderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileBackupProvider>())
-            {
-                return services
-                    .AddStorageFactoryService()
-                    .AddStorageFactoryConfigService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Data.Backup/Core/NotifyHelper.cs b/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
index b7a2377b55..8680ab7ab3 100644
--- a/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
+++ b/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.Utility;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Data.Backup
-{
+{
+    [Singletone]
     public class NotifyHelper
     {
         private IServiceProvider ServiceProvider { get; }
@@ -171,16 +172,10 @@ namespace ASC.Data.Backup
     public static class NotifyHelperExtension
     {
         public static DIHelper AddNotifyHelperService(this DIHelper services)
-        {
-            services.TryAddSingleton<NotifyHelper>();
+        {
             services.TryAddScoped<NotifyHelperScope>();
 
-            return services
-                .AddNotifyConfiguration()
-                .AddStudioNotifySourceService()
-                .AddUserManagerService()
-                .AddStudioNotifyHelperService()
-                .AddDisplayUserSettingsService();
+            return services;
         }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Core/Schedule.cs b/common/services/ASC.Data.Backup/Core/Schedule.cs
index 4354f75eb4..8975e976a0 100644
--- a/common/services/ASC.Data.Backup/Core/Schedule.cs
+++ b/common/services/ASC.Data.Backup/Core/Schedule.cs
@@ -11,7 +11,8 @@ using ASC.Notify.Cron;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup
-{
+{
+    [Scope]
     public class Schedule
     {
         private TenantManager TenantManager { get; }
@@ -57,21 +58,4 @@ namespace ASC.Data.Backup
             }
         }
     }
-
-    public static class ScheduleExtension
-    {
-        public static DIHelper AddScheduleService(this DIHelper services)
-        {
-            if (services.TryAddScoped<Schedule>())
-            {
-
-                return services
-                    .AddTenantManagerService()
-                    .AddTenantUtilService()
-                    .AddBackupHelperService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Listerners/BackupListener.cs b/common/services/ASC.Data.Backup/Listerners/BackupListener.cs
index 3cbdd90ab9..2c174c584b 100644
--- a/common/services/ASC.Data.Backup/Listerners/BackupListener.cs
+++ b/common/services/ASC.Data.Backup/Listerners/BackupListener.cs
@@ -9,7 +9,8 @@ using ASC.Data.Backup.Service;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Data.Backup.Listerners
-{
+{
+    [Singletone]
     public class BackupListener
     {
         private ICacheNotify<DeleteSchedule> CacheDeleteSchedule { get; }
@@ -38,13 +39,4 @@ namespace ASC.Data.Backup.Listerners
             backupService.DeleteSchedule(deleteSchedule.TenantId);
         }
     }
-
-    public static class BackupListenerExtension
-    {
-        public static DIHelper AddBackupListenerService(this DIHelper services)
-        {
-            services.TryAddSingleton<BackupListener>();
-            return services.AddBackupService();
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs b/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs
index c0adfabf6b..44ef40b738 100644
--- a/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs
@@ -36,7 +36,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup.Service
-{
+{
+    [Scope]
     internal class BackupCleanerHelperService
     {
         private readonly ILog log;
@@ -100,7 +101,9 @@ namespace ASC.Data.Backup.Service
                 }
             }
         }
-    }
+    }
+
+    [Singletone]
     public class BackupCleanerService
     {
         private readonly object cleanerLock = new object();
@@ -169,19 +172,4 @@ namespace ASC.Data.Backup.Service
             }
         }
     }
-    public static class BackupCleanerServiceExtension
-    {
-        public static DIHelper AddBackupCleanerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupCleanerHelperService>())
-            {
-                services.TryAddSingleton<BackupCleanerService>();
-                return services
-                    .AddBackupStorageFactory()
-                    .AddBackupRepositoryService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs b/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs
index 604e2f03ea..a8679213eb 100644
--- a/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs
@@ -38,7 +38,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup.Service
-{
+{
+    [Scope]
     internal class BackupSchedulerServiceHelper
     {
         private ILog Log { get; }
@@ -94,7 +95,8 @@ namespace ASC.Data.Backup.Service
             }
         }
     }
-
+
+    [Singletone]
     public class BackupSchedulerService
     {
         private readonly object schedulerLock = new object();
@@ -160,25 +162,5 @@ namespace ASC.Data.Backup.Service
                 }
             }
         }
-    }
-
-    public static class BackupSchedulerServiceExtension
-    {
-        public static DIHelper AddBackupSchedulerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupSchedulerServiceHelper>())
-            {
-                services.TryAddSingleton<BackupSchedulerService>();
-
-                return services
-                    .AddPaymentManagerService()
-                    .AddScheduleService()
-                    .AddBackupStorageFactory()
-                    .AddBackupWorkerService()
-                    .AddBackupRepositoryService();
-            }
-
-            return services;
-        }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Service/BackupService.cs b/common/services/ASC.Data.Backup/Service/BackupService.cs
index 9980d333aa..30c9268d47 100644
--- a/common/services/ASC.Data.Backup/Service/BackupService.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupService.cs
@@ -45,7 +45,8 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace ASC.Data.Backup.Service
-{
+{
+    [Singletone]
     public class BackupServiceNotifier
     {
         private ICacheNotify<BackupProgress> СacheBackupProgress { get; }
@@ -83,7 +84,8 @@ namespace ASC.Data.Backup.Service
             return $"{backupProgressEnum}backup{tenantId}";
         }
     }
-
+
+    [Scope]
     public class BackupService : IBackupService
     {
         private ILog Log { get; set; }
@@ -291,20 +293,4 @@ namespace ASC.Data.Backup.Service
             }
         }
     }
-    public static class BackupServiceExtension
-    {
-        public static DIHelper AddBackupService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupService>())
-            {
-                services.TryAddSingleton<BackupServiceNotifier>();
-                return services
-                    .AddBackupWorkerService()
-                    .AddBackupStorageFactory()
-                    .AddBackupRepositoryService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Service/BackupWorker.cs b/common/services/ASC.Data.Backup/Service/BackupWorker.cs
index e5580fb4cb..8edb6d0d4c 100644
--- a/common/services/ASC.Data.Backup/Service/BackupWorker.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupWorker.cs
@@ -35,7 +35,6 @@ using ASC.Common.Caching;
 using ASC.Common.Logging;
 using ASC.Common.Threading.Progress;
 using ASC.Core;
-using ASC.Core.Billing;
 using ASC.Core.Tenants;
 using ASC.Data.Backup.Contracts;
 using ASC.Data.Backup.EF.Model;
@@ -43,7 +42,6 @@ using ASC.Data.Backup.Storage;
 using ASC.Data.Backup.Tasks;
 using ASC.Data.Backup.Tasks.Modules;
 using ASC.Data.Backup.Utils;
-using ASC.Data.Storage;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -52,6 +50,7 @@ using Newtonsoft.Json;
 
 namespace ASC.Data.Backup.Service
 {
+    [Singletone]
     public class BackupWorker
     {
         private ILog Log { get; set; }
@@ -304,6 +303,7 @@ namespace ASC.Data.Backup.Service
         public abstract void RunJob();
     }
 
+    [Transient]
     public class BackupProgressItem : BaseBackupProgressItem
     {
         private const string ArchiveFormat = "tar.gz";
@@ -468,6 +468,7 @@ namespace ASC.Data.Backup.Service
         }
     }
 
+    [Transient]
     public class RestoreProgressItem : BaseBackupProgressItem
     {
         public override BackupProgressItemEnum BackupProgressItemEnum { get => BackupProgressItemEnum.Restore; }
@@ -615,6 +616,7 @@ namespace ASC.Data.Backup.Service
 
     }
 
+    [Transient]
     public class TransferProgressItem : BaseBackupProgressItem
     {
         public override BackupProgressItemEnum BackupProgressItemEnum { get => BackupProgressItemEnum.Transfer; }
@@ -728,6 +730,7 @@ namespace ASC.Data.Backup.Service
         }
     }
 
+    [Singletone]
     public class FactoryProgressItem
     {
         public IServiceProvider ServiceProvider { get; }
@@ -853,27 +856,12 @@ namespace ASC.Data.Backup.Service
     {
         public static DIHelper AddBackupWorkerService(this DIHelper services)
         {
-            services.TryAddSingleton<BackupWorker>();
-            services.TryAddSingleton<FactoryProgressItem>();
-            services.TryAddTransient<BackupProgressItem>();
-            services.TryAddTransient<TransferProgressItem>();
-            services.TryAddTransient<RestoreProgressItem>();
             services.TryAddScoped<BackupWorkerScope>();
             services.TryAddSingleton<ProgressQueueOptionsManager<BaseBackupProgressItem>>();
             services.TryAddSingleton<ProgressQueue<BaseBackupProgressItem>>();
             services.AddSingleton<IPostConfigureOptions<ProgressQueue<BaseBackupProgressItem>>, ConfigureProgressQueue<BaseBackupProgressItem>>();
 
-            return services
-                .AddTenantManagerService()
-                .AddCoreBaseSettingsService()
-                .AddStorageFactoryService()
-                .AddStorageFactoryConfigService()
-                .AddLicenseReaderService()
-                .AddNotifyHelperService()
-                .AddBackupPortalTaskService()
-                .AddDbFactoryService()
-                .AddRestorePortalTaskService()
-                .AddTransferPortalTaskService();
+            return services;
         }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Startup.cs b/common/services/ASC.Data.Backup/Startup.cs
index 09d474e0b9..d44b900cde 100644
--- a/common/services/ASC.Data.Backup/Startup.cs
+++ b/common/services/ASC.Data.Backup/Startup.cs
@@ -2,7 +2,6 @@
 
 using ASC.Api.Core;
 using ASC.Common;
-using ASC.Data.Backup.Controllers;
 using ASC.Data.Backup.Service;
 
 using Microsoft.Extensions.Configuration;
@@ -23,10 +22,7 @@ namespace ASC.Data.Backup
         public override void ConfigureServices(IServiceCollection services)
         {
             base.ConfigureServices(services);
-            DIHelper
-                .AddBackupServiceLauncher()
-                .AddBackupController()
-                .AddProgressQueue<BaseBackupProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
+            DIHelper.AddProgressQueue<BaseBackupProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
 
             services.AddHostedService<BackupServiceLauncher>();
         }
diff --git a/common/services/ASC.Data.Backup/Storage/BackupRepository.cs b/common/services/ASC.Data.Backup/Storage/BackupRepository.cs
index 4a4655816c..f040f2da1f 100644
--- a/common/services/ASC.Data.Backup/Storage/BackupRepository.cs
+++ b/common/services/ASC.Data.Backup/Storage/BackupRepository.cs
@@ -37,7 +37,8 @@ using ASC.Data.Backup.EF.Model;
 using Microsoft.EntityFrameworkCore.Internal;
 
 namespace ASC.Data.Backup.Storage
-{
+{
+    [Scope]
     public class BackupRepository : IBackupRepository
     {
         private BackupsContext BackupContext { get; }
@@ -114,19 +115,5 @@ namespace ASC.Data.Backup.Storage
         {
             return BackupContext.Schedules.SingleOrDefault(s => s.TenantId == tenantId);
         }
-    }
-
-    public static class BackupRepositoryExtension
-    {
-        public static DIHelper AddBackupRepositoryService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupRepository>())
-            {
-                return services
-                    .AddBackupsContext();
-            }
-
-            return services;
-        }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Storage/BackupStorageFactory.cs b/common/services/ASC.Data.Backup/Storage/BackupStorageFactory.cs
index f5ee0499e4..96e170afd0 100644
--- a/common/services/ASC.Data.Backup/Storage/BackupStorageFactory.cs
+++ b/common/services/ASC.Data.Backup/Storage/BackupStorageFactory.cs
@@ -34,14 +34,14 @@ using ASC.Data.Backup.Contracts;
 using ASC.Data.Backup.EF.Model;
 using ASC.Data.Backup.Service;
 using ASC.Data.Backup.Utils;
-using ASC.Web.Files.Utils;
 
 using Microsoft.Extensions.Configuration;
 
 using Newtonsoft.Json;
 
 namespace ASC.Data.Backup.Storage
-{
+{
+    [Scope]
     public class BackupStorageFactory
     {
         private IConfiguration Configuration { get; }
@@ -99,22 +99,4 @@ namespace ASC.Data.Backup.Storage
             }
         }
     }
-    public static class BackupStorageFactoryExtension
-    {
-        public static DIHelper AddBackupStorageFactory(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupStorageFactory>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddDocumentsBackupStorage()
-                    .AddDataStoreBackupStorage()
-                    .AddLocalBackupStorage()
-                    .AddConsumerBackupStorage()
-                    .AddFileConverterService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Storage/ConsumerBackupStorage.cs b/common/services/ASC.Data.Backup/Storage/ConsumerBackupStorage.cs
index 80f4dd3dc4..61c6fccd32 100644
--- a/common/services/ASC.Data.Backup/Storage/ConsumerBackupStorage.cs
+++ b/common/services/ASC.Data.Backup/Storage/ConsumerBackupStorage.cs
@@ -34,7 +34,8 @@ using ASC.Data.Storage;
 using ASC.Data.Storage.Configuration;
 
 namespace ASC.Data.Backup.Storage
-{
+{
+    [Scope]
     public class ConsumerBackupStorage : IBackupStorage
     {
         private IDataStore Store { get; set; }
@@ -82,17 +83,4 @@ namespace ASC.Data.Backup.Storage
             return Store.GetInternalUri(Domain, storagePath, TimeSpan.FromDays(1), null).AbsoluteUri;
         }
     }
-    public static class ConsumerBackupStorageExtension
-    {
-        public static DIHelper AddConsumerBackupStorage(this DIHelper services)
-        {
-            if (services.TryAddScoped<ConsumerBackupStorage>())
-            {
-                return services
-                    .AddStorageSettingsService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Storage/DataStoreBackupStorage.cs b/common/services/ASC.Data.Backup/Storage/DataStoreBackupStorage.cs
index f5fa7c7025..928f4ed684 100644
--- a/common/services/ASC.Data.Backup/Storage/DataStoreBackupStorage.cs
+++ b/common/services/ASC.Data.Backup/Storage/DataStoreBackupStorage.cs
@@ -31,7 +31,8 @@ using ASC.Common;
 using ASC.Data.Storage;
 
 namespace ASC.Data.Backup.Storage
-{
+{
+    [Scope]
     public class DataStoreBackupStorage : IBackupStorage
     {
         private string WebConfigPath { get; set; }
@@ -85,19 +86,5 @@ namespace ASC.Data.Backup.Storage
         {
             return StorageFactory.GetStorage(WebConfigPath, Tenant.ToString(), "backup", null);
         }
-
-
-    }
-
-    public static class DataStoreBackupStorageExtension
-    {
-        public static DIHelper AddDataStoreBackupStorage(this DIHelper services)
-        {
-            if (services.TryAddScoped<DataStoreBackupStorage>())
-            {
-                return services.AddStorageFactoryService();
-            }
-            return services;
-        }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Storage/DocumentsBackupStorage.cs b/common/services/ASC.Data.Backup/Storage/DocumentsBackupStorage.cs
index fecd591683..c5f114ea30 100644
--- a/common/services/ASC.Data.Backup/Storage/DocumentsBackupStorage.cs
+++ b/common/services/ASC.Data.Backup/Storage/DocumentsBackupStorage.cs
@@ -31,13 +31,13 @@ using ASC.Common;
 using ASC.Core;
 using ASC.Data.Storage;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 //using File = ASC.Files.Core.File;
 
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Data.Backup.Storage
-{
+{
+    [Scope]
     public class DocumentsBackupStorage : IBackupStorage
     {
         private int TenantId { get; set; }
@@ -200,19 +200,4 @@ namespace ASC.Data.Backup.Storage
             return DaoFactory.GetFileDao<T>();
         }
     }
-    public static class DocumentsBackupStorageExtension
-    {
-        public static DIHelper AddDocumentsBackupStorage(this DIHelper services)
-        {
-            if (services.TryAddScoped<DocumentsBackupStorage>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddSecurityContextService()
-                    .AddStorageFactoryService()
-                    .AddDaoFactoryService();
-            }
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Storage/LocalBackupStorage.cs b/common/services/ASC.Data.Backup/Storage/LocalBackupStorage.cs
index 2a1d624f25..81bd82816c 100644
--- a/common/services/ASC.Data.Backup/Storage/LocalBackupStorage.cs
+++ b/common/services/ASC.Data.Backup/Storage/LocalBackupStorage.cs
@@ -30,7 +30,8 @@ using System.IO;
 using ASC.Common;
 
 namespace ASC.Data.Backup.Storage
-{
+{
+    [Scope]
     public class LocalBackupStorage : IBackupStorage
     {
         public string Upload(string storageBasePath, string localPath, Guid userId)
@@ -67,12 +68,4 @@ namespace ASC.Data.Backup.Storage
             return string.Empty;
         }
     }
-    public static class LocalBackupStorageExtension
-    {
-        public static DIHelper AddLocalBackupStorage(this DIHelper services)
-        {
-            services.TryAddScoped<LocalBackupStorage>();
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Tasks/BackupPortalTask.cs b/common/services/ASC.Data.Backup/Tasks/BackupPortalTask.cs
index f58b2481fc..0966143bfc 100644
--- a/common/services/ASC.Data.Backup/Tasks/BackupPortalTask.cs
+++ b/common/services/ASC.Data.Backup/Tasks/BackupPortalTask.cs
@@ -50,7 +50,8 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace ASC.Data.Backup.Tasks
-{
+{
+    [Scope]
     public class BackupPortalTask : PortalTaskBase
     {
         private const int MaxLength = 250;
@@ -678,22 +679,4 @@ namespace ASC.Data.Backup.Tasks
             return list;
         }
     }
-    public static class BackupPortalTaskExtension
-    {
-        public static DIHelper AddBackupPortalTaskService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BackupPortalTask>())
-            {
-                return services
-                    .AddCoreConfigurationService()
-                    .AddStorageFactoryService()
-                    .AddModuleProvider()
-                    .AddBackupsContext()
-                    .AddTenantManagerService()
-                    .AddDbFactoryService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Tasks/DbFactory.cs b/common/services/ASC.Data.Backup/Tasks/DbFactory.cs
index dc025e1a89..fbb41e3e6d 100644
--- a/common/services/ASC.Data.Backup/Tasks/DbFactory.cs
+++ b/common/services/ASC.Data.Backup/Tasks/DbFactory.cs
@@ -37,7 +37,8 @@ using Microsoft.Extensions.Configuration;
 using MySql.Data.MySqlClient;
 
 namespace ASC.Data.Backup.Tasks
-{
+{
+    [Scope]
     public class DbFactory
     {
         public const string DefaultConnectionStringName = "default";
@@ -136,12 +137,4 @@ namespace ASC.Data.Backup.Tasks
             return connectionString;
         }
     }
-    public static class DbFactoryExtension
-    {
-        public static DIHelper AddDbFactoryService(this DIHelper services)
-        {
-            services.TryAddScoped<DbFactory>();
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Tasks/Modules/Helpers.cs b/common/services/ASC.Data.Backup/Tasks/Modules/Helpers.cs
index 27f83fc3de..637e334b48 100644
--- a/common/services/ASC.Data.Backup/Tasks/Modules/Helpers.cs
+++ b/common/services/ASC.Data.Backup/Tasks/Modules/Helpers.cs
@@ -35,7 +35,8 @@ using ConfigurationConstants = ASC.Core.Configuration.Constants;
 using UserConstants = ASC.Core.Users.Constants;
 
 namespace ASC.Data.Backup.Tasks.Modules
-{
+{
+    [Scope]
     public class Helpers
     {
 
@@ -92,17 +93,4 @@ namespace ASC.Data.Backup.Tasks.Modules
             return !string.IsNullOrEmpty(s) ? "S|" + Crypto.GetV(instanceCrypto.Decrypt(s), 1, true) : s;
         }
     }
-    public static class HelpersExtension
-    {
-        public static DIHelper AddHelpers(this DIHelper services)
-        {
-            if (services.TryAddScoped<Helpers>())
-            {
-                return services
-                    .AddInstanceCryptoService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Tasks/Modules/ModuleProvider.cs b/common/services/ASC.Data.Backup/Tasks/Modules/ModuleProvider.cs
index 3c9b5ba944..51bebd615d 100644
--- a/common/services/ASC.Data.Backup/Tasks/Modules/ModuleProvider.cs
+++ b/common/services/ASC.Data.Backup/Tasks/Modules/ModuleProvider.cs
@@ -34,7 +34,8 @@ using ASC.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup.Tasks.Modules
-{
+{
+    [Scope]
     public class ModuleProvider
     {
         public List<IModuleSpecifics> AllModules;
@@ -72,18 +73,4 @@ namespace ASC.Data.Backup.Tasks.Modules
             };
         }
     }
-    public static class ModuleProviderExtension
-    {
-        public static DIHelper AddModuleProvider(this DIHelper services)
-        {
-            if (services.TryAddScoped<ModuleProvider>())
-            {
-                return services
-                    .AddCoreSettingsService()
-                    .AddHelpers();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Tasks/RestorePortalTask.cs b/common/services/ASC.Data.Backup/Tasks/RestorePortalTask.cs
index 7353fbfcea..b881381a5c 100644
--- a/common/services/ASC.Data.Backup/Tasks/RestorePortalTask.cs
+++ b/common/services/ASC.Data.Backup/Tasks/RestorePortalTask.cs
@@ -44,7 +44,8 @@ using ASC.Data.Storage;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup.Tasks
-{
+{
+    [Scope]
     public class RestorePortalTask : PortalTaskBase
     {
         private ColumnMapper ColumnMapper { get; set; }
@@ -381,24 +382,4 @@ namespace ASC.Data.Backup.Tasks
             connection.CreateCommand().WithTimeout(120).ExecuteNonQuery();
         }
     }
-
-    public static class RestorePortalTaskExtension
-    {
-        public static DIHelper AddRestorePortalTaskService(this DIHelper services)
-        {
-            if (services.TryAddScoped<RestorePortalTask>())
-            {
-                services.TryAddSingleton<AscCacheNotify>();
-                return services
-                    .AddCoreConfigurationService()
-                    .AddStorageFactoryService()
-                    .AddStorageFactoryConfigService()
-                    .AddModuleProvider()
-                    .AddCoreBaseSettingsService()
-                    .AddLicenseReaderService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Backup/Tasks/TransferPortalTask.cs b/common/services/ASC.Data.Backup/Tasks/TransferPortalTask.cs
index 913083f7ad..5eb2fe23c3 100644
--- a/common/services/ASC.Data.Backup/Tasks/TransferPortalTask.cs
+++ b/common/services/ASC.Data.Backup/Tasks/TransferPortalTask.cs
@@ -40,7 +40,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup.Tasks
-{
+{
+    [Scope]
     public class TransferPortalTask : PortalTaskBase
     {
         public const string DefaultDirectoryName = "backup";
@@ -249,17 +250,4 @@ namespace ASC.Data.Backup.Tasks
         }
 
     }
-
-    public static class TransferPortalTaskExtension
-    {
-        public static DIHelper AddTransferPortalTaskService(this DIHelper services)
-        {
-            services.TryAddScoped<TransferPortalTask>();
-            return services
-                .AddStorageFactoryConfigService()
-                .AddBackupPortalTaskService()
-                .AddDbFactoryService()
-                .AddRestorePortalTaskService();
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs b/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
index 0a8907f067..5a3f22ccd8 100644
--- a/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
+++ b/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
@@ -42,7 +42,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Transient]
     public class EncryptionOperation : ProgressBase
     {
         private const string ConfigPath = "";
@@ -384,13 +385,8 @@ namespace ASC.Data.Storage.Encryption
     {
         public static DIHelper AddEncryptionOperationService(this DIHelper services)
         {
-            services.TryAddTransient<EncryptionOperation>();
             services.TryAddTransient<EncryptionOperationScope>();
-            return services
-                .AddStorageFactoryConfigService()
-                .AddStorageFactoryService()
-                .AddNotifyHelperService()
-                .AddEncryptionSettingsHelperService();
+            return services;
         }
     }
 }
diff --git a/common/services/ASC.Data.Storage.Encryption/EncryptionServiceLauncher.cs b/common/services/ASC.Data.Storage.Encryption/EncryptionServiceLauncher.cs
index 6e8629d665..400cc83330 100644
--- a/common/services/ASC.Data.Storage.Encryption/EncryptionServiceLauncher.cs
+++ b/common/services/ASC.Data.Storage.Encryption/EncryptionServiceLauncher.cs
@@ -31,7 +31,8 @@ using ASC.Common;
 using Microsoft.Extensions.Hosting;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Singletone]
     public class EncryptionServiceLauncher : IHostedService
     {
         private EncryptionServiceListener EncryptionServiceListener { get; set; }
@@ -60,13 +61,4 @@ namespace ASC.Data.Storage.Encryption
             return Task.CompletedTask;
         }
     }
-
-    public static class EncryptionServiceLauncherExtension
-    {
-        public static DIHelper AddEncryptionServiceLauncher(this DIHelper services)
-        {
-            services.TryAddSingleton<EncryptionServiceLauncher>();
-            return services.AddEncryptionServiceListener();
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Storage.Encryption/EncryptionServiceListener.cs b/common/services/ASC.Data.Storage.Encryption/EncryptionServiceListener.cs
index 9b075e46fb..8a675d9400 100644
--- a/common/services/ASC.Data.Storage.Encryption/EncryptionServiceListener.cs
+++ b/common/services/ASC.Data.Storage.Encryption/EncryptionServiceListener.cs
@@ -22,11 +22,12 @@
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
 */
-using ASC.Common.Caching;
 using ASC.Common;
+using ASC.Common.Caching;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Singletone]
     public class EncryptionServiceListener
     {
         private ICacheNotify<EncryptionSettingsProto> NotifySettings { get; }
@@ -62,13 +63,4 @@ namespace ASC.Data.Storage.Encryption
             EncryptionWorker.Stop();
         }
     }
-
-    public static class EncryptionServiceListenerExtension
-    {
-        public static DIHelper AddEncryptionServiceListener(this DIHelper services)
-        {
-            services.TryAddSingleton<EncryptionServiceListener>();
-            return services.AddEncryptionWorkerService();
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs b/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
index 5c69bd1229..43d9683d66 100644
--- a/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
+++ b/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
@@ -34,7 +34,8 @@ using ASC.Common.Caching;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Singletone]
     public class EncryptionWorker
     {
         private CancellationTokenSource TokenSource { get; set; }
@@ -85,7 +86,8 @@ namespace ASC.Data.Storage.Encryption
             return typeof(EncryptionOperation).FullName;
         }
     }
-
+
+    [Singletone]
     public class FactoryOperation
     {
         private IServiceProvider ServiceProvider { get; set; }
@@ -102,14 +104,4 @@ namespace ASC.Data.Storage.Encryption
             return item;
         }
     }
-
-    public static class EncryptionWorkerExtension
-    {
-        public static DIHelper AddEncryptionWorkerService(this DIHelper services)
-        {
-            services.TryAddSingleton<EncryptionWorker>();
-            services.TryAddSingleton<FactoryOperation>();
-            return services.AddEncryptionOperationService();
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Storage.Encryption/NotifyHelper.cs b/common/services/ASC.Data.Storage.Encryption/NotifyHelper.cs
index e32f1d4efd..3c3453052f 100644
--- a/common/services/ASC.Data.Storage.Encryption/NotifyHelper.cs
+++ b/common/services/ASC.Data.Storage.Encryption/NotifyHelper.cs
@@ -33,7 +33,8 @@ using ASC.Notify.Messages;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage.Encryption
-{
+{
+    [Scope]
     public class NotifyHelper
     {
         private const string NotifyService = "ASC.Web.Studio.Core.Notify.StudioNotifyService, ASC.Web.Core";
@@ -102,15 +103,4 @@ namespace ASC.Data.Storage.Encryption
             }
         }
     }
-
-    public static class NotifyHelperExtension
-    {
-        public static DIHelper AddNotifyHelperService(this DIHelper services)
-        {
-            services.TryAddScoped<NotifyHelper>();
-            services.TryAddScoped<NotifyServiceClient>();
-            return services;
-
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Storage.Migration/MigrationService.cs b/common/services/ASC.Data.Storage.Migration/MigrationService.cs
index c933c6ef3b..7bda3e4efa 100644
--- a/common/services/ASC.Data.Storage.Migration/MigrationService.cs
+++ b/common/services/ASC.Data.Storage.Migration/MigrationService.cs
@@ -37,7 +37,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage.Migration
-{
+{
+    [Singletone]
     public class MigrationServiceListener
     {
         public IServiceProvider ServiceProvider { get; }
@@ -78,7 +79,8 @@ namespace ASC.Data.Storage.Migration
             CacheNotifyAction.InsertOrUpdate);
         }
     }
-
+
+    [Scope]
     public class MigrationService : IService
     {
         public StorageUploader StorageUploader { get; }
@@ -126,22 +128,4 @@ namespace ASC.Data.Storage.Migration
             StorageUploader.Stop();
         }
     }
-
-    public static class MigrationServiceExtension
-    {
-        public static DIHelper AddMigrationService(this DIHelper services)
-        {
-            if (services.TryAddScoped<MigrationService>())
-            {
-                services.TryAddSingleton<MigrationServiceListener>();
-                services.TryAddSingleton<StorageUploader>();
-
-                return services
-                    .AddStaticUploaderService()
-                    .AddStorageFactoryConfigService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs b/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
index 528374b5bf..af80a70e9e 100644
--- a/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
+++ b/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
@@ -62,13 +62,4 @@ namespace ASC.Data.Storage.Migration
             return Task.CompletedTask;
         }
     }
-
-    public static class MigrationServiceLauncherExtension
-    {
-        public static DIHelper AddMigrationServiceLauncher(this DIHelper services)
-        {
-            return services
-                .AddMigrationService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Data.Storage.Migration/Program.cs b/common/services/ASC.Data.Storage.Migration/Program.cs
index c4a282d8d9..61396e6ee4 100644
--- a/common/services/ASC.Data.Storage.Migration/Program.cs
+++ b/common/services/ASC.Data.Storage.Migration/Program.cs
@@ -49,10 +49,7 @@ namespace ASC.Data.Storage.Migration
                     var diHelper = new DIHelper(services);
 
                     diHelper.AddNLogManager("ASC.Data.Storage.Migration", "ASC.Migration");
-
-                    diHelper.TryAddSingleton<CommonLinkUtilitySettings>();
-
-                    diHelper.AddMigrationServiceLauncher();
+                    diHelper.TryAdd<MigrationServiceLauncher>();
                     services.AddHostedService<MigrationServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
diff --git a/common/services/ASC.ElasticSearch/Core/SearchSettings.cs b/common/services/ASC.ElasticSearch/Core/SearchSettings.cs
index 28d768afc4..437e302bda 100644
--- a/common/services/ASC.ElasticSearch/Core/SearchSettings.cs
+++ b/common/services/ASC.ElasticSearch/Core/SearchSettings.cs
@@ -79,7 +79,8 @@ namespace ASC.ElasticSearch.Core
             return wrapper != null && wrapper.Enabled;
         }
     }
-
+
+    [Scope]
     public class SearchSettingsHelper
     {
         private TenantManager TenantManager { get; }
@@ -184,21 +185,4 @@ namespace ASC.ElasticSearch.Core
 
         public string Title { get; set; }
     }
-
-    public static class SearchSettingsHelperExtention
-    {
-        public static DIHelper AddSearchSettingsHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SearchSettingsHelper>())
-            {
-                return services
-                    .AddSettingsManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddFactoryIndexerService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.ElasticSearch/Core/Selector.cs b/common/services/ASC.ElasticSearch/Core/Selector.cs
index 62de027533..bff462f541 100644
--- a/common/services/ASC.ElasticSearch/Core/Selector.cs
+++ b/common/services/ASC.ElasticSearch/Core/Selector.cs
@@ -27,14 +27,17 @@
 using System;
 using System.Globalization;
 using System.Linq;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
+
+using ASC.Common;
 
 using Microsoft.Extensions.DependencyInjection;
 
 using Nest;
 
 namespace ASC.ElasticSearch
-{
+{
+    [Scope]
     public class Selector<T> where T : class, ISearchItem
     {
         private readonly QueryContainerDescriptor<T> queryContainerDescriptor = new QueryContainerDescriptor<T>();
diff --git a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
index 8f10fad534..60146d5e10 100644
--- a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
+++ b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
@@ -40,7 +40,6 @@ using ASC.Core;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Context;
 using ASC.Core.Common.EF.Model;
-using ASC.ElasticSearch.Core;
 using ASC.ElasticSearch.Service;
 
 using Autofac;
@@ -51,7 +50,8 @@ using Microsoft.Extensions.Options;
 using Nest;
 
 namespace ASC.ElasticSearch
-{
+{
+    [Singletone]
     public class BaseIndexerHelper
     {
         public ConcurrentDictionary<string, bool> IsExist { get; set; }
@@ -72,7 +72,8 @@ namespace ASC.ElasticSearch
             Notify.Publish(new ClearIndexAction() { Id = t.IndexName }, CacheNotifyAction.Any);
         }
     }
-
+
+    [Scope]
     public class BaseIndexer<T> where T : class, ISearchItem
     {
         private static readonly object Locker = new object();
@@ -623,29 +624,4 @@ namespace ASC.ElasticSearch
         Replace,
         Remove
     }
-
-    public static class BaseIndexerExtention
-    {
-        public static DIHelper AddBaseIndexerHelperService(this DIHelper services)
-        {
-            services.TryAddSingleton<BaseIndexerHelper>();
-            return services.AddKafkaService();
-        }
-
-        public static DIHelper AddBaseIndexerService<T>(this DIHelper services) where T : class, ISearchItem
-        {
-            if (services.TryAddScoped<BaseIndexer<T>>())
-            {
-                return services
-                    .AddFactoryIndexerService()
-                    .AddClientService()
-                    .AddWebstudioDbContextService()
-                    .AddTenantManagerService()
-                    .AddBaseIndexerHelperService()
-                    ;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ElasticSearch/Engine/Client.cs b/common/services/ASC.ElasticSearch/Engine/Client.cs
index bc4cea6365..cf6a29d6c8 100644
--- a/common/services/ASC.ElasticSearch/Engine/Client.cs
+++ b/common/services/ASC.ElasticSearch/Engine/Client.cs
@@ -40,7 +40,8 @@ using Microsoft.Extensions.Options;
 using Nest;
 
 namespace ASC.ElasticSearch
-{
+{
+    [Scope]
     public class Client
     {
         private static volatile ElasticClient client;
@@ -127,19 +128,4 @@ namespace ASC.ElasticSearch
             }
         }
     }
-
-    public static class ClientExtention
-    {
-        public static DIHelper AddClientService(this DIHelper services)
-        {
-            if (services.TryAddScoped<Client>())
-            {
-                return services
-                    .AddSettingsService()
-                    .AddCoreConfigurationService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs b/common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
index 1ea1c2e93e..d6d4af9e6a 100644
--- a/common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
+++ b/common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
@@ -49,7 +49,8 @@ using Microsoft.Extensions.Options;
 using Nest;
 
 namespace ASC.ElasticSearch
-{
+{
+    [Singletone]
     public class FactoryIndexerHelper
     {
         public DateTime LastIndexed { get; set; }
@@ -75,7 +76,8 @@ namespace ASC.ElasticSearch
         void ReIndex();
         string SettingsTitle { get; }
     }
-
+
+    [Scope]
     public class FactoryIndexer<T> : IFactoryIndexer where T : class, ISearchItem
     {
         private static readonly TaskScheduler Scheduler = new ConcurrentExclusiveSchedulerPair(TaskScheduler.Default, 10).ConcurrentScheduler;
@@ -444,7 +446,8 @@ namespace ASC.ElasticSearch
             }
         }
     }
-
+
+    [Scope]
     public class FactoryIndexer
     {
         private static readonly ICache cache = AscCache.Memory;
@@ -587,40 +590,4 @@ namespace ASC.ElasticSearch
             }
         }
     }
-
-    public static class FactoryIndexerExtention
-    {
-        public static DIHelper AddFactoryIndexerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FactoryIndexer>())
-            {
-                services.TryAddSingleton<FactoryIndexerHelper>();
-                return services
-                    .AddClientService()
-                    .AddCoreBaseSettingsService();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddFactoryIndexerService<T>(this DIHelper services, bool addBase = true) where T : class, ISearchItem
-        {
-            if (addBase)
-            {
-                services.TryAddScoped<FactoryIndexer<T>>();
-            }
-
-            if (services.TryAddScoped<Selector<T>>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddFactoryIndexerService()
-                    .AddClientService()
-                    .AddSearchSettingsHelperService()
-                    .AddBaseIndexerService<T>();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.ElasticSearch/Service/Launcher.cs b/common/services/ASC.ElasticSearch/Service/Launcher.cs
index fbae991c5b..5c921de346 100644
--- a/common/services/ASC.ElasticSearch/Service/Launcher.cs
+++ b/common/services/ASC.ElasticSearch/Service/Launcher.cs
@@ -42,6 +42,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.ElasticSearch
 {
+    [Singletone]
     public class ServiceLauncher : IHostedService
     {
         private ILog Log { get; }
@@ -202,14 +203,9 @@ namespace ASC.ElasticSearch
     {
         public static DIHelper AddServiceLauncher(this DIHelper services)
         {
-            services.TryAddSingleton<ServiceLauncher>();
             services.TryAddScoped<ServiceLauncherScope>();
-            services.TryAddSingleton<Service.Service>();
-            services.TryAddScoped<ServiceScope>();
 
-            return services
-                .AddSettingsService()
-                .AddFactoryIndexerService();
+            return services;
         }
     }
 }
diff --git a/common/services/ASC.ElasticSearch/Service/Service.cs b/common/services/ASC.ElasticSearch/Service/Service.cs
index 95979d6222..c964a549c6 100644
--- a/common/services/ASC.ElasticSearch/Service/Service.cs
+++ b/common/services/ASC.ElasticSearch/Service/Service.cs
@@ -27,8 +27,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Core;
 using ASC.Core.Common.Settings;
@@ -40,6 +41,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.ElasticSearch.Service
 {
+    [Singletone]
     public class Service
     {
         public IContainer Container { get; }
@@ -102,7 +104,8 @@ namespace ASC.ElasticSearch.Service
         //    };
         //}
     }
-
+
+    [Scope]
     public class ServiceScope
     {
         private TenantManager TenantManager { get; }
diff --git a/common/services/ASC.ElasticSearch/Service/Settings.cs b/common/services/ASC.ElasticSearch/Service/Settings.cs
index 60e83daf77..131acfd83e 100644
--- a/common/services/ASC.ElasticSearch/Service/Settings.cs
+++ b/common/services/ASC.ElasticSearch/Service/Settings.cs
@@ -30,7 +30,8 @@ using ASC.Common.Utils;
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.ElasticSearch.Service
-{
+{
+    [Singletone]
     public class Settings
     {
         public Settings()
@@ -57,14 +58,5 @@ namespace ASC.ElasticSearch.Service
         public int? Period { get; set; }
 
         public long? MemoryLimit { get; set; }
-    }
-
-    public static class SettingsExtention
-    {
-        public static DIHelper AddSettingsService(this DIHelper services)
-        {
-            services.TryAddSingleton<Settings>();
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs b/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
index 3dbabf6736..74485286a1 100644
--- a/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
+++ b/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
@@ -49,6 +49,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Feed.Aggregator
 {
+    [Singletone]
     public class FeedAggregatorService : IHostedService
     {
         private ILog Log { get; set; }
@@ -288,6 +289,7 @@ namespace ASC.Feed.Aggregator
         }
     }
 
+    [Scope]
     public class FeedAggregatorServiceScope
     {
         private BaseCommonLinkUtility BaseCommonLinkUtility { get; }
@@ -327,22 +329,4 @@ namespace ASC.Feed.Aggregator
             authManager = AuthManager;
         }
     }
-
-    public static class FeedAggregatorServiceExtension
-    {
-        public static DIHelper AddFeedAggregatorService(this DIHelper services)
-        {
-            services.TryAddSingleton<FeedAggregatorService>();
-            services.TryAddScoped<FeedAggregatorServiceScope>();
-
-            return services
-                .AddBaseCommonLinkUtilityService()
-                .AddTenantManagerService()
-                .AddUserManagerService()
-                .AddSecurityContextService()
-                .AddAuthManager()
-                .AddFeedAggregateDataProvider()
-                .AddSignalrServiceClient();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Notify/DbWorker.cs b/common/services/ASC.Notify/DbWorker.cs
index 152a38f23c..adbafb8055 100644
--- a/common/services/ASC.Notify/DbWorker.cs
+++ b/common/services/ASC.Notify/DbWorker.cs
@@ -46,6 +46,7 @@ using Newtonsoft.Json;
 
 namespace ASC.Notify
 {
+    [Singletone]
     public class DbWorker
     {
         private readonly string dbid;
@@ -222,15 +223,4 @@ namespace ASC.Notify
             tx.Commit();
         }
     }
-
-    public static class DbWorkerExtension
-    {
-        public static DIHelper AddDbWorker(this DIHelper services)
-        {
-            services.TryAddSingleton<DbWorker>();
-
-            return services
-                .AddNotifyDbContext();
-        }
-    }
 }
diff --git a/common/services/ASC.Notify/NotifyCleaner.cs b/common/services/ASC.Notify/NotifyCleaner.cs
index d47cb6ee91..26e9ef9901 100644
--- a/common/services/ASC.Notify/NotifyCleaner.cs
+++ b/common/services/ASC.Notify/NotifyCleaner.cs
@@ -39,7 +39,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Notify
-{
+{
+    [Singletone]
     public class NotifyCleaner
     {
         private readonly ILog log;
@@ -107,14 +108,4 @@ namespace ASC.Notify
             }
         }
     }
-
-    public static class NotifyCleanerExtension
-    {
-        public static DIHelper AddNotifyCleaner(this DIHelper services)
-        {
-            services.TryAddSingleton<NotifyCleaner>();
-
-            return services.AddNotifyDbContext();
-        }
-    }
 }
diff --git a/common/services/ASC.Notify/NotifySender.cs b/common/services/ASC.Notify/NotifySender.cs
index 1e6df154fc..0297ef6006 100644
--- a/common/services/ASC.Notify/NotifySender.cs
+++ b/common/services/ASC.Notify/NotifySender.cs
@@ -38,7 +38,8 @@ using ASC.Notify.Messages;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Notify
-{
+{
+    [Singletone]
     public class NotifySender
     {
         private readonly ILog log;
@@ -147,15 +148,4 @@ namespace ASC.Notify
             }
         }
     }
-
-    public static class NotifySenderExtension
-    {
-        public static DIHelper AddNotifySender(this DIHelper services)
-        {
-            services.TryAddSingleton<NotifySender>();
-
-            return services
-                .AddDbWorker();
-        }
-    }
 }
diff --git a/common/services/ASC.Notify/NotifyService.cs b/common/services/ASC.Notify/NotifyService.cs
index 738029b91f..06eae1c106 100644
--- a/common/services/ASC.Notify/NotifyService.cs
+++ b/common/services/ASC.Notify/NotifyService.cs
@@ -40,6 +40,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Notify
 {
+    [Singletone]
     public class NotifyService : INotifyService, IDisposable
     {
         private ILog Log { get; }
@@ -144,12 +145,9 @@ namespace ASC.Notify
     {
         public static DIHelper AddNotifyService(this DIHelper services)
         {
-            services.TryAddSingleton<NotifyService>();
             services.TryAddScoped<NotifyServiceScope>();
-            services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
-            return services
-                .AddDbWorker();
+            return services;
         }
     }
 }
diff --git a/common/services/ASC.Notify/NotifyServiceLauncher.cs b/common/services/ASC.Notify/NotifyServiceLauncher.cs
index 1e2be04eba..0508ea66f9 100644
--- a/common/services/ASC.Notify/NotifyServiceLauncher.cs
+++ b/common/services/ASC.Notify/NotifyServiceLauncher.cs
@@ -29,13 +29,11 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core.Common;
 using ASC.Notify.Config;
 using ASC.Web.Core;
 using ASC.Web.Studio.Core.Notify;
-using ASC.Web.Studio.Utility;
 
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
@@ -128,17 +126,4 @@ namespace ASC.Notify
             }
         }
     }
-
-    public static class NotifyServiceLauncherExtension
-    {
-        public static DIHelper AddNotifyServiceLauncher(this DIHelper services)
-        {
-            return services
-                .AddCommonLinkUtilityService()
-                .AddNotifySender()
-                .AddNotifyService()
-                .AddWebItemManager()
-                .AddNotifyCleaner();
-        }
-    }
 }
diff --git a/common/services/ASC.Notify/Program.cs b/common/services/ASC.Notify/Program.cs
index 0179bf12bd..a19356e4cc 100644
--- a/common/services/ASC.Notify/Program.cs
+++ b/common/services/ASC.Notify/Program.cs
@@ -59,14 +59,9 @@ namespace ASC.Notify
                     diHelper.TryAddSingleton<CommonLinkUtilitySettings>();
                     diHelper.AddSingleton<IConfigureOptions<CommonLinkUtilitySettings>, ConfigureCommonLinkUtilitySettings>();
 
-                    diHelper.AddNotifyServiceLauncher();
+                    diHelper.TryAdd<NotifyServiceLauncher>();
                     services.AddHostedService<NotifyServiceLauncher>();
 
-                    diHelper
-                    .AddJabberSenderService()
-                    .AddSmtpSenderService()
-                    .AddAWSSenderService();
-
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
                 })
                 .UseConsoleLifetime()
diff --git a/common/services/ASC.Socket.IO.Svc/Program.cs b/common/services/ASC.Socket.IO.Svc/Program.cs
index 681549493a..a7a4b437b4 100644
--- a/common/services/ASC.Socket.IO.Svc/Program.cs
+++ b/common/services/ASC.Socket.IO.Svc/Program.cs
@@ -75,8 +75,8 @@ namespace ASC.Socket.IO.Svc
                     var diHelper = new DIHelper(services);
 
                     diHelper.AddNLogManager("ASC.Socket.IO.Svc");
-                    services.AddHostedService<SocketServiceLauncher>();
-                    diHelper.AddSocketServiceLauncher();
+                    services.AddHostedService<SocketServiceLauncher>();
+                    diHelper.TryAdd<SocketServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath, false, false);
                 })
diff --git a/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs b/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
index 0df7e41142..b8738d0ffb 100644
--- a/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
+++ b/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
@@ -43,7 +43,8 @@ using Microsoft.Extensions.Options;
 using WebSocketSharp;
 
 namespace ASC.Socket.IO.Svc
-{
+{
+    [Scope]
     public class SocketServiceLauncher : IHostedService
     {
         private const int PingInterval = 10000;
@@ -239,15 +240,4 @@ namespace ASC.Socket.IO.Svc
             }
         }
     }
-
-    public static class SocketServiceLauncherExtension
-    {
-        public static DIHelper AddSocketServiceLauncher(this DIHelper services)
-        {
-            services.TryAddScoped<SocketServiceLauncher>();
-            return services
-                .AddCoreBaseSettingsService()
-                .AddSignalrServiceClient();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Studio.Notify/Program.cs b/common/services/ASC.Studio.Notify/Program.cs
index efd918e38b..5634a3abce 100644
--- a/common/services/ASC.Studio.Notify/Program.cs
+++ b/common/services/ASC.Studio.Notify/Program.cs
@@ -49,7 +49,7 @@ namespace ASC.Studio.Notify
                     var diHelper = new DIHelper(services);
                     diHelper.AddNLogManager("ASC.Notify", "ASC.Notify.Messages");
                     services.AddHostedService<ServiceLauncher>();
-                    diHelper.AddServiceLauncher();
+                    diHelper.TryAdd<ServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
                 })
diff --git a/common/services/ASC.Studio.Notify/ServiceLauncher.cs b/common/services/ASC.Studio.Notify/ServiceLauncher.cs
index 249eda76d3..b7f07e52f6 100644
--- a/common/services/ASC.Studio.Notify/ServiceLauncher.cs
+++ b/common/services/ASC.Studio.Notify/ServiceLauncher.cs
@@ -64,18 +64,4 @@ namespace ASC.Notify
             return Task.CompletedTask;
         }
     }
-
-    public static class ServiceLauncherExtension
-    {
-        public static DIHelper AddServiceLauncher(this DIHelper services)
-        {
-            services.TryAddSingleton<StudioNotifyServiceSender>();
-
-            return services
-                .AddWebItemManager()
-                .AddStudioNotifyServiceSender()
-                .AddNotifyConfiguration()
-                ;
-        }
-    }
 }
diff --git a/common/services/ASC.TelegramService/Commands/UserCommands.cs b/common/services/ASC.TelegramService/Commands/UserCommands.cs
index 19f782e044..c1ee72a456 100644
--- a/common/services/ASC.TelegramService/Commands/UserCommands.cs
+++ b/common/services/ASC.TelegramService/Commands/UserCommands.cs
@@ -34,7 +34,8 @@ using ASC.TelegramService.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.TelegramService.Commands
-{
+{
+    [Scope]
     public class UserCommands : CommandContext
     {
         private CachedTelegramDao CachedTelegramDao { get; }
@@ -70,13 +71,4 @@ namespace ASC.TelegramService.Commands
             await ReplyAsync("Error");
         }
     }
-
-    public static class UserCommandsExtension
-    {
-        public static DIHelper AddUserCommandsService(this DIHelper services)
-        {
-            services.TryAddScoped<UserCommands>();
-            return services.AddCachedTelegramDaoService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.TelegramService/Core/Core.cs b/common/services/ASC.TelegramService/Core/Core.cs
index e18b390324..6e581a8079 100644
--- a/common/services/ASC.TelegramService/Core/Core.cs
+++ b/common/services/ASC.TelegramService/Core/Core.cs
@@ -29,14 +29,13 @@ using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-
+
 using ASC.Common;
 using ASC.Common.Logging;
-using ASC.TelegramService.Commands;
-
-using Microsoft.Extensions.Options;
+
 using Microsoft.Extensions.DependencyInjection;
-
+using Microsoft.Extensions.Options;
+
 using Telegram.Bot;
 using Telegram.Bot.Types;
 
@@ -58,7 +57,8 @@ namespace ASC.TelegramService.Core
             Args = args;
         }
     }
-
+
+    [Singletone]
     public class CommandModule
     {
         private ILog Log { get; }
@@ -191,13 +191,4 @@ namespace ASC.TelegramService.Core
         public override abstract object FromString(string arg);
         public override abstract string ToString(object arg);
     }
-
-    public static class CommandModuleExtension
-    {
-        public static DIHelper AddCommandModuleService(this DIHelper services)
-        {
-            services.TryAddSingleton<CommandModule>();
-            return services.AddUserCommandsService();
-        }
-    }
 }
diff --git a/common/services/ASC.TelegramService/TelegramHandler.cs b/common/services/ASC.TelegramService/TelegramHandler.cs
index a0b09d5b56..0929e32c8b 100644
--- a/common/services/ASC.TelegramService/TelegramHandler.cs
+++ b/common/services/ASC.TelegramService/TelegramHandler.cs
@@ -44,7 +44,8 @@ using Telegram.Bot;
 using Telegram.Bot.Args;
 
 namespace ASC.TelegramService
-{
+{
+    [Singletone]
     public class TelegramHandler
     {
         private Dictionary<int, TenantTgClient> Clients { get; set; }
@@ -174,15 +175,4 @@ namespace ASC.TelegramService
             return string.Format("{0}:{1}", userId, tenantId);
         }
     }
-
-    public static class TelegramHandlerExtension
-    {
-        public static DIHelper AddTelegramHandlerService(this DIHelper services)
-        {
-            services.TryAddSingleton<TelegramHandler>();
-            return services.AddCachedTelegramDaoService()
-                .AddCommandModuleService()
-                .AddTelegramHelperSerivce();
-        }
-    }
 }
diff --git a/common/services/ASC.TelegramService/TelegramLauncher.cs b/common/services/ASC.TelegramService/TelegramLauncher.cs
index 04f2581b04..c021d00ae1 100644
--- a/common/services/ASC.TelegramService/TelegramLauncher.cs
+++ b/common/services/ASC.TelegramService/TelegramLauncher.cs
@@ -30,15 +30,14 @@ using System.Threading.Tasks;
 using ASC.Common;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
-using ASC.Core.Common.Notify;
 using ASC.FederatedLogin.LoginProviders;
-using ASC.TelegramService.Commands;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace ASC.TelegramService
-{
+{
+    [Singletone]
     public class TelegramLauncher : IHostedService
     {
         private TelegramListener TelegramListener { get; set; }
@@ -104,17 +103,8 @@ namespace ASC.TelegramService
     {
         public static DIHelper AddTelegramLauncher(this DIHelper services)
         {
-            services.TryAddSingleton<TelegramLauncher>();
             services.TryAddScoped<ScopeTelegramLauncher>();
-            return services.AddTelegramService()
-                .AddTelegramListenerService()
-                .AddTelegramHandlerService()
-                .AddTenantManagerService()
-                .AddTelegramLoginProviderService()
-                .AddTelegramHelperSerivce()
-                .AddTelegramServiceClient()
-                .AddConsumerFactoryService()
-                .AddUserCommandsService();
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.TelegramService/TelegramListener.cs b/common/services/ASC.TelegramService/TelegramListener.cs
index 49e4c008f7..7bd17be0aa 100644
--- a/common/services/ASC.TelegramService/TelegramListener.cs
+++ b/common/services/ASC.TelegramService/TelegramListener.cs
@@ -29,7 +29,8 @@ using ASC.Core.Common.Notify;
 using ASC.Notify.Messages;
 
 namespace ASC.TelegramService
-{
+{
+    [Singletone]
     public class TelegramListener
     {
         private ICacheNotify<NotifyMessage> CacheMessage { get; }
@@ -90,13 +91,4 @@ namespace ASC.TelegramService
             TelegramService.CreateOrUpdateClient(createClientProto.TenantId, createClientProto.Token, createClientProto.TokenLifespan, createClientProto.Proxy);
         }
     }
-
-    public static class TelegramListenerExtension
-    {
-        public static DIHelper AddTelegramListenerService(this DIHelper services)
-        {
-            services.TryAddSingleton<TelegramListener>();
-            return services.AddTelegramService();
-        }
-    }
 }
diff --git a/common/services/ASC.TelegramService/TelegramService.cs b/common/services/ASC.TelegramService/TelegramService.cs
index 4294792986..f617a6d150 100644
--- a/common/services/ASC.TelegramService/TelegramService.cs
+++ b/common/services/ASC.TelegramService/TelegramService.cs
@@ -29,7 +29,8 @@ using ASC.Core.Common.Notify;
 using ASC.Notify.Messages;
 
 namespace ASC.TelegramService
-{
+{
+    [Singletone]
     public class TelegramService : ITelegramService
     {
         private TelegramHandler TelegramHandler { get; set; }
@@ -59,13 +60,4 @@ namespace ASC.TelegramService
             TelegramHandler.CreateOrUpdateClientForTenant(tenantId, token, tokenLifespan, proxy, false);
         }
     }
-
-    public static class TelegramServiceExtension
-    {
-        public static DIHelper AddTelegramService(this DIHelper services)
-        {
-            services.TryAddSingleton<TelegramService>();
-            return services.AddTelegramHandlerService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Thumbnails.Svc/Program.cs b/common/services/ASC.Thumbnails.Svc/Program.cs
index 4472a63b0f..e760e38b09 100644
--- a/common/services/ASC.Thumbnails.Svc/Program.cs
+++ b/common/services/ASC.Thumbnails.Svc/Program.cs
@@ -75,7 +75,7 @@ namespace ASC.Thumbnails.Svc
                     var diHelper = new DIHelper(services);
                     diHelper.AddNLogManager("ASC.Thumbnails.Svc");
                     services.AddHostedService<ThumbnailsServiceLauncher>();
-                    diHelper.AddThumbnailsServiceLauncher();
+                    diHelper.TryAdd<ThumbnailsServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath, false, false);
                 })
diff --git a/common/services/ASC.Thumbnails.Svc/ThumbnailsServiceLauncher.cs b/common/services/ASC.Thumbnails.Svc/ThumbnailsServiceLauncher.cs
index 56b6608bf9..5b9039a2e3 100644
--- a/common/services/ASC.Thumbnails.Svc/ThumbnailsServiceLauncher.cs
+++ b/common/services/ASC.Thumbnails.Svc/ThumbnailsServiceLauncher.cs
@@ -39,7 +39,8 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Thumbnails.Svc
-{
+{
+    [Scope]
     public class ThumbnailsServiceLauncher : IHostedService
     {
         private ProcessStartInfo StartInfo { get; set; }
@@ -116,12 +117,4 @@ namespace ASC.Thumbnails.Svc
             Proc = Process.Start(StartInfo);
         }
     }
-    public static class ThumbnailsServiceLauncherExtension
-    {
-        public static DIHelper AddThumbnailsServiceLauncher(this DIHelper services)
-        {
-            services.TryAddScoped<ThumbnailsServiceLauncher>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/services/ASC.UrlShortener.Svc/Program.cs b/common/services/ASC.UrlShortener.Svc/Program.cs
index 3002857ac8..5b713201a0 100644
--- a/common/services/ASC.UrlShortener.Svc/Program.cs
+++ b/common/services/ASC.UrlShortener.Svc/Program.cs
@@ -74,7 +74,7 @@ namespace ASC.UrlShortener.Svc
                     var diHelper = new DIHelper(services);
                     diHelper.AddNLogManager("ASC.UrlShortener.Svc");
                     services.AddHostedService<UrlShortenerServiceLauncher>();
-                    diHelper.AddUrlShortenerServiceLauncher();
+                    diHelper.TryAdd<UrlShortenerServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath, false, false);
                 })
diff --git a/common/services/ASC.UrlShortener.Svc/UrlShortenerService.cs b/common/services/ASC.UrlShortener.Svc/UrlShortenerService.cs
index 9033352ef6..ef934a8fb5 100644
--- a/common/services/ASC.UrlShortener.Svc/UrlShortenerService.cs
+++ b/common/services/ASC.UrlShortener.Svc/UrlShortenerService.cs
@@ -40,7 +40,8 @@ using Microsoft.Extensions.Options;
 
 
 namespace ASC.UrlShortener.Svc
-{
+{
+    [Singletone]
     public class UrlShortenerService : IServiceController
     {
         private readonly ILog log;
@@ -145,14 +146,4 @@ namespace ASC.UrlShortener.Svc
             return startInfo;
         }
     }
-
-    public static class UrlShortenerServiceExtension
-    {
-        public static DIHelper AddUrlShortenerService(this DIHelper services)
-        {
-            services.TryAddSingleton<UrlShortenerService>();
-
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs b/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
index 2ded3572e3..8db56310b1 100644
--- a/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
+++ b/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
@@ -57,12 +57,4 @@ namespace ASC.UrlShortener.Svc
             return Task.CompletedTask;
         }
     }
-
-    public static class UrlShortenerServiceLauncherExtension
-    {
-        public static DIHelper AddUrlShortenerServiceLauncher(this DIHelper services)
-        {
-            return services.AddUrlShortenerService();
-        }
-    }
 }
diff --git a/products/ASC.Files/Core/Configuration/FilesSettings.cs b/products/ASC.Files/Core/Configuration/FilesSettings.cs
index f612b3e303..72b66980c2 100644
--- a/products/ASC.Files/Core/Configuration/FilesSettings.cs
+++ b/products/ASC.Files/Core/Configuration/FilesSettings.cs
@@ -106,7 +106,8 @@ namespace ASC.Web.Files.Classes
             get { return new Guid("{03B382BD-3C20-4f03-8AB9-5A33F016316E}"); }
         }
     }
-
+
+    [Scope]
     public class FilesSettingsHelper
     {
         private SettingsManager SettingsManager { get; }
@@ -276,20 +277,5 @@ namespace ASC.Web.Files.Classes
         {
             SettingsManager.SaveForCurrentUser(settings);
         }
-    }
-
-    public static class FilesSettingsHelperExtention
-    {
-        public static DIHelper AddFilesSettingsHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FilesSettingsHelper>())
-            {
-                return services
-                    .AddSettingsManagerService()
-                    .AddCoreBaseSettingsService();
-            }
-
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs b/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
index f8e02579d9..93ee2867ba 100644
--- a/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
+++ b/products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
@@ -41,7 +41,8 @@ using ASC.Web.Files.Classes;
 using ASC.Web.Studio.Utility;
 
 namespace ASC.Web.Files
-{
+{
+    [Scope]
     public class FilesSpaceUsageStatManager : SpaceUsageStatManager
     {
         private ASC.Files.Core.EF.FilesDbContext FilesDbContext { get; }
@@ -122,7 +123,8 @@ namespace ASC.Web.Files
 
         }
     }
-
+
+    [Scope]
     public class FilesUserSpaceUsage : IUserSpaceUsage
     {
         private ASC.Files.Core.EF.FilesDbContext FilesDbContext { get; }
@@ -150,44 +152,4 @@ namespace ASC.Web.Files
                 .FirstOrDefault();
         }
     }
-
-    public static class FilesSpaceUsageStatManagerExtention
-    {
-        public static DIHelper AddFilesSpaceUsageStatManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FilesSpaceUsageStatManager>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddUserManagerService()
-                    .AddUserPhotoManagerService()
-                    .AddDisplayUserSettingsService()
-                    .AddCommonLinkUtilityService()
-                    .AddFilesDbContextService()
-                    .AddPathProviderService()
-                    .AddFeedDbService()
-                    .AddNotifyDbContext()
-                    .AddDbContextService()
-                    .AddResourceDbService()
-                    .AddVoipDbContextService()
-                    .AddMailDbContextService()
-                    .AddMessagesContextService();
-
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddFilesUserSpaceUsageService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FilesUserSpaceUsage>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddFilesDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs b/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
index 85555708f1..16f3bd49f3 100644
--- a/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
+++ b/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
@@ -35,11 +35,11 @@ using ASC.Files.Core.Resources;
 using ASC.Web.Core;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Files.Classes;
-using ASC.Web.Files.Core.Search;
 using ASC.Web.Studio.Core.Notify;
 
 namespace ASC.Web.Files.Configuration
-{
+{
+    [Scope]
     public class ProductEntryPoint : Product
     {
         internal const string ProductPath = "/products/files/";
@@ -179,19 +179,8 @@ namespace ASC.Web.Files.Configuration
     public static class ProductEntryPointExtention
     {
         public static DIHelper AddProductEntryPointService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ProductEntryPoint>())
-            {
-                services.TryAddScoped<IWebItem, ProductEntryPoint>();
-                return services
-                    .AddFilesSpaceUsageStatManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddAuthContextService()
-                    .AddUserManagerService()
-                    .AddGlobalService()
-                    .AddFilesSubscriptionManagerService()
-                    .AddFactoryIndexerFileService();
-            }
+        {
+            services.TryAddScoped<IWebItem, ProductEntryPoint>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Configuration/SubscriptionManager.cs b/products/ASC.Files/Core/Configuration/SubscriptionManager.cs
index cb3d16ca59..33a01e99d0 100644
--- a/products/ASC.Files/Core/Configuration/SubscriptionManager.cs
+++ b/products/ASC.Files/Core/Configuration/SubscriptionManager.cs
@@ -26,16 +26,17 @@
 
 using System;
 using System.Collections.Generic;
-
+
 using ASC.Common;
 using ASC.Core;
 using ASC.Files.Core.Resources;
+using ASC.Files.Core.Services.NotifyService;
 using ASC.Notify.Model;
 using ASC.Web.Core.Subscriptions;
-using ASC.Files.Core.Services.NotifyService;
 
 namespace ASC.Web.Files.Classes
-{
+{
+    [Scope]
     public class SubscriptionManager : IProductSubscriptionManager
     {
         private readonly Guid _subscrTypeDocuSignComplete = new Guid("{0182E476-D63D-46ED-B928-104861507811}");
@@ -137,19 +138,4 @@ namespace ASC.Web.Files.Classes
             return new List<SubscriptionGroup>();
         }
     }
-
-    public static class FilesSubscriptionManagerExtention
-    {
-        public static DIHelper AddFilesSubscriptionManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SubscriptionManager>())
-            {
-                return services
-                    .AddFilesNotifySourceService()
-                    .AddCoreBaseSettingsService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs
index 49946f0f22..23f74532f4 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs
@@ -24,10 +24,13 @@
 */
 
 
+using ASC.Common;
+using ASC.Files.Core.Data;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Core
-{
+{
+    [Scope(typeof(DaoFactory))]
     public interface IDaoFactory
     {
         IFolderDao<T> GetFolderDao<T>();
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
index 95c6dd4791..2a2786bb6f 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
@@ -25,10 +25,14 @@
 
 
 using System;
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
+using ASC.Common;
+using ASC.Files.Thirdparty;
+
 namespace ASC.Files.Core
-{
+{
+    [Scope(typeof(ProviderAccountDao))]
     public interface IProviderDao
     {
         IProviderInfo GetProviderInfo(int linkId);
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
index 265106a400..3ac08b894e 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
@@ -65,27 +65,4 @@ namespace ASC.Files.Core.Data
             return ServiceProvider.GetService<ISecurityDao<T>>();
         }
     }
-
-    public static class DaoFactoryExtention
-    {
-        public static DIHelper AddDaoFactoryService(this DIHelper services)
-        {
-            if (services.TryAddScoped<IDaoFactory, DaoFactory>())
-            {
-                return services
-                    .AddFileDaoService()
-                    .AddFolderDaoService()
-                    .AddTagDaoService()
-                    .AddSecurityDaoService()
-                    .AddCachedProviderAccountDaoService()
-                    .AddProviderTagDaoService()
-                    .AddProviderSecurityDaoService()
-                    .AddProviderFileDaoService()
-                    .AddProviderFolderDaoService()
-                    ;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
index 73359dd1c9..870486569d 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
@@ -44,7 +44,6 @@ using ASC.Files.Core.Thirdparty;
 using ASC.Files.Thirdparty.ProviderDao;
 using ASC.Web.Core.Files;
 using ASC.Web.Files.Classes;
-using ASC.Web.Files.Core.Search;
 using ASC.Web.Files.Services.DocumentService;
 using ASC.Web.Files.Utils;
 using ASC.Web.Studio.Core;
@@ -468,15 +467,15 @@ namespace ASC.Files.Core.Data
                 {
                     try
                     {
-                    if (isNew)
-                    {
-                        var stored = GlobalStore.GetStore().IsDirectory(GetUniqFileDirectory(file.ID));
-                        DeleteFile(file.ID, stored);
-                    }
-                    else if (!IsExistOnStorage(file))
-                    {
-                        DeleteVersion(file);
-                    }
+                        if (isNew)
+                        {
+                            var stored = GlobalStore.GetStore().IsDirectory(GetUniqFileDirectory(file.ID));
+                            DeleteFile(file.ID, stored);
+                        }
+                        else if (!IsExistOnStorage(file))
+                        {
+                            DeleteVersion(file);
+                        }
                     }
                     catch (Exception deleteException)
                     {
@@ -959,10 +958,10 @@ namespace ASC.Files.Core.Data
             if (!uploadSession.UseChunks)
             {
                 using var streamToSave = ChunkedUploadSessionHolder.UploadSingleChunk(uploadSession, stream, chunkLength);
-                    if (streamToSave != Stream.Null)
-                    {
-                        uploadSession.File = SaveFile(GetFileForCommit(uploadSession), streamToSave);
-                    }
+                if (streamToSave != Stream.Null)
+                {
+                    uploadSession.File = SaveFile(GetFileForCommit(uploadSession), streamToSave);
+                }
 
                 return;
             }
@@ -1441,31 +1440,9 @@ namespace ASC.Files.Core.Data
     {
         public static DIHelper AddFileDaoService(this DIHelper services)
         {
-            if (services.TryAddScoped<IFileDao<int>, FileDao>())
-            {
-            services.TryAddTransient<File<int>>();
+            services.TryAddScoped<IFileDao<int>, FileDao>();
 
-            return services
-                .AddFilesDbContextService()
-                .AddUserManagerService()
-                .AddTenantManagerService()
-                .AddTenantUtilService()
-                .AddSetupInfo()
-                .AddTenantExtraService()
-                .AddTenantStatisticsProviderService()
-                .AddCoreBaseSettingsService()
-                .AddCoreConfigurationService()
-                .AddSettingsManagerService()
-                .AddAuthContextService()
-                .AddGlobalStoreService()
-                .AddGlobalSpaceService()
-                .AddFactoryIndexerFileService()
-                .AddGlobalFolderService()
-                .AddChunkedUploadSessionHolderService()
-                .AddFolderDaoService();
+            return services;
         }
-
-            return services;
-    }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
index 6661e78dac..928ef367af 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
@@ -42,7 +42,6 @@ using ASC.Files.Core.Security;
 using ASC.Files.Core.Thirdparty;
 using ASC.Files.Thirdparty.ProviderDao;
 using ASC.Web.Files.Classes;
-using ASC.Web.Files.Core.Search;
 using ASC.Web.Studio.Core;
 using ASC.Web.Studio.UserControls.Statistics;
 using ASC.Web.Studio.Utility;
@@ -1285,27 +1284,7 @@ namespace ASC.Files.Core.Data
     {
         public static DIHelper AddFolderDaoService(this DIHelper services)
         {
-            if (services.TryAddScoped<IFolderDao<int>, FolderDao>())
-            {
-                services.TryAddTransient<Folder<int>>();
-                services.TryAddTransient<Folder<string>>();
-
-                return services
-                    .AddFactoryIndexerFolderService()
-                    .AddTenantManagerService()
-                    .AddUserManagerService()
-                    .AddFilesDbContextService()
-                    .AddTenantUtilService()
-                    .AddSetupInfo()
-                    .AddTenantExtraService()
-                    .AddTenantStatisticsProviderService()
-                    .AddCoreBaseSettingsService()
-                    .AddCoreConfigurationService()
-                    .AddSettingsManagerService()
-                    .AddAuthContextService()
-                    .AddGlobalSpaceService();
-            }
-
+            services.TryAddScoped<IFolderDao<int>, FolderDao>();
             return services;
         }
     }
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
index 4426100618..e0482cee04 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.UserControls.Statistics;
 using ASC.Web.Studio.Utility;
 
 namespace ASC.Files.Core.Data
-{
+{
+    [Scope]
     internal class SecurityDao<T> : AbstractDao, ISecurityDao<T>
     {
         public SecurityDao(UserManager userManager,
@@ -376,25 +377,8 @@ namespace ASC.Files.Core.Data
     public static class SecurityDaoExtention
     {
         public static DIHelper AddSecurityDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SecurityDao<int>>())
-            {
-                services.TryAddScoped<SecurityDao<string>>();
-                services.TryAddScoped<ISecurityDao<int>, SecurityDao<int>>();
-
-                return services
-                    .AddUserManagerService()
-                    .AddFilesDbContextService()
-                    .AddTenantManagerService()
-                    .AddTenantUtilService()
-                    .AddSetupInfo()
-                    .AddTenantExtraService()
-                    .AddTenantStatisticsProviderService()
-                    .AddCoreBaseSettingsService()
-                    .AddCoreConfigurationService()
-                    .AddSettingsManagerService()
-                    .AddAuthContextService();
-            }
+        {
+            services.TryAddScoped<ISecurityDao<int>, SecurityDao<int>>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
index 8b61fa0300..2f4f3418cf 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
@@ -40,7 +40,8 @@ using ASC.Web.Studio.UserControls.Statistics;
 using ASC.Web.Studio.Utility;
 
 namespace ASC.Files.Core.Data
-{
+{
+    [Scope]
     internal class TagDao<T> : AbstractDao, ITagDao<T>
     {
         private static readonly object syncRoot = new object();
@@ -699,23 +700,7 @@ namespace ASC.Files.Core.Data
     {
         public static DIHelper AddTagDaoService(this DIHelper services)
         {
-            if (services.TryAddScoped<TagDao<string>>())
-            {
-                services.TryAddScoped<ITagDao<int>, TagDao<int>>();
-
-                return services
-                    .AddUserManagerService()
-                    .AddFilesDbContextService()
-                    .AddTenantManagerService()
-                    .AddTenantUtilService()
-                    .AddSetupInfo()
-                    .AddTenantExtraService()
-                    .AddTenantStatisticsProviderService()
-                    .AddCoreBaseSettingsService()
-                    .AddCoreConfigurationService()
-                    .AddSettingsManagerService()
-                    .AddAuthContextService();
-            }
+            services.TryAddScoped<ITagDao<int>, TagDao<int>>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Core/EF/DbFile.cs b/products/ASC.Files/Core/Core/EF/DbFile.cs
index 8c8a341f36..2a0096e34d 100644
--- a/products/ASC.Files/Core/Core/EF/DbFile.cs
+++ b/products/ASC.Files/Core/Core/EF/DbFile.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq.Expressions;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Model;
 using ASC.ElasticSearch;
@@ -21,7 +22,8 @@ namespace ASC.Files.Core.EF
         public const string Tree = "tree";
         public const string Folder = "folder";
     }
-
+
+    [Transient]
     [ElasticsearchType(RelationName = Tables.File)]
     [Table("files_file")]
     public class DbFile : BaseEntity, IDbFile, IDbSearch, ISearchItemDocument
diff --git a/products/ASC.Files/Core/Core/EF/DbFolder.cs b/products/ASC.Files/Core/Core/EF/DbFolder.cs
index ced19adbed..b32c3e0072 100644
--- a/products/ASC.Files/Core/Core/EF/DbFolder.cs
+++ b/products/ASC.Files/Core/Core/EF/DbFolder.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq.Expressions;
 
+using ASC.Common;
 using ASC.Core.Common.EF;
 using ASC.Core.Common.EF.Model;
 using ASC.ElasticSearch;
@@ -13,7 +14,8 @@ using Nest;
 using ColumnAttribute = System.ComponentModel.DataAnnotations.Schema.ColumnAttribute;
 
 namespace ASC.Files.Core.EF
-{
+{
+    [Transient]
     [ElasticsearchType(RelationName = Tables.Folder)]
     [Table("files_folder")]
     public class DbFolder : IDbFile, IDbSearch, ISearchItem
diff --git a/products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs b/products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
index 3b8608ca0a..fbface633d 100644
--- a/products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
+++ b/products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
@@ -60,7 +60,8 @@ namespace ASC.Files.Core
             return clone;
         }
     }
-
+
+    [Scope]
     public class ChunkedUploadSessionHelper
     {
         private EntryManager EntryManager { get; }
@@ -100,17 +101,4 @@ namespace ASC.Files.Core
             };
         }
     }
-
-    public static class ChunkedUploadSessionHelperExtention
-    {
-        public static DIHelper AddChunkedUploadSessionHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ChunkedUploadSessionHelper>())
-            {
-                return services.AddEntryManagerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs b/products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
index e2f3c90223..9e754f2fb0 100644
--- a/products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
+++ b/products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
@@ -33,7 +33,6 @@ using ASC.Common;
 using ASC.Core;
 using ASC.Core.Users;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Web.Files.Services.WCFService;
@@ -48,6 +47,7 @@ namespace ASC.Web.Files.Core.Entries
         public Guid UserId { get; set; }
     }
 
+    [Scope]
     public class EncryptionKeyPairHelper
     {
         private UserManager UserManager { get; }
@@ -132,22 +132,4 @@ namespace ASC.Web.Files.Core.Entries
             return fileKeysPair;
         }
     }
-
-    public static class EncryptionKeyPairHelperExtention
-    {
-        public static DIHelper AddEncryptionKeyPairHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<EncryptionKeyPairHelper>())
-            {
-                services
-                    .AddAuthContextService()
-                    .AddUserManagerService()
-                    .AddEncryptionLoginProviderService()
-                    .AddFileSecurityService()
-                    .AddDaoFactoryService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Entries/File.cs b/products/ASC.Files/Core/Core/Entries/File.cs
index 965e1cb8f8..eec26b2c87 100644
--- a/products/ASC.Files/Core/Core/Entries/File.cs
+++ b/products/ASC.Files/Core/Core/Entries/File.cs
@@ -26,8 +26,9 @@
 
 using System;
 using System.Diagnostics;
-using System.Text.Json.Serialization;
-
+using System.Text.Json.Serialization;
+
+using ASC.Common;
 using ASC.Web.Core.Files;
 using ASC.Web.Files.Classes;
 using ASC.Web.Files.Utils;
@@ -54,7 +55,8 @@ namespace ASC.Files.Core
 
         IsTemplate = 0x40
     }
-
+
+    [Transient]
     [Serializable]
     [DebuggerDisplay("{Title} ({ID} v{Version})")]
     public class File<T> : FileEntry<T>
diff --git a/products/ASC.Files/Core/Core/Entries/Folder.cs b/products/ASC.Files/Core/Core/Entries/Folder.cs
index 5b9f84f359..8f7a0587be 100644
--- a/products/ASC.Files/Core/Core/Entries/Folder.cs
+++ b/products/ASC.Files/Core/Core/Entries/Folder.cs
@@ -25,8 +25,9 @@
 
 
 using System;
-using System.Diagnostics;
-
+using System.Diagnostics;
+
+using ASC.Common;
 using ASC.Web.Files.Classes;
 
 namespace ASC.Files.Core
@@ -45,7 +46,8 @@ namespace ASC.Files.Core
         Templates = 12,
         Privacy = 13,
     }
-
+
+    [Transient]
     [DebuggerDisplay("{Title} ({ID})")]
     public class Folder<T> : FileEntry<T>
     {
diff --git a/products/ASC.Files/Core/Core/FileStorageService.cs b/products/ASC.Files/Core/Core/FileStorageService.cs
index 6432bbc727..4c8d6a143c 100644
--- a/products/ASC.Files/Core/Core/FileStorageService.cs
+++ b/products/ASC.Files/Core/Core/FileStorageService.cs
@@ -48,7 +48,6 @@ using ASC.Data.Storage;
 using ASC.ElasticSearch;
 using ASC.FederatedLogin.LoginProviders;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Files.Core.Services.NotifyService;
@@ -56,7 +55,6 @@ using ASC.MessagingSystem;
 using ASC.Web.Core.Files;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Core.Users;
-using ASC.Web.Core.Utility;
 using ASC.Web.Files.Classes;
 using ASC.Web.Files.Core.Entries;
 using ASC.Web.Files.Helpers;
@@ -76,6 +74,7 @@ using UrlShortener = ASC.Web.Core.Utility.UrlShortener;
 
 namespace ASC.Web.Files.Services.WCFService
 {
+    [Scope]
     public class FileStorageService<T> //: IFileStorageService
     {
         private static readonly FileEntrySerializer serializer = new FileEntrySerializer();
@@ -579,27 +578,27 @@ namespace ASC.Web.Files.Services.WCFService
 
             if (fileWrapper.TemplateId.Equals(default(T)))
             {
-            var culture = UserManager.GetUsers(AuthContext.CurrentAccount.ID).GetCulture();
-            var storeTemplate = GetStoreTemplate();
+                var culture = UserManager.GetUsers(AuthContext.CurrentAccount.ID).GetCulture();
+                var storeTemplate = GetStoreTemplate();
 
-            var path = FileConstant.NewDocPath + culture + "/";
-            if (!storeTemplate.IsDirectory(path))
-            {
-                path = FileConstant.NewDocPath + "default/";
-            }
+                var path = FileConstant.NewDocPath + culture + "/";
+                if (!storeTemplate.IsDirectory(path))
+                {
+                    path = FileConstant.NewDocPath + "default/";
+                }
 
-            path += "new" + fileExt;
+                path += "new" + fileExt;
 
-            try
-            {
-                using var stream = storeTemplate.GetReadStream("", path);
-                file.ContentLength = stream.CanSeek ? stream.Length : storeTemplate.GetFileSize(path);
-                file = fileDao.SaveFile(file, stream);
-            }
-            catch (Exception e)
-            {
-                throw GenerateException(e);
-            }
+                try
+                {
+                    using var stream = storeTemplate.GetReadStream("", path);
+                    file.ContentLength = stream.CanSeek ? stream.Length : storeTemplate.GetFileSize(path);
+                    file = fileDao.SaveFile(file, stream);
+                }
+                catch (Exception e)
+                {
+                    throw GenerateException(e);
+                }
             }
             else
             {
@@ -2245,54 +2244,6 @@ namespace ASC.Web.Files.Services.WCFService
         {
             return HttpContextAccessor?.HttpContext?.Request?.Headers;
         }
-    }
-
-    public static class FileStorageServiceExtention
-    {
-        public static DIHelper AddFileStorageService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileStorageService<string>>())
-            {
-            services.TryAddScoped<FileStorageService<int>>();
-            //services.TryAddScoped<IFileStorageService, FileStorageService>();
-            return services
-                .AddGlobalService()
-                .AddGlobalStoreService()
-                .AddGlobalFolderHelperService()
-                .AddAuthContextService()
-                .AddUserManagerService()
-                .AddFilesLinkUtilityService()
-                .AddBaseCommonLinkUtilityService()
-                .AddCoreBaseSettingsService()
-                .AddCustomNamingPeopleService()
-                .AddDisplayUserSettingsService()
-                .AddPathProviderService()
-                .AddDaoFactoryService()
-                .AddFileMarkerService()
-                .AddFilesSettingsHelperService()
-                .AddFileUtilityService()
-                .AddFileSecurityService()
-                .AddFilesMessageService()
-                .AddFileShareLinkService()
-                .AddDocumentServiceConnectorService()
-                .AddEntryManagerService()
-                .AddDocumentServiceHelperService()
-                .AddThirdpartyConfigurationService()
-                .AddUrlShortener()
-                .AddDocuSignHelperService()
-                .AddDocuSignTokenService()
-                .AddFileConverterService()
-                .AddNotifyClientService()
-                .AddFileSharingService()
-                .AddDocumentServiceTrackerHelperService()
-                .AddSocketManagerService()
-                .AddFileOperationsManagerHelperService()
-                    .AddFileSharingAceHelperService()
-                    .AddTenantManagerService();
-        }
-
-            return services;
-    }
     }
 
     public class FileModel<T>
diff --git a/products/ASC.Files/Core/Core/FilesIntegration.cs b/products/ASC.Files/Core/Core/FilesIntegration.cs
index 5c093bb17c..c73dbb2aa2 100644
--- a/products/ASC.Files/Core/Core/FilesIntegration.cs
+++ b/products/ASC.Files/Core/Core/FilesIntegration.cs
@@ -30,11 +30,11 @@ using System.Linq;
 
 using ASC.Common;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Security;
 
 namespace ASC.Web.Files.Api
-{
+{
+    [Scope]
     public class FilesIntegration
     {
         private static readonly IDictionary<string, IFileSecurityProvider> providers = new Dictionary<string, IFileSecurityProvider>();
@@ -132,17 +132,4 @@ namespace ASC.Web.Files.Api
             return result;
         }
     }
-    public static class FilesIntegrationExtension
-    {
-        public static DIHelper AddFilesIntegrationService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FilesIntegration>())
-            {
-                return services
-                    .AddDaoFactoryService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
index 7af6812730..5128c92d7a 100644
--- a/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
+++ b/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
@@ -118,11 +118,8 @@ namespace ASC.Web.Files.Core.Search
         public static DIHelper AddFactoryIndexerFileService(this DIHelper services)
         {
             if (services.TryAddScoped<FactoryIndexer<DbFile>, FactoryIndexerFile>())
-            {
-                services.TryAddTransient<DbFile>();
-
-                return services
-                    .AddFactoryIndexerService<DbFile>(false);
+            {
+                return services;
             }
 
             return services;
diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
index 30a6df872b..ca2086a605 100644
--- a/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
+++ b/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
@@ -105,14 +105,7 @@ namespace ASC.Web.Files.Core.Search
     {
         public static DIHelper AddFactoryIndexerFolderService(this DIHelper services)
         {
-            if (services.TryAddScoped<FactoryIndexer<DbFolder>, FactoryIndexerFolder>())
-            {
-                services.TryAddTransient<DbFolder>();
-
-                return services
-                    .AddFactoryIndexerService<DbFolder>(false)
-                    .AddDaoFactoryService();
-            }
+            services.TryAddScoped<FactoryIndexer<DbFolder>, FactoryIndexerFolder>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Core/Security/FileSecurity.cs b/products/ASC.Files/Core/Core/Security/FileSecurity.cs
index f79ac085b4..6d2c937cc1 100644
--- a/products/ASC.Files/Core/Core/Security/FileSecurity.cs
+++ b/products/ASC.Files/Core/Core/Security/FileSecurity.cs
@@ -31,14 +31,14 @@ using System.Linq;
 using ASC.Common;
 using ASC.Core;
 using ASC.Core.Users;
-using ASC.Files.Core.Data;
 using ASC.Web.Core;
 using ASC.Web.Files.Api;
 using ASC.Web.Files.Classes;
 using ASC.Web.Files.Configuration;
 
 namespace ASC.Files.Core.Security
-{
+{
+    [Scope]
     public class FileSecurityCommon
     {
         private UserManager UserManager { get; }
@@ -56,7 +56,8 @@ namespace ASC.Files.Core.Security
                    WebItemSecurity.IsProductAdministrator(ProductEntryPoint.ID, userId);
         }
     }
-
+
+    [Scope]
     public class FileSecurity : IFileSecurity
     {
         private readonly IDaoFactory daoFactory;
@@ -954,38 +955,4 @@ namespace ASC.Files.Core.Security
             CustomFilter
         }
     }
-
-    public static class FileSecurityExtention
-    {
-        public static DIHelper AddFileSecurityCommonService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileSecurityCommon>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddWebItemSecurity();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddFileSecurityService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileSecurity>())
-            {
-                services.TryAddScoped<IFileSecurity, FileSecurity>();
-
-                return services
-                    .AddDaoFactoryService()
-                    .AddUserManagerService()
-                    .AddTenantManagerService()
-                    .AddAuthContextService()
-                    .AddAuthManager()
-                    .AddGlobalFolderService()
-                    .AddFileSecurityCommonService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Security/IFileSecurity.cs b/products/ASC.Files/Core/Core/Security/IFileSecurity.cs
index 14e1bef461..0220df88f4 100644
--- a/products/ASC.Files/Core/Core/Security/IFileSecurity.cs
+++ b/products/ASC.Files/Core/Core/Security/IFileSecurity.cs
@@ -25,10 +25,13 @@
 
 
 using System;
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
+using ASC.Common;
+
 namespace ASC.Files.Core.Security
-{
+{
+    [Scope(typeof(FileSecurity))]
     public interface IFileSecurity
     {
         bool CanRead<T>(FileEntry<T> entry, Guid userId);
diff --git a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
index cb072a7120..bdbba675a0 100644
--- a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
@@ -25,8 +25,8 @@
 
 
 using System;
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
 namespace ASC.Files.Core.Security
 {
     public interface ISecurityDao<T>
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs
index 4345166af4..60b84a88ac 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs
@@ -31,7 +31,8 @@ using ASC.Files.Core;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.Box
-{
+{
+    [Scope]
     internal class BoxDaoSelector : RegexDaoSelectorBase<BoxProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "Box"; }
@@ -62,21 +63,4 @@ namespace ASC.Files.Thirdparty.Box
             return base.GetSecurityDao<BoxSecurityDao>(id);
         }
     }
-
-    public static class BoxDaoSelectorExtention
-    {
-        public static DIHelper AddBoxDaoSelectorService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BoxDaoSelector>())
-            {
-                return services
-                    .AddBoxSecurityDaoService()
-                    .AddBoxTagDaoService()
-                    .AddBoxFolderDaoService()
-                    .AddBoxFileDaoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
index 336767de21..bc7575e472 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
@@ -48,7 +48,8 @@ using Box.V2.Models;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Box
-{
+{
+    [Scope]
     internal class BoxFileDao : BoxDaoBase, IFileDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -606,14 +607,4 @@ namespace ASC.Files.Thirdparty.Box
 
         #endregion
     }
-
-    public static class BoxFileDaoExtention
-    {
-        public static DIHelper AddBoxFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<BoxFileDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
index aae4972de4..df9e3fff3e 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
@@ -46,7 +46,8 @@ using Box.V2.Models;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Box
-{
+{
+    [Scope]
     internal class BoxFolderDao : BoxDaoBase, IFolderDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -532,14 +533,4 @@ namespace ASC.Files.Thirdparty.Box
 
         #endregion
     }
-
-    public static class BoxFolderDaoExtention
-    {
-        public static DIHelper AddBoxFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<BoxFolderDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
index cdbaf74505..819d4183da 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
@@ -42,7 +42,8 @@ using Box.V2.Models;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Thirdparty.Box
-{
+{
+    [Scope]
     [DebuggerDisplay("{CustomerTitle}")]
     internal class BoxProviderInfo : IProviderInfo
     {
@@ -166,7 +167,8 @@ namespace ASC.Files.Thirdparty.Box
             BoxProviderInfoHelper.CacheReset(BoxRootId, ID, boxPath, isFile);
         }
     }
-
+
+    [Scope]
     internal class BoxStorageDisposableWrapper : IDisposable
     {
         public BoxStorage Storage { get; private set; }
@@ -211,7 +213,8 @@ namespace ASC.Files.Thirdparty.Box
             }
         }
     }
-
+
+    [Singletone]
     public class BoxProviderInfoHelper
     {
         private readonly TimeSpan CacheExpiration = TimeSpan.FromMinutes(1);
@@ -315,20 +318,4 @@ namespace ASC.Files.Thirdparty.Box
             }
         }
     }
-
-    public static class BoxProviderInfoExtension
-    {
-        public static DIHelper AddBoxProviderInfoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BoxProviderInfo>())
-            {
-                services.TryAddScoped<BoxStorageDisposableWrapper>();
-                services.TryAddSingleton<BoxProviderInfoHelper>();
-
-                return services;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxSecurityDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxSecurityDao.cs
index 08ca286ce4..847b4fb047 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxSecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxSecurityDao.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Box
-{
+{
+    [Scope]
     internal class BoxSecurityDao : BoxDaoBase, ISecurityDao<string>
     {
         public BoxSecurityDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -90,14 +91,4 @@ namespace ASC.Files.Thirdparty.Box
             throw new NotImplementedException();
         }
     }
-
-    public static class BoxSecurityDaoExtention
-    {
-        public static DIHelper AddBoxSecurityDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<BoxSecurityDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxTagDao.cs
index b8e5b8b7d4..61cd633880 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxTagDao.cs
@@ -42,7 +42,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Box
-{
+{
+    [Scope]
     internal class BoxTagDao : BoxDaoBase, ITagDao<string>
     {
         public BoxTagDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -172,14 +173,4 @@ namespace ASC.Files.Thirdparty.Box
 
         #endregion
     }
-
-    public static class BoxTagDaoExtention
-    {
-        public static DIHelper AddBoxTagDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<BoxTagDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs b/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
index d8cfe0238c..df92e16a5b 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
@@ -42,7 +42,8 @@ using ASC.Security.Cryptography;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty
-{
+{
+    [Singletone]
     internal class CachedProviderAccountDaoNotify
     {
         public ConcurrentDictionary<string, IProviderInfo> Cache { get; private set; }
@@ -121,19 +122,4 @@ namespace ASC.Files.Thirdparty
             return result;
         }
     }
-    public static class CachedProviderAccountDaoExtention
-    {
-        public static DIHelper AddCachedProviderAccountDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<IProviderDao, ProviderAccountDao>())
-            {
-                services.TryAddSingleton<CachedProviderAccountDaoNotify>();
-
-                return services
-                    .AddProviderAccountDaoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs b/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
index 72e561f712..a0346d6904 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Linq;
-using System.Threading;
-
+using System.Threading;
+
+using ASC.Common;
 using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Web.Files.Utils;
@@ -10,7 +11,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Thirdparty
-{
+{
+    [Scope]
     internal class CrossDao
     {
         private IServiceProvider ServiceProvider { get; }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs
index 237388538a..a01c37cb42 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs
@@ -31,7 +31,8 @@ using ASC.Files.Core;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.Dropbox
-{
+{
+    [Scope]
     internal class DropboxDaoSelector : RegexDaoSelectorBase<DropboxProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "Dropbox"; }
@@ -62,21 +63,4 @@ namespace ASC.Files.Thirdparty.Dropbox
             return base.GetSecurityDao<DropboxSecurityDao>(id);
         }
     }
-
-    public static class DropboxDaoSelectorExtention
-    {
-        public static DIHelper AddDropboxDaoSelectorService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DropboxDaoSelector>())
-            {
-                return services
-                    .AddDropboxSecurityDaoService()
-                    .AddDropboxTagDaoService()
-                    .AddDropboxFolderDaoService()
-                    .AddDropboxFileDaoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
index 612b34747f..1362f850eb 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
@@ -48,7 +48,8 @@ using Dropbox.Api.Files;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Dropbox
-{
+{
+    [Scope]
     internal class DropboxFileDao : DropboxDaoBase, IFileDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -651,14 +652,4 @@ namespace ASC.Files.Thirdparty.Dropbox
 
         #endregion
     }
-
-    public static class DropboxFileDaoExtention
-    {
-        public static DIHelper AddDropboxFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<DropboxFileDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
index 4659408c01..ebb31bfa3b 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
@@ -44,7 +44,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Dropbox
-{
+{
+    [Scope]
     internal class DropboxFolderDao : DropboxDaoBase, IFolderDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -529,14 +530,4 @@ namespace ASC.Files.Thirdparty.Dropbox
 
         #endregion
     }
-
-    public static class DropboxFolderDaoExtention
-    {
-        public static DIHelper AddDropboxFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<DropboxFolderDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs
index c9ee6d4611..bfac801b62 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs
@@ -37,7 +37,8 @@ using ASC.Files.Core;
 using Dropbox.Api.Files;
 
 namespace ASC.Files.Thirdparty.Dropbox
-{
+{
+    [Scope]
     [DebuggerDisplay("{CustomerTitle}")]
     internal class DropboxProviderInfo : IProviderInfo
     {
@@ -148,7 +149,8 @@ namespace ASC.Files.Thirdparty.Dropbox
             DropboxProviderInfoHelper.CacheReset(ID, dropboxPath, isFile);
         }
     }
-
+
+    [Scope]
     internal class DropboxStorageDisposableWrapper : IDisposable
     {
         public DropboxStorage Storage { get; private set; }
@@ -173,7 +175,8 @@ namespace ASC.Files.Thirdparty.Dropbox
             Storage = null;
         }
     }
-
+
+    [Singletone]
     public class DropboxProviderInfoHelper
     {
         private readonly TimeSpan CacheExpiration;
@@ -278,18 +281,4 @@ namespace ASC.Files.Thirdparty.Dropbox
             }
         }
     }
-
-    public static class DropboxProviderInfoExtension
-    {
-        public static DIHelper AddDropboxProviderInfoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DropboxProviderInfo>())
-            {
-                services.TryAddScoped<DropboxStorageDisposableWrapper>();
-                services.TryAddSingleton<DropboxProviderInfoHelper>();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxSecurityDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxSecurityDao.cs
index d765647f30..63c03a0599 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxSecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxSecurityDao.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Dropbox
-{
+{
+    [Scope]
     internal class DropboxSecurityDao : DropboxDaoBase, ISecurityDao<string>
     {
         public DropboxSecurityDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -90,14 +91,4 @@ namespace ASC.Files.Thirdparty.Dropbox
             throw new NotImplementedException();
         }
     }
-
-    public static class DropboxSecurityDaoExtention
-    {
-        public static DIHelper AddDropboxSecurityDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<DropboxSecurityDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxTagDao.cs
index 016b509e7a..b7745a920c 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxTagDao.cs
@@ -42,7 +42,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Dropbox
-{
+{
+    [Scope]
     internal class DropboxTagDao : DropboxDaoBase, ITagDao<string>
     {
         public DropboxTagDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -191,14 +192,4 @@ namespace ASC.Files.Thirdparty.Dropbox
             return obj.Id.GetHashCode() + obj.TenantId.GetHashCode();
         }
     }
-
-    public static class DropboxTagDaoExtention
-    {
-        public static DIHelper AddDropboxTagDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<DropboxTagDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs
index 34aed3998e..e5b1410dba 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs
@@ -31,7 +31,8 @@ using ASC.Files.Core;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
-{
+{
+    [Scope]
     internal class GoogleDriveDaoSelector : RegexDaoSelectorBase<GoogleDriveProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "GoogleDrive"; }
@@ -61,21 +62,4 @@ namespace ASC.Files.Thirdparty.GoogleDrive
             return base.GetSecurityDao<GoogleDriveSecurityDao>(id);
         }
     }
-
-    public static class GoogleDriveDaoSelectorExtention
-    {
-        public static DIHelper AddGoogleDriveSelectorService(this DIHelper services)
-        {
-            if (services.TryAddScoped<GoogleDriveDaoSelector>())
-            {
-                return services
-                    .AddGoogleDriveSecurityDaoService()
-                    .AddGoogleDriveTagDaoService()
-                    .AddGoogleDriveFolderDaoService()
-                    .AddGoogleDriveFileDaoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
index 89d95b8de4..d98a313e3e 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
@@ -48,7 +48,8 @@ using Microsoft.Extensions.Options;
 using DriveFile = Google.Apis.Drive.v3.Data.File;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
-{
+{
+    [Scope]
     internal class GoogleDriveFileDao : GoogleDriveDaoBase, IFileDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -652,14 +653,4 @@ namespace ASC.Files.Thirdparty.GoogleDrive
 
         #endregion
     }
-
-    public static class GoogleDriveFilrDaoExtention
-    {
-        public static DIHelper AddGoogleDriveFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<GoogleDriveFileDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
index e74cea32d8..1aebe4234c 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
@@ -44,7 +44,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
-{
+{
+    [Scope]
     internal class GoogleDriveFolderDao : GoogleDriveDaoBase, IFolderDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -521,14 +522,4 @@ namespace ASC.Files.Thirdparty.GoogleDrive
 
         #endregion
     }
-
-    public static class GoogleDriveFolderDaoExtention
-    {
-        public static DIHelper AddGoogleDriveFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<GoogleDriveFolderDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
index 480c1ab53b..7edf4904e6 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
@@ -45,7 +45,8 @@ using Microsoft.Extensions.Options;
 using DriveFile = Google.Apis.Drive.v3.Data.File;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
-{
+{
+    [Scope]
     [DebuggerDisplay("{CustomerTitle}")]
     internal class GoogleDriveProviderInfo : IProviderInfo
     {
@@ -179,7 +180,8 @@ namespace ASC.Files.Thirdparty.GoogleDrive
             GoogleDriveProviderInfoHelper.CacheResetChilds(ID, parentDriveId, childFolder);
         }
     }
-
+
+    [Scope]
     internal class GoogleDriveStorageDisposableWrapper : IDisposable
     {
         internal GoogleDriveStorage Storage { get; set; }
@@ -222,7 +224,8 @@ namespace ASC.Files.Thirdparty.GoogleDrive
             Storage?.Close();
         }
     }
-
+
+    [Singletone]
     public class GoogleDriveProviderInfoHelper
     {
         private readonly TimeSpan CacheExpiration;
@@ -363,19 +366,4 @@ namespace ASC.Files.Thirdparty.GoogleDrive
             CacheNotify.Publish(new GoogleDriveCacheItem { ResetChilds = true, Key = id + "-" + parentDriveId, ChildFolder = childFolder ?? false, ChildFolderExist = childFolder.HasValue }, CacheNotifyAction.Remove);
         }
     }
-
-    public static class GoogleDriveProviderInfoExtension
-    {
-        public static DIHelper AddGoogleDriveProviderInfoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<GoogleDriveProviderInfo>())
-            {
-                services.TryAddScoped<GoogleDriveStorageDisposableWrapper>();
-                services.TryAddScoped<GoogleDriveStorage>();
-                services.TryAddSingleton<GoogleDriveProviderInfoHelper>();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveSecurityDao.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveSecurityDao.cs
index d22cd013e5..4718bcab57 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveSecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveSecurityDao.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
-{
+{
+    [Scope]
     internal class GoogleDriveSecurityDao : GoogleDriveDaoBase, ISecurityDao<string>
     {
         public GoogleDriveSecurityDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -90,14 +91,4 @@ namespace ASC.Files.Thirdparty.GoogleDrive
             throw new NotImplementedException();
         }
     }
-
-    public static class GoogleDriveSecurityDaoExtention
-    {
-        public static DIHelper AddGoogleDriveSecurityDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<GoogleDriveSecurityDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
index a505338317..2dc53d663d 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
@@ -32,8 +32,9 @@ using System.Linq;
 using System.Net;
 using System.Security;
 using System.Text;
-using System.Web;
-
+using System.Web;
+
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core.Common.Configuration;
 using ASC.FederatedLogin;
@@ -57,7 +58,8 @@ using DriveFile = Google.Apis.Drive.v3.Data.File;
 using MimeMapping = ASC.Common.Web.MimeMapping;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
-{
+{
+    [Scope]
     internal class GoogleDriveStorage
     {
         public GoogleDriveStorage(
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveTagDao.cs
index ed40a5bd2a..05ada43796 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveTagDao.cs
@@ -42,7 +42,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
-{
+{
+    [Scope]
     internal class GoogleDriveTagDao : GoogleDriveDaoBase, ITagDao<string>
     {
         public GoogleDriveTagDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -172,14 +173,4 @@ namespace ASC.Files.Thirdparty.GoogleDrive
 
         #endregion
     }
-
-    public static class GoogleDriveTagDaoExtention
-    {
-        public static DIHelper AddGoogleDriveTagDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<GoogleDriveTagDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs
index 8c94709d3c..77705a4c9e 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs
@@ -31,7 +31,8 @@ using ASC.Files.Core;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.OneDrive
-{
+{
+    [Scope]
     internal class OneDriveDaoSelector : RegexDaoSelectorBase<OneDriveProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "OneDrive"; }
@@ -62,21 +63,4 @@ namespace ASC.Files.Thirdparty.OneDrive
             return base.GetSecurityDao<OneDriveSecurityDao>(id);
         }
     }
-
-    public static class OneDriveDaoSelectorExtention
-    {
-        public static DIHelper AddOneDriveSelectorService(this DIHelper services)
-        {
-            if (services.TryAddScoped<OneDriveDaoSelector>())
-            {
-                return services
-                    .AddOneDriveSecurityDaoService()
-                    .AddOneDriveTagDaoService()
-                    .AddOneDriveFolderDaoService()
-                    .AddOneDriveFileDaoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
index b06b8f92e9..a53bdfa764 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
@@ -47,7 +47,8 @@ using Microsoft.Extensions.Options;
 using Microsoft.OneDrive.Sdk;
 
 namespace ASC.Files.Thirdparty.OneDrive
-{
+{
+    [Scope]
     internal class OneDriveFileDao : OneDriveDaoBase, IFileDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -653,14 +654,4 @@ namespace ASC.Files.Thirdparty.OneDrive
 
         #endregion
     }
-
-    public static class OneDriveFileDaoExtention
-    {
-        public static DIHelper AddOneDriveFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<OneDriveFileDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
index b157ea3af9..98702eacad 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
@@ -44,7 +44,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.OneDrive
-{
+{
+    [Scope]
     internal class OneDriveFolderDao : OneDriveDaoBase, IFolderDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -532,14 +533,4 @@ namespace ASC.Files.Thirdparty.OneDrive
 
         #endregion
     }
-
-    public static class OneDriveFolderDaoExtention
-    {
-        public static DIHelper AddOneDriveFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<OneDriveFolderDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
index 8422d870fa..f7747e8579 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
@@ -41,7 +41,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OneDrive.Sdk;
 
 namespace ASC.Files.Thirdparty.OneDrive
-{
+{
+    [Scope]
     [DebuggerDisplay("{CustomerTitle}")]
     internal class OneDriveProviderInfo : IProviderInfo
     {
@@ -140,7 +141,8 @@ namespace ASC.Files.Thirdparty.OneDrive
             OneDriveProviderInfoHelper.CacheReset(ID, onedriveId);
         }
     }
-
+
+    [Scope]
     internal class OneDriveStorageDisposableWrapper : IDisposable
     {
         internal OneDriveStorage Storage { get; private set; }
@@ -187,7 +189,8 @@ namespace ASC.Files.Thirdparty.OneDrive
             }
         }
     }
-
+
+    [Singletone]
     public class OneDriveProviderInfoHelper
     {
         private readonly TimeSpan CacheExpiration;
@@ -256,19 +259,4 @@ namespace ASC.Files.Thirdparty.OneDrive
             }
         }
     }
-
-    public static class OneDriveProviderInfoExtension
-    {
-        public static DIHelper AddOneDriveProviderInfoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<OneDriveProviderInfo>())
-            {
-                services.TryAddScoped<OneDriveStorageDisposableWrapper>();
-                services.TryAddScoped<OneDriveStorage>();
-                services.TryAddSingleton<OneDriveProviderInfoHelper>();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveSecurityDao.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveSecurityDao.cs
index 1dfe628013..0156d25ece 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveSecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveSecurityDao.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.OneDrive
-{
+{
+    [Scope]
     internal class OneDriveSecurityDao : OneDriveDaoBase, ISecurityDao<string>
     {
         public OneDriveSecurityDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -90,14 +91,4 @@ namespace ASC.Files.Thirdparty.OneDrive
             throw new NotImplementedException();
         }
     }
-
-    public static class OneDriveSecurityDaoExtention
-    {
-        public static DIHelper AddOneDriveSecurityDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<OneDriveSecurityDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
index 784b7dd15f..1159f0ac44 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
@@ -31,8 +31,9 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
-using System.Threading.Tasks;
-
+using System.Threading.Tasks;
+
+using ASC.Common;
 using ASC.Core.Common.Configuration;
 using ASC.FederatedLogin;
 using ASC.FederatedLogin.Helpers;
@@ -44,7 +45,8 @@ using Microsoft.OneDrive.Sdk;
 using Newtonsoft.Json.Linq;
 
 namespace ASC.Files.Thirdparty.OneDrive
-{
+{
+    [Scope]
     internal class OneDriveStorage
     {
         public OneDriveStorage(ConsumerFactory consumerFactory)
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveTagDao.cs
index 811b9ca833..871d7d7e5f 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveTagDao.cs
@@ -42,7 +42,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.OneDrive
-{
+{
+    [Scope]
     internal class OneDriveTagDao : OneDriveDaoBase, ITagDao<string>
     {
         public OneDriveTagDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -172,14 +173,4 @@ namespace ASC.Files.Thirdparty.OneDrive
 
         #endregion
     }
-
-    public static class OneDriveTagDaoExtention
-    {
-        public static DIHelper AddOneDriveTagDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<OneDriveTagDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
index 1d937c3d9c..bd6a2283ec 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
@@ -26,9 +26,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-
-using ASC.Common;
+using System.Linq;
+
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
@@ -583,26 +582,4 @@ namespace ASC.Files.Thirdparty
             }
         }
     }
-
-    public static class ProviderAccountDaoExtention
-    {
-        public static DIHelper AddProviderAccountDaoService(this DIHelper services)
-        {
-            //services.TryAddScoped<IProviderDao, ProviderAccountDao>();
-
-            return services
-                .AddSharpBoxProviderInfoService()
-                .AddSharePointProviderInfoService()
-                .AddOneDriveProviderInfoService()
-                .AddGoogleDriveProviderInfoService()
-                .AddBoxProviderInfoService()
-                .AddDropboxProviderInfoService()
-                .AddTenantUtilService()
-                .AddTenantManagerService()
-                .AddInstanceCryptoService()
-                .AddSecurityContextService()
-                .AddConsumerFactoryService()
-                .AddDbContextManagerService<FilesDbContext>();
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
index b670af55d8..6881f9290d 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
@@ -27,9 +27,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-
-using ASC.Common;
+using System.Threading;
+
 using ASC.Core;
 using ASC.Files.Core;
 using ASC.Files.Core.Data;
@@ -166,23 +165,4 @@ namespace ASC.Files.Thirdparty.ProviderDao
             Selectors.ForEach(r => r.Dispose());
         }
     }
-
-    public static class ProviderDaoBaseExtention
-    {
-        public static DIHelper AddProviderDaoBaseService(this DIHelper services)
-        {
-            if (services.TryAddScoped<CrossDao>())
-            {
-                return services
-                    .AddSharpBoxDaoSelectorService()
-                    .AddSharePointSelectorService()
-                    .AddOneDriveSelectorService()
-                    .AddGoogleDriveSelectorService()
-                    .AddDropboxDaoSelectorService()
-                    .AddBoxDaoSelectorService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
index 7d2b284301..0393c7eea3 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
@@ -526,15 +526,8 @@ namespace ASC.Files.Thirdparty.ProviderDao
     public static class ProviderFileDaoExtention
     {
         public static DIHelper AddProviderFileDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ProviderFileDao>())
-            {
-                services.TryAddScoped<File<string>>();
-                services.TryAddScoped<IFileDao<string>, ProviderFileDao>();
-
-                return services
-                    .AddProviderDaoBaseService();
-            }
+        {
+            services.TryAddScoped<IFileDao<string>, ProviderFileDao>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
index e58c5b0749..9ff0768ead 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
@@ -37,7 +37,8 @@ using ASC.Files.Core.Security;
 using ASC.Files.Core.Thirdparty;
 
 namespace ASC.Files.Thirdparty.ProviderDao
-{
+{
+    [Scope]
     internal class ProviderFolderDao : ProviderDaoBase, IFolderDao<string>
     {
         public ProviderFolderDao(
@@ -449,15 +450,8 @@ filterType, subjectGroup, subjectID, searchText, searchSubfolders, checkShare);
     public static class ProviderFolderDaoExtention
     {
         public static DIHelper AddProviderFolderDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ProviderFolderDao>())
-            {
-                services.TryAddScoped<Folder<string>>();
-                services.TryAddScoped<IFolderDao<string>, ProviderFolderDao>();
-
-                return services
-                    .AddProviderDaoBaseService();
-            }
+        {
+            services.TryAddScoped<IFolderDao<string>, ProviderFolderDao>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
index ecfe908b50..d6d6ce8532 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
@@ -203,8 +203,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
         {
             if (services.TryAddScoped<ISecurityDao<string>, ProviderSecurityDao>())
             {
-                return services
-                    .AddProviderDaoBaseService();
+                return services;
             }
 
             return services;
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
index 02055beb02..0c5a22157d 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
@@ -137,8 +137,7 @@ namespace ASC.Files.Thirdparty.ProviderDao
         {
             if (services.TryAddScoped<ITagDao<string>, ProviderTagDao>())
             {
-                return services
-                    .AddProviderDaoBaseService();
+                return services;
             }
 
             return services;
diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs
index f737a0e7b1..5849890d04 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs
@@ -31,7 +31,8 @@ using ASC.Files.Core;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.SharePoint
-{
+{
+    [Scope]
     internal class SharePointDaoSelector : RegexDaoSelectorBase<SharePointProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "sharepoint"; }
@@ -75,21 +76,4 @@ namespace ASC.Files.Thirdparty.SharePoint
             return base.ConvertId(null);
         }
     }
-
-    public static class SharePointDaoSelectorExtention
-    {
-        public static DIHelper AddSharePointSelectorService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SharePointDaoSelector>())
-            {
-                return services
-                    .AddSharePointSecurityDaoService()
-                    .AddSharePointTagDaoService()
-                    .AddSharePointFolderDaoService()
-                    .AddSharePointFileDaoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
index 5705e0325f..3ab3d266e6 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
@@ -46,7 +46,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.SharePoint
-{
+{
+    [Scope]
     internal class SharePointFileDao : SharePointDaoBase, IFileDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -486,14 +487,4 @@ namespace ASC.Files.Thirdparty.SharePoint
 
         #endregion
     }
-
-    public static class SharePointFileDaoExtention
-    {
-        public static DIHelper AddSharePointFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharePointFileDao>();
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
index 758900ec37..7218247500 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
@@ -44,7 +44,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.SharePoint
-{
+{
+    [Scope]
     internal class SharePointFolderDao : SharePointDaoBase, IFolderDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -482,14 +483,4 @@ namespace ASC.Files.Thirdparty.SharePoint
 
         #endregion
     }
-
-    public static class SharePointFolderDaoExtention
-    {
-        public static DIHelper AddSharePointFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharePointFolderDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
index 014548a97d..dc7f3ca79e 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
@@ -47,7 +47,8 @@ using File = Microsoft.SharePoint.Client.File;
 using Folder = Microsoft.SharePoint.Client.Folder;
 
 namespace ASC.Files.Thirdparty.SharePoint
-{
+{
+    [Scope]
     public class SharePointProviderInfo : IProviderInfo
     {
         private ClientContext clientContext;
@@ -583,7 +584,8 @@ namespace ASC.Files.Thirdparty.SharePoint
             clientContext.Dispose();
         }
     }
-
+
+    [Singletone]
     public class SharePointProviderInfoHelper
     {
         private readonly TimeSpan CacheExpiration;
@@ -668,15 +670,4 @@ namespace ASC.Files.Thirdparty.SharePoint
             FileCache.Insert(key, file, DateTime.UtcNow.Add(CacheExpiration));
         }
     }
-
-    public static class SharePointProviderInfoExtension
-    {
-        public static DIHelper AddSharePointProviderInfoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharePointProviderInfo>();
-            services.TryAddSingleton<SharePointProviderInfoHelper>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointSecurityDao.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointSecurityDao.cs
index 6af1331734..6d9208a16f 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointSecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointSecurityDao.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.SharePoint
-{
+{
+    [Scope]
     internal class SharePointSecurityDao : SharePointDaoBase, ISecurityDao<string>
     {
         public SharePointSecurityDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -90,14 +91,4 @@ namespace ASC.Files.Thirdparty.SharePoint
             throw new NotImplementedException();
         }
     }
-
-    public static class SharePointSecurityDaoExtention
-    {
-        public static DIHelper AddSharePointSecurityDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharePointSecurityDao>();
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointTagDao.cs
index fd0374a02c..49143df184 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointTagDao.cs
@@ -42,7 +42,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.SharePoint
-{
+{
+    [Scope]
     internal class SharePointTagDao : SharePointDaoBase, ITagDao<string>
     {
         public SharePointTagDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -167,14 +168,4 @@ namespace ASC.Files.Thirdparty.SharePoint
             return new List<Tag>();
         }
     }
-
-    public static class SharePointTagDaoExtention
-    {
-        public static DIHelper AddSharePointTagDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharePointTagDao>();
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs
index a4e050a756..10eaf08c8b 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs
@@ -31,7 +31,8 @@ using ASC.Files.Core;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.Sharpbox
-{
+{
+    [Scope]
     internal class SharpBoxDaoSelector : RegexDaoSelectorBase<SharpBoxProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "SharpBox"; }
@@ -62,21 +63,4 @@ namespace ASC.Files.Thirdparty.Sharpbox
             return base.GetSecurityDao<SharpBoxSecurityDao>(id);
         }
     }
-
-    public static class SharpBoxDaoSelectorExtention
-    {
-        public static DIHelper AddSharpBoxDaoSelectorService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SharpBoxDaoSelector>())
-            {
-                return services
-                    .AddSharpBoxSecurityDaoService()
-                    .AddSharpBoxTagDaoService()
-                    .AddSharpBoxFolderDaoService()
-                    .AddSharpBoxFileDaoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
index 2cba56b461..9f09d185d8 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
@@ -51,7 +51,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Sharpbox
-{
+{
+    [Scope]
     internal class SharpBoxFileDao : SharpBoxDaoBase, IFileDao<string>
     {
         private CrossDao CrossDao { get; }
@@ -708,14 +709,4 @@ namespace ASC.Files.Thirdparty.Sharpbox
 
         #endregion
     }
-
-    public static class SharpBoxFileDaoExtention
-    {
-        public static DIHelper AddSharpBoxFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharpBoxFileDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
index 88e4e2c4c8..52daa1a215 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
@@ -32,9 +32,8 @@ using System.Security;
 using System.Threading;
 
 using AppLimit.CloudComputing.SharpBox;
-using AppLimit.CloudComputing.SharpBox.Exceptions;
-
-using ASC.Common;
+using AppLimit.CloudComputing.SharpBox.Exceptions;
+
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Common.EF;
@@ -552,14 +551,4 @@ namespace ASC.Files.Thirdparty.Sharpbox
 
         #endregion
     }
-
-    public static class SharpBoxFolderDaoExtention
-    {
-        public static DIHelper AddSharpBoxFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharpBoxFileDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
index 3b02d943f2..bf098c6986 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
@@ -37,7 +37,8 @@ using ASC.Files.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Sharpbox
-{
+{
+    [Scope]
     internal class SharpBoxProviderInfo : IProviderInfo
     {
         public int ID { get; set; }
@@ -128,7 +129,8 @@ namespace ASC.Files.Thirdparty.Sharpbox
         public FolderType RootFolderType { get; set; }
         private SharpBoxStorageDisposableWrapper Wrapper { get; set; }
     }
-
+
+    [Scope]
     class SharpBoxStorageDisposableWrapper : IDisposable
     {
         public CloudStorage Storage { get; private set; }
@@ -177,15 +179,4 @@ namespace ASC.Files.Thirdparty.Sharpbox
             }
         }
     }
-
-    public static class SharpBoxProviderInfoExtension
-    {
-        public static DIHelper AddSharpBoxProviderInfoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharpBoxProviderInfo>();
-            services.TryAddScoped<SharpBoxStorageDisposableWrapper>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxSecurityDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxSecurityDao.cs
index e8b7ebbdc8..f2f47e28e4 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxSecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxSecurityDao.cs
@@ -41,7 +41,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Sharpbox
-{
+{
+    [Scope]
     internal class SharpBoxSecurityDao : SharpBoxDaoBase, ISecurityDao<string>
     {
         public SharpBoxSecurityDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -90,14 +91,4 @@ namespace ASC.Files.Thirdparty.Sharpbox
             throw new NotImplementedException();
         }
     }
-
-    public static class SharpBoxSecurityDaoExtention
-    {
-        public static DIHelper AddSharpBoxSecurityDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharpBoxSecurityDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxTagDao.cs
index 8cee4a74da..94cc135198 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxTagDao.cs
@@ -42,7 +42,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Files.Thirdparty.Sharpbox
-{
+{
+    [Scope]
     internal class SharpBoxTagDao : SharpBoxDaoBase, ITagDao<string>
     {
         public SharpBoxTagDao(IServiceProvider serviceProvider, UserManager userManager, TenantManager tenantManager, TenantUtil tenantUtil, DbContextManager<FilesDbContext> dbContextManager, SetupInfo setupInfo, IOptionsMonitor<ILog> monitor, FileUtility fileUtility) : base(serviceProvider, userManager, tenantManager, tenantUtil, dbContextManager, setupInfo, monitor, fileUtility)
@@ -175,14 +176,4 @@ namespace ASC.Files.Thirdparty.Sharpbox
 
         #endregion
     }
-
-    public static class SharpBoxTagDaoExtention
-    {
-        public static DIHelper AddSharpBoxTagDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<SharpBoxTagDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Helpers/DocuSignHelper.cs b/products/ASC.Files/Core/Helpers/DocuSignHelper.cs
index fc38602501..e62a185ef8 100644
--- a/products/ASC.Files/Core/Helpers/DocuSignHelper.cs
+++ b/products/ASC.Files/Core/Helpers/DocuSignHelper.cs
@@ -41,7 +41,6 @@ using ASC.FederatedLogin;
 using ASC.FederatedLogin.Helpers;
 using ASC.FederatedLogin.LoginProviders;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.MessagingSystem;
@@ -65,7 +64,8 @@ using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
 namespace ASC.Web.Files.Helpers
-{
+{
+    [Scope]
     public class DocuSignToken
     {
         public ILog Log { get; set; }
@@ -133,7 +133,8 @@ namespace ASC.Web.Files.Helpers
             return token.AccessToken;
         }
     }
-
+
+    [Scope]
     public class DocuSignHelper
     {
         public ILog Log { get; set; }
@@ -465,40 +466,4 @@ namespace ASC.Web.Files.Helpers
         Declined,
         Voided,
     }
-
-    public static class DocuSignHelperExtension
-    {
-        public static DIHelper AddDocuSignTokenService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DocuSignToken>())
-            {
-                return services
-                    .AddAuthContextService()
-                    .AddDocuSignLoginProviderService()
-                    .AddTokenHelperService();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddDocuSignHelperService(this DIHelper services)
-        {
-            services.TryAddScoped<DocuSignHelper>();
-
-            return services
-                .AddDocuSignLoginProviderService()
-                .AddFileSecurityService()
-                .AddDaoFactoryService()
-                .AddBaseCommonLinkUtilityService()
-                .AddUserManagerService()
-                .AddAuthContextService()
-                .AddDisplayUserSettingsService()
-                .AddFileMarkerService()
-                .AddGlobalFolderHelperService()
-                .AddFilesMessageService()
-                .AddDocuSignTokenService()
-                .AddFilesLinkUtilityService()
-                ;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Helpers/EasyBibHelper.cs b/products/ASC.Files/Core/Helpers/EasyBibHelper.cs
index 56c43d522c..8a2bbd69eb 100644
--- a/products/ASC.Files/Core/Helpers/EasyBibHelper.cs
+++ b/products/ASC.Files/Core/Helpers/EasyBibHelper.cs
@@ -40,7 +40,8 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
 
 namespace ASC.Web.Files.Helpers
-{
+{
+    [Scope]
     public class EasyBibHelper : Consumer
     {
         public ILog Log { get; set; }
@@ -157,22 +158,4 @@ namespace ASC.Web.Files.Helpers
 
         }
     }
-
-    public static class EasyBibHelperExtension
-    {
-        public static DIHelper AddEasyBibHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<EasyBibHelper>())
-            {
-                return services
-                    .AddConsumerFactoryService()
-                    .AddKafkaService()
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddCoreSettingsService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Helpers/FilesMessageService.cs b/products/ASC.Files/Core/Helpers/FilesMessageService.cs
index 3ffde801d8..1b787e8fcf 100644
--- a/products/ASC.Files/Core/Helpers/FilesMessageService.cs
+++ b/products/ASC.Files/Core/Helpers/FilesMessageService.cs
@@ -36,7 +36,8 @@ using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
 namespace ASC.Web.Files.Helpers
-{
+{
+    [Scope]
     public class FilesMessageService
     {
         private readonly ILog log;
@@ -120,19 +121,4 @@ namespace ASC.Web.Files.Helpers
             MessageService.Send(initiator, action, MessageTarget.Create(entry.ID), description);
         }
     }
-
-    public static class FilesMessageServiceExtension
-    {
-        public static DIHelper AddFilesMessageService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FilesMessageService>())
-            {
-                return services
-                    .AddMessageTargetService()
-                    .AddMessageServiceService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Helpers/Global.cs b/products/ASC.Files/Core/Helpers/Global.cs
index 40e616848e..47f3d64350 100644
--- a/products/ASC.Files/Core/Helpers/Global.cs
+++ b/products/ASC.Files/Core/Helpers/Global.cs
@@ -38,7 +38,6 @@ using ASC.Core.Common.Settings;
 using ASC.Core.Users;
 using ASC.Data.Storage;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Web.Core;
@@ -53,7 +52,8 @@ using Microsoft.Extensions.Options;
 using Constants = ASC.Core.Configuration.Constants;
 
 namespace ASC.Web.Files.Classes
-{
+{
+    [Singletone]
     public class GlobalNotify
     {
         private ICacheNotify<AscCacheItem> Notify { get; set; }
@@ -99,7 +99,8 @@ namespace ASC.Web.Files.Classes
             }
         }
     }
-
+
+    [Scope]
     public class Global
     {
         private IConfiguration Configuration { get; }
@@ -199,7 +200,8 @@ namespace ASC.Web.Files.Classes
             return userInfo.DisplayUserName(false, DisplayUserSettingsHelper);
         }
     }
-
+
+    [Scope]
     public class GlobalStore
     {
         private StorageFactory StorageFactory { get; }
@@ -221,7 +223,8 @@ namespace ASC.Web.Files.Classes
             return StorageFactory.GetStorage(string.Empty, FileConstant.StorageTemplate);
         }
     }
-
+
+    [Scope]
     public class GlobalSpace
     {
         private FilesUserSpaceUsage FilesUserSpaceUsage { get; }
@@ -243,7 +246,8 @@ namespace ASC.Web.Files.Classes
             return FilesUserSpaceUsage.GetUserSpaceUsage(userId);
         }
     }
-
+
+    [Scope]
     public class GlobalFolder
     {
         private CoreBaseSettings CoreBaseSettings { get; }
@@ -599,7 +603,8 @@ namespace ASC.Web.Files.Classes
             get { return UserManager.GetUsers(AuthContext.CurrentAccount.ID).IsOutsider(UserManager); }
         }
     }
-
+
+    [Scope]
     public class GlobalFolderHelper
     {
         private FileMarker FileMarker { get; }
@@ -670,88 +675,4 @@ namespace ASC.Web.Files.Classes
             }
         }
     }
-
-    public static class GlobalExtention
-    {
-        public static DIHelper AddGlobalNotifyService(this DIHelper services)
-        {
-            services.TryAddSingleton<GlobalNotify>();
-
-            return services
-                .AddKafkaService()
-                .AddCoreBaseSettingsService();
-        }
-
-        public static DIHelper AddGlobalService(this DIHelper services)
-        {
-            if (services.TryAddScoped<Global>())
-            {
-                return services
-                    .AddAuthContextService()
-                    .AddUserManagerService()
-                    .AddCoreSettingsService()
-                    .AddTenantManagerService()
-                    .AddDisplayUserSettingsService()
-                    .AddCustomNamingPeopleService()
-                    .AddFileSecurityCommonService();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddGlobalStoreService(this DIHelper services)
-        {
-            if (services.TryAddScoped<GlobalStore>())
-            {
-                return services
-                    .AddStorageFactoryService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddGlobalSpaceService(this DIHelper services)
-        {
-            if (services.TryAddScoped<GlobalSpace>())
-            {
-                return services
-                    .AddFilesUserSpaceUsageService()
-                    .AddAuthContextService();
-            }
-
-            return services;
-        }
-        public static DIHelper AddGlobalFolderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<GlobalFolder>())
-            {
-                return services
-                    .AddCoreBaseSettingsService()
-                    .AddWebItemManager()
-                    .AddWebItemSecurity()
-                    .AddAuthContextService()
-                    .AddTenantManagerService()
-                    .AddUserManagerService()
-                    .AddSettingsManagerService()
-                    .AddGlobalStoreService();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddGlobalFolderHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<GlobalFolderHelper>())
-            {
-                return services
-                    .AddGlobalFolderService()
-                    .AddDaoFactoryService()
-                    .AddFileMarkerService()
-                    ;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Helpers/PathProvider.cs b/products/ASC.Files/Core/Helpers/PathProvider.cs
index a1e2d7a2a7..de2633acb6 100644
--- a/products/ASC.Files/Core/Helpers/PathProvider.cs
+++ b/products/ASC.Files/Core/Helpers/PathProvider.cs
@@ -34,7 +34,6 @@ using ASC.Common;
 using ASC.Common.Web;
 using ASC.Core.Common;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Security.Cryptography;
 using ASC.Web.Core.Files;
@@ -42,7 +41,8 @@ using ASC.Web.Core.Utility.Skins;
 using ASC.Web.Studio.Utility;
 
 namespace ASC.Web.Files.Classes
-{
+{
+    [Scope]
     public class PathProvider
     {
         public static readonly string ProjectVirtualPath = "~/Products/Projects/TMDocs.aspx";
@@ -212,24 +212,4 @@ namespace ASC.Web.Files.Classes
             return $"{uriBuilder.Uri}?{query}";
         }
     }
-
-    public static class PathProviderExtention
-    {
-        public static DIHelper AddPathProviderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<PathProvider>())
-            {
-                return services
-                    .AddWebImageSupplierService()
-                    .AddCommonLinkUtilityService()
-                    .AddEmailValidationKeyProviderService()
-                    .AddGlobalStoreService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddFilesLinkUtilityService()
-                    .AddDaoFactoryService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs b/products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
index d0c4a88ec1..5d312cd174 100644
--- a/products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
+++ b/products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
@@ -32,12 +32,12 @@ using ASC.Common;
 using ASC.Core.Common.Configuration;
 using ASC.FederatedLogin.LoginProviders;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Files.Helpers
-{
+{
+    [Scope]
     public class ThirdpartyConfiguration
     {
         private IConfiguration Configuration { get; }
@@ -158,23 +158,4 @@ namespace ASC.Web.Files.Helpers
             }
         }
     }
-    public static class ThirdpartyConfigurationExtension
-    {
-        public static DIHelper AddThirdpartyConfigurationService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ThirdpartyConfiguration>())
-            {
-                return services
-                    .AddDaoFactoryService()
-                    .AddDocuSignLoginProviderService()
-                    .AddBoxLoginProviderService()
-                    .AddDropboxLoginProviderService()
-                    .AddOneDriveLoginProviderService()
-                    .AddGoogleLoginProviderService()
-                    ;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Helpers/WordpressHelper.cs b/products/ASC.Files/Core/Helpers/WordpressHelper.cs
index 8039498119..24ead767da 100644
--- a/products/ASC.Files/Core/Helpers/WordpressHelper.cs
+++ b/products/ASC.Files/Core/Helpers/WordpressHelper.cs
@@ -35,7 +35,8 @@ using ASC.Web.Files.ThirdPartyApp;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Helpers
-{
+{
+    [Scope]
     public class WordpressToken
     {
         public ILog Log { get; set; }
@@ -66,7 +67,9 @@ namespace ASC.Web.Files.Helpers
             TokenHelper.DeleteToken(AppAttr);
 
         }
-    }
+    }
+
+    [Singletone]
     public class WordpressHelper
     {
         public ILog Log { get; set; }
@@ -110,24 +113,4 @@ namespace ASC.Web.Files.Helpers
             }
         }
     }
-
-    public static class WordpressHelperExtention
-    {
-        public static DIHelper AddWordpressHelperService(this DIHelper services)
-        {
-            services.TryAddSingleton<WordpressHelper>();
-            return services;
-        }
-
-        public static DIHelper AddWordpressTokenService(this DIHelper services)
-        {
-            if (services.TryAddScoped<WordpressToken>())
-            {
-                return services
-                    .AddTokenHelperService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs b/products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
index 397d46dc06..ea4001d548 100644
--- a/products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
+++ b/products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
@@ -73,7 +73,8 @@ namespace ASC.Web.Files.HttpHandlers
             await Next.Invoke(context);
         }
     }
-
+
+    [Scope]
     public class ChunkedUploaderHandlerService
     {
         private TenantManager TenantManager { get; }
@@ -399,25 +400,6 @@ namespace ASC.Web.Files.HttpHandlers
 
     public static class ChunkedUploaderHandlerExtention
     {
-        public static DIHelper AddChunkedUploaderHandlerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ChunkedUploaderHandlerService>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddFileUploaderService()
-                    .AddFilesMessageService()
-                    .AddAuthManager()
-                    .AddSecurityContextService()
-                    .AddSetupInfo()
-                    .AddInstanceCryptoService()
-                    .AddChunkedUploadSessionHolderService()
-                    .AddChunkedUploadSessionHelperService();
-            }
-
-            return services;
-        }
-
         public static IApplicationBuilder UseChunkedUploaderHandler(this IApplicationBuilder builder)
         {
             return builder.UseMiddleware<ChunkedUploaderHandler>();
diff --git a/products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs b/products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
index 8415621c6a..5210c7bd0b 100644
--- a/products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
+++ b/products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
@@ -39,7 +39,6 @@ using ASC.Common.Logging;
 using ASC.Common.Web;
 using ASC.Core;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.MessagingSystem;
@@ -89,7 +88,8 @@ namespace ASC.Web.Files
             await Next.Invoke(context);
         }
     }
-
+
+    [Scope]
     public class FileHandlerService
     {
         public string FileHandlerPath
@@ -1260,38 +1260,6 @@ namespace ASC.Web.Files
 
     public static class FileHandlerExtensions
     {
-        public static DIHelper AddFileHandlerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileHandlerService>())
-            {
-                return services
-                    .AddFilesLinkUtilityService()
-                    .AddTenantExtraService()
-                    .AddCookiesManagerService()
-                    .AddAuthContextService()
-                    .AddSecurityContextService()
-                    .AddGlobalStoreService()
-                    .AddDaoFactoryService()
-                    .AddFileSecurityService()
-                    .AddFileMarkerService()
-                    .AddSetupInfo()
-                    .AddFileUtilityService()
-                    .AddGlobalService()
-                    .AddEmailValidationKeyProviderService()
-                    .AddCoreBaseSettingsService()
-                    .AddGlobalFolderHelperService()
-                    .AddPathProviderService()
-                    .AddUserManagerService()
-                    .AddDocumentServiceTrackerHelperService()
-                    .AddFilesMessageService()
-                    .AddFileConverterService()
-                    .AddFileShareLinkService()
-                    .AddFFmpegServiceService();
-            }
-
-            return services;
-        }
-
         public static IApplicationBuilder UseFileHandler(this IApplicationBuilder builder)
         {
             return builder.UseMiddleware<FileHandler>();
diff --git a/products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs b/products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
index 96d1c6f250..129d7e1c0e 100644
--- a/products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
+++ b/products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
@@ -64,7 +64,8 @@ namespace ASC.Web.Files.HttpHandlers
             await Next.Invoke(context);
         }
     }
-
+
+    [Scope]
     public class ThirdPartyAppHandlerService
     {
         private AuthContext AuthContext { get; }
@@ -132,19 +133,6 @@ namespace ASC.Web.Files.HttpHandlers
 
     public static class ThirdPartyAppHandlerExtention
     {
-        public static DIHelper AddThirdPartyAppHandlerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ThirdPartyAppHandlerService>())
-            {
-                return services
-                    .AddCommonLinkUtilityService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddAuthContextService();
-            }
-
-            return services;
-        }
-
         public static IApplicationBuilder UseThirdPartyAppHandler(this IApplicationBuilder builder)
         {
             return builder.UseMiddleware<ThirdPartyAppHandler>();
diff --git a/products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs b/products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
index e77e54807b..76f4049f23 100644
--- a/products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
+++ b/products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
@@ -30,18 +30,18 @@ using System.Net;
 using System.Threading.Tasks;
 using System.Web;
 using System.Xml;
-
+
 using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Common.Web;
 using ASC.Core;
 using ASC.Files.Core.Resources;
+using ASC.Files.Core.Services.NotifyService;
 using ASC.Web.Core.Files;
 using ASC.Web.Files.Classes;
 using ASC.Web.Files.Helpers;
-using ASC.Files.Core.Services.NotifyService;
 using ASC.Web.Studio.Utility;
-
+
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -68,7 +68,8 @@ namespace ASC.Web.Files.HttpHandlers
             await Next.Invoke(context);
         }
     }
-
+
+    [Scope]
     public class DocuSignHandlerService
     {
         public static string Path(FilesLinkUtility filesLinkUtility)
@@ -254,21 +255,6 @@ namespace ASC.Web.Files.HttpHandlers
 
     public static class DocuSignHandlerExtension
     {
-        public static DIHelper AddDocuSignHandlerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DocuSignHandlerService>())
-            {
-                return services
-                    .AddFilesLinkUtilityService()
-                    .AddTenantExtraService()
-                    .AddDocuSignHelperService()
-                    .AddSecurityContextService()
-                    .AddNotifyClientService();
-            }
-
-            return services;
-        }
-
         public static IApplicationBuilder UseDocuSignHandler(this IApplicationBuilder builder)
         {
             return builder.UseMiddleware<DocuSignHandler>();
diff --git a/products/ASC.Files/Core/Model/FileEntryWrapper.cs b/products/ASC.Files/Core/Model/FileEntryWrapper.cs
index 5a9828beb2..611a42b0eb 100644
--- a/products/ASC.Files/Core/Model/FileEntryWrapper.cs
+++ b/products/ASC.Files/Core/Model/FileEntryWrapper.cs
@@ -146,7 +146,8 @@ namespace ASC.Api.Documents
 
         }
     }
-
+
+    [Scope]
     public class FileEntryWrapperHelper
     {
         private ApiDateTimeHelper ApiDateTimeHelper { get; }
@@ -180,19 +181,4 @@ namespace ASC.Api.Documents
             };
         }
     }
-
-    public static class FileEntryWrapperHelperExtention
-    {
-        public static DIHelper AddFileEntryWrapperHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileEntryWrapperHelper>())
-            {
-                return services
-                    .AddApiDateTimeHelper()
-                    .AddEmployeeWraper();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Model/FileOperationWraper.cs b/products/ASC.Files/Core/Model/FileOperationWraper.cs
index 10d18f491c..a61fc76423 100644
--- a/products/ASC.Files/Core/Model/FileOperationWraper.cs
+++ b/products/ASC.Files/Core/Model/FileOperationWraper.cs
@@ -31,7 +31,6 @@ using System.Text.Json.Serialization;
 
 using ASC.Common;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Web.Files.Services.WCFService.FileOperations;
 using ASC.Web.Studio.Utility;
 
@@ -103,7 +102,8 @@ namespace ASC.Api.Documents
             };
         }
     }
-
+
+    [Scope]
     public class FileOperationWraperHelper
     {
         private FolderWrapperHelper FolderWrapperHelper { get; }
@@ -212,20 +212,4 @@ namespace ASC.Api.Documents
             }
         }
     }
-    public static class FileOperationWraperHelperExtention
-    {
-        public static DIHelper AddFileOperationWraperHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileOperationWraperHelper>())
-            {
-                return services
-                    .AddFolderWrapperHelperService()
-                    .AddFileWrapperHelperService()
-                    .AddDaoFactoryService()
-                    .AddCommonLinkUtilityService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Model/FileShareParams.cs b/products/ASC.Files/Core/Model/FileShareParams.cs
index e986dba672..d5c681f122 100644
--- a/products/ASC.Files/Core/Model/FileShareParams.cs
+++ b/products/ASC.Files/Core/Model/FileShareParams.cs
@@ -50,7 +50,8 @@ namespace ASC.Api.Documents
         /// <returns></returns>
 
     }
-
+
+    [Scope]
     public class FileShareParamsHelper
     {
         private UserManager UserManager { get; }
@@ -68,18 +69,4 @@ namespace ASC.Api.Documents
             };
         }
     }
-
-    public static class FileShareParamsExtention
-    {
-        public static DIHelper AddFileShareParamsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileShareParamsHelper>())
-            {
-                return services
-                    .AddUserManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Model/FileShareWrapper.cs b/products/ASC.Files/Core/Model/FileShareWrapper.cs
index a01c7dc546..4063c8c0da 100644
--- a/products/ASC.Files/Core/Model/FileShareWrapper.cs
+++ b/products/ASC.Files/Core/Model/FileShareWrapper.cs
@@ -90,7 +90,9 @@ namespace ASC.Api.Documents
         /// <summary> 
         /// </summary>
         public string ShareLink { get; set; }
-    }
+    }
+
+    [Scope]
     public class FileShareWrapperHelper
     {
         private UserManager UserManager { get; }
@@ -137,17 +139,4 @@ namespace ASC.Api.Documents
             return result;
         }
     }
-    public static class FileShareWrapperExtention
-    {
-        public static DIHelper AddFileShareWrapperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileShareWrapperHelper>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddEmployeeWraperFull();
-            }
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Model/FileWrapper.cs b/products/ASC.Files/Core/Model/FileWrapper.cs
index 5611b6a447..c159fe4768 100644
--- a/products/ASC.Files/Core/Model/FileWrapper.cs
+++ b/products/ASC.Files/Core/Model/FileWrapper.cs
@@ -32,7 +32,6 @@ using ASC.Api.Utils;
 using ASC.Common;
 using ASC.Core;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Security;
 using ASC.Web.Api.Models;
 using ASC.Web.Core.Files;
@@ -138,7 +137,9 @@ namespace ASC.Api.Documents
                 ViewUrl = "http://www.onlyoffice.com/viewfile?fileid=2221"
             };
         }
-    }
+    }
+
+    [Scope]
     public class FileWrapperHelper : FileEntryWrapperHelper
     {
         private AuthContext AuthContext { get; }
@@ -213,25 +214,4 @@ namespace ASC.Api.Documents
             return result;
         }
     }
-
-    public static class FileWrapperHelperExtention
-    {
-        public static DIHelper AddFileWrapperHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileWrapperHelper>())
-            {
-
-                return services
-                    .AddFileEntryWrapperHelperService()
-                    .AddAuthContextService()
-                    .AddDaoFactoryService()
-                    .AddFileSecurityService()
-                    .AddGlobalFolderHelperService()
-                    .AddFilesLinkUtilityService()
-                    .AddFileUtilityService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Model/FolderContentWrapper.cs b/products/ASC.Files/Core/Model/FolderContentWrapper.cs
index 9f8b4b322c..d4daaedf10 100644
--- a/products/ASC.Files/Core/Model/FolderContentWrapper.cs
+++ b/products/ASC.Files/Core/Model/FolderContentWrapper.cs
@@ -101,7 +101,8 @@ namespace ASC.Api.Documents
             };
         }
     }
-
+
+    [Scope]
     public class FolderContentWrapperHelper
     {
         private FileWrapperHelper FileWrapperHelper { get; }
@@ -149,21 +150,6 @@ namespace ASC.Api.Documents
             return result;
         }
     }
-    public static class FolderContentWrapperHelperExtention
-    {
-        public static DIHelper AddFolderContentWrapperHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FolderContentWrapperHelper>())
-            {
-                return services
-                    .AddFileWrapperHelperService()
-                    .AddFolderWrapperHelperService();
-            }
-
-            return services;
-        }
-    }
-
 
     public class FileEntryWrapperConverter : JsonConverter<FileEntryWrapper>
     {
diff --git a/products/ASC.Files/Core/Model/FolderWrapper.cs b/products/ASC.Files/Core/Model/FolderWrapper.cs
index ef4b5c8b39..c0080d17a8 100644
--- a/products/ASC.Files/Core/Model/FolderWrapper.cs
+++ b/products/ASC.Files/Core/Model/FolderWrapper.cs
@@ -31,7 +31,6 @@ using ASC.Api.Utils;
 using ASC.Common;
 using ASC.Core;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Security;
 using ASC.Web.Api.Models;
 using ASC.Web.Files.Classes;
@@ -90,7 +89,8 @@ namespace ASC.Api.Documents
             };
         }
     }
-
+
+    [Scope]
     public class FolderWrapperHelper : FileEntryWrapperHelper
     {
         private AuthContext AuthContext { get; }
@@ -136,22 +136,4 @@ namespace ASC.Api.Documents
             return result;
         }
     }
-
-    public static class FolderWrapperHelperExtention
-    {
-        public static DIHelper AddFolderWrapperHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FolderWrapperHelper>())
-            {
-                return services
-                    .AddFileEntryWrapperHelperService()
-                    .AddAuthContextService()
-                    .AddDaoFactoryService()
-                    .AddFileSecurityService()
-                    .AddGlobalFolderHelperService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/DocumentService/Configuration.cs b/products/ASC.Files/Core/Services/DocumentService/Configuration.cs
index bfa8c387ba..660ff0b97a 100644
--- a/products/ASC.Files/Core/Services/DocumentService/Configuration.cs
+++ b/products/ASC.Files/Core/Services/DocumentService/Configuration.cs
@@ -41,7 +41,6 @@ using ASC.Core.Common.Settings;
 using ASC.Core.Users;
 using ASC.FederatedLogin.LoginProviders;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Web.Core.Files;
@@ -140,7 +139,8 @@ namespace ASC.Web.Files.Services.DocumentService
         }
     }
     #region Nested Classes
-
+
+    [Transient]
     public class DocumentConfig<T>
     {
         public string SharedLinkKey;
@@ -196,7 +196,8 @@ namespace ASC.Web.Files.Services.DocumentService
         private DocumentServiceConnector DocumentServiceConnector { get; }
         private PathProvider PathProvider { get; }
     }
-
+
+    [Transient]
     public class InfoConfig<T>
     {
         public File<T> File;
@@ -300,7 +301,8 @@ namespace ASC.Web.Files.Services.DocumentService
 
         public bool Review { get; set; } = true;
     }
-
+
+    [Transient]
     public class EditorConfiguration<T>
     {
         public EditorConfiguration(
@@ -543,7 +545,8 @@ namespace ASC.Web.Files.Services.DocumentService
             return JsonSerializer.Serialize(actionLinkConfig);
         }
     }
-
+
+    [Transient]
     public class EmbeddedConfig
     {
         public string ShareLinkParam { get; set; }
@@ -588,6 +591,7 @@ namespace ASC.Web.Files.Services.DocumentService
     }
 
 
+    [Transient]
     public class PluginsConfig
     {
         public string[] PluginsData
@@ -625,6 +629,7 @@ namespace ASC.Web.Files.Services.DocumentService
         }
     }
 
+    [Transient]
     public class CustomizationConfig<T>
     {
         public CustomizationConfig(
@@ -783,6 +788,7 @@ namespace ASC.Web.Files.Services.DocumentService
         private PathProvider PathProvider { get; }
     }
 
+    [Transient]
     public class CustomerConfig<T>
     {
         public CustomerConfig(
@@ -835,6 +841,7 @@ namespace ASC.Web.Files.Services.DocumentService
         public string Url { get; set; }
     }
 
+    [Transient]
     public class LogoConfig<T>
     {
         public LogoConfig(
@@ -914,111 +921,5 @@ namespace ASC.Web.Files.Services.DocumentService
         public string Id { get; set; }
 
         public string Name { get; set; }
-    }
-
-    public static class ConfigurationExtention
-    {
-        public static DIHelper AddConfigurationService(this DIHelper services)
-        {
-            return services
-                .AddDocumentConfigService()
-                .AddEditorConfigurationService();
-        }
-
-        public static DIHelper AddDocumentConfigService(this DIHelper services)
-        {
-            services.TryAddTransient<DocumentConfig<string>>();
-            services.TryAddTransient<DocumentConfig<int>>();
-
-            return services
-                .AddDocumentServiceConnectorService()
-                .AddPathProviderService()
-                .AddInfoConfigService();
-        }
-
-        public static DIHelper AddInfoConfigService(this DIHelper services)
-        {
-            services.TryAddTransient<InfoConfig<string>>();
-            services.TryAddTransient<InfoConfig<int>>();
-
-            return services
-                .AddBreadCrumbsManagerService()
-                .AddFileSharingService();
-        }
-
-        public static DIHelper AddEditorConfigurationService(this DIHelper services)
-        {
-            services.TryAddTransient<EditorConfiguration<string>>();
-            services.TryAddTransient<EditorConfiguration<int>>();
-
-            return services
-                .AddUserManagerService()
-                .AddAuthContextService()
-                .AddDisplayUserSettingsService()
-                .AddFilesLinkUtilityService()
-                .AddBaseCommonLinkUtilityService()
-                .AddPluginsConfigService()
-                .AddEmbeddedConfigService()
-                .AddCustomizationConfigService();
-        }
-
-        public static DIHelper AddPluginsConfigService(this DIHelper services)
-        {
-            services.TryAddTransient<PluginsConfig>();
-
-            return services
-                .AddConsumerFactoryService()
-                .AddBaseCommonLinkUtilityService();
-        }
-
-        public static DIHelper AddEmbeddedConfigService(this DIHelper services)
-        {
-            services.TryAddTransient<EmbeddedConfig>();
-
-            return services
-                .AddFilesLinkUtilityService()
-                .AddBaseCommonLinkUtilityService();
-        }
-
-        public static DIHelper AddCustomizationConfigService(this DIHelper services)
-        {
-            services.TryAddTransient<CustomizationConfig<string>>();
-            services.TryAddTransient<CustomizationConfig<int>>();
-
-            return services
-                .AddCoreBaseSettingsService()
-                .AddSettingsManagerService()
-                .AddFileUtilityService()
-                .AddFilesSettingsHelperService()
-                .AddAuthContextService()
-                .AddFileSecurityService()
-                .AddDaoFactoryService()
-                .AddGlobalFolderHelperService()
-                .AddPathProviderService()
-                .AddCustomerConfigService()
-                .AddLogoConfigService();
-        }
-
-        public static DIHelper AddCustomerConfigService(this DIHelper services)
-        {
-            services.TryAddTransient<CustomerConfig<string>>();
-            services.TryAddTransient<CustomerConfig<int>>();
-
-            return services
-                .AddSettingsManagerService()
-                .AddBaseCommonLinkUtilityService()
-                .AddTenantLogoHelperService();
-        }
-
-        public static DIHelper AddLogoConfigService(this DIHelper services)
-        {
-            services.TryAddTransient<LogoConfig<string>>();
-            services.TryAddTransient<LogoConfig<int>>();
-
-            return services
-                .AddSettingsManagerService()
-                .AddBaseCommonLinkUtilityService()
-                .AddTenantLogoHelperService();
-        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
index f5a4042a53..532b85581d 100644
--- a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
+++ b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
@@ -48,7 +48,8 @@ using Newtonsoft.Json;
 using CommandMethod = ASC.Web.Core.Files.DocumentService.CommandMethod;
 
 namespace ASC.Web.Files.Services.DocumentService
-{
+{
+    [Scope]
     public class DocumentServiceConnector
     {
         public ILog Logger { get; }
@@ -378,25 +379,4 @@ namespace ASC.Web.Files.Services.DocumentService
             return new Exception(error, ex);
         }
     }
-    public static class DocumentServiceConnectorExtension
-    {
-        public static DIHelper AddDocumentServiceConnectorService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DocumentServiceConnector>())
-            {
-
-                return services
-                    .AddFilesLinkUtilityService()
-                    .AddFileUtilityService()
-                    .AddPathProviderService()
-                    .AddGlobalStoreService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddTenantManagerService()
-                    .AddTenantExtraService()
-                    .AddCoreSettingsService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
index aa4bffafca..62986f7f37 100644
--- a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
+++ b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
@@ -34,7 +34,6 @@ using ASC.Common;
 using ASC.Core;
 using ASC.Core.Users;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Security.Cryptography;
@@ -46,7 +45,8 @@ using ASC.Web.Studio.Core;
 using FileShare = ASC.Files.Core.Security.FileShare;
 
 namespace ASC.Web.Files.Services.DocumentService
-{
+{
+    [Scope]
     public class DocumentServiceHelper
     {
         private IDaoFactory DaoFactory { get; }
@@ -395,28 +395,4 @@ namespace ASC.Web.Files.Services.DocumentService
             return DocumentServiceConnector.Command(Web.Core.Files.DocumentService.CommandMethod.Meta, docKeyForTrack, file.ID, meta: meta);
         }
     }
-    public static class DocumentServiceHelperExtention
-    {
-        public static DIHelper AddDocumentServiceHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DocumentServiceHelper>())
-            {
-                return services
-                    .AddDaoFactoryService()
-                    .AddFileShareLinkService()
-                    .AddUserManagerService()
-                    .AddAuthContextService()
-                    .AddFileSecurityService()
-                    .AddSetupInfo()
-                    .AddLockerManagerService()
-                    .AddFileUtilityService()
-                    .AddMachinePseudoKeysService()
-                    .AddGlobalService()
-                    .AddDocumentServiceConnectorService()
-                    .AddConfigurationService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
index d7cfd0c9ac..0847d44c24 100644
--- a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
+++ b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
@@ -42,7 +42,6 @@ using ASC.Core;
 using ASC.Core.Common;
 using ASC.Core.Users;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Services.NotifyService;
 using ASC.MessagingSystem;
@@ -157,7 +156,8 @@ namespace ASC.Web.Files.Services.DocumentService
 
         #endregion
     }
-
+
+    [Scope]
     public class DocumentServiceTrackerHelper
     {
         private SecurityContext SecurityContext { get; }
@@ -637,33 +637,4 @@ namespace ASC.Web.Files.Services.DocumentService
             }
         }
     }
-    public static class DocumentServiceTrackerHelperExtension
-    {
-        public static DIHelper AddDocumentServiceTrackerHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<DocumentServiceTrackerHelper>())
-            {
-                return services
-                    .AddSecurityContextService()
-                    .AddUserManagerService()
-                    .AddTenantManagerService()
-                    .AddFilesLinkUtilityService()
-                    .AddEmailValidationKeyProviderService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddGlobalStoreService()
-                    .AddDisplayUserSettingsService()
-                    .AddDaoFactoryService()
-                    .AddDocumentServiceHelperService()
-                    .AddEntryManagerService()
-                    .AddFileShareLinkService()
-                    .AddFilesMessageService()
-                    .AddDocumentServiceConnectorService()
-                    .AddNotifyClientService()
-                    .AddSocketManagerService()
-                    .AddMailMergeTaskRunnerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Core/Services/FFmpegService/FFmpeg.cs b/products/ASC.Files/Core/Services/FFmpegService/FFmpeg.cs
index 5b2692ced3..35036ded4a 100644
--- a/products/ASC.Files/Core/Services/FFmpegService/FFmpeg.cs
+++ b/products/ASC.Files/Core/Services/FFmpegService/FFmpeg.cs
@@ -14,7 +14,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Services.FFmpegService
-{
+{
+    [Singletone]
     public class FFmpegService
     {
         public List<string> MustConvertable
@@ -157,12 +158,4 @@ namespace ASC.Web.Files.Services.FFmpegService
             }
         }
     }
-    public static class FFmpegServiceExtensions
-    {
-        public static DIHelper AddFFmpegServiceService(this DIHelper services)
-        {
-            services.TryAddSingleton<FFmpegService>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs b/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
index d0d831ad3f..1a7610fffc 100644
--- a/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
+++ b/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
@@ -31,7 +31,6 @@ using System.Globalization;
 using ASC.Common;
 using ASC.Core;
 using ASC.Core.Common;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Notify.Patterns;
@@ -41,7 +40,8 @@ using ASC.Web.Files.Classes;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Services.NotifyService
-{
+{
+    [Scope]
     public class NotifyClient
     {
         private IServiceProvider ServiceProvider { get; }
@@ -250,22 +250,8 @@ namespace ASC.Files.Core.Services.NotifyService
     public static class NotifyClientExtension
     {
         public static DIHelper AddNotifyClientService(this DIHelper services)
-        {
-            if (services.TryAddScoped<NotifyClient>())
-            {
-                services.TryAddScoped<NotifyClientScope>();
-                return services
-                    .AddFilesNotifySourceService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddUserManagerService()
-                    .AddSecurityContextService()
-                    .AddFilesLinkUtilityService()
-                    .AddFileUtilityService()
-                    .AddPathProviderService()
-                    .AddTenantManagerService()
-                    .AddDaoFactoryService()
-                    ;
-            }
+        {
+            services.TryAddScoped<NotifyClientScope>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Services/NotifyService/NotifySource.cs b/products/ASC.Files/Core/Services/NotifyService/NotifySource.cs
index da6d7bfcea..e585f53799 100644
--- a/products/ASC.Files/Core/Services/NotifyService/NotifySource.cs
+++ b/products/ASC.Files/Core/Services/NotifyService/NotifySource.cs
@@ -28,7 +28,6 @@ using System;
 
 using ASC.Common;
 using ASC.Core;
-using ASC.Core.Notify;
 using ASC.Notify.Model;
 using ASC.Notify.Patterns;
 using ASC.Notify.Recipients;
@@ -36,7 +35,8 @@ using ASC.Notify.Recipients;
 using NotifySourceBase = ASC.Core.Notify.NotifySource;
 
 namespace ASC.Files.Core.Services.NotifyService
-{
+{
+    [Scope]
     public class NotifySource : NotifySourceBase
     {
         public NotifySource(UserManager userManager, IRecipientProvider recipientsProvider, SubscriptionManager subscriptionManager)
@@ -56,20 +56,4 @@ namespace ASC.Files.Core.Services.NotifyService
             return new XmlPatternProvider2(FilesPatternResource.patterns);
         }
     }
-
-    public static class FilesNotifySourceExtension
-    {
-        public static DIHelper AddFilesNotifySourceService(this DIHelper services)
-        {
-            if (services.TryAddScoped<NotifySource>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddRecipientProviderImplService()
-                    .AddSubscriptionManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
index c21e95771d..8230787d8a 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
@@ -32,14 +32,14 @@ using System.Text.Json;
 
 using ASC.Common;
 using ASC.Common.Threading;
-using ASC.Core;
 using ASC.Core.Tenants;
 using ASC.Files.Core.Resources;
 
 using Microsoft.Extensions.Primitives;
 
 namespace ASC.Web.Files.Services.WCFService.FileOperations
-{
+{
+    [Singletone]
     public class FileOperationsManager
     {
         private readonly DistributedTaskQueue tasks;
@@ -171,18 +171,13 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
     {
         public static DIHelper AddFileOperationsManagerHelperService(this DIHelper services)
         {
-            services.TryAddSingleton<DistributedTaskCacheNotify>();
-            services.TryAddSingleton<FileOperationsManager>();
             services.TryAddScoped<FileDeleteOperationScope>();
             services.TryAddScoped<FileMarkAsReadOperationScope>();
             services.TryAddScoped<FileMoveCopyOperationScope>();
             services.TryAddScoped<FileOperationScope>();
             services.TryAddScoped<FileDownloadOperationScope>();
 
-            return services
-                .AddAuthContextService()
-                .AddTenantManagerService()
-                ;
+            return services;
 
         }
     }
diff --git a/products/ASC.Files/Core/ThirdPartyApp/Token.cs b/products/ASC.Files/Core/ThirdPartyApp/Token.cs
index b4776860c3..6d4b91c921 100644
--- a/products/ASC.Files/Core/ThirdPartyApp/Token.cs
+++ b/products/ASC.Files/Core/ThirdPartyApp/Token.cs
@@ -84,7 +84,8 @@ namespace ASC.Web.Files.ThirdPartyApp
             return AccessToken;
         }
     }
-
+
+    [Scope]
     public class TokenHelper
     {
         public ILog Logger { get; }
@@ -162,21 +163,4 @@ namespace ASC.Web.Files.ThirdPartyApp
             return string.IsNullOrEmpty(token) ? null : OAuth20Token.FromJson(InstanceCrypto.Decrypt(token));
         }
     }
-
-    public static class TokenHelperExtension
-    {
-        public static DIHelper AddTokenHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TokenHelper>())
-            {
-                return services
-                    .AddFilesDbContextService()
-                    .AddInstanceCryptoService()
-                    .AddAuthContextService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs b/products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
index b648d078e8..d31100543f 100644
--- a/products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
+++ b/products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
@@ -37,7 +37,8 @@ using ASC.Web.Studio.Core;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Utils
-{
+{
+    [Scope]
     public class ChunkedUploadSessionHolder
     {
         public static readonly TimeSpan SlidingExpiration = TimeSpan.FromHours(12);
@@ -119,19 +120,4 @@ namespace ASC.Web.Files.Utils
             return new CommonChunkedUploadSessionHolder(Options, GlobalStore.GetStore(currentTenant), FileConstant.StorageDomainTmp, SetupInfo.ChunkUploadSize);
         }
     }
-
-    public static class ChunkedUploadSessionHolderExtention
-    {
-        public static DIHelper AddChunkedUploadSessionHolderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ChunkedUploadSessionHolder>())
-            {
-                return services
-                    .AddGlobalStoreService()
-                    .AddSetupInfo();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/EntryManager.cs b/products/ASC.Files/Core/Utils/EntryManager.cs
index 93bdf30c5d..4510ad8d6c 100644
--- a/products/ASC.Files/Core/Utils/EntryManager.cs
+++ b/products/ASC.Files/Core/Utils/EntryManager.cs
@@ -40,7 +40,6 @@ using ASC.Core;
 using ASC.Core.Common.Settings;
 using ASC.Core.Users;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Web.Core.Files;
@@ -60,7 +59,8 @@ using Newtonsoft.Json.Linq;
 using FileShare = ASC.Files.Core.Security.FileShare;
 
 namespace ASC.Web.Files.Utils
-{
+{
+    [Scope]
     public class LockerManager
     {
         private AuthContext AuthContext { get; }
@@ -92,7 +92,8 @@ namespace ASC.Web.Files.Utils
             return tagLock != null ? tagLock.Owner : Guid.Empty;
         }
     }
-
+
+    [Scope]
     public class BreadCrumbsManager
     {
         private IDaoFactory DaoFactory { get; }
@@ -169,7 +170,8 @@ namespace ASC.Web.Files.Utils
             return breadCrumbs;
         }
     }
-
+
+    [Scope]
     public class EntryManager
     {
         private const string UPDATE_LIST = "filesUpdateList";
@@ -1198,69 +1200,4 @@ namespace ASC.Web.Files.Utils
             folderDao.ReassignFolders(folderIds.ToArray(), toUserId);
         }
     }
-
-    public static class EntryManagerExtension
-    {
-        public static DIHelper AddEntryManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<EntryManager>())
-            {
-                return services
-                    .AddDaoFactoryService()
-                    .AddFileSecurityService()
-                    .AddGlobalFolderHelperService()
-                    .AddPathProviderService()
-                    .AddAuthContextService()
-                    .AddFileMarkerService()
-                    .AddFileUtilityService()
-                    .AddGlobalService()
-                    .AddGlobalStoreService()
-                    .AddCoreBaseSettingsService()
-                    .AddFilesSettingsHelperService()
-                    .AddUserManagerService()
-                    .AddFileShareLinkService()
-                    .AddDocumentServiceConnectorService()
-                    .AddDocumentServiceHelperService()
-                    .AddFilesIntegrationService()
-                    .AddThirdpartyConfigurationService()
-                    .AddLockerManagerService()
-                    .AddBreadCrumbsManagerService()
-                    ;
-            }
-
-            return services;
-        }
-    }
-
-    public static class LockerManagerExtension
-    {
-        public static DIHelper AddLockerManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<LockerManager>())
-            {
-                return services
-                    .AddAuthContextService()
-                    .AddDaoFactoryService();
-            }
-
-            return services;
-        }
-    }
-
-    public static class BreadCrumbsManagerExtension
-    {
-        public static DIHelper AddBreadCrumbsManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<BreadCrumbsManager>())
-            {
-                return services
-                    .AddDaoFactoryService()
-                    .AddFileSecurityService()
-                    .AddGlobalFolderHelperService()
-                    .AddAuthContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/FileConverter.cs b/products/ASC.Files/Core/Utils/FileConverter.cs
index 86d917139e..d47d0e4740 100644
--- a/products/ASC.Files/Core/Utils/FileConverter.cs
+++ b/products/ASC.Files/Core/Utils/FileConverter.cs
@@ -41,7 +41,6 @@ using ASC.Common.Logging;
 using ASC.Common.Security.Authentication;
 using ASC.Core;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.MessagingSystem;
@@ -60,7 +59,8 @@ using Microsoft.Extensions.Options;
 using SecurityContext = ASC.Core.SecurityContext;
 
 namespace ASC.Web.Files.Utils
-{
+{
+    [Singletone]
     internal class FileConverterQueue<T>
     {
         private readonly object singleThread = new object();
@@ -487,7 +487,8 @@ namespace ASC.Web.Files.Utils
         public string FolderTitle { get; set; }
         public string FileJson { get; set; }
     }
-
+
+    [Scope]
     public class FileConverter
     {
         private FileUtility FileUtility { get; }
@@ -849,31 +850,8 @@ namespace ASC.Web.Files.Utils
     public static class FileConverterExtension
     {
         public static DIHelper AddFileConverterService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileConverter>())
-            {
-                services.TryAddSingleton<FileConverterQueue<string>>();
-                services.TryAddSingleton<FileConverterQueue<int>>();
-                services.TryAddScoped<FileConverterQueueScope>();
-
-                return services
-                    .AddFilesLinkUtilityService()
-                    .AddFileUtilityService()
-                    .AddDaoFactoryService()
-                    .AddSetupInfo()
-                    .AddPathProviderService()
-                    .AddFileSecurityService()
-                    .AddFileMarkerService()
-                    .AddTenantManagerService()
-                    .AddAuthContextService()
-                    .AddEntryManagerService()
-                    .AddFilesSettingsHelperService()
-                    .AddGlobalFolderHelperService()
-                    .AddFilesMessageService()
-                    .AddFileShareLinkService()
-                    .AddDocumentServiceHelperService()
-                    .AddDocumentServiceConnectorService();
-            }
+        {
+            services.TryAddScoped<FileConverterQueueScope>();
 
             return services;
         }
diff --git a/products/ASC.Files/Core/Utils/FileMarker.cs b/products/ASC.Files/Core/Utils/FileMarker.cs
index 2bd8eb539f..f8be954784 100644
--- a/products/ASC.Files/Core/Utils/FileMarker.cs
+++ b/products/ASC.Files/Core/Utils/FileMarker.cs
@@ -36,7 +36,6 @@ using ASC.Common.Threading.Workers;
 using ASC.Core;
 using ASC.Core.Users;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Web.Files.Classes;
@@ -46,7 +45,8 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Utils
 {
-
+
+    [Singletone]
     public class FileMarkerHelper<T>
     {
         private IServiceProvider ServiceProvider { get; }
@@ -94,7 +94,8 @@ namespace ASC.Web.Files.Utils
             }
         }
     }
-
+
+    [Scope]
     public class FileMarker
     {
         private readonly ICache cache;
@@ -721,7 +722,8 @@ namespace ASC.Web.Files.Utils
             cache.Remove(key);
         }
     }
-
+
+    [Transient]
     public class AsyncTaskData<T>
     {
         public AsyncTaskData(TenantManager tenantManager, AuthContext authContext)
@@ -750,24 +752,14 @@ namespace ASC.Web.Files.Utils
         }
 
         public static DIHelper AddFileMarkerService<T>(this DIHelper services)
-        {
-            services.TryAddTransient<AsyncTaskData<T>>();
-            services.TryAddScoped<FileMarker>();
-            services.TryAddSingleton<FileMarkerHelper<T>>();
+        {
             services.TryAddSingleton<WorkerQueueOptionsManager<AsyncTaskData<T>>>();
             services.TryAddSingleton<WorkerQueue<AsyncTaskData<T>>>();
             services.AddSingleton<IConfigureOptions<WorkerQueue<AsyncTaskData<T>>>, ConfigureWorkerQueue<AsyncTaskData<T>>>();
 
             services.AddWorkerQueue<AsyncTaskData<T>>(1, (int)TimeSpan.FromSeconds(60).TotalMilliseconds, false, 1);
 
-            return services
-                .AddTenantManagerService()
-                .AddUserManagerService()
-                .AddDaoFactoryService()
-                .AddGlobalFolderService()
-                .AddFileSecurityService()
-                .AddCoreBaseSettingsService()
-                .AddAuthContextService();
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/FileShareLink.cs b/products/ASC.Files/Core/Utils/FileShareLink.cs
index 6cf148aa1f..3ac10c008d 100644
--- a/products/ASC.Files/Core/Utils/FileShareLink.cs
+++ b/products/ASC.Files/Core/Utils/FileShareLink.cs
@@ -37,7 +37,8 @@ using ASC.Web.Files.Classes;
 using FileShare = ASC.Files.Core.Security.FileShare;
 
 namespace ASC.Web.Files.Utils
-{
+{
+    [Scope]
     public class FileShareLink
     {
         private FileUtility FileUtility { get; }
@@ -120,21 +121,4 @@ namespace ASC.Web.Files.Utils
             return FileShare.Restrict;
         }
     }
-    public static class FileShareLinkExtension
-    {
-        public static DIHelper AddFileShareLinkService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileShareLink>())
-            {
-                return services
-                    .AddFilesLinkUtilityService()
-                    .AddFileUtilityService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddGlobalService()
-                    .AddFileSecurityService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/FileSharing.cs b/products/ASC.Files/Core/Utils/FileSharing.cs
index ee4e494e1b..02c1835b8a 100644
--- a/products/ASC.Files/Core/Utils/FileSharing.cs
+++ b/products/ASC.Files/Core/Utils/FileSharing.cs
@@ -34,7 +34,6 @@ using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Users;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.Files.Core.Services.NotifyService;
@@ -47,7 +46,8 @@ using ASC.Web.Files.Services.WCFService;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Utils
-{
+{
+    [Scope]
     public class FileSharingAceHelper<T>
     {
         private FileSecurity FileSecurity { get; }
@@ -213,7 +213,8 @@ namespace ASC.Web.Files.Utils
                 });
         }
     }
-
+
+    [Scope]
     public class FileSharingHelper
     {
         public FileSharingHelper(
@@ -249,7 +250,8 @@ namespace ASC.Web.Files.Utils
                                 && (Equals(entry.RootFolderId, GlobalFolderHelper.FolderPrivacy) || FileSecurity.CanEdit(entry))));
         }
     }
-
+
+    [Scope]
     public class FileSharing
     {
         private Global Global { get; }
@@ -551,60 +553,4 @@ namespace ASC.Web.Files.Utils
                     .Select(aceWrapper => new AceShortWrapper(aceWrapper)));
         }
     }
-
-    public static class FileSharingExtension
-    {
-        public static DIHelper AddFileSharingService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileSharing>())
-            {
-                return services
-                    .AddGlobalService()
-                    .AddFileSecurityService()
-                    .AddAuthContextService()
-                    .AddUserManagerService()
-                    .AddDisplayUserSettingsService()
-                    .AddFileShareLinkService()
-                    .AddDaoFactoryService()
-                    .AddFileSharingHelperService();
-            }
-
-            return services;
-        }
-
-        public static DIHelper AddFileSharingHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileSharingHelper>())
-            {
-                return services
-                    .AddGlobalService()
-                    .AddGlobalFolderHelperService()
-                    .AddFileSecurityService()
-                    .AddAuthContextService()
-                    .AddUserManagerService();
-            }
-            return services;
-        }
-        public static DIHelper AddFileSharingAceHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileSharingAceHelper<string>>())
-            {
-                services.TryAddScoped<FileSharingAceHelper<int>>();
-
-                return services
-                    .AddFileSecurityService()
-                    .AddCoreBaseSettingsService()
-                    .AddFileUtilityService()
-                    .AddUserManagerService()
-                    .AddAuthContextService()
-                    .AddDocumentServiceHelperService()
-                    .AddFileMarkerService()
-                    .AddNotifyClientService()
-                    .AddGlobalFolderHelperService()
-                    .AddFileSharingHelperService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/FileUploader.cs b/products/ASC.Files/Core/Utils/FileUploader.cs
index fa662f19c9..d17df5883a 100644
--- a/products/ASC.Files/Core/Utils/FileUploader.cs
+++ b/products/ASC.Files/Core/Utils/FileUploader.cs
@@ -35,7 +35,6 @@ using ASC.Common;
 using ASC.Core;
 using ASC.Core.Users;
 using ASC.Files.Core;
-using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
 using ASC.Files.Core.Security;
 using ASC.MessagingSystem;
@@ -49,7 +48,8 @@ using ASC.Web.Studio.Utility;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Web.Files.Utils
-{
+{
+    [Scope]
     public class FileUploader
     {
         private FilesSettingsHelper FilesSettingsHelper { get; }
@@ -329,36 +329,4 @@ namespace ASC.Web.Files.Utils
 
         #endregion
     }
-
-    public static class FileUploaderExtention
-    {
-        public static DIHelper AddFileUploaderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileUploader>())
-            {
-
-                return services
-                    .AddChunkedUploadSessionHolderService()
-                    .AddEntryManagerService()
-                    .AddFileSecurityService()
-                    .AddFilesLinkUtilityService()
-                    .AddFilesMessageService()
-                    .AddGlobalService()
-                    .AddDaoFactoryService()
-                    .AddFileConverterService()
-                    .AddFileMarkerService()
-                    .AddTenantStatisticsProviderService()
-                    .AddTenantExtraService()
-                    .AddUserManagerService()
-                    .AddTenantManagerService()
-                    .AddAuthContextService()
-                    .AddSetupInfo()
-                    .AddFileUtilityService()
-                    .AddFilesSettingsHelperService()
-                    ;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/MailMergeTask.cs b/products/ASC.Files/Core/Utils/MailMergeTask.cs
index 3017c837c2..24806c7f6e 100644
--- a/products/ASC.Files/Core/Utils/MailMergeTask.cs
+++ b/products/ASC.Files/Core/Utils/MailMergeTask.cs
@@ -63,7 +63,8 @@ namespace ASC.Web.Files.Utils
                 Attach.Dispose();
         }
     }
-
+
+    [Scope]
     public class MailMergeTaskRunner
     {
         private SetupInfo SetupInfo { get; }
@@ -205,20 +206,4 @@ namespace ASC.Web.Files.Utils
             return responseSend["response"].Value<string>();
         }
     }
-
-    public static class MailMergeTaskRunnerExtension
-    {
-        public static DIHelper AddMailMergeTaskRunnerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<MailMergeTaskRunner>())
-            {
-                return services
-                    .AddSetupInfo()
-                    .AddSecurityContextService()
-                    .AddBaseCommonLinkUtilityService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/SocketManager.cs b/products/ASC.Files/Core/Utils/SocketManager.cs
index 9fbeb3f73f..47e3ce9cf4 100644
--- a/products/ASC.Files/Core/Utils/SocketManager.cs
+++ b/products/ASC.Files/Core/Utils/SocketManager.cs
@@ -31,7 +31,8 @@ using ASC.Core.Notify.Signalr;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Utils
-{
+{
+    [Scope]
     public class SocketManager
     {
         private readonly SignalrServiceClient _signalrServiceClient;
@@ -49,18 +50,4 @@ namespace ASC.Web.Files.Utils
             _signalrServiceClient.FilesChangeEditors(TenantManager.GetCurrentTenant().TenantId, fileId.ToString(), finish);
         }
     }
-    public static class SocketManagerExtension
-    {
-        public static DIHelper AddSocketManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SocketManager>())
-            {
-                return services
-                    .AddTenantManagerService()
-                    .AddSignalrServiceClient();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Server/Controllers/FilesController.cs b/products/ASC.Files/Server/Controllers/FilesController.cs
index bc05a01fba..a53e3ceaa6 100644
--- a/products/ASC.Files/Server/Controllers/FilesController.cs
+++ b/products/ASC.Files/Server/Controllers/FilesController.cs
@@ -1902,14 +1902,6 @@ namespace ASC.Api.Documents
         }
     }
 
-    public static class DocumentsControllerExtention
-    {
-        public static DIHelper AddDocumentsControllerService(this DIHelper services)
-        {
-            return services.AddFilesControllerHelperService();
-        }
-    }
-
     public class BodySpecificAttribute : Attribute, IActionConstraint
     {
         public BodySpecificAttribute()
diff --git a/products/ASC.Files/Server/Controllers/PrivacyRoomController.cs b/products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
index d5ce6e31a5..5c89370faa 100644
--- a/products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
+++ b/products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
@@ -44,6 +44,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Documents
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class PrivacyRoomApi : ControllerBase
@@ -170,23 +171,4 @@ namespace ASC.Api.Documents
             return enable;
         }
     }
-
-    public static class PrivacyRoomApiExtention
-    {
-        public static DIHelper AddPrivacyRoomApiService(this DIHelper services)
-        {
-            if (services.TryAddScoped<PrivacyRoomApi>())
-            {
-                services
-                    .AddAuthContextService()
-                    .AddPermissionContextService()
-                    .AddSettingsManagerService()
-                    .AddTenantManagerService()
-                    .AddMessageServiceService()
-                    .AddEncryptionKeyPairHelperService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
index 1c79c4ce99..703b01e8aa 100644
--- a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
+++ b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
@@ -46,6 +46,7 @@ using SortedByType = ASC.Files.Core.SortedByType;
 
 namespace ASC.Files.Helpers
 {
+    [Scope]
     public class FilesControllerHelper<T>
     {
         private readonly ApiContext ApiContext;
@@ -990,51 +991,4 @@ namespace ASC.Files.Helpers
 
         #endregion
     }
-
-    public static class FilesControllerHelperExtention
-    {
-        public static DIHelper AddFilesControllerHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FilesControllerHelper<string>>())
-            {
-                services.TryAddScoped<FilesControllerHelper<int>>();
-
-                return services
-                    .AddEasyBibHelperService()
-                    .AddWordpressTokenService()
-                    .AddWordpressHelperService()
-                    .AddFolderContentWrapperHelperService()
-                    .AddFileUploaderService()
-                    .AddFileShareParamsService()
-                    .AddFileShareWrapperService()
-                    .AddFileOperationWraperHelperService()
-                    .AddFileWrapperHelperService()
-                    .AddFolderWrapperHelperService()
-                    .AddConsumerFactoryService()
-                    .AddDocumentServiceConnectorService()
-                    .AddCommonLinkUtilityService()
-                    .AddMessageServiceService()
-                    .AddThirdpartyConfigurationService()
-                    .AddCoreBaseSettingsService()
-                    .AddWebItemSecurity()
-                    .AddUserManagerService()
-                    .AddEntryManagerService()
-                    .AddTenantManagerService()
-                    .AddSecurityContextService()
-                    .AddDocumentServiceHelperService()
-                    .AddFilesLinkUtilityService()
-                    .AddApiContextService()
-                    .AddFileStorageService()
-                    .AddFilesSettingsHelperService()
-                    .AddBoxLoginProviderService()
-                    .AddDropboxLoginProviderService()
-                    .AddOneDriveLoginProviderService()
-                    .AddGoogleLoginProviderService()
-                    .AddChunkedUploadSessionHelperService()
-                    ;
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Server/ProductEntryPoint.cs b/products/ASC.Files/Server/ProductEntryPoint.cs
index 876e2502e4..04f5f4d9b1 100644
--- a/products/ASC.Files/Server/ProductEntryPoint.cs
+++ b/products/ASC.Files/Server/ProductEntryPoint.cs
@@ -28,25 +28,13 @@ using ASC.Common;
 using ASC.Web.Files.Configuration;
 
 namespace ASC.Files
-{
+{
+    [Scope]
     public class ApiProductEntryPoint : ProductEntryPoint
     {
         public override string ApiURL
         {
             get => "api/2.0/files/info.json";
         }
-    }
-
-    public static class ApiProductEntryPointExtention
-    {
-        public static DIHelper AddApiProductEntryPointService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ApiProductEntryPoint>())
-            {
-                return services.AddProductEntryPointService();
-            }
-
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
index 26a53faf0c..430183c072 100644
--- a/products/ASC.Files/Server/Startup.cs
+++ b/products/ASC.Files/Server/Startup.cs
@@ -1,13 +1,10 @@
-using System.Diagnostics;
 using System.Text;
 using System.Text.Json.Serialization;
 
 using ASC.Api.Core;
 using ASC.Api.Documents;
-using ASC.Common;
 using ASC.Web.Files;
 using ASC.Web.Files.HttpHandlers;
-using ASC.Web.Studio.Core.Notify;
 
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -35,18 +32,6 @@ namespace ASC.Files
             services.AddMemoryCache();
 
             base.ConfigureServices(services);
-
-            DIHelper
-                .AddApiProductEntryPointService()
-                .AddDocumentsControllerService()
-                .AddPrivacyRoomApiService()
-                .AddFileHandlerService()
-                .AddChunkedUploaderHandlerService()
-                .AddThirdPartyAppHandlerService()
-                .AddDocuSignHandlerService()
-                .AddNotifyConfiguration();
-
-
         }
 
         public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/products/ASC.Files/Service/Program.cs b/products/ASC.Files/Service/Program.cs
index 5c788e0b1d..848907d144 100644
--- a/products/ASC.Files/Service/Program.cs
+++ b/products/ASC.Files/Service/Program.cs
@@ -54,17 +54,8 @@ namespace ASC.Files.Service
 
                     diHelper.AddNLogManager("ASC.Files");
                     services.AddHostedService<ServiceLauncher>();
-                    diHelper
-                        .AddServiceLauncher()
-                        .AddFileConverterService()
-                        .AddKafkaService()
-                        .AddFactoryIndexerFileService()
-                        .AddFactoryIndexerFolderService();
-
                     diHelper.AddNLogManager("ASC.Feed.Agregator");
                     services.AddHostedService<FeedAggregatorService>();
-                    diHelper
-                        .AddFeedAggregatorService();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath, true, false, "search.json", "feed.json");
                 })
diff --git a/products/ASC.People/Server/Controllers/GroupController.cs b/products/ASC.People/Server/Controllers/GroupController.cs
index e55e5f41fb..ef5d2278c3 100644
--- a/products/ASC.People/Server/Controllers/GroupController.cs
+++ b/products/ASC.People/Server/Controllers/GroupController.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using ASC.Api.Core;
 using ASC.Api.Utils;
 using ASC.Common;
 using ASC.Common.Web;
@@ -12,13 +11,12 @@ using ASC.MessagingSystem;
 using ASC.People.Models;
 using ASC.Web.Api.Models;
 using ASC.Web.Api.Routing;
-using ASC.Web.Core.Users;
-using ASC.Web.Studio.Utility;
 
 using Microsoft.AspNetCore.Mvc;
 
 namespace ASC.Employee.Core.Controllers
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class GroupController : ControllerBase
@@ -219,22 +217,4 @@ namespace ASC.Employee.Core.Controllers
             UserManager.AddUserIntoGroup(userId, @group.ID);
         }
     }
-
-    public static class GroupControllerExtention
-    {
-        public static DIHelper AddGroupController(this DIHelper services)
-        {
-            return services
-                .AddGroupWraperFull()
-                .AddMessageServiceService()
-                .AddApiContextService()
-                .AddUserManagerService()
-                .AddUserPhotoManagerService()
-                .AddSecurityContextService()
-                .AddPermissionContextService()
-                .AddCommonLinkUtilityService()
-                .AddDisplayUserSettingsService()
-                .AddMessageTargetService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.People/Server/Controllers/PeopleController.cs b/products/ASC.People/Server/Controllers/PeopleController.cs
index c16e33e192..6d786ce48d 100644
--- a/products/ASC.People/Server/Controllers/PeopleController.cs
+++ b/products/ASC.People/Server/Controllers/PeopleController.cs
@@ -46,6 +46,7 @@ using SecurityContext = ASC.Core.SecurityContext;
 
 namespace ASC.Employee.Core.Controllers
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class PeopleController : ControllerBase
@@ -1502,47 +1503,4 @@ namespace ASC.Employee.Core.Controllers
             }
         }
     }
-
-    public static class PeopleControllerExtention
-    {
-        public static DIHelper AddPeopleController(this DIHelper services)
-        {
-            return services
-                .AddAccountLinker()
-                .AddMessageTargetService()
-                .AddAccountLinkerStorageService()
-                .AddFileSizeCommentService()
-                .AddCookiesManagerService()
-                .AddUserPhotoManagerService()
-                .AddCustomNamingPeopleService()
-                .AddSignatureService()
-                .AddApiContextService()
-                .AddUserManagerWrapperService()
-                .AddInstanceCryptoService()
-                .AddTenantUtilService()
-                .AddSecurityContextService()
-                .AddWebItemSecurityCache()
-                .AddDisplayUserSettingsService()
-                .AddTenantManagerService()
-                .AddSetupInfo()
-                .AddCommonLinkUtilityService()
-                .AddCoreBaseSettingsService()
-                .AddWebItemManager()
-                .AddAuthContextService()
-                .AddWebItemSecurity()
-                .AddPermissionContextService()
-                .AddTenantStatisticsProviderService()
-                .AddTenantExtraService()
-                .AddMessageServiceService()
-                .AddQueueWorkerRemoveService()
-                .AddQueueWorkerReassignService()
-                .AddStudioNotifyServiceService()
-                .AddUserManagerService()
-                .AddSettingsManagerService()
-                .AddEmployeeWraperFull()
-                .AddEmployeeWraper()
-                .AddUserFormatter()
-                .AddPasswordHasherService();
-        }
-    }
 }
diff --git a/products/ASC.People/Server/Models/GroupWrapperFull.cs b/products/ASC.People/Server/Models/GroupWrapperFull.cs
index d7c1c0516a..6994adf62f 100644
--- a/products/ASC.People/Server/Models/GroupWrapperFull.cs
+++ b/products/ASC.People/Server/Models/GroupWrapperFull.cs
@@ -65,6 +65,7 @@ namespace ASC.Web.Api.Models
         }
     }
 
+    [Scope]
     public class GroupWraperFullHelper
     {
         private UserManager UserManager { get; }
@@ -95,20 +96,4 @@ namespace ASC.Web.Api.Models
             return result;
         }
     }
-
-    public static class GroupWraperFullExtension
-    {
-        public static DIHelper AddGroupWraperFull(this DIHelper services)
-        {
-            if (services.TryAddScoped<GroupWraperFullHelper>())
-            {
-
-                return services
-                    .AddUserManagerService()
-                    .AddEmployeeWraper();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.People/Server/Startup.cs b/products/ASC.People/Server/Startup.cs
index ed3d01ef07..0ad97cc411 100644
--- a/products/ASC.People/Server/Startup.cs
+++ b/products/ASC.People/Server/Startup.cs
@@ -4,7 +4,6 @@ using System;
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Data.Reassigns;
-using ASC.Employee.Core.Controllers;
 using ASC.Web.Core.Users;
 
 using Microsoft.Extensions.Configuration;
@@ -28,11 +27,7 @@ namespace ASC.People
 
             DIHelper.AddProgressQueue<RemoveProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
             DIHelper.AddProgressQueue<ReassignProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
-            DIHelper.AddWorkerQueue<ResizeWorkerItem>(2, (int)TimeSpan.FromMinutes(30).TotalMilliseconds, true, 1);
-
-            DIHelper
-                .AddPeopleController()
-                .AddGroupController();
+            DIHelper.AddWorkerQueue<ResizeWorkerItem>(2, (int)TimeSpan.FromMinutes(30).TotalMilliseconds, true, 1);
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Api/Controllers/AuthenticationController.cs b/web/ASC.Web.Api/Controllers/AuthenticationController.cs
index 66ea647139..29d798b6c1 100644
--- a/web/ASC.Web.Api/Controllers/AuthenticationController.cs
+++ b/web/ASC.Web.Api/Controllers/AuthenticationController.cs
@@ -16,6 +16,7 @@ using static ASC.Security.Cryptography.EmailValidationKeyProvider;
 
 namespace ASC.Web.Api.Controllers
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     [AllowAnonymous]
@@ -140,17 +141,4 @@ namespace ASC.Web.Api.Controllers
             };
         }
     }
-
-    public static class AuthenticationControllerExtension
-    {
-        public static DIHelper AddAuthenticationController(this DIHelper services)
-        {
-            return services
-                .AddUserManagerService()
-                .AddTenantManagerService()
-                .AddSecurityContextService()
-                .AddTenantCookieSettingsService()
-                .AddPasswordHasherService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Api/Controllers/ModulesController.cs b/web/ASC.Web.Api/Controllers/ModulesController.cs
index d9a821ebc8..79b94c8d6c 100644
--- a/web/ASC.Web.Api/Controllers/ModulesController.cs
+++ b/web/ASC.Web.Api/Controllers/ModulesController.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 
 using ASC.Common;
-using ASC.Core;
 using ASC.Web.Api.Routing;
 using ASC.Web.Core;
 using ASC.Web.Core.WebZones;
@@ -10,6 +9,7 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace ASC.Web.Api.Controllers
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class ModulesController : ControllerBase
@@ -35,13 +35,4 @@ namespace ASC.Web.Api.Controllers
             return result;
         }
     }
-
-    public static class ModulesControllerExtension
-    {
-        public static DIHelper AddModulesController(this DIHelper services)
-        {
-            return services
-                .AddWebItemManagerSecurity();
-        }
-    }
 }
diff --git a/web/ASC.Web.Api/Controllers/PortalController.cs b/web/ASC.Web.Api/Controllers/PortalController.cs
index 0a86e42162..87f729377f 100644
--- a/web/ASC.Web.Api/Controllers/PortalController.cs
+++ b/web/ASC.Web.Api/Controllers/PortalController.cs
@@ -11,13 +11,10 @@ using ASC.Core.Billing;
 using ASC.Core.Common.Settings;
 using ASC.Core.Tenants;
 using ASC.Core.Users;
-using ASC.MessagingSystem;
-using ASC.Security.Cryptography;
 using ASC.Web.Api.Routing;
 using ASC.Web.Core;
 using ASC.Web.Core.Utility;
 using ASC.Web.Studio.Core;
-using ASC.Web.Studio.Core.Notify;
 using ASC.Web.Studio.Utility;
 
 using Microsoft.AspNetCore.Mvc;
@@ -28,6 +25,7 @@ using SecurityContext = ASC.Core.SecurityContext;
 
 namespace ASC.Web.Api.Controllers
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class PortalController : ControllerBase
@@ -197,26 +195,4 @@ namespace ASC.Web.Api.Controllers
             }
         }
     }
-
-    public static class PortalControllerExtension
-    {
-        public static DIHelper AddPortalController(this DIHelper services)
-        {
-            return services
-                .AddUrlShortener()
-                .AddMessageServiceService()
-                .AddStudioNotifyServiceService()
-                .AddApiContextService()
-                .AddUserManagerService()
-                .AddAuthContextService()
-                .AddAuthContextService()
-                .AddTenantManagerService()
-                .AddEmailValidationKeyProviderService()
-                .AddPaymentManagerService()
-                .AddCommonLinkUtilityService()
-                .AddAuthContextService()
-                .AddWebItemSecurity()
-                .AddSecurityContextService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Api/Controllers/SecurityController.cs b/web/ASC.Web.Api/Controllers/SecurityController.cs
index a80746b3f9..3c6408b62e 100644
--- a/web/ASC.Web.Api/Controllers/SecurityController.cs
+++ b/web/ASC.Web.Api/Controllers/SecurityController.cs
@@ -19,7 +19,8 @@ using ASC.Web.Studio.Utility;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ASC.Web.Api.Controllers
-{
+{
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class SecurityController : ControllerBase
@@ -150,21 +151,4 @@ namespace ASC.Web.Api.Controllers
             return settings;
         }
     }
-
-    public static class SecurityControllerExtension
-    {
-        public static DIHelper AddSecurityController(this DIHelper services)
-        {
-            return services
-                .AddPermissionContextService()
-                .AddCoreBaseSettingsService()
-                .AddTenantExtraService()
-                .AddTenantManagerService()
-                .AddMessageServiceService()
-                .AddLoginEventsRepositoryService()
-                .AddAuditEventsRepositoryService()
-                .AddAuditReportCreatorService()
-                .AddSettingsManagerService();
-        }
-    }
 }
diff --git a/web/ASC.Web.Api/Controllers/SettingsController.cs b/web/ASC.Web.Api/Controllers/SettingsController.cs
index d3a93827e7..c257061552 100644
--- a/web/ASC.Web.Api/Controllers/SettingsController.cs
+++ b/web/ASC.Web.Api/Controllers/SettingsController.cs
@@ -96,6 +96,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Settings
 {
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public partial class SettingsController : ControllerBase
@@ -345,7 +346,7 @@ namespace ASC.Api.Settings
 
             MessageService.Send(MessageAction.AdministratorMessageSettingsUpdated);
 
-            return  Resource.SuccessfullySaveSettingsMessage;
+            return Resource.SuccessfullySaveSettingsMessage;
         }
 
         [AllowAnonymous]
@@ -440,23 +441,23 @@ namespace ASC.Api.Settings
                 switch (Tenant.TrustedDomainsType)
                 {
                     case TenantTrustedDomainsType.Custom:
-                        {
-                            var address = new MailAddress(email);
-                            if (Tenant.TrustedDomains.Any(d => address.Address.EndsWith("@" + d, StringComparison.InvariantCultureIgnoreCase)))
-                            {
-                                StudioNotifyService.SendJoinMsg(email, emplType);
-                                MessageService.Send(MessageInitiator.System, MessageAction.SentInviteInstructions, email);
-                                return Resource.FinishInviteJoinEmailMessage;
-                            }
-
-                            throw new Exception(Resource.ErrorEmailDomainNotAllowed);
-                        }
-                    case TenantTrustedDomainsType.All:
+                    {
+                        var address = new MailAddress(email);
+                        if (Tenant.TrustedDomains.Any(d => address.Address.EndsWith("@" + d, StringComparison.InvariantCultureIgnoreCase)))
                         {
                             StudioNotifyService.SendJoinMsg(email, emplType);
                             MessageService.Send(MessageInitiator.System, MessageAction.SentInviteInstructions, email);
-                            return Resource.FinishInviteJoinEmailMessage ;
+                            return Resource.FinishInviteJoinEmailMessage;
                         }
+
+                        throw new Exception(Resource.ErrorEmailDomainNotAllowed);
+                    }
+                    case TenantTrustedDomainsType.All:
+                    {
+                        StudioNotifyService.SendJoinMsg(email, emplType);
+                        MessageService.Send(MessageInitiator.System, MessageAction.SentInviteInstructions, email);
+                        return Resource.FinishInviteJoinEmailMessage;
+                    }
                     default:
                         throw new Exception(Resource.ErrorNotCorrectEmail);
                 }
@@ -2399,68 +2400,4 @@ namespace ASC.Api.Settings
             MemoryCache.Set(key, ++count, TimeSpan.FromMinutes(expirationMinutes));
         }
     }
-
-    public static class SettingsControllerExtension
-    {
-        public static DIHelper AddSettingsController(this DIHelper services)
-        {
-            return services
-                .AddMessageTargetService()
-                .AddCoreConfigurationService()
-                .AddIPRestrictionsService()
-                .AddDisplayUserSettingsService()
-                .AddSetupInfo()
-                .AddCommonLinkUtilityService()
-                .AddCoreBaseSettingsService()
-                .AddTenantUtilService()
-                .AddEmailValidationKeyProviderService()
-                .AddMessageServiceService()
-                .AddStudioNotifyServiceService()
-                .AddApiContextService()
-                .AddUserManagerService()
-                .AddTenantManagerService()
-                .AddTenantExtraService()
-                .AddTenantStatisticsProviderService()
-                .AddUserPhotoManagerService()
-                .AddAuthContextService()
-                .AddCookiesManagerService()
-                .AddWebItemSecurity()
-                .AddStudioNotifyHelperService()
-                .AddLicenseReaderService()
-                .AddPermissionContextService()
-                .AddWebItemManager()
-                .AddWebItemManagerSecurity()
-                .AddStorageSettingsService()
-                .AddStorageFactoryService()
-                .AddStorageFactoryConfigService()
-                .AddSettingsManagerService()
-                .AddTenantInfoSettingsService()
-                .AddColorThemesSettingsHelperService()
-                .AddTenantWhiteLabelSettingsService()
-                .AddStudioSmsNotificationSettingsService()
-                .AddTfaManagerService()
-                .AddStorageHelperService()
-                .AddTenantLogoManagerService()
-                .AddBuildVersionService()
-                .AddStatisticManagerService()
-                .AddEmployeeWraper()
-                .AddConsumerFactoryService()
-                .AddSmsProviderManagerService()
-                .AddCustomNamingPeopleService()
-                .AddProviderManagerService()
-                .AddAccountLinker()
-                .AddMobileDetectorService()
-                .AddFirstTimeTenantSettings()
-                .AddServiceClient()
-                .AddTwilioProviderService()
-                .AddEncryptionServiceClient()
-                .AddEncryptionSettingsHelperService()
-                .AddStorageFactoryService()
-                .AddBackupService()
-                .AddEncryptionServiceNotifierService()
-                .AddTelegramLoginProviderService()
-                .AddTelegramHelperSerivce()
-                .AddPasswordHasherService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs b/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs
index b209fecccd..73553c512d 100644
--- a/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs
+++ b/web/ASC.Web.Api/Controllers/SmtpSettingsController.cs
@@ -33,19 +33,16 @@ using ASC.Core;
 using ASC.Core.Billing;
 using ASC.Core.Configuration;
 using ASC.Core.Tenants;
-using ASC.MessagingSystem;
 using ASC.Web.Api.Routing;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Studio.Core;
-using ASC.Web.Studio.Core.Notify;
-using ASC.Web.Studio.Utility;
-
-using Microsoft.AspNetCore.Hosting;
+using ASC.Web.Studio.Utility;
+
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 
 namespace ASC.Api.Settings
-{
+{
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class SmtpSettingsController : ControllerBase
@@ -228,17 +225,4 @@ namespace ASC.Api.Settings
             }
         }
     }
-
-    public static class SmtpSettingsControllerExtension
-    {
-        public static DIHelper AddSmtpSettingsController(this DIHelper services)
-        {
-            return services
-                .AddApiContextService()
-                .AddPermissionContextService()
-                .AddCoreConfigurationService()
-                .AddCoreBaseSettingsService()
-                ;
-        }
-    }
 }
diff --git a/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs b/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
index 8278d8985b..dcae437037 100644
--- a/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
+++ b/web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
@@ -43,7 +43,6 @@ using ASC.Core.Tenants;
 using ASC.Core.Users;
 using ASC.MessagingSystem;
 using ASC.Web.Api.Models;
-using ASC.Web.Core;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Core.Users;
 using ASC.Web.Core.Utility.Settings;
@@ -57,6 +56,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.UserControls.FirstTime
 {
+    [Transient]
     public class FirstTimeTenantSettings
     {
         private ILog Log { get; }
@@ -358,25 +358,4 @@ namespace ASC.Web.Studio.UserControls.FirstTime
             public string Alias { get; set; }
         }
     }
-
-    public static class FirstTimeTenantSettingsExtension
-    {
-        public static DIHelper AddFirstTimeTenantSettings(this DIHelper services)
-        {
-            services.TryAddTransient<FirstTimeTenantSettings>();
-
-            return services
-                .AddTenantManagerService()
-                .AddCoreConfigurationService()
-                .AddCoreSettingsService()
-                .AddTenantExtraService()
-                .AddSettingsManagerService()
-                .AddSetupInfo()
-                .AddSecurityContextService()
-                .AddPaymentManagerService()
-                .AddMessageServiceService()
-                .AddLicenseReaderService()
-                .AddStudioNotifyServiceService();
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Api/Models/BuildVersion.cs b/web/ASC.Web.Api/Models/BuildVersion.cs
index 904c4e2181..6f4c50e45a 100644
--- a/web/ASC.Web.Api/Models/BuildVersion.cs
+++ b/web/ASC.Web.Api/Models/BuildVersion.cs
@@ -32,7 +32,8 @@ using ASC.Common;
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.Api.Settings
-{
+{
+    [Singletone]
     public class BuildVersion
     {
         public string CommunityServer { get; set; }
@@ -116,15 +117,5 @@ namespace ASC.Api.Settings
 
             return null;
         }
-    }
-
-    public static class BuildVersionExtension
-    {
-        public static DIHelper AddBuildVersionService(this DIHelper services)
-        {
-            services.TryAddSingleton<BuildVersion>();
-
-            return services;
-        }
     }
 }
diff --git a/web/ASC.Web.Api/Startup.cs b/web/ASC.Web.Api/Startup.cs
index 5998567c6e..6b5434d76e 100644
--- a/web/ASC.Web.Api/Startup.cs
+++ b/web/ASC.Web.Api/Startup.cs
@@ -1,9 +1,6 @@
 
 using ASC.Api.Core;
-using ASC.Api.Settings;
-using ASC.Common;
 using ASC.Common.DependencyInjection;
-using ASC.Web.Api.Controllers;
 
 using Autofac.Extensions.DependencyInjection;
 
@@ -27,15 +24,7 @@ namespace ASC.Web.Api
         {
             base.ConfigureServices(services);
 
-            services.AddMemoryCache();
-
-            DIHelper
-                .AddAuthenticationController()
-                .AddModulesController()
-                .AddPortalController()
-                .AddSettingsController()
-                .AddSecurityController()
-                .AddSmtpSettingsController();
+            services.AddMemoryCache();
 
             services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
 
diff --git a/web/ASC.Web.Core/CookiesManager.cs b/web/ASC.Web.Core/CookiesManager.cs
index 894e3fab11..cc05cdee22 100644
--- a/web/ASC.Web.Core/CookiesManager.cs
+++ b/web/ASC.Web.Core/CookiesManager.cs
@@ -47,6 +47,7 @@ namespace ASC.Web.Core
         SocketIO
     }
 
+    [Scope]
     public class CookiesManager
     {
         private const string AuthCookiesName = "asc_auth_key";
@@ -235,21 +236,4 @@ namespace ASC.Web.Core
             SetCookies(CookiesType.AuthKey, cookie);
         }
     }
-
-    public static class CookiesManagerExtension
-    {
-        public static DIHelper AddCookiesManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<CookiesManager>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddSecurityContextService()
-                    .AddTenantCookieSettingsService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/FileSizeComment.cs b/web/ASC.Web.Core/FileSizeComment.cs
index bb1217c1f7..c5a3e77ff7 100644
--- a/web/ASC.Web.Core/FileSizeComment.cs
+++ b/web/ASC.Web.Core/FileSizeComment.cs
@@ -33,6 +33,7 @@ using ASC.Web.Studio.Utility;
 
 namespace ASC.Web.Studio.Core
 {
+    [Scope]
     public class FileSizeComment
     {
         private TenantExtra TenantExtra { get; }
@@ -159,19 +160,4 @@ namespace ASC.Web.Studio.Core
             return string.Format("{0:#,0.##} {1}", resultSize, sizeNames[power]);
         }
     }
-
-    public static class FileSizeCommentExtension
-    {
-        public static DIHelper AddFileSizeCommentService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileSizeComment>())
-            {
-                return services
-                    .AddTenantExtraService()
-                    .AddSetupInfo();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Files/FileUtility.cs b/web/ASC.Web.Core/Files/FileUtility.cs
index 119b140dcd..4c2ba3b65b 100644
--- a/web/ASC.Web.Core/Files/FileUtility.cs
+++ b/web/ASC.Web.Core/Files/FileUtility.cs
@@ -38,6 +38,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Core.Files
 {
+    [Scope]
     public class FileUtility
     {
         private DbContextManager<FilesDbContext> FilesDbContext { get; set; }
@@ -462,19 +463,4 @@ namespace ASC.Web.Core.Files
 
         #endregion
     }
-
-    public static class FileUtilityExtention
-    {
-        public static DIHelper AddFileUtilityService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FileUtility>())
-            {
-                return services
-                    .AddFilesLinkUtilityService()
-                    .AddFilesDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Files/FilesLinkUtility.cs b/web/ASC.Web.Core/Files/FilesLinkUtility.cs
index a24349a8d2..23878d2ff3 100644
--- a/web/ASC.Web.Core/Files/FilesLinkUtility.cs
+++ b/web/ASC.Web.Core/Files/FilesLinkUtility.cs
@@ -39,6 +39,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Core.Files
 {
+    [Scope]
     public class FilesLinkUtility
     {
         public const string FilesBaseVirtualPath = "~/products/files/";
@@ -431,21 +432,4 @@ namespace ASC.Web.Core.Files
             return "DocKey_" + key;
         }
     }
-    public static class FilesLinkUtilityExtention
-    {
-        public static DIHelper AddFilesLinkUtilityService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FilesLinkUtility>())
-            {
-                return services
-                    .AddCommonLinkUtilityService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddCoreBaseSettingsService()
-                    .AddCoreSettingsService()
-                    .AddInstanceCryptoService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Helpers/ApiSystemHelper.cs b/web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
index 697a62e8e7..1cf7a7a22b 100644
--- a/web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
+++ b/web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
@@ -44,7 +44,8 @@ using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json.Linq;
 
 namespace ASC.Web.Core.Helpers
-{
+{
+    [Scope]
     public class ApiSystemHelper
     {
         public string ApiSystemUrl { get; private set; }
@@ -170,13 +171,4 @@ namespace ASC.Web.Core.Helpers
             return reader.ReadToEnd();
         }
     }
-
-    public static class ApiSystemHelperExtension
-    {
-        public static DIHelper AddApiSystemHelper(this DIHelper services)
-        {
-            services.TryAddScoped<ApiSystemHelper>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/LogoUploader.cs b/web/ASC.Web.Core/LogoUploader.cs
index 34aec931b5..1f890bae4d 100644
--- a/web/ASC.Web.Core/LogoUploader.cs
+++ b/web/ASC.Web.Core/LogoUploader.cs
@@ -105,7 +105,8 @@ namespace ASC.Web.Studio.UserControls.CustomNavigation
     //        return result;
     //    }
     //}
-
+
+    [Scope]
     public class StorageHelper
     {
         private const string StorageName = "customnavigation";
@@ -185,20 +186,4 @@ namespace ASC.Web.Studio.UserControls.CustomNavigation
             return store.Save(fileName, stream).ToString();
         }
     }
-
-    public static class StorageHelperExtension
-    {
-        public static DIHelper AddStorageHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<StorageHelper>())
-            {
-                return services
-                    .AddUserPhotoManagerService()
-                    .AddStorageFactoryService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Mobile/MobileDetector.cs b/web/ASC.Web.Core/Mobile/MobileDetector.cs
index 33f635b7a5..6a2dcde79d 100644
--- a/web/ASC.Web.Core/Mobile/MobileDetector.cs
+++ b/web/ASC.Web.Core/Mobile/MobileDetector.cs
@@ -35,6 +35,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Core.Mobile
 {
+    [Scope]
     public class MobileDetector
     {
         private readonly Regex uaMobileRegex;
@@ -82,13 +83,4 @@ namespace ASC.Web.Core.Mobile
             return result.GetValueOrDefault();
         }
     }
-
-    public static class MobileDetectorExtension
-    {
-        public static DIHelper AddMobileDetectorService(this DIHelper services)
-        {
-            services.TryAddScoped<MobileDetector>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Notify/NotifyConfiguration.cs b/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
index 9bfe2e84c5..b40aa346b9 100644
--- a/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
+++ b/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
@@ -42,7 +42,6 @@ using ASC.Notify;
 using ASC.Notify.Engine;
 using ASC.Notify.Messages;
 using ASC.Notify.Patterns;
-using ASC.Notify.Textile;
 using ASC.Web.Core;
 using ASC.Web.Core.Users;
 using ASC.Web.Core.WhiteLabel;
@@ -447,24 +446,7 @@ namespace ASC.Web.Studio.Core.Notify
             if (services.TryAddScoped<NotifyConfigurationScope>())
             {
 
-                return services
-                    .AddJabberStylerService()
-                    .AddTextileStylerService()
-                    .AddPushStylerService()
-                    .AddTenantManagerService()
-                    .AddAuthContextService()
-                    .AddUserManagerService()
-                    .AddDisplayUserSettingsService()
-                    .AddTenantExtraService()
-                    .AddWebItemManagerSecurity()
-                    .AddWebItemManager()
-                    .AddTenantLogoManagerService()
-                    .AddTenantUtilService()
-                    .AddCoreBaseSettingsService()
-                    .AddAdditionalWhiteLabelSettingsService()
-                    .AddCommonLinkUtilityService()
-                    .AddMailWhiteLabelSettingsService()
-                    .AddStudioNotifyHelperService();
+                return services;
             }
 
             return services;
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyHelper.cs b/web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
index d624da8a80..0fd828ff30 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
@@ -43,7 +43,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.Core.Notify
-{
+{
+    [Scope]
     public class StudioNotifyHelper
     {
         public readonly string Helplink;
@@ -247,26 +248,4 @@ namespace ASC.Web.Studio.Core.Notify
             }
         }
     }
-
-    public static class StudioNotifyHelperExtension
-    {
-        public static DIHelper AddStudioNotifyHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<StudioNotifyHelper>())
-            {
-                return services
-                    .AddStudioNotifySourceService()
-                    .AddUserManagerService()
-                    .AddAdditionalWhiteLabelSettingsService()
-                    .AddCommonLinkUtilityService()
-                    .AddTenantManagerService()
-                    .AddSetupInfo()
-                    .AddTenantExtraService()
-                    .AddCoreBaseSettingsService()
-                    .AddWebImageSupplierService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyService.cs b/web/ASC.Web.Core/Notify/StudioNotifyService.cs
index e697f92f72..8da8de4b02 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyService.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyService.cs
@@ -53,6 +53,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.Core.Notify
 {
+    [Scope]
     public class StudioNotifyService
     {
         private readonly StudioNotifyServiceHelper client;
@@ -1033,25 +1034,7 @@ namespace ASC.Web.Studio.Core.Notify
     {
         public static DIHelper AddStudioNotifyServiceService(this DIHelper services)
         {
-            if (services.TryAddScoped<StudioNotifyService>())
-            {
-                services.TryAddScoped<StudioNotifyServiceScope>();
-                return services
-                    .AddDisplayUserSettingsService()
-                    .AddMailWhiteLabelSettingsService()
-                    .AddAdditionalWhiteLabelSettingsService()
-                    .AddStudioNotifyServiceHelper()
-                    .AddUserManagerService()
-                    .AddStudioNotifyHelperService()
-                    .AddTenantExtraService()
-                    .AddAuthManager()
-                    .AddAuthContextService()
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddCommonLinkUtilityService()
-                    .AddSetupInfo()
-                    .AddWebItemSecurity();
-            }
+            services.TryAddScoped<StudioNotifyServiceScope>();
 
             return services;
         }
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs b/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
index f130e30de2..312258f80a 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
@@ -10,6 +10,7 @@ using ASC.Web.Studio.Core.Notify;
 
 namespace ASC.Web.Core.Notify
 {
+    [Scope]
     public class StudioNotifyServiceHelper
     {
         private ICacheNotify<NotifyItem> Cache { get; }
@@ -116,15 +117,7 @@ namespace ASC.Web.Core.Notify
     {
         public static DIHelper AddStudioNotifyServiceHelper(this DIHelper services)
         {
-            if (services.TryAddScoped<StudioNotifyServiceHelper>())
-            {
-                services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-
-                return services
-                    .AddAuthContextService()
-                    .AddStudioNotifyHelperService()
-                    .AddTenantManagerService();
-            }
+            services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
             return services;
         }
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs b/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
index 0d21308d26..76e5180ef9 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
@@ -36,7 +36,6 @@ using ASC.Core.Configuration;
 using ASC.Notify.Model;
 using ASC.Notify.Patterns;
 using ASC.Notify.Recipients;
-using ASC.Web.Core.Users;
 using ASC.Web.Studio.Utility;
 
 using Microsoft.Extensions.Configuration;
@@ -44,6 +43,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Web.Studio.Core.Notify
 {
+    [Singletone]
     public class StudioNotifyServiceSender
     {
         private static string EMailSenderName { get { return Constants.NotifyEMailSenderSysName; } }
@@ -215,20 +215,9 @@ namespace ASC.Web.Studio.Core.Notify
     {
         public static DIHelper AddStudioNotifyServiceSender(this DIHelper services)
         {
-            services.TryAddSingleton<StudioNotifyServiceSender>();
             services.TryAddScoped<StudioNotifyServiceSenderScope>();
 
-            return services
-                .AddStudioPeriodicNotify()
-                .AddStudioWhatsNewNotify()
-                .AddTenantManagerService()
-                .AddUserManagerService()
-                .AddSecurityContextService()
-                .AddAuthContextService()
-                .AddStudioNotifyHelperService()
-                .AddDisplayUserSettingsService()
-                .AddTenantExtraService()
-                .AddCoreBaseSettingsService();
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Notify/StudioNotifySource.cs b/web/ASC.Web.Core/Notify/StudioNotifySource.cs
index 2c1d0712c1..533eab2e7c 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifySource.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifySource.cs
@@ -34,6 +34,7 @@ using ASC.Web.Core.PublicResources;
 
 namespace ASC.Web.Studio.Core.Notify
 {
+    [Scope]
     public class StudioNotifySource : NotifySource
     {
         public StudioNotifySource(UserManager userManager, IRecipientProvider recipientsProvider, SubscriptionManager subscriptionManager)
@@ -271,21 +272,4 @@ namespace ASC.Web.Studio.Core.Notify
             }
         }
     }
-
-    public static class StudioNotifySourceExtension
-    {
-        public static DIHelper AddStudioNotifySourceService(this DIHelper services)
-        {
-            if (services.TryAddScoped<StudioNotifySource>())
-            {
-
-                return services
-                    .AddUserManagerService()
-                    .AddRecipientProviderImplService()
-                    .AddSubscriptionManagerService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs b/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
index 74c473dc26..b4bae92252 100644
--- a/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
+++ b/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
@@ -53,7 +53,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.Core.Notify
-{
+{
+    [Singletone]
     public class StudioPeriodicNotify
     {
         private IServiceProvider ServiceProvider { get; }
@@ -1228,26 +1229,10 @@ namespace ASC.Web.Studio.Core.Notify
     public static class StudioPeriodicNotifyExtension
     {
         public static DIHelper AddStudioPeriodicNotify(this DIHelper services)
-        {
-            services.TryAddSingleton<StudioPeriodicNotify>();
-            services.TryAddSingleton<CouponManager>();
+        {
             services.TryAddScoped<StudioPeriodicNotifyScope>();
 
-            return services
-                .AddApiSystemHelper()
-                .AddTenantManagerService()
-                .AddUserManagerService()
-                .AddStudioNotifyHelperService()
-                .AddPaymentManagerService()
-                .AddTenantExtraService()
-                .AddAuthContextService()
-                .AddCommonLinkUtilityService()
-                .AddSetupInfo()
-                .AddFeedDbService()
-                .AddCoreBaseSettingsService()
-                .AddDisplayUserSettingsService()
-                .AddSecurityContextService()
-                .AddAuthManager();
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs b/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
index 291f5d7902..8f555aae5d 100644
--- a/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
+++ b/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
@@ -50,7 +50,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.Core.Notify
-{
+{
+    [Singletone]
     public class StudioWhatsNewNotify
     {
         private IServiceProvider ServiceProvider { get; }
@@ -366,25 +367,9 @@ namespace ASC.Web.Studio.Core.Notify
     public static class StudioWhatsNewNotifyExtension
     {
         public static DIHelper AddStudioWhatsNewNotify(this DIHelper services)
-        {
-            services.TryAddSingleton<StudioWhatsNewNotify>();
+        {
             services.TryAddScoped<StudioWhatsNewNotifyScope>();
-            return services
-                .AddWebItemManager()
-                .AddFeedAggregateDataProvider()
-
-                .AddTenantManagerService()
-                .AddPaymentManagerService()
-                .AddStudioNotifyHelperService()
-                .AddUserManagerService()
-                .AddSecurityContextService()
-                .AddAuthContextService()
-                .AddAuthManager()
-                .AddTenantUtilService()
-                .AddCommonLinkUtilityService()
-                .AddDisplayUserSettingsService()
-                .AddCoreSettingsService()
-                ;
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/PersonalSettings.cs b/web/ASC.Web.Core/PersonalSettings.cs
index a262e36f72..56e54477d7 100644
--- a/web/ASC.Web.Core/PersonalSettings.cs
+++ b/web/ASC.Web.Core/PersonalSettings.cs
@@ -56,6 +56,8 @@ namespace ASC.Web.Studio.Core
             };
         }
     }
+
+    [Scope]
     public class PersonalSettingsHelper
     {
         public PersonalSettingsHelper(SettingsManager settingsManager)
@@ -87,17 +89,4 @@ namespace ASC.Web.Studio.Core
 
         private SettingsManager SettingsManager { get; }
     }
-
-    public static class PersonalSettingsExtention
-    {
-        public static DIHelper AddTenantCookieSettingsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<PersonalSettingsHelper>())
-            {
-                return services.AddSettingsManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/QuotaSync.cs b/web/ASC.Web.Core/QuotaSync.cs
index 564bdc1388..bfe2b7a48f 100644
--- a/web/ASC.Web.Core/QuotaSync.cs
+++ b/web/ASC.Web.Core/QuotaSync.cs
@@ -26,7 +26,6 @@
 
 using System;
 using System.Linq;
-using System.Threading;
 
 using ASC.Common.Threading;
 using ASC.Core;
diff --git a/web/ASC.Web.Core/SetupInfo.cs b/web/ASC.Web.Core/SetupInfo.cs
index b50852c409..04526ea248 100644
--- a/web/ASC.Web.Core/SetupInfo.cs
+++ b/web/ASC.Web.Core/SetupInfo.cs
@@ -40,6 +40,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Studio.Core
 {
+    [Singletone]
     public class SetupInfo
     {
         private static string web_autotest_secret_email;
@@ -251,14 +252,4 @@ namespace ASC.Web.Studio.Core
             return defaultValue;
         }
     }
-
-    public static class SetupInfoExtension
-    {
-        public static DIHelper AddSetupInfo(this DIHelper services)
-        {
-            services.TryAddSingleton<SetupInfo>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Sms/SmsManager.cs b/web/ASC.Web.Core/Sms/SmsManager.cs
index 4314324576..a406442a87 100644
--- a/web/ASC.Web.Core/Sms/SmsManager.cs
+++ b/web/ASC.Web.Core/Sms/SmsManager.cs
@@ -32,9 +32,6 @@ using ASC.Core.Tenants;
 using ASC.Core.Users;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Core.Sms;
-using ASC.Web.Studio.Utility;
-
-using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Studio.Core.SMS
 {
diff --git a/web/ASC.Web.Core/Sms/SmsProvider.cs b/web/ASC.Web.Core/Sms/SmsProvider.cs
index 450b26c46b..2007ba93e0 100644
--- a/web/ASC.Web.Core/Sms/SmsProvider.cs
+++ b/web/ASC.Web.Core/Sms/SmsProvider.cs
@@ -51,6 +51,7 @@ using Twilio.Types;
 
 namespace ASC.Web.Core.Sms
 {
+    [Scope]
     public class SmsProviderManager
     {
         public SmscProvider SmscProvider { get => ConsumerFactory.Get<SmscProvider>(); }
@@ -114,18 +115,6 @@ namespace ASC.Web.Core.Sms
             return provider.SendMessage(number, message);
         }
     }
-    public static class SmsProviderManagerExtension
-    {
-        public static DIHelper AddSmsProviderManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<SmsProviderManager>())
-            {
-                return services.AddConsumerFactoryService();
-            }
-
-            return services;
-        }
-    }
 
     public abstract class SmsProvider : Consumer
     {
@@ -375,6 +364,7 @@ namespace ASC.Web.Core.Sms
         }
     }
 
+    [Scope]
     public class TwilioProvider : SmsProvider, IValidateKeysProvider
     {
         protected override string Key
@@ -479,6 +469,7 @@ namespace ASC.Web.Core.Sms
         }
     }
 
+    [Scope]
     public class TwilioSaaSProvider : TwilioProvider
     {
         public TwilioSaaSProvider()
@@ -504,6 +495,7 @@ namespace ASC.Web.Core.Sms
         }
     }
 
+    [Scope]
     public class TwilioProviderCleaner
     {
         private VoipDao VoipDao { get; }
@@ -540,16 +532,7 @@ namespace ASC.Web.Core.Sms
     {
         public static DIHelper AddTwilioProviderService(this DIHelper services)
         {
-            if (services.TryAddScoped<TwilioProvider>())
-            {
-                services.TryAddScoped<TwilioProviderCleaner>();
-                services.TryAddScoped<TwilioSaaSProvider>();
-                return services
-                    .AddVoipDaoService()
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddCoreSettingsService();
-            }
+            services.TryAddScoped<TwilioSaaSProvider>();
 
             return services;
         }
diff --git a/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs b/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
index 405ecd92b2..7c6785b297 100644
--- a/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
+++ b/web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
@@ -52,6 +52,7 @@ namespace ASC.Web.Studio.Core.SMS
         public bool EnableSetting { get; set; }
     }
 
+    [Scope]
     public class StudioSmsNotificationSettingsHelper
     {
         private TenantExtra TenantExtra { get; }
@@ -95,20 +96,4 @@ namespace ASC.Web.Studio.Core.SMS
             }
         }
     }
-
-    public static class StudioSmsNotificationSettingsExtension
-    {
-        public static DIHelper AddStudioSmsNotificationSettingsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<StudioSmsNotificationSettingsHelper>())
-            {
-                return services
-                    .AddTenantExtraService()
-                    .AddCoreBaseSettingsService()
-                    .AddSetupInfo();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Statistic/StatisticManager.cs b/web/ASC.Web.Core/Statistic/StatisticManager.cs
index b0a96f8bc9..83d12b6448 100644
--- a/web/ASC.Web.Core/Statistic/StatisticManager.cs
+++ b/web/ASC.Web.Core/Statistic/StatisticManager.cs
@@ -38,6 +38,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace ASC.Web.Studio.Core.Statistic
 {
+    [Scope]
     public class StatisticManager
     {
         private static DateTime lastSave = DateTime.UtcNow;
@@ -162,17 +163,4 @@ namespace ASC.Web.Studio.Core.Statistic
             tx.Commit();
         }
     }
-
-    public static class StatisticManagerExtension
-    {
-        public static DIHelper AddStatisticManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<StatisticManager>())
-            {
-                return services.AddWebstudioDbContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Tfa/TfaManager.cs b/web/ASC.Web.Core/Tfa/TfaManager.cs
index 2e2a87df1c..08920d0fe0 100644
--- a/web/ASC.Web.Core/Tfa/TfaManager.cs
+++ b/web/ASC.Web.Core/Tfa/TfaManager.cs
@@ -83,6 +83,7 @@ namespace ASC.Web.Studio.Core.TFA
         }
     }
 
+    [Scope]
     public class TfaManager
     {
         private static readonly TwoFactorAuthenticator Tfa = new TwoFactorAuthenticator();
@@ -214,23 +215,4 @@ namespace ASC.Web.Studio.Core.TFA
             return encodedToken.Substring(0, 10);
         }
     }
-
-    public static class TfaManagerExtension
-    {
-        public static DIHelper AddTfaManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TfaManager>())
-            {
-
-                return services
-                    .AddSettingsManagerService()
-                    .AddSetupInfo()
-                    .AddSignatureService()
-                    .AddCookiesManagerService()
-                    .AddSecurityContextService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Users/CustomNamingPeople.cs b/web/ASC.Web.Core/Users/CustomNamingPeople.cs
index 1b86da248d..728f151580 100644
--- a/web/ASC.Web.Core/Users/CustomNamingPeople.cs
+++ b/web/ASC.Web.Core/Users/CustomNamingPeople.cs
@@ -161,6 +161,7 @@ namespace ASC.Web.Core.Users
         }
     }
 
+    [Scope]
     public class CustomNamingPeople
     {
         private static bool loaded = false;
@@ -372,17 +373,4 @@ namespace ASC.Web.Core.Users
             return text;
         }
     }
-
-    public static class CustomNamingPeopleExtension
-    {
-        public static DIHelper AddCustomNamingPeopleService(this DIHelper services)
-        {
-            if (services.TryAddScoped<CustomNamingPeople>())
-            {
-                return services.AddSettingsManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Users/UserManagerWrapper.cs b/web/ASC.Web.Core/Users/UserManagerWrapper.cs
index c352b56b0f..9a08cb8c9b 100644
--- a/web/ASC.Web.Core/Users/UserManagerWrapper.cs
+++ b/web/ASC.Web.Core/Users/UserManagerWrapper.cs
@@ -35,7 +35,6 @@ using ASC.Core;
 using ASC.Core.Common.Settings;
 using ASC.Core.Tenants;
 using ASC.Core.Users;
-using ASC.IPSecurity;
 using ASC.MessagingSystem;
 using ASC.Web.Core.PublicResources;
 using ASC.Web.Core.Utility;
@@ -46,6 +45,8 @@ namespace ASC.Web.Core.Users
     /// <summary>
     /// Web studio user manager helper
     /// </summary>
+    /// 
+    [Scope]
     public sealed class UserManagerWrapper
     {
         private StudioNotifyService StudioNotifyService { get; }
@@ -350,28 +351,4 @@ namespace ASC.Web.Core.Users
             return new Regex(pattern, options).IsMatch(email);
         }
     }
-    public static class UserManagerWrapperExtension
-    {
-        public static DIHelper AddUserManagerWrapperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<UserManagerWrapper>())
-            {
-
-                return services
-                    .AddIPSecurityService()
-                    .AddTenantUtilService()
-                    .AddCustomNamingPeopleService()
-                    .AddSettingsManagerService()
-                    .AddStudioNotifyServiceService()
-                    .AddUserManagerService()
-                    .AddSecurityContextService()
-                    .AddMessageServiceService()
-                    .AddDisplayUserSettingsService()
-                    .AddCoreBaseSettingsService()
-                    .AddUserFormatter();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Users/UserPhotoManager.cs b/web/ASC.Web.Core/Users/UserPhotoManager.cs
index b9d0ec16db..04fe9a1019 100644
--- a/web/ASC.Web.Core/Users/UserPhotoManager.cs
+++ b/web/ASC.Web.Core/Users/UserPhotoManager.cs
@@ -93,6 +93,7 @@ namespace ASC.Web.Core.Users
         }
     }
 
+    [Singletone]
     public class UserPhotoManagerCache
     {
         private readonly ConcurrentDictionary<CacheSize, ConcurrentDictionary<Guid, string>> Photofiles;
@@ -179,6 +180,7 @@ namespace ASC.Web.Core.Users
         }
     }
 
+    [Scope]
     public class UserPhotoManager
     {
         //Regex for parsing filenames into groups with id's
@@ -1014,25 +1016,4 @@ namespace ASC.Web.Core.Users
             return services;
         }
     }
-
-    public static class UserPhotoManagerExtension
-    {
-        public static DIHelper AddUserPhotoManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<UserPhotoManager>())
-            {
-                services.TryAddSingleton<UserPhotoManagerCache>();
-
-                return services
-                    .AddStorageFactoryService()
-                    .AddSettingsManagerService()
-                    .AddWebImageSupplierService()
-                    .AddUserManagerService()
-                    .AddTenantManagerService()
-                    .AddResizeWorkerItemService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Utility/ColorThemesSettings.cs b/web/ASC.Web.Core/Utility/ColorThemesSettings.cs
index b769ef3fda..8caf83b1ce 100644
--- a/web/ASC.Web.Core/Utility/ColorThemesSettings.cs
+++ b/web/ASC.Web.Core/Utility/ColorThemesSettings.cs
@@ -61,6 +61,7 @@ namespace ASC.Web.Core.Utility
         }
     }
 
+    [Scope]
     public class ColorThemesSettingsHelper
     {
         private SettingsManager SettingsManager { get; }
@@ -139,17 +140,4 @@ namespace ASC.Web.Core.Utility
             }
         }
     }
-
-    public static class ColorThemesSettingsHelperExtension
-    {
-        public static DIHelper AddColorThemesSettingsHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ColorThemesSettingsHelper>())
-            {
-                return services.AddSettingsManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Utility/CommonLinkUtility.cs b/web/ASC.Web.Core/Utility/CommonLinkUtility.cs
index 9590f6735a..1ab0f56272 100644
--- a/web/ASC.Web.Core/Utility/CommonLinkUtility.cs
+++ b/web/ASC.Web.Core/Utility/CommonLinkUtility.cs
@@ -72,6 +72,7 @@ namespace ASC.Web.Studio.Utility
         PrivacyRoom = 22
     }
 
+    [Scope]
     public class CommonLinkUtility : BaseCommonLinkUtility
     {
         private static readonly Regex RegFilePathTrim = new Regex("/[^/]*\\.aspx", RegexOptions.IgnoreCase | RegexOptions.Compiled);
@@ -548,22 +549,4 @@ namespace ASC.Web.Studio.Utility
         #endregion
 
     }
-
-    public static class CommonLinkUtilityExtension
-    {
-        public static DIHelper AddCommonLinkUtilityService(this DIHelper services)
-        {
-            if (services.TryAddScoped<CommonLinkUtility>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddBaseCommonLinkUtilityService()
-                    .AddWebItemManagerSecurity()
-                    .AddWebItemManager()
-                    .AddEmailValidationKeyProviderService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/web/ASC.Web.Core/Utility/Skins/WebImageSupplier.cs b/web/ASC.Web.Core/Utility/Skins/WebImageSupplier.cs
index 71484fd2f5..8bffe180c5 100644
--- a/web/ASC.Web.Core/Utility/Skins/WebImageSupplier.cs
+++ b/web/ASC.Web.Core/Utility/Skins/WebImageSupplier.cs
@@ -34,6 +34,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Core.Utility.Skins
 {
+    [Scope]
     public class WebImageSupplier
     {
         private string FolderName { get; }
@@ -116,19 +117,4 @@ namespace ASC.Web.Core.Utility.Skins
             return dir + "/App_Themes";
         }
     }
-
-    public static class WebImageSupplierExtension
-    {
-        public static DIHelper AddWebImageSupplierService(this DIHelper services)
-        {
-            if (services.TryAddScoped<WebImageSupplier>())
-            {
-                return services
-                    .AddWebPathService()
-                    .AddWebItemManager();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Utility/TenantExtra.cs b/web/ASC.Web.Core/Utility/TenantExtra.cs
index c39b0a5087..6cf2f821e1 100644
--- a/web/ASC.Web.Core/Utility/TenantExtra.cs
+++ b/web/ASC.Web.Core/Utility/TenantExtra.cs
@@ -43,6 +43,7 @@ using ASC.Web.Studio.UserControls.Statistics;
 
 namespace ASC.Web.Studio.Utility
 {
+    [Scope]
     public class TenantExtra
     {
         private UserManager UserManager { get; }
@@ -254,27 +255,4 @@ namespace ASC.Web.Studio.Utility
             }
         }
     }
-
-    public static class TenantExtraExtension
-    {
-        public static DIHelper AddTenantExtraService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantExtra>())
-            {
-
-                return services
-                    .AddUserManagerService()
-                    .AddAuthContextService()
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddSetupInfo()
-                    .AddPaymentManagerService()
-                    .AddLicenseReaderService()
-                    .AddTenantStatisticsProviderService()
-                    .AddSettingsManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Utility/TenantLogoHelper.cs b/web/ASC.Web.Core/Utility/TenantLogoHelper.cs
index fc1f443907..8cf3da3e48 100644
--- a/web/ASC.Web.Core/Utility/TenantLogoHelper.cs
+++ b/web/ASC.Web.Core/Utility/TenantLogoHelper.cs
@@ -29,7 +29,8 @@ using ASC.Core.Common.Settings;
 using ASC.Web.Core.WhiteLabel;
 
 namespace ASC.Web.Studio.Utility
-{
+{
+    [Scope]
     public class TenantLogoHelper
     {
         private TenantLogoManager TenantLogoManager { get; }
@@ -83,21 +84,4 @@ namespace ASC.Web.Studio.Utility
 
         }
     }
-    public static class TenantLogoHelperExtention
-    {
-        public static DIHelper AddTenantLogoHelperService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantLogoHelper>())
-            {
-
-                return services
-                    .AddTenantLogoManagerService()
-                    .AddSettingsManagerService()
-                    .AddTenantWhiteLabelSettingsService()
-                    .AddTenantInfoSettingsService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/web/ASC.Web.Core/Utility/TenantStatisticsProvider.cs b/web/ASC.Web.Core/Utility/TenantStatisticsProvider.cs
index e1d776ad0c..e35cdd7a75 100644
--- a/web/ASC.Web.Core/Utility/TenantStatisticsProvider.cs
+++ b/web/ASC.Web.Core/Utility/TenantStatisticsProvider.cs
@@ -35,6 +35,7 @@ using ASC.Core.Users;
 
 namespace ASC.Web.Studio.UserControls.Statistics
 {
+    [Scope]
     public class TenantStatisticsProvider
     {
         private UserManager UserManager { get; }
@@ -72,19 +73,4 @@ namespace ASC.Web.Studio.UserControls.Statistics
                 .Where(r => !string.IsNullOrEmpty(r.Tag) && new Guid(r.Tag) != Guid.Empty);
         }
     }
-
-    public static class TenantStatisticsProviderExtension
-    {
-        public static DIHelper AddTenantStatisticsProviderService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantStatisticsProvider>())
-            {
-                return services
-                    .AddUserManagerService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Utility/UrlShortener.cs b/web/ASC.Web.Core/Utility/UrlShortener.cs
index fa04e4067c..8e4bff55e5 100644
--- a/web/ASC.Web.Core/Utility/UrlShortener.cs
+++ b/web/ASC.Web.Core/Utility/UrlShortener.cs
@@ -18,7 +18,8 @@ namespace ASC.Web.Core.Utility
     {
         string GetShortenLink(string shareLink);
     }
-
+
+    [Scope]
     public class UrlShortener
     {
         public bool Enabled { get { return !(Instance is NullShortener); } }
@@ -130,19 +131,4 @@ namespace ASC.Web.Core.Utility
             return null;
         }
     }
-
-    public static class UrlShortenerExtension
-    {
-        public static DIHelper AddUrlShortener(this DIHelper services)
-        {
-            if (services.TryAddScoped<UrlShortener>())
-            {
-                return services
-                    .AddConsumerFactoryService()
-                    .AddCommonLinkUtilityService();
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/web/ASC.Web.Core/WebItemManager.cs b/web/ASC.Web.Core/WebItemManager.cs
index 0c2512d653..38a6c36d7c 100644
--- a/web/ASC.Web.Core/WebItemManager.cs
+++ b/web/ASC.Web.Core/WebItemManager.cs
@@ -48,6 +48,7 @@ namespace ASC.Web.Core
         All = Normal | Disabled
     }
 
+    [Singletone]
     public class WebItemManager
     {
         private readonly ILog log;
@@ -215,6 +216,7 @@ namespace ASC.Web.Core
         }
     }
 
+    [Scope]
     public class WebItemManagerSecurity
     {
         private WebItemSecurity WebItemSecurity { get; }
@@ -263,25 +265,4 @@ namespace ASC.Web.Core
                                                             .ToList();
         }
     }
-
-    public static class WebItemManagerExtension
-    {
-        public static DIHelper AddWebItemManager(this DIHelper services)
-        {
-            services.TryAddSingleton<WebItemManager>();
-            return services;
-        }
-        public static DIHelper AddWebItemManagerSecurity(this DIHelper services)
-        {
-            if (services.TryAddScoped<WebItemManagerSecurity>())
-            {
-                return services
-                    .AddAuthContextService()
-                    .AddWebItemSecurity()
-                    .AddWebItemManager();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/WebItemSecurity.cs b/web/ASC.Web.Core/WebItemSecurity.cs
index f4965cb529..3fb3d8f9c6 100644
--- a/web/ASC.Web.Core/WebItemSecurity.cs
+++ b/web/ASC.Web.Core/WebItemSecurity.cs
@@ -42,6 +42,7 @@ using SecurityAction = ASC.Common.Security.Authorizing.Action;
 
 namespace ASC.Web.Core
 {
+    [Singletone]
     public class WebItemSecurityCache
     {
         public ICache Cache { get; }
@@ -90,6 +91,7 @@ namespace ASC.Web.Core
         }
     }
 
+    [Scope]
     public class WebItemSecurity
     {
         private static readonly SecurityAction Read = new SecurityAction(new Guid("77777777-32ae-425f-99b5-83176061d1ae"), "ReadWebItem", false, true);
@@ -436,33 +438,4 @@ namespace ASC.Web.Core
             }
         }
     }
-
-    public static class WebItemSecurityExtension
-    {
-        public static DIHelper AddWebItemSecurity(this DIHelper services)
-        {
-            if (services.TryAddScoped<WebItemSecurity>())
-            {
-
-                return services
-                    .AddPermissionContextService()
-                    .AddUserManagerService()
-                    .AddAuthContextService()
-                    .AddWebItemManager()
-                    .AddTenantManagerService()
-                    .AddCoreBaseSettingsService()
-                    .AddAuthorizationManagerService()
-                    .AddWebItemSecurityCache()
-                    .AddAuthManager()
-                    .AddSettingsManagerService();
-            }
-
-            return services;
-        }
-        public static DIHelper AddWebItemSecurityCache(this DIHelper services)
-        {
-            services.TryAddSingleton<WebItemSecurityCache>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs b/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
index b67c3157ac..fb7b004dd4 100644
--- a/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
+++ b/web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
@@ -127,8 +127,9 @@ namespace ASC.Web.Core.WhiteLabel
         {
             return GetDefault(serviceProvider.GetService<IConfiguration>());
         }
-    }
-
+    }
+
+    [Singletone]
     public class AdditionalWhiteLabelSettingsHelper
     {
         private IConfiguration Configuration { get; }
@@ -192,13 +193,4 @@ namespace ASC.Web.Core.WhiteLabel
             }
         }
     }
-
-    public static class AdditionalWhiteLabelSettingsExtension
-    {
-        public static DIHelper AddAdditionalWhiteLabelSettingsService(this DIHelper services)
-        {
-            services.TryAddSingleton<AdditionalWhiteLabelSettingsHelper>();
-            return services;
-        }
-    }
 }
diff --git a/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs b/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
index e62b7fa900..49310e0ef8 100644
--- a/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
+++ b/web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
@@ -65,7 +65,8 @@ namespace ASC.Web.Core.WhiteLabel
             get { return new Guid("{5116B892-CCDD-4406-98CD-4F18297C0C0A}"); }
         }
     }
-
+
+    [Scope]
     public class TenantInfoSettingsHelper
     {
         private WebImageSupplier WebImageSupplier { get; }
@@ -168,22 +169,4 @@ namespace ASC.Web.Core.WhiteLabel
             return storage.IsFile(fileName) ? storage.GetReadStream(fileName) : null;
         }
     }
-
-    public static class TenantInfoSettingsExtension
-    {
-        public static DIHelper AddTenantInfoSettingsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantInfoSettingsHelper>())
-            {
-
-                return services
-                    .AddWebImageSupplierService()
-                    .AddStorageFactoryService()
-                    .AddTenantManagerService()
-                    .AddSettingsManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/WhiteLabel/TenantLogoManager.cs b/web/ASC.Web.Core/WhiteLabel/TenantLogoManager.cs
index df1d6a6fd6..7fe491f2bc 100644
--- a/web/ASC.Web.Core/WhiteLabel/TenantLogoManager.cs
+++ b/web/ASC.Web.Core/WhiteLabel/TenantLogoManager.cs
@@ -37,7 +37,8 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 
 namespace ASC.Web.Core.WhiteLabel
-{
+{
+    [Scope]
     public class TenantLogoManager
     {
         private string CacheKey
@@ -205,21 +206,4 @@ namespace ASC.Web.Core.WhiteLabel
             CacheNotify.Publish(new TenantLogoCacheItem() { Key = CacheKey }, CacheNotifyAction.Remove);
         }
     }
-
-    public static class TenantLogoManagerExtension
-    {
-        public static DIHelper AddTenantLogoManagerService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantLogoManager>())
-            {
-
-                return services
-                    .AddTenantWhiteLabelSettingsService()
-                    .AddTenantInfoSettingsService()
-                    .AddTenantManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
index e2723fdb9a..324c506e48 100644
--- a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
+++ b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
@@ -195,7 +195,8 @@ namespace ASC.Web.Core.WhiteLabel
 
         #endregion
     }
-
+
+    [Scope]
     public class TenantWhiteLabelSettingsHelper
     {
         private const string moduleName = "whitelabel";
@@ -595,22 +596,4 @@ namespace ASC.Web.Core.WhiteLabel
 
         #endregion
     }
-
-    public static class TenantWhiteLabelSettingsExtension
-    {
-        public static DIHelper AddTenantWhiteLabelSettingsService(this DIHelper services)
-        {
-            if (services.TryAddScoped<TenantWhiteLabelSettingsHelper>())
-            {
-                return services
-                    .AddUserPhotoManagerService()
-                    .AddWebImageSupplierService()
-                    .AddStorageFactoryService()
-                    .AddWhiteLabelHelperService()
-                    .AddSettingsManagerService();
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Studio/Startup.cs b/web/ASC.Web.Studio/Startup.cs
index b59393f0a4..971a9d6ce5 100644
--- a/web/ASC.Web.Studio/Startup.cs
+++ b/web/ASC.Web.Studio/Startup.cs
@@ -1,11 +1,6 @@
 using ASC.Api.Core;
-using ASC.Common;
 using ASC.Common.DependencyInjection;
-using ASC.Core.Common.EF;
-using ASC.Core.Common.EF.Context;
 using ASC.Data.Storage;
-using ASC.Data.Storage.Configuration;
-using ASC.Data.Storage.DiscStorage;
 using ASC.FederatedLogin;
 
 using Microsoft.AspNetCore.Builder;
@@ -33,15 +28,8 @@ namespace ASC.Web.Studio
 
             base.ConfigureServices(services);
 
-            DIHelper
-                .AddStorage()
-                .AddPathUtilsService()
-                .AddStorageHandlerService()
-                .AddLoginHandlerService();
-
             services.AddMemoryCache();
 
-
             services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
         }
 

From f56f231c915d4557d1133471f849f6ec495ce134 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 19 Oct 2020 22:04:07 +0300
Subject: [PATCH 04/22] Refactoring: scope

---
 common/ASC.Api.Core/Auth/CookieAuthHandler.cs |  1 +
 common/ASC.Api.Core/Core/BaseStartup.cs       |  6 +++-
 common/ASC.Common/DIHelper.cs                 | 35 ++++++++++++++-----
 .../Context/Impl/CoreConfiguration.cs         |  3 +-
 .../Context/Impl/TenantManager.cs             |  3 +-
 .../Notify/IRecipientsProvider.cs             |  6 +++-
 .../Notify/RecipientProviderImpl.cs           | 11 ------
 .../Security/Authorizing/RoleProvider.cs      |  3 +-
 .../ASC.Core.Common/Security/IRoleProvider.cs |  4 ++-
 .../Server/Controllers/FilesController.cs     |  1 +
 products/ASC.Files/Server/Startup.cs          |  2 ++
 11 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/common/ASC.Api.Core/Auth/CookieAuthHandler.cs b/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
index 3bfd28109c..5a5c5333d5 100644
--- a/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
+++ b/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
@@ -3,6 +3,7 @@ using System.Security.Authentication;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Core;
 
 using Microsoft.AspNetCore.Authentication;
diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs
index 1cfb7f7e29..7af5438e91 100644
--- a/common/ASC.Api.Core/Core/BaseStartup.cs
+++ b/common/ASC.Api.Core/Core/BaseStartup.cs
@@ -4,6 +4,7 @@ using ASC.Api.Core.Auth;
 using ASC.Api.Core.Core;
 using ASC.Api.Core.Middleware;
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 
@@ -17,6 +18,7 @@ using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 
 namespace ASC.Api.Core
@@ -69,6 +71,8 @@ namespace ASC.Api.Core
             DIHelper.TryAdd<PaymentFilter>();
             DIHelper.TryAdd<ProductSecurityFilter>();
             DIHelper.TryAdd<TenantStatusFilter>();
+
+            services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
             var builder = services.AddMvcCore(config =>
             {
@@ -86,7 +90,7 @@ namespace ASC.Api.Core
                 config.OutputFormatters.Add(new XmlOutputFormatter());
             });
 
-            DIHelper.TryAdd<CookieAuthHandler>();
+
             var authBuilder = services.AddAuthentication("cookie")
                 .AddScheme<AuthenticationSchemeOptions, CookieAuthHandler>("cookie", a => { });
 
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index b99598e8be..7249f56701 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -151,14 +151,17 @@ namespace ASC.Common
 
                             foreach (var g in b)
                             {
-                                TryAdd(g);
+                                if (g != service)
+                                {
+                                    TryAdd(g);
+                                }
                             }
 
                             TryAdd(a, di.Type);
                         }
                         else
                         {
-                            Register(service, di.Type);
+                            isnew = Register(service, di.Type);
                         }
                     }
 
@@ -178,7 +181,7 @@ namespace ASC.Common
                         }
                         else
                         {
-                            Register(service, di.CachedType);
+                            isnew = Register(service, di.CachedType);
                         }
                     }
 
@@ -187,15 +190,31 @@ namespace ASC.Common
 
             if (isnew)
             {
-                var props = service.GetConstructors();
+                ConstructorInfo[] props = null;
 
-                foreach (var p in props)
+                if (!service.IsInterface)
                 {
-                    var par = p.GetParameters();
+                    props = service.GetConstructors();
+                }
+                else if (implementation != null)
+                {
+                    props = implementation.GetConstructors();
+                }
+                else if (di.Type != null)
+                {
+                    props = di.Type.GetConstructors();
+                }
 
-                    foreach (var p1 in par)
+                if (props != null)
+                {
+                    foreach (var p in props)
                     {
-                        TryAdd(p1.ParameterType);
+                        var par = p.GetParameters();
+
+                        foreach (var p1 in par)
+                        {
+                            TryAdd(p1.ParameterType);
+                        }
                     }
                 }
             }
diff --git a/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs b/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
index 73b0373e31..f4d36eea6a 100644
--- a/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
+++ b/common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
@@ -39,7 +39,8 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace ASC.Core
-{
+{
+    [Singletone]
     public class CoreBaseSettings
     {
         private bool? standalone;
diff --git a/common/ASC.Core.Common/Context/Impl/TenantManager.cs b/common/ASC.Core.Common/Context/Impl/TenantManager.cs
index 5a8bea8173..f8c3dd1213 100644
--- a/common/ASC.Core.Common/Context/Impl/TenantManager.cs
+++ b/common/ASC.Core.Common/Context/Impl/TenantManager.cs
@@ -41,7 +41,8 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core
-{
+{
+    [Scope]
     class ConfigureTenantManager : IConfigureNamedOptions<TenantManager>
     {
         private IOptionsSnapshot<CachedTenantService> TenantService { get; }
diff --git a/common/ASC.Core.Common/Notify/IRecipientsProvider.cs b/common/ASC.Core.Common/Notify/IRecipientsProvider.cs
index 42dfdd6deb..4f010799c4 100644
--- a/common/ASC.Core.Common/Notify/IRecipientsProvider.cs
+++ b/common/ASC.Core.Common/Notify/IRecipientsProvider.cs
@@ -23,8 +23,12 @@
  *
 */
 
+using ASC.Common;
+using ASC.Core.Notify;
+
 namespace ASC.Notify.Recipients
-{
+{
+    [Scope(typeof(RecipientProviderImpl))]
     public interface IRecipientProvider
     {
         IRecipient GetRecipient(string id);
diff --git a/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs b/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs
index a6c67042b0..11c26ff143 100644
--- a/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs
+++ b/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs
@@ -158,15 +158,4 @@ namespace ASC.Core.Notify
             return false;
         }
     }
-
-    public static class RecipientProviderImplExtension
-    {
-        public static DIHelper AddRecipientProviderImplService(this DIHelper services)
-        {
-            services.TryAddScoped(typeof(IRecipientProvider), typeof(RecipientProviderImpl));
-
-            return services
-                .AddUserManagerService();
-        }
-    }
 }
diff --git a/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs b/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs
index 67455fe923..57d5393ce9 100644
--- a/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs
@@ -37,7 +37,8 @@ using ASC.Core.Users;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Core.Security.Authorizing
-{
+{
+    [Scope]
     class RoleProvider : IRoleProvider
     {
         //circ dep
diff --git a/common/ASC.Core.Common/Security/IRoleProvider.cs b/common/ASC.Core.Common/Security/IRoleProvider.cs
index a1f056b72c..a11bda29c9 100644
--- a/common/ASC.Core.Common/Security/IRoleProvider.cs
+++ b/common/ASC.Core.Common/Security/IRoleProvider.cs
@@ -27,9 +27,11 @@
 using System.Collections.Generic;
 
 using ASC.Common.Security.Authorizing;
+using ASC.Core.Security.Authorizing;
 
 namespace ASC.Common.Security
-{
+{
+    [Scope(typeof(RoleProvider))]
     public interface IRoleProvider
     {
         List<IRole> GetRoles(ISubject account);
diff --git a/products/ASC.Files/Server/Controllers/FilesController.cs b/products/ASC.Files/Server/Controllers/FilesController.cs
index a53e3ceaa6..125c31339b 100644
--- a/products/ASC.Files/Server/Controllers/FilesController.cs
+++ b/products/ASC.Files/Server/Controllers/FilesController.cs
@@ -70,6 +70,7 @@ namespace ASC.Api.Documents
     /// <summary>
     /// Provides access to documents
     /// </summary>
+    [Scope]
     [DefaultRoute]
     [ApiController]
     public class FilesController : ControllerBase
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
index 430183c072..203f11be16 100644
--- a/products/ASC.Files/Server/Startup.cs
+++ b/products/ASC.Files/Server/Startup.cs
@@ -32,6 +32,8 @@ namespace ASC.Files
             services.AddMemoryCache();
 
             base.ConfigureServices(services);
+
+            DIHelper.TryAdd<FilesController>();
         }
 
         public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)

From bff9629389eccb97d5371cfb8b317eb25d63600c Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Tue, 20 Oct 2020 16:24:46 +0300
Subject: [PATCH 05/22] Scope: refactoring

---
 common/ASC.Api.Core/Auth/CookieAuthHandler.cs |   1 -
 .../Middleware/IpSecurityFilter.cs            |   2 +
 common/ASC.Common/DIHelper.cs                 | 117 ++++++++++--------
 .../Threading/Workers/WorkerQueue.cs          |   3 +-
 .../Caching/CachedTenantService.cs            |   1 -
 .../EF/Context/ConfigureDbContext.cs          |   6 +-
 .../EF/Context/DbContextManager.cs            |   2 +-
 .../Notify/RecipientProviderImpl.cs           |   3 +-
 .../Security/Authorizing/RoleProvider.cs      |   9 --
 .../Configuration/Appender.cs                 |   4 +-
 .../DbSender/DbMessageSender.cs               |   1 -
 .../MigrationServiceLauncher.cs               |   2 -
 .../ASC.Data.Storage.Migration/Program.cs     |   1 -
 .../ASC.Notify/Config/NotifyServiceCfg.cs     |   2 +
 common/services/ASC.Notify/Program.cs         |   8 +-
 .../ASC.Studio.Notify/ServiceLauncher.cs      |   1 -
 .../UrlShortenerServiceLauncher.cs            |   2 -
 .../Core/Configuration/ProductEntryPoint.cs   |   9 --
 .../Core/Core/Dao/TeamlabDao/DaoFactory.cs    |   5 +-
 .../Core/Core/Dao/TeamlabDao/FileDao.cs       |   6 +-
 .../Core/Core/Dao/TeamlabDao/FolderDao.cs     |   5 +-
 .../Core/Core/Search/FactoryIndexerFile.cs    |  15 +--
 .../Core/Core/Search/FactoryIndexerFolder.cs  |  13 +-
 products/ASC.Files/Service/Program.cs         |   3 -
 web/ASC.Web.Core/Users/UserPhotoManager.cs    |   1 +
 25 files changed, 94 insertions(+), 128 deletions(-)

diff --git a/common/ASC.Api.Core/Auth/CookieAuthHandler.cs b/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
index 5a5c5333d5..3bfd28109c 100644
--- a/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
+++ b/common/ASC.Api.Core/Auth/CookieAuthHandler.cs
@@ -3,7 +3,6 @@ using System.Security.Authentication;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Core;
 
 using Microsoft.AspNetCore.Authentication;
diff --git a/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs b/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
index 8b7aba26f9..0b8741c2e5 100644
--- a/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
+++ b/common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
@@ -1,5 +1,6 @@
 using System.Net;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.IPSecurity;
@@ -10,6 +11,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
 {
+    [Scope]
     public class IpSecurityFilter : IResourceFilter
     {
         private readonly ILog log;
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 7249f56701..80c3de5792 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -12,18 +12,22 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Common
 {
+    public interface IAdditionalDI
+    {
+        void Register(DIHelper services);
+    }
+
     public class TransientAttribute : DIAttribute
     {
         public TransientAttribute()
         {
-
         }
 
-        public TransientAttribute(Type type) : base(type)
+        public TransientAttribute(Type service) : base(service)
         {
         }
 
-        public TransientAttribute(Type type, Type cachedType) : base(type, cachedType)
+        public TransientAttribute(Type service, Type implementation) : base(service, implementation)
         {
 
         }
@@ -33,16 +37,14 @@ namespace ASC.Common
     {
         public ScopeAttribute()
         {
-
         }
 
-        public ScopeAttribute(Type type) : base(type)
+        public ScopeAttribute(Type service) : base(service)
         {
         }
 
-        public ScopeAttribute(Type type, Type cachedType) : base(type, cachedType)
+        public ScopeAttribute(Type service, Type implementation) : base(service, implementation)
         {
-
         }
     }
 
@@ -50,38 +52,37 @@ namespace ASC.Common
     {
         public SingletoneAttribute()
         {
-
         }
 
-        public SingletoneAttribute(Type type) : base(type)
+        public SingletoneAttribute(Type service) : base(service)
         {
         }
 
-        public SingletoneAttribute(Type type, Type cachedType) : base(type, cachedType)
+        public SingletoneAttribute(Type service, Type implementation) : base(service, implementation)
         {
-
         }
     }
 
     public class DIAttribute : Attribute
     {
-        public Type CachedType { get; }
-        public Type Type { get; }
+        public Type Implementation { get; }
+        public Type Service { get; }
+        public Type Additional { get; set; }
 
         public DIAttribute()
         {
 
         }
 
-        public DIAttribute(Type type)
+        public DIAttribute(Type service)
         {
-            Type = type;
+            Service = service;
         }
 
-        public DIAttribute(Type type, Type cachedType)
+        public DIAttribute(Type service, Type implementation)
         {
-            CachedType = cachedType;
-            Type = type;
+            Implementation = implementation;
+            Service = service;
         }
     }
 
@@ -138,53 +139,78 @@ namespace ASC.Common
                 if (!service.IsInterface || implementation != null)
                 {
                     isnew = implementation != null ? Register(service, implementation) : Register(service);
+                    if (!isnew) return false;
                 }
 
                 if (service.IsInterface && implementation == null || !service.IsInterface)
                 {
-                    if (di.Type != null)
+                    if (di.Service != null)
                     {
-                        var a = di.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                        var a = di.Service.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
                         if (a != null)
                         {
-                            var b = a.GetGenericArguments();
-
-                            foreach (var g in b)
+                            if (!a.ContainsGenericParameters)
                             {
-                                if (g != service)
+                                var b = a.GetGenericArguments();
+
+                                foreach (var g in b)
                                 {
-                                    TryAdd(g);
+                                    if (g != service)
+                                    {
+                                        TryAdd(g);
+                                        if (service.IsInterface)
+                                        {
+                                            TryAdd(service, g);
+                                        }
+                                    }
                                 }
-                            }
 
-                            TryAdd(a, di.Type);
+                                TryAdd(a, di.Service);
+                            }
+                            else
+                            {
+                                TryAdd(a.GetGenericTypeDefinition().MakeGenericType(service.GetGenericArguments()), di.Service.MakeGenericType(service.GetGenericArguments()));
+                                //a, di.Service
+                            }
                         }
                         else
                         {
-                            isnew = Register(service, di.Type);
+                            isnew = Register(service, di.Service);
                         }
                     }
 
-                    if (di.CachedType != null)
+                    if (di.Implementation != null)
                     {
-                        var a = di.CachedType.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                        var a = di.Implementation.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
                         if (a != null)
                         {
-                            var b = a.GetGenericArguments();
-
-                            foreach (var g in b)
+                            if (!a.ContainsGenericParameters)
                             {
-                                TryAdd(service, g);
-                            }
+                                var b = a.GetGenericArguments();
 
-                            TryAdd(a, di.CachedType);
+                                foreach (var g in b)
+                                {
+                                    TryAdd(service, g);
+                                }
+
+                                TryAdd(a, di.Implementation);
+                            }
+                            else
+                            {
+                                var qazw = 0;
+                            }
                         }
                         else
                         {
-                            isnew = Register(service, di.CachedType);
+                            isnew = Register(service, di.Implementation);
                         }
                     }
+                }
 
+                if (di.Additional != null)
+                {
+                    var m = di.Additional.GetMethod("Register", BindingFlags.Public | BindingFlags.Static);
+                    m.Invoke(null, new[] { this });
                 }
             }
 
@@ -200,9 +226,9 @@ namespace ASC.Common
                 {
                     props = implementation.GetConstructors();
                 }
-                else if (di.Type != null)
+                else if (di.Service != null)
                 {
-                    props = di.Type.GetConstructors();
+                    props = di.Service.GetConstructors();
                 }
 
                 if (props != null)
@@ -305,19 +331,6 @@ namespace ASC.Common
             return false;
         }
 
-        public bool TryAddScoped<TService, TImplementation>(TService tservice, TImplementation tImplementation) where TService : Type where TImplementation : Type
-        {
-            var serviceName = $"{tservice}{tImplementation}";
-            if (!Scoped.Contains(serviceName))
-            {
-                Scoped.Add(serviceName);
-                ServiceCollection.TryAddScoped(tservice, tImplementation);
-                return true;
-            }
-
-            return false;
-        }
-
 
         public DIHelper TryAddSingleton<TService>() where TService : class
         {
diff --git a/common/ASC.Common/Threading/Workers/WorkerQueue.cs b/common/ASC.Common/Threading/Workers/WorkerQueue.cs
index c4ef01d815..44d2241470 100644
--- a/common/ASC.Common/Threading/Workers/WorkerQueue.cs
+++ b/common/ASC.Common/Threading/Workers/WorkerQueue.cs
@@ -34,7 +34,8 @@ using ASC.Common.Logging;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Common.Threading.Workers
-{
+{
+    [Singletone(typeof(ConfigureWorkerQueue<>))]
     public class WorkerQueueOptionsManager<T> : OptionsManager<WorkerQueue<T>>
     {
         public WorkerQueueOptionsManager(IOptionsFactory<WorkerQueue<T>> factory) : base(factory)
diff --git a/common/ASC.Core.Common/Caching/CachedTenantService.cs b/common/ASC.Core.Common/Caching/CachedTenantService.cs
index 5ce4090763..4187610113 100644
--- a/common/ASC.Core.Common/Caching/CachedTenantService.cs
+++ b/common/ASC.Core.Common/Caching/CachedTenantService.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
 
 using ASC.Common;
 using ASC.Common.Caching;
-using ASC.Common.Utils;
 using ASC.Core.Data;
 using ASC.Core.Tenants;
 
diff --git a/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs b/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
index ad9782edc2..2973a775b8 100644
--- a/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
+++ b/common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Options;
 namespace ASC.Core.Common.EF
 {
     [Scope]
-    public class ConfigureDbContext : IConfigureNamedOptions<BaseDbContext>
+    public class ConfigureDbContext<T> : IConfigureNamedOptions<T> where T : BaseDbContext, new()
     {
         public const string baseName = "default";
         private EFLoggerFactory LoggerFactory { get; }
@@ -23,13 +23,13 @@ namespace ASC.Core.Common.EF
             Configuration = configuration;
         }
 
-        public void Configure(string name, BaseDbContext context)
+        public void Configure(string name, T context)
         {
             context.LoggerFactory = LoggerFactory;
             context.ConnectionStringSettings = Configuration.GetConnectionStrings(name) ?? Configuration.GetConnectionStrings(baseName);
         }
 
-        public void Configure(BaseDbContext context)
+        public void Configure(T context)
         {
             Configure(baseName, context);
         }
diff --git a/common/ASC.Core.Common/EF/Context/DbContextManager.cs b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
index de70cc4c70..140241fae4 100644
--- a/common/ASC.Core.Common/EF/Context/DbContextManager.cs
+++ b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
@@ -65,7 +65,7 @@ namespace ASC.Core.Common.EF
         }
     }
 
-    [Scope(typeof(ConfigureDbContext))]
+    [Scope(typeof(ConfigureDbContext<>))]
     public class DbContextManager<T> : BaseDbContextManager<T> where T : BaseDbContext, new()
     {
         public DbContextManager(IOptionsFactory<T> factory, IConfiguration configuration) : base(factory, configuration)
diff --git a/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs b/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs
index 11c26ff143..4d2f6d4bf6 100644
--- a/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs
+++ b/common/ASC.Core.Common/Notify/RecipientProviderImpl.cs
@@ -26,9 +26,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 
-using ASC.Common;
 using ASC.Core.Users;
 using ASC.Notify.Recipients;
 
diff --git a/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs b/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs
index 57d5393ce9..b89b13757f 100644
--- a/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs
+++ b/common/ASC.Core.Common/Security/Authorizing/RoleProvider.cs
@@ -86,13 +86,4 @@ namespace ASC.Core.Security.Authorizing
             return roles;
         }
     }
-
-    public static class RoleProviderConfigExtention
-    {
-        public static DIHelper AddRoleProviderService(this DIHelper services)
-        {
-            services.TryAddScoped(typeof(IRoleProvider), typeof(RoleProvider));
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Data.Storage/Configuration/Appender.cs b/common/ASC.Data.Storage/Configuration/Appender.cs
index 1765c33ea0..741935c2e7 100644
--- a/common/ASC.Data.Storage/Configuration/Appender.cs
+++ b/common/ASC.Data.Storage/Configuration/Appender.cs
@@ -12,13 +12,13 @@ namespace ASC.Data.Storage.Configuration
 {
     public static class StorageConfigExtension
     {
-        public static DIHelper AddStorage(this DIHelper services)
+        public static void Register(DIHelper services)
         {
             services.TryAddSingleton(r => r.GetService<IConfiguration>().GetSetting<Storage>("Storage"));
-            return services;
         }
     }
 
+    [Singletone(Additional = typeof(StorageConfigExtension))]
     public class Storage
     {
         public IEnumerable<Appender> Appender { get; set; }
diff --git a/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs b/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs
index 41b48782fd..c048a86246 100644
--- a/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs
+++ b/common/ASC.MessagingSystem/DbSender/DbMessageSender.cs
@@ -28,7 +28,6 @@ using System;
 
 using ASC.Common;
 using ASC.Common.Logging;
-using ASC.Core.Common.EF.Context;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
diff --git a/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs b/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
index af80a70e9e..87a4aec21e 100644
--- a/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
+++ b/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
@@ -27,8 +27,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using ASC.Common;
-
 using Microsoft.Extensions.Hosting;
 
 namespace ASC.Data.Storage.Migration
diff --git a/common/services/ASC.Data.Storage.Migration/Program.cs b/common/services/ASC.Data.Storage.Migration/Program.cs
index 61396e6ee4..2dca3bbd54 100644
--- a/common/services/ASC.Data.Storage.Migration/Program.cs
+++ b/common/services/ASC.Data.Storage.Migration/Program.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using ASC.Common;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
-using ASC.Core.Common;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/common/services/ASC.Notify/Config/NotifyServiceCfg.cs b/common/services/ASC.Notify/Config/NotifyServiceCfg.cs
index 2436f16b5b..23263a6d68 100644
--- a/common/services/ASC.Notify/Config/NotifyServiceCfg.cs
+++ b/common/services/ASC.Notify/Config/NotifyServiceCfg.cs
@@ -27,6 +27,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 
+using ASC.Common;
 using ASC.Core.Notify.Senders;
 
 using Microsoft.Extensions.Options;
@@ -48,6 +49,7 @@ namespace ASC.Notify.Config
         }
     }
 
+    [Singletone(typeof(ConfigureNotifyServiceCfg))]
     public class NotifyServiceCfg
     {
         public string ConnectionStringName { get; set; }
diff --git a/common/services/ASC.Notify/Program.cs b/common/services/ASC.Notify/Program.cs
index a19356e4cc..f4bc740b9c 100644
--- a/common/services/ASC.Notify/Program.cs
+++ b/common/services/ASC.Notify/Program.cs
@@ -6,13 +6,11 @@ using ASC.Common;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 using ASC.Core.Common;
-using ASC.Core.Notify.Senders;
 using ASC.Notify.Config;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 
 namespace ASC.Notify
 {
@@ -54,12 +52,10 @@ namespace ASC.Notify
                     diHelper.AddNLogManager("ASC.Notify", "ASC.Notify.Messages");
 
                     services.Configure<NotifyServiceCfg>(hostContext.Configuration.GetSection("notify"));
-                    diHelper.AddSingleton<IConfigureOptions<NotifyServiceCfg>, ConfigureNotifyServiceCfg>();
-
-                    diHelper.TryAddSingleton<CommonLinkUtilitySettings>();
-                    diHelper.AddSingleton<IConfigureOptions<CommonLinkUtilitySettings>, ConfigureCommonLinkUtilitySettings>();
 
+                    diHelper.TryAdd(typeof(CommonLinkUtilitySettings), typeof(ConfigureCommonLinkUtilitySettings));
                     diHelper.TryAdd<NotifyServiceLauncher>();
+
                     services.AddHostedService<NotifyServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
diff --git a/common/services/ASC.Studio.Notify/ServiceLauncher.cs b/common/services/ASC.Studio.Notify/ServiceLauncher.cs
index b7f07e52f6..582c2e491f 100644
--- a/common/services/ASC.Studio.Notify/ServiceLauncher.cs
+++ b/common/services/ASC.Studio.Notify/ServiceLauncher.cs
@@ -28,7 +28,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-using ASC.Common;
 using ASC.Web.Core;
 using ASC.Web.Studio.Core.Notify;
 
diff --git a/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs b/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
index 8db56310b1..6343b01918 100644
--- a/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
+++ b/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
@@ -27,8 +27,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using ASC.Common;
-
 using Microsoft.Extensions.Hosting;
 
 
diff --git a/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs b/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
index 16f3bd49f3..61d9e7bb10 100644
--- a/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
+++ b/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
@@ -176,13 +176,4 @@ namespace ASC.Web.Files.Configuration
             get => "";
         }
     }
-    public static class ProductEntryPointExtention
-    {
-        public static DIHelper AddProductEntryPointService(this DIHelper services)
-        {
-            services.TryAddScoped<IWebItem, ProductEntryPoint>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
index 3ac08b894e..8681758748 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
@@ -28,13 +28,12 @@ using System;
 
 using ASC.Common;
 using ASC.Files.Core.Security;
-using ASC.Files.Thirdparty;
-using ASC.Files.Thirdparty.ProviderDao;
 
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Data
-{
+{
+    [Scope]
     public class DaoFactory : IDaoFactory
     {
         private IServiceProvider ServiceProvider { get; }
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
index 870486569d..44e7103721 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
@@ -44,6 +44,7 @@ using ASC.Files.Core.Thirdparty;
 using ASC.Files.Thirdparty.ProviderDao;
 using ASC.Web.Core.Files;
 using ASC.Web.Files.Classes;
+using ASC.Web.Files.Core.Search;
 using ASC.Web.Files.Services.DocumentService;
 using ASC.Web.Files.Utils;
 using ASC.Web.Studio.Core;
@@ -55,12 +56,13 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Data
 {
+    [Scope]
     internal class FileDao : AbstractDao, IFileDao<int>
     {
         public const long MaxContentLength = 2 * 1024 * 1024 * 1024L;
 
         private static readonly object syncRoot = new object();
-        private FactoryIndexer<DbFile> FactoryIndexer { get; }
+        private FactoryIndexerFile FactoryIndexer { get; }
         private GlobalStore GlobalStore { get; }
         private GlobalSpace GlobalSpace { get; }
         private GlobalFolder GlobalFolder { get; }
@@ -70,7 +72,7 @@ namespace ASC.Files.Core.Data
         private CrossDao CrossDao { get; }
 
         public FileDao(
-            FactoryIndexer<DbFile> factoryIndexer,
+            FactoryIndexerFile factoryIndexer,
             UserManager userManager,
             DbContextManager<FilesDbContext> dbContextManager,
             TenantManager tenantManager,
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
index 928ef367af..3954095189 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
@@ -42,6 +42,7 @@ using ASC.Files.Core.Security;
 using ASC.Files.Core.Thirdparty;
 using ASC.Files.Thirdparty.ProviderDao;
 using ASC.Web.Files.Classes;
+using ASC.Web.Files.Core.Search;
 using ASC.Web.Studio.Core;
 using ASC.Web.Studio.UserControls.Statistics;
 using ASC.Web.Studio.Utility;
@@ -64,14 +65,14 @@ namespace ASC.Files.Core.Data
         private const string trash = "trash";
         private const string projects = "projects";
 
-        private FactoryIndexer<DbFolder> FactoryIndexer { get; }
+        private FactoryIndexerFolder FactoryIndexer { get; }
         private GlobalSpace GlobalSpace { get; }
         private IDaoFactory DaoFactory { get; }
         private ProviderFolderDao ProviderFolderDao { get; }
         private CrossDao CrossDao { get; }
 
         public FolderDao(
-            FactoryIndexer<DbFolder> factoryIndexer,
+            FactoryIndexerFolder factoryIndexer,
             UserManager userManager,
             DbContextManager<FilesDbContext> dbContextManager,
             TenantManager tenantManager,
diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
index 5128c92d7a..77469f0938 100644
--- a/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
+++ b/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
@@ -40,7 +40,8 @@ using ASC.Files.Core.Resources;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Core.Search
-{
+{
+    [Scope]
     public class FactoryIndexerFile : FactoryIndexer<DbFile>
     {
         private IDaoFactory DaoFactory { get; }
@@ -113,16 +114,4 @@ namespace ASC.Web.Files.Core.Search
             get { return FilesCommonResource.IndexTitle; }
         }
     }
-    public static class FactoryIndexerFileExtention
-    {
-        public static DIHelper AddFactoryIndexerFileService(this DIHelper services)
-        {
-            if (services.TryAddScoped<FactoryIndexer<DbFile>, FactoryIndexerFile>())
-            {
-                return services;
-            }
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
index ca2086a605..12b4d6a6c9 100644
--- a/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
+++ b/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
@@ -40,7 +40,8 @@ using ASC.Files.Core.EF;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Core.Search
-{
+{
+    [Scope]
     public class FactoryIndexerFolder : FactoryIndexer<DbFolder>
     {
         private IDaoFactory DaoFactory { get; }
@@ -100,14 +101,4 @@ namespace ASC.Web.Files.Core.Search
             }
         }
     }
-
-    public static class FactoryIndexerFolderExtention
-    {
-        public static DIHelper AddFactoryIndexerFolderService(this DIHelper services)
-        {
-            services.TryAddScoped<FactoryIndexer<DbFolder>, FactoryIndexerFolder>();
-
-            return services;
-        }
-    }
 }
diff --git a/products/ASC.Files/Service/Program.cs b/products/ASC.Files/Service/Program.cs
index 848907d144..6f5e37193f 100644
--- a/products/ASC.Files/Service/Program.cs
+++ b/products/ASC.Files/Service/Program.cs
@@ -3,13 +3,10 @@ using System.IO;
 using System.Threading.Tasks;
 
 using ASC.Common;
-using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 using ASC.ElasticSearch;
 using ASC.Feed.Aggregator;
-using ASC.Web.Files.Core.Search;
-using ASC.Web.Files.Utils;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/web/ASC.Web.Core/Users/UserPhotoManager.cs b/web/ASC.Web.Core/Users/UserPhotoManager.cs
index 04fe9a1019..2e3fb069db 100644
--- a/web/ASC.Web.Core/Users/UserPhotoManager.cs
+++ b/web/ASC.Web.Core/Users/UserPhotoManager.cs
@@ -1008,6 +1008,7 @@ namespace ASC.Web.Core.Users
     {
         public static DIHelper AddResizeWorkerItemService(this DIHelper services)
         {
+            //WorkerQueueOptionsManager<ResizeWorkerItem> optionsQueue,
             services.TryAddSingleton<WorkerQueueOptionsManager<ResizeWorkerItem>>();
             services.TryAddSingleton<WorkerQueue<ResizeWorkerItem>>();
             services.AddSingleton<IConfigureOptions<WorkerQueue<ResizeWorkerItem>>, ConfigureWorkerQueue<ResizeWorkerItem>>();

From 1d2f65ba12e26ab1064517dfd9f77c2975e138a1 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Tue, 20 Oct 2020 23:10:17 +0300
Subject: [PATCH 06/22] Refactoring: scope

---
 common/ASC.Common/DIHelper.cs                 | 53 ++++++++++++-------
 .../Threading/Workers/WorkerQueue.cs          |  3 +-
 common/ASC.Core.Common/HostedSolution.cs      | 16 +-----
 .../Users/DisplayUserSettings.cs              |  2 +-
 .../Encryption/EncryptionFactory.cs           | 11 +++-
 .../Core/Core/Dao/Interfaces/IDaoFactory.cs   |  2 +-
 .../Core/Core/Dao/Interfaces/IFileDao.cs      |  8 +--
 .../Core/Core/Dao/Interfaces/IFolderDao.cs    |  8 +--
 .../Core/Core/Dao/Interfaces/IProviderDao.cs  |  2 +-
 .../Core/Core/Dao/Interfaces/ITagDao.cs       |  9 ++--
 .../Core/Core/Dao/TeamlabDao/DaoFactory.cs    | 30 ++++++++++-
 .../Core/Core/Dao/TeamlabDao/FileDao.cs       | 10 ----
 .../Core/Core/Dao/TeamlabDao/FolderDao.cs     | 10 +---
 .../Core/Core/Dao/TeamlabDao/SecurityDao.cs   | 10 ----
 .../Core/Core/Dao/TeamlabDao/TagDao.cs        |  9 ----
 .../Core/Core/Security/ISecurityDao.cs        |  5 +-
 .../Core/Thirdparty/ProviderAccountDao.cs     | 17 +++++-
 .../Thirdparty/ProviderDao/ProviderFileDao.cs | 13 +----
 .../ProviderDao/ProviderFolderDao.cs          | 10 ----
 .../ProviderDao/ProviderSecutiryDao.cs        | 16 +-----
 .../Thirdparty/ProviderDao/ProviderTagDao.cs  | 16 +-----
 21 files changed, 122 insertions(+), 138 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 80c3de5792..9f09edb52f 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -12,11 +12,6 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Common
 {
-    public interface IAdditionalDI
-    {
-        void Register(DIHelper services);
-    }
-
     public class TransientAttribute : DIAttribute
     {
         public TransientAttribute()
@@ -88,6 +83,7 @@ namespace ASC.Common
 
     public class DIHelper
     {
+        public List<string> Added { get; set; }
         public List<string> Singleton { get; set; }
         public List<string> Scoped { get; set; }
         public List<string> Transient { get; set; }
@@ -96,6 +92,7 @@ namespace ASC.Common
 
         public DIHelper()
         {
+            Added = new List<string>();
             Singleton = new List<string>();
             Scoped = new List<string>();
             Transient = new List<string>();
@@ -129,13 +126,28 @@ namespace ASC.Common
             return TryAdd(typeof(TService));
         }
 
+        public bool TryAdd<TService, TImplementation>() where TService : class
+        {
+            return TryAdd(typeof(TService), typeof(TImplementation));
+        }
+
         public bool TryAdd(Type service, Type implementation = null)
         {
+            var serviceName = $"{service}{implementation}";
+            if (Added.Contains(serviceName)) return false;
+            Added.Add(serviceName);
+
             var di = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var isnew = false;
 
             if (di != null)
             {
+                if (di.Additional != null)
+                {
+                    var m = di.Additional.GetMethod("Register", BindingFlags.Public | BindingFlags.Static);
+                    m.Invoke(null, new[] { this });
+                }
+
                 if (!service.IsInterface || implementation != null)
                 {
                     isnew = implementation != null ? Register(service, implementation) : Register(service);
@@ -169,7 +181,20 @@ namespace ASC.Common
                             }
                             else
                             {
-                                TryAdd(a.GetGenericTypeDefinition().MakeGenericType(service.GetGenericArguments()), di.Service.MakeGenericType(service.GetGenericArguments()));
+                                Type c = null;
+                                var a1 = a.GetGenericTypeDefinition();
+                                var b = a.GetGenericArguments().FirstOrDefault();
+
+                                if (b != null && b.IsGenericType)
+                                {
+                                    c = a1.MakeGenericType(b.GetGenericTypeDefinition().MakeGenericType(service.GetGenericArguments()));
+                                }
+                                else
+                                {
+                                    c = a1.MakeGenericType(service.GetGenericArguments());
+                                }
+
+                                TryAdd(c, di.Service.MakeGenericType(service.GetGenericArguments()));
                                 //a, di.Service
                             }
                         }
@@ -206,12 +231,6 @@ namespace ASC.Common
                         }
                     }
                 }
-
-                if (di.Additional != null)
-                {
-                    var m = di.Additional.GetMethod("Register", BindingFlags.Public | BindingFlags.Static);
-                    m.Invoke(null, new[] { this });
-                }
             }
 
             if (isnew)
@@ -233,14 +252,10 @@ namespace ASC.Common
 
                 if (props != null)
                 {
-                    foreach (var p in props)
+                    var par = props.SelectMany(r => r.GetParameters()).Distinct();
+                    foreach (var p1 in par)
                     {
-                        var par = p.GetParameters();
-
-                        foreach (var p1 in par)
-                        {
-                            TryAdd(p1.ParameterType);
-                        }
+                        TryAdd(p1.ParameterType);
                     }
                 }
             }
diff --git a/common/ASC.Common/Threading/Workers/WorkerQueue.cs b/common/ASC.Common/Threading/Workers/WorkerQueue.cs
index 44d2241470..c7dfc71750 100644
--- a/common/ASC.Common/Threading/Workers/WorkerQueue.cs
+++ b/common/ASC.Common/Threading/Workers/WorkerQueue.cs
@@ -42,7 +42,8 @@ namespace ASC.Common.Threading.Workers
         {
         }
     }
-
+
+    [Singletone]
     public class ConfigureWorkerQueue<T> : IConfigureOptions<WorkerQueue<T>>
     {
         public ConfigureWorkerQueue(IOptionsMonitor<ILog> log)
diff --git a/common/ASC.Core.Common/HostedSolution.cs b/common/ASC.Core.Common/HostedSolution.cs
index 2d0c210d8d..57c662712a 100644
--- a/common/ASC.Core.Common/HostedSolution.cs
+++ b/common/ASC.Core.Common/HostedSolution.cs
@@ -103,7 +103,8 @@ namespace ASC.Core
             hostedSolution.CoreSettings = CoreSettings.Get(name);
         }
     }
-
+
+    [Scope(typeof(ConfigureHostedSolution))]
     public class HostedSolution
     {
         internal ITenantService TenantService { get; set; }
@@ -283,18 +284,5 @@ namespace ASC.Core
             }
             return tenant;
         }
-    }
-
-    public static class HostedSolutionExtension
-    {
-        public static DIHelper AddHostedSolutionService(this DIHelper services)
-        {
-            if (services.TryAddScoped<IConfigureOptions<HostedSolution>, ConfigureHostedSolution>())
-            {
-                return services;
-            }
-
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Users/DisplayUserSettings.cs b/common/ASC.Core.Common/Users/DisplayUserSettings.cs
index 987116fe18..3824883d51 100644
--- a/common/ASC.Core.Common/Users/DisplayUserSettings.cs
+++ b/common/ASC.Core.Common/Users/DisplayUserSettings.cs
@@ -90,7 +90,7 @@ namespace ASC.Web.Core.Users
             {
                 try
                 {
-                    var resourceType = Type.GetType("Resources.Resource, ASC.Web.Studio");
+                    var resourceType = Type.GetType("ASC.Web.Core.PublicResources.Resources.Resource, ASC.Web.Core");
                     var resourceProperty = resourceType.GetProperty("ProfileRemoved", BindingFlags.Static | BindingFlags.Public);
                     var resourceValue = (string)resourceProperty.GetValue(null);
 
diff --git a/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs b/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
index 5fa4ced3b0..3e382460ac 100644
--- a/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
+++ b/common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
@@ -32,7 +32,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Data.Storage.Encryption
 {
-    [Singletone]
+    [Singletone(Additional = typeof(EncryptionFactoryExtension))]
     public class EncryptionFactory
     {
         private IServiceProvider ServiceProvider { get; }
@@ -53,5 +53,14 @@ namespace ASC.Data.Storage.Encryption
         {
             return ServiceProvider.GetService<Metadata>();
         }
+    }
+
+    public class EncryptionFactoryExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<Crypt>();
+            services.TryAdd<Metadata>();
+        }
     }
 }
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs
index 23f74532f4..de630293e2 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IDaoFactory.cs
@@ -30,7 +30,7 @@ using ASC.Files.Core.Security;
 
 namespace ASC.Files.Core
 {
-    [Scope(typeof(DaoFactory))]
+    [Scope(typeof(DaoFactory), Additional = typeof(DaoFactoryExtension))]
     public interface IDaoFactory
     {
         IFolderDao<T> GetFolderDao<T>();
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
index bf66e5a99a..4052d296b9 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
@@ -26,13 +26,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-
+using System.IO;
+
+using ASC.Common;
 using ASC.Files.Core.Security;
 using ASC.Web.Files.Services.DocumentService;
 
 namespace ASC.Files.Core
-{
+{
+    [Scope]
     public interface IFileDao<T>
     {
         /// <summary>
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
index 91433800a3..3c2f491199 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
@@ -26,12 +26,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
-
+using System.Threading;
+
+using ASC.Common;
 using ASC.Files.Core.Security;
 
 namespace ASC.Files.Core
-{
+{
+    [Scope]
     public interface IFolderDao<T>
     {
         /// <summary>
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
index 2a2786bb6f..008687347c 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
@@ -32,7 +32,7 @@ using ASC.Files.Thirdparty;
 
 namespace ASC.Files.Core
 {
-    [Scope(typeof(ProviderAccountDao))]
+    [Scope(typeof(ProviderAccountDao), Additional = typeof(ProviderAccountDaoExtension))]
     public interface IProviderDao
     {
         IProviderInfo GetProviderInfo(int linkId);
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
index 8028aac522..fb9dd11006 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
@@ -25,10 +25,13 @@
 
 
 using System;
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
+using ASC.Common;
+
 namespace ASC.Files.Core
-{
+{
+    [Scope]
     public interface ITagDao<T>
     {
         IEnumerable<Tag> GetTags(Guid subject, TagType tagType, IEnumerable<FileEntry<T>> fileEntries);
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
index 8681758748..402b8afa44 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
@@ -28,7 +28,8 @@ using System;
 
 using ASC.Common;
 using ASC.Files.Core.Security;
-
+using ASC.Files.Thirdparty.ProviderDao;
+
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Data
@@ -53,7 +54,8 @@ namespace ASC.Files.Core.Data
         public IFolderDao<T> GetFolderDao<T>()
         {
             return ServiceProvider.GetService<IFolderDao<T>>();
-        }
+        }
+
         public ITagDao<T> GetTagDao<T>()
         {
             return ServiceProvider.GetService<ITagDao<T>>();
@@ -63,5 +65,29 @@ namespace ASC.Files.Core.Data
         {
             return ServiceProvider.GetService<ISecurityDao<T>>();
         }
+    }
+
+    public class DaoFactoryExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<File<int>>();
+            services.TryAdd<IFileDao<int>, FileDao>();
+
+            services.TryAdd<File<string>>();
+            services.TryAdd<IFileDao<string>, ProviderFileDao>();
+
+            services.TryAdd<Folder<int>>();
+            services.TryAdd<IFolderDao<int>, FolderDao>();
+
+            services.TryAdd<Folder<string>>();
+            services.TryAdd<IFolderDao<string>, ProviderFolderDao>();
+
+            services.TryAdd<ISecurityDao<int>, SecurityDao<int>>();
+            services.TryAdd<ISecurityDao<string>, ProviderSecurityDao>();
+
+            services.TryAdd<ITagDao<int>, TagDao<int>>();
+            services.TryAdd<ITagDao<string>, ProviderTagDao>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
index 44e7103721..83513647d0 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
@@ -1436,15 +1436,5 @@ namespace ASC.Files.Core.Data
     {
         public DbFileQuery DbFileQuery { get; set; }
         public DbFilesSecurity Security { get; set; }
-    }
-
-    public static class FileDaoExtention
-    {
-        public static DIHelper AddFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<IFileDao<int>, FileDao>();
-
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
index 3954095189..7c21278e73 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
@@ -53,6 +53,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Data
 {
+    [Scope]
     internal class FolderDao : AbstractDao, IFolderDao<int>
     {
         private const string my = "my";
@@ -1279,14 +1280,5 @@ namespace ASC.Files.Core.Data
     {
         public DbFolderQuery DbFolderQuery { get; set; }
         public DbFilesSecurity Security { get; set; }
-    }
-
-    public static class FolderDaoExtention
-    {
-        public static DIHelper AddFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<IFolderDao<int>, FolderDao>();
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
index e0482cee04..34e2804244 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
@@ -373,14 +373,4 @@ namespace ASC.Files.Core.Data
         public DbFilesSecurity DbFilesSecurity { get; set; }
         public DbFolderTree DbFolderTree { get; set; }
     }
-
-    public static class SecurityDaoExtention
-    {
-        public static DIHelper AddSecurityDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<ISecurityDao<int>, SecurityDao<int>>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
index 2f4f3418cf..f3a0527ac3 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
@@ -696,13 +696,4 @@ namespace ASC.Files.Core.Data
 
         public DbFilesTagLink Link { get; set; }
     }
-    public static class TagDaoExtention
-    {
-        public static DIHelper AddTagDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<ITagDao<int>, TagDao<int>>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
index bdbba675a0..6d74bbdd7f 100644
--- a/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
+++ b/products/ASC.Files/Core/Core/Security/ISecurityDao.cs
@@ -27,8 +27,11 @@
 using System;
 using System.Collections.Generic;
 
+using ASC.Common;
+
 namespace ASC.Files.Core.Security
-{
+{
+    [Scope]
     public interface ISecurityDao<T>
     {
         void SetShare(FileShareRecord r);
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
index bd6a2283ec..bccd76ce06 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Common.Configuration;
@@ -70,7 +71,8 @@ namespace ASC.Files.Thirdparty
         kDrive,
         Yandex,
     }
-
+
+    [Scope]
     internal class ProviderAccountDao : IProviderDao
     {
         private int tenantID;
@@ -581,5 +583,18 @@ namespace ASC.Files.Thirdparty
                 return token ?? "";
             }
         }
+    }
+
+    public class ProviderAccountDaoExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<BoxProviderInfo>();
+            services.TryAdd<DropboxProviderInfo>();
+            services.TryAdd<SharePointProviderInfo>();
+            services.TryAdd<GoogleDriveProviderInfo>();
+            services.TryAdd<OneDriveProviderInfo>();
+            services.TryAdd<SharpBoxProviderInfo>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
index 0393c7eea3..15aa87f6db 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
@@ -38,7 +38,8 @@ using ASC.Files.Core.Thirdparty;
 using ASC.Web.Files.Services.DocumentService;
 
 namespace ASC.Files.Thirdparty.ProviderDao
-{
+{
+    [Scope]
     internal class ProviderFileDao : ProviderDaoBase, IFileDao<string>
     {
         public ProviderFileDao(
@@ -522,14 +523,4 @@ namespace ASC.Files.Thirdparty.ProviderDao
 
         #endregion
     }
-
-    public static class ProviderFileDaoExtention
-    {
-        public static DIHelper AddProviderFileDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<IFileDao<string>, ProviderFileDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
index 9ff0768ead..fa18a26062 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
@@ -446,14 +446,4 @@ filterType, subjectGroup, subjectID, searchText, searchSubfolders, checkShare);
 
         #endregion
     }
-
-    public static class ProviderFolderDaoExtention
-    {
-        public static DIHelper AddProviderFolderDaoService(this DIHelper services)
-        {
-            services.TryAddScoped<IFolderDao<string>, ProviderFolderDao>();
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
index d6d6ce8532..e0ab914871 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
@@ -38,7 +38,8 @@ using ASC.Files.Core.Thirdparty;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Thirdparty.ProviderDao
-{
+{
+    [Scope]
     internal class ProviderSecurityDao : ProviderDaoBase, ISecurityDao<string>
     {
         public ProviderSecurityDao(
@@ -196,17 +197,4 @@ namespace ASC.Files.Thirdparty.ProviderDao
             return SecurityDao.IsShared(entryId, type);
         }
     }
-
-    public static class ProviderSecurityDaoExtention
-    {
-        public static DIHelper AddProviderSecurityDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ISecurityDao<string>, ProviderSecurityDao>())
-            {
-                return services;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
index 0c5a22157d..3f086aa41e 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
@@ -34,7 +34,8 @@ using ASC.Files.Core.Data;
 using ASC.Files.Core.Thirdparty;
 
 namespace ASC.Files.Thirdparty.ProviderDao
-{
+{
+    [Scope]
     internal class ProviderTagDao : ProviderDaoBase, ITagDao<string>
     {
         public ProviderTagDao(
@@ -130,17 +131,4 @@ namespace ASC.Files.Thirdparty.ProviderDao
 
         #endregion
     }
-
-    public static class ProviderTagDaoExtention
-    {
-        public static DIHelper AddProviderTagDaoService(this DIHelper services)
-        {
-            if (services.TryAddScoped<ITagDao<string>, ProviderTagDao>())
-            {
-                return services;
-            }
-
-            return services;
-        }
-    }
 }
\ No newline at end of file

From 6f25e2e83e32b728eb159c2e990990a9c5180b15 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 21 Oct 2020 14:12:08 +0300
Subject: [PATCH 07/22] Refacoring: scope

---
 common/ASC.Common/DIHelper.cs                 |  7 ++++--
 .../Threading/Workers/WorkerQueue.cs          |  3 ++-
 .../DbSender/MessagesRepository.cs            | 10 +++++++-
 .../Core/Core/Dao/TeamlabDao/DaoFactory.cs    |  2 ++
 .../Core/Thirdparty/Box/BoxDaoSelector.cs     | 15 ++++++++++--
 .../Core/Core/Thirdparty/CrossDao.cs          | 23 +++++++++++++++++--
 .../Thirdparty/Dropbox/DropboxDaoSelector.cs  | 13 ++++++++++-
 .../GoogleDrive/GoogleDriveDaoSelector.cs     | 13 ++++++++++-
 .../OneDrive/OneDriveDaoSelector.cs           | 13 ++++++++++-
 .../SharePoint/SharePointDaoSelector.cs       | 13 ++++++++++-
 .../Sharpbox/SharpBoxDaoSelector.cs           | 13 ++++++++++-
 products/ASC.Files/Server/Startup.cs          |  2 ++
 web/ASC.Web.Core/Users/UserPhotoManager.cs    | 12 +++-------
 13 files changed, 117 insertions(+), 22 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 9f09edb52f..f4f9f2a155 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -187,7 +187,10 @@ namespace ASC.Common
 
                                 if (b != null && b.IsGenericType)
                                 {
-                                    c = a1.MakeGenericType(b.GetGenericTypeDefinition().MakeGenericType(service.GetGenericArguments()));
+                                    var b1 = b.GetGenericTypeDefinition().MakeGenericType(service.GetGenericArguments());
+
+                                    TryAdd(b1);
+                                    c = a1.MakeGenericType(b1);
                                 }
                                 else
                                 {
@@ -316,7 +319,7 @@ namespace ASC.Common
                 if (!Singleton.Contains(serviceName))
                 {
                     Singleton.Add(serviceName);
-                    ServiceCollection.TryAddSingleton(service, implementation);
+                    ServiceCollection.AddSingleton(service, implementation);
                     return true;
                 }
             }
diff --git a/common/ASC.Common/Threading/Workers/WorkerQueue.cs b/common/ASC.Common/Threading/Workers/WorkerQueue.cs
index c7dfc71750..a202dba3e0 100644
--- a/common/ASC.Common/Threading/Workers/WorkerQueue.cs
+++ b/common/ASC.Common/Threading/Workers/WorkerQueue.cs
@@ -58,7 +58,8 @@ namespace ASC.Common.Threading.Workers
             queue.log = Log.Get("ASC.WorkerQueue");
         }
     }
-
+
+    [Singletone]
     public class WorkerQueue<T>
     {
         internal ILog log;
diff --git a/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs b/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
index 619c75aa7c..4ae0bd660d 100644
--- a/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
+++ b/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
@@ -49,7 +49,7 @@ using IsolationLevel = System.Data.IsolationLevel;
 
 namespace ASC.MessagingSystem.DbSender
 {
-    [Singletone]
+    [Singletone(Additional = typeof(MessagesRepositoryExtension))]
     public class MessagesRepository
     {
         private static DateTime lastSave = DateTime.UtcNow;
@@ -316,4 +316,12 @@ namespace ASC.MessagingSystem.DbSender
             } while (ids.Any());
         }
     }
+
+    public class MessagesRepositoryExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<DbContextManager<MessagesContext>>();
+        }
+    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
index 402b8afa44..4f49a063a4 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
@@ -88,6 +88,8 @@ namespace ASC.Files.Core.Data
 
             services.TryAdd<ITagDao<int>, TagDao<int>>();
             services.TryAdd<ITagDao<string>, ProviderTagDao>();
+
+            // AddSharpBoxDaoSelectorService
         }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs
index 60b84a88ac..897ef9e01e 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoSelector.cs
@@ -32,7 +32,7 @@ using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.Box
 {
-    [Scope]
+    [Scope(Additional = typeof(BoxDaoSelectorExtension))]
     internal class BoxDaoSelector : RegexDaoSelectorBase<BoxProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "Box"; }
@@ -62,5 +62,16 @@ namespace ASC.Files.Thirdparty.Box
         {
             return base.GetSecurityDao<BoxSecurityDao>(id);
         }
-    }
+    }
+    public class BoxDaoSelectorExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<BoxFileDao>();
+            services.TryAdd<BoxFolderDao>();
+            services.TryAdd<BoxTagDao>();
+            services.TryAdd<BoxSecurityDao>();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs b/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
index a0346d6904..9ef4b5429e 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
@@ -5,6 +5,12 @@ using System.Threading;
 using ASC.Common;
 using ASC.Files.Core.Data;
 using ASC.Files.Core.Resources;
+using ASC.Files.Thirdparty.Box;
+using ASC.Files.Thirdparty.Dropbox;
+using ASC.Files.Thirdparty.GoogleDrive;
+using ASC.Files.Thirdparty.OneDrive;
+using ASC.Files.Thirdparty.SharePoint;
+using ASC.Files.Thirdparty.Sharpbox;
 using ASC.Web.Files.Utils;
 using ASC.Web.Studio.Core;
 
@@ -12,8 +18,8 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Thirdparty
 {
-    [Scope]
-    internal class CrossDao
+    [Scope(Additional = typeof(CrossDaoExtension))]
+    internal class CrossDao //Additional SharpBox
     {
         private IServiceProvider ServiceProvider { get; }
         private SetupInfo SetupInfo { get; }
@@ -178,5 +184,18 @@ namespace ASC.Files.Core.Thirdparty
 
             return toFolderDao.GetFolder(toConverter(toFolderId));
         }
+    }
+
+    public class CrossDaoExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<SharpBoxDaoSelector>();
+            services.TryAdd<SharePointDaoSelector>();
+            services.TryAdd<OneDriveDaoSelector>();
+            services.TryAdd<GoogleDriveDaoSelector>();
+            services.TryAdd<DropboxDaoSelector>();
+            services.TryAdd<BoxDaoSelector>();
+        }
     }
 }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs
index a01c37cb42..937bb13f2c 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoSelector.cs
@@ -32,7 +32,7 @@ using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.Dropbox
 {
-    [Scope]
+    [Scope(Additional = typeof(DropboxDaoSelectorExtension))]
     internal class DropboxDaoSelector : RegexDaoSelectorBase<DropboxProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "Dropbox"; }
@@ -62,5 +62,16 @@ namespace ASC.Files.Thirdparty.Dropbox
         {
             return base.GetSecurityDao<DropboxSecurityDao>(id);
         }
+    }
+
+    public class DropboxDaoSelectorExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<DropboxFileDao>();
+            services.TryAdd<DropboxFolderDao>();
+            services.TryAdd<DropboxTagDao>();
+            services.TryAdd<DropboxSecurityDao>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs
index e5b1410dba..6eebee8067 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoSelector.cs
@@ -32,7 +32,7 @@ using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.GoogleDrive
 {
-    [Scope]
+    [Scope(Additional = typeof(GoogleDriveDaoSelectorExtension))]
     internal class GoogleDriveDaoSelector : RegexDaoSelectorBase<GoogleDriveProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "GoogleDrive"; }
@@ -61,5 +61,16 @@ namespace ASC.Files.Thirdparty.GoogleDrive
         {
             return base.GetSecurityDao<GoogleDriveSecurityDao>(id);
         }
+    }
+
+    public class GoogleDriveDaoSelectorExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<GoogleDriveFileDao>();
+            services.TryAdd<GoogleDriveFolderDao>();
+            services.TryAdd<GoogleDriveTagDao>();
+            services.TryAdd<GoogleDriveSecurityDao>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs
index 77705a4c9e..f5d1510da5 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoSelector.cs
@@ -32,7 +32,7 @@ using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.OneDrive
 {
-    [Scope]
+    [Scope(Additional = typeof(OneDriveDaoSelectorExtension))]
     internal class OneDriveDaoSelector : RegexDaoSelectorBase<OneDriveProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "OneDrive"; }
@@ -62,5 +62,16 @@ namespace ASC.Files.Thirdparty.OneDrive
         {
             return base.GetSecurityDao<OneDriveSecurityDao>(id);
         }
+    }
+
+    public class OneDriveDaoSelectorExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<OneDriveFileDao>();
+            services.TryAdd<OneDriveFolderDao>();
+            services.TryAdd<OneDriveTagDao>();
+            services.TryAdd<OneDriveSecurityDao>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs
index 5849890d04..618b3bfb60 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoSelector.cs
@@ -32,7 +32,7 @@ using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.SharePoint
 {
-    [Scope]
+    [Scope(Additional = typeof(SharePointDaoSelectorExtension))]
     internal class SharePointDaoSelector : RegexDaoSelectorBase<SharePointProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "sharepoint"; }
@@ -75,5 +75,16 @@ namespace ASC.Files.Thirdparty.SharePoint
             }
             return base.ConvertId(null);
         }
+    }
+
+    public class SharePointDaoSelectorExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<SharePointFileDao>();
+            services.TryAdd<SharePointFolderDao>();
+            services.TryAdd<SharePointTagDao>();
+            services.TryAdd<SharePointSecurityDao>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs
index 10eaf08c8b..7caba01af8 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoSelector.cs
@@ -32,7 +32,7 @@ using ASC.Files.Core.Security;
 
 namespace ASC.Files.Thirdparty.Sharpbox
 {
-    [Scope]
+    [Scope(Additional = typeof(SharpBoxDaoSelectorExtension))]
     internal class SharpBoxDaoSelector : RegexDaoSelectorBase<SharpBoxProviderInfo>, IDaoSelector
     {
         protected internal override string Name { get => "SharpBox"; }
@@ -62,5 +62,16 @@ namespace ASC.Files.Thirdparty.Sharpbox
         {
             return base.GetSecurityDao<SharpBoxSecurityDao>(id);
         }
+    }
+
+    public class SharpBoxDaoSelectorExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<SharpBoxFileDao>();
+            services.TryAdd<SharpBoxFolderDao>();
+            services.TryAdd<SharpBoxTagDao>();
+            services.TryAdd<SharpBoxSecurityDao>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
index 203f11be16..a12c99fe0b 100644
--- a/products/ASC.Files/Server/Startup.cs
+++ b/products/ASC.Files/Server/Startup.cs
@@ -34,6 +34,8 @@ namespace ASC.Files
             base.ConfigureServices(services);
 
             DIHelper.TryAdd<FilesController>();
+
+            var a = 0;
         }
 
         public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/web/ASC.Web.Core/Users/UserPhotoManager.cs b/web/ASC.Web.Core/Users/UserPhotoManager.cs
index 2e3fb069db..d0e4827b97 100644
--- a/web/ASC.Web.Core/Users/UserPhotoManager.cs
+++ b/web/ASC.Web.Core/Users/UserPhotoManager.cs
@@ -180,7 +180,7 @@ namespace ASC.Web.Core.Users
         }
     }
 
-    [Scope]
+    [Scope(Additional = typeof(ResizeWorkerItemExtension))]
     public class UserPhotoManager
     {
         //Regex for parsing filenames into groups with id's
@@ -1004,17 +1004,11 @@ namespace ASC.Web.Core.Users
         }
     }
 
-    public static class ResizeWorkerItemExtension
+    public class ResizeWorkerItemExtension
     {
-        public static DIHelper AddResizeWorkerItemService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            //WorkerQueueOptionsManager<ResizeWorkerItem> optionsQueue,
-            services.TryAddSingleton<WorkerQueueOptionsManager<ResizeWorkerItem>>();
-            services.TryAddSingleton<WorkerQueue<ResizeWorkerItem>>();
-            services.AddSingleton<IConfigureOptions<WorkerQueue<ResizeWorkerItem>>, ConfigureWorkerQueue<ResizeWorkerItem>>();
-
             services.AddWorkerQueue<ResizeWorkerItem>(2, (int)TimeSpan.FromSeconds(30).TotalMilliseconds, true, 1);
-            return services;
         }
     }
 }
\ No newline at end of file

From 3ddb202c56ac20ebd80abbae7ca60cdb61b5e011 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 21 Oct 2020 14:52:44 +0300
Subject: [PATCH 08/22] Scope: refactoring

---
 common/ASC.Api.Core/Core/BaseStartup.cs                 | 3 ++-
 common/ASC.Api.Core/Middleware/PaymentFilter.cs         | 2 ++
 common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs | 2 ++
 common/ASC.Api.Core/Middleware/TenantStatusFilter.cs    | 2 ++
 common/ASC.Common/ASC.Common.csproj                     | 1 +
 common/ASC.Common/Caching/ICacheNotify.cs               | 1 +
 common/ASC.Common/Caching/KafkaCache.cs                 | 1 +
 common/ASC.Common/DIHelper.cs                           | 4 ++++
 products/ASC.Files/Server/Startup.cs                    | 4 +++-
 9 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs
index 7af5438e91..79aee7ae44 100644
--- a/common/ASC.Api.Core/Core/BaseStartup.cs
+++ b/common/ASC.Api.Core/Core/BaseStartup.cs
@@ -66,13 +66,14 @@ namespace ASC.Api.Core
                     });
             }
 
+            DIHelper.TryAdd<DisposeMiddleware>();
             DIHelper.TryAdd<CultureMiddleware>();
             DIHelper.TryAdd<IpSecurityFilter>();
             DIHelper.TryAdd<PaymentFilter>();
             DIHelper.TryAdd<ProductSecurityFilter>();
             DIHelper.TryAdd<TenantStatusFilter>();
 
-            services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
+            DIHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
             var builder = services.AddMvcCore(config =>
             {
diff --git a/common/ASC.Api.Core/Middleware/PaymentFilter.cs b/common/ASC.Api.Core/Middleware/PaymentFilter.cs
index 69fa747f43..284a04ae59 100644
--- a/common/ASC.Api.Core/Middleware/PaymentFilter.cs
+++ b/common/ASC.Api.Core/Middleware/PaymentFilter.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using System.Web;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Web.Api.Routing;
 using ASC.Web.Studio.Utility;
@@ -13,6 +14,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
 {
+    [Scope]
     public class PaymentFilter : IResourceFilter
     {
         private readonly ILog log;
diff --git a/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs b/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
index 14717360d6..cbc2cd13b1 100644
--- a/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
+++ b/common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Common.Notify.Engine;
 using ASC.Core;
@@ -16,6 +17,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
 {
+    [Scope]
     public class ProductSecurityFilter : IResourceFilter
     {
         private static readonly IDictionary<string, Guid> products;
diff --git a/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs b/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
index 75fb7f2610..8eda940670 100644
--- a/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
+++ b/common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
@@ -1,5 +1,6 @@
 using System.Net;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Tenants;
@@ -10,6 +11,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Middleware
 {
+    [Scope]
     public class TenantStatusFilter : IResourceFilter
     {
         private readonly ILog log;
diff --git a/common/ASC.Common/ASC.Common.csproj b/common/ASC.Common/ASC.Common.csproj
index 6c7708ffc0..ab1cff6243 100644
--- a/common/ASC.Common/ASC.Common.csproj
+++ b/common/ASC.Common/ASC.Common.csproj
@@ -45,6 +45,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.9" />
diff --git a/common/ASC.Common/Caching/ICacheNotify.cs b/common/ASC.Common/Caching/ICacheNotify.cs
index dbe0687b47..a8ac77606f 100644
--- a/common/ASC.Common/Caching/ICacheNotify.cs
+++ b/common/ASC.Common/Caching/ICacheNotify.cs
@@ -30,6 +30,7 @@ using Google.Protobuf;
 
 namespace ASC.Common.Caching
 {
+    [Singletone]
     public interface ICacheNotify<T> where T : IMessage<T>, new()
     {
         void Publish(T obj, CacheNotifyAction action);
diff --git a/common/ASC.Common/Caching/KafkaCache.cs b/common/ASC.Common/Caching/KafkaCache.cs
index e464b86c16..0ba203308c 100644
--- a/common/ASC.Common/Caching/KafkaCache.cs
+++ b/common/ASC.Common/Caching/KafkaCache.cs
@@ -16,6 +16,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Common.Caching
 {
+    [Singletone]
     public class KafkaCache<T> : IDisposable, ICacheNotify<T> where T : IMessage<T>, new()
     {
         private ClientConfig ClientConfig { get; set; }
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index f4f9f2a155..28fd75480a 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -6,6 +6,8 @@ using System.Reflection;
 using ASC.Common.Threading.Progress;
 using ASC.Common.Threading.Workers;
 
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -268,6 +270,7 @@ namespace ASC.Common
 
         private bool Register(Type service)
         {
+            if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter))) return true;
             var c = service.GetCustomAttribute<DIAttribute>();
             var serviceName = $"{service}";
             if (c is ScopeAttribute)
@@ -303,6 +306,7 @@ namespace ASC.Common
 
         private bool Register(Type service, Type implementation)
         {
+            if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter))) return true;
             var c = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var serviceName = $"{service}{implementation}";
             if (c is ScopeAttribute)
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
index a12c99fe0b..2e18d0868d 100644
--- a/products/ASC.Files/Server/Startup.cs
+++ b/products/ASC.Files/Server/Startup.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Text;
 using System.Text.Json.Serialization;
 
@@ -35,7 +36,8 @@ namespace ASC.Files
 
             DIHelper.TryAdd<FilesController>();
 
-            var a = 0;
+            var a = $"{string.Join(",", DIHelper.Singleton.OrderBy(r => r).ToArray())},{string.Join(",", DIHelper.Scoped.OrderBy(r => r).ToArray())},{string.Join(",", DIHelper.Transient.OrderBy(r => r).ToArray())}";
+            var b = 0;
         }
 
         public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)

From 2143f376a3cb76638b5ff05987e7eb6954ff051c Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 21 Oct 2020 16:39:06 +0300
Subject: [PATCH 09/22] Scope: refactoring

---
 common/ASC.Common/DIHelper.cs                 | 44 ++++++++++++++++---
 .../Caching/CachedTenantService.cs            |  3 +-
 .../ASC.Core.Common/Data/DbTenantService.cs   |  1 +
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 28fd75480a..3097c1eb26 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -139,6 +139,16 @@ namespace ASC.Common
             if (Added.Contains(serviceName)) return false;
             Added.Add(serviceName);
 
+            if (serviceName == "ASC.Core.IAzService")
+            {
+                var qweasd = 0;
+            }
+
+            if (serviceName == "ASC.Core.Caching.CachedAzService")
+            {
+                var qweasd = 0;
+            }
+
             var di = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var isnew = false;
 
@@ -172,7 +182,7 @@ namespace ASC.Common
                                     if (g != service)
                                     {
                                         TryAdd(g);
-                                        if (service.IsInterface)
+                                        if (service.IsInterface && di.Implementation == null)
                                         {
                                             TryAdd(service, g);
                                         }
@@ -205,7 +215,7 @@ namespace ASC.Common
                         }
                         else
                         {
-                            isnew = Register(service, di.Service);
+                            isnew = di.Implementation == null ? Register(service, di.Service) : Register(di.Service);
                         }
                     }
 
@@ -220,19 +230,43 @@ namespace ASC.Common
 
                                 foreach (var g in b)
                                 {
-                                    TryAdd(service, g);
+                                    if (g != service)
+                                    {
+                                        //TryAdd(g);
+                                        if (service.IsInterface && implementation == null)
+                                        {
+                                            TryAdd(service, g);
+                                        }
+                                    }
                                 }
 
                                 TryAdd(a, di.Implementation);
                             }
                             else
                             {
-                                var qazw = 0;
+                                Type c = null;
+                                var a1 = a.GetGenericTypeDefinition();
+                                var b = a.GetGenericArguments().FirstOrDefault();
+
+                                if (b != null && b.IsGenericType)
+                                {
+                                    var b1 = b.GetGenericTypeDefinition().MakeGenericType(service.GetGenericArguments());
+
+                                    TryAdd(b1);
+                                    c = a1.MakeGenericType(b1);
+                                }
+                                else
+                                {
+                                    c = a1.MakeGenericType(service.GetGenericArguments());
+                                }
+
+                                TryAdd(c, di.Implementation.MakeGenericType(service.GetGenericArguments()));
+                                //a, di.Service
                             }
                         }
                         else
                         {
-                            isnew = Register(service, di.Implementation);
+                            isnew = TryAdd(service, di.Implementation);
                         }
                     }
                 }
diff --git a/common/ASC.Core.Common/Caching/CachedTenantService.cs b/common/ASC.Core.Common/Caching/CachedTenantService.cs
index 4187610113..a25b4d707b 100644
--- a/common/ASC.Core.Common/Caching/CachedTenantService.cs
+++ b/common/ASC.Core.Common/Caching/CachedTenantService.cs
@@ -179,7 +179,8 @@ namespace ASC.Core.Caching
             options.CacheNotifySettings = TenantServiceCache.CacheNotifySettings;
         }
     }
-
+
+    [Scope]
     class CachedTenantService : ITenantService
     {
         internal ITenantService Service { get; set; }
diff --git a/common/ASC.Core.Common/Data/DbTenantService.cs b/common/ASC.Core.Common/Data/DbTenantService.cs
index 4fe9a072af..a08facd2e2 100644
--- a/common/ASC.Core.Common/Data/DbTenantService.cs
+++ b/common/ASC.Core.Common/Data/DbTenantService.cs
@@ -70,6 +70,7 @@ namespace ASC.Core.Data
         }
     }
 
+    [Scope]
     public class DbTenantService : ITenantService
     {
         private List<string> forbiddenDomains;

From 367c93fd91e3ad8d4fe099db440545634dc8f699 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Thu, 22 Oct 2020 20:57:18 +0300
Subject: [PATCH 10/22] Refactoring: scope

---
 .../ASC.Api.Core/Auth/ConfirmAuthHandler.cs   | 10 ++++++
 common/ASC.Api.Core/Core/BaseStartup.cs       |  1 +
 common/ASC.Common/DIHelper.cs                 | 36 ++++++++-----------
 .../ASC.Core.Common/Billing/TariffService.cs  |  3 +-
 .../Caching/CachedQuotaService.cs             |  3 +-
 common/ASC.Core.Common/Data/DbQuotaService.cs |  3 +-
 .../ASC.Core.Common/Data/DbSettingsManager.cs |  3 +-
 common/ASC.Core.Common/Tenants/TenantUtil.cs  |  3 +-
 .../Configuration/StorageSettings.cs          | 11 +++---
 common/ASC.Data.Storage/StaticUploader.cs     | 12 +++----
 common/ASC.FederatedLogin/AccountLinker.cs    |  2 ++
 .../ASC.Data.Backup/Core/NotifyHelper.cs      | 10 +++---
 .../EncryptionOperation.cs                    |  9 +++--
 .../EncryptionWorker.cs                       | 10 +++++-
 .../ASC.ElasticSearch/Engine/BaseIndexer.cs   | 10 +++---
 .../Core/Core/Dao/Interfaces/IProviderDao.cs  |  2 +-
 .../Core/Core/Dao/TeamlabDao/DaoFactory.cs    |  1 +
 .../Thirdparty/CachedProviderAccountDao.cs    |  3 +-
 .../GoogleDrive/GoogleDriveProviderInfo.cs    | 10 +++++-
 .../OneDrive/OneDriveProviderInfo.cs          | 12 +++++--
 .../Services/DocumentService/Configuration.cs | 28 +++++++++++++++
 .../DocumentService/DocumentServiceHelper.cs  |  2 +-
 .../Services/NotifyService/NotifyClient.cs    | 13 ++++---
 .../FileOperations/FileDeleteOperation.cs     |  8 +++--
 .../FileOperations/FileDownloadOperation.cs   |  8 +++--
 .../FileOperations/FileMarkAsReadOperation.cs |  8 +++--
 .../FileOperations/FileMoveCopyOperation.cs   |  8 +++--
 .../FileOperations/FileOperation.cs           |  8 +++--
 .../FileOperations/FileOperationsManager.cs   | 19 +++++-----
 .../ASC.Files/Core/Utils/FileConverter.cs     | 22 ++++++++----
 products/ASC.Files/Core/Utils/FileMarker.cs   | 28 ++++++---------
 products/ASC.Files/Server/Startup.cs          |  8 +++++
 .../Notify/NotifyConfiguration.cs             | 17 +++++----
 .../Notify/StudioNotifyServiceHelper.cs       | 10 ------
 .../Notify/StudioPeriodicNotify.cs            | 10 +++---
 35 files changed, 207 insertions(+), 144 deletions(-)

diff --git a/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs b/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
index d01446177f..14823619fd 100644
--- a/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
+++ b/common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
@@ -6,6 +6,7 @@ using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Core;
 using ASC.Security.Cryptography;
 
@@ -16,6 +17,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Api.Core.Auth
 {
+    [Scope(Additional = typeof(ConfirmAuthHandlerExtension))]
     public class ConfirmAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
     {
         public ConfirmAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
@@ -94,4 +96,12 @@ namespace ASC.Api.Core.Auth
             return Task.FromResult(result);
         }
     }
+
+    public class ConfirmAuthHandlerExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<EmailValidationKeyModelHelper>();
+        }
+    }
 }
diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs
index 79aee7ae44..ccca67d944 100644
--- a/common/ASC.Api.Core/Core/BaseStartup.cs
+++ b/common/ASC.Api.Core/Core/BaseStartup.cs
@@ -72,6 +72,7 @@ namespace ASC.Api.Core
             DIHelper.TryAdd<PaymentFilter>();
             DIHelper.TryAdd<ProductSecurityFilter>();
             DIHelper.TryAdd<TenantStatusFilter>();
+            DIHelper.TryAdd<ConfirmAuthHandler>();
 
             DIHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 3097c1eb26..5e0abb59a2 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -6,6 +6,7 @@ using System.Reflection;
 using ASC.Common.Threading.Progress;
 using ASC.Common.Threading.Workers;
 
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
@@ -135,18 +136,22 @@ namespace ASC.Common
 
         public bool TryAdd(Type service, Type implementation = null)
         {
+            if (service.IsInterface && service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IOptionsSnapshot<>))
+            {
+                service = service.GetGenericArguments().FirstOrDefault();
+                if (service == null)
+                {
+                    return false;
+                }
+            }
+
             var serviceName = $"{service}{implementation}";
             if (Added.Contains(serviceName)) return false;
             Added.Add(serviceName);
 
-            if (serviceName == "ASC.Core.IAzService")
+            if (serviceName == "ASC.FederatedLogin.AccountLinker")
             {
-                var qweasd = 0;
-            }
-
-            if (serviceName == "ASC.Core.Caching.CachedAzService")
-            {
-                var qweasd = 0;
+                var qqaz = 0;
             }
 
             var di = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
@@ -304,7 +309,7 @@ namespace ASC.Common
 
         private bool Register(Type service)
         {
-            if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter))) return true;
+            if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter)) || service.GetInterfaces().Contains(typeof(IAuthenticationHandler))) return true;
             var c = service.GetCustomAttribute<DIAttribute>();
             var serviceName = $"{service}";
             if (c is ScopeAttribute)
@@ -447,19 +452,6 @@ namespace ASC.Common
             return this;
         }
 
-
-        public DIHelper TryAddTransient<TService>() where TService : class
-        {
-            var serviceName = $"{typeof(TService)}";
-            if (!Transient.Contains(serviceName))
-            {
-                Transient.Add(serviceName);
-                ServiceCollection.TryAddTransient<TService>();
-            }
-
-            return this;
-        }
-
         public DIHelper Configure<TOptions>(Action<TOptions> configureOptions) where TOptions : class
         {
             var serviceName = $"{typeof(TOptions)}";
@@ -493,6 +485,7 @@ namespace ASC.Common
             AddToConfigured($"{typeof(WorkerQueue<T1>)}", (Action<WorkerQueue<T1>>)action);
             return this;
         }
+
         public DIHelper AddProgressQueue<T1>(int workerCount, int waitInterval, bool removeAfterCompleted, bool stopAfterFinsih, int errorCount) where T1 : class, IProgressItem
         {
             void action(ProgressQueue<T1> a)
@@ -506,6 +499,7 @@ namespace ASC.Common
             AddToConfigured($"{typeof(ProgressQueue<T1>)}", (Action<ProgressQueue<T1>>)action);
             return this;
         }
+
         public DIHelper Configure<TOptions>(string name, Action<TOptions> configureOptions) where TOptions : class
         {
             var serviceName = $"{typeof(TOptions)}{name}";
diff --git a/common/ASC.Core.Common/Billing/TariffService.cs b/common/ASC.Core.Common/Billing/TariffService.cs
index 8ca0305b58..57aedbff11 100644
--- a/common/ASC.Core.Common/Billing/TariffService.cs
+++ b/common/ASC.Core.Common/Billing/TariffService.cs
@@ -76,7 +76,8 @@ namespace ASC.Core.Billing
             }*/
         }
     }
-
+
+    [Scope]
     class ConfigureTariffService : IConfigureNamedOptions<TariffService>
     {
         public ConfigureTariffService(
diff --git a/common/ASC.Core.Common/Caching/CachedQuotaService.cs b/common/ASC.Core.Common/Caching/CachedQuotaService.cs
index c034666d35..de356d7280 100644
--- a/common/ASC.Core.Common/Caching/CachedQuotaService.cs
+++ b/common/ASC.Core.Common/Caching/CachedQuotaService.cs
@@ -78,7 +78,8 @@ namespace ASC.Core.Caching
             }, CacheNotifyAction.Any);
         }
     }
-
+
+    [Scope]
     class ConfigureCachedQuotaService : IConfigureNamedOptions<CachedQuotaService>
     {
         private IOptionsSnapshot<DbQuotaService> Service { get; }
diff --git a/common/ASC.Core.Common/Data/DbQuotaService.cs b/common/ASC.Core.Common/Data/DbQuotaService.cs
index b4cf619800..7f971d9c41 100644
--- a/common/ASC.Core.Common/Data/DbQuotaService.cs
+++ b/common/ASC.Core.Common/Data/DbQuotaService.cs
@@ -36,7 +36,8 @@ using ASC.Core.Tenants;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Data
-{
+{
+    [Scope]
     class ConfigureDbQuotaService : IConfigureNamedOptions<DbQuotaService>
     {
         private DbContextManager<CoreDbContext> DbContextManager { get; }
diff --git a/common/ASC.Core.Common/Data/DbSettingsManager.cs b/common/ASC.Core.Common/Data/DbSettingsManager.cs
index ae782d8f89..a723574f45 100644
--- a/common/ASC.Core.Common/Data/DbSettingsManager.cs
+++ b/common/ASC.Core.Common/Data/DbSettingsManager.cs
@@ -60,7 +60,8 @@ namespace ASC.Core.Data
             Notify.Publish(new SettingsCacheItem { Key = key }, CacheNotifyAction.Remove);
         }
     }
-
+
+    [Scope]
     class ConfigureDbSettingsManager : IConfigureNamedOptions<DbSettingsManager>
     {
         private IServiceProvider ServiceProvider { get; }
diff --git a/common/ASC.Core.Common/Tenants/TenantUtil.cs b/common/ASC.Core.Common/Tenants/TenantUtil.cs
index fe7a9bfc6d..56edeacb40 100644
--- a/common/ASC.Core.Common/Tenants/TenantUtil.cs
+++ b/common/ASC.Core.Common/Tenants/TenantUtil.cs
@@ -32,7 +32,8 @@ using ASC.Common.Utils;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Tenants
-{
+{
+    [Scope]
     class ConfigureTenantUtil : IConfigureNamedOptions<TenantUtil>
     {
         private IOptionsSnapshot<TenantManager> TenantManager { get; }
diff --git a/common/ASC.Data.Storage/Configuration/StorageSettings.cs b/common/ASC.Data.Storage/Configuration/StorageSettings.cs
index 3980d4f216..c533a93760 100644
--- a/common/ASC.Data.Storage/Configuration/StorageSettings.cs
+++ b/common/ASC.Data.Storage/Configuration/StorageSettings.cs
@@ -40,7 +40,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage.Configuration
 {
-    [Singletone]
+    [Singletone(Additional = typeof(StorageSettingsExtension))]
     public class BaseStorageSettingsListener
     {
         private IServiceProvider ServiceProvider { get; }
@@ -227,6 +227,7 @@ namespace ASC.Data.Storage.Configuration
         }
     }
 
+    [Scope]
     public class BaseStorageSettingsListenerScope
     {
         private StorageSettingsHelper StorageSettingsHelper { get; }
@@ -248,13 +249,11 @@ namespace ASC.Data.Storage.Configuration
         }
     }
 
-    public static class StorageSettingsExtension
+    public class StorageSettingsExtension
     {
-        public static DIHelper AddStorageSettingsService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<BaseStorageSettingsListenerScope>();
-
-            return services;
+            services.TryAdd<BaseStorageSettingsListenerScope>();
         }
     }
 }
diff --git a/common/ASC.Data.Storage/StaticUploader.cs b/common/ASC.Data.Storage/StaticUploader.cs
index be158adbc8..1dfe9576c8 100644
--- a/common/ASC.Data.Storage/StaticUploader.cs
+++ b/common/ASC.Data.Storage/StaticUploader.cs
@@ -45,7 +45,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage
 {
-    [Scope]
+    [Scope(Additional = typeof(StaticUploaderExtension))]
     public class StaticUploader
     {
         private static readonly TaskScheduler Scheduler;
@@ -283,7 +283,8 @@ namespace ASC.Data.Storage
             }
         }
     }
-
+
+    [Scope]
     public class StaticUploaderScope
     {
         private TenantManager TenantManager { get; }
@@ -317,11 +318,10 @@ namespace ASC.Data.Storage
 
     public static class StaticUploaderExtension
     {
-        public static DIHelper AddStaticUploaderService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<StaticUploaderScope>();
-
-            return services;
+            services.TryAdd<StaticUploaderScope>();
+
         }
     }
 }
diff --git a/common/ASC.FederatedLogin/AccountLinker.cs b/common/ASC.FederatedLogin/AccountLinker.cs
index b4f6719418..83f796fe82 100644
--- a/common/ASC.FederatedLogin/AccountLinker.cs
+++ b/common/ASC.FederatedLogin/AccountLinker.cs
@@ -70,6 +70,8 @@ namespace ASC.FederatedLogin
             return profiles;
         }
     }
+
+    [Scope]
     public class ConfigureAccountLinker : IConfigureNamedOptions<AccountLinker>
     {
         private Signature Signature { get; }
diff --git a/common/services/ASC.Data.Backup/Core/NotifyHelper.cs b/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
index 8680ab7ab3..bd1d284d4a 100644
--- a/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
+++ b/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
@@ -42,7 +42,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Data.Backup
 {
-    [Singletone]
+    [Singletone(Additional = typeof(NotifyHelperExtension))]
     public class NotifyHelper
     {
         private IServiceProvider ServiceProvider { get; }
@@ -169,13 +169,11 @@ namespace ASC.Data.Backup
         }
     }
 
-    public static class NotifyHelperExtension
+    public class NotifyHelperExtension
     {
-        public static DIHelper AddNotifyHelperService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<NotifyHelperScope>();
-
-            return services;
+            services.TryAdd<NotifyHelperScope>();
         }
     }
 }
diff --git a/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs b/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
index 5a3f22ccd8..a236b8b80a 100644
--- a/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
+++ b/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
@@ -43,7 +43,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Storage.Encryption
 {
-    [Transient]
+    [Transient(Additional = typeof(EncryptionOperationExtension))]
     public class EncryptionOperation : ProgressBase
     {
         private const string ConfigPath = "";
@@ -381,12 +381,11 @@ namespace ASC.Data.Storage.Encryption
         }
     }
 
-    public static class EncryptionOperationExtension
+    public class EncryptionOperationExtension
     {
-        public static DIHelper AddEncryptionOperationService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddTransient<EncryptionOperationScope>();
-            return services;
+            services.TryAdd<EncryptionOperationScope>();
         }
     }
 }
diff --git a/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs b/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
index 43d9683d66..bffa5d7907 100644
--- a/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
+++ b/common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
@@ -87,7 +87,7 @@ namespace ASC.Data.Storage.Encryption
         }
     }
 
-    [Singletone]
+    [Singletone(Additional = typeof(FactoryOperationExtension))]
     public class FactoryOperation
     {
         private IServiceProvider ServiceProvider { get; set; }
@@ -103,5 +103,13 @@ namespace ASC.Data.Storage.Encryption
             item.Init(encryptionSettings);
             return item;
         }
+    }
+
+    public class FactoryOperationExtension
+    {
+        public static void Register(DIHelper dIHelper)
+        {
+            dIHelper.TryAdd<EncryptionOperation>();
+        }
     }
 }
diff --git a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
index 60146d5e10..c41ec62af8 100644
--- a/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
+++ b/common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
@@ -291,7 +291,7 @@ namespace ASC.ElasticSearch
         internal IReadOnlyCollection<T> Select(Expression<Func<Selector<T>, Selector<T>>> expression, bool onlyId = false)
         {
             var func = expression.Compile();
-            var selector = ServiceProvider.GetService<Selector<T>>();
+            var selector = new Selector<T>(ServiceProvider);
             var descriptor = func(selector).Where(r => r.TenantId, TenantManager.GetCurrentTenant().TenantId);
             return Client.Instance.Search(descriptor.GetDescriptor(this, onlyId)).Documents;
         }
@@ -299,7 +299,7 @@ namespace ASC.ElasticSearch
         internal IReadOnlyCollection<T> Select(Expression<Func<Selector<T>, Selector<T>>> expression, bool onlyId, out long total)
         {
             var func = expression.Compile();
-            var selector = ServiceProvider.GetService<Selector<T>>();
+            var selector = new Selector<T>(ServiceProvider);
             var descriptor = func(selector).Where(r => r.TenantId, TenantManager.GetCurrentTenant().TenantId);
             var result = Client.Instance.Search(descriptor.GetDescriptor(this, onlyId));
             total = result.Total;
@@ -544,7 +544,7 @@ namespace ASC.ElasticSearch
         private Func<DeleteByQueryDescriptor<T>, IDeleteByQueryRequest> GetDescriptorForDelete(Expression<Func<Selector<T>, Selector<T>>> expression, int tenantId, bool immediately = true)
         {
             var func = expression.Compile();
-            var selector = ServiceProvider.GetService<Selector<T>>();
+            var selector = new Selector<T>(ServiceProvider);
             var descriptor = func(selector).Where(r => r.TenantId, tenantId);
             return descriptor.GetDescriptorForDelete(this, immediately);
         }
@@ -552,7 +552,7 @@ namespace ASC.ElasticSearch
         private Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> GetDescriptorForUpdate(T data, Expression<Func<Selector<T>, Selector<T>>> expression, int tenantId, bool immediately = true, params Expression<Func<T, object>>[] fields)
         {
             var func = expression.Compile();
-            var selector = ServiceProvider.GetService<Selector<T>>();
+            var selector = new Selector<T>(ServiceProvider);
             var descriptor = func(selector).Where(r => r.TenantId, tenantId);
             return descriptor.GetDescriptorForUpdate(this, GetScriptUpdateByQuery(data, fields), immediately);
         }
@@ -560,7 +560,7 @@ namespace ASC.ElasticSearch
         private Func<UpdateByQueryDescriptor<T>, IUpdateByQueryRequest> GetDescriptorForUpdate(T data, Expression<Func<Selector<T>, Selector<T>>> expression, int tenantId, UpdateAction action, Expression<Func<T, IList>> fields, bool immediately = true)
         {
             var func = expression.Compile();
-            var selector = ServiceProvider.GetService<Selector<T>>();
+            var selector = new Selector<T>(ServiceProvider);
             var descriptor = func(selector).Where(r => r.TenantId, tenantId);
             return descriptor.GetDescriptorForUpdate(this, GetScriptForUpdate(data, action, fields), immediately);
         }
diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
index 008687347c..2a21eca0f8 100644
--- a/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
+++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
@@ -32,7 +32,7 @@ using ASC.Files.Thirdparty;
 
 namespace ASC.Files.Core
 {
-    [Scope(typeof(ProviderAccountDao), Additional = typeof(ProviderAccountDaoExtension))]
+    [Scope(typeof(CachedProviderAccountDao), Additional = typeof(ProviderAccountDaoExtension))]
     public interface IProviderDao
     {
         IProviderInfo GetProviderInfo(int linkId);
diff --git a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
index 4f49a063a4..d239835e94 100644
--- a/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
+++ b/products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
@@ -83,6 +83,7 @@ namespace ASC.Files.Core.Data
             services.TryAdd<Folder<string>>();
             services.TryAdd<IFolderDao<string>, ProviderFolderDao>();
 
+            services.TryAdd<SecurityDao<int>>();
             services.TryAdd<ISecurityDao<int>, SecurityDao<int>>();
             services.TryAdd<ISecurityDao<string>, ProviderSecurityDao>();
 
diff --git a/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs b/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
index df92e16a5b..c106a94243 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
@@ -60,7 +60,8 @@ namespace ASC.Files.Thirdparty
             Cache.TryRemove(key, out _);
         }
     }
-
+
+    [Scope]
     internal class CachedProviderAccountDao : ProviderAccountDao
     {
         private readonly ConcurrentDictionary<string, IProviderInfo> cache;
diff --git a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
index 7edf4904e6..461a785438 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
@@ -181,7 +181,7 @@ namespace ASC.Files.Thirdparty.GoogleDrive
         }
     }
 
-    [Scope]
+    [Scope(Additional = typeof(GoogleDriveProviderInfoExtention))]
     internal class GoogleDriveStorageDisposableWrapper : IDisposable
     {
         internal GoogleDriveStorage Storage { get; set; }
@@ -365,5 +365,13 @@ namespace ASC.Files.Thirdparty.GoogleDrive
         {
             CacheNotify.Publish(new GoogleDriveCacheItem { ResetChilds = true, Key = id + "-" + parentDriveId, ChildFolder = childFolder ?? false, ChildFolderExist = childFolder.HasValue }, CacheNotifyAction.Remove);
         }
+    }
+
+    public class GoogleDriveProviderInfoExtention
+    {
+        public static void Register(DIHelper dIHelper)
+        {
+            dIHelper.TryAdd<GoogleDriveStorage>();
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
index f7747e8579..99b46face7 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
@@ -142,7 +142,7 @@ namespace ASC.Files.Thirdparty.OneDrive
         }
     }
 
-    [Scope]
+    [Scope(Additional = typeof(OneDriveProviderInfoExtention))]
     internal class OneDriveStorageDisposableWrapper : IDisposable
     {
         internal OneDriveStorage Storage { get; private set; }
@@ -258,5 +258,13 @@ namespace ASC.Files.Thirdparty.OneDrive
                 CacheNotify.Publish(new OneDriveCacheItem { Key = key }, CacheNotifyAction.Remove);
             }
         }
-    }
+    }
+    public class OneDriveProviderInfoExtention
+    {
+        public static void Register(DIHelper dIHelper)
+        {
+            dIHelper.TryAdd<OneDriveStorage>();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/DocumentService/Configuration.cs b/products/ASC.Files/Core/Services/DocumentService/Configuration.cs
index 660ff0b97a..c00070f834 100644
--- a/products/ASC.Files/Core/Services/DocumentService/Configuration.cs
+++ b/products/ASC.Files/Core/Services/DocumentService/Configuration.cs
@@ -921,5 +921,33 @@ namespace ASC.Web.Files.Services.DocumentService
         public string Id { get; set; }
 
         public string Name { get; set; }
+    }
+
+    public static class ConfigurationExtention
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<DocumentConfig<string>>();
+            services.TryAdd<DocumentConfig<int>>();
+
+            services.TryAdd<InfoConfig<string>>();
+            services.TryAdd<InfoConfig<int>>();
+
+            services.TryAdd<EditorConfiguration<string>>();
+            services.TryAdd<EditorConfiguration<int>>();
+
+            services.TryAdd<PluginsConfig>();
+            services.TryAdd<EmbeddedConfig>();
+
+            services.TryAdd<CustomizationConfig<string>>();
+            services.TryAdd<CustomizationConfig<int>>();
+
+            services.TryAdd<CustomerConfig<string>>();
+            services.TryAdd<CustomerConfig<int>>();
+
+            services.TryAdd<LogoConfig<string>>();
+            services.TryAdd<LogoConfig<int>>();
+
+        }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
index 62986f7f37..614bf25c6e 100644
--- a/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
+++ b/products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
@@ -46,7 +46,7 @@ using FileShare = ASC.Files.Core.Security.FileShare;
 
 namespace ASC.Web.Files.Services.DocumentService
 {
-    [Scope]
+    [Scope(Additional = typeof(ConfigurationExtention))]
     public class DocumentServiceHelper
     {
         private IDaoFactory DaoFactory { get; }
diff --git a/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs b/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
index 1a7610fffc..9e1e88727a 100644
--- a/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
+++ b/products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
@@ -41,7 +41,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Files.Core.Services.NotifyService
 {
-    [Scope]
+    [Scope(Additional = typeof(NotifyClientExtension))]
     public class NotifyClient
     {
         private IServiceProvider ServiceProvider { get; }
@@ -191,7 +191,8 @@ namespace ASC.Files.Core.Services.NotifyService
             };
         }
     }
-
+
+    [Scope]
     public class NotifyClientScope
     {
         private NotifySource NotifySource { get; }
@@ -247,13 +248,11 @@ namespace ASC.Files.Core.Services.NotifyService
         }
     }
 
-    public static class NotifyClientExtension
+    public class NotifyClientExtension
     {
-        public static DIHelper AddNotifyClientService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<NotifyClientScope>();
-
-            return services;
+            services.TryAdd<NotifyClientScope>();
         }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
index 60834d5103..584f2a393b 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
@@ -27,8 +27,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-
+using System.Threading;
+
+using ASC.Common;
 using ASC.Core.Tenants;
 using ASC.Files.Core;
 using ASC.Files.Core.Resources;
@@ -275,7 +276,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
             return false;
         }
     }
-
+
+    [Scope]
     public class FileDeleteOperationScope
     {
         private FileMarker FileMarker { get; }
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
index 1697e860c4..359bcedb1c 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
@@ -29,8 +29,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading;
-
+using System.Threading;
+
+using ASC.Common;
 using ASC.Common.Security.Authentication;
 using ASC.Common.Threading;
 using ASC.Core.Tenants;
@@ -435,7 +436,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
             dic.Remove(name);
         }
     }
-
+
+    [Scope]
     public class FileDownloadOperationScope
     {
         private GlobalStore GlobalStore { get; }
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
index 187e8e3b22..fba88aa0a3 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
@@ -27,8 +27,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-
+using System.Threading;
+
+using ASC.Common;
 using ASC.Common.Security.Authentication;
 using ASC.Core.Common.Settings;
 using ASC.Core.Tenants;
@@ -134,7 +135,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
             Status += string.Join(SPLIT_CHAR, newrootfolder.ToArray());
         }
     }
-
+
+    [Scope]
     public class FileMarkAsReadOperationScope
     {
         private FileMarker FileMarker { get; }
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
index a03fd37d5e..d6eab1308a 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
@@ -27,8 +27,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json;
-
+using System.Text.Json;
+
+using ASC.Common;
 using ASC.Core.Tenants;
 using ASC.Files.Core;
 using ASC.Files.Core.Resources;
@@ -584,7 +585,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
             return false;
         }
     }
-
+
+    [Scope]
     public class FileMoveCopyOperationScope
     {
         private FilesMessageService FilesMessageService { get; }
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
index 0026f29f5b..d82a5b36ee 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
@@ -31,8 +31,9 @@ using System.Linq;
 using System.Security;
 using System.Security.Principal;
 using System.Threading;
-using System.Threading.Tasks;
-
+using System.Threading.Tasks;
+
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Common.Security.Authentication;
 using ASC.Common.Security.Authorizing;
@@ -391,7 +392,8 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
             TaskInfo.PublishChanges();
         }
     }
-
+
+    [Scope]
     public class FileOperationScope
     {
         private TenantManager TenantManager { get; }
diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
index 8230787d8a..598b3cef84 100644
--- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
+++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
@@ -39,7 +39,7 @@ using Microsoft.Extensions.Primitives;
 
 namespace ASC.Web.Files.Services.WCFService.FileOperations
 {
-    [Singletone]
+    [Singletone(Additional = typeof(FileOperationsManagerHelperExtention))]
     public class FileOperationsManager
     {
         private readonly DistributedTaskQueue tasks;
@@ -167,18 +167,15 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
         }
     }
 
-    public static class FileOperationsManagerHelperExtention
+    public class FileOperationsManagerHelperExtention
     {
-        public static DIHelper AddFileOperationsManagerHelperService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<FileDeleteOperationScope>();
-            services.TryAddScoped<FileMarkAsReadOperationScope>();
-            services.TryAddScoped<FileMoveCopyOperationScope>();
-            services.TryAddScoped<FileOperationScope>();
-            services.TryAddScoped<FileDownloadOperationScope>();
-
-            return services;
-
+            services.TryAdd<FileDeleteOperationScope>();
+            services.TryAdd<FileMarkAsReadOperationScope>();
+            services.TryAdd<FileMoveCopyOperationScope>();
+            services.TryAdd<FileOperationScope>();
+            services.TryAdd<FileDownloadOperationScope>();
         }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/FileConverter.cs b/products/ASC.Files/Core/Utils/FileConverter.cs
index d47d0e4740..2a83884cd8 100644
--- a/products/ASC.Files/Core/Utils/FileConverter.cs
+++ b/products/ASC.Files/Core/Utils/FileConverter.cs
@@ -60,7 +60,7 @@ using SecurityContext = ASC.Core.SecurityContext;
 
 namespace ASC.Web.Files.Utils
 {
-    [Singletone]
+    [Singletone(Additional = typeof(FileConverterQueueExtension))]
     internal class FileConverterQueue<T>
     {
         private readonly object singleThread = new object();
@@ -401,6 +401,7 @@ namespace ASC.Web.Files.Utils
         }
     }
 
+    [Scope]
     public class FileConverterQueueScope
     {
         private IOptionsMonitor<ILog> Options { get; }
@@ -488,7 +489,7 @@ namespace ASC.Web.Files.Utils
         public string FileJson { get; set; }
     }
 
-    [Scope]
+    [Scope(Additional = typeof(FileConverterExtension))]
     public class FileConverter
     {
         private FileUtility FileUtility { get; }
@@ -847,13 +848,20 @@ namespace ASC.Web.Files.Utils
         public string Password { get; set; }
     }
 
-    public static class FileConverterExtension
+    public class FileConverterQueueExtension
     {
-        public static DIHelper AddFileConverterService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<FileConverterQueueScope>();
-
-            return services;
+            services.TryAdd<FileConverterQueueScope>();
+        }
+    }
+
+    public class FileConverterExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<FileConverterQueue<int>>();
+            services.TryAdd<FileConverterQueue<string>>();
         }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Utils/FileMarker.cs b/products/ASC.Files/Core/Utils/FileMarker.cs
index f8be954784..c91882e28a 100644
--- a/products/ASC.Files/Core/Utils/FileMarker.cs
+++ b/products/ASC.Files/Core/Utils/FileMarker.cs
@@ -95,7 +95,7 @@ namespace ASC.Web.Files.Utils
         }
     }
 
-    [Scope]
+    [Scope(Additional = typeof(FileMarkerExtention))]
     public class FileMarker
     {
         private readonly ICache cache;
@@ -741,25 +741,17 @@ namespace ASC.Web.Files.Utils
         public Guid CurrentAccountId { get; set; }
     }
 
-    public static class FileMarkerExtention
+    public class FileMarkerExtention
     {
-        public static DIHelper AddFileMarkerService(this DIHelper services)
-        {
-            return services
-                .AddFileMarkerService<string>()
-                .AddFileMarkerService<int>()
-                ;
-        }
-
-        public static DIHelper AddFileMarkerService<T>(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddSingleton<WorkerQueueOptionsManager<AsyncTaskData<T>>>();
-            services.TryAddSingleton<WorkerQueue<AsyncTaskData<T>>>();
-            services.AddSingleton<IConfigureOptions<WorkerQueue<AsyncTaskData<T>>>, ConfigureWorkerQueue<AsyncTaskData<T>>>();
-
-            services.AddWorkerQueue<AsyncTaskData<T>>(1, (int)TimeSpan.FromSeconds(60).TotalMilliseconds, false, 1);
-
-            return services;
+            services.TryAdd<AsyncTaskData<int>>();
+            services.TryAdd<FileMarkerHelper<int>>();
+            services.AddWorkerQueue<AsyncTaskData<int>>(1, (int)TimeSpan.FromSeconds(60).TotalMilliseconds, false, 1);
+
+            services.TryAdd<AsyncTaskData<string>>();
+            services.TryAdd<FileMarkerHelper<string>>();
+            services.AddWorkerQueue<AsyncTaskData<string>>(1, (int)TimeSpan.FromSeconds(60).TotalMilliseconds, false, 1);
         }
     }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
index 2e18d0868d..13c4f04e58 100644
--- a/products/ASC.Files/Server/Startup.cs
+++ b/products/ASC.Files/Server/Startup.cs
@@ -6,6 +6,7 @@ using ASC.Api.Core;
 using ASC.Api.Documents;
 using ASC.Web.Files;
 using ASC.Web.Files.HttpHandlers;
+using ASC.Web.Studio.Core.Notify;
 
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -35,6 +36,13 @@ namespace ASC.Files
             base.ConfigureServices(services);
 
             DIHelper.TryAdd<FilesController>();
+            DIHelper.TryAdd<PrivacyRoomApi>();
+            DIHelper.TryAdd<FileHandlerService>();
+            DIHelper.TryAdd<ChunkedUploaderHandlerService>();
+            DIHelper.TryAdd<DocuSignHandlerService>();
+            DIHelper.TryAdd<ThirdPartyAppHandlerService>();
+
+            NotifyConfigurationExtension.Register(DIHelper);
 
             var a = $"{string.Join(",", DIHelper.Singleton.OrderBy(r => r).ToArray())},{string.Join(",", DIHelper.Scoped.OrderBy(r => r).ToArray())},{string.Join(",", DIHelper.Transient.OrderBy(r => r).ToArray())}";
             var b = 0;
diff --git a/web/ASC.Web.Core/Notify/NotifyConfiguration.cs b/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
index b40aa346b9..d8acd3bc07 100644
--- a/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
+++ b/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
@@ -42,6 +42,7 @@ using ASC.Notify;
 using ASC.Notify.Engine;
 using ASC.Notify.Messages;
 using ASC.Notify.Patterns;
+using ASC.Notify.Textile;
 using ASC.Web.Core;
 using ASC.Web.Core.Users;
 using ASC.Web.Core.WhiteLabel;
@@ -353,6 +354,7 @@ namespace ASC.Web.Studio.Core.Notify
         }
     }
 
+    [Scope]
     public class NotifyConfigurationScope
     {
         private TenantManager TenantManager { get; }
@@ -439,17 +441,14 @@ namespace ASC.Web.Studio.Core.Notify
         }
     }
 
-    public static class NotifyConfigurationExtension
+    public class NotifyConfigurationExtension
     {
-        public static DIHelper AddNotifyConfiguration(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            if (services.TryAddScoped<NotifyConfigurationScope>())
-            {
-
-                return services;
-            }
-
-            return services;
+            services.TryAdd<NotifyConfigurationScope>();
+            services.TryAdd<TextileStyler>();
+            services.TryAdd<JabberStyler>();
+            services.TryAdd<PushStyler>();
         }
     }
 }
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs b/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
index 312258f80a..abe210a3b5 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
@@ -112,14 +112,4 @@ namespace ASC.Web.Core.Notify
             Cache.Publish(item, CacheNotifyAction.Any);
         }
     }
-
-    public static class StudioNotifyServiceHelperExtension
-    {
-        public static DIHelper AddStudioNotifyServiceHelper(this DIHelper services)
-        {
-            services.TryAddSingleton(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs b/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
index b4bae92252..370435cd5b 100644
--- a/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
+++ b/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
@@ -54,7 +54,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.Core.Notify
 {
-    [Singletone]
+    [Singletone(Additional = typeof(StudioPeriodicNotifyExtension))]
     public class StudioPeriodicNotify
     {
         private IServiceProvider ServiceProvider { get; }
@@ -1226,13 +1226,11 @@ namespace ASC.Web.Studio.Core.Notify
         }
     }
 
-    public static class StudioPeriodicNotifyExtension
+    public class StudioPeriodicNotifyExtension
     {
-        public static DIHelper AddStudioPeriodicNotify(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<StudioPeriodicNotifyScope>();
-
-            return services;
+            services.TryAdd<StudioPeriodicNotifyScope>();
         }
     }
 }
\ No newline at end of file

From 035a98b878502e015b5267b286b7fd8a1941b2b0 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 26 Oct 2020 16:38:21 +0300
Subject: [PATCH 11/22] Refactoring: scope. Backup

---
 common/ASC.Common/DIHelper.cs                 | 10 ++++----
 .../Threading/Progress/ProgressQueue.cs       |  9 ++++---
 .../ASC.Data.Backup/Core/NotifyHelper.cs      |  3 ++-
 .../Service/BackupCleanerService.cs           | 10 +++++++-
 .../Service/BackupSchedulerService.cs         | 10 +++++++-
 .../ASC.Data.Backup/Service/BackupWorker.cs   | 24 ++++++++++++-------
 common/services/ASC.Data.Backup/Startup.cs    | 12 ++++++++--
 7 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 5e0abb59a2..6ce3b5ac09 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -149,12 +149,12 @@ namespace ASC.Common
             if (Added.Contains(serviceName)) return false;
             Added.Add(serviceName);
 
-            if (serviceName == "ASC.FederatedLogin.AccountLinker")
+            if (serviceName == "ASC.Common.Threading.Progress.ProgressQueueOptionsManager`1[ASC.Data.Backup.Service.BaseBackupProgressItem]")
             {
                 var qqaz = 0;
             }
 
-            var di = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
+            var di = service.IsGenericType && (service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || service.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var isnew = false;
 
             if (di != null)
@@ -175,7 +175,7 @@ namespace ASC.Common
                 {
                     if (di.Service != null)
                     {
-                        var a = di.Service.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                        var a = di.Service.GetInterfaces().FirstOrDefault(x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || x.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)));
                         if (a != null)
                         {
                             if (!a.ContainsGenericParameters)
@@ -226,7 +226,7 @@ namespace ASC.Common
 
                     if (di.Implementation != null)
                     {
-                        var a = di.Implementation.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
+                        var a = di.Implementation.GetInterfaces().FirstOrDefault(x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || x.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)));
                         if (a != null)
                         {
                             if (!a.ContainsGenericParameters)
@@ -346,7 +346,7 @@ namespace ASC.Common
         private bool Register(Type service, Type implementation)
         {
             if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter))) return true;
-            var c = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
+            var c = service.IsGenericType && (service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || service.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var serviceName = $"{service}{implementation}";
             if (c is ScopeAttribute)
             {
diff --git a/common/ASC.Common/Threading/Progress/ProgressQueue.cs b/common/ASC.Common/Threading/Progress/ProgressQueue.cs
index 0aacc64a08..0fcfec7671 100644
--- a/common/ASC.Common/Threading/Progress/ProgressQueue.cs
+++ b/common/ASC.Common/Threading/Progress/ProgressQueue.cs
@@ -33,14 +33,16 @@ using ASC.Common.Threading.Workers;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Common.Threading.Progress
-{
+{
+    [Singletone(typeof(ConfigureProgressQueue<>))]
     public class ProgressQueueOptionsManager<T> : OptionsManager<ProgressQueue<T>> where T : class, IProgressItem
     {
         public ProgressQueueOptionsManager(IOptionsFactory<ProgressQueue<T>> factory) : base(factory)
         {
         }
     }
-
+
+    [Singletone]
     public class ConfigureProgressQueue<T> : IPostConfigureOptions<ProgressQueue<T>> where T : class, IProgressItem
     {
         public ConfigureProgressQueue(IOptionsMonitor<ILog> log)
@@ -56,7 +58,8 @@ namespace ASC.Common.Threading.Progress
             queue.Start(x => x.RunJob());
         }
     }
-
+
+    [Singletone]
     public class ProgressQueue<T> : WorkerQueue<T> where T : class, IProgressItem
     {
         public bool removeAfterCompleted;
diff --git a/common/services/ASC.Data.Backup/Core/NotifyHelper.cs b/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
index bd1d284d4a..6de260958d 100644
--- a/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
+++ b/common/services/ASC.Data.Backup/Core/NotifyHelper.cs
@@ -144,7 +144,8 @@ namespace ASC.Data.Backup
             }
         }
     }
-
+
+    [Scope]
     public class NotifyHelperScope
     {
         private UserManager UserManager { get; }
diff --git a/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs b/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs
index 44ef40b738..d38b4a9311 100644
--- a/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupCleanerService.cs
@@ -103,7 +103,7 @@ namespace ASC.Data.Backup.Service
         }
     }
 
-    [Singletone]
+    [Singletone(Additional = typeof(BackupCleanerServiceExtension))]
     public class BackupCleanerService
     {
         private readonly object cleanerLock = new object();
@@ -171,5 +171,13 @@ namespace ASC.Data.Backup.Service
                 }
             }
         }
+    }
+
+    public class BackupCleanerServiceExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<BackupCleanerHelperService>();
+        }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs b/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs
index a8679213eb..632d9663e5 100644
--- a/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupSchedulerService.cs
@@ -96,7 +96,7 @@ namespace ASC.Data.Backup.Service
         }
     }
 
-    [Singletone]
+    [Singletone(Additional = typeof(BackupSchedulerServiceExtension))]
     public class BackupSchedulerService
     {
         private readonly object schedulerLock = new object();
@@ -162,5 +162,13 @@ namespace ASC.Data.Backup.Service
                 }
             }
         }
+    }
+
+    public class BackupSchedulerServiceExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<BackupSchedulerServiceHelper>();
+        }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Service/BackupWorker.cs b/common/services/ASC.Data.Backup/Service/BackupWorker.cs
index 8edb6d0d4c..c0658941e0 100644
--- a/common/services/ASC.Data.Backup/Service/BackupWorker.cs
+++ b/common/services/ASC.Data.Backup/Service/BackupWorker.cs
@@ -50,7 +50,7 @@ using Newtonsoft.Json;
 
 namespace ASC.Data.Backup.Service
 {
-    [Singletone]
+    [Singletone(Additional = typeof(BackupWorkerExtension))]
     public class BackupWorker
     {
         private ILog Log { get; set; }
@@ -730,7 +730,7 @@ namespace ASC.Data.Backup.Service
         }
     }
 
-    [Singletone]
+    [Singletone(Additional = typeof(FactoryProgressItemExtension))]
     public class FactoryProgressItem
     {
         public IServiceProvider ServiceProvider { get; }
@@ -797,6 +797,7 @@ namespace ASC.Data.Backup.Service
         }
     }
 
+    [Scope]
     internal class BackupWorkerScope
     {
         private TenantManager TenantManager { get; }
@@ -852,16 +853,21 @@ namespace ASC.Data.Backup.Service
         }
     }
 
-    public static class BackupWorkerExtension
+    public class BackupWorkerExtension
     {
-        public static DIHelper AddBackupWorkerService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<BackupWorkerScope>();
-            services.TryAddSingleton<ProgressQueueOptionsManager<BaseBackupProgressItem>>();
-            services.TryAddSingleton<ProgressQueue<BaseBackupProgressItem>>();
-            services.AddSingleton<IPostConfigureOptions<ProgressQueue<BaseBackupProgressItem>>, ConfigureProgressQueue<BaseBackupProgressItem>>();
+            services.TryAdd<BackupWorkerScope>();
+        }
+    }
 
-            return services;
+    public class FactoryProgressItemExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<BackupProgressItem>();
+            services.TryAdd<RestoreProgressItem>();
+            services.TryAdd<TransferProgressItem>();
         }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Startup.cs b/common/services/ASC.Data.Backup/Startup.cs
index d44b900cde..99c189deab 100644
--- a/common/services/ASC.Data.Backup/Startup.cs
+++ b/common/services/ASC.Data.Backup/Startup.cs
@@ -1,8 +1,11 @@
 using System;
-
+using System.Linq;
+
 using ASC.Api.Core;
 using ASC.Common;
+using ASC.Data.Backup.Controllers;
 using ASC.Data.Backup.Service;
+using ASC.Web.Studio.Core.Notify;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -21,9 +24,14 @@ namespace ASC.Data.Backup
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            base.ConfigureServices(services);
+            base.ConfigureServices(services);
+
             DIHelper.AddProgressQueue<BaseBackupProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
 
+            DIHelper.TryAdd<BackupServiceLauncher>();
+            DIHelper.TryAdd<BackupController>();
+            NotifyConfigurationExtension.Register(DIHelper);
+
             services.AddHostedService<BackupServiceLauncher>();
         }
     }

From af99020de04f275c7de2f2e5d994df4b081ab574 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 26 Oct 2020 17:23:23 +0300
Subject: [PATCH 12/22] Scope: refactoring. Encryption

---
 common/ASC.Data.Storage/Configuration/Appender.cs           | 2 +-
 common/ASC.Data.Storage/StorageFactory.cs                   | 2 +-
 common/services/ASC.ApiSystem/Classes/CommonMethods.cs      | 6 ++++--
 .../ASC.Data.Storage.Encryption/EncryptionOperation.cs      | 3 ++-
 common/services/ASC.Data.Storage.Encryption/Startup.cs      | 4 +++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/ASC.Data.Storage/Configuration/Appender.cs b/common/ASC.Data.Storage/Configuration/Appender.cs
index 741935c2e7..e23dae778f 100644
--- a/common/ASC.Data.Storage/Configuration/Appender.cs
+++ b/common/ASC.Data.Storage/Configuration/Appender.cs
@@ -18,7 +18,7 @@ namespace ASC.Data.Storage.Configuration
         }
     }
 
-    [Singletone(Additional = typeof(StorageConfigExtension))]
+    [Singletone]
     public class Storage
     {
         public IEnumerable<Appender> Appender { get; set; }
diff --git a/common/ASC.Data.Storage/StorageFactory.cs b/common/ASC.Data.Storage/StorageFactory.cs
index 9c29884041..9d1d8b8e5e 100644
--- a/common/ASC.Data.Storage/StorageFactory.cs
+++ b/common/ASC.Data.Storage/StorageFactory.cs
@@ -73,7 +73,7 @@ namespace ASC.Data.Storage
         }
     }
 
-    [Singletone]
+    [Singletone(Additional = typeof(StorageConfigExtension))]
     public class StorageFactoryConfig
     {
         public Configuration.Storage Section { get; }
diff --git a/common/services/ASC.ApiSystem/Classes/CommonMethods.cs b/common/services/ASC.ApiSystem/Classes/CommonMethods.cs
index 7168f9a4a0..83121c6bce 100644
--- a/common/services/ASC.ApiSystem/Classes/CommonMethods.cs
+++ b/common/services/ASC.ApiSystem/Classes/CommonMethods.cs
@@ -75,8 +75,10 @@ namespace ASC.ApiSystem.Controllers
         private HostedSolution HostedSolution { get; }
 
         private IMemoryCache MemoryCache { get; }
-        public CoreBaseSettings CoreBaseSettings { get; }
-        public TenantManager TenantManager { get; }
+
+        private CoreBaseSettings CoreBaseSettings { get; }
+
+        private TenantManager TenantManager { get; }
 
         public CommonMethods(
             IHttpContextAccessor httpContextAccessor,
diff --git a/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs b/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
index a236b8b80a..ea16aa0929 100644
--- a/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
+++ b/common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
@@ -333,7 +333,8 @@ namespace ASC.Data.Storage.Encryption
             }
         }
     }
-
+
+    [Scope]
     public class EncryptionOperationScope
     {
         private ILog Log { get; set; }
diff --git a/common/services/ASC.Data.Storage.Encryption/Startup.cs b/common/services/ASC.Data.Storage.Encryption/Startup.cs
index 40c322fe65..cca1dbb8f0 100644
--- a/common/services/ASC.Data.Storage.Encryption/Startup.cs
+++ b/common/services/ASC.Data.Storage.Encryption/Startup.cs
@@ -23,6 +23,8 @@
  *
 */
 
+using System.Linq;
+
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Common.DependencyInjection;
@@ -48,7 +50,7 @@ namespace ASC.Data.Storage.Encryption
         {
             base.ConfigureServices(services);
 
-            DIHelper.AddEncryptionServiceLauncher();
+            DIHelper.TryAdd<EncryptionServiceLauncher>();
 
             services.AddHostedService<EncryptionServiceLauncher>();
 

From 75bbe888cdf0d20f8cbc867381f3a7c0895c05a4 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Mon, 26 Oct 2020 19:38:23 +0300
Subject: [PATCH 13/22] Scope: refactoring. Migration, ASC.Files.Service

---
 common/ASC.Common/DIHelper.cs                    |  4 ++--
 .../MigrationServiceLauncher.cs                  |  9 ++++++---
 .../ASC.Data.Storage.Migration/Program.cs        |  6 +++++-
 .../ASC.ElasticSearch/Service/Launcher.cs        | 11 +++++------
 .../ASC.ElasticSearch/Service/Service.cs         | 10 +++++++++-
 .../Service/FeedAggregatorService.cs             | 16 +++++++++++-----
 .../Core/Core/Search/FactoryIndexerFile.cs       | 10 +++++++++-
 .../Core/Core/Search/FactoryIndexerFolder.cs     | 10 +++++++++-
 .../Core/Thirdparty/CachedProviderAccountDao.cs  |  3 +--
 products/ASC.Files/Service/Program.cs            | 12 ++++++++++++
 10 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 6ce3b5ac09..6e061c7157 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -102,7 +102,7 @@ namespace ASC.Common
             Configured = new List<string>();
         }
 
-        public DIHelper(IServiceCollection serviceCollection)
+        public DIHelper(IServiceCollection serviceCollection) : this()
         {
             ServiceCollection = serviceCollection;
         }
@@ -136,7 +136,7 @@ namespace ASC.Common
 
         public bool TryAdd(Type service, Type implementation = null)
         {
-            if (service.IsInterface && service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IOptionsSnapshot<>))
+            if (service.IsInterface && service.IsGenericType && (service.GetGenericTypeDefinition() == typeof(IOptionsSnapshot<>) || service.GetGenericTypeDefinition() == typeof(IOptions<>)))
             {
                 service = service.GetGenericArguments().FirstOrDefault();
                 if (service == null)
diff --git a/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs b/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
index 87a4aec21e..9ec13913c2 100644
--- a/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
+++ b/common/services/ASC.Data.Storage.Migration/MigrationServiceLauncher.cs
@@ -25,12 +25,15 @@
 
 
 using System.Threading;
-using System.Threading.Tasks;
-
+using System.Threading.Tasks;
+
+using ASC.Common;
+
 using Microsoft.Extensions.Hosting;
 
 namespace ASC.Data.Storage.Migration
-{
+{
+    [Singletone]
     public class MigrationServiceLauncher : IHostedService
     {
         public MigrationService MigrationService { get; }
diff --git a/common/services/ASC.Data.Storage.Migration/Program.cs b/common/services/ASC.Data.Storage.Migration/Program.cs
index 2dca3bbd54..a518ba7830 100644
--- a/common/services/ASC.Data.Storage.Migration/Program.cs
+++ b/common/services/ASC.Data.Storage.Migration/Program.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 
@@ -47,7 +49,9 @@ namespace ASC.Data.Storage.Migration
                 {
                     var diHelper = new DIHelper(services);
 
-                    diHelper.AddNLogManager("ASC.Data.Storage.Migration", "ASC.Migration");
+                    diHelper.AddNLogManager("ASC.Data.Storage.Migration", "ASC.Migration");
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
+
                     diHelper.TryAdd<MigrationServiceLauncher>();
                     services.AddHostedService<MigrationServiceLauncher>();
 
diff --git a/common/services/ASC.ElasticSearch/Service/Launcher.cs b/common/services/ASC.ElasticSearch/Service/Launcher.cs
index 5c921de346..042b6d0448 100644
--- a/common/services/ASC.ElasticSearch/Service/Launcher.cs
+++ b/common/services/ASC.ElasticSearch/Service/Launcher.cs
@@ -42,7 +42,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.ElasticSearch
 {
-    [Singletone]
+    [Singletone(Additional = typeof(ServiceLauncherExtension))]
     public class ServiceLauncher : IHostedService
     {
         private ILog Log { get; }
@@ -181,6 +181,7 @@ namespace ASC.ElasticSearch
         }
     }
 
+    [Scope]
     public class ServiceLauncherScope
     {
         private FactoryIndexer FactoryIndexer { get; }
@@ -199,13 +200,11 @@ namespace ASC.ElasticSearch
         }
     }
 
-    public static class ServiceLauncherExtension
+    public class ServiceLauncherExtension
     {
-        public static DIHelper AddServiceLauncher(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<ServiceLauncherScope>();
-
-            return services;
+            services.TryAdd<ServiceLauncherScope>();
         }
     }
 }
diff --git a/common/services/ASC.ElasticSearch/Service/Service.cs b/common/services/ASC.ElasticSearch/Service/Service.cs
index c964a549c6..89aa3b94d2 100644
--- a/common/services/ASC.ElasticSearch/Service/Service.cs
+++ b/common/services/ASC.ElasticSearch/Service/Service.cs
@@ -41,7 +41,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.ElasticSearch.Service
 {
-    [Singletone]
+    [Singletone(Additional = typeof(ServiceExtension))]
     public class Service
     {
         public IContainer Container { get; }
@@ -122,5 +122,13 @@ namespace ASC.ElasticSearch.Service
             tenantManager = TenantManager;
             settingsManager = SettingsManager;
         }
+    }
+
+    internal class ServiceExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<ServiceScope>();
+        }
     }
 }
diff --git a/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs b/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
index 74485286a1..e092a3ae1f 100644
--- a/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
+++ b/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs
@@ -49,7 +49,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Feed.Aggregator
 {
-    [Singletone]
+    [Singletone(Additional = typeof(FeedAggregatorServiceExtension))]
     public class FeedAggregatorService : IHostedService
     {
         private ILog Log { get; set; }
@@ -71,15 +71,13 @@ namespace ASC.Feed.Aggregator
             IServiceProvider serviceProvider,
             IContainer container,
             IOptionsMonitor<ILog> optionsMonitor,
-            SignalrServiceClient signalrServiceClient,
-            IConfigureNamedOptions<SignalrServiceClient> configureOptions)
+            IOptionsSnapshot<SignalrServiceClient> optionsSnapshot)
         {
             Configuration = configuration;
             ServiceProvider = serviceProvider;
             Container = container;
             Log = optionsMonitor.Get("ASC.Feed.Agregator");
-            SignalrServiceClient = signalrServiceClient;
-            configureOptions.Configure("counters", SignalrServiceClient);
+            SignalrServiceClient = optionsSnapshot.Get("counters");
         }
 
         public Task StartAsync(CancellationToken cancellationToken)
@@ -329,4 +327,12 @@ namespace ASC.Feed.Aggregator
             authManager = AuthManager;
         }
     }
+
+    public class FeedAggregatorServiceExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<FeedAggregatorServiceScope>();
+        }
+    }
 }
\ No newline at end of file
diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
index 77469f0938..98e0aceafa 100644
--- a/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
+++ b/products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
@@ -41,7 +41,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Core.Search
 {
-    [Scope]
+    [Scope(Additional = typeof(FactoryIndexerFileExtension))]
     public class FactoryIndexerFile : FactoryIndexer<DbFile>
     {
         private IDaoFactory DaoFactory { get; }
@@ -113,5 +113,13 @@ namespace ASC.Web.Files.Core.Search
         {
             get { return FilesCommonResource.IndexTitle; }
         }
+    }
+
+    public class FactoryIndexerFileExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<DbFile>();
+        }
     }
 }
diff --git a/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs b/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
index 12b4d6a6c9..cd4938ff70 100644
--- a/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
+++ b/products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
@@ -41,7 +41,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Files.Core.Search
 {
-    [Scope]
+    [Scope(Additional = typeof(FactoryIndexerFolderExtension))]
     public class FactoryIndexerFolder : FactoryIndexer<DbFolder>
     {
         private IDaoFactory DaoFactory { get; }
@@ -100,5 +100,13 @@ namespace ASC.Web.Files.Core.Search
                 throw;
             }
         }
+    }
+
+    public class FactoryIndexerFolderExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<DbFolder>();
+        }
     }
 }
diff --git a/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs b/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
index c106a94243..da4083507f 100644
--- a/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
+++ b/products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
@@ -67,7 +67,7 @@ namespace ASC.Files.Thirdparty
         private readonly ConcurrentDictionary<string, IProviderInfo> cache;
         private readonly ICacheNotify<ProviderAccountCacheItem> cacheNotify;
 
-        private readonly string _rootKey;
+        private string _rootKey { get => TenantID.ToString(CultureInfo.InvariantCulture); }
 
         public CachedProviderAccountDao(
             IServiceProvider serviceProvider,
@@ -83,7 +83,6 @@ namespace ASC.Files.Thirdparty
         {
             cache = cachedProviderAccountDaoNotify.Cache;
             cacheNotify = cachedProviderAccountDaoNotify.CacheNotify;
-            _rootKey = tenantManager.GetCurrentTenant().TenantId.ToString(CultureInfo.InvariantCulture);
         }
 
         public override IProviderInfo GetProviderInfo(int linkId)
diff --git a/products/ASC.Files/Service/Program.cs b/products/ASC.Files/Service/Program.cs
index 6f5e37193f..e5e482643b 100644
--- a/products/ASC.Files/Service/Program.cs
+++ b/products/ASC.Files/Service/Program.cs
@@ -1,12 +1,16 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 using ASC.ElasticSearch;
 using ASC.Feed.Aggregator;
+using ASC.Web.Files.Core.Search;
+using ASC.Web.Files.Utils;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -49,10 +53,18 @@ namespace ASC.Files.Service
                 {
                     var diHelper = new DIHelper(services);
 
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.AddNLogManager("ASC.Files");
                     services.AddHostedService<ServiceLauncher>();
+                    diHelper.TryAdd<ServiceLauncher>();
+
                     diHelper.AddNLogManager("ASC.Feed.Agregator");
                     services.AddHostedService<FeedAggregatorService>();
+                    diHelper.TryAdd<FeedAggregatorService>();
+
+                    //diHelper.TryAdd<FileConverter>();
+                    diHelper.TryAdd<FactoryIndexerFile>();
+                    diHelper.TryAdd<FactoryIndexerFolder>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath, true, false, "search.json", "feed.json");
                 })

From e9a9b320e87758a6c1c4da3d0b959f342b23fd3b Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Tue, 27 Oct 2020 18:34:22 +0300
Subject: [PATCH 14/22] Scope: refactoring. Notify, People

---
 common/ASC.Api.Core/Core/BaseStartup.cs         |  1 -
 common/ASC.Common/DIHelper.cs                   |  2 +-
 .../ASC.Core.Common/Notify/Senders/AWSSender.cs | 14 +++++++-------
 .../Notify/Senders/JabberSender.cs              | 10 +++++++++-
 .../Notify/Senders/SmtpSender.cs                | 12 ++++++------
 common/ASC.Data.Reassigns/QueueWorker.cs        |  4 ++--
 .../ASC.Data.Reassigns/ReassignProgressItem.cs  | 17 ++++++-----------
 common/ASC.Data.Reassigns/RemoveProgressItem.cs | 12 +++++-------
 common/services/ASC.Data.Backup/Startup.cs      |  1 -
 .../ASC.Data.Storage.Encryption/Startup.cs      |  2 --
 .../ASC.Data.Storage.Migration/Program.cs       |  1 -
 .../ASC.Notify/Config/NotifyServiceCfg.cs       |  1 +
 common/services/ASC.Notify/DbWorker.cs          | 10 +++++++++-
 common/services/ASC.Notify/NotifyService.cs     | 11 +++++------
 .../ASC.Notify/NotifyServiceLauncher.cs         |  7 +++++--
 common/services/ASC.Notify/Program.cs           | 15 ++++++++++++++-
 products/ASC.Files/Server/Startup.cs            |  4 ----
 products/ASC.Files/Service/Program.cs           |  2 --
 products/ASC.People/Server/Startup.cs           | 13 +++++++------
 web/ASC.Web.Core/Notify/StudioNotifyService.cs  |  7 +++----
 20 files changed, 80 insertions(+), 66 deletions(-)

diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs
index ccca67d944..3c125b5ff3 100644
--- a/common/ASC.Api.Core/Core/BaseStartup.cs
+++ b/common/ASC.Api.Core/Core/BaseStartup.cs
@@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 
 namespace ASC.Api.Core
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 6e061c7157..161a1c9b2e 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -149,7 +149,7 @@ namespace ASC.Common
             if (Added.Contains(serviceName)) return false;
             Added.Add(serviceName);
 
-            if (serviceName == "ASC.Common.Threading.Progress.ProgressQueueOptionsManager`1[ASC.Data.Backup.Service.BaseBackupProgressItem]")
+            if (serviceName == "ASC.Notify.DbWorker")
             {
                 var qqaz = 0;
             }
diff --git a/common/ASC.Core.Common/Notify/Senders/AWSSender.cs b/common/ASC.Core.Common/Notify/Senders/AWSSender.cs
index d9297f9e9b..2ba94163cd 100644
--- a/common/ASC.Core.Common/Notify/Senders/AWSSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/AWSSender.cs
@@ -46,8 +46,8 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Notify.Senders
 {
-    [Singletone]
-    class AWSSender : SmtpSender
+    [Singletone(Additional = typeof(AWSSenderExtension))]
+    public class AWSSender : SmtpSender
     {
         private readonly object locker = new object();
         private AmazonSimpleEmailServiceClient ses;
@@ -230,7 +230,8 @@ namespace ASC.Core.Notify.Senders
             return quota == null || (DateTime.UtcNow - lastRefresh) > refreshTimeout;
         }
     }
-
+
+    [Scope]
     public class AWSSenderScope
     {
         private TenantManager TenantManager { get; }
@@ -248,12 +249,11 @@ namespace ASC.Core.Notify.Senders
         }
     }
 
-    public static class AWSSenderExtension
+    public class AWSSenderExtension
     {
-        public static DIHelper AddAWSSenderService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<AWSSenderScope>();
-            return services;
+            services.TryAdd<AWSSenderScope>();
         }
     }
 }
diff --git a/common/ASC.Core.Common/Notify/Senders/JabberSender.cs b/common/ASC.Core.Common/Notify/Senders/JabberSender.cs
index 3f8cc6bafb..1adf0f70af 100644
--- a/common/ASC.Core.Common/Notify/Senders/JabberSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/JabberSender.cs
@@ -38,7 +38,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Notify.Senders
 {
-    [Singletone]
+    [Singletone(Additional = typeof(JabberSenderExtension))]
     public class JabberSender : INotifySender
     {
         private readonly ILog log;
@@ -76,5 +76,13 @@ namespace ASC.Core.Notify.Senders
             }
             return NoticeSendResult.OK;
         }
+    }
+
+    public class JabberSenderExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<JabberServiceClient>();
+        }
     }
 }
diff --git a/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs b/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
index bc0ac61e16..2705e41a96 100644
--- a/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
@@ -46,8 +46,8 @@ using MimeKit;
 
 namespace ASC.Core.Notify.Senders
 {
-    [Singletone]
-    internal class SmtpSender : INotifySender
+    [Singletone(Additional = typeof(SmtpSenderExtension))]
+    public class SmtpSender : INotifySender
     {
         private const string HTML_FORMAT =
             @"<!DOCTYPE html PUBLIC ""-//W3C//DTD HTML 4.01 Transitional//EN"">
@@ -322,7 +322,8 @@ namespace ASC.Core.Notify.Senders
             }
         }
     }
-
+
+    [Scope]
     public class SmtpSenderScope
     {
         private TenantManager TenantManager { get; }
@@ -340,12 +341,11 @@ namespace ASC.Core.Notify.Senders
         }
     }
 
-    public static class SmtpSenderExtension
+    public class SmtpSenderExtension
     {
-        public static DIHelper AddSmtpSenderService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
             services.TryAddScoped<SmtpSenderScope>();
-            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Data.Reassigns/QueueWorker.cs b/common/ASC.Data.Reassigns/QueueWorker.cs
index 22ce015179..a68191889b 100644
--- a/common/ASC.Data.Reassigns/QueueWorker.cs
+++ b/common/ASC.Data.Reassigns/QueueWorker.cs
@@ -105,7 +105,7 @@ namespace ASC.Data.Reassigns
         }
     }
 
-    [Scope]
+    [Scope(Additional = typeof(ReassignProgressItemExtension))]
     public class QueueWorkerReassign : QueueWorker<ReassignProgressItem>
     {
         private QueueWorkerRemove QueueWorkerRemove { get; }
@@ -125,7 +125,7 @@ namespace ASC.Data.Reassigns
         }
     }
 
-    [Scope]
+    [Scope(Additional = typeof(RemoveProgressItemExtension))]
     public class QueueWorkerRemove : QueueWorker<RemoveProgressItem>
     {
         public QueueWorkerRemove(
diff --git a/common/ASC.Data.Reassigns/ReassignProgressItem.cs b/common/ASC.Data.Reassigns/ReassignProgressItem.cs
index 81a3e31eb3..d9632fb520 100644
--- a/common/ASC.Data.Reassigns/ReassignProgressItem.cs
+++ b/common/ASC.Data.Reassigns/ReassignProgressItem.cs
@@ -206,7 +206,8 @@ namespace ASC.Data.Reassigns
                 messageService.Send(MessageAction.UserDeleted, messageTarget.Create(FromUser), userName);
         }
     }
-
+
+    [Scope]
     public class ReassignProgressItemScope
     {
         private TenantManager TenantManager { get; }
@@ -267,18 +268,12 @@ namespace ASC.Data.Reassigns
         }
     }
 
-    public static class ReassignProgressItemExtension
+    public class ReassignProgressItemExtension
     {
-        public static DIHelper AddReassignProgressItemService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            if (services.TryAddScoped<ReassignProgressItemScope>())
-            {
-                services.TryAddSingleton<ProgressQueueOptionsManager<ReassignProgressItem>>();
-                services.TryAddSingleton<ProgressQueue<ReassignProgressItem>>();
-                services.AddSingleton<IPostConfigureOptions<ProgressQueue<ReassignProgressItem>>, ConfigureProgressQueue<ReassignProgressItem>>();
-            }
-
-            return services;
+            services.TryAdd<ReassignProgressItemScope>();
+            services.AddProgressQueue<ReassignProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
         }
     }
 }
diff --git a/common/ASC.Data.Reassigns/RemoveProgressItem.cs b/common/ASC.Data.Reassigns/RemoveProgressItem.cs
index 16868f000a..b78c748903 100644
--- a/common/ASC.Data.Reassigns/RemoveProgressItem.cs
+++ b/common/ASC.Data.Reassigns/RemoveProgressItem.cs
@@ -245,7 +245,8 @@ namespace ASC.Data.Reassigns
             studioNotifyService.SendMsgRemoveUserDataFailed(_currentUserId, User, userName, errorMessage);
         }
     }
-
+
+    [Scope]
     public class RemoveProgressItemScope
     {
         private TenantManager TenantManager { get; }
@@ -313,13 +314,10 @@ namespace ASC.Data.Reassigns
 
     public static class RemoveProgressItemExtension
     {
-        public static DIHelper AddRemoveProgressItemService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddSingleton<ProgressQueueOptionsManager<RemoveProgressItem>>();
-            services.TryAddSingleton<ProgressQueue<RemoveProgressItem>>();
-            services.TryAddScoped<RemoveProgressItemScope>();
-            services.AddSingleton<IPostConfigureOptions<ProgressQueue<RemoveProgressItem>>, ConfigureProgressQueue<RemoveProgressItem>>();
-            return services;
+            services.TryAdd<RemoveProgressItemScope>();
+            services.AddProgressQueue<RemoveProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
         }
     }
 }
diff --git a/common/services/ASC.Data.Backup/Startup.cs b/common/services/ASC.Data.Backup/Startup.cs
index 99c189deab..735d3e958f 100644
--- a/common/services/ASC.Data.Backup/Startup.cs
+++ b/common/services/ASC.Data.Backup/Startup.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 using ASC.Api.Core;
 using ASC.Common;
diff --git a/common/services/ASC.Data.Storage.Encryption/Startup.cs b/common/services/ASC.Data.Storage.Encryption/Startup.cs
index cca1dbb8f0..2bb0b2c218 100644
--- a/common/services/ASC.Data.Storage.Encryption/Startup.cs
+++ b/common/services/ASC.Data.Storage.Encryption/Startup.cs
@@ -23,8 +23,6 @@
  *
 */
 
-using System.Linq;
-
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Common.DependencyInjection;
diff --git a/common/services/ASC.Data.Storage.Migration/Program.cs b/common/services/ASC.Data.Storage.Migration/Program.cs
index a518ba7830..205199c2b1 100644
--- a/common/services/ASC.Data.Storage.Migration/Program.cs
+++ b/common/services/ASC.Data.Storage.Migration/Program.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 
 using ASC.Common;
diff --git a/common/services/ASC.Notify/Config/NotifyServiceCfg.cs b/common/services/ASC.Notify/Config/NotifyServiceCfg.cs
index 23263a6d68..3bfbd25b3c 100644
--- a/common/services/ASC.Notify/Config/NotifyServiceCfg.cs
+++ b/common/services/ASC.Notify/Config/NotifyServiceCfg.cs
@@ -34,6 +34,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Notify.Config
 {
+    [Singletone]
     public class ConfigureNotifyServiceCfg : IConfigureOptions<NotifyServiceCfg>
     {
         public ConfigureNotifyServiceCfg(IServiceProvider serviceProvider)
diff --git a/common/services/ASC.Notify/DbWorker.cs b/common/services/ASC.Notify/DbWorker.cs
index adbafb8055..17f92e59aa 100644
--- a/common/services/ASC.Notify/DbWorker.cs
+++ b/common/services/ASC.Notify/DbWorker.cs
@@ -46,7 +46,7 @@ using Newtonsoft.Json;
 
 namespace ASC.Notify
 {
-    [Singletone]
+    [Singletone(Additional = typeof(DbWorkerExtension))]
     public class DbWorker
     {
         private readonly string dbid;
@@ -223,4 +223,12 @@ namespace ASC.Notify
             tx.Commit();
         }
     }
+
+    public class DbWorkerExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<DbContextManager<NotifyDbContext>>();
+        }
+    }
 }
diff --git a/common/services/ASC.Notify/NotifyService.cs b/common/services/ASC.Notify/NotifyService.cs
index 06eae1c106..7507390e16 100644
--- a/common/services/ASC.Notify/NotifyService.cs
+++ b/common/services/ASC.Notify/NotifyService.cs
@@ -40,7 +40,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Notify
 {
-    [Singletone]
+    [Singletone(Additional = typeof(NotifyServiceExtension))]
     public class NotifyService : INotifyService, IDisposable
     {
         private ILog Log { get; }
@@ -120,6 +120,7 @@ namespace ASC.Notify
         }
     }
 
+    [Scope]
     public class NotifyServiceScope
     {
         private TenantManager TenantManager { get; }
@@ -141,13 +142,11 @@ namespace ASC.Notify
         }
     }
 
-    public static class NotifyServiceExtension
+    public class NotifyServiceExtension
     {
-        public static DIHelper AddNotifyService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<NotifyServiceScope>();
-
-            return services;
+            services.TryAdd<NotifyServiceScope>();
         }
     }
 }
diff --git a/common/services/ASC.Notify/NotifyServiceLauncher.cs b/common/services/ASC.Notify/NotifyServiceLauncher.cs
index 0508ea66f9..a3c0ccf078 100644
--- a/common/services/ASC.Notify/NotifyServiceLauncher.cs
+++ b/common/services/ASC.Notify/NotifyServiceLauncher.cs
@@ -29,6 +29,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core.Common;
 using ASC.Notify.Config;
@@ -40,6 +41,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Notify
 {
+    [Singletone]
     public class ConfigureCommonLinkUtilitySettings : IConfigureOptions<CommonLinkUtilitySettings>
     {
         public ConfigureCommonLinkUtilitySettings(IOptions<NotifyServiceCfg> notifyServiceCfg)
@@ -55,15 +57,16 @@ namespace ASC.Notify
         }
     }
 
+    [Singletone]
     public class NotifyServiceLauncher : IHostedService
     {
-        public NotifyServiceCfg NotifyServiceCfg { get; }
+        private NotifyServiceCfg NotifyServiceCfg { get; }
         private NotifyService NotifyService { get; }
         private NotifySender NotifySender { get; }
         private NotifyCleaner NotifyCleaner { get; }
         private WebItemManager WebItemManager { get; }
         private IServiceProvider ServiceProvider { get; }
-        public ILog Log { get; }
+        private ILog Log { get; }
 
         public NotifyServiceLauncher(
             IOptions<NotifyServiceCfg> notifyServiceCfg,
diff --git a/common/services/ASC.Notify/Program.cs b/common/services/ASC.Notify/Program.cs
index f4bc740b9c..6d7da418ed 100644
--- a/common/services/ASC.Notify/Program.cs
+++ b/common/services/ASC.Notify/Program.cs
@@ -1,16 +1,20 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 using ASC.Core.Common;
+using ASC.Core.Notify.Senders;
 using ASC.Notify.Config;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
 
 namespace ASC.Notify
 {
@@ -50,15 +54,24 @@ namespace ASC.Notify
                     var diHelper = new DIHelper(services);
 
                     diHelper.AddNLogManager("ASC.Notify", "ASC.Notify.Messages");
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
                     services.Configure<NotifyServiceCfg>(hostContext.Configuration.GetSection("notify"));
 
-                    diHelper.TryAdd(typeof(CommonLinkUtilitySettings), typeof(ConfigureCommonLinkUtilitySettings));
+                    diHelper.TryAdd(typeof(CommonLinkUtilitySettings));
+                    diHelper.TryAdd(typeof(IConfigureOptions<CommonLinkUtilitySettings>), typeof(ConfigureCommonLinkUtilitySettings));
                     diHelper.TryAdd<NotifyServiceLauncher>();
 
+                    diHelper.TryAdd<JabberSender>();
+                    diHelper.TryAdd<SmtpSender>();
+                    diHelper.TryAdd<AWSSender>(); // fix private
+
                     services.AddHostedService<NotifyServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
+
+                    var a = $"{string.Join(",", diHelper.Singleton.OrderBy(r => r).ToArray())},{string.Join(",", diHelper.Scoped.OrderBy(r => r).ToArray())},{string.Join(",", diHelper.Transient.OrderBy(r => r).ToArray())}";
+                    var b = 0;
                 })
                 .UseConsoleLifetime()
                 .Build();
diff --git a/products/ASC.Files/Server/Startup.cs b/products/ASC.Files/Server/Startup.cs
index 13c4f04e58..6472c1a1fb 100644
--- a/products/ASC.Files/Server/Startup.cs
+++ b/products/ASC.Files/Server/Startup.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Text;
 using System.Text.Json.Serialization;
 
@@ -43,9 +42,6 @@ namespace ASC.Files
             DIHelper.TryAdd<ThirdPartyAppHandlerService>();
 
             NotifyConfigurationExtension.Register(DIHelper);
-
-            var a = $"{string.Join(",", DIHelper.Singleton.OrderBy(r => r).ToArray())},{string.Join(",", DIHelper.Scoped.OrderBy(r => r).ToArray())},{string.Join(",", DIHelper.Transient.OrderBy(r => r).ToArray())}";
-            var b = 0;
         }
 
         public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/products/ASC.Files/Service/Program.cs b/products/ASC.Files/Service/Program.cs
index e5e482643b..c7289bf680 100644
--- a/products/ASC.Files/Service/Program.cs
+++ b/products/ASC.Files/Service/Program.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 
 using ASC.Common;
@@ -10,7 +9,6 @@ using ASC.Common.Logging;
 using ASC.ElasticSearch;
 using ASC.Feed.Aggregator;
 using ASC.Web.Files.Core.Search;
-using ASC.Web.Files.Utils;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/products/ASC.People/Server/Startup.cs b/products/ASC.People/Server/Startup.cs
index 0ad97cc411..9c46d0551c 100644
--- a/products/ASC.People/Server/Startup.cs
+++ b/products/ASC.People/Server/Startup.cs
@@ -1,9 +1,11 @@
 
 using System;
-
+using System.Linq;
+
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Data.Reassigns;
+using ASC.Employee.Core.Controllers;
 using ASC.Web.Core.Users;
 
 using Microsoft.Extensions.Configuration;
@@ -23,11 +25,10 @@ namespace ASC.People
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            base.ConfigureServices(services);
-
-            DIHelper.AddProgressQueue<RemoveProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
-            DIHelper.AddProgressQueue<ReassignProgressItem>(1, (int)TimeSpan.FromMinutes(5).TotalMilliseconds, true, false, 0);
-            DIHelper.AddWorkerQueue<ResizeWorkerItem>(2, (int)TimeSpan.FromMinutes(30).TotalMilliseconds, true, 1);
+            base.ConfigureServices(services);
+
+            DIHelper.TryAdd<PeopleController>();
+            DIHelper.TryAdd<GroupController>();
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyService.cs b/web/ASC.Web.Core/Notify/StudioNotifyService.cs
index 8da8de4b02..ac59384bc0 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyService.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyService.cs
@@ -53,7 +53,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.Core.Notify
 {
-    [Scope]
+    [Scope(Additional = typeof(StudioNotifyServiceExtension))]
     public class StudioNotifyService
     {
         private readonly StudioNotifyServiceHelper client;
@@ -1012,6 +1012,7 @@ namespace ASC.Web.Studio.Core.Notify
         #endregion
     }
 
+    [Scope]
     public class StudioNotifyServiceScope
     {
         private TenantManager TenantManager { get; }
@@ -1032,11 +1033,9 @@ namespace ASC.Web.Studio.Core.Notify
 
     public static class StudioNotifyServiceExtension
     {
-        public static DIHelper AddStudioNotifyServiceService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
             services.TryAddScoped<StudioNotifyServiceScope>();
-
-            return services;
         }
     }
 }
\ No newline at end of file

From 51f1f92307d8baf28ae6a08513732e24a3865e62 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 28 Oct 2020 15:26:27 +0300
Subject: [PATCH 15/22] Scope: refactoring.

---
 common/ASC.Core.Common/Context/WorkContext.cs | 11 +++++++++-
 .../Notify/Signalr/SignalrServiceClient.cs    |  3 ++-
 common/ASC.Data.Storage/StorageHandler.cs     |  3 ++-
 .../ASC.Data.Backup/BackupServiceLauncher.cs  | 13 ++++++------
 .../ASC.Notify/NotifyServiceLauncher.cs       |  5 ++++-
 common/services/ASC.Socket.IO.Svc/Program.cs  |  5 +++--
 .../SocketServiceLauncher.cs                  | 11 ++++++----
 common/services/ASC.Studio.Notify/Program.cs  |  4 ++++
 .../ASC.Studio.Notify/ServiceLauncher.cs      | 14 ++++++++-----
 .../services/ASC.TelegramService/Startup.cs   |  2 +-
 .../ASC.TelegramService/TelegramHandler.cs    | 10 ++++++++-
 .../ASC.TelegramService/TelegramLauncher.cs   | 12 +++++------
 common/services/ASC.Thumbnails.Svc/Program.cs |  5 ++++-
 .../UrlShortenerServiceLauncher.cs            |  9 +++++---
 .../Core/Configuration/ProductEntryPoint.cs   | 21 ++++++++++---------
 products/ASC.People/Server/Startup.cs         |  7 +------
 web/ASC.Web.Api/Startup.cs                    | 14 ++++++++++---
 .../Notify/NotifyConfiguration.cs             | 15 ++++++++++---
 .../Notify/StudioNotifyServiceSender.cs       | 11 +++++-----
 .../Notify/StudioPeriodicNotify.cs            |  3 ++-
 .../Notify/StudioWhatsNewNotify.cs            | 12 ++++++-----
 web/ASC.Web.Studio/Startup.cs                 | 10 ++++++++-
 22 files changed, 132 insertions(+), 68 deletions(-)

diff --git a/common/ASC.Core.Common/Context/WorkContext.cs b/common/ASC.Core.Common/Context/WorkContext.cs
index 73c2499801..a46aa19fd2 100644
--- a/common/ASC.Core.Common/Context/WorkContext.cs
+++ b/common/ASC.Core.Common/Context/WorkContext.cs
@@ -27,7 +27,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-
+
+using ASC.Common;
 using ASC.Common.Caching;
 using ASC.Common.Logging;
 using ASC.Core.Common.Notify;
@@ -169,5 +170,13 @@ namespace ASC.Core
                 tenantManager.SetCurrentTenant(tenant);
             }
         }
+    }
+
+    public class WorkContextExtension
+    {
+        public static void Register(DIHelper dIHelper)
+        {
+            dIHelper.TryAdd<TelegramHelper>();
+        }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs b/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
index 84950222dc..9634222310 100644
--- a/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
+++ b/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
@@ -43,7 +43,8 @@ using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace ASC.Core.Notify.Signalr
-{
+{
+    [Scope]
     public class ConfigureSignalrServiceClient : IConfigureNamedOptions<SignalrServiceClient>
     {
         internal TenantManager TenantManager { get; }
diff --git a/common/ASC.Data.Storage/StorageHandler.cs b/common/ASC.Data.Storage/StorageHandler.cs
index 02c08e39a4..90bcd735f5 100644
--- a/common/ASC.Data.Storage/StorageHandler.cs
+++ b/common/ASC.Data.Storage/StorageHandler.cs
@@ -152,7 +152,8 @@ namespace ASC.Data.Storage.DiscStorage
             }
         }
     }
-
+
+    [Scope]
     public class StorageHandlerScope
     {
         private TenantManager TenantManager { get; }
diff --git a/common/services/ASC.Data.Backup/BackupServiceLauncher.cs b/common/services/ASC.Data.Backup/BackupServiceLauncher.cs
index b57b514272..a9d96b1d68 100644
--- a/common/services/ASC.Data.Backup/BackupServiceLauncher.cs
+++ b/common/services/ASC.Data.Backup/BackupServiceLauncher.cs
@@ -24,7 +24,6 @@
 */
 
 
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -41,32 +40,32 @@ namespace ASC.Data.Backup.Service
     [Singletone]
     internal class BackupServiceLauncher : IHostedService
     {
-        private IServiceProvider ServiceProvider { get; }
         private BackupCleanerService CleanerService { get; set; }
         private BackupSchedulerService SchedulerService { get; set; }
         private BackupWorker BackupWorker { get; set; }
         private IConfiguration Configuration { get; set; }
         private BackupListener BackupListener { get; set; }
+        public NotifyConfiguration NotifyConfiguration { get; }
 
-        public BackupServiceLauncher(
-            IServiceProvider serviceProvider,
+        public BackupServiceLauncher(
             BackupCleanerService cleanerService,
             BackupSchedulerService schedulerService,
             BackupWorker backupWorker,
             IConfiguration configuration,
-            BackupListener backupListener)
+            BackupListener backupListener,
+            NotifyConfiguration notifyConfiguration)
         {
-            ServiceProvider = serviceProvider;
             CleanerService = cleanerService;
             SchedulerService = schedulerService;
             BackupWorker = backupWorker;
             Configuration = configuration;
             BackupListener = backupListener;
+            NotifyConfiguration = notifyConfiguration;
         }
 
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            NotifyConfiguration.Configure(ServiceProvider);
+            NotifyConfiguration.Configure();
 
             var settings = Configuration.GetSetting<BackupSettings>("backup");
 
diff --git a/common/services/ASC.Notify/NotifyServiceLauncher.cs b/common/services/ASC.Notify/NotifyServiceLauncher.cs
index a3c0ccf078..70d6098147 100644
--- a/common/services/ASC.Notify/NotifyServiceLauncher.cs
+++ b/common/services/ASC.Notify/NotifyServiceLauncher.cs
@@ -66,6 +66,7 @@ namespace ASC.Notify
         private NotifyCleaner NotifyCleaner { get; }
         private WebItemManager WebItemManager { get; }
         private IServiceProvider ServiceProvider { get; }
+        private NotifyConfiguration NotifyConfiguration { get; }
         private ILog Log { get; }
 
         public NotifyServiceLauncher(
@@ -75,6 +76,7 @@ namespace ASC.Notify
             NotifyCleaner notifyCleaner,
             WebItemManager webItemManager,
             IServiceProvider serviceProvider,
+            NotifyConfiguration notifyConfiguration,
             IOptionsMonitor<ILog> options)
         {
             NotifyServiceCfg = notifyServiceCfg.Value;
@@ -83,6 +85,7 @@ namespace ASC.Notify
             NotifyCleaner = notifyCleaner;
             WebItemManager = webItemManager;
             ServiceProvider = serviceProvider;
+            NotifyConfiguration = notifyConfiguration;
             Log = options.Get("ASC.Notify");
         }
 
@@ -120,7 +123,7 @@ namespace ASC.Notify
 
         private void InitializeNotifySchedulers()
         {
-            NotifyConfiguration.Configure(ServiceProvider);
+            NotifyConfiguration.Configure();
             WebItemManager.LoadItems();
             foreach (var pair in NotifyServiceCfg.Schedulers.Where(r => r.MethodInfo != null))
             {
diff --git a/common/services/ASC.Socket.IO.Svc/Program.cs b/common/services/ASC.Socket.IO.Svc/Program.cs
index a7a4b437b4..b7f0726dcd 100644
--- a/common/services/ASC.Socket.IO.Svc/Program.cs
+++ b/common/services/ASC.Socket.IO.Svc/Program.cs
@@ -29,6 +29,7 @@ using System.IO;
 using System.Threading.Tasks;
 
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 
@@ -73,10 +74,10 @@ namespace ASC.Socket.IO.Svc
                 .ConfigureServices((hostContext, services) =>
                 {
                     var diHelper = new DIHelper(services);
-
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.AddNLogManager("ASC.Socket.IO.Svc");
                     services.AddHostedService<SocketServiceLauncher>();
-                    diHelper.TryAdd<SocketServiceLauncher>();
+                    diHelper.TryAdd<SocketServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath, false, false);
                 })
diff --git a/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs b/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
index b8738d0ffb..d74191b9c9 100644
--- a/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
+++ b/common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
@@ -60,16 +60,19 @@ namespace ASC.Socket.IO.Svc
         private SignalrServiceClient SignalrServiceClient { get; set; }
         private IHostEnvironment HostEnvironment { get; set; }
 
-        public SocketServiceLauncher(IOptionsMonitor<ILog> options, IConfiguration configuration, CoreBaseSettings coreBaseSettings, SignalrServiceClient signalrServiceClient, IHostEnvironment hostEnvironment, IConfigureNamedOptions<SignalrServiceClient> configureOptions)
+        public SocketServiceLauncher(
+            IOptionsMonitor<ILog> options,
+            IConfiguration configuration,
+            CoreBaseSettings coreBaseSettings,
+            IOptionsSnapshot<SignalrServiceClient> signalrServiceClient,
+            IHostEnvironment hostEnvironment)
         {
             Logger = options.CurrentValue;
             CancellationTokenSource = new CancellationTokenSource();
             Configuration = configuration;
             CoreBaseSettings = coreBaseSettings;
-            SignalrServiceClient = signalrServiceClient;
+            SignalrServiceClient = signalrServiceClient.Value;
             HostEnvironment = hostEnvironment;
-
-            configureOptions.Configure(SignalrServiceClient);
         }
 
         public Task StartAsync(CancellationToken cancellationToken)
diff --git a/common/services/ASC.Studio.Notify/Program.cs b/common/services/ASC.Studio.Notify/Program.cs
index 5634a3abce..e58632cae3 100644
--- a/common/services/ASC.Studio.Notify/Program.cs
+++ b/common/services/ASC.Studio.Notify/Program.cs
@@ -3,9 +3,11 @@ using System.IO;
 using System.Threading.Tasks;
 
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 using ASC.Notify;
+using ASC.Web.Studio.Core.Notify;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -47,9 +49,11 @@ namespace ASC.Studio.Notify
                 .ConfigureServices((hostContext, services) =>
                 {
                     var diHelper = new DIHelper(services);
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.AddNLogManager("ASC.Notify", "ASC.Notify.Messages");
                     services.AddHostedService<ServiceLauncher>();
                     diHelper.TryAdd<ServiceLauncher>();
+                    NotifyConfigurationExtension.Register(diHelper);
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
                 })
diff --git a/common/services/ASC.Studio.Notify/ServiceLauncher.cs b/common/services/ASC.Studio.Notify/ServiceLauncher.cs
index 582c2e491f..be5b4cb7b2 100644
--- a/common/services/ASC.Studio.Notify/ServiceLauncher.cs
+++ b/common/services/ASC.Studio.Notify/ServiceLauncher.cs
@@ -24,10 +24,10 @@
 */
 
 
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Web.Core;
 using ASC.Web.Studio.Core.Notify;
 
@@ -35,22 +35,26 @@ using Microsoft.Extensions.Hosting;
 
 namespace ASC.Notify
 {
+    [Singletone]
     public class ServiceLauncher : IHostedService
     {
         private WebItemManager WebItemManager { get; }
         private StudioNotifyServiceSender StudioNotifyServiceSender { get; }
-        private IServiceProvider ServiceProvider { get; }
+        private NotifyConfiguration NotifyConfiguration { get; }
 
-        public ServiceLauncher(WebItemManager webItemManager, StudioNotifyServiceSender studioNotifyServiceSender, IServiceProvider serviceProvider)
+        public ServiceLauncher(
+            WebItemManager webItemManager,
+            StudioNotifyServiceSender studioNotifyServiceSender,
+            NotifyConfiguration notifyConfiguration)
         {
             WebItemManager = webItemManager;
             StudioNotifyServiceSender = studioNotifyServiceSender;
-            ServiceProvider = serviceProvider;
+            NotifyConfiguration = notifyConfiguration;
         }
 
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            NotifyConfiguration.Configure(ServiceProvider);
+            NotifyConfiguration.Configure();
             WebItemManager.LoadItems();
 
             StudioNotifyServiceSender.RegisterSendMethod();
diff --git a/common/services/ASC.TelegramService/Startup.cs b/common/services/ASC.TelegramService/Startup.cs
index 7b5190bf98..342e650d2d 100644
--- a/common/services/ASC.TelegramService/Startup.cs
+++ b/common/services/ASC.TelegramService/Startup.cs
@@ -48,7 +48,7 @@ namespace ASC.TelegramService
         {
             base.ConfigureServices(services);
 
-            DIHelper.AddTelegramLauncher();
+            DIHelper.TryAdd<TelegramLauncher>();
 
             services.AddHostedService<TelegramLauncher>();
 
diff --git a/common/services/ASC.TelegramService/TelegramHandler.cs b/common/services/ASC.TelegramService/TelegramHandler.cs
index 0929e32c8b..ea4901b959 100644
--- a/common/services/ASC.TelegramService/TelegramHandler.cs
+++ b/common/services/ASC.TelegramService/TelegramHandler.cs
@@ -45,7 +45,7 @@ using Telegram.Bot.Args;
 
 namespace ASC.TelegramService
 {
-    [Singletone]
+    [Singletone(Additional = typeof(TelegramHandlerExtension))]
     public class TelegramHandler
     {
         private Dictionary<int, TenantTgClient> Clients { get; set; }
@@ -174,5 +174,13 @@ namespace ASC.TelegramService
         {
             return string.Format("{0}:{1}", userId, tenantId);
         }
+    }
+
+    public class TelegramHandlerExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<TelegramHelper>();
+        }
     }
 }
diff --git a/common/services/ASC.TelegramService/TelegramLauncher.cs b/common/services/ASC.TelegramService/TelegramLauncher.cs
index c021d00ae1..0f022e809a 100644
--- a/common/services/ASC.TelegramService/TelegramLauncher.cs
+++ b/common/services/ASC.TelegramService/TelegramLauncher.cs
@@ -37,7 +37,7 @@ using Microsoft.Extensions.Hosting;
 
 namespace ASC.TelegramService
 {
-    [Singletone]
+    [Singletone(Additional = typeof(TelegramLauncherExtension))]
     public class TelegramLauncher : IHostedService
     {
         private TelegramListener TelegramListener { get; set; }
@@ -77,7 +77,8 @@ namespace ASC.TelegramService
             }
         }
     }
-
+
+    [Scope]
     public class ScopeTelegramLauncher
     {
         private TelegramHandler Handler { get; set; }
@@ -99,12 +100,11 @@ namespace ASC.TelegramService
         }
     }
 
-    public static class TelegramLauncherExtension
+    public class TelegramLauncherExtension
     {
-        public static DIHelper AddTelegramLauncher(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<ScopeTelegramLauncher>();
-            return services;
+            services.TryAdd<ScopeTelegramLauncher>();
         }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Thumbnails.Svc/Program.cs b/common/services/ASC.Thumbnails.Svc/Program.cs
index e760e38b09..bf06dad33b 100644
--- a/common/services/ASC.Thumbnails.Svc/Program.cs
+++ b/common/services/ASC.Thumbnails.Svc/Program.cs
@@ -29,6 +29,7 @@ using System.IO;
 using System.Threading.Tasks;
 
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 
@@ -72,7 +73,9 @@ namespace ASC.Thumbnails.Svc
                 })
                 .ConfigureServices((hostContext, services) =>
                 {
-                    var diHelper = new DIHelper(services);
+                    var diHelper = new DIHelper(services);
+
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
                     diHelper.AddNLogManager("ASC.Thumbnails.Svc");
                     services.AddHostedService<ThumbnailsServiceLauncher>();
                     diHelper.TryAdd<ThumbnailsServiceLauncher>();
diff --git a/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs b/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
index 6343b01918..5a9e491c64 100644
--- a/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
+++ b/common/services/ASC.UrlShortener.Svc/UrlShortenerServiceLauncher.cs
@@ -25,13 +25,16 @@
 
 
 using System.Threading;
-using System.Threading.Tasks;
-
+using System.Threading.Tasks;
+
+using ASC.Common;
+
 using Microsoft.Extensions.Hosting;
 
 
 namespace ASC.UrlShortener.Svc
-{
+{
+    [Singletone]
     public class UrlShortenerServiceLauncher : IHostedService
     {
         private UrlShortenerService UrlShortenerService { get; }
diff --git a/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs b/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
index 61d9e7bb10..7724f9d945 100644
--- a/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
+++ b/products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
@@ -47,11 +47,11 @@ namespace ASC.Web.Files.Configuration
         //public FilesSpaceUsageStatManager FilesSpaceUsageStatManager { get; }
         private CoreBaseSettings CoreBaseSettings { get; }
         private AuthContext AuthContext { get; }
-        private UserManager UserManager { get; }
-        private IServiceProvider ServiceProvider { get; }
-
-        //public SubscriptionManager SubscriptionManager { get; }
-
+        private UserManager UserManager { get; }
+        public NotifyConfiguration NotifyConfiguration { get; }
+
+        //public SubscriptionManager SubscriptionManager { get; }
+
         public ProductEntryPoint()
         {
 
@@ -62,7 +62,8 @@ namespace ASC.Web.Files.Configuration
             CoreBaseSettings coreBaseSettings,
             AuthContext authContext,
             UserManager userManager,
-            IServiceProvider serviceProvider
+            IServiceProvider serviceProvider,
+            NotifyConfiguration notifyConfiguration
             //            SubscriptionManager subscriptionManager
             )
         {
@@ -70,8 +71,8 @@ namespace ASC.Web.Files.Configuration
             CoreBaseSettings = coreBaseSettings;
             AuthContext = authContext;
             UserManager = userManager;
-            ServiceProvider = serviceProvider;
-            //SubscriptionManager = subscriptionManager;
+            NotifyConfiguration = notifyConfiguration;
+            //SubscriptionManager = subscriptionManager;
         }
 
         public static readonly Guid ID = WebItemManager.DocumentsProductID;
@@ -104,9 +105,9 @@ namespace ASC.Web.Files.Configuration
                     CanNotBeDisabled = true,
                 };
 
-            if (ServiceProvider != null)
+            if (NotifyConfiguration != null)
             {
-                NotifyConfiguration.Configure(ServiceProvider);
+                NotifyConfiguration.Configure();
             }
             //SearchHandlerManager.Registry(new SearchHandler());
         }
diff --git a/products/ASC.People/Server/Startup.cs b/products/ASC.People/Server/Startup.cs
index 9c46d0551c..99abbe21ed 100644
--- a/products/ASC.People/Server/Startup.cs
+++ b/products/ASC.People/Server/Startup.cs
@@ -1,12 +1,7 @@
-
-using System;
-using System.Linq;
-
+
 using ASC.Api.Core;
 using ASC.Common;
-using ASC.Data.Reassigns;
 using ASC.Employee.Core.Controllers;
-using ASC.Web.Core.Users;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/web/ASC.Web.Api/Startup.cs b/web/ASC.Web.Api/Startup.cs
index 6b5434d76e..67bb5a3267 100644
--- a/web/ASC.Web.Api/Startup.cs
+++ b/web/ASC.Web.Api/Startup.cs
@@ -1,6 +1,8 @@
-
+
 using ASC.Api.Core;
+using ASC.Api.Settings;
 using ASC.Common.DependencyInjection;
+using ASC.Web.Api.Controllers;
 
 using Autofac.Extensions.DependencyInjection;
 
@@ -26,8 +28,14 @@ namespace ASC.Web.Api
 
             services.AddMemoryCache();
 
-            services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
-
+            services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
+
+            DIHelper.TryAdd<AuthenticationController>();
+            DIHelper.TryAdd<ModulesController>();
+            DIHelper.TryAdd<PortalController>();
+            DIHelper.TryAdd<SettingsController>();
+            DIHelper.TryAdd<SecurityController>();
+            DIHelper.TryAdd<SmtpSettingsController>();
         }
     }
 }
diff --git a/web/ASC.Web.Core/Notify/NotifyConfiguration.cs b/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
index d8acd3bc07..f7664f14c8 100644
--- a/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
+++ b/web/ASC.Web.Core/Notify/NotifyConfiguration.cs
@@ -58,20 +58,29 @@ using MimeKit.Utils;
 
 namespace ASC.Web.Studio.Core.Notify
 {
-    public static class NotifyConfiguration
+    [Singletone(Additional = typeof(WorkContextExtension))]
+    public class NotifyConfiguration
     {
         private static bool configured;
         private static readonly object locker = new object();
         private static readonly Regex urlReplacer = new Regex(@"(<a [^>]*href=(('(?<url>[^>']*)')|(""(?<url>[^>""]*)""))[^>]*>)|(<img [^>]*src=(('(?<url>(?![data:|cid:])[^>']*)')|(""(?<url>(?![data:|cid:])[^>""]*)""))[^/>]*/?>)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private static readonly Regex textileLinkReplacer = new Regex(@"""(?<text>[\w\W]+?)"":""(?<link>[^""]+)""", RegexOptions.Singleline | RegexOptions.Compiled);
-        public static void Configure(IServiceProvider serviceProvider)
+
+        private IServiceProvider ServiceProvider { get; }
+
+        public NotifyConfiguration(IServiceProvider serviceProvider)
+        {
+            ServiceProvider = serviceProvider;
+        }
+
+        public void Configure()
         {
             lock (locker)
             {
                 if (!configured)
                 {
                     configured = true;
-                    WorkContext.NotifyStartUp(serviceProvider);
+                    WorkContext.NotifyStartUp(ServiceProvider);
                     WorkContext.NotifyContext.NotifyClientRegistration += NotifyClientRegisterCallback;
                     WorkContext.NotifyContext.NotifyEngine.BeforeTransferRequest += BeforeTransferRequest;
                 }
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs b/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
index 76e5180ef9..8791eaf0c5 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
@@ -43,7 +43,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace ASC.Web.Studio.Core.Notify
 {
-    [Singletone]
+    [Singletone(Additional = typeof(ServiceLauncherExtension))]
     public class StudioNotifyServiceSender
     {
         private static string EMailSenderName { get { return Constants.NotifyEMailSenderSysName; } }
@@ -171,6 +171,7 @@ namespace ASC.Web.Studio.Core.Notify
         }
     }
 
+    [Scope]
     public class StudioNotifyServiceSenderScope
     {
         private TenantManager TenantManager { get; }
@@ -213,11 +214,11 @@ namespace ASC.Web.Studio.Core.Notify
 
     public static class ServiceLauncherExtension
     {
-        public static DIHelper AddStudioNotifyServiceSender(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<StudioNotifyServiceSenderScope>();
-
-            return services;
+            services.TryAdd<StudioNotifyServiceSenderScope>();
+            services.TryAdd<StudioPeriodicNotify>();
+            services.TryAdd<StudioWhatsNewNotify>();
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs b/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
index 370435cd5b..ab787ae4e1 100644
--- a/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
+++ b/web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
@@ -1130,7 +1130,8 @@ namespace ASC.Web.Studio.Core.Notify
             return !isSubscribe;
         }
     }
-
+
+    [Scope]
     public class StudioPeriodicNotifyScope
     {
         private TenantManager TenantManager { get; }
diff --git a/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs b/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
index 8f555aae5d..09ac10c7a6 100644
--- a/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
+++ b/web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
@@ -51,7 +51,7 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Web.Studio.Core.Notify
 {
-    [Singletone]
+    [Singletone(Additional = typeof(StudioWhatsNewNotifyExtension))]
     public class StudioWhatsNewNotify
     {
         private IServiceProvider ServiceProvider { get; }
@@ -293,7 +293,8 @@ namespace ASC.Web.Studio.Core.Notify
             public string Action { get; set; }
         }
     }
-
+
+    [Scope]
     public class StudioWhatsNewNotifyScope
     {
         private TenantManager TenantManager { get; }
@@ -366,10 +367,11 @@ namespace ASC.Web.Studio.Core.Notify
 
     public static class StudioWhatsNewNotifyExtension
     {
-        public static DIHelper AddStudioWhatsNewNotify(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<StudioWhatsNewNotifyScope>();
-            return services;
+            services.TryAdd<WebItemManager>();
+            services.TryAdd<FeedAggregateDataProvider>();
+            services.TryAdd<StudioWhatsNewNotifyScope>();
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Studio/Startup.cs b/web/ASC.Web.Studio/Startup.cs
index 971a9d6ce5..26b71c5e5a 100644
--- a/web/ASC.Web.Studio/Startup.cs
+++ b/web/ASC.Web.Studio/Startup.cs
@@ -1,6 +1,9 @@
+
 using ASC.Api.Core;
 using ASC.Common.DependencyInjection;
 using ASC.Data.Storage;
+using ASC.Data.Storage.Configuration;
+using ASC.Data.Storage.DiscStorage;
 using ASC.FederatedLogin;
 
 using Microsoft.AspNetCore.Builder;
@@ -30,7 +33,12 @@ namespace ASC.Web.Studio
 
             services.AddMemoryCache();
 
-            services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
+            services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
+
+            DIHelper.TryAdd<Login>();
+            StorageConfigExtension.Register(DIHelper);
+            DIHelper.TryAdd<PathUtils>();
+            DIHelper.TryAdd<StorageHandlerScope>();
         }
 
         public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)

From 3256a3dbc751ea624ce14d6c19c07289807ae748 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 28 Oct 2020 23:02:03 +0300
Subject: [PATCH 16/22] DI: fix

---
 common/ASC.Common/DIHelper.cs                 | 49 -------------------
 common/ASC.Core.Common/Context/WorkContext.cs |  2 +
 .../EF/Context/DbContextManager.cs            |  5 +-
 .../ASC.Core.Common/Notify/EmailSenderSink.cs | 12 +----
 .../Notify/JabberSenderSink.cs                | 12 +----
 .../Notify/Senders/SmtpSender.cs              |  2 +-
 common/ASC.Data.Storage/StorageHandler.cs     |  5 --
 .../services/ASC.Data.Backup/Core/DbHelper.cs | 11 +----
 common/services/ASC.Notify/Program.cs         |  4 --
 .../Notify/StudioNotifyService.cs             |  2 +-
 web/ASC.Web.Core/Sms/SmsProvider.cs           |  8 ++-
 11 files changed, 16 insertions(+), 96 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 161a1c9b2e..9e8bf43c54 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -112,18 +112,6 @@ namespace ASC.Common
             ServiceCollection = serviceCollection;
         }
 
-        public bool TryAddScoped<TService>() where TService : class
-        {
-            var serviceName = $"{typeof(TService)}";
-            if (!Scoped.Contains(serviceName))
-            {
-                Scoped.Add(serviceName);
-                ServiceCollection.TryAddScoped<TService>();
-                return true;
-            }
-            return false;
-        }
-
         public bool TryAdd<TService>() where TService : class
         {
             return TryAdd(typeof(TService));
@@ -379,31 +367,6 @@ namespace ASC.Common
             return false;
         }
 
-        public bool TryAddScoped<TService, TImplementation>() where TService : class where TImplementation : class, TService
-        {
-            var serviceName = $"{typeof(TService)}{typeof(TImplementation)}";
-            if (!Scoped.Contains(serviceName))
-            {
-                Scoped.Add(serviceName);
-                ServiceCollection.TryAddScoped<TService, TImplementation>();
-                return true;
-            }
-
-            return false;
-        }
-
-
-        public DIHelper TryAddSingleton<TService>() where TService : class
-        {
-            var serviceName = $"{typeof(TService)}";
-            if (!Singleton.Contains(serviceName))
-            {
-                Singleton.Add(serviceName);
-                ServiceCollection.TryAddSingleton<TService>();
-            }
-
-            return this;
-        }
 
         public DIHelper TryAddSingleton<TService>(Func<IServiceProvider, TService> implementationFactory) where TService : class
         {
@@ -429,18 +392,6 @@ namespace ASC.Common
             return this;
         }
 
-        public DIHelper AddSingleton<TService, TImplementation>() where TService : class where TImplementation : class, TService
-        {
-            var serviceName = $"{typeof(TService)}{typeof(TImplementation)}";
-            if (!Singleton.Contains(serviceName))
-            {
-                Singleton.Add(serviceName);
-                ServiceCollection.AddSingleton<TService, TImplementation>();
-            }
-
-            return this;
-        }
-
         public DIHelper TryAddSingleton<TService, TImplementation>(TService tservice, TImplementation tImplementation) where TService : Type where TImplementation : Type
         {
             var serviceName = $"{tservice}{tImplementation}";
diff --git a/common/ASC.Core.Common/Context/WorkContext.cs b/common/ASC.Core.Common/Context/WorkContext.cs
index a46aa19fd2..9e993aa697 100644
--- a/common/ASC.Core.Common/Context/WorkContext.cs
+++ b/common/ASC.Core.Common/Context/WorkContext.cs
@@ -177,6 +177,8 @@ namespace ASC.Core
         public static void Register(DIHelper dIHelper)
         {
             dIHelper.TryAdd<TelegramHelper>();
+            dIHelper.TryAdd<EmailSenderSinkScope>();
+            dIHelper.TryAdd<JabberSenderSinkScope>();
         }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/EF/Context/DbContextManager.cs b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
index 140241fae4..d897cd7e61 100644
--- a/common/ASC.Core.Common/EF/Context/DbContextManager.cs
+++ b/common/ASC.Core.Common/EF/Context/DbContextManager.cs
@@ -84,8 +84,9 @@ namespace ASC.Core.Common.EF
     {
         public static DIHelper AddDbContextManagerService<T>(this DIHelper services) where T : BaseDbContext, new()
         {
-            services.TryAddScoped<MultiRegionalDbContextManager<T>>();
-            services.TryAddScoped<IConfigureOptions<MultiRegionalDbContext<T>>, ConfigureMultiRegionalDbContext<T>>();
+            //TODO
+            //services.TryAddScoped<MultiRegionalDbContextManager<T>>();
+            //services.TryAddScoped<IConfigureOptions<MultiRegionalDbContext<T>>, ConfigureMultiRegionalDbContext<T>>();
             return services;
         }
     }
diff --git a/common/ASC.Core.Common/Notify/EmailSenderSink.cs b/common/ASC.Core.Common/Notify/EmailSenderSink.cs
index 2eda77536c..03520c04c3 100644
--- a/common/ASC.Core.Common/Notify/EmailSenderSink.cs
+++ b/common/ASC.Core.Common/Notify/EmailSenderSink.cs
@@ -166,7 +166,8 @@ namespace ASC.Core.Notify
             return m;
         }
     }
-
+
+    [Scope]
     public class EmailSenderSinkScope
     {
         private TenantManager TenantManager { get; }
@@ -185,13 +186,4 @@ namespace ASC.Core.Notify
             (tenantManager, coreConfiguration, optionsMonitor) = (TenantManager, CoreConfiguration, Options);
         }
     }
-
-    public static class EmailSenderSinkExtension
-    {
-        public static DIHelper AddEmailSenderSinkService(this DIHelper services)
-        {
-            services.TryAddScoped<EmailSenderSinkScope>();
-            return services;
-        }
-    }
 }
\ No newline at end of file
diff --git a/common/ASC.Core.Common/Notify/JabberSenderSink.cs b/common/ASC.Core.Common/Notify/JabberSenderSink.cs
index bf68568eee..868d9edd4a 100644
--- a/common/ASC.Core.Common/Notify/JabberSenderSink.cs
+++ b/common/ASC.Core.Common/Notify/JabberSenderSink.cs
@@ -88,7 +88,8 @@ namespace ASC.Core.Notify
             }
         }
     }
-
+
+    [Scope]
     public class JabberSenderSinkScope
     {
         private UserManager UserManager { get; }
@@ -104,14 +105,5 @@ namespace ASC.Core.Notify
         {
             (userManager, tenantManager) = (UserManager, TenantManager);
         }
-    }
-
-    public static class JabberSenderSinkExtension
-    {
-        public static DIHelper AddJabberSenderSinkService(this DIHelper services)
-        {
-            services.TryAddScoped<JabberSenderSinkScope>();
-            return services;
-        }
     }
 }
diff --git a/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs b/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
index 2705e41a96..d730d55eaf 100644
--- a/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/SmtpSender.cs
@@ -345,7 +345,7 @@ namespace ASC.Core.Notify.Senders
     {
         public static void Register(DIHelper services)
         {
-            services.TryAddScoped<SmtpSenderScope>();
+            services.TryAdd<SmtpSenderScope>();
         }
     }
 }
\ No newline at end of file
diff --git a/common/ASC.Data.Storage/StorageHandler.cs b/common/ASC.Data.Storage/StorageHandler.cs
index 90bcd735f5..0cbf0c0428 100644
--- a/common/ASC.Data.Storage/StorageHandler.cs
+++ b/common/ASC.Data.Storage/StorageHandler.cs
@@ -202,10 +202,5 @@ namespace ASC.Data.Storage.DiscStorage
 
             return builder;
         }
-        public static DIHelper AddStorageHandlerService(this DIHelper services)
-        {
-            services.TryAddScoped<StorageHandlerScope>();
-            return services;
-        }
     }
 }
\ No newline at end of file
diff --git a/common/services/ASC.Data.Backup/Core/DbHelper.cs b/common/services/ASC.Data.Backup/Core/DbHelper.cs
index 2e6fc98284..c86bfd2020 100644
--- a/common/services/ASC.Data.Backup/Core/DbHelper.cs
+++ b/common/services/ASC.Data.Backup/Core/DbHelper.cs
@@ -17,7 +17,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Data.Backup
-{
+{
+    [Scope]
     public class DbHelper : IDisposable
     {
         private readonly DbProviderFactory factory;
@@ -269,12 +270,4 @@ namespace ASC.Data.Backup
                 " where 1 = 0";
         }
     }
-    public static class DbHelperExtension
-    {
-        public static DIHelper AddDbHelper(this DIHelper services)
-        {
-            services.TryAddScoped<DbHelper>();
-            return services;
-        }
-    }
 }
diff --git a/common/services/ASC.Notify/Program.cs b/common/services/ASC.Notify/Program.cs
index 6d7da418ed..587a0812f5 100644
--- a/common/services/ASC.Notify/Program.cs
+++ b/common/services/ASC.Notify/Program.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 
 using ASC.Common;
@@ -69,9 +68,6 @@ namespace ASC.Notify
                     services.AddHostedService<NotifyServiceLauncher>();
 
                     services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
-
-                    var a = $"{string.Join(",", diHelper.Singleton.OrderBy(r => r).ToArray())},{string.Join(",", diHelper.Scoped.OrderBy(r => r).ToArray())},{string.Join(",", diHelper.Transient.OrderBy(r => r).ToArray())}";
-                    var b = 0;
                 })
                 .UseConsoleLifetime()
                 .Build();
diff --git a/web/ASC.Web.Core/Notify/StudioNotifyService.cs b/web/ASC.Web.Core/Notify/StudioNotifyService.cs
index ac59384bc0..151e513bfd 100644
--- a/web/ASC.Web.Core/Notify/StudioNotifyService.cs
+++ b/web/ASC.Web.Core/Notify/StudioNotifyService.cs
@@ -1035,7 +1035,7 @@ namespace ASC.Web.Studio.Core.Notify
     {
         public static void Register(DIHelper services)
         {
-            services.TryAddScoped<StudioNotifyServiceScope>();
+            services.TryAdd<StudioNotifyServiceScope>();
         }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Sms/SmsProvider.cs b/web/ASC.Web.Core/Sms/SmsProvider.cs
index 2007ba93e0..ff569890e7 100644
--- a/web/ASC.Web.Core/Sms/SmsProvider.cs
+++ b/web/ASC.Web.Core/Sms/SmsProvider.cs
@@ -51,7 +51,7 @@ using Twilio.Types;
 
 namespace ASC.Web.Core.Sms
 {
-    [Scope]
+    [Scope(Additional = typeof(TwilioProviderExtention))]
     public class SmsProviderManager
     {
         public SmscProvider SmscProvider { get => ConsumerFactory.Get<SmscProvider>(); }
@@ -530,11 +530,9 @@ namespace ASC.Web.Core.Sms
 
     public static class TwilioProviderExtention
     {
-        public static DIHelper AddTwilioProviderService(this DIHelper services)
+        public static void Register(DIHelper services)
         {
-            services.TryAddScoped<TwilioSaaSProvider>();
-
-            return services;
+            services.TryAdd<TwilioSaaSProvider>();
         }
     }
 }
\ No newline at end of file

From 049e8f63e9e571b5a9f62f916da750c33a92fc3f Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Thu, 29 Oct 2020 11:13:51 +0300
Subject: [PATCH 17/22] Refactoring: scope.

---
 common/ASC.Api.Core/Core/BaseStartup.cs       |  2 +-
 common/ASC.Common/DIHelper.cs                 | 47 ++++++++-----------
 common/ASC.Common/Logging/Log.cs              | 40 +++++++++-------
 .../Configuration/Appender.cs                 |  2 +-
 common/services/ASC.ApiSystem/Startup.cs      |  4 +-
 .../ASC.Data.Storage.Migration/Program.cs     |  4 +-
 common/services/ASC.Notify/Program.cs         |  2 +-
 common/services/ASC.Socket.IO.Svc/Program.cs  |  4 +-
 common/services/ASC.Studio.Notify/Program.cs  |  2 +-
 common/services/ASC.Thumbnails.Svc/Program.cs |  4 +-
 .../services/ASC.UrlShortener.Svc/Program.cs  |  4 +-
 products/ASC.Files/Service/Program.cs         |  3 +-
 .../Server/Controllers/PeopleController.cs    |  1 +
 products/ASC.People/Server/Startup.cs         |  2 +
 web/ASC.Web.Studio/Startup.cs                 |  1 -
 15 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/common/ASC.Api.Core/Core/BaseStartup.cs b/common/ASC.Api.Core/Core/BaseStartup.cs
index 3c125b5ff3..2441968fc8 100644
--- a/common/ASC.Api.Core/Core/BaseStartup.cs
+++ b/common/ASC.Api.Core/Core/BaseStartup.cs
@@ -102,7 +102,7 @@ namespace ASC.Api.Core
 
             if (LogParams != null)
             {
-                DIHelper.AddNLogManager(LogParams);
+                LogNLogExtension.ConfigureLog(DIHelper, LogParams);
             }
 
             services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 9e8bf43c54..9b2ab62870 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -124,7 +124,11 @@ namespace ASC.Common
 
         public bool TryAdd(Type service, Type implementation = null)
         {
-            if (service.IsInterface && service.IsGenericType && (service.GetGenericTypeDefinition() == typeof(IOptionsSnapshot<>) || service.GetGenericTypeDefinition() == typeof(IOptions<>)))
+            if (service.IsInterface && service.IsGenericType && implementation == null &&
+                (service.GetGenericTypeDefinition() == typeof(IOptionsSnapshot<>) ||
+                service.GetGenericTypeDefinition() == typeof(IOptions<>) ||
+                service.GetGenericTypeDefinition() == typeof(IOptionsMonitor<>)
+                ))
             {
                 service = service.GetGenericArguments().FirstOrDefault();
                 if (service == null)
@@ -142,7 +146,11 @@ namespace ASC.Common
                 var qqaz = 0;
             }
 
-            var di = service.IsGenericType && (service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || service.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
+            var di = service.IsGenericType && (
+                service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) ||
+                service.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>) ||
+                service.GetGenericTypeDefinition() == typeof(IOptionsMonitor<>)
+                ) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var isnew = false;
 
             if (di != null)
@@ -163,7 +171,11 @@ namespace ASC.Common
                 {
                     if (di.Service != null)
                     {
-                        var a = di.Service.GetInterfaces().FirstOrDefault(x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || x.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)));
+                        var a = di.Service.GetInterfaces().FirstOrDefault(x => x.IsGenericType && (
+                        x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) ||
+                        x.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>) ||
+                        x.GetGenericTypeDefinition() == typeof(IOptionsMonitor<>)
+                        ));
                         if (a != null)
                         {
                             if (!a.ContainsGenericParameters)
@@ -334,7 +346,11 @@ namespace ASC.Common
         private bool Register(Type service, Type implementation)
         {
             if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter))) return true;
-            var c = service.IsGenericType && (service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || service.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
+            var c = service.IsGenericType && (
+                service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) ||
+                service.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>) ||
+                service.GetGenericTypeDefinition() == typeof(IOptionsMonitor<>)
+                ) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var serviceName = $"{service}{implementation}";
             if (c is ScopeAttribute)
             {
@@ -380,29 +396,6 @@ namespace ASC.Common
             return this;
         }
 
-        public DIHelper TryAddSingleton<TService, TImplementation>() where TService : class where TImplementation : class, TService
-        {
-            var serviceName = $"{typeof(TService)}{typeof(TImplementation)}";
-            if (!Singleton.Contains(serviceName))
-            {
-                Singleton.Add(serviceName);
-                ServiceCollection.TryAddSingleton<TService, TImplementation>();
-            }
-
-            return this;
-        }
-
-        public DIHelper TryAddSingleton<TService, TImplementation>(TService tservice, TImplementation tImplementation) where TService : Type where TImplementation : Type
-        {
-            var serviceName = $"{tservice}{tImplementation}";
-            if (!Singleton.Contains(serviceName))
-            {
-                Singleton.Add(serviceName);
-                ServiceCollection.TryAddSingleton(tservice, tImplementation);
-            }
-            return this;
-        }
-
         public DIHelper Configure<TOptions>(Action<TOptions> configureOptions) where TOptions : class
         {
             var serviceName = $"{typeof(TOptions)}";
diff --git a/common/ASC.Common/Logging/Log.cs b/common/ASC.Common/Logging/Log.cs
index b9e8030572..4cf99f13af 100644
--- a/common/ASC.Common/Logging/Log.cs
+++ b/common/ASC.Common/Logging/Log.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 using ASC.Common.Utils;
 
@@ -40,7 +41,8 @@ using Microsoft.Extensions.Options;
 using NLog;
 
 namespace ASC.Common.Logging
-{
+{
+    [Singletone(typeof(ConfigureLogNLog), Additional = typeof(LogNLogExtension))]
     public interface ILog
     {
         bool IsDebugEnabled { get; }
@@ -371,7 +373,8 @@ namespace ASC.Common.Logging
         public string Name { get; set; }
         public string Dir { get; set; }
     }
-
+
+    [Singletone]
     public class ConfigureLogNLog : IConfigureNamedOptions<LogNLog>
     {
         public ConfigureLogNLog(IConfiguration configuration)
@@ -851,7 +854,8 @@ namespace ASC.Common.Logging
         public string Name { get; set; }
     }
 
-
+
+    [Singletone]
     public class LogManager<T> : OptionsMonitor<T> where T : class, ILog, new()
     {
         public LogManager(IOptionsFactory<T> factory, IEnumerable<IOptionsChangeTokenSource<T>> sources, IOptionsMonitorCache<T> cache) : base(factory, sources, cache)
@@ -871,30 +875,32 @@ namespace ASC.Common.Logging
         }
     }
 
-    public static class StudioNotifyHelperExtension
+    public class LoggerExtension<T> where T : class, ILog, new()
     {
-        public static DIHelper AddLogManager<T>(this DIHelper services, params string[] additionalLoggers) where T : class, ILog, new()
+        public static void RegisterLog(DIHelper services)
         {
             const string baseName = "ASC";
             var baseSqlName = $"{baseName}.SQL";
             services.Configure<T>(r => r.Name = baseName);
             services.Configure<T>(baseName, r => r.Name = baseName);
-            services.Configure<T>(baseSqlName, r => r.Name = baseSqlName);
-
+            services.Configure<T>(baseSqlName, r => r.Name = baseSqlName);
+            services.TryAdd(typeof(IOptionsMonitor<ILog>), typeof(LogManager<T>));
+        }
+
+        public static void ConfigureLog(DIHelper services, params string[] additionalLoggers)
+        {
             foreach (var l in additionalLoggers)
             {
                 services.Configure<T>(l, r => r.Name = l);
             }
-
-            services.TryAddSingleton(typeof(IOptionsMonitor<ILog>), typeof(LogManager<T>));
-            return services;
-        }
-
-        public static DIHelper AddNLogManager(this DIHelper services, params string[] additionalLoggers)
-        {
-            services.TryAddSingleton<IConfigureNamedOptions<LogNLog>, ConfigureLogNLog>();
-            services.TryAddSingleton<IConfigureOptions<LogNLog>, ConfigureLogNLog>();
-            return services.AddLogManager<LogNLog>(additionalLoggers);
         }
+    }
+
+    public class LogNLogExtension : LoggerExtension<LogNLog>
+    {
+        public static void Register(DIHelper services)
+        {
+            RegisterLog(services);
+        }
     }
 }
diff --git a/common/ASC.Data.Storage/Configuration/Appender.cs b/common/ASC.Data.Storage/Configuration/Appender.cs
index e23dae778f..65aeb314fa 100644
--- a/common/ASC.Data.Storage/Configuration/Appender.cs
+++ b/common/ASC.Data.Storage/Configuration/Appender.cs
@@ -18,7 +18,7 @@ namespace ASC.Data.Storage.Configuration
         }
     }
 
-    [Singletone]
+
     public class Storage
     {
         public IEnumerable<Appender> Appender { get; set; }
diff --git a/common/services/ASC.ApiSystem/Startup.cs b/common/services/ASC.ApiSystem/Startup.cs
index 0dfb54b8f7..048d521726 100644
--- a/common/services/ASC.ApiSystem/Startup.cs
+++ b/common/services/ASC.ApiSystem/Startup.cs
@@ -70,8 +70,8 @@ namespace ASC.ApiSystem
             services.AddAuthentication()
                 .AddScheme<AuthenticationSchemeOptions, AuthHandler>("auth.allowskip", _ => { })
                 .AddScheme<AuthenticationSchemeOptions, AuthHandler>("auth.allowskip.registerportal", _ => { });
-
-            diHelper.AddNLogManager("ASC.Apisystem");
+
+            LogNLogExtension.ConfigureLog(diHelper, "ASC.Apisystem");
 
             services.AddAutofac(Configuration, HostEnvironment.ContentRootPath, false);
         }
diff --git a/common/services/ASC.Data.Storage.Migration/Program.cs b/common/services/ASC.Data.Storage.Migration/Program.cs
index 205199c2b1..25941246cb 100644
--- a/common/services/ASC.Data.Storage.Migration/Program.cs
+++ b/common/services/ASC.Data.Storage.Migration/Program.cs
@@ -47,8 +47,8 @@ namespace ASC.Data.Storage.Migration
                 .ConfigureServices((hostContext, services) =>
                 {
                     var diHelper = new DIHelper(services);
-
-                    diHelper.AddNLogManager("ASC.Data.Storage.Migration", "ASC.Migration");
+
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Data.Storage.Migration", "ASC.Migration");
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
                     diHelper.TryAdd<MigrationServiceLauncher>();
diff --git a/common/services/ASC.Notify/Program.cs b/common/services/ASC.Notify/Program.cs
index 587a0812f5..0a02a35c73 100644
--- a/common/services/ASC.Notify/Program.cs
+++ b/common/services/ASC.Notify/Program.cs
@@ -52,7 +52,7 @@ namespace ASC.Notify
                 {
                     var diHelper = new DIHelper(services);
 
-                    diHelper.AddNLogManager("ASC.Notify", "ASC.Notify.Messages");
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Notify", "ASC.Notify.Messages");
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
 
                     services.Configure<NotifyServiceCfg>(hostContext.Configuration.GetSection("notify"));
diff --git a/common/services/ASC.Socket.IO.Svc/Program.cs b/common/services/ASC.Socket.IO.Svc/Program.cs
index b7f0726dcd..50b2420ae9 100644
--- a/common/services/ASC.Socket.IO.Svc/Program.cs
+++ b/common/services/ASC.Socket.IO.Svc/Program.cs
@@ -74,8 +74,8 @@ namespace ASC.Socket.IO.Svc
                 .ConfigureServices((hostContext, services) =>
                 {
                     var diHelper = new DIHelper(services);
-                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                    diHelper.AddNLogManager("ASC.Socket.IO.Svc");
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Socket.IO.Svc");
                     services.AddHostedService<SocketServiceLauncher>();
                     diHelper.TryAdd<SocketServiceLauncher>();
 
diff --git a/common/services/ASC.Studio.Notify/Program.cs b/common/services/ASC.Studio.Notify/Program.cs
index e58632cae3..5c7209ae3c 100644
--- a/common/services/ASC.Studio.Notify/Program.cs
+++ b/common/services/ASC.Studio.Notify/Program.cs
@@ -50,7 +50,7 @@ namespace ASC.Studio.Notify
                 {
                     var diHelper = new DIHelper(services);
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                    diHelper.AddNLogManager("ASC.Notify", "ASC.Notify.Messages");
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Notify", "ASC.Notify.Messages");
                     services.AddHostedService<ServiceLauncher>();
                     diHelper.TryAdd<ServiceLauncher>();
                     NotifyConfigurationExtension.Register(diHelper);
diff --git a/common/services/ASC.Thumbnails.Svc/Program.cs b/common/services/ASC.Thumbnails.Svc/Program.cs
index bf06dad33b..cd009353ea 100644
--- a/common/services/ASC.Thumbnails.Svc/Program.cs
+++ b/common/services/ASC.Thumbnails.Svc/Program.cs
@@ -75,8 +75,8 @@ namespace ASC.Thumbnails.Svc
                 {
                     var diHelper = new DIHelper(services);
 
-                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                    diHelper.AddNLogManager("ASC.Thumbnails.Svc");
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Thumbnails.Svc");
                     services.AddHostedService<ThumbnailsServiceLauncher>();
                     diHelper.TryAdd<ThumbnailsServiceLauncher>();
 
diff --git a/common/services/ASC.UrlShortener.Svc/Program.cs b/common/services/ASC.UrlShortener.Svc/Program.cs
index 5b713201a0..72fba20bf4 100644
--- a/common/services/ASC.UrlShortener.Svc/Program.cs
+++ b/common/services/ASC.UrlShortener.Svc/Program.cs
@@ -71,8 +71,8 @@ namespace ASC.UrlShortener.Svc
                 })
                 .ConfigureServices((hostContext, services) =>
                 {
-                    var diHelper = new DIHelper(services);
-                    diHelper.AddNLogManager("ASC.UrlShortener.Svc");
+                    var diHelper = new DIHelper(services);
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.UrlShortener.Svc");
                     services.AddHostedService<UrlShortenerServiceLauncher>();
                     diHelper.TryAdd<UrlShortenerServiceLauncher>();
 
diff --git a/products/ASC.Files/Service/Program.cs b/products/ASC.Files/Service/Program.cs
index c7289bf680..b6a88c7f1b 100644
--- a/products/ASC.Files/Service/Program.cs
+++ b/products/ASC.Files/Service/Program.cs
@@ -52,14 +52,13 @@ namespace ASC.Files.Service
                     var diHelper = new DIHelper(services);
 
                     diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
-                    diHelper.AddNLogManager("ASC.Files");
                     services.AddHostedService<ServiceLauncher>();
                     diHelper.TryAdd<ServiceLauncher>();
 
-                    diHelper.AddNLogManager("ASC.Feed.Agregator");
                     services.AddHostedService<FeedAggregatorService>();
                     diHelper.TryAdd<FeedAggregatorService>();
 
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.Files", "ASC.Feed.Agregator");
                     //diHelper.TryAdd<FileConverter>();
                     diHelper.TryAdd<FactoryIndexerFile>();
                     diHelper.TryAdd<FactoryIndexerFolder>();
diff --git a/products/ASC.People/Server/Controllers/PeopleController.cs b/products/ASC.People/Server/Controllers/PeopleController.cs
index 6d786ce48d..a24cac04ff 100644
--- a/products/ASC.People/Server/Controllers/PeopleController.cs
+++ b/products/ASC.People/Server/Controllers/PeopleController.cs
@@ -122,6 +122,7 @@ namespace ASC.Employee.Core.Controllers
             PasswordHasher passwordHasher)
         {
             Log = option.Get("ASC.Api");
+            Log.Debug("Test");
             MessageService = messageService;
             QueueWorkerReassign = queueWorkerReassign;
             QueueWorkerRemove = queueWorkerRemove;
diff --git a/products/ASC.People/Server/Startup.cs b/products/ASC.People/Server/Startup.cs
index 99abbe21ed..8e3f59023e 100644
--- a/products/ASC.People/Server/Startup.cs
+++ b/products/ASC.People/Server/Startup.cs
@@ -1,4 +1,6 @@
 
+using System.Linq;
+
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Employee.Core.Controllers;
diff --git a/web/ASC.Web.Studio/Startup.cs b/web/ASC.Web.Studio/Startup.cs
index 26b71c5e5a..13d2b77aaf 100644
--- a/web/ASC.Web.Studio/Startup.cs
+++ b/web/ASC.Web.Studio/Startup.cs
@@ -36,7 +36,6 @@ namespace ASC.Web.Studio
             services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
 
             DIHelper.TryAdd<Login>();
-            StorageConfigExtension.Register(DIHelper);
             DIHelper.TryAdd<PathUtils>();
             DIHelper.TryAdd<StorageHandlerScope>();
         }

From 265feee81ef60e443e04340bcac1d8f9777f3148 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Thu, 29 Oct 2020 12:31:55 +0300
Subject: [PATCH 18/22] Refactoring: scope

---
 common/ASC.Common/DIHelper.cs         | 181 +++++++++++---------------
 common/ASC.Common/Logging/Log.cs      |   1 -
 products/ASC.People/Server/Startup.cs |   2 -
 web/ASC.Web.Studio/Startup.cs         |   1 -
 4 files changed, 77 insertions(+), 108 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 9b2ab62870..72365fcf2d 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -6,7 +6,6 @@ using System.Reflection;
 using ASC.Common.Threading.Progress;
 using ASC.Common.Threading.Workers;
 
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
@@ -15,62 +14,90 @@ using Microsoft.Extensions.Options;
 
 namespace ASC.Common
 {
+    public enum DIAttributeEnum
+    {
+        Singletone,
+        Scope,
+        Transient
+    }
+
     public class TransientAttribute : DIAttribute
     {
-        public TransientAttribute()
-        {
-        }
+        public override DIAttributeEnum DIAttributeEnum { get => DIAttributeEnum.Transient; }
 
-        public TransientAttribute(Type service) : base(service)
-        {
-        }
+        public TransientAttribute() { }
 
-        public TransientAttribute(Type service, Type implementation) : base(service, implementation)
-        {
+        public TransientAttribute(Type service) : base(service) { }
 
+        public TransientAttribute(Type service, Type implementation) : base(service, implementation) { }
+
+        public override void TryAdd(IServiceCollection services, Type service, Type implementation = null)
+        {
+            if (implementation != null)
+            {
+                services.AddTransient(service, implementation);
+            }
+            else
+            {
+                services.AddTransient(service);
+            }
         }
     }
 
     public class ScopeAttribute : DIAttribute
     {
-        public ScopeAttribute()
-        {
-        }
+        public override DIAttributeEnum DIAttributeEnum { get => DIAttributeEnum.Scope; }
 
-        public ScopeAttribute(Type service) : base(service)
-        {
-        }
+        public ScopeAttribute() { }
 
-        public ScopeAttribute(Type service, Type implementation) : base(service, implementation)
+        public ScopeAttribute(Type service) : base(service) { }
+
+        public ScopeAttribute(Type service, Type implementation) : base(service, implementation) { }
+
+        public override void TryAdd(IServiceCollection services, Type service, Type implementation = null)
         {
+            if (implementation != null)
+            {
+                services.AddScoped(service, implementation);
+            }
+            else
+            {
+                services.AddScoped(service);
+            }
         }
     }
 
     public class SingletoneAttribute : DIAttribute
     {
-        public SingletoneAttribute()
-        {
-        }
+        public override DIAttributeEnum DIAttributeEnum { get => DIAttributeEnum.Singletone; }
 
-        public SingletoneAttribute(Type service) : base(service)
-        {
-        }
+        public SingletoneAttribute() { }
 
-        public SingletoneAttribute(Type service, Type implementation) : base(service, implementation)
+        public SingletoneAttribute(Type service) : base(service) { }
+
+        public SingletoneAttribute(Type service, Type implementation) : base(service, implementation) { }
+
+        public override void TryAdd(IServiceCollection services, Type service, Type implementation = null)
         {
+            if (implementation != null)
+            {
+                services.AddSingleton(service, implementation);
+            }
+            else
+            {
+                services.AddSingleton(service);
+            }
         }
     }
 
-    public class DIAttribute : Attribute
+    public abstract class DIAttribute : Attribute
     {
+        public abstract DIAttributeEnum DIAttributeEnum { get; }
         public Type Implementation { get; }
         public Type Service { get; }
         public Type Additional { get; set; }
 
-        public DIAttribute()
-        {
-
-        }
+        public DIAttribute() { }
 
         public DIAttribute(Type service)
         {
@@ -82,23 +109,26 @@ namespace ASC.Common
             Implementation = implementation;
             Service = service;
         }
+
+        public abstract void TryAdd(IServiceCollection services, Type service, Type implementation = null);
     }
 
     public class DIHelper
     {
+        public Dictionary<DIAttributeEnum, List<string>> Services { get; set; }
         public List<string> Added { get; set; }
-        public List<string> Singleton { get; set; }
-        public List<string> Scoped { get; set; }
-        public List<string> Transient { get; set; }
         public List<string> Configured { get; set; }
         public IServiceCollection ServiceCollection { get; private set; }
 
         public DIHelper()
         {
+            Services = new Dictionary<DIAttributeEnum, List<string>>()
+            {
+                { DIAttributeEnum.Singletone, new List<string>() },
+                { DIAttributeEnum.Scope, new List<string>() },
+                { DIAttributeEnum.Transient, new List<string>() }
+            };
             Added = new List<string>();
-            Singleton = new List<string>();
-            Scoped = new List<string>();
-            Transient = new List<string>();
             Configured = new List<string>();
         }
 
@@ -141,11 +171,6 @@ namespace ASC.Common
             if (Added.Contains(serviceName)) return false;
             Added.Add(serviceName);
 
-            if (serviceName == "ASC.Notify.DbWorker")
-            {
-                var qqaz = 0;
-            }
-
             var di = service.IsGenericType && (
                 service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) ||
                 service.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>) ||
@@ -226,7 +251,11 @@ namespace ASC.Common
 
                     if (di.Implementation != null)
                     {
-                        var a = di.Implementation.GetInterfaces().FirstOrDefault(x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) || x.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>)));
+                        var a = di.Implementation.GetInterfaces().FirstOrDefault(x => x.IsGenericType &&
+                        (x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) ||
+                        x.GetGenericTypeDefinition() == typeof(IPostConfigureOptions<>) ||
+                        x.GetGenericTypeDefinition() == typeof(IOptionsMonitor<>))
+                        );
                         if (a != null)
                         {
                             if (!a.ContainsGenericParameters)
@@ -307,43 +336,7 @@ namespace ASC.Common
             return isnew;
         }
 
-        private bool Register(Type service)
-        {
-            if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter)) || service.GetInterfaces().Contains(typeof(IAuthenticationHandler))) return true;
-            var c = service.GetCustomAttribute<DIAttribute>();
-            var serviceName = $"{service}";
-            if (c is ScopeAttribute)
-            {
-                if (!Scoped.Contains(serviceName))
-                {
-                    Scoped.Add(serviceName);
-                    ServiceCollection.TryAddScoped(service);
-                    return true;
-                }
-            }
-            else if (c is SingletoneAttribute)
-            {
-                if (!Singleton.Contains(serviceName))
-                {
-                    Singleton.Add(serviceName);
-                    ServiceCollection.TryAddSingleton(service);
-                    return true;
-                }
-            }
-            else if (c is TransientAttribute)
-            {
-                if (!Transient.Contains(serviceName))
-                {
-                    Transient.Add(serviceName);
-                    ServiceCollection.TryAddTransient(service);
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        private bool Register(Type service, Type implementation)
+        private bool Register(Type service, Type implementation = null)
         {
             if (service.IsSubclassOf(typeof(ControllerBase)) || service.GetInterfaces().Contains(typeof(IResourceFilter))) return true;
             var c = service.IsGenericType && (
@@ -352,32 +345,12 @@ namespace ASC.Common
                 service.GetGenericTypeDefinition() == typeof(IOptionsMonitor<>)
                 ) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
             var serviceName = $"{service}{implementation}";
-            if (c is ScopeAttribute)
+
+            if (!Services[c.DIAttributeEnum].Contains(serviceName))
             {
-                if (!Scoped.Contains(serviceName))
-                {
-                    Scoped.Add(serviceName);
-                    ServiceCollection.TryAddScoped(service, implementation);
-                    return true;
-                }
-            }
-            else if (c is SingletoneAttribute)
-            {
-                if (!Singleton.Contains(serviceName))
-                {
-                    Singleton.Add(serviceName);
-                    ServiceCollection.AddSingleton(service, implementation);
-                    return true;
-                }
-            }
-            else if (c is TransientAttribute)
-            {
-                if (!Transient.Contains(serviceName))
-                {
-                    Transient.Add(serviceName);
-                    ServiceCollection.TryAddTransient(service, implementation);
-                    return true;
-                }
+                c.TryAdd(ServiceCollection, service, implementation);
+                Services[c.DIAttributeEnum].Add(serviceName);
+                return true;
             }
 
             return false;
@@ -387,9 +360,9 @@ namespace ASC.Common
         public DIHelper TryAddSingleton<TService>(Func<IServiceProvider, TService> implementationFactory) where TService : class
         {
             var serviceName = $"{typeof(TService)}";
-            if (!Singleton.Contains(serviceName))
+            if (!Services[DIAttributeEnum.Singletone].Contains(serviceName))
             {
-                Singleton.Add(serviceName);
+                Services[DIAttributeEnum.Singletone].Add(serviceName);
                 ServiceCollection.TryAddSingleton(implementationFactory);
             }
 
diff --git a/common/ASC.Common/Logging/Log.cs b/common/ASC.Common/Logging/Log.cs
index 4cf99f13af..1c9dcf7b89 100644
--- a/common/ASC.Common/Logging/Log.cs
+++ b/common/ASC.Common/Logging/Log.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 using ASC.Common.Utils;
 
diff --git a/products/ASC.People/Server/Startup.cs b/products/ASC.People/Server/Startup.cs
index 8e3f59023e..99abbe21ed 100644
--- a/products/ASC.People/Server/Startup.cs
+++ b/products/ASC.People/Server/Startup.cs
@@ -1,6 +1,4 @@
 
-using System.Linq;
-
 using ASC.Api.Core;
 using ASC.Common;
 using ASC.Employee.Core.Controllers;
diff --git a/web/ASC.Web.Studio/Startup.cs b/web/ASC.Web.Studio/Startup.cs
index 13d2b77aaf..0a94350027 100644
--- a/web/ASC.Web.Studio/Startup.cs
+++ b/web/ASC.Web.Studio/Startup.cs
@@ -2,7 +2,6 @@
 using ASC.Api.Core;
 using ASC.Common.DependencyInjection;
 using ASC.Data.Storage;
-using ASC.Data.Storage.Configuration;
 using ASC.Data.Storage.DiscStorage;
 using ASC.FederatedLogin;
 

From 43beaf6f6b8208143558f3c0a52306d092436b10 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Thu, 29 Oct 2020 17:30:08 +0300
Subject: [PATCH 19/22] Refactoring: scope

---
 common/ASC.Common/DIHelper.cs                      | 11 ++++++++++-
 common/ASC.Core.Common/Context/WorkContext.cs      |  5 ++---
 .../Notify/Senders/TelegramSender.cs               | 11 +++++++----
 common/ASC.VoipService/Dao/CachedVoipDao.cs        |  3 ++-
 .../services/ASC.ApiSystem/Classes/AuthHandler.cs  |  4 +++-
 common/services/ASC.ApiSystem/Startup.cs           | 14 +++++++++++++-
 6 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/common/ASC.Common/DIHelper.cs b/common/ASC.Common/DIHelper.cs
index 72365fcf2d..24699b441d 100644
--- a/common/ASC.Common/DIHelper.cs
+++ b/common/ASC.Common/DIHelper.cs
@@ -245,7 +245,16 @@ namespace ASC.Common
                         }
                         else
                         {
-                            isnew = di.Implementation == null ? Register(service, di.Service) : Register(di.Service);
+                            if (di.Implementation == null)
+                            {
+                                isnew = Register(service, di.Service);
+                                TryAdd(di.Service);
+                            }
+                            else
+                            {
+                                Register(di.Service);
+                            }
+
                         }
                     }
 
diff --git a/common/ASC.Core.Common/Context/WorkContext.cs b/common/ASC.Core.Common/Context/WorkContext.cs
index 9e993aa697..c9d5f1f75a 100644
--- a/common/ASC.Core.Common/Context/WorkContext.cs
+++ b/common/ASC.Core.Common/Context/WorkContext.cs
@@ -104,14 +104,13 @@ namespace ASC.Core
                 var configuration = serviceProvider.GetService<IConfiguration>();
                 var cacheNotify = serviceProvider.GetService<ICacheNotify<NotifyMessage>>();
                 var cacheInvoke = serviceProvider.GetService<ICacheNotify<NotifyInvoke>>();
-                var options = serviceProvider.GetService<IOptionsMonitor<ILog>>();
-                var telegramHelper = serviceProvider.GetService<TelegramHelper>();
+                var options = serviceProvider.GetService<IOptionsMonitor<ILog>>();
 
                 NotifyContext = new NotifyContext(serviceProvider);
 
                 INotifySender jabberSender = new NotifyServiceSender(cacheNotify, cacheInvoke);
                 INotifySender emailSender = new NotifyServiceSender(cacheNotify, cacheInvoke);
-                INotifySender telegramSender = new TelegramSender(options, telegramHelper);
+                INotifySender telegramSender = new TelegramSender(options, serviceProvider);
 
                 var postman = configuration["core:notify:postman"];
 
diff --git a/common/ASC.Core.Common/Notify/Senders/TelegramSender.cs b/common/ASC.Core.Common/Notify/Senders/TelegramSender.cs
index 8659b0f95d..d6986f89e9 100644
--- a/common/ASC.Core.Common/Notify/Senders/TelegramSender.cs
+++ b/common/ASC.Core.Common/Notify/Senders/TelegramSender.cs
@@ -31,6 +31,7 @@ using ASC.Common.Logging;
 using ASC.Core.Common.Notify;
 using ASC.Notify.Messages;
 
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace ASC.Core.Notify.Senders
@@ -38,14 +39,14 @@ namespace ASC.Core.Notify.Senders
     public class TelegramSender : INotifySender
     {
         private readonly ILog log;
-        private TelegramHelper TelegramHelper { get; }
 
-        public TelegramSender(IOptionsMonitor<ILog> options, TelegramHelper telegramHelper)
+        public TelegramSender(IOptionsMonitor<ILog> options, IServiceProvider serviceProvider)
         {
             log = options.Get("ASC");
-            TelegramHelper = telegramHelper;
+            ServiceProvider = serviceProvider;
         }
 
+        public IServiceProvider ServiceProvider { get; }
 
         public void Init(IDictionary<string, string> properties)
         {
@@ -59,7 +60,9 @@ namespace ASC.Core.Notify.Senders
                 m.Content = Regex.Replace(m.Content, "\n{3,}", "\n\n");
             }
             try
-            {
+            {
+                using var scope = ServiceProvider.CreateScope();
+                var TelegramHelper = scope.ServiceProvider.GetService<TelegramHelper>();
                 TelegramHelper.SendMessage(m);
             }
             catch (Exception e)
diff --git a/common/ASC.VoipService/Dao/CachedVoipDao.cs b/common/ASC.VoipService/Dao/CachedVoipDao.cs
index 741d5b7ae4..b917a96eb0 100644
--- a/common/ASC.VoipService/Dao/CachedVoipDao.cs
+++ b/common/ASC.VoipService/Dao/CachedVoipDao.cs
@@ -58,7 +58,8 @@ namespace ASC.VoipService.Dao
             Notify.Publish(new CachedVoipItem { Tenant = tenant }, CacheNotifyAction.Any);
         }
     }
-
+
+    [Scope]
     public class CachedVoipDao : VoipDao
     {
         private readonly ICache cache;
diff --git a/common/services/ASC.ApiSystem/Classes/AuthHandler.cs b/common/services/ASC.ApiSystem/Classes/AuthHandler.cs
index f40bf699bb..9ef9c3da9d 100644
--- a/common/services/ASC.ApiSystem/Classes/AuthHandler.cs
+++ b/common/services/ASC.ApiSystem/Classes/AuthHandler.cs
@@ -34,6 +34,7 @@ using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
+using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Security.Cryptography;
 using ASC.Web.Core.Helpers;
@@ -45,7 +46,8 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace ASC.ApiSystem.Classes
-{
+{
+    [Scope]
     public class AuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
     {
         public AuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) :
diff --git a/common/services/ASC.ApiSystem/Startup.cs b/common/services/ASC.ApiSystem/Startup.cs
index 048d521726..7f23d8d058 100644
--- a/common/services/ASC.ApiSystem/Startup.cs
+++ b/common/services/ASC.ApiSystem/Startup.cs
@@ -25,7 +25,9 @@
 
 
 using ASC.ApiSystem.Classes;
+using ASC.ApiSystem.Controllers;
 using ASC.Common;
+using ASC.Common.Caching;
 using ASC.Common.DependencyInjection;
 using ASC.Common.Logging;
 
@@ -35,6 +37,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 
 
@@ -65,7 +68,16 @@ namespace ASC.ApiSystem
                     options.JsonSerializerOptions.IgnoreNullValues = true;
                 });
 
-            services.AddMemoryCache();
+            services.AddMemoryCache();
+
+            diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
+            diHelper.TryAdd<AuthHandler>();
+            diHelper.TryAdd<CalDavController>();
+            diHelper.TryAdd<CoreSettingsController>();
+            diHelper.TryAdd<PortalController>();
+            diHelper.TryAdd<RegistrationController>();
+            diHelper.TryAdd<SettingsController>();
+            diHelper.TryAdd<TariffController>();
 
             services.AddAuthentication()
                 .AddScheme<AuthenticationSchemeOptions, AuthHandler>("auth.allowskip", _ => { })

From aea74a82e83a8e0475eda19d0cd0ebca49623672 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 4 Nov 2020 14:15:14 +0300
Subject: [PATCH 20/22] Mobile: fix

---
 web/ASC.Web.Api/Controllers/PortalController.cs      | 12 ++++++++++++
 .../Mobile/CachedMobileAppInstallRegistrator.cs      |  4 ++--
 .../Mobile/IMobileAppInstallRegistrator.cs           |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/web/ASC.Web.Api/Controllers/PortalController.cs b/web/ASC.Web.Api/Controllers/PortalController.cs
index 87f729377f..52f2340441 100644
--- a/web/ASC.Web.Api/Controllers/PortalController.cs
+++ b/web/ASC.Web.Api/Controllers/PortalController.cs
@@ -8,11 +8,13 @@ using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Billing;
+using ASC.Core.Common.Notify.Push;
 using ASC.Core.Common.Settings;
 using ASC.Core.Tenants;
 using ASC.Core.Users;
 using ASC.Web.Api.Routing;
 using ASC.Web.Core;
+using ASC.Web.Core.Mobile;
 using ASC.Web.Core.Utility;
 using ASC.Web.Studio.Core;
 using ASC.Web.Studio.Utility;
@@ -43,6 +45,7 @@ namespace ASC.Web.Api.Controllers
         private WebItemSecurity WebItemSecurity { get; }
         private SecurityContext SecurityContext { get; }
         private SettingsManager SettingsManager { get; }
+        public IMobileAppInstallRegistrator MobileAppInstallRegistrator { get; }
         private IConfiguration Configuration { get; set; }
         public ILog Log { get; }
 
@@ -59,6 +62,7 @@ namespace ASC.Web.Api.Controllers
             WebItemSecurity webItemSecurity,
             SecurityContext securityContext,
             SettingsManager settingsManager,
+            IMobileAppInstallRegistrator mobileAppInstallRegistrator,
             IConfiguration configuration
             )
         {
@@ -73,6 +77,7 @@ namespace ASC.Web.Api.Controllers
             WebItemSecurity = webItemSecurity;
             SecurityContext = securityContext;
             SettingsManager = settingsManager;
+            MobileAppInstallRegistrator = mobileAppInstallRegistrator;
             Configuration = configuration;
         }
 
@@ -194,5 +199,12 @@ namespace ASC.Web.Api.Controllers
                 Log.Error("MarkPresentAsReaded", ex);
             }
         }
+
+        [Create("mobile/registration")]
+        public void RegisterMobileAppInstall(MobileAppType type)
+        {
+            var currentUser = UserManager.GetUsers(SecurityContext.CurrentAccount.ID);
+            MobileAppInstallRegistrator.RegisterInstall(currentUser.Email, type);
+        }
     }
 }
\ No newline at end of file
diff --git a/web/ASC.Web.Core/Mobile/CachedMobileAppInstallRegistrator.cs b/web/ASC.Web.Core/Mobile/CachedMobileAppInstallRegistrator.cs
index 0254fe9d22..380e725db9 100644
--- a/web/ASC.Web.Core/Mobile/CachedMobileAppInstallRegistrator.cs
+++ b/web/ASC.Web.Core/Mobile/CachedMobileAppInstallRegistrator.cs
@@ -40,12 +40,12 @@ namespace ASC.Web.Core.Mobile
 
         private TenantManager TenantManager { get; }
 
-        public CachedMobileAppInstallRegistrator(IMobileAppInstallRegistrator registrator, TenantManager tenantManager)
+        public CachedMobileAppInstallRegistrator(MobileAppInstallRegistrator registrator, TenantManager tenantManager)
             : this(registrator, TimeSpan.FromMinutes(30), tenantManager)
         {
         }
 
-        public CachedMobileAppInstallRegistrator(IMobileAppInstallRegistrator registrator, TimeSpan cacheExpiration, TenantManager tenantManager)
+        public CachedMobileAppInstallRegistrator(MobileAppInstallRegistrator registrator, TimeSpan cacheExpiration, TenantManager tenantManager)
         {
             TenantManager = tenantManager;
             this.registrator = registrator ?? throw new ArgumentNullException("registrator");
diff --git a/web/ASC.Web.Core/Mobile/IMobileAppInstallRegistrator.cs b/web/ASC.Web.Core/Mobile/IMobileAppInstallRegistrator.cs
index 5a57707439..bf18b2d097 100644
--- a/web/ASC.Web.Core/Mobile/IMobileAppInstallRegistrator.cs
+++ b/web/ASC.Web.Core/Mobile/IMobileAppInstallRegistrator.cs
@@ -24,10 +24,12 @@
 */
 
 
+using ASC.Common;
 using ASC.Core.Common.Notify.Push;
 
 namespace ASC.Web.Core.Mobile
 {
+    [Scope(typeof(MobileAppInstallRegistrator), typeof(CachedMobileAppInstallRegistrator))]
     public interface IMobileAppInstallRegistrator
     {
         void RegisterInstall(string userEmail, MobileAppType appType);

From 7c228a78e5dd1468d9d3325847c100020a0e9471 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Sun, 15 Nov 2020 18:34:47 +0300
Subject: [PATCH 21/22] Files: fix create file in thirdparty

---
 .../ASC.Files/Core/Core/FileStorageService.cs |  2 +-
 products/ASC.Files/Core/Utils/FileMarker.cs   | 64 +++++++++++--------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/products/ASC.Files/Core/Core/FileStorageService.cs b/products/ASC.Files/Core/Core/FileStorageService.cs
index 3a8a447eb3..d3e4831b24 100644
--- a/products/ASC.Files/Core/Core/FileStorageService.cs
+++ b/products/ASC.Files/Core/Core/FileStorageService.cs
@@ -588,7 +588,7 @@ namespace ASC.Web.Files.Services.WCFService
                 file.Title = FileUtility.ReplaceFileExtension(fileWrapper.Title, fileExt);
             }
 
-            if (fileWrapper.TemplateId.Equals(default(T)))
+            if (fileWrapper.TemplateId == null || fileWrapper.TemplateId.Equals(default(T)))
             {
                 var culture = UserManager.GetUsers(AuthContext.CurrentAccount.ID).GetCulture();
                 var storeTemplate = GetStoreTemplate();
diff --git a/products/ASC.Files/Core/Utils/FileMarker.cs b/products/ASC.Files/Core/Utils/FileMarker.cs
index 2bd8eb539f..1b408ed86e 100644
--- a/products/ASC.Files/Core/Utils/FileMarker.cs
+++ b/products/ASC.Files/Core/Utils/FileMarker.cs
@@ -104,7 +104,7 @@ namespace ASC.Web.Files.Utils
         private TenantManager TenantManager { get; }
         private UserManager UserManager { get; }
         private IDaoFactory DaoFactory { get; }
-        private GlobalFolder GlobalFolder { get; }
+        private GlobalFolder GlobalFolder { get; }
         private FileSecurity FileSecurity { get; }
         private CoreBaseSettings CoreBaseSettings { get; }
         private AuthContext AuthContext { get; }
@@ -125,7 +125,7 @@ namespace ASC.Web.Files.Utils
             TenantManager = tenantManager;
             UserManager = userManager;
             DaoFactory = daoFactory;
-            GlobalFolder = globalFolder;
+            GlobalFolder = globalFolder;
             FileSecurity = fileSecurity;
             CoreBaseSettings = coreBaseSettings;
             AuthContext = authContext;
@@ -150,7 +150,7 @@ namespace ASC.Web.Files.Utils
 
             var userIDs = obj.UserIDs;
 
-            var userEntriesData = new Dictionary<Guid, List<FileEntry<T>>>();
+            var userEntriesData = new Dictionary<Guid, List<FileEntry>>();
 
             if (obj.FileEntry.RootFolderType == FolderType.BUNCH)
             {
@@ -158,7 +158,7 @@ namespace ASC.Web.Files.Utils
 
                 parentFolders.Add(folderDao.GetFolder(GlobalFolder.GetFolderProjects<T>(DaoFactory)));
 
-                var entries = new List<FileEntry<T>> { obj.FileEntry };
+                var entries = new List<FileEntry> { obj.FileEntry };
                 entries = entries.Concat(parentFolders).ToList();
 
                 userIDs.ForEach(userID =>
@@ -194,26 +194,27 @@ namespace ASC.Web.Files.Utils
                                                            if (userEntriesData.ContainsKey(userID))
                                                                userEntriesData[userID].Add(parentFolder);
                                                            else
-                                                               userEntriesData.Add(userID, new List<FileEntry<T>> { parentFolder });
+                                                               userEntriesData.Add(userID, new List<FileEntry> { parentFolder });
                                                        })
                     );
 
 
 
                 if (obj.FileEntry.RootFolderType == FolderType.USER)
-                {
-                    var folderShare = folderDao.GetFolder(GlobalFolder.GetFolderShare<T>(DaoFactory));
+                {
+                    var folderDaoInt = DaoFactory.GetFolderDao<int>();
+                    var folderShare = folderDaoInt.GetFolder(GlobalFolder.GetFolderShare(DaoFactory));
 
                     foreach (var userID in userIDs)
                     {
-                        var userFolderId = folderDao.GetFolderIDUser(false, userID);
+                        var userFolderId = GlobalFolder.GetFolderMy(this, DaoFactory);
                         if (Equals(userFolderId, 0)) continue;
 
-                        Folder<T> rootFolder = null;
+                        Folder<int> rootFolder = null;
                         if (obj.FileEntry.ProviderEntry)
                         {
                             rootFolder = obj.FileEntry.RootFolderCreator == userID
-                                             ? folderDao.GetFolder(userFolderId)
+                                             ? folderDaoInt.GetFolder(userFolderId)
                                              : folderShare;
                         }
                         else if (!Equals(obj.FileEntry.RootFolderId, userFolderId))
@@ -230,7 +231,7 @@ namespace ASC.Web.Files.Utils
                         if (userEntriesData.ContainsKey(userID))
                             userEntriesData[userID].Add(rootFolder);
                         else
-                            userEntriesData.Add(userID, new List<FileEntry<T>> { rootFolder });
+                            userEntriesData.Add(userID, new List<FileEntry> { rootFolder });
 
                         RemoveFromCahce(rootFolder.ID, userID);
                     }
@@ -247,7 +248,7 @@ namespace ASC.Web.Files.Utils
                                                 if (userEntriesData.ContainsKey(userID))
                                                     userEntriesData[userID].Add(commonFolder);
                                                 else
-                                                    userEntriesData.Add(userID, new List<FileEntry<T>> { commonFolder });
+                                                    userEntriesData.Add(userID, new List<FileEntry> { commonFolder });
 
                                                 RemoveFromCahce(GlobalFolder.GetFolderCommon(this, DaoFactory), userID);
                                             });
@@ -266,7 +267,7 @@ namespace ASC.Web.Files.Utils
                         if (userEntriesData.ContainsKey(userID))
                             userEntriesData[userID].Add(rootFolder);
                         else
-                            userEntriesData.Add(userID, new List<FileEntry<T>> { rootFolder });
+                            userEntriesData.Add(userID, new List<FileEntry> { rootFolder });
 
                         RemoveFromCahce(rootFolder.ID, userID);
                     }
@@ -277,7 +278,7 @@ namespace ASC.Web.Files.Utils
                                         if (userEntriesData.ContainsKey(userID))
                                             userEntriesData[userID].Add(obj.FileEntry);
                                         else
-                                            userEntriesData.Add(userID, new List<FileEntry<T>> { obj.FileEntry });
+                                            userEntriesData.Add(userID, new List<FileEntry> { obj.FileEntry });
                                     });
             }
 
@@ -291,25 +292,32 @@ namespace ASC.Web.Files.Utils
                     continue;
 
                 var entries = userEntriesData[userID].Distinct().ToList();
-
-                var exist = tagDao.GetNewTags(userID, entries).ToList();
-                var update = exist.Where(t => t.EntryType == FileEntryType.Folder).ToList();
-                update.ForEach(t => t.Count++);
-                updateTags.AddRange(update);
-
-                entries.ForEach(entry =>
-                                    {
-                                        if (entry != null && exist.All(tag => tag != null && !tag.EntryId.Equals(entry.ID)))
-                                        {
-                                            newTags.Add(Tag.New(userID, entry));
-                                        }
-                                    });
+
+                GetNewTags(userID, entries.OfType<FileEntry<int>>().ToList());
+                GetNewTags(userID, entries.OfType<FileEntry<string>>().ToList());
             }
 
             if (updateTags.Any())
                 tagDao.UpdateNewTags(updateTags);
             if (newTags.Any())
-                tagDao.SaveTags(newTags);
+                tagDao.SaveTags(newTags);
+
+            void GetNewTags<T1>(Guid userID, List<FileEntry<T1>> entries)
+            {
+                var tagDao1 = DaoFactory.GetTagDao<T1>();
+                var exist = tagDao1.GetNewTags(userID, entries).ToList();
+                var update = exist.Where(t => t.EntryType == FileEntryType.Folder).ToList();
+                update.ForEach(t => t.Count++);
+                updateTags.AddRange(update);
+
+                entries.ForEach(entry =>
+                {
+                    if (entry != null && exist.All(tag => tag != null && !tag.EntryId.Equals(entry.ID)))
+                    {
+                        newTags.Add(Tag.New(userID, entry));
+                    }
+                });
+            }
         }
 
         public void MarkAsNew<T>(FileEntry<T> fileEntry, List<Guid> userIDs = null)

From f328484bac7919a721dda63323443efe7d34ca67 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Sun, 15 Nov 2020 18:42:47 +0300
Subject: [PATCH 22/22] Thumbnails: updated winston

---
 common/ASC.Thumbnails/package.json |   2 +-
 common/ASC.Thumbnails/yarn.lock    | 197 ++++++++++++++---------------
 2 files changed, 95 insertions(+), 104 deletions(-)

diff --git a/common/ASC.Thumbnails/package.json b/common/ASC.Thumbnails/package.json
index fd67087d70..af68331e3d 100644
--- a/common/ASC.Thumbnails/package.json
+++ b/common/ASC.Thumbnails/package.json
@@ -16,7 +16,7 @@
     "nconf": "^0.10.0",
     "node-cache": "^5.1.0",
     "request": "^2.88.2",
-    "winston": "^3.2.1",
+    "winston": "^3.3.3",
     "winston-daily-rotate-file": "^4.4.2",
     "graceful-fs": "~4.2.4",
     "cross-spawn": "^7.0.3",
diff --git a/common/ASC.Thumbnails/yarn.lock b/common/ASC.Thumbnails/yarn.lock
index c7d8487ba3..cd497dbeeb 100644
--- a/common/ASC.Thumbnails/yarn.lock
+++ b/common/ASC.Thumbnails/yarn.lock
@@ -2,6 +2,15 @@
 # yarn lockfile v1
 
 
+"@dabh/diagnostics@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31"
+  integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==
+  dependencies:
+    colorspace "1.1.x"
+    enabled "2.0.x"
+    kuler "^2.0.0"
+
 accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -10,10 +19,10 @@ accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-ajv@^6.5.5:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+ajv@^6.12.3:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -47,12 +56,10 @@ async@^1.4.0:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.6.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
+async@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -65,9 +72,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
-  integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -172,9 +179,9 @@ color-name@^1.0.0:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-string@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
-  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
+  integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -187,11 +194,6 @@ color@3.0.x:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colornames@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
-  integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
-
 colors@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -305,15 +307,6 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-diagnostics@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
-  integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
-  dependencies:
-    colorspace "1.1.x"
-    enabled "1.0.x"
-    kuler "1.0.x"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -327,23 +320,16 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-enabled@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
-  integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
-  dependencies:
-    env-variable "0.0.x"
+enabled@2.0.x:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
+  integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-env-variable@0.0.x:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
-  integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
-
 es6-promise@^4.0.3:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -447,10 +433,10 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fecha@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
-  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
+fecha@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41"
+  integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==
 
 file-stream-rotator@^0.5.7:
   version "0.5.7"
@@ -473,9 +459,9 @@ filenamify-url@^2.1.1:
     humanize-url "^2.0.0"
 
 filenamify@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.1.0.tgz#54d110810ae74eebfe115c1b995bd07e03cf2184"
-  integrity sha512-KQV/uJDI9VQgN7sHH1Zbk6+42cD6mnQ2HONzkXUfPJ+K2FC8GZ1dpewbbHw0Sz8Tf5k3EVdHVayM4DoAwWlmtg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.2.0.tgz#c99716d676869585b3b5d328b3f06590d032e89f"
+  integrity sha512-pkgE+4p7N1n7QieOopmn3TqJaefjdWXwEkj2XLZJLKfOgcQKkn11ahvGNgTD8mLggexLiDFQxeTs14xVU22XPA==
   dependencies:
     filename-reserved-regex "^2.0.0"
     strip-outer "^1.0.1"
@@ -494,6 +480,11 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
+fn.name@1.x.x:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
+  integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -562,11 +553,11 @@ har-schema@^2.0.0:
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    ajv "^6.5.5"
+    ajv "^6.12.3"
     har-schema "^2.0.0"
 
 hasha@^2.2.0:
@@ -667,11 +658,16 @@ is-fullwidth-code-point@^1.0.0:
   dependencies:
     number-is-nan "^1.0.0"
 
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -741,12 +737,10 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-kuler@1.0.x:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6"
-  integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==
-  dependencies:
-    colornames "^1.1.1"
+kuler@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
+  integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
 
 lcid@^1.0.0:
   version "1.0.0"
@@ -755,19 +749,14 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
-lodash@^4.17.14:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
-
-logform@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360"
-  integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==
+logform@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2"
+  integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==
   dependencies:
     colors "^1.2.1"
     fast-safe-stringify "^2.0.4"
-    fecha "^2.3.3"
+    fecha "^4.2.0"
     ms "^2.1.1"
     triple-beam "^1.3.0"
 
@@ -823,9 +812,9 @@ mkdirp@^0.5.4:
     minimist "^1.2.5"
 
 moment@^2.11.2, moment@^2.26.0:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
-  integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
 
 ms@2.0.0:
   version "2.0.0"
@@ -858,9 +847,9 @@ negotiator@0.6.2:
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 node-cache@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-5.1.1.tgz#5fcc887176b23bdcd19cd1461b9544d2d501e786"
-  integrity sha512-bJ9nH25Z51HG2QIu66K4dMVyMs6o8bNQpviDnXzG+O/gfNxPU9IpIig0j4pzlO707GcGZ6QA4rWhlRxjJsjnZw==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-5.1.2.tgz#f264dc2ccad0a780e76253a694e9fd0ed19c398d"
+  integrity sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==
   dependencies:
     clone "2.x"
 
@@ -898,10 +887,12 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-one-time@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
-  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
+one-time@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45"
+  integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==
+  dependencies:
+    fn.name "1.x.x"
 
 os-locale@^1.4.0:
   version "1.4.0"
@@ -1020,7 +1011,7 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-readable-stream@^2.2.2, readable-stream@^2.3.6:
+readable-stream@^2.2.2, readable-stream@^2.3.7:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -1033,7 +1024,7 @@ readable-stream@^2.2.2, readable-stream@^2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.1.1:
+readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -1290,9 +1281,9 @@ unpipe@1.0.0, unpipe@~1.0.0:
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
   dependencies:
     punycode "^2.1.0"
 
@@ -1345,37 +1336,37 @@ window-size@^0.1.4:
   integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
 
 winston-daily-rotate-file@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/winston-daily-rotate-file/-/winston-daily-rotate-file-4.4.2.tgz#7a4dd34fc26ab3873bdee8c4f9d5bf1d8fd6d562"
-  integrity sha512-pVOUJKxN+Kn6LnOJZ4tTwdV5+N+fCkiRAb3bVnzcPtOj1ScxGNC3DyUhHuAHssBtMl5s45/aUcSUtApH+69V5A==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.0.tgz#3914ac57c4bdae1138170bec85af0c2217b253b1"
+  integrity sha512-/HqeWiU48dzGqcrABRlxYWVMdL6l3uKCtFSJyrqK+E2rLnSFNsgYpvwx15EgTitBLNzH69lQd/+z2ASryV2aqw==
   dependencies:
     file-stream-rotator "^0.5.7"
     object-hash "^2.0.1"
     triple-beam "^1.3.0"
     winston-transport "^4.2.0"
 
-winston-transport@^4.2.0, winston-transport@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66"
-  integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==
+winston-transport@^4.2.0, winston-transport@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59"
+  integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==
   dependencies:
-    readable-stream "^2.3.6"
+    readable-stream "^2.3.7"
     triple-beam "^1.2.0"
 
-winston@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07"
-  integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==
+winston@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170"
+  integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==
   dependencies:
-    async "^2.6.1"
-    diagnostics "^1.1.1"
-    is-stream "^1.1.0"
-    logform "^2.1.1"
-    one-time "0.0.4"
-    readable-stream "^3.1.1"
+    "@dabh/diagnostics" "^2.0.2"
+    async "^3.1.0"
+    is-stream "^2.0.0"
+    logform "^2.2.0"
+    one-time "^1.0.0"
+    readable-stream "^3.4.0"
     stack-trace "0.0.x"
     triple-beam "^1.3.0"
-    winston-transport "^4.3.0"
+    winston-transport "^4.4.0"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"