From 1fc1c1b28d8d29aa6fd04d7697ff50f40f76cfe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 3 May 2020 03:19:29 +0300 Subject: [PATCH] Add Role for extensibility and refactor related classes. --- .../IdentityModuleExtensionConfiguration.cs | 19 ++++++++++++++++++- ...yModuleExtensionConfigurationExtensions.cs | 2 +- .../IdentityModuleExtensionConsts.cs | 14 ++++++++++++++ ...nsionConfigurationDictionaryExtensions.cs} | 4 ++-- .../Abp/Identity/AbpIdentityDomainModule.cs | 11 +++++++++-- 5 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConsts.cs rename modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/{IdentityModuleObjectExtensionConfigurationsExtensions.cs => ModuleExtensionConfigurationDictionaryExtensions.cs} (77%) diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfiguration.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfiguration.cs index fc057eccce..c2fc9b7a13 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfiguration.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfiguration.cs @@ -1,9 +1,26 @@ -using Volo.Abp.ObjectExtending.Modularity; +using System; +using Volo.Abp.ObjectExtending.Modularity; namespace Volo.Abp.ObjectExtending { public class IdentityModuleExtensionConfiguration : ModuleExtensionConfiguration { + public IdentityModuleExtensionConfiguration ConfigureUser( + Action configureAction) + { + return this.ConfigureEntity( + IdentityModuleExtensionConsts.EntityNames.User, + configureAction + ); + } + public IdentityModuleExtensionConfiguration ConfigureRole( + Action configureAction) + { + return this.ConfigureEntity( + IdentityModuleExtensionConsts.EntityNames.Role, + configureAction + ); + } } } \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfigurationExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfigurationExtensions.cs index b7a8877034..7b07d1f9ed 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfigurationExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConfigurationExtensions.cs @@ -10,7 +10,7 @@ namespace Volo.Abp.ObjectExtending Action configureAction) { return configurations.ConfigureEntity( - "User", + IdentityModuleExtensionConsts.EntityNames.User, configureAction ); } diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConsts.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConsts.cs new file mode 100644 index 0000000000..b7cc311965 --- /dev/null +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleExtensionConsts.cs @@ -0,0 +1,14 @@ +namespace Volo.Abp.ObjectExtending +{ + public static class IdentityModuleExtensionConsts + { + public const string ModuleName = "Identity"; + + public static class EntityNames + { + public const string User = "User"; + + public const string Role = "Role"; + } + } +} \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleObjectExtensionConfigurationsExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/ModuleExtensionConfigurationDictionaryExtensions.cs similarity index 77% rename from modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleObjectExtensionConfigurationsExtensions.cs rename to modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/ModuleExtensionConfigurationDictionaryExtensions.cs index a8422314ae..af94966a10 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/IdentityModuleObjectExtensionConfigurationsExtensions.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/ObjectExtending/ModuleExtensionConfigurationDictionaryExtensions.cs @@ -3,14 +3,14 @@ using Volo.Abp.ObjectExtending.Modularity; namespace Volo.Abp.ObjectExtending { - public static class IdentityModuleObjectExtensionConfigurationsExtensions + public static class ModuleExtensionConfigurationDictionaryExtensions { public static ModuleExtensionConfigurationDictionary ConfigureIdentity( this ModuleExtensionConfigurationDictionary modules, Action configureAction) { return modules.ConfigureModule( - "Identity", + IdentityModuleExtensionConsts.ModuleName, configureAction ); } 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 f7eea9fb5c..373fa2b637 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,6 +6,7 @@ using Volo.Abp.AutoMapper; using Volo.Abp.Domain; using Volo.Abp.EventBus.Distributed; using Volo.Abp.Modularity; +using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending.Modularity; using Volo.Abp.Users; @@ -49,10 +50,16 @@ namespace Volo.Abp.Identity public override void PostConfigureServices(ServiceConfigurationContext context) { ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( - "Identity", - "User", + IdentityModuleExtensionConsts.ModuleName, + IdentityModuleExtensionConsts.EntityNames.User, typeof(IdentityUser) ); + + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( + IdentityModuleExtensionConsts.ModuleName, + IdentityModuleExtensionConsts.EntityNames.Role, + typeof(IdentityRole) + ); } private static void AddAbpIdentityOptionsFactory(IServiceCollection services)