[PM-18087] Add cipher permissions to response models #5418
+208
−81
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ganization properties
…bility - Split large test method into smaller, focused methods - Added helper methods for creating test data and performing assertions - Improved test coverage for cipher permissions in different scenarios - Maintained existing test logic while enhancing code structure
- Removed redundant helper methods for permission assertions - Simplified test methods for GetCipherPermissionsForOrganizationAsync, GetManyByUserIdAsync, and GetByIdAsync - Maintained existing test coverage for cipher manage permissions - Improved code readability and reduced code duplication
…missions - Added new test method GetCipherPermissionsForOrganizationAsync_ManageProperty_RespectsCollectionGroupRules - Implemented helper method CreateCipherInOrganizationCollectionWithGroup to support group-based collection permission testing - Verified manage permissions are correctly applied based on group collection access settings
- Updated CipherDetails_Create, CipherDetails_CreateWithCollections, and CipherDetails_Update stored procedures - Added @manage parameter with comment "-- not used" - Included new stored procedure implementations in migration script - Consistent with previous work on adding Manage property to cipher details
This change introduces organization ability context to various cipher response models across multiple controllers. The modifications include: - Updating CipherResponseModel to include permissions based on user and organization ability - Modifying CiphersController methods to fetch and pass organization abilities - Updating SyncController to include organization abilities in sync response - Adding organization ability context to EmergencyAccessController response generation
This change simplifies the EmergencyAccessController by removing unnecessary organization ability fetching and passing. Since emergency access only retrieves personal ciphers, the organization ability context is no longer needed in the response generation.
Remove unnecessary JsonConstructor attribute and simplify constructor initialization for EmergencyAccessViewResponseModel
|
New Issues (7)Checkmarx found the following issues in this Pull Request
Fixed Issues (29)Great job! The following issues were fixed in this Pull Request
|
Extract methods to simplify organization ability fetching for ciphers, reducing code duplication and improving readability. Added two private helper methods: - GetOrganizationAbilityAsync: Retrieves organization ability for a single cipher - GetManyOrganizationAbilitiesAsync: Retrieves organization abilities for multiple ciphers
Modify test methods to: - Replace GetProperUserId with GetUserByPrincipalAsync - Use User object instead of separate userId - Update mocking to return User object - Ensure user ID is correctly set in test scenarios
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5418 +/- ##
==========================================
- Coverage 44.48% 44.37% -0.12%
==========================================
Files 1533 1535 +2
Lines 71075 70596 -479
Branches 6377 6319 -58
==========================================
- Hits 31618 31324 -294
+ Misses 38090 37927 -163
+ Partials 1367 1345 -22 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
eliykat
reviewed
Feb 21, 2025
Closed
eliykat
reviewed
Feb 26, 2025
…/add-cipher-permissions-to-response-models
…rs and models - Update CiphersController to use GetOrganizationAbilitiesAsync instead of individual methods - Modify CipherResponseModel and CipherDetailsResponseModel to accept organization abilities dictionary - Update CipherPermissionsResponseModel to handle organization abilities lookup - Remove deprecated organization ability retrieval methods - Simplify sync and emergency access response model handling of organization abilities
- Delete unused method from IApplicationCacheService interface - Remove corresponding implementation in InMemoryApplicationCacheService - Continues cleanup of organization ability retrieval methods
…eval - Add organization abilities retrieval in test setup for PutCollections_vNext method - Ensure consistent mocking of IApplicationCacheService in test scenarios
Base automatically changed from
ac/pm-18086/add-authorization-methods
to
main
February 27, 2025 21:30
eliykat
requested changes
Feb 28, 2025
src/Api/Vault/Models/Response/CipherPermissionsResponseModel.cs
Outdated
Show resolved
Hide resolved
src/Core/Vault/Authorization/Permissions/NormalCipherPermissions.cs
Outdated
Show resolved
Hide resolved
test/Core.Test/Vault/Authorization/Permissions/NormalCipherPermissionTests.cs
Outdated
Show resolved
Hide resolved
…se-models # Conflicts: # src/Core/Vault/Authorization/Permissions/NormalCipherPermissions.cs # test/Core.Test/Vault/Authorization/Permissions/NormalCipherPermissionTests.cs
r-tome
force-pushed
the
ac/pm-18087/add-cipher-permissions-to-response-models
branch
from
2c03a19 to
5e2d973
Compare
eliykat
approved these changes
Mar 4, 2025
shane-melton
approved these changes
Mar 4, 2025
ike-kottlowski
approved these changes
Mar 5, 2025
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-18087
📔 Objective
CipherPermissionsResponseModelto explicitly communicate cipher permissionsDeleteandRestoreboolean propertiesNormalCipherPermissionsto calculate these valuesCipherResponseModelto include the new permissions propertyOrganizationAbilityparameter to relevant response model constructors to support permission calculationsImplementation Details
OrganizationAbilityfor organizational ciphers📸 Screenshots
⏰ Reminders before review
🦮 Reviewer guidelines
:+1:) or similar for great changes:memo:) or ℹ️ (:information_source:) for notes or general info:question:) for questions:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion:art:) for suggestions / improvements:x:) or:warning:) for more significant problems or concerns needing attention:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt:pick:) for minor or nitpick changes