Remove `IHybridServiceScopeFactory`.

Resolve #12246

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarManager.cs

@@ -3,16 +3,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars;
 
 public class PageToolbarManager : IPageToolbarManager, ITransientDependency
 {
-    protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+    protected IServiceScopeFactory ServiceScopeFactory { get; }
 
     public PageToolbarManager(
-        IHybridServiceScopeFactory serviceScopeFactory)
+        IServiceScopeFactory serviceScopeFactory)
     {
         ServiceScopeFactory = serviceScopeFactory;
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 
@@ -10,11 +11,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars;
 public class PageToolbarManager : IPageToolbarManager, ITransientDependency
 {
     protected AbpPageToolbarOptions Options { get; }
-    protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+    protected IServiceScopeFactory ServiceScopeFactory { get; }
 
     public PageToolbarManager(
         IOptions<AbpPageToolbarOptions> options,
-        IHybridServiceScopeFactory serviceScopeFactory)
+        IServiceScopeFactory serviceScopeFactory)
     {
         Options = options.Value;
         ServiceScopeFactory = serviceScopeFactory;

framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/DependencyInjection/HttpContextServiceScopeFactory.cs

@@ -1,52 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.AspNetCore.DependencyInjection;
-
-[ExposeServices(
-    typeof(IHybridServiceScopeFactory),
-    typeof(HttpContextServiceScopeFactory)
-    )]
-[Dependency(ReplaceServices = true)]
-public class HttpContextServiceScopeFactory : IHybridServiceScopeFactory, ITransientDependency
-{
-    protected IHttpContextAccessor HttpContextAccessor { get; }
-
-    protected IServiceScopeFactory ServiceScopeFactory { get; }
-
-    public HttpContextServiceScopeFactory(
-        IHttpContextAccessor httpContextAccessor,
-        IServiceScopeFactory serviceScopeFactory)
-    {
-        HttpContextAccessor = httpContextAccessor;
-        ServiceScopeFactory = serviceScopeFactory;
-    }
-
-    public virtual IServiceScope CreateScope()
-    {
-        var httpContext = HttpContextAccessor.HttpContext;
-        if (httpContext == null)
-        {
-            return ServiceScopeFactory.CreateScope();
-        }
-
-        return new NonDisposedHttpContextServiceScope(httpContext.RequestServices);
-    }
-
-    protected class NonDisposedHttpContextServiceScope : IServiceScope
-    {
-        public IServiceProvider ServiceProvider { get; }
-
-        public NonDisposedHttpContextServiceScope(IServiceProvider serviceProvider)
-        {
-            ServiceProvider = serviceProvider;
-        }
-
-        public void Dispose()
-        {
-
-        }
-    }
-}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Cli.ServiceProxying;
 using Volo.Abp.DependencyInjection;
@@ -13,7 +14,7 @@ public class GenerateProxyCommand : ProxyCommandBase<GenerateProxyCommand>
 
     public GenerateProxyCommand(
         IOptions<AbpCliServiceProxyOptions> serviceProxyOptions,
-        IHybridServiceScopeFactory serviceScopeFactory)
+        IServiceScopeFactory serviceScopeFactory)
         : base(serviceProxyOptions, serviceScopeFactory)
     {
     }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -19,11 +20,11 @@ public abstract class ProxyCommandBase<T> : IConsoleCommand, ITransientDependenc
 
     protected AbpCliServiceProxyOptions ServiceProxyOptions { get; }
 
-    protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+    protected IServiceScopeFactory ServiceScopeFactory { get; }
 
     public ProxyCommandBase(
         IOptions<AbpCliServiceProxyOptions> serviceProxyOptions,
-        IHybridServiceScopeFactory serviceScopeFactory)
+        IServiceScopeFactory serviceScopeFactory)
     {
         ServiceScopeFactory = serviceScopeFactory;
         ServiceProxyOptions = serviceProxyOptions.Value;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/RemoveProxyCommand.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Cli.ServiceProxying;
 using Volo.Abp.DependencyInjection;
@@ -13,7 +14,7 @@ public class RemoveProxyCommand : ProxyCommandBase<RemoveProxyCommand>
 
     public RemoveProxyCommand(
         IOptions<AbpCliServiceProxyOptions> serviceProxyOptions,
-        IHybridServiceScopeFactory serviceScopeFactory)
+        IServiceScopeFactory serviceScopeFactory)
         : base(serviceProxyOptions, serviceScopeFactory)
     {
     }

framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DefaultServiceScopeFactory.cs

@@ -1,22 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Volo.Abp.DependencyInjection;
-
-[ExposeServices(
-    typeof(IHybridServiceScopeFactory),
-    typeof(DefaultServiceScopeFactory)
-    )]
-public class DefaultServiceScopeFactory : IHybridServiceScopeFactory, ITransientDependency
-{
-    protected IServiceScopeFactory Factory { get; }
-
-    public DefaultServiceScopeFactory(IServiceScopeFactory factory)
-    {
-        Factory = factory;
-    }
-
-    public IServiceScope CreateScope()
-    {
-        return Factory.CreateScope();
-    }
-}

framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IHybridServiceScopeFactory.cs

@@ -1,8 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Volo.Abp.DependencyInjection;
-
-public interface IHybridServiceScopeFactory : IServiceScopeFactory
-{
-
-}

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.DependencyInjection;
@@ -13,11 +14,11 @@ namespace Volo.Abp.UI.Navigation;
 public class MenuManager : IMenuManager, ITransientDependency
 {
     protected AbpNavigationOptions Options { get; }
-    protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+    protected IServiceScopeFactory ServiceScopeFactory { get; }
     protected ISimpleStateCheckerManager<ApplicationMenuItem> SimpleStateCheckerManager { get; }
     public MenuManager(
         IOptions<AbpNavigationOptions> options,
-        IHybridServiceScopeFactory serviceScopeFactory,
+        IServiceScopeFactory serviceScopeFactory,
         ISimpleStateCheckerManager<ApplicationMenuItem> simpleStateCheckerManager)
     {
         Options = options.Value;

framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/HybridServiceScopeFactory_Tests.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Shouldly;
-using Volo.Abp.Modularity;
-using Xunit;
-
-namespace Volo.Abp.DependencyInjection;
-
-public class HybridServiceScopeFactory_Tests
-{
-    [Fact]
-    public async Task Should_Use_Default_ServiceScopeFactory_By_Default_Async()
-    {
-        using (var application = await AbpApplicationFactory.CreateAsync<IndependentEmptyModule>())
-        {
-            application.Services.AddType(typeof(MyServiceAsync));
-
-            await application.InitializeAsync();
-
-            var serviceScopeFactory = application.ServiceProvider.GetRequiredService<IHybridServiceScopeFactory>();
-
-            using (var scope = serviceScopeFactory.CreateScope())
-            {
-                scope.ServiceProvider.GetRequiredService<MyServiceAsync>();
-            }
-
-            MyServiceAsync.DisposeCount.ShouldBe(1);
-        }
-    }
-
-    [Fact]
-    public void Should_Use_Default_ServiceScopeFactory_By_Default()
-    {
-        using (var application = AbpApplicationFactory.Create<IndependentEmptyModule>())
-        {
-            application.Services.AddType(typeof(MyService));
-
-            application.Initialize();
-
-            var serviceScopeFactory = application.ServiceProvider.GetRequiredService<IHybridServiceScopeFactory>();
-
-            using (var scope = serviceScopeFactory.CreateScope())
-            {
-                scope.ServiceProvider.GetRequiredService<MyService>();
-            }
-
-            MyService.DisposeCount.ShouldBe(1);
-        }
-    }
-
-    private class MyServiceAsync : ITransientDependency, IDisposable
-    {
-        public static int DisposeCount { get; private set; }
-
-        public void Dispose()
-        {
-            ++DisposeCount;
-        }
-    }
-
-    private class MyService : ITransientDependency, IDisposable
-    {
-        public static int DisposeCount { get; private set; }
-
-        public void Dispose()
-        {
-            ++DisposeCount;
-        }
-    }
-}

modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs

@@ -29,7 +29,7 @@ public class FeatureManager : IFeatureManager, ISingletonDependency
         StringLocalizerFactory = stringLocalizerFactory;
         Options = options.Value;
 
-        //TODO: Instead, use IHybridServiceScopeFactory and create a scope..?
+        //TODO: Instead, use IServiceScopeFactory and create a scope..?
 
         _lazyProviders = new Lazy<List<IFeatureManagementProvider>>(
             () => Options

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs

@@ -17,13 +17,13 @@ namespace Volo.Abp.IdentityServer;
 public class AbpCorsPolicyService : ICorsPolicyService
 {
     public ILogger<AbpCorsPolicyService> Logger { get; set; }
-    protected IHybridServiceScopeFactory HybridServiceScopeFactory { get; }
+    protected IServiceScopeFactory HybridServiceScopeFactory { get; }
     protected IDistributedCache<AllowedCorsOriginsCacheItem> Cache { get; }
     protected IdentityServerOptions Options { get; }
 
     public AbpCorsPolicyService(
         IDistributedCache<AllowedCorsOriginsCacheItem> cache,
-        IHybridServiceScopeFactory hybridServiceScopeFactory,
+        IServiceScopeFactory hybridServiceScopeFactory,
         IOptions<IdentityServerOptions> options)
     {
         Cache = cache;

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using IdentityServer4.Configuration;
 using Microsoft.Extensions.Options;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Text.Formatting;
@@ -13,7 +14,7 @@ public class AbpWildcardSubdomainCorsPolicyService : AbpCorsPolicyService
 {
     public AbpWildcardSubdomainCorsPolicyService(
         IDistributedCache<AllowedCorsOriginsCacheItem> cache,
-        IHybridServiceScopeFactory hybridServiceScopeFactory,
+        IServiceScopeFactory hybridServiceScopeFactory,
         IOptions<IdentityServerOptions> options)
             : base(cache, hybridServiceScopeFactory, options)
     {

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs

@@ -32,7 +32,7 @@ public class AbpResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator
     protected IdentitySecurityLogManager IdentitySecurityLogManager { get; }
     protected ILogger<ResourceOwnerPasswordValidator<IdentityUser>> Logger { get; }
     protected IStringLocalizer<AbpIdentityServerResource> Localizer { get; }
-    protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+    protected IServiceScopeFactory ServiceScopeFactory { get; }
     protected AbpIdentityOptions AbpIdentityOptions { get; }
     protected IOptions<IdentityOptions> IdentityOptions { get; }
 
@@ -43,7 +43,7 @@ public class AbpResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator
         ILogger<ResourceOwnerPasswordValidator<IdentityUser>> logger,
         IStringLocalizer<AbpIdentityServerResource> localizer,
         IOptions<AbpIdentityOptions> abpIdentityOptions,
-        IHybridServiceScopeFactory serviceScopeFactory,
+        IServiceScopeFactory serviceScopeFactory,
         IOptions<IdentityOptions> identityOptions)
     {
         UserManager = userManager;

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs

@@ -22,7 +22,7 @@ namespace Volo.Abp.OpenIddict.Controllers;
 
 public partial class TokenController
 {
-    protected IHybridServiceScopeFactory ServiceScopeFactory => LazyServiceProvider.LazyGetRequiredService<IHybridServiceScopeFactory>();
+    protected IServiceScopeFactory ServiceScopeFactory => LazyServiceProvider.LazyGetRequiredService<IServiceScopeFactory>();
     protected ITenantConfigurationProvider TenantConfigurationProvider=> LazyServiceProvider.LazyGetRequiredService<ITenantConfigurationProvider>();
     protected IOptions<AbpIdentityOptions> AbpIdentityOptions => LazyServiceProvider.LazyGetRequiredService<IOptions<AbpIdentityOptions>>();
     protected IOptions<IdentityOptions> IdentityOptions => LazyServiceProvider.LazyGetRequiredService<IOptions<IdentityOptions>>();

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs

@@ -27,7 +27,7 @@ public class SettingManager : ISettingManager, ISingletonDependency
         SettingEncryptionService = settingEncryptionService;
         Options = options.Value;
 
-        //TODO: Instead, use IHybridServiceScopeFactory and create a scope..?
+        //TODO: Instead, use IServiceScopeFactory and create a scope..?
 
         _lazyProviders = new Lazy<List<ISettingManagementProvider>>(
             () => Options