From 80013faec4dadfb795e1ac8ae003418eed8e9167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 23 Feb 2018 16:03:34 +0300
Subject: [PATCH] Move permission configuration to AbpIdentityApplicationModule

---
 .../Volo/Abp/Identity/AbpIdentityApplicationModule.cs     | 8 +++++++-
 .../Volo/Abp/Identity/AbpIdentityDomainModule.cs          | 6 ------
 .../Volo/Abp/Identity/PermissionManager_Tests.cs          | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename test/{Volo.Abp.Identity.Tests => Volo.Abp.Identity.Application.Tests}/Volo/Abp/Identity/PermissionManager_Tests.cs (98%)

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 515517580c..47d89ee1fd 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModule.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
+using Volo.Abp.Permissions;
 using Volo.Abp.Session;
 
 namespace Volo.Abp.Identity
@@ -15,12 +16,17 @@ namespace Volo.Abp.Identity
     {
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddAssemblyOf<AbpIdentityApplicationModule>();
+            services.Configure<PermissionManagementOptions>(options =>
+            {
+                options.ManagementProviders.Add<RolePermissionManagementProvider>();
+            });
 
             services.Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<AbpIdentityApplicationModuleAutoMapperProfile>();
             });
+
+            services.AddAssemblyOf<AbpIdentityApplicationModule>();
         }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
index ef9a3d23bd..ae29666b8e 100644
--- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
+++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
@@ -11,12 +11,6 @@ namespace Volo.Abp.Identity
     {
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.Configure<PermissionManagementOptions>(options =>
-            {
-                options.ManagementProviders.Add<UserPermissionManagementProvider>();
-                options.ManagementProviders.Add<RolePermissionManagementProvider>();
-            });
-
             var identityBuilder = services.AddAbpIdentity();
             services.ExecutePreConfiguredActions(identityBuilder);
 
diff --git a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs b/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
similarity index 98%
rename from test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
rename to test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
index 8deb512cad..10ef9f84a3 100644
--- a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
+++ b/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
@@ -10,7 +10,7 @@ using Xunit;
 
 namespace Volo.Abp.Identity
 {
-    public class PermissionManager_Tests : AbpIdentityDomainTestBase
+    public class PermissionManager_Tests : AbpIdentityApplicationTestBase
     {
         private readonly IPermissionManager _permissionManager;
         private readonly IPermissionStore _permissionStore;