diff --git a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj index 3a211d4c19..95ecf93245 100644 --- a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj +++ b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj @@ -17,6 +17,7 @@ + diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs index 9c8b092d8c..515517580c 100644 --- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs @@ -1,13 +1,15 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; +using Volo.Abp.Session; namespace Volo.Abp.Identity { [DependsOn( typeof(AbpIdentityDomainModule), typeof(AbpIdentityApplicationContractsModule), - typeof(AbpAutoMapperModule) + typeof(AbpAutoMapperModule), + typeof(AbpSessionModule) )] public class AbpIdentityApplicationModule : AbpModule { diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/RolePermissionManagementProvider.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/RolePermissionManagementProvider.cs similarity index 94% rename from src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/RolePermissionManagementProvider.cs rename to src/Volo.Abp.Identity.Application/Volo/Abp/Identity/RolePermissionManagementProvider.cs index aed01f7025..6bdf667f61 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/RolePermissionManagementProvider.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/RolePermissionManagementProvider.cs @@ -4,14 +4,13 @@ using Volo.Abp.Authorization.Permissions; using Volo.Abp.Guids; using Volo.Abp.MultiTenancy; using Volo.Abp.Permissions; +using Volo.Abp.Session; namespace Volo.Abp.Identity { public class RolePermissionManagementProvider : PermissionManagementProvider { - public const string ProviderName = "Role"; - - public override string Name => ProviderName; + public override string Name => RolePermissionValueProvider.ProviderName; private readonly IIdentityUserRepository _identityUserRepository; diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserPermissionManagementProvider.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/UserPermissionManagementProvider.cs similarity index 73% rename from src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserPermissionManagementProvider.cs rename to src/Volo.Abp.Identity.Application/Volo/Abp/Identity/UserPermissionManagementProvider.cs index 8639140e3b..9ac6d3687b 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserPermissionManagementProvider.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/UserPermissionManagementProvider.cs @@ -1,14 +1,13 @@ using Volo.Abp.Guids; using Volo.Abp.MultiTenancy; using Volo.Abp.Permissions; +using Volo.Abp.Session; namespace Volo.Abp.Identity { public class UserPermissionManagementProvider : PermissionManagementProvider { - public const string ProviderName = "User"; //TODO: Share a common string with UserPermissionValueProvider (same is true for the role) - - public override string Name => ProviderName; + public override string Name => UserPermissionValueProvider.ProviderName; public UserPermissionManagementProvider(IPermissionGrantRepository permissionGrantRepository, diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs similarity index 77% rename from src/Volo.Abp.Identity.Domain/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs rename to src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs index 77f152928c..508ed8a549 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs @@ -1,8 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using JetBrains.Annotations; -using Volo.Abp.Identity; +using Volo.Abp.Session; namespace Volo.Abp.Permissions { @@ -12,21 +11,21 @@ namespace Volo.Abp.Permissions { Check.NotNull(permissionManager, nameof(permissionManager)); - return permissionManager.GetAsync(permissionName, RolePermissionManagementProvider.ProviderName, roleName); + return permissionManager.GetAsync(permissionName, RolePermissionValueProvider.ProviderName, roleName); } public static Task> GetAllForRoleAsync([NotNull] this IPermissionManager permissionManager, string roleName) { Check.NotNull(permissionManager, nameof(permissionManager)); - return permissionManager.GetAllAsync(RolePermissionManagementProvider.ProviderName, roleName); + return permissionManager.GetAllAsync(RolePermissionValueProvider.ProviderName, roleName); } public static Task SetForRoleAsync([NotNull] this IPermissionManager permissionManager, string roleName, [NotNull] string permissionName, bool isGranted) { Check.NotNull(permissionManager, nameof(permissionManager)); - return permissionManager.SetAsync(permissionName, RolePermissionManagementProvider.ProviderName, roleName, isGranted); + return permissionManager.SetAsync(permissionName, RolePermissionValueProvider.ProviderName, roleName, isGranted); } } } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs similarity index 78% rename from src/Volo.Abp.Identity.Domain/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs rename to src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs index 3e916b6f67..0aa0c40979 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using JetBrains.Annotations; -using Volo.Abp.Identity; +using Volo.Abp.Session; namespace Volo.Abp.Permissions { @@ -12,14 +12,14 @@ namespace Volo.Abp.Permissions { Check.NotNull(permissionManager, nameof(permissionManager)); - return permissionManager.GetAllAsync(UserPermissionManagementProvider.ProviderName, userId.ToString()); + return permissionManager.GetAllAsync(UserPermissionValueProvider.ProviderName, userId.ToString()); } public static Task SetForUserAsync([NotNull] this IPermissionManager permissionManager, Guid userId, [NotNull] string name, bool isGranted) { Check.NotNull(permissionManager, nameof(permissionManager)); - return permissionManager.SetAsync(name, UserPermissionManagementProvider.ProviderName, userId.ToString(), isGranted); + return permissionManager.SetAsync(name, UserPermissionValueProvider.ProviderName, userId.ToString(), isGranted); } } }