tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Identity module remove sync api usage

pull/2464/head
Halil İbrahim Kalkan 7 years ago
parent
4a3177d187
commit
c4acff598d
5 changed files with 45 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs
  2. 4
      modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityClaimTypeManager_Tests.cs
  3. 31
      modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/TestPermissionDataBuilder.cs
  4. 12
      modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestBaseModule.cs
  5. 34
      modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs

5
modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs
View File

@ -3,6 +3,7 @@ using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement.Identity;
using Volo.Abp.Threading;
namespace Volo.Abp.Identity
{
@ -22,9 +23,9 @@ namespace Volo.Abp.Identity
{
using (var scope = context.ServiceProvider.CreateScope())
{
scope.ServiceProvider
AsyncHelper.RunSync(() => scope.ServiceProvider
.GetRequiredService<TestPermissionDataBuilder>()
.Build();
.Build());
}
}
}

4
modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityClaimTypeManager_Tests.cs
View File

@ -42,7 +42,7 @@ namespace Volo.Abp.Identity
[Fact]
public async Task UpdateAsync()
{
var ageClaim = _identityClaimTypeRepository.Find(_testData.AgeClaimId);
var ageClaim = await _identityClaimTypeRepository.FindAsync(_testData.AgeClaimId);
ageClaim.ShouldNotBeNull();
ageClaim.Description = "this is age";
@ -65,7 +65,7 @@ namespace Volo.Abp.Identity
public async Task Static_IdentityClaimType_Cant_Not_Update()
{
var phoneClaim = new IdentityClaimType(Guid.NewGuid(), "Phone", true, true);
_identityClaimTypeRepository.Insert(phoneClaim);
await _identityClaimTypeRepository.InsertAsync(phoneClaim);
await Assert.ThrowsAnyAsync<AbpException>(async () => await _claimTypeManager.UpdateAsync(phoneClaim));
}

31
modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/TestPermissionDataBuilder.cs
View File

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Identity;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids;
@ -26,33 +27,33 @@ namespace Volo.Abp.Identity
_lookupNormalizer = lookupNormalizer;
}
public void Build()
public async Task Build()
{
AddRolePermissions();
AddUserPermissions();
await AddRolePermissions();
await AddUserPermissions();
}
private void AddRolePermissions()
private async Task AddRolePermissions()
{
AddPermission(TestPermissionNames.MyPermission1, RolePermissionValueProvider.ProviderName, "admin");
AddPermission(TestPermissionNames.MyPermission2, RolePermissionValueProvider.ProviderName, "admin");
AddPermission(TestPermissionNames.MyPermission2_ChildPermission1, RolePermissionValueProvider.ProviderName, "admin");
await AddPermission(TestPermissionNames.MyPermission1, RolePermissionValueProvider.ProviderName, "admin");
await AddPermission(TestPermissionNames.MyPermission2, RolePermissionValueProvider.ProviderName, "admin");
await AddPermission(TestPermissionNames.MyPermission2_ChildPermission1, RolePermissionValueProvider.ProviderName, "admin");
AddPermission(TestPermissionNames.MyPermission1, RolePermissionValueProvider.ProviderName, "moderator");
AddPermission(TestPermissionNames.MyPermission2, RolePermissionValueProvider.ProviderName, "moderator");
await AddPermission(TestPermissionNames.MyPermission1, RolePermissionValueProvider.ProviderName, "moderator");
await AddPermission(TestPermissionNames.MyPermission2, RolePermissionValueProvider.ProviderName, "moderator");
AddPermission(TestPermissionNames.MyPermission1, RolePermissionValueProvider.ProviderName, "supporter");
await AddPermission(TestPermissionNames.MyPermission1, RolePermissionValueProvider.ProviderName, "supporter");
}
private void AddUserPermissions()
private async Task AddUserPermissions()
{
var david = AsyncHelper.RunSync(() => _userRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.NormalizeName("david")));
AddPermission(TestPermissionNames.MyPermission1, UserPermissionValueProvider.ProviderName, david.Id.ToString());
await AddPermission(TestPermissionNames.MyPermission1, UserPermissionValueProvider.ProviderName, david.Id.ToString());
}
private void AddPermission(string permissionName, string providerName, string providerKey)
private async Task AddPermission(string permissionName, string providerName, string providerKey)
{
_permissionGrantRepository.Insert(
await _permissionGrantRepository.InsertAsync(
new PermissionGrant(
_guidGenerator.Create(),
permissionName,

12
modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestBaseModule.cs
View File

@ -30,11 +30,13 @@ namespace Volo.Abp.Identity
using (var scope = context.ServiceProvider.CreateScope())
{
var dataSeeder = scope.ServiceProvider.GetRequiredService<IDataSeeder>();
AsyncHelper.RunSync(() => dataSeeder.SeedAsync());
scope.ServiceProvider
.GetRequiredService<AbpIdentityTestDataBuilder>()
.Build();
AsyncHelper.RunSync(async () =>
{
await dataSeeder.SeedAsync();
await scope.ServiceProvider
.GetRequiredService<AbpIdentityTestDataBuilder>()
.Build();
});
}
}
}

34
modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs
View File

@ -1,8 +1,8 @@
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids;
using Volo.Abp.Threading;
namespace Volo.Abp.Identity
{
@ -35,31 +35,31 @@ namespace Volo.Abp.Identity
_testData = testData;
}
public void Build()
public async Task Build()
{
AddRoles();
AddUsers();
AddClaimTypes();
await AddRoles();
await AddUsers();
await AddClaimTypes();
}
private void AddRoles()
private async Task AddRoles()
{
_adminRole = AsyncHelper.RunSync(()=> _roleRepository.FindByNormalizedNameAsync(_lookupNormalizer.NormalizeName("admin")));
_adminRole = await _roleRepository.FindByNormalizedNameAsync(_lookupNormalizer.NormalizeName("admin"));
_moderator = new IdentityRole(_testData.RoleModeratorId, "moderator");
_moderator.AddClaim(_guidGenerator, new Claim("test-claim", "test-value"));
_roleRepository.Insert(_moderator);
await _roleRepository.InsertAsync(_moderator);
_supporterRole = new IdentityRole(_guidGenerator.Create(), "supporter");
_roleRepository.Insert(_supporterRole);
await _roleRepository.InsertAsync(_supporterRole);
}
private void AddUsers()
private async Task AddUsers()
{
var adminUser = new IdentityUser(_guidGenerator.Create(), "administrator", "admin@abp.io");
adminUser.AddRole(_adminRole.Id);
adminUser.AddClaim(_guidGenerator, new Claim("TestClaimType", "42"));
_userRepository.Insert(adminUser);
await _userRepository.InsertAsync(adminUser);
var john = new IdentityUser(_testData.UserJohnId, "john.nash", "john.nash@abp.io");
john.AddRole(_moderator.Id);
@ -68,23 +68,23 @@ namespace Volo.Abp.Identity
john.AddLogin(new UserLoginInfo("twitter", "johnx", "John Nash"));
john.AddClaim(_guidGenerator, new Claim("TestClaimType", "42"));
john.SetToken("test-provider", "test-name", "test-value");
_userRepository.Insert(john);
await _userRepository.InsertAsync(john);
var david = new IdentityUser(_testData.UserDavidId, "david", "david@abp.io");
_userRepository.Insert(david);
await _userRepository.InsertAsync(david);
var neo = new IdentityUser(_testData.UserNeoId, "neo", "neo@abp.io");
neo.AddRole(_supporterRole.Id);
neo.AddClaim(_guidGenerator, new Claim("TestClaimType", "43"));
_userRepository.Insert(neo);
await _userRepository.InsertAsync(neo);
}
private void AddClaimTypes()
private async Task AddClaimTypes()
{
var ageClaim = new IdentityClaimType(_testData.AgeClaimId, "Age", false, false, null, null, null,IdentityClaimValueType.Int);
_identityClaimTypeRepository.Insert(ageClaim);
await _identityClaimTypeRepository.InsertAsync(ageClaim);
var educationClaim = new IdentityClaimType(_testData.EducationClaimId, "Education", true, false, null, null, null);
_identityClaimTypeRepository.Insert(educationClaim);
await _identityClaimTypeRepository.InsertAsync(educationClaim);
}
}
}
Write Preview
Loading…
Cancel
Save