Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1110] add deleteAnyCollection permission to bulk delete (#2766)

Browse Source 
* [AC-1110] add deleteAnyCollection permission to bulk delete

* [AC-1110] call collection service instead of repo for user collections

* [AC-1110] fix tests

* [AC-1110] fix more tests
This commit is contained in:
Jake Fink 2023-03-10 12:53:22 -05:00 committed by GitHub
parent e5aafe1c8b
commit dafcdde715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Controllers/CollectionsController.cs
View File

@ -204,12 +204,12 @@ public class CollectionsController : Controller
{ {
var orgId = new Guid(model.OrganizationId); var orgId = new Guid(model.OrganizationId);
var collectionIds = model.Ids.Select(i => new Guid(i)); var collectionIds = model.Ids.Select(i => new Guid(i));
if (!await _currentContext.DeleteAssignedCollections(orgId)) if (!await _currentContext.DeleteAssignedCollections(orgId) && !await _currentContext.DeleteAnyCollection(orgId))
{ {
throw new NotFoundException(); throw new NotFoundException();
} }
var userCollections = await _collectionRepository.GetManyByUserIdAsync(_currentContext.UserId.Value); var userCollections = await _collectionService.GetOrganizationCollections(orgId);
var filteredCollections = userCollections.Where(c => collectionIds.Contains(c.Id) && c.OrganizationId == orgId); var filteredCollections = userCollections.Where(c => collectionIds.Contains(c.Id) && c.OrganizationId == orgId);
if (!filteredCollections.Any()) if (!filteredCollections.Any())

12
test/Api.Test/Controllers/CollectionsControllerTests.cs
View File

@ -148,7 +148,7 @@ public class CollectionsControllerTests
OrganizationId = orgId.ToString() OrganizationId = orgId.ToString()
}; };
var collections = new List<CollectionDetails> var collections = new List<Collection>
{ {
new CollectionDetails new CollectionDetails
{ {
@ -170,8 +170,8 @@ public class CollectionsControllerTests
.UserId .UserId
.Returns(user.Id); .Returns(user.Id);
sutProvider.GetDependency<ICollectionRepository>() sutProvider.GetDependency<ICollectionService>()
.GetManyByUserIdAsync(user.Id) .GetOrganizationCollections(orgId)
.Returns(collections); .Returns(collections);
// Act // Act
@ -219,7 +219,7 @@ public class CollectionsControllerTests
OrganizationId = orgId.ToString() OrganizationId = orgId.ToString()
}; };
var collections = new List<CollectionDetails> var collections = new List<Collection>
{ {
new CollectionDetails new CollectionDetails
{ {
@ -236,8 +236,8 @@ public class CollectionsControllerTests
.UserId .UserId
.Returns(user.Id); .Returns(user.Id);
sutProvider.GetDependency<ICollectionRepository>() sutProvider.GetDependency<ICollectionService>()
.GetManyByUserIdAsync(user.Id) .GetOrganizationCollections(orgId)
.Returns(collections); .Returns(collections);
// Act // Act