[PM-12049] Remove usage of ActiveUserState from folder service #11880
Conversation
…tate Added extra test cases for encrypted folder and decrypted folders Updated derived state to use decrypt with key
This comment has been minimized.
This comment has been minimized.
Codecov ReportAttention: Patch coverage is
✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## main #11880 +/- ##
==========================================
- Coverage 33.73% 33.73% -0.01%
==========================================
Files 2918 2918
Lines 90929 91001 +72
Branches 17185 17201 +16
==========================================
+ Hits 30679 30696 +17
- Misses 57857 57905 +48
- Partials 2393 2400 +7 ☔ View full report in Codecov by Sentry. |
| return []; | ||
| } | ||
|
|
||
| const decryptFolderPromises = folders.map((f) => f.decryptWithKey(userKey, encryptService)); |
There was a problem hiding this comment.
ℹ️ @bitwarden/team-platform-dev changed folder decryption to use decryptWithKey instead of the decrypt method.
|
|
||
| folders$(userId$: Observable<UserId>): Observable<Folder[]> { | ||
| return userId$.pipe( | ||
| takeWhile((userId) => userId != null), |
There was a problem hiding this comment.
ℹ️ takeWhile operator to stop folder state observations when userId becomes invalid (during logout)
| this.folderViews$ = this.decryptedFoldersState.state$; | ||
| folderViews$(userId$: Observable<UserId>): Observable<FolderView[]> { | ||
| return userId$.pipe( | ||
| takeWhile((userId) => userId != null), |
There was a problem hiding this comment.
ℹ️ takeWhile operator to stop folder state observations when userId becomes invalid (during logout)
There was a problem hiding this comment.
Nice work on this so far!
I mostly just left a couple thoughts/comments on my concern with mixing Observable<UserId> and UserId arguments to the FolderService. They're not hard change requests, but I think it something we should consider / discuss further.
Also, I do think we'll need to introduce the same UserId requirement to the FolderApiService to ensure we are always using the same userId throughout a submission.
.../tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Looks good! But we do need to make Justin's suggested change.
gbubemismith
dismissed stale reviews from jprusik, rr-bw, and audreyality
via
e69e997
gbubemismith
requested review from
shane-melton,
rr-bw,
audreyality,
jprusik and
justindbaur
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-12049
📔 Objective
ActiveUserStateis being deprecated. Remove usage fromfolderServiceand require userId to be passed.📸 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