Open
Conversation
Contributor
|
New Issues (30)Checkmarx found the following issues in this Pull Request
|
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #1029 +/- ##
==========================================
+ Coverage 6.79% 25.90% +19.11%
==========================================
Files 67 73 +6
Lines 2798 2957 +159
Branches 483 535 +52
==========================================
+ Hits 190 766 +576
+ Misses 2576 2074 -502
- Partials 32 117 +85 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
eliykat
requested changes
Mar 7, 2026
Member
eliykat
left a comment
eliykat
left a comment
There was a problem hiding this comment.
Thank you for tackling this! I think spending some time getting proper tests on stateService and stateMigrationService will give us some peace of mind that we won't get an influx of tickets on release.
Member
There was a problem hiding this comment.
I think we should consider removing the old migrations and just throwing if the stateVersion is not the minimum we expect. Account switching was released ~4 years ago, if you haven't opened DC since then you can just go download a fresh copy. Please check with Priya though.
Then you could just delete the legacy keys rather than moving them to their own file.
Contributor
Author
There was a problem hiding this comment.
We have the okay from Priya 👍
Member
There was a problem hiding this comment.
Any ideas for testing this? e.g. could you configure the current DC version, then copy/paste your actual data.json into the code, then run a migration and assert the outcome?
I believe we have tests for it in the clients repo - the migration service has evolved a bit but should still give you the idea.
Member
There was a problem hiding this comment.
Assuming the secure storage keys are changing, we're missing the following migrations:
- accessToken
- refreshToken
- apiKeyClientId
- apiKeyClientSecret
- twoFactorToken (if required)
Comment on lines
+304
to
+305
| // @TODO Keep old key for now - will remove in future release | ||
| // await this.secureStorageService.remove(oldKey); |
Member
There was a problem hiding this comment.
I don't disagree, but this migration will only run once. This would need to be done in a separately versioned migration.
Comment on lines
+19
to
+33
| const normalized = new EnvironmentUrls(); | ||
|
|
||
| for (const [key, value] of Object.entries(urls)) { | ||
| if (!value || typeof value !== "string") { | ||
| continue; | ||
| } | ||
|
|
||
| let url = value.trim(); | ||
| url = url.replace(/\/+$/, ""); // Remove trailing slashes | ||
|
|
||
| if (!/^https?:\/\//i.test(url)) { | ||
| url = `https://${url}`; | ||
| } | ||
|
|
||
| normalized[key as keyof EnvironmentUrls] = url; |
Member
There was a problem hiding this comment.
This was neater in its own private method. I think Claude may be over-optimizing.
BTreston
commented
Mar 11, 2026
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Contributor
Author
|
@eliykat this is ready for another look when you have a moment, thanks. |
|
Member
Code Review SummaryOverall Assessment: This PR implements a well-structured rewrite of the state service, moving from an account-based hierarchy to a simpler flat key-value structure. The changes are comprehensive and include proper test coverage. What was reviewed:
Strengths:
Items verified as non-issues:
Minor observations (not blocking):
The PR addresses the previous review feedback well and the implementation is solid. No blocking issues found. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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-31159
📔 Objective
This PR encompasses the totality of the state service re-write. This includes:
state.service.tsjslibjslibservices into the main directory structurejslibservice dependencies (e.g.crypto-service)jslibstate into DC app state (mostly electron related state).jslibcompatibility (stub files)jslibstate migration logic into DC's state migration servicejslibmodels📸 Screenshots