From 1eca93f9856d4292b46b3536bcbca635186d40a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 27 Jun 2020 15:38:24 +0300
Subject: [PATCH] Fix routes for feature and permission controllers.

---
 .../FeatureManagementRemoteServiceConsts.cs                  | 2 +-
 .../Volo/Abp/FeatureManagement/FeatureAppService.cs          | 1 -
 .../Volo/Abp/FeatureManagement/FeaturesController.cs         | 5 ++++-
 .../Volo/Abp/PermissionManagement/PermissionsController.cs   | 5 ++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementRemoteServiceConsts.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementRemoteServiceConsts.cs
index 749805da05..c941a1b7eb 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementRemoteServiceConsts.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementRemoteServiceConsts.cs
@@ -2,6 +2,6 @@
 {
     public class FeatureManagementRemoteServiceConsts
     {
-        public const string RemoteServiceName = "FeatureManagement";
+        public const string RemoteServiceName = "AbpFeatureManagement";
     }
 }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
index 24b04b7013..6c9db9bade 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
@@ -16,7 +16,6 @@ namespace Volo.Abp.FeatureManagement
     public class FeatureAppService : FeatureManagementAppServiceBase, IFeatureAppService
     {
         protected FeatureManagementOptions Options { get; }
-
         protected IFeatureManager FeatureManager { get; }
         protected IFeatureDefinitionManager FeatureDefinitionManager { get; }
 
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs
index e3eda46033..0ae78ed03f 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs
@@ -5,7 +5,8 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Abp.FeatureManagement
 {
     [RemoteService(Name = FeatureManagementRemoteServiceConsts.RemoteServiceName)]
-    [Area("abp")]
+    [Area("featureManagement")]
+    [Route("api/feature-management/features")]
     public class FeaturesController : AbpController, IFeatureAppService
     {
         protected IFeatureAppService FeatureAppService { get; }
@@ -15,11 +16,13 @@ namespace Volo.Abp.FeatureManagement
             FeatureAppService = featureAppService;
         }
 
+        [HttpGet]
         public virtual Task<FeatureListDto> GetAsync(string providerName, string providerKey)
         {
             return FeatureAppService.GetAsync(providerName, providerKey);
         }
 
+        [HttpPut]
         public virtual Task UpdateAsync(string providerName, string providerKey, UpdateFeaturesDto input)
         {
             return FeatureAppService.UpdateAsync(providerName, providerKey, input);
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs
index 2ed9a4d044..bb9db51f98 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs
@@ -5,7 +5,8 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Abp.PermissionManagement
 {
     [RemoteService(Name = PermissionManagementRemoteServiceConsts.RemoteServiceName)]
-    [Area("abp")]
+    [Area("permissionManagement")]
+    [Route("api/permission-management/permissions")]
     public class PermissionsController : AbpController, IPermissionAppService
     {
         protected IPermissionAppService PermissionAppService { get; }
@@ -15,11 +16,13 @@ namespace Volo.Abp.PermissionManagement
             PermissionAppService = permissionAppService;
         }
 
+        [HttpGet]
         public virtual Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
         {
             return PermissionAppService.GetAsync(providerName, providerKey);
         }
 
+        [HttpPut]
         public virtual Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input)
         {
             return PermissionAppService.UpdateAsync(providerName, providerKey, input);