bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-31 15:43:16 +00:00
Code Issues Releases Wiki Activity

[PM-24278] Fix sproc to return UserId (#6203)

Browse Source
This commit is contained in:
Jimmy Vo
2025-08-18 11:12:42 -04:00
committed by GitHub
parent bd133b936c
commit 03327cb082
3 changed files with 146 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByOrganizationIdAsyncTests.cs
View File

@@ -40,6 +40,10 @@ public class GetPolicyDetailsByOrganizationIdAsyncTests
Assert.True(results.Single().IsProvider);
// Annul
await organizationRepository.DeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId });
await userRepository.DeleteAsync(user);
async Task ArrangeProvider()
{
var provider = await providerRepository.CreateAsync(new Provider
@@ -86,6 +90,11 @@ public class GetPolicyDetailsByOrganizationIdAsyncTests
Assert.Contains(results, result => result.OrganizationUserId == userOrgConnectedDirectly.Id
&& result.OrganizationId == userOrgConnectedDirectly.OrganizationId);
Assert.DoesNotContain(results, result => result.OrganizationId == notConnectedOrg.Id);
// Annul
await organizationRepository.DeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId });
await organizationRepository.DeleteAsync(notConnectedOrg);
await userRepository.DeleteAsync(user);
}
[DatabaseTheory, DatabaseData]
@@ -115,6 +124,10 @@ public class GetPolicyDetailsByOrganizationIdAsyncTests
&& result.PolicyType == inputPolicyType);
Assert.DoesNotContain(results, result => result.PolicyType == notInputPolicyType);
// Annul
await organizationRepository.DeleteAsync(new Organization { Id = orgUser.OrganizationId });
await userRepository.DeleteAsync(user);
}
@@ -143,6 +156,12 @@ public class GetPolicyDetailsByOrganizationIdAsyncTests
Assert.Equal(expectedCount, results.Count);
AssertPolicyDetailUserConnections(results, userOrgConnectedDirectly, userOrgConnectedByEmail, userOrgConnectedByUserId);
// Annul
await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId });
await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId });
await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId });
await userRepository.DeleteAsync(user);
}
[DatabaseTheory, DatabaseData]
@@ -167,8 +186,52 @@ public class GetPolicyDetailsByOrganizationIdAsyncTests
// Assert
AssertPolicyDetailUserConnections(results, userOrgConnectedDirectly, userOrgConnectedByEmail, userOrgConnectedByUserId);
// Annul
await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId });
await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId });
await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId });
await userRepository.DeleteAsync(user);
}
[DatabaseTheory, DatabaseData]
public async Task ShouldReturnUserIds(
IUserRepository userRepository,
IOrganizationUserRepository organizationUserRepository,
IOrganizationRepository organizationRepository,
IPolicyRepository policyRepository)
{
// Arrange
var user1 = await userRepository.CreateTestUserAsync();
var user2 = await userRepository.CreateTestUserAsync();
const PolicyType policyType = PolicyType.SingleOrg;
var organization = await CreateEnterpriseOrg(organizationRepository);
await policyRepository.CreateAsync(new Policy { OrganizationId = organization.Id, Enabled = true, Type = policyType });
var orgUser1 = await organizationUserRepository.CreateTestOrganizationUserAsync(organization, user1);
var orgUser2 = await organizationUserRepository.CreateTestOrganizationUserAsync(organization, user2);
// Act
var results = (await policyRepository.GetPolicyDetailsByOrganizationIdAsync(organization.Id, policyType)).ToList();
// Assert
Assert.Equal(2, results.Count);
Assert.Contains(results, result => result.OrganizationUserId == orgUser1.Id
&& result.UserId == orgUser1.UserId
&& result.OrganizationId == orgUser1.OrganizationId);
Assert.Contains(results, result => result.OrganizationUserId == orgUser2.Id
&& result.UserId == orgUser2.UserId
&& result.OrganizationId == orgUser2.OrganizationId);
// Annul
await organizationRepository.DeleteAsync(organization);
await userRepository.DeleteManyAsync([user1, user2]);
}
private async Task<OrganizationUser> ArrangeOtherOrgConnectedByUserIdAsync(IOrganizationUserRepository organizationUserRepository,
IOrganizationRepository organizationRepository, IPolicyRepository policyRepository, User user,
PolicyType policyType)