diff --git a/src/Volo.Abp.Permissions.Application.Contracts/Volo/Abp/Permissions/IPermissionAppService.cs b/src/Volo.Abp.Permissions.Application.Contracts/Volo/Abp/Permissions/IPermissionAppService.cs index f30688649a..169944d950 100644 --- a/src/Volo.Abp.Permissions.Application.Contracts/Volo/Abp/Permissions/IPermissionAppService.cs +++ b/src/Volo.Abp.Permissions.Application.Contracts/Volo/Abp/Permissions/IPermissionAppService.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Threading.Tasks; +using System.Threading.Tasks; using JetBrains.Annotations; using Volo.Abp.Application.Services; @@ -7,9 +6,7 @@ namespace Volo.Abp.Permissions { public interface IPermissionAppService : IApplicationService { - Task GetAsync([NotNull] string name, [NotNull] string providerName, [NotNull] string providerKey); - - Task GetListAsync([NotNull] string providerName, [NotNull] string providerKey); + Task GetAsync([NotNull] string providerName, [NotNull] string providerKey); Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdatePermissionsDto input); } diff --git a/src/Volo.Abp.Permissions.Application/Volo/Abp/Permissions/PermissionAppService.cs b/src/Volo.Abp.Permissions.Application/Volo/Abp/Permissions/PermissionAppService.cs index c5e67aea0e..badc1ae236 100644 --- a/src/Volo.Abp.Permissions.Application/Volo/Abp/Permissions/PermissionAppService.cs +++ b/src/Volo.Abp.Permissions.Application/Volo/Abp/Permissions/PermissionAppService.cs @@ -18,12 +18,7 @@ namespace Volo.Abp.Permissions _permissionDefinitionManager = permissionDefinitionManager; } - public async Task GetAsync(string name, string providerName, string providerKey) - { - throw new NotImplementedException(); - } - - public async Task GetListAsync(string providerName, string providerKey) + public async Task GetAsync(string providerName, string providerKey) { var result = new GetPermissionListResultDto { diff --git a/src/Volo.Abp.Permissions.Web/Pages/AbpPermissions/PermissionManagementModal.cshtml.cs b/src/Volo.Abp.Permissions.Web/Pages/AbpPermissions/PermissionManagementModal.cshtml.cs index 771cfb84a7..a54ef53100 100644 --- a/src/Volo.Abp.Permissions.Web/Pages/AbpPermissions/PermissionManagementModal.cshtml.cs +++ b/src/Volo.Abp.Permissions.Web/Pages/AbpPermissions/PermissionManagementModal.cshtml.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.Permissions.Web.Pages.AbpPermissions public async Task OnGetAsync() { - var result = await _permissionAppService.GetListAsync(ProviderName, ProviderKey); + var result = await _permissionAppService.GetAsync(ProviderName, ProviderKey); Groups = ObjectMapper.Map, List>(result.Groups); } diff --git a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionChecker_User_Tests.cs b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionChecker_User_Tests.cs new file mode 100644 index 0000000000..2b8d3a5688 --- /dev/null +++ b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionChecker_User_Tests.cs @@ -0,0 +1,57 @@ +using System; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using NSubstitute; +using Shouldly; +using Volo.Abp.Session; +using Xunit; + +namespace Volo.Abp.Permissions +{ + public class PermissionChecker_User_Tests : PermissionTestBase + { + private readonly IPermissionChecker _permissionChecker; + + private Guid? _currentUserId; + + public PermissionChecker_User_Tests() + { + _permissionChecker = GetRequiredService(); + } + + protected override void AfterAddApplication(IServiceCollection services) + { + var currentUser = Substitute.For(); + currentUser.Id.Returns(ci => _currentUserId); + services.AddSingleton(currentUser); + } + + [Fact] + public async Task Should_Return_True_For_Granted_Current_User() + { + _currentUserId = PermissionTestDataBuilder.User1Id; + + (await _permissionChecker.IsGrantedAsync( + "MyPermission1" + )).ShouldBeTrue(); + } + + [Fact] + public async Task Should_Return_False_For_Non_Granted_Current_User() + { + _currentUserId = PermissionTestDataBuilder.User2Id; + + (await _permissionChecker.IsGrantedAsync( + "MyPermission1" + )).ShouldBeFalse(); + } + + [Fact] + public async Task Should_Return_False_For_Current_User_If_Anonymous() + { + (await _permissionChecker.IsGrantedAsync( + "MyPermission1" + )).ShouldBeFalse(); + } + } +} diff --git a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs deleted file mode 100644 index 886e8d1441..0000000000 --- a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using NSubstitute; -using Shouldly; -using Volo.Abp.Session; -using Xunit; - -namespace Volo.Abp.Permissions -{ - public class PermissionManager_User_Tests : PermissionTestBase - { - private readonly IPermissionChecker _permissionChecker; - - private Guid? _currentUserId; - - public PermissionManager_User_Tests() - { - _permissionChecker = GetRequiredService(); - } - - protected override void AfterAddApplication(IServiceCollection services) - { - var currentUser = Substitute.For(); - currentUser.Id.Returns(ci => _currentUserId); - services.AddSingleton(currentUser); - } - - //[Fact] - //public async Task Should_Return_True_For_Granted_User() - //{ - // (await _permissionManager.IsGrantedForUserAsync( - // "MyPermission1", - // PermissionTestDataBuilder.User1Id - // )).ShouldBeTrue(); - //} - - [Fact] - public async Task Should_Return_True_For_Granted_Current_User() - { - _currentUserId = PermissionTestDataBuilder.User1Id; - - (await _permissionChecker.IsGrantedAsync( - "MyPermission1" - )).ShouldBeTrue(); - } - - //[Fact] - //public async Task Should_Return_False_For_Non_Granted_User() - //{ - // (await _permissionManager.IsGrantedForUserAsync( - // "MyPermission1", - // PermissionTestDataBuilder.User2Id - // )).ShouldBeFalse(); - //} - - [Fact] - public async Task Should_Return_False_For_Non_Granted_Current_User() - { - _currentUserId = PermissionTestDataBuilder.User2Id; - - (await _permissionChecker.IsGrantedAsync( - "MyPermission1" - )).ShouldBeFalse(); - } - - [Fact] - public async Task Should_Return_False_For_Current_User_If_Anonymous() - { - (await _permissionChecker.IsGrantedAsync( - "MyPermission1" - )).ShouldBeFalse(); - } - - //[Fact] - //public async Task Should_Get_List_Of_Granted_Permissions_For_A_User() - //{ - // //User1 - // var permission = await _permissionManager.GetAllForUserAsync(PermissionTestDataBuilder.User1Id); - // permission.Count.ShouldBeGreaterThan(0); - // permission.ShouldContain(p => p.Name == "MyPermission1" && p.IsGranted && p.ProviderName == UserPermissionValueProvider.ProviderName); - - // //User2 - // permission = await _permissionManager.GetAllForUserAsync(PermissionTestDataBuilder.User2Id); - // permission.Count.ShouldBeGreaterThan(0); - // permission.ShouldContain(p => p.Name == "MyPermission1" && !p.IsGranted); - //} - - //[Fact] - //public async Task Should_Grant_Permission_For_A_User() - //{ - // (await _permissionManager.IsGrantedForUserAsync( - // "MyPermission1", - // PermissionTestDataBuilder.User2Id - // )).ShouldBeFalse(); - - // await _permissionManager.SetForUserAsync(PermissionTestDataBuilder.User2Id, "MyPermission1", true); - - // (await _permissionManager.IsGrantedForUserAsync( - // "MyPermission1", - // PermissionTestDataBuilder.User2Id - // )).ShouldBeTrue(); - //} - } -}