From 0351cf8df561c7786667b0a34bbadcf519a26794 Mon Sep 17 00:00:00 2001 From: oykuermann <142304401+oykuermann@users.noreply.github.com> Date: Wed, 18 Nov 2026 11:09:37 +0300 Subject: [PATCH 1/2] Identity MongoDB: GetRoleNamesAsync returns no roles for a user that does not exist MongoIdentityUserRepository.GetRoleNamesAsync and GetRoleNamesInOrganizationUnitAsync started with GetAsync, which throws EntityNotFoundException for a deleted user, while the EF Core repository returns an empty list. A permission check of a deleted user (the Chat contact list) failed on MongoDB only. Co-Authored-By: Claude Opus 5.5 --- .../MongoDB/MongoIdentityUserRepository.cs | 14 ++++++++++++-- .../Abp/Identity/IdentityUserRepository_Tests.cs | 9 +++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs index 9209946d7f..ae76d16662 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs @@ -39,7 +39,13 @@ public class MongoIdentityUserRepository : MongoDbRepository(); + } + var organizationUnitIds = user.OrganizationUnits .Select(r => r.OrganizationUnitId) .ToList(); @@ -58,7 +64,11 @@ public class MongoIdentityUserRepository : MongoDbRepository(); + } var organizationUnitIds = user.OrganizationUnits .Select(r => r.OrganizationUnitId) diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs index ce7b002c59..95da3bd1d4 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs @@ -59,6 +59,15 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity roles.ShouldContain("manager"); } + [Fact] + public async Task GetRoleNamesAsync_Should_Return_Empty_For_A_User_That_Does_Not_Exist() + { + var userId = Guid.NewGuid(); + + (await UserRepository.GetRoleNamesAsync(userId)).ShouldBeEmpty(); + (await UserRepository.GetRoleNamesInOrganizationUnitAsync(userId)).ShouldBeEmpty(); + } + [Fact] public async Task GetRoleNames_By_UserIds_Async() { From 29c7b6ec2fb40c10a8d25aa5472378a5c968ec1f Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Wed, 18 Nov 2026 17:08:41 +0300 Subject: [PATCH 2/2] Align EF Core and MongoDB IdentityUserRepository role/OU queries for missing and soft-deleted users --- .../EfCoreIdentityUserRepository.cs | 24 +++++++++++++++---- .../MongoDB/MongoIdentityUserRepository.cs | 14 +++++++++-- .../Identity/IdentityUserRepository_Tests.cs | 22 ++++++++++++++++- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs index 98869c7a17..b766b7e072 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs @@ -40,10 +40,16 @@ public class EfCoreIdentityUserRepository : EfCoreRepository() + 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().Where(q => q.UserId == id).Select(q => q.OrganizationUnitId).ToArray(); + var organizationUnitIds = await ( + from userOu in dbContext.Set() + 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() @@ -63,6 +69,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository() + 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() - join roleOu in dbContext.Set() 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() 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() + join user in dbContext.Users on userOu.UserId equals user.Id join roleOu in dbContext.Set() on userOu.OrganizationUnitId equals roleOu.OrganizationUnitId join ou in dbContext.Set() 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> GetUserIdListByRoleIdAsync(Guid roleId, CancellationToken cancellationToken = default) { - return await (await GetDbContextAsync()).Set().Where(x => x.RoleId == roleId) - .Select(x => x.UserId).ToListAsync(GetCancellationToken(cancellationToken)); + var dbContext = await GetDbContextAsync(); + return await (from userRole in dbContext.Set() + 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> GetListAsync( @@ -257,12 +270,14 @@ public class EfCoreIdentityUserRepository : EfCoreRepository() + 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() + 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() + 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; diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs index ae76d16662..a1e6b7d8db 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs @@ -224,7 +224,12 @@ public class MongoIdentityUserRepository : MongoDbRepository(); + } + var organizationUnitIds = user.OrganizationUnits .Select(r => r.OrganizationUnitId) .ToList(); @@ -244,7 +249,12 @@ public class MongoIdentityUserRepository : MongoDbRepository(); + } + var organizationUnitIds = user.OrganizationUnits.Select(r => r.OrganizationUnitId).ToList(); return await (await GetQueryableAsync(cancellationToken)) diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs index 95da3bd1d4..d86b0f39b8 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs @@ -60,12 +60,32 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity } [Fact] - public async Task GetRoleNamesAsync_Should_Return_Empty_For_A_User_That_Does_Not_Exist() + 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]