remove BlockBrowserInjectionsByDomain feature flag (#16008)

2025-12-10 21:33:27 +00:00 · 2025-08-18 10:17:05 -04:00
parent a60b7fed9a
commit 0c166b3f94
12 changed files with 16 additions and 50 deletions
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -156,7 +156,7 @@ describe("OverlayBackground", () => {
    fakeStateProvider = new FakeStateProvider(accountService);
    showFaviconsMock$ = new BehaviorSubject(true);
    neverDomainsMock$ = new BehaviorSubject({});
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
+    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
    domainSettingsService.showFavicons$ = showFaviconsMock$;
    domainSettingsService.neverDomains$ = neverDomainsMock$;
    logService = mock<LogService>();
--- a/apps/browser/src/autofill/popup/settings/autofill.component.html
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.html
@@ -213,7 +213,7 @@
        </bit-card>
      </form>
    </bit-section>
-    <bit-section [disableMargin]="!blockBrowserInjectionsByDomainEnabled">
+    <bit-section>
      <form [formGroup]="additionalOptionsForm">
        <bit-section-header>
          <h2 bitTypography="h6">{{ "additionalOptions" | i18n }}</h2>
@@ -276,7 +276,7 @@
        </bit-card>
      </form>
    </bit-section>
-    <bit-section *ngIf="blockBrowserInjectionsByDomainEnabled" disableMargin>
+    <bit-section disableMargin>
      <bit-item>
        <a bit-item-content routerLink="/blocked-domains">{{ "blockedDomains" | i18n }}</a>
        <i slot="end" class="bwi bwi-angle-right bwi-lg row-sub-icon" aria-hidden="true"></i>
--- a/apps/browser/src/autofill/popup/settings/autofill.component.ts
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.ts
@@ -44,7 +44,6 @@ import {
  DisablePasswordManagerUri,
  InlineMenuVisibilitySetting,
 } from "@bitwarden/common/autofill/types";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import {
  UriMatchStrategy,
  UriMatchStrategySetting,
@@ -110,7 +109,6 @@ export class AutofillComponent implements OnInit {
  protected defaultBrowserAutofillDisabled: boolean = false;
  protected inlineMenuVisibility: InlineMenuVisibilitySetting =
    AutofillOverlayVisibility.OnFieldFocus;
-  protected blockBrowserInjectionsByDomainEnabled: boolean = false;
  protected browserClientVendor: BrowserClientVendor = BrowserClientVendors.Unknown;
  protected disablePasswordManagerURI: DisablePasswordManagerUri =
    DisablePasswordManagerUris.Unknown;
@@ -222,10 +220,6 @@ export class AutofillComponent implements OnInit {
      this.autofillSettingsService.inlineMenuVisibility$,
    );

-    this.blockBrowserInjectionsByDomainEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.BlockBrowserInjectionsByDomain,
-    );
-
    this.showInlineMenuIdentities = await firstValueFrom(
      this.autofillSettingsService.showInlineMenuIdentities$,
    );
--- a/apps/browser/src/autofill/services/autofill.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -138,7 +138,7 @@ describe("AutofillService", () => {
      userNotificationsSettings,
      messageListener,
    );
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
+    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
    domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
    jest.spyOn(BrowserApi, "tabSendMessage");
  });
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -872,10 +872,7 @@ export default class MainBackground {

    this.userVerificationApiService = new UserVerificationApiService(this.apiService);

-    this.domainSettingsService = new DefaultDomainSettingsService(
-      this.stateProvider,
-      this.configService,
-    );
+    this.domainSettingsService = new DefaultDomainSettingsService(this.stateProvider);

    this.themeStateService = new DefaultThemeStateService(this.globalStateProvider);

--- a/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
+++ b/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
@@ -1,11 +1,10 @@
-import { mock, MockProxy } from "jest-mock-extended";
+import { mock } from "jest-mock-extended";
 import { of } from "rxjs";

 import {
  DomainSettingsService,
  DefaultDomainSettingsService,
 } from "@bitwarden/common/autofill/services/domain-settings.service";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -54,14 +53,11 @@ describe("ScriptInjectorService", () => {
  const mockUserId = Utils.newGuid() as UserId;
  const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
  const fakeStateProvider: FakeStateProvider = new FakeStateProvider(accountService);
-  let configService: MockProxy<ConfigService>;
  let domainSettingsService: DomainSettingsService;

  beforeEach(() => {
    jest.spyOn(BrowserApi, "getTab").mockImplementation(async () => tabMock);
-    configService = mock<ConfigService>();
-    configService.getFeatureFlag$.mockImplementation(() => of(false));
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
+    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);
    domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
    domainSettingsService.blockedInteractionsUris$ = of({});
    scriptInjectorService = new BrowserScriptInjectorService(
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -352,7 +352,7 @@ const safeProviders: SafeProvider[] = [
  safeProvider({
    provide: DomainSettingsService,
    useClass: DefaultDomainSettingsService,
-    deps: [StateProvider, ConfigService],
+    deps: [StateProvider],
  }),
  safeProvider({
    provide: AbstractStorageService,
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -532,10 +532,7 @@ export class ServiceContainer {
      this.authService,
    );

-    this.domainSettingsService = new DefaultDomainSettingsService(
-      this.stateProvider,
-      this.configService,
-    );
+    this.domainSettingsService = new DefaultDomainSettingsService(this.stateProvider);

    this.fileUploadService = new FileUploadService(this.logService, this.apiService);

--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -520,7 +520,7 @@ const safeProviders: SafeProvider[] = [
  safeProvider({
    provide: DomainSettingsService,
    useClass: DefaultDomainSettingsService,
-    deps: [StateProvider, ConfigService],
+    deps: [StateProvider],
  }),
  safeProvider({
    provide: CipherServiceAbstraction,
--- a/libs/common/src/autofill/services/domain-settings.service.spec.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.spec.ts
@@ -1,8 +1,6 @@
-import { MockProxy, mock } from "jest-mock-extended";
 import { firstValueFrom, of } from "rxjs";

 import { FakeStateProvider, FakeAccountService, mockAccountServiceWith } from "../../../spec";
-import { ConfigService } from "../../platform/abstractions/config/config.service";
 import { Utils } from "../../platform/misc/utils";
 import { UserId } from "../../types/guid";

@@ -10,7 +8,6 @@ import { DefaultDomainSettingsService, DomainSettingsService } from "./domain-se

 describe("DefaultDomainSettingsService", () => {
  let domainSettingsService: DomainSettingsService;
-  let configService: MockProxy<ConfigService>;
  const mockUserId = Utils.newGuid() as UserId;
  const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
  const fakeStateProvider: FakeStateProvider = new FakeStateProvider(accountService);
@@ -22,9 +19,7 @@ describe("DefaultDomainSettingsService", () => {
  ];

  beforeEach(() => {
-    configService = mock<ConfigService>();
-    configService.getFeatureFlag$.mockImplementation(() => of(false));
-    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
+    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider);

    jest.spyOn(domainSettingsService, "getUrlEquivalentDomains");
    domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
--- a/libs/common/src/autofill/services/domain-settings.service.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.ts
@@ -1,15 +1,13 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { map, Observable, switchMap, of } from "rxjs";
+import { map, Observable } from "rxjs";

-import { FeatureFlag } from "../../enums/feature-flag.enum";
 import {
  NeverDomains,
  EquivalentDomains,
  UriMatchStrategySetting,
  UriMatchStrategy,
 } from "../../models/domain/domain-service";
-import { ConfigService } from "../../platform/abstractions/config/config.service";
 import { Utils } from "../../platform/misc/utils";
 import {
  DOMAIN_SETTINGS_DISK,
@@ -111,10 +109,7 @@ export class DefaultDomainSettingsService implements DomainSettingsService {
  private defaultUriMatchStrategyState: ActiveUserState<UriMatchStrategySetting>;
  readonly defaultUriMatchStrategy$: Observable<UriMatchStrategySetting>;

-  constructor(
-    private stateProvider: StateProvider,
-    private configService: ConfigService,
-  ) {
+  constructor(private stateProvider: StateProvider) {
    this.showFaviconsState = this.stateProvider.getGlobal(SHOW_FAVICONS);
    this.showFavicons$ = this.showFaviconsState.state$.pipe(map((x) => x ?? true));

@@ -123,14 +118,8 @@ export class DefaultDomainSettingsService implements DomainSettingsService {

    // Needs to be global to prevent pre-login injections
    this.blockedInteractionsUrisState = this.stateProvider.getGlobal(BLOCKED_INTERACTIONS_URIS);
-
-    this.blockedInteractionsUris$ = this.configService
-      .getFeatureFlag$(FeatureFlag.BlockBrowserInjectionsByDomain)
-      .pipe(
-        switchMap((featureIsEnabled) =>
-          featureIsEnabled ? this.blockedInteractionsUrisState.state$ : of({} as NeverDomains),
-        ),
-        map((disabledUris) => (Object.keys(disabledUris).length ? disabledUris : {})),
+    this.blockedInteractionsUris$ = this.blockedInteractionsUrisState.state$.pipe(
+      map((x) => x ?? ({} as NeverDomains)),
    );

    this.equivalentDomainsState = this.stateProvider.getActive(EQUIVALENT_DOMAINS);
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -17,7 +17,6 @@ export enum FeatureFlag {
  PM14938_BrowserExtensionLoginApproval = "pm-14938-browser-extension-login-approvals",

  /* Autofill */
-  BlockBrowserInjectionsByDomain = "block-browser-injections-by-domain",
  EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill",
  NotificationRefresh = "notification-refresh",
  UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
@@ -76,7 +75,6 @@ export const DefaultFeatureFlagValue = {
  [FeatureFlag.CreateDefaultLocation]: FALSE,

  /* Autofill */
-  [FeatureFlag.BlockBrowserInjectionsByDomain]: FALSE,
  [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE,
  [FeatureFlag.NotificationRefresh]: FALSE,
  [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,