[PR #6990] [PM-37255] feat: Consume fill-assist targeting rules data #120935

Open
opened 2026-06-09 19:24:23 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/6990
Author: @aj-rosado
Created: 5/29/2026
Status: 🔄 Open

Base: mainHead: PM-37255/fill-assist-network-layer


📝 Commits (7)

  • c646372 Add fill assist rules network data
  • f57a7d0 reverted unwanted changes on AuthRepositoryTest
  • f66485f Removed nulls and sets on non nullable fields by schema definition. Removed unnecessary deserialization tests
  • 0b39ad2 following autofill assist forms schema
  • b25404e removed unnecessary null set
  • 31a9cf7 Added FillAssist to BaseUrlInterceptors
  • d6f0a47 Merge branch 'main' into PM-37255/fill-assist-network-layer

📊 Changes

31 files changed (+425 additions, -0 deletions)

View changed files

📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt (+6 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt (+5 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt (+7 -0)
📝 app/src/main/kotlin/com/x8bit/bitwarden/data/platform/provider/BaseUrlsProviderImpl.kt (+2 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt (+1 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt (+15 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/FakeEnvironmentDiskSource.kt (+2 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/sdk/ServerCommunicationConfigRepositoryTest.kt (+1 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerTest.kt (+1 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/provider/BaseUrlsProviderTest.kt (+13 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/SdkRepositoryFactoryTests.kt (+1 -0)
📝 app/src/test/kotlin/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt (+1 -0)
📝 authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/provider/BaseUrlsProviderImpl.kt (+2 -0)
📝 authenticator/src/test/kotlin/com/bitwarden/authenticator/data/platform/manager/FeatureFlagManagerTest.kt (+1 -0)
📝 authenticator/src/test/kotlin/com/bitwarden/authenticator/data/platform/repository/util/FakeServerConfigRepository.kt (+1 -0)
📝 data/src/test/kotlin/com/bitwarden/data/datasource/disk/ConfigDiskSourceTest.kt (+1 -0)
📝 data/src/test/kotlin/com/bitwarden/data/repository/ServerConfigRepositoryTest.kt (+2 -0)
📝 network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClient.kt (+6 -0)
📝 network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt (+6 -0)
network/src/main/kotlin/com/bitwarden/network/api/FillAssistApi.kt (+27 -0)

...and 11 more files

📄 Description

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-37255

📔 Objective

Changes:

  • ConfigResponseJson.EnvironmentJson — adds fillAssistRulesUrl: String? (@SerialName("fillAssistRules")) from the server config response
  • FillAssistManifestJson — model for the CDN manifest file, with a version-keyed map (Map<String, FileEntryJson?>) so new schema versions appear automatically without model changes
  • FillAssistFormsJson — model for the forms rules file; uses JsonElement for the composite selector array to handle both string and array-of-string alternatives
  • FillAssistApi / FillAssistService / FillAssistServiceImpl — Retrofit service using @Url annotation with createStaticRetrofit() to bypass BaseUrlInterceptor (the fill-assist CDN is external to the Bitwarden API)
  • BitwardenServiceClient — exposes fillAssistService
  • PlatformNetworkModule — provides FillAssistService
  • All EnvironmentJson test fixtures updated with fillAssistRulesUrl = null

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/6990 **Author:** [@aj-rosado](https://github.com/aj-rosado) **Created:** 5/29/2026 **Status:** 🔄 Open **Base:** `main` ← **Head:** `PM-37255/fill-assist-network-layer` --- ### 📝 Commits (7) - [`c646372`](https://github.com/bitwarden/android/commit/c6463722f2bc7b721d034ae7584d1e02fe4e5247) Add fill assist rules network data - [`f57a7d0`](https://github.com/bitwarden/android/commit/f57a7d09a26060a54efd32fe6f32bb8372785e69) reverted unwanted changes on AuthRepositoryTest - [`f66485f`](https://github.com/bitwarden/android/commit/f66485facdd4c8f4510c9c20ea58c2726664d505) Removed nulls and sets on non nullable fields by schema definition. Removed unnecessary deserialization tests - [`0b39ad2`](https://github.com/bitwarden/android/commit/0b39ad27313da783a3644f05adc3aa7c14c6f2ee) following autofill assist forms schema - [`b25404e`](https://github.com/bitwarden/android/commit/b25404e1122f38bcc18a6cf5bc658b317390c9e6) removed unnecessary null set - [`31a9cf7`](https://github.com/bitwarden/android/commit/31a9cf7c346d66c81c60f5d0b669fd0a89ef5ac8) Added FillAssist to BaseUrlInterceptors - [`d6f0a47`](https://github.com/bitwarden/android/commit/d6f0a47d77bcf330ceeb1a1f6d3240b5677b4040) Merge branch 'main' into PM-37255/fill-assist-network-layer ### 📊 Changes **31 files changed** (+425 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSource.kt` (+6 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceImpl.kt` (+5 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/datasource/network/di/PlatformNetworkModule.kt` (+7 -0) 📝 `app/src/main/kotlin/com/x8bit/bitwarden/data/platform/provider/BaseUrlsProviderImpl.kt` (+2 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/auth/repository/AuthRepositoryTest.kt` (+1 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/EnvironmentDiskSourceTest.kt` (+15 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/disk/FakeEnvironmentDiskSource.kt` (+2 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/datasource/sdk/ServerCommunicationConfigRepositoryTest.kt` (+1 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/FeatureFlagManagerTest.kt` (+1 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/provider/BaseUrlsProviderTest.kt` (+13 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/sdk/SdkRepositoryFactoryTests.kt` (+1 -0) 📝 `app/src/test/kotlin/com/x8bit/bitwarden/data/platform/repository/util/FakeServerConfigRepository.kt` (+1 -0) 📝 `authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/provider/BaseUrlsProviderImpl.kt` (+2 -0) 📝 `authenticator/src/test/kotlin/com/bitwarden/authenticator/data/platform/manager/FeatureFlagManagerTest.kt` (+1 -0) 📝 `authenticator/src/test/kotlin/com/bitwarden/authenticator/data/platform/repository/util/FakeServerConfigRepository.kt` (+1 -0) 📝 `data/src/test/kotlin/com/bitwarden/data/datasource/disk/ConfigDiskSourceTest.kt` (+1 -0) 📝 `data/src/test/kotlin/com/bitwarden/data/repository/ServerConfigRepositoryTest.kt` (+2 -0) 📝 `network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClient.kt` (+6 -0) 📝 `network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt` (+6 -0) ➕ `network/src/main/kotlin/com/bitwarden/network/api/FillAssistApi.kt` (+27 -0) _...and 11 more files_ </details> ### 📄 Description ## 🎟️ Tracking https://bitwarden.atlassian.net/browse/PM-37255 ## 📔 Objective **Changes:** - `ConfigResponseJson.EnvironmentJson` — adds `fillAssistRulesUrl: String?` (`@SerialName("fillAssistRules")`) from the server config response - `FillAssistManifestJson` — model for the CDN manifest file, with a version-keyed map (`Map<String, FileEntryJson?>`) so new schema versions appear automatically without model changes - `FillAssistFormsJson` — model for the forms rules file; uses `JsonElement` for the composite selector array to handle both string and array-of-string alternatives - `FillAssistApi` / `FillAssistService` / `FillAssistServiceImpl` — Retrofit service using `@Url` annotation with `createStaticRetrofit()` to bypass `BaseUrlInterceptor` (the fill-assist CDN is external to the Bitwarden API) - `BitwardenServiceClient` — exposes `fillAssistService` - `PlatformNetworkModule` — provides `FillAssistService` - All `EnvironmentJson` test fixtures updated with `fillAssistRulesUrl = null` --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-06-09 19:24:23 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#120935