bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-22 19:23:45 +00:00
Code Issues Releases Wiki Activity

[PM-26126] Add includeMemberItems query param to GET /organization-details (#6376)

Browse Source
This commit is contained in:
Nik Gilmore
2025-09-24 15:25:40 -07:00
committed by GitHub
parent 4b10c16419
commit f0953ed6b0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Vault/Controllers/CiphersController.cs
View File

@@ -336,13 +336,15 @@ public class CiphersController : Controller
} }
[HttpGet("organization-details")] [HttpGet("organization-details")]
public async Task<ListResponseModel<CipherMiniDetailsResponseModel>> GetOrganizationCiphers(Guid organizationId) public async Task<ListResponseModel<CipherMiniDetailsResponseModel>> GetOrganizationCiphers(Guid organizationId, bool includeMemberItems = false)
{ {
if (!await CanAccessAllCiphersAsync(organizationId)) if (!await CanAccessAllCiphersAsync(organizationId))
{ {
throw new NotFoundException(); throw new NotFoundException();
} }
var allOrganizationCiphers = _featureService.IsEnabled(FeatureFlagKeys.CreateDefaultLocation)
bool excludeDefaultUserCollections = _featureService.IsEnabled(FeatureFlagKeys.CreateDefaultLocation) && !includeMemberItems;
var allOrganizationCiphers = excludeDefaultUserCollections
? ?
await _organizationCiphersQuery.GetAllOrganizationCiphersExcludingDefaultUserCollections(organizationId) await _organizationCiphersQuery.GetAllOrganizationCiphersExcludingDefaultUserCollections(organizationId)
: :