Revert "[PM-21024] Use Server for Password Change URLs (#14912)" (#16322)

This reverts commit fcc2bc96d1.
2025-12-10 13:23:34 +00:00 · 2025-09-06 10:57:55 -05:00
parent 92b92488d9
commit 0040c857ec
16 changed files with 175 additions and 200 deletions
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -1763,8 +1763,14 @@
  "popupU2fCloseMessage": {
    "message": "This browser cannot process U2F requests in this popup window. Do you want to open this popup in a new window so that you can log in using U2F?"
  },
-  "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+  "enableFavicon": {
+    "message": "Show website icons"
+  },
+  "faviconDesc": {
+    "message": "Show a recognizable image next to each login."
+  },
+  "faviconDescAlt": {
+    "message": "Show a recognizable image next to each login. Applies to all logged in accounts."
  },
  "enableBadgeCounter": {
    "message": "Show badge counter"
@@ -4373,7 +4379,7 @@
  },
   "uriMatchDefaultStrategyHint": {
    "message": "URI match detection is how Bitwarden identifies autofill suggestions.",
-    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."
+    "description": "Explains to the user that URI match detection determines how Bitwarden suggests autofill options, and clarifies that this default strategy applies when no specific match detection is set for a login item."  
  },
   "regExAdvancedOptionWarning": {
    "message": "\"Regular expression\" is an advanced option with increased risk of exposing credentials.",
@@ -5578,12 +5584,6 @@
    "message": "Easily create strong and unique passwords by clicking on the Generate password button to help you keep your logins secure.",
    "description": "Aria label for the body content of the generator nudge"
  },
-  "aboutThisSetting": {
-    "message": "About this setting"
-  },
-  "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
-  },
  "noPermissionsViewPage": {
    "message": "You do not have permissions to view this page. Try logging in with a different account."
  },
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.html
@@ -45,10 +45,7 @@
    <bit-card>
      <bit-form-control>
        <input bitCheckbox formControlName="enableFavicon" type="checkbox" />
-        <bit-label>
-          {{ "showIconsChangePasswordUrls" | i18n }}
-          <vault-permit-cipher-details-popover></vault-permit-cipher-details-popover>
-        </bit-label>
+        <bit-label>{{ "enableFavicon" | i18n }}</bit-label>
      </bit-form-control>
      <bit-form-control>
        <input bitCheckbox formControlName="showQuickCopyActions" type="checkbox" />
--- a/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/appearance-v2.component.ts
@@ -23,7 +23,6 @@ import {
  Option,
  SelectModule,
 } from "@bitwarden/components";
-import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";

 import { PopupWidthOption } from "../../../platform/browser/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
@@ -47,7 +46,6 @@ import { VaultPopupCopyButtonsService } from "../services/vault-popup-copy-butto
    ReactiveFormsModule,
    CheckboxModule,
    BadgeModule,
-    PermitCipherDetailsPopoverComponent,
  ],
 })
 export class AppearanceV2Component implements OnInit {
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -162,15 +162,14 @@
                    <input
                      id="enableFavicons"
                      type="checkbox"
+                      aria-describedby="enableFaviconsHelp"
                      formControlName="enableFavicons"
                      (change)="saveFavicons()"
                    />
-                    {{ "showIconsChangePasswordUrls" | i18n }}
+                    {{ "enableFavicon" | i18n }}
                  </label>
-                  <div class="tw-inline-block tw-ml-2">
-                    <vault-permit-cipher-details-popover></vault-permit-cipher-details-popover>
-                  </div>
                </div>
+                <small id="enableFaviconsHelp" class="help-block">{{ "faviconDesc" | i18n }}</small>
              </div>
            </ng-container>
          </div>
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -54,7 +54,6 @@ import {
  BadgeComponent,
 } from "@bitwarden/components";
 import { KeyService, BiometricStateService, BiometricsStatus } from "@bitwarden/key-management";
-import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";

 import { SetPinComponent } from "../../auth/components/set-pin.component";
 import { SshAgentPromptType } from "../../autofill/models/ssh-agent-setting";
@@ -86,7 +85,6 @@ import { NativeMessagingManifestService } from "../services/native-messaging-man
    SelectModule,
    TypographyModule,
    VaultTimeoutInputComponent,
-    PermitCipherDetailsPopoverComponent,
  ],
 })
 export class SettingsComponent implements OnInit, OnDestroy {
--- a/apps/desktop/src/app/app.module.ts
+++ b/apps/desktop/src/app/app.module.ts
@@ -31,6 +31,7 @@ import { SharedModule } from "./shared/shared.module";
@NgModule({
  imports: [
    BrowserAnimationsModule,
+
    SharedModule,
    AppRoutingModule,
    VaultFilterModule,
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -1305,8 +1305,11 @@
    "message": "Automatically clear copied values from your clipboard.",
    "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
  },
-  "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+  "enableFavicon": {
+    "message": "Show website icons"
+  },
+  "faviconDesc": {
+    "message": "Show a recognizable image next to each login."
  },
  "enableMinToTray": {
    "message": "Minimize to tray icon"
@@ -3931,12 +3934,6 @@
    "description": "Two part message",
    "example": "Store your keys and connect with the SSH agent for fast, encrypted authentication. Learn more about SSH agent"
  },
-  "aboutThisSetting": {
-    "message": "About this setting"
-  },
-  "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
-  },
  "assignToCollections": {
    "message": "Assign to collections"
  },
--- a/apps/web/src/app/settings/preferences.component.html
+++ b/apps/web/src/app/settings/preferences.component.html
@@ -67,17 +67,23 @@
      </bit-select>
      <bit-hint>{{ "languageDesc" | i18n }}</bit-hint>
    </bit-form-field>
-    <div class="tw-flex tw-items-start tw-gap-1.5">
-      <bit-form-control>
-        <input type="checkbox" bitCheckbox formControlName="enableFavicons" />
-        <bit-label>
-          {{ "showIconsChangePasswordUrls" | i18n }}
-        </bit-label>
-      </bit-form-control>
-      <div class="-tw-mt-0.5">
-        <vault-permit-cipher-details-popover></vault-permit-cipher-details-popover>
-      </div>
-    </div>
+    <bit-form-control>
+      <input type="checkbox" bitCheckbox formControlName="enableFavicons" />
+      <bit-label
+        >{{ "enableFavicon" | i18n }}
+        <a
+          bitLink
+          href="https://bitwarden.com/help/website-icons/"
+          target="_blank"
+          rel="noreferrer"
+          appA11yTitle="{{ 'learnMoreAboutWebsiteIcons' | i18n }}"
+          slot="end"
+        >
+          <i class="bwi bwi-question-circle" aria-hidden="true"></i>
+        </a>
+      </bit-label>
+      <bit-hint>{{ "faviconDesc" | i18n }}</bit-hint>
+    </bit-form-control>
    <bit-form-field>
      <bit-label>{{ "theme" | i18n }}</bit-label>
      <bit-select formControlName="theme" id="theme">
--- a/apps/web/src/app/settings/preferences.component.ts
+++ b/apps/web/src/app/settings/preferences.component.ts
@@ -34,7 +34,6 @@ import { Theme, ThemeTypes } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { DialogService } from "@bitwarden/components";
-import { PermitCipherDetailsPopoverComponent } from "@bitwarden/vault";

 import { HeaderModule } from "../layouts/header/header.module";
 import { SharedModule } from "../shared";
@@ -42,12 +41,7 @@ import { SharedModule } from "../shared";
@Component({
  selector: "app-preferences",
  templateUrl: "preferences.component.html",
-  imports: [
-    SharedModule,
-    HeaderModule,
-    VaultTimeoutInputComponent,
-    PermitCipherDetailsPopoverComponent,
-  ],
+  imports: [SharedModule, HeaderModule, VaultTimeoutInputComponent],
 })
 export class PreferencesComponent implements OnInit, OnDestroy {
  // For use in template
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2115,8 +2115,11 @@
  "languageDesc": {
    "message": "Change the language used by the web vault."
  },
-  "showIconsChangePasswordUrls": {
-    "message": "Show website icons and retrieve change password URLs"
+  "enableFavicon": {
+    "message": "Show website icons"
+  },
+  "faviconDesc": {
+    "message": "Show a recognizable image next to each login."
  },
  "default": {
    "message": "Default"
@@ -11072,12 +11075,6 @@
    "message": "Billing address required to add credit.",
    "description": "Error message shown when trying to add credit to a trialing organization without a billing address."
  },
-  "aboutThisSetting": {
-    "message": "About this setting"
-  },
-  "permitCipherDetailsDescription": {
-    "message": "Bitwarden will use saved login URIs to identify which icon or change password URL should be used to improve your experience. No information is collected or saved when you use this service."
-  },
  "billingAddress": {
    "message": "Billing address"
  },