update tests and cleanup

apps/browser/src/autofill/popup/settings/blocked-domains.component.ts

@@ -15,7 +15,6 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { NeverDomains } from "@bitwarden/common/models/domain/domain-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   ButtonModule,
@@ -26,6 +25,7 @@ import {
   LinkModule,
   SectionComponent,
   SectionHeaderComponent,
+  ToastService,
   TypographyModule,
 } from "@bitwarden/components";
 
@@ -59,7 +59,8 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
   ],
 })
 export class BlockedDomainsComponent implements AfterViewInit, OnDestroy {
-  @ViewChildren("uriInput") uriInputElements: QueryList<ElementRef<HTMLInputElement>>;
+  @ViewChildren("uriInput") uriInputElements: QueryList<ElementRef<HTMLInputElement>> =
+    new QueryList();
 
   dataIsPristine = true;
   isLoading = false;
@@ -73,7 +74,7 @@ export class BlockedDomainsComponent implements AfterViewInit, OnDestroy {
   constructor(
     private domainSettingsService: DomainSettingsService,
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
+    private toastService: ToastService,
   ) {}
 
   async ngAfterViewInit() {
@@ -150,11 +151,11 @@ export class BlockedDomainsComponent implements AfterViewInit, OnDestroy {
         const validatedHost = Utils.getHostname(uri);
 
         if (!validatedHost) {
-          this.platformUtilsService.showToast(
-            "error",
-            null,
-            this.i18nService.t("excludedDomainsInvalidDomain", uri),
-          );
+          this.toastService.showToast({
+            message: this.i18nService.t("excludedDomainsInvalidDomain", uri),
+            title: "",
+            variant: "error",
+          });
 
           // Don't reset via `handleStateUpdate` to allow existing input value correction
           this.isLoading = false;
@@ -176,21 +177,25 @@ export class BlockedDomainsComponent implements AfterViewInit, OnDestroy {
       if (stateIsUnchanged) {
         // Reset UI state directly
         const constructedNeverDomainsState = this.storedBlockedDomains.reduce(
-          (neverDomains, uri) => ({ ...neverDomains, [uri]: null }),
+          (neverDomains: NeverDomains, uri: string) => ({ ...neverDomains, [uri]: null }),
           {},
         );
         this.handleStateUpdate(constructedNeverDomainsState);
       } else {
         await this.domainSettingsService.setBlockedInteractionsUris(newBlockedDomainsSaveState);
       }
 
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("blockedDomainsSavedSuccess"),
-      );
+      this.toastService.showToast({
+        message: this.i18nService.t("blockedDomainsSavedSuccess"),
+        title: "",
+        variant: "success",
+      });
     } catch {
-      this.platformUtilsService.showToast("error", null, this.i18nService.t("unexpectedError"));
+      this.toastService.showToast({
+        message: this.i18nService.t("unexpectedError"),
+        title: "",
+        variant: "error",
+      });
 
       // Don't reset via `handleStateUpdate` to preserve input values
       this.isLoading = false;

apps/browser/src/autofill/popup/settings/excluded-domains.component.ts

@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
 import {
   QueryList,
@@ -17,7 +15,6 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { NeverDomains } from "@bitwarden/common/models/domain/domain-service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   ButtonModule,
@@ -28,6 +25,7 @@ import {
   LinkModule,
   SectionComponent,
   SectionHeaderComponent,
+  ToastService,
   TypographyModule,
 } from "@bitwarden/components";
 
@@ -62,7 +60,8 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
   ],
 })
 export class ExcludedDomainsComponent implements AfterViewInit, OnDestroy {
-  @ViewChildren("uriInput") uriInputElements: QueryList<ElementRef<HTMLInputElement>>;
+  @ViewChildren("uriInput") uriInputElements: QueryList<ElementRef<HTMLInputElement>> =
+    new QueryList();
 
   accountSwitcherEnabled = false;
   dataIsPristine = true;
@@ -77,7 +76,7 @@ export class ExcludedDomainsComponent implements AfterViewInit, OnDestroy {
   constructor(
     private domainSettingsService: DomainSettingsService,
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
+    private toastService: ToastService,
   ) {
     this.accountSwitcherEnabled = enableAccountSwitching();
   }
@@ -156,11 +155,11 @@ export class ExcludedDomainsComponent implements AfterViewInit, OnDestroy {
         const validatedHost = Utils.getHostname(uri);
 
         if (!validatedHost) {
-          this.platformUtilsService.showToast(
-            "error",
-            null,
-            this.i18nService.t("excludedDomainsInvalidDomain", uri),
-          );
+          this.toastService.showToast({
+            message: this.i18nService.t("excludedDomainsInvalidDomain", uri),
+            title: "",
+            variant: "error",
+          });
 
           // Don't reset via `handleStateUpdate` to allow existing input value correction
           this.isLoading = false;
@@ -182,21 +181,25 @@ export class ExcludedDomainsComponent implements AfterViewInit, OnDestroy {
       if (stateIsUnchanged) {
         // Reset UI state directly
         const constructedNeverDomainsState = this.storedExcludedDomains.reduce(
-          (neverDomains, uri) => ({ ...neverDomains, [uri]: null }),
+          (neverDomains: NeverDomains, uri: string) => ({ ...neverDomains, [uri]: null }),
           {},
         );
         this.handleStateUpdate(constructedNeverDomainsState);
       } else {
         await this.domainSettingsService.setNeverDomains(newExcludedDomainsSaveState);
       }
 
-      this.platformUtilsService.showToast(
-        "success",
-        null,
-        this.i18nService.t("excludedDomainsSavedSuccess"),
-      );
+      this.toastService.showToast({
+        message: this.i18nService.t("excludedDomainsSavedSuccess"),
+        title: "",
+        variant: "success",
+      });
     } catch {
-      this.platformUtilsService.showToast("error", null, this.i18nService.t("unexpectedError"));
+      this.toastService.showToast({
+        message: this.i18nService.t("unexpectedError"),
+        title: "",
+        variant: "error",
+      });
 
       // Don't reset via `handleStateUpdate` to preserve input values
       this.isLoading = false;

apps/browser/src/autofill/services/autofill.service.spec.ts

@@ -98,6 +98,8 @@ describe("AutofillService", () => {
   let messageListener: MockProxy<MessageListener>;
 
   beforeEach(() => {
+    configService = mock<ConfigService>();
+    configService.getFeatureFlag$.mockImplementation(() => of(false));
     scriptInjectorService = new BrowserScriptInjectorService(
       domainSettingsService,
       platformUtilsService,
@@ -110,10 +112,10 @@ describe("AutofillService", () => {
     autofillSettingsService.inlineMenuVisibility$ = inlineMenuVisibilityMock$;
     autofillSettingsService.showInlineMenuCards$ = showInlineMenuCardsMock$;
     autofillSettingsService.showInlineMenuIdentities$ = showInlineMenuIdentitiesMock$;
+    autofillSettingsService.autofillOnPageLoad$ = of(true);
     activeAccountStatusMock$ = new BehaviorSubject(AuthenticationStatus.Unlocked);
     authService = mock<AuthService>();
     authService.activeAccountStatus$ = activeAccountStatusMock$;
-    configService = mock<ConfigService>();
     messageListener = mock<MessageListener>();
     enableChangedPasswordPromptMock$ = new BehaviorSubject(true);
     enableAddedLoginPromptMock$ = new BehaviorSubject(true);
@@ -389,6 +391,7 @@ describe("AutofillService", () => {
       );
       tabMock = createChromeTabMock();
       sender = { tab: tabMock, frameId: 1 };
+      jest.spyOn(BrowserApi, "getTab").mockImplementation(async () => tabMock);
       jest.spyOn(BrowserApi, "executeScriptInTab").mockImplementation();
       jest
         .spyOn(autofillService, "getInlineMenuVisibility")

apps/browser/src/platform/services/browser-script-injector.service.spec.ts

@@ -1,9 +1,22 @@
-import { mock } from "jest-mock-extended";
+import { mock, MockProxy } from "jest-mock-extended";
+import { of } from "rxjs";
 
-import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
+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";
+import {
+  FakeStateProvider,
+  FakeAccountService,
+  mockAccountServiceWith,
+} from "@bitwarden/common/spec";
+import { UserId } from "@bitwarden/common/types/guid";
 
+import { createChromeTabMock } from "../../autofill/spec/autofill-mocks";
 import { BrowserApi } from "../browser/browser-api";
 
 import {
@@ -12,8 +25,19 @@ import {
 } from "./abstractions/script-injector.service";
 import { BrowserScriptInjectorService } from "./browser-script-injector.service";
 
+const mockEquivalentDomains = [
+  ["example.com", "exampleapp.com", "example.co.uk", "ejemplo.es"],
+  ["bitwarden.com", "bitwarden.co.uk", "sm-bitwarden.com"],
+  ["example.co.uk", "exampleapp.co.uk"],
+];
+
 describe("ScriptInjectorService", () => {
   const tabId = 1;
+  const tabMock = createChromeTabMock({ id: tabId });
+  const mockBlockedURI = new URL(tabMock.url);
+  jest.spyOn(BrowserApi, "executeScriptInTab").mockImplementation();
+  jest.spyOn(BrowserApi, "isManifestVersion");
+
   const combinedManifestVersionFile = "content/autofill-init.js";
   const mv2SpecificFile = "content/autofill-init-mv2.js";
   const mv2Details = { file: mv2SpecificFile };
@@ -23,14 +47,24 @@ describe("ScriptInjectorService", () => {
     runAt: "document_start",
   };
   const manifestVersionSpy = jest.spyOn(BrowserApi, "manifestVersion", "get");
+
   let scriptInjectorService: BrowserScriptInjectorService;
-  jest.spyOn(BrowserApi, "executeScriptInTab").mockImplementation();
-  jest.spyOn(BrowserApi, "isManifestVersion");
-  const domainSettingsService = mock<DomainSettingsService>();
-  const platformUtilsService = mock<PlatformUtilsService>();
   const logService = mock<LogService>();
+  const platformUtilsService = mock<PlatformUtilsService>();
+  const mockUserId = Utils.newGuid() as UserId;
+  const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
+  const fakeStateProvider: FakeStateProvider = new FakeStateProvider(accountService);
+  let configService: MockProxy<ConfigService>;
+  let domainSettingsService: DomainSettingsService;
+  const expectedBlockedURIError = new Error("This URI of this tab is on the blocked domains list.");
 
   beforeEach(() => {
+    jest.spyOn(BrowserApi, "getTab").mockImplementation(async () => tabMock);
+    configService = mock<ConfigService>();
+    configService.getFeatureFlag$.mockImplementation(() => of(false));
+    domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
+    domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
+    domainSettingsService.blockedInteractionsUris$ = of(null);
     scriptInjectorService = new BrowserScriptInjectorService(
       domainSettingsService,
       platformUtilsService,
@@ -77,6 +111,76 @@ describe("ScriptInjectorService", () => {
           { world: "ISOLATED" },
         );
       });
+
+      it("skips injecting the script in manifest v3 when the tab domain is a blocked domain", async () => {
+        domainSettingsService.blockedInteractionsUris$ = of({ [mockBlockedURI.host]: null });
+        manifestVersionSpy.mockReturnValue(3);
+
+        await expect(
+          scriptInjectorService.inject({
+            tabId,
+            injectDetails: {
+              file: combinedManifestVersionFile,
+              frame: 10,
+              ...sharedInjectDetails,
+            },
+          }),
+        ).rejects.toThrow(expectedBlockedURIError);
+      });
+
+      it("skips injecting the script in manifest v2 when the tab domain is a blocked domain", async () => {
+        domainSettingsService.blockedInteractionsUris$ = of({ [mockBlockedURI.host]: null });
+        manifestVersionSpy.mockReturnValue(2);
+
+        await expect(
+          scriptInjectorService.inject({
+            tabId,
+            injectDetails: {
+              file: combinedManifestVersionFile,
+              frame: "all_frames",
+              ...sharedInjectDetails,
+            },
+          }),
+        ).rejects.toThrow(expectedBlockedURIError);
+      });
+
+      it("injects the script in manifest v2 when given combined injection details", async () => {
+        manifestVersionSpy.mockReturnValue(2);
+
+        await scriptInjectorService.inject({
+          tabId,
+          injectDetails: {
+            file: combinedManifestVersionFile,
+            frame: "all_frames",
+            ...sharedInjectDetails,
+          },
+        });
+
+        expect(BrowserApi.executeScriptInTab).toHaveBeenCalledWith(tabId, {
+          ...sharedInjectDetails,
+          allFrames: true,
+          file: combinedManifestVersionFile,
+        });
+      });
+
+      it("injects the script in manifest v3 when given combined injection details", async () => {
+        manifestVersionSpy.mockReturnValue(3);
+
+        await scriptInjectorService.inject({
+          tabId,
+          injectDetails: {
+            file: combinedManifestVersionFile,
+            frame: 10,
+            ...sharedInjectDetails,
+          },
+        });
+
+        expect(BrowserApi.executeScriptInTab).toHaveBeenCalledWith(
+          tabId,
+          { ...sharedInjectDetails, frameId: 10, file: combinedManifestVersionFile },
+          { world: "ISOLATED" },
+        );
+      });
     });
 
     describe("injection of mv2 specific details", () => {