1
0
mirror of https://github.com/bitwarden/server synced 2025-12-15 15:53:59 +00:00

[PM-22558] Update IOrganizationUserRepository.ReplaceAsync to preserve existing access to collections of the type DefaultUserCollection (#6037)

* feat: exclude DefaultUserCollection from GetManyByOrganizationIdWithPermissionsAsync

Updated EF implementation, SQL procedure, and unit test to verify that default user collections are filtered from results

* Update the public CollectionsController.Get method to return a NotFoundResult for collections of type DefaultUserCollection.

* Add unit tests for the public CollectionsController

* Update ICollectionRepository.GetManyByOrganizationIdAsync to exclude results of the type DefaultUserCollection

Modified the SQL stored procedure and the EF query to reflect this change and added a new integration test to ensure the functionality works as expected.

* Refactor CollectionsController to remove unused IApplicationCacheService dependency

* Update IOrganizationUserRepository.GetDetailsByIdWithCollectionsAsync to exclude DefaultUserCollections

* Update IOrganizationUserRepository.GetManyDetailsByOrganizationAsync to exclude DefaultUserCollections

* Undo change to GetByIdWithCollectionsAsync

* Update integration test to verify exclusion of DefaultUserCollection in OrganizationUserRepository.GetDetailsByIdWithCollectionsAsync

* Clarify documentation in ICollectionRepository to specify that GetManyByOrganizationIdWithAccessAsync returns only shared collections belonging to the organization.

* Update IOrganizationUserRepository.ReplaceAsync to preserve existing access to collections of the type DefaultUserCollection
This commit is contained in:
Rui Tomé
2025-07-29 15:04:45 +01:00
committed by GitHub
parent 6dea40c868
commit b00e689ff6
4 changed files with 160 additions and 3 deletions

View File

@@ -1166,4 +1166,67 @@ public class OrganizationUserRepositoryTests
Assert.NotNull(responseModel);
Assert.Empty(responseModel);
}
[DatabaseTheory, DatabaseData]
public async Task ReplaceAsync_PreservesDefaultCollections_WhenUpdatingCollectionAccess(
IUserRepository userRepository,
IOrganizationRepository organizationRepository,
IOrganizationUserRepository organizationUserRepository,
ICollectionRepository collectionRepository)
{
// Arrange
var organization = await organizationRepository.CreateTestOrganizationAsync();
var user = await userRepository.CreateTestUserAsync();
var orgUser = await organizationUserRepository.CreateTestOrganizationUserAsync(organization, user);
// Create a regular collection and a default collection
var regularCollection = await collectionRepository.CreateTestCollectionAsync(organization);
// Manually create default collection since CreateTestCollectionAsync doesn't support type parameter
var defaultCollection = new Collection
{
OrganizationId = organization.Id,
Name = $"Default Collection {Guid.NewGuid()}",
Type = CollectionType.DefaultUserCollection
};
await collectionRepository.CreateAsync(defaultCollection);
var newCollection = await collectionRepository.CreateTestCollectionAsync(organization);
// Set up initial collection access: user has access to both regular and default collections
await organizationUserRepository.ReplaceAsync(orgUser, [
new CollectionAccessSelection { Id = regularCollection.Id, ReadOnly = false, HidePasswords = false, Manage = false },
new CollectionAccessSelection { Id = defaultCollection.Id, ReadOnly = false, HidePasswords = false, Manage = true }
]);
// Verify initial state
var (_, initialCollections) = await organizationUserRepository.GetByIdWithCollectionsAsync(orgUser.Id);
Assert.Equal(2, initialCollections.Count);
Assert.Contains(initialCollections, c => c.Id == regularCollection.Id);
Assert.Contains(initialCollections, c => c.Id == defaultCollection.Id);
// Act: Update collection access with only the new collection
// This should preserve the default collection but remove the regular collection
await organizationUserRepository.ReplaceAsync(orgUser, [
new CollectionAccessSelection { Id = newCollection.Id, ReadOnly = false, HidePasswords = false, Manage = true }
]);
// Assert
var (actualOrgUser, actualCollections) = await organizationUserRepository.GetByIdWithCollectionsAsync(orgUser.Id);
Assert.NotNull(actualOrgUser);
Assert.Equal(2, actualCollections.Count); // Should have default collection + new collection
// Default collection should be preserved
var preservedDefaultCollection = actualCollections.FirstOrDefault(c => c.Id == defaultCollection.Id);
Assert.NotNull(preservedDefaultCollection);
Assert.True(preservedDefaultCollection.Manage); // Original permissions preserved
// New collection should be added
var addedNewCollection = actualCollections.FirstOrDefault(c => c.Id == newCollection.Id);
Assert.NotNull(addedNewCollection);
Assert.True(addedNewCollection.Manage);
// Regular collection should be removed
Assert.DoesNotContain(actualCollections, c => c.Id == regularCollection.Id);
}
}