-
Notifications
You must be signed in to change notification settings - Fork 48
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove the last references to Encryptable and Decryptable #738
Conversation
No New Or Fixed Issues Found |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #738 +/- ##
==========================================
- Coverage 61.82% 61.80% -0.03%
==========================================
Files 173 172 -1
Lines 10947 10932 -15
==========================================
- Hits 6768 6756 -12
+ Misses 4179 4176 -3 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, there are some merge conflicts to resolve though
…table # Conflicts: # crates/bitwarden/src/tool/exporters/mod.rs
In #738 we migrated away from `decrypt` and used `decrypt_with_key` instead. However ciphers can be encrypted using either organization keys or user key. The changes introduced meant we always used the users key instead of conditionally based on the value of `organization_jd` in `Cipher`. The fix was to call `locate_key` on `Cipher` and `Collection`. To properly write tests I needed to mock a user account and organization. I took this moment to refactor our tests account and we now have nice helpers for initializing the test@bitwarden.com account, which also includes an organization.
Type of change
Objective
Wrap up the migration to KeyEncryptable / KeyDecryptable.
Before you submit