From 2f8d2ac3cbf1993105cd53d9f502606748ff0625 Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@classynemesis.com>
Date: Fri, 15 Nov 2024 17:09:46 -0500
Subject: [PATCH] add dismissable banner to the vault view when the active
 autofill tab is on the blocked domains list

---
 apps/browser/src/_locales/en/messages.json    |  6 +++
 .../components/vault/vault-v2.component.html  |  9 ++++
 .../components/vault/vault-v2.component.ts    | 51 ++++++++++++++++++-
 .../src/models/domain/domain-service.ts       |  2 +-
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 4ec1a97abbc..85937b63304 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -2339,6 +2339,12 @@
   "blockedDomainsDesc": {
     "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect."
   },
+  "autofillBlockedNotice": {
+    "message": "Autofill is blocked for this website. Review or change this in settings."
+  },
+  "autofillBlockedTooltip": {
+    "message": "Autofill is blocked on this website. Review in settings."
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {
diff --git a/apps/browser/src/vault/popup/components/vault/vault-v2.component.html b/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
index 4798ddf4dfb..651a976ff2b 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault/vault-v2.component.html
@@ -22,6 +22,15 @@
     </bit-no-items>
   </div>
 
+  <bit-banner
+    *ngIf="vaultState !== VaultStateEnum.Empty && showScriptInjectionIsBlockedBanner"
+    id="domain-script-injection-blocked-banner"
+    bannerType="info"
+    (onClose)="handleScriptInjectionIsBlockedBannerDismiss()"
+  >
+    {{ "autofillBlockedNotice" | i18n }}
+  </bit-banner>
+
   <!-- Show search & filters outside of the scroll area of the page -->
   <ng-container
     slot="above-scroll-area"
diff --git a/apps/browser/src/vault/popup/components/vault/vault-v2.component.ts b/apps/browser/src/vault/popup/components/vault/vault-v2.component.ts
index 68aa40cbf62..71905a3c87f 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/vault-v2.component.ts
@@ -3,18 +3,20 @@ import { CommonModule } from "@angular/common";
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { RouterLink } from "@angular/router";
-import { combineLatest, Observable, shareReplay, switchMap } from "rxjs";
+import { combineLatest, firstValueFrom, Observable, shareReplay, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
-import { ButtonModule, Icons, NoItemsModule } from "@bitwarden/components";
+import { BannerModule, ButtonModule, Icons, NoItemsModule } from "@bitwarden/components";
 import { VaultIcons } from "@bitwarden/vault";
 
 import { CurrentAccountComponent } from "../../../../auth/popup/account-switching/current-account.component";
 import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
+import { VaultPopupAutofillService } from "../../services/vault-popup-autofill.service";
 import { VaultPopupItemsService } from "../../services/vault-popup-items.service";
 import { VaultPopupListFiltersService } from "../../services/vault-popup-list-filters.service";
 import { VaultUiOnboardingService } from "../../services/vault-ui-onboarding.service";
@@ -45,6 +47,7 @@ enum VaultState {
     CommonModule,
     AutofillVaultListItemsComponent,
     VaultListItemsContainerComponent,
+    BannerModule,
     ButtonModule,
     RouterLink,
     NewItemDropdownV2Component,
@@ -59,6 +62,9 @@ export class VaultV2Component implements OnInit, OnDestroy {
   protected favoriteCiphers$ = this.vaultPopupItemsService.favoriteCiphers$;
   protected remainingCiphers$ = this.vaultPopupItemsService.remainingCiphers$;
   protected loading$ = this.vaultPopupItemsService.loading$;
+  protected scriptInjectionIsBlocked = false;
+  protected showScriptInjectionIsBlockedBanner = false;
+  protected autofillTabHostname: string = null;
 
   protected newItemItemValues$: Observable<NewItemInitialValues> =
     this.vaultPopupListFiltersService.filters$.pipe(
@@ -86,6 +92,8 @@ export class VaultV2Component implements OnInit, OnDestroy {
   constructor(
     private vaultPopupItemsService: VaultPopupItemsService,
     private vaultPopupListFiltersService: VaultPopupListFiltersService,
+    private domainSettingsService: DomainSettingsService,
+    private vaultPopupAutofillService: VaultPopupAutofillService,
     private vaultUiOnboardingService: VaultUiOnboardingService,
   ) {
     combineLatest([
@@ -110,6 +118,27 @@ export class VaultV2Component implements OnInit, OnDestroy {
             this.vaultState = null;
         }
       });
+
+    combineLatest([
+      this.domainSettingsService.blockedInteractionsUris$,
+      this.vaultPopupAutofillService.currentAutofillTab$,
+    ])
+      .pipe(takeUntilDestroyed())
+      .subscribe(([blockedInteractionsUris, currentAutofillTab]) => {
+        if (blockedInteractionsUris && currentAutofillTab?.url?.length) {
+          const autofillTabURL = new URL(currentAutofillTab.url);
+          this.autofillTabHostname = autofillTabURL.hostname;
+          const autofillTabIsBlocked = Object.keys(blockedInteractionsUris).includes(
+            autofillTabURL.hostname,
+          );
+
+          this.scriptInjectionIsBlocked = autofillTabIsBlocked;
+
+          this.showScriptInjectionIsBlockedBanner =
+            autofillTabIsBlocked &&
+            !blockedInteractionsUris[autofillTabURL.hostname]?.bannerIsDismissed;
+        }
+      });
   }
 
   async ngOnInit() {
@@ -117,4 +146,22 @@ export class VaultV2Component implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {}
+
+  handleScriptInjectionIsBlockedBannerDismiss() {
+    firstValueFrom(this.domainSettingsService.blockedInteractionsUris$)
+      .then((blockedURIs) => {
+        this.showScriptInjectionIsBlockedBanner = false;
+        this.domainSettingsService
+          .setBlockedInteractionsUris({
+            ...blockedURIs,
+            [this.autofillTabHostname]: { bannerIsDismissed: true },
+          })
+          .catch(() => {
+            /* no-op */
+          });
+      })
+      .catch(() => {
+        /* no-op */
+      });
+  }
 }
diff --git a/libs/common/src/models/domain/domain-service.ts b/libs/common/src/models/domain/domain-service.ts
index 9ff53cc8787..a6b5ecfdaac 100644
--- a/libs/common/src/models/domain/domain-service.ts
+++ b/libs/common/src/models/domain/domain-service.ts
@@ -21,5 +21,5 @@ export const UriMatchStrategy = {
 export type UriMatchStrategySetting = (typeof UriMatchStrategy)[keyof typeof UriMatchStrategy];
 
 // using uniqueness properties of object shape over Set for ease of state storability
-export type NeverDomains = { [id: string]: null };
+export type NeverDomains = { [id: string]: null | { bannerIsDismissed?: boolean } };
 export type EquivalentDomains = string[][];