From 9617efc5e977c1894aeff00f423643a53d0fda90 Mon Sep 17 00:00:00 2001
From: mperk <perkmehmed@gmail.com>
Date: Mon, 20 Jan 2020 15:07:39 +0300
Subject: [PATCH] change authorization service to abpauthorization service

---
 .../MethodInvocationAuthorizationService.cs      | 16 +++++-----------
 .../Abp/Authorization/Authorization_Tests.cs     |  7 -------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/MethodInvocationAuthorizationService.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/MethodInvocationAuthorizationService.cs
index b2e06c0207..4d0589486b 100644
--- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/MethodInvocationAuthorizationService.cs
+++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/MethodInvocationAuthorizationService.cs
@@ -11,21 +11,15 @@ namespace Volo.Abp.Authorization
 {
     public class MethodInvocationAuthorizationService : IMethodInvocationAuthorizationService, ITransientDependency
     {
-        private readonly IAuthorizationService _authorizationService;
-        private readonly ICurrentUser _currentUser;
-        private readonly ICurrentClient _currentClient;
         private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider;
+        private readonly IAbpAuthorizationService _abpAuthorizationService;
 
         public MethodInvocationAuthorizationService(
-            IAuthorizationService authorizationService, 
-            ICurrentUser currentUser,
-            ICurrentClient currentClient,
-            IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider)
+            IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
+            IAbpAuthorizationService abpAuthorizationService)
         {
-            _authorizationService = authorizationService;
-            _currentUser = currentUser;
-            _currentClient = currentClient;
             _abpAuthorizationPolicyProvider = abpAuthorizationPolicyProvider;
+            _abpAuthorizationService = abpAuthorizationService;
         }
 
         public async Task CheckAsync(MethodInvocationAuthorizationContext context)
@@ -70,7 +64,7 @@ namespace Volo.Abp.Authorization
             var authorizationPolicy = await AuthorizationPolicy.CombineAsync(
                                                     _abpAuthorizationPolicyProvider,
                                                     new List<IAuthorizeData> { authorizationAttribute });
-            await _authorizationService.CheckAsync(authorizationPolicy).ConfigureAwait(false);
+            await _abpAuthorizationService.CheckAsync(authorizationPolicy).ConfigureAwait(false);
         }
     }
 }
\ No newline at end of file
diff --git a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/Authorization_Tests.cs b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/Authorization_Tests.cs
index 827f7b676e..9be90dc045 100644
--- a/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/Authorization_Tests.cs
+++ b/framework/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/Authorization_Tests.cs
@@ -62,13 +62,6 @@ namespace Volo.Abp.Authorization
             }).ConfigureAwait(false);
         }
 
-        [Fact]
-        public async Task Should_Allow_To_Call_Method_If_Has_No_Role_ProtectedByRole_Async()
-        {
-            int result = await _myAuthorizedService1.ProtectedByRole().ConfigureAwait(false);
-            result.ShouldBe(42);
-        }
-
         [Fact]
         public async Task Should_Not_Allow_To_Call_Method_If_Has_No_Role_ProtectedByScheme_Async()
         {