[PM-38443] feat: Add FillAssistRepository and sync integration#2812
Open
andrebispo5 wants to merge 24 commits into
Open
[PM-38443] feat: Add FillAssistRepository and sync integration#2812andrebispo5 wants to merge 24 commits into
andrebispo5 wants to merge 24 commits into
Conversation
github-actions
Bot
added
app:password-manager
Contributor
🤖 Bitwarden Claude Code ReviewOverall Assessment: APPROVE Reviewed the new Code Review DetailsNo new findings. The one substantive concern — Prior round findings (missing repository tests, integrity-check re-encoding, unused |
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Pull request overview
This PR introduces a new Fill-Assist sync orchestration layer (FillAssistRepository + DefaultFillAssistRepository) and wires it into the app’s dependency graph and vault sync flow so Fill-Assist rules can be fetched, validated, cached per-account, and consulted by hostname.
Changes:
- Added
FillAssistRepository/DefaultFillAssistRepositoryimplementing the fill-assist sync + caching pipeline. - Integrated the repository into
ServiceContainer/Servicesand injected it intoDefaultSyncService. - Updated mocks/tests wiring to accommodate the new dependency.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| BitwardenShared/Core/Vault/Services/SyncServiceTests.swift | Injects a MockFillAssistRepository into DefaultSyncService test setup. |
| BitwardenShared/Core/Vault/Services/SyncService.swift | Calls fill-assist sync during vault sync completion path. |
| BitwardenShared/Core/Platform/Services/TestHelpers/ServiceContainer+Mocks.swift | Adds fillAssistRepository to mock container factory. |
| BitwardenShared/Core/Platform/Services/Services.swift | Adds HasFillAssistRepository to the Services composition. |
| BitwardenShared/Core/Platform/Services/ServiceContainer.swift | Instantiates DefaultFillAssistRepository and injects it into DefaultSyncService and container. |
| BitwardenShared/Core/Autofill/Repositories/FillAssistRepository.swift | New repository implementing manifest fetch, schema check, integrity check, parsing, and per-account caching. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+482
to
+484
| // Sync fill-assist rules alongside vault data. Failures must not block vault sync. | ||
| await fillAssistRepository.syncFillAssistRules() | ||
|
|
Comment on lines
+33
to
+37
| typealias Services = HasConfigService | ||
| & HasEnvironmentService | ||
| & HasFillAssistAPIService | ||
| & HasStateService | ||
|
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2812 +/- ##
==========================================
- Coverage 81.24% 79.02% -2.22%
==========================================
Files 1028 1153 +125
Lines 66164 73732 +7568
==========================================
+ Hits 53756 58268 +4512
- Misses 12408 15464 +3056 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
fedemkr
reviewed
Jun 26, 2026
Comment on lines
+9
to
+22
| /// Fetches and caches fill-assist rules for the active account. | ||
| /// | ||
| func syncFillAssistRules() async | ||
|
|
||
| /// Returns the cached fill-assist rules for a given hostname, or `nil` if unavailable. | ||
| /// | ||
| /// - Parameter hostname: The hostname to look up. | ||
| /// - Returns: The cached `FillAssistHostRules`, or `nil`. | ||
| /// | ||
| func fillAssistRules(for hostname: String) async -> FillAssistHostRules? | ||
|
|
||
| /// Clears all cached fill-assist data for the active account. | ||
| /// | ||
| func clearFillAssistRules() async throws |
Member
There was a problem hiding this comment.
⛏️ Given that this is the "Fill Assist" repository, I think we can remove the use of "FillAssist" in the function names as it's a bit repetitive IMO.
| let sourceUrl = environmentService.fillAssistRulesURL | ||
| let userId = try await stateService.getActiveAccountId() | ||
| let lastFetch = appSettingsStore.fillAssistLastFetchTimestamp(userId: userId) | ||
| if let lastFetch, Date().timeIntervalSince(lastFetch) < Constants.fillAssistUpdateInterval { |
Member
There was a problem hiding this comment.
🎨 Use TimeProvider instead of Date() so you can better mock the date on the tests.
This applies to all Date() in this file.
| ) | ||
| } | ||
|
|
||
| // Sync fill-assist rules alongside vault data. Failures must not block vault sync. |
Member
There was a problem hiding this comment.
⛏️ I'd remove "Failures must not block vault sync." as the function doesn't throw any errors so I think it's a direct assumption.
| } | ||
|
|
||
| // Sync fill-assist rules alongside vault data. Failures must not block vault sync. | ||
| await fillAssistRepository.syncFillAssistRules() |
Comment on lines
+227
to
+283
| private func makeManifest(cid: String) throws -> FillAssistManifestResponseModel { | ||
| let json = """ | ||
| { | ||
| "buildId": "v1", | ||
| "gitSha": "abc", | ||
| "maps": { "forms": { "v1": { | ||
| "cid": "\(cid)", | ||
| "filename": "forms.v1.json", | ||
| "schema": "forms.v1.schema.json" | ||
| }}}, | ||
| "timestamp": "2026-06-11T14:29:32.184Z" | ||
| } | ||
| """ | ||
| return try JSONDecoder.pascalOrSnakeCaseDecoder.decode( | ||
| FillAssistManifestResponseModel.self, | ||
| from: Data(json.utf8), | ||
| ) | ||
| } | ||
|
|
||
| private func makeFormsMapWithPathnames() throws -> FormsMapResponseModel { | ||
| let json = """ | ||
| { | ||
| "schemaVersion": "1.0.0", | ||
| "hosts": { | ||
| "example.com": { | ||
| "forms": [{ "category": "account-login", "fields": { "username": ["input#user1"] } }], | ||
| "pathnames": { | ||
| "/login": { | ||
| "forms": [{ "category": "account-login", "fields": { "username": ["input#user2"] } }] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| return try JSONDecoder.pascalOrSnakeCaseDecoder.decode( | ||
| FormsMapResponseModel.self, | ||
| from: Data(json.utf8), | ||
| ) | ||
| } | ||
|
|
||
| private func makeFormsMap(schemaVersion: String = "1.0.0") throws -> FormsMapResponseModel { | ||
| let json = """ | ||
| { | ||
| "schemaVersion": "\(schemaVersion)", | ||
| "hosts": { | ||
| "example.com": { | ||
| "forms": [{ "category": "account-login", "fields": { "username": ["input#user"] } }] | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| return try JSONDecoder.pascalOrSnakeCaseDecoder.decode( | ||
| FormsMapResponseModel.self, | ||
| from: Data(json.utf8), | ||
| ) | ||
| } |
Member
There was a problem hiding this comment.
🤔 Can't we directly initialize the structs instead of using JSON decoding?
…red for fill-assist CDN
…ling tests to FillAssistRepository
…der, move helpers to model layer
…nd add coverage for edge cases
…epositoryTests - Add @mainactor so featureFlagsBool mutations compile in Swift Testing - Move helper methods to a private extension to satisfy type_body_length
…t fillAssistClient for tests - Filter pooled entries with empty attribute arrays before writing host rules, so hosts with only unsupported selectors (e.g. shadow DOM) are correctly excluded - Add fillAssistClient parameter to APIService.init (defaults to URLSession.shared) so FillAssistAPIServiceTests can inject MockHTTPClient for download calls
andrebispo5
force-pushed
the
pm-38443/consume-fill-assist-data-and-cache
branch
from
6b5d552 to
4d9842c
Compare
…uct initialization Add memberwise inits to FormsMapResponseModel and FormsMapHostEntry so test helpers can construct fixtures without JSON string construction.
fedemkr
reviewed
Jul 1, 2026
Comment on lines
+294
to
+352
| func makeManifest(cid: String) -> FillAssistManifestResponseModel { | ||
| let entry = FillAssistManifestEntryModel( | ||
| cid: cid, | ||
| deprecated: false, | ||
| filename: "forms.v1.json", | ||
| schema: "forms.v1.schema.json", | ||
| ) | ||
| return FillAssistManifestResponseModel( | ||
| buildId: "v1", | ||
| gitSha: "abc", | ||
| maps: ["forms": ["v1": entry]], | ||
| timestamp: Date(timeIntervalSinceReferenceDate: 0), | ||
| ) | ||
| } | ||
|
|
||
| private func makeFormsMap( | ||
| schemaVersion: String = "1.0.0", | ||
| usernameSelector: String = "input#user", | ||
| hosts: [String: String]? = nil, | ||
| ) -> FormsMapResponseModel { | ||
| let content = { (selector: String) in | ||
| FormsMapContent( | ||
| category: "account-login", | ||
| container: nil, | ||
| fields: ["username": [.single(selector)]], | ||
| actions: nil, | ||
| ) | ||
| } | ||
| let resolvedHosts: [String: FormsMapHostEntry] = if let hosts { | ||
| hosts.mapValues { FormsMapHostEntry(forms: [content($0)]) } | ||
| } else { | ||
| ["example.com": FormsMapHostEntry(forms: [content(usernameSelector)])] | ||
| } | ||
| return FormsMapResponseModel(hosts: resolvedHosts, schemaVersion: schemaVersion) | ||
| } | ||
|
|
||
| private func makeFormsMapWithPathnames() -> FormsMapResponseModel { | ||
| let loginContent = FormsMapContent( | ||
| category: "account-login", | ||
| container: nil, | ||
| fields: ["username": [.single("input#user1")]], | ||
| actions: nil, | ||
| ) | ||
| let pathnameContent = FormsMapContent( | ||
| category: "account-login", | ||
| container: nil, | ||
| fields: ["username": [.single("input#user2")]], | ||
| actions: nil, | ||
| ) | ||
| return FormsMapResponseModel( | ||
| hosts: [ | ||
| "example.com": FormsMapHostEntry( | ||
| forms: [loginContent], | ||
| pathnames: ["/login": FormsMapPathnameEntry(forms: [pathnameContent])], | ||
| ), | ||
| ], | ||
| schemaVersion: "1.0.0", | ||
| ) | ||
| } |
…its and test helpers
…ting in Action Extension (#2830)
github-actions
Bot
added
the
app:authenticator
… timestamp is fresh
… timestamp is fresh
…thod and its test
…c-skip behavior syncRules_withinUpdateInterval now also stubs cached data to match the updated skip condition, and a new test covers a fresh timestamp with no readable cache. Fixture builders moved to a separate file to stay under the file length limit.
Adds setFillAssistEnabledError to MockStateService and a test verifying AutoFillProcessor reverts the toggle and shows an alert when persisting the preference fails.
…uests The tests still mocked the old download(filename:)-based HTTPClient API, but the production code was migrated to fillAssistService.send(_:) in an earlier commit. Update the mock setup and assertions to match.
The reprompt handler only proceeded when the app extension's canAutofill was true, blocking Fill Assist-driven autofill from the main app context.
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
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-38443
📔 Objective
Adds
FillAssistRepository(protocol +DefaultFillAssistRepository) which orchestrates the full fill-assist sync pipeline: feature flag check, 6-hour interval guard, manifest fetch, cid/sourceUrl cache comparison, forms download, schema version validation, CSS selector parsing, and per-account storage. Wires the repository intoSyncService(non-blocking) andServiceContainer.Also fixes
APIService.fillAssistServiceto use a plainHTTPService(client: URLSession.shared)— the standardCertificateHTTPClientdeliberately blocks 302 redirects for SSO, which broke the GitHub Releases CDN redirect chain.