nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

[PM-10292] Remove Flexible Collections v1 from Core (#4579)

Browse Source 
* chore: remove fc v1 from OrganizationService, refs PM-10292

* chore: remove fc v1 from CollectionService, refs PM-10292

* chore: remove fc v1 from OrganizationCiphersQuery, refs PM-10292

* fix: update CollectionServiceTests, refs PM-10292
This commit is contained in:
Vincent Salucci
2024-08-06 11:14:16 -05:00
committed by GitHub
parent 7d48102865
commit f49fb3a891
4 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Core/Services/Implementations/CollectionService.cs
View File

@ -17,7 +17,6 @@ public class CollectionService : ICollectionService
private readonly ICollectionRepository _collectionRepository;
private readonly IReferenceEventService _referenceEventService;
private readonly ICurrentContext _currentContext;
private readonly IFeatureService _featureService;
public CollectionService(
IEventService eventService,
@ -25,8 +24,7 @@ public class CollectionService : ICollectionService
IOrganizationUserRepository organizationUserRepository,
ICollectionRepository collectionRepository,
IReferenceEventService referenceEventService,
ICurrentContext currentContext,
IFeatureService featureService)
ICurrentContext currentContext)
{
_eventService = eventService;
_organizationRepository = organizationRepository;
@ -34,7 +32,6 @@ public class CollectionService : ICollectionService
_collectionRepository = collectionRepository;
_referenceEventService = referenceEventService;
_currentContext = currentContext;
_featureService = featureService;
}
public async Task SaveAsync(Collection collection, IEnumerable<CollectionAccessSelection> groups = null,
@ -56,16 +53,13 @@ public class CollectionService : ICollectionService
throw new BadRequestException("The Manage property is mutually exclusive and cannot be true while the ReadOnly or HidePasswords properties are also true.");
}
// If using Flexible Collections V1 - a collection should always have someone with Can Manage permissions
if (_featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsV1))
// A collection should always have someone with Can Manage permissions
var groupHasManageAccess = groupsList?.Any(g => g.Manage) ?? false;
var userHasManageAccess = usersList?.Any(u => u.Manage) ?? false;
if (!groupHasManageAccess && !userHasManageAccess && !org.AllowAdminAccessToAllCollectionItems)
{
var groupHasManageAccess = groupsList?.Any(g => g.Manage) ?? false;
var userHasManageAccess = usersList?.Any(u => u.Manage) ?? false;
if (!groupHasManageAccess && !userHasManageAccess && !org.AllowAdminAccessToAllCollectionItems)
{
throw new BadRequestException(
"At least one member or group must have can manage permission.");
}
throw new BadRequestException(
"At least one member or group must have can manage permission.");
}
if (collection.Id == default(Guid))