bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-06 00:03:34 +00:00
Code Issues Releases Wiki Activity

[PM-25372] Filter out DefaultUserCollections from CiphersController.GetAssignedOrganizationCiphers (#6274)

Browse Source 
Co-authored-by: Jimmy Vo <huynhmaivo82@gmail.com>
This commit is contained in:
Rui Tomé
2025-09-17 17:43:27 +01:00
committed by GitHub
parent 57f891f391
commit d83395aeb0
8 changed files with 162 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
test/Infrastructure.IntegrationTest/Vault/Repositories/CollectionCipherRepositoryTests.cs Normal file
View File

@@ -0,0 +1,84 @@
using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Repositories;
using Bit.Core.Vault.Entities;
using Bit.Core.Vault.Enums;
using Bit.Core.Vault.Repositories;
using Xunit;
namespace Bit.Infrastructure.IntegrationTest.Vault.Repositories;
public class CollectionCipherRepositoryTests
{
[Theory, DatabaseData]
public async Task GetManySharedByOrganizationIdAsync_OnlyReturnsSharedCollections(
IOrganizationRepository organizationRepository,
ICollectionRepository collectionRepository,
ICipherRepository cipherRepository,
ICollectionCipherRepository collectionCipherRepository)
{
// Arrange
var organization = await organizationRepository.CreateAsync(new Organization
{
Name = "Test Org",
PlanType = PlanType.EnterpriseAnnually,
Plan = "Enterprise",
BillingEmail = "billing@example.com"
});
var sharedCollection = await collectionRepository.CreateAsync(new Collection
{
Name = "Shared Collection",
OrganizationId = organization.Id,
Type = CollectionType.SharedCollection
});
var defaultUserCollection = await collectionRepository.CreateAsync(new Collection
{
Name = "Default User Collection",
OrganizationId = organization.Id,
Type = CollectionType.DefaultUserCollection
});
var sharedCipher = await cipherRepository.CreateAsync(new Cipher
{
Type = CipherType.Login,
OrganizationId = organization.Id,
Data = ""
});
var defaultCipher = await cipherRepository.CreateAsync(new Cipher
{
Type = CipherType.Login,
OrganizationId = organization.Id,
Data = ""
});
await collectionCipherRepository.AddCollectionsForManyCiphersAsync(
organization.Id,
new[] { sharedCipher.Id },
new[] { sharedCollection.Id });
await collectionCipherRepository.AddCollectionsForManyCiphersAsync(
organization.Id,
new[] { defaultCipher.Id },
new[] { defaultUserCollection.Id });
// Act
var result = await collectionCipherRepository.GetManySharedByOrganizationIdAsync(organization.Id);
// Assert
Assert.Single(result);
Assert.Equal(sharedCollection.Id, result.First().CollectionId);
Assert.DoesNotContain(result, cc => cc.CollectionId == defaultUserCollection.Id);
// Cleanup
await cipherRepository.DeleteAsync(sharedCipher);
await cipherRepository.DeleteAsync(defaultCipher);
await collectionRepository.DeleteAsync(sharedCollection);
await collectionRepository.DeleteAsync(defaultUserCollection);
await organizationRepository.DeleteAsync(organization);
}
}