Browse Source

Merge pull request #26515 from abpframework/fix/mongo-user-role-names-missing-user

Identity: align EF Core and MongoDB role/OU queries for missing and soft-deleted users
pull/26518/head
Enis Necipoglu 3 days ago
committed by GitHub
parent
commit
8974f945bd
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 24
      modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs
  2. 28
      modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
  3. 29
      modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs

24
modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs

@ -40,10 +40,16 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
{
var dbContext = await GetDbContextAsync();
var query = from userRole in dbContext.Set<IdentityUserRole>()
join user in dbContext.Users on userRole.UserId equals user.Id
join role in dbContext.Roles on userRole.RoleId equals role.Id
where userRole.UserId == id
select role.Name;
var organizationUnitIds = dbContext.Set<IdentityUserOrganizationUnit>().Where(q => q.UserId == id).Select(q => q.OrganizationUnitId).ToArray();
var organizationUnitIds = await (
from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in dbContext.Users on userOu.UserId equals user.Id
where userOu.UserId == id
select userOu.OrganizationUnitId
).ToArrayAsync(GetCancellationToken(cancellationToken));
var organizationRoleIds = await (
from ouRole in dbContext.Set<OrganizationUnitRole>()
@ -63,6 +69,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
{
var dbContext = await GetDbContextAsync();
var userRoles = await (from userRole in dbContext.Set<IdentityUserRole>()
join user in dbContext.Users on userRole.UserId equals user.Id
join role in dbContext.Roles on userRole.RoleId equals role.Id
where userIds.Contains(userRole.UserId)
group new {
@ -77,7 +84,9 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
}).ToListAsync(cancellationToken: cancellationToken);
var orgUnitRoles = await (from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join roleOu in dbContext.Set<OrganizationUnitRole>() on userOu.OrganizationUnitId equals roleOu.OrganizationUnitId
join user in dbContext.Users on userOu.UserId equals user.Id
join ou in dbContext.OrganizationUnits on userOu.OrganizationUnitId equals ou.Id
join roleOu in dbContext.Set<OrganizationUnitRole>() on ou.Id equals roleOu.OrganizationUnitId
join role in dbContext.Roles on roleOu.RoleId equals role.Id
where userIds.Contains(userOu.UserId)
group new {
@ -109,6 +118,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
{
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in dbContext.Users on userOu.UserId equals user.Id
join roleOu in dbContext.Set<OrganizationUnitRole>() on userOu.OrganizationUnitId equals roleOu.OrganizationUnitId
join ou in dbContext.Set<OrganizationUnit>() on roleOu.OrganizationUnitId equals ou.Id
join userOuRoles in dbContext.Roles on roleOu.RoleId equals userOuRoles.Id
@ -194,8 +204,11 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
public virtual async Task<List<Guid>> GetUserIdListByRoleIdAsync(Guid roleId, CancellationToken cancellationToken = default)
{
return await (await GetDbContextAsync()).Set<IdentityUserRole>().Where(x => x.RoleId == roleId)
.Select(x => x.UserId).ToListAsync(GetCancellationToken(cancellationToken));
var dbContext = await GetDbContextAsync();
return await (from userRole in dbContext.Set<IdentityUserRole>()
join user in dbContext.Users on userRole.UserId equals user.Id
where userRole.RoleId == roleId
select userRole.UserId).ToListAsync(GetCancellationToken(cancellationToken));
}
public virtual async Task<List<IdentityUser>> GetListAsync(
@ -257,12 +270,14 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
var dbContext = await GetDbContextAsync();
var query = from userRole in dbContext.Set<IdentityUserRole>()
join user in dbContext.Users on userRole.UserId equals user.Id
join role in dbContext.Roles.IncludeDetails(includeDetails) on userRole.RoleId equals role.Id
where userRole.UserId == id
select role;
//TODO: Needs improvement
var userOrganizationsQuery = from userOrg in dbContext.Set<IdentityUserOrganizationUnit>()
join user in dbContext.Users on userOrg.UserId equals user.Id
join ou in dbContext.OrganizationUnits.IncludeDetails(includeDetails) on userOrg.OrganizationUnitId equals ou.Id
where userOrg.UserId == id
select ou;
@ -330,6 +345,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository<IIdentityDbContext,
var dbContext = await GetDbContextAsync();
var query = from userOu in dbContext.Set<IdentityUserOrganizationUnit>()
join user in dbContext.Users on userOu.UserId equals user.Id
join ou in dbContext.OrganizationUnits.IncludeDetails(includeDetails) on userOu.OrganizationUnitId equals ou.Id
where userOu.UserId == id
select ou;

28
modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs

@ -39,7 +39,13 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
CancellationToken cancellationToken = default)
{
cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var user = await FindAsync(id, cancellationToken: cancellationToken);
if (user == null)
{
// As in the EF Core repository: a user that does not exist (any more) has no roles.
return new List<string>();
}
var organizationUnitIds = user.OrganizationUnits
.Select(r => r.OrganizationUnitId)
.ToList();
@ -58,7 +64,11 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
CancellationToken cancellationToken = default)
{
cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var user = await FindAsync(id, cancellationToken: cancellationToken);
if (user == null)
{
return new List<string>();
}
var organizationUnitIds = user.OrganizationUnits
.Select(r => r.OrganizationUnitId)
@ -214,7 +224,12 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
CancellationToken cancellationToken = default)
{
cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var user = await FindAsync(id, cancellationToken: cancellationToken);
if (user == null)
{
return new List<IdentityRole>();
}
var organizationUnitIds = user.OrganizationUnits
.Select(r => r.OrganizationUnitId)
.ToList();
@ -234,7 +249,12 @@ public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDb
CancellationToken cancellationToken = default)
{
cancellationToken = GetCancellationToken(cancellationToken);
var user = await GetAsync(id, cancellationToken: cancellationToken);
var user = await FindAsync(id, cancellationToken: cancellationToken);
if (user == null)
{
return new List<OrganizationUnit>();
}
var organizationUnitIds = user.OrganizationUnits.Select(r => r.OrganizationUnitId).ToList();
return await (await GetQueryableAsync<OrganizationUnit>(cancellationToken))

29
modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs

@ -59,6 +59,35 @@ public abstract class IdentityUserRepository_Tests<TStartupModule> : AbpIdentity
roles.ShouldContain("manager");
}
[Fact]
public async Task Should_Return_Empty_Roles_And_OrganizationUnits_For_A_User_That_Does_Not_Exist()
{
var userId = Guid.NewGuid();
(await UserRepository.GetRoleNamesAsync(userId)).ShouldBeEmpty();
(await UserRepository.GetRoleNamesInOrganizationUnitAsync(userId)).ShouldBeEmpty();
(await UserRepository.GetRolesAsync(userId)).ShouldBeEmpty();
(await UserRepository.GetOrganizationUnitsAsync(userId)).ShouldBeEmpty();
}
[Fact]
public async Task Should_Not_Return_Roles_Or_OrganizationUnits_For_A_Soft_Deleted_User()
{
var john = await UserRepository.FindByNormalizedUserNameAsync(LookupNormalizer.NormalizeName("john.nash"));
john.ShouldNotBeNull();
var supporterRole = await RoleRepository.FindByNormalizedNameAsync(LookupNormalizer.NormalizeName("supporter"));
supporterRole.ShouldNotBeNull();
await UserRepository.DeleteAsync(john, autoSave: true);
(await UserRepository.GetRoleNamesAsync(john.Id)).ShouldBeEmpty();
(await UserRepository.GetRoleNamesAsync(new[] { john.Id })).ShouldBeEmpty();
(await UserRepository.GetRoleNamesInOrganizationUnitAsync(john.Id)).ShouldBeEmpty();
(await UserRepository.GetRolesAsync(john.Id)).ShouldBeEmpty();
(await UserRepository.GetOrganizationUnitsAsync(john.Id)).ShouldBeEmpty();
(await UserRepository.GetUserIdListByRoleIdAsync(supporterRole.Id)).ShouldNotContain(john.Id);
}
[Fact]
public async Task GetRoleNames_By_UserIds_Async()
{

Loading…
Cancel
Save