Move KeyedObjectResourcePermission to Abp.Authorization

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs

@@ -33,6 +33,7 @@ public class AbpAuthorizationModule : AbpModule
     {
         context.Services.AddAuthorizationCore();
 
+        context.Services.AddKeyedObjectResourcePermissionAuthorization();
         context.Services.AddSingleton<IAuthorizationHandler, PermissionRequirementHandler>();
         context.Services.AddSingleton<IAuthorizationHandler, PermissionsRequirementHandler>();
 

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Authorization/Permissions/Resources/KeyedObjectResourcePermissionRequirementHandler.cs → framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/Resources/KeyedObjectResourcePermissionRequirementHandler.cs

@@ -7,8 +7,7 @@ public class KeyedObjectResourcePermissionRequirementHandler : AuthorizationHand
 {
     protected readonly IResourcePermissionChecker PermissionChecker;
 
-    public KeyedObjectResourcePermissionRequirementHandler(
-        IResourcePermissionChecker permissionChecker)
+    public KeyedObjectResourcePermissionRequirementHandler(IResourcePermissionChecker permissionChecker)
     {
         PermissionChecker = permissionChecker;
     }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Authorization/Permissions/Resources/KeyedObjectResourcePermissionStoreExtensions.cs → framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/Resources/KeyedObjectResourcePermissionStoreExtensions.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.Authorization.Permissions.Resources;
 
@@ -18,7 +17,7 @@ public static class KeyedObjectResourcePermissionStoreExtensions
         this IResourcePermissionStore resourcePermissionStore,
         TResource resource
     )
-        where TResource : class, IEntity
+        where TResource : class, IKeyedObject
     {
         Check.NotNull(resourcePermissionStore, nameof(resourcePermissionStore));
         Check.NotNull(resource, nameof(resource));
@@ -37,7 +36,7 @@ public static class KeyedObjectResourcePermissionStoreExtensions
         this IResourcePermissionStore resourcePermissionStore,
         TEntity entity
     )
-        where TEntity : class, IEntity
+        where TEntity : class, IKeyedObject
     {
         Check.NotNull(resourcePermissionStore, nameof(resourcePermissionStore));
         Check.NotNull(entity, nameof(entity));

framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj

@@ -17,7 +17,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Authorization.Abstractions\Volo.Abp.Authorization.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.Ddd.Domain.Shared\Volo.Abp.Ddd.Domain.Shared.csproj" />
     <ProjectReference Include="..\Volo.Abp.Auditing\Volo.Abp.Auditing.csproj" />
     <ProjectReference Include="..\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Auditing;
-using Volo.Abp.Authorization;
 using Volo.Abp.Caching;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.ChangeTracking;
@@ -25,8 +24,7 @@ namespace Volo.Abp.Domain;
     typeof(AbpExceptionHandlingModule),
     typeof(AbpSpecificationsModule),
     typeof(AbpCachingModule),
-    typeof(AbpDddDomainSharedModule),
-    typeof(AbpAuthorizationAbstractionsModule)
+    typeof(AbpDddDomainSharedModule)
     )]
 public class AbpDddDomainModule : AbpModule
 {
@@ -35,9 +33,4 @@ public class AbpDddDomainModule : AbpModule
         context.Services.AddConventionalRegistrar(new AbpRepositoryConventionalRegistrar());
         context.Services.OnRegistered(ChangeTrackingInterceptorRegistrar.RegisterIfNeeded);
     }
-
-    public override void ConfigureServices(ServiceConfigurationContext context)
-    {
-        context.Services.AddKeyedObjectResourcePermissionAuthorization();
-    }
 }