diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/NullTenantDatabaseSchemaMigrator.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/NullTenantDatabaseSchemaMigrator.cs
deleted file mode 100644
index 7d5e76f11b..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/NullTenantDatabaseSchemaMigrator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.DependencyInjection;
-
-namespace Volo.Abp.MultiTenancy
-{
- public class NullTenantDatabaseSchemaMigrator : ITenantDatabaseSchemaMigrator, ISingletonDependency
- {
- public Task MigrateAsync()
- {
- return Task.CompletedTask;
- }
- }
-}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantDatabaseSchemaMigrator.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantDatabaseSchemaMigrator.cs
deleted file mode 100644
index e6fef5c427..0000000000
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantDatabaseSchemaMigrator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Volo.Abp.MultiTenancy
-{
- public interface ITenantDatabaseSchemaMigrator
- {
- ///
- /// Set Current Tenant before calling this method.
- ///
- ///
- Task MigrateAsync();
- }
-}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
index 6c2197b38d..4326d1aeb8 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
@@ -6,7 +6,6 @@ using Microsoft.Extensions.Options;
using Volo.Abp.AutoMapper;
using Volo.Abp.Domain;
using Volo.Abp.Domain.Entities.Events.Distributed;
-using Volo.Abp.EventBus.Distributed;
using Volo.Abp.Modularity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectExtending.Modularity;
@@ -59,20 +58,6 @@ namespace Volo.Abp.Identity
});
context.Services.AddAbpDynamicOptions();
-
- Configure(options =>
- {
- var serviceProvider = context.Services.GetServiceProviderOrNull();
- if (serviceProvider != null)
- {
- var abpIdentityOptions = serviceProvider.GetRequiredService>().Value;
- if (!abpIdentityOptions.IsDistributedEventHandlingEnabled)
- {
- var identityDomainAssembly = typeof(AbpIdentityDomainModule).Assembly;
- options.Handlers.RemoveAll(x => x.Assembly == identityDomainAssembly);
- }
- }
- });
}
public override void PostConfigureServices(ServiceConfigurationContext context)
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs
index 36b7ba587a..6cfaf75c0c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs
@@ -4,11 +4,6 @@
{
public ExternalLoginProviderDictionary ExternalLoginProviders { get; }
- ///
- /// Default: true.
- ///
- public bool IsDistributedEventHandlingEnabled { get; } = true;
-
public AbpIdentityOptions()
{
ExternalLoginProviders = new ExternalLoginProviderDictionary();
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTenantCreatedHandler.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTenantCreatedHandler.cs
deleted file mode 100644
index 92a0be629c..0000000000
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityTenantCreatedHandler.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Threading.Tasks;
-using AutoMapper.Internal;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.MultiTenancy;
-
-namespace Volo.Abp.Identity
-{
- public class IdentityTenantCreatedHandler : IDistributedEventHandler, ITransientDependency
- {
- public ILogger Logger { get; set; }
-
- protected IIdentityDataSeeder IdentityDataSeeder { get; }
-
- public IdentityTenantCreatedHandler(IIdentityDataSeeder identityDataSeeder)
- {
- IdentityDataSeeder = identityDataSeeder;
- Logger = NullLogger.Instance;
- }
-
- public async Task HandleEventAsync(TenantCreatedEto eventData)
- {
- await IdentityDataSeeder.SeedAsync(
- eventData.Properties.GetOrDefault("AdminEmail") as string ?? "admin@abp.io",
- eventData.Properties.GetOrDefault("AdminPassword") as string ?? "1q2w3E*",
- eventData.Id
- );
- }
- }
-}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs
index 5b3eb9f40f..f437802c6b 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs
@@ -4,7 +4,6 @@ using Microsoft.Extensions.Options;
using Volo.Abp.Authorization;
using Volo.Abp.Caching;
using Volo.Abp.Domain;
-using Volo.Abp.EventBus.Distributed;
using Volo.Abp.Json;
using Volo.Abp.Modularity;
@@ -17,21 +16,6 @@ namespace Volo.Abp.PermissionManagement
[DependsOn(typeof(AbpJsonModule))]
public class AbpPermissionManagementDomainModule : AbpModule
{
- public override void ConfigureServices(ServiceConfigurationContext context)
- {
- Configure(options =>
- {
- var serviceProvider = context.Services.GetServiceProviderOrNull();
- if (serviceProvider != null)
- {
- var abpIdentityOptions = serviceProvider.GetRequiredService>().Value;
- if (!abpIdentityOptions.IsDistributedEventHandlingEnabled)
- {
- var identityDomainAssembly = typeof(AbpPermissionManagementDomainModule).Assembly;
- options.Handlers.RemoveAll(x => x.Assembly == identityDomainAssembly);
- }
- }
- });
- }
+
}
}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs
index c36cde49ee..2e29ab9c29 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementOptions.cs
@@ -9,11 +9,6 @@ namespace Volo.Abp.PermissionManagement
public Dictionary ProviderPolicies { get; }
- ///
- /// Default: true.
- ///
- public bool IsDistributedEventHandlingEnabled { get; } = true;
-
public PermissionManagementOptions()
{
ManagementProviders = new TypeList();
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionTenantCreatedHandler.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionTenantCreatedHandler.cs
deleted file mode 100644
index 8962574434..0000000000
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionTenantCreatedHandler.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.MultiTenancy;
-
-namespace Volo.Abp.PermissionManagement
-{
- public class PermissionTenantCreatedHandler : IDistributedEventHandler, ITransientDependency
- {
- protected IPermissionDefinitionManager PermissionDefinitionManager { get; }
- protected IPermissionDataSeeder PermissionDataSeeder { get; }
-
- public PermissionTenantCreatedHandler(IPermissionDefinitionManager permissionDefinitionManager, IPermissionDataSeeder permissionDataSeeder)
- {
- PermissionDefinitionManager = permissionDefinitionManager;
- PermissionDataSeeder = permissionDataSeeder;
- }
-
- public async Task HandleEventAsync(TenantCreatedEto eventData)
- {
- var permissionNames = PermissionDefinitionManager
- .GetPermissions()
- .Where(p => p.MultiTenancySide.HasFlag(MultiTenancySides.Tenant))
- .Where(p => !p.Providers.Any() || p.Providers.Contains(RolePermissionValueProvider.ProviderName))
- .Select(p => p.Name)
- .ToArray();
-
- await PermissionDataSeeder.SeedAsync(
- RolePermissionValueProvider.ProviderName,
- "admin",
- permissionNames,
- eventData.Id
- );
- }
- }
-}