From e063c3d05110b57bc4ca3a7d575872acd0d0203a Mon Sep 17 00:00:00 2001
From: --global <>
Date: Tue, 26 Nov 2024 17:23:23 -0500
Subject: [PATCH 1/4] Changes to disabled user from seeing password that they
 shouldn't see or edit easily.

---
 .../custom-fields/custom-fields.component.ts  | 25 ++++++++++++-------
 .../custom-fields-v2.component.html           |  3 +++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index 1aeb9e0da08..f3d1b4a1b0d 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -154,15 +154,22 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
         value = field.value === "true" ? true : false;
       }
 
-      this.fields.push(
-        this.formBuilder.group<CustomField>({
-          type: field.type,
-          name: field.name,
-          value: value,
-          linkedId: field.linkedId,
-          newField: false,
-        }),
-      );
+      const formGroup = this.formBuilder.group<CustomField>({
+        type: field.type,
+        name: field.name,
+        value: value,
+        linkedId: field.linkedId,
+        newField: false,
+      });
+
+      if (
+        field.type === FieldType.Hidden &&
+        !this.cipherFormContainer.originalCipherView.viewPassword
+      ) {
+        formGroup.get("value")?.disable();
+      }
+
+      this.fields.push(formGroup);
     });
 
     // Disable the form if in partial-edit mode
diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
index b82b2e7a8a3..e2516018d3c 100644
--- a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
+++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
@@ -28,6 +28,7 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
         <input
           readonly
           bitInput
+          [disabled]="!this.cipher.viewPassword"
           type="password"
           [value]="field.value"
           aria-readonly="true"
@@ -36,6 +37,7 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
         <button
           bitSuffix
           type="button"
+          [disabled]="!this.cipher.viewPassword"
           bitIconButton
           bitPasswordInputToggle
           (toggledChange)="logHiddenEvent($event)"
@@ -43,6 +45,7 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
         <button
           bitIconButton="bwi-clone"
           bitSuffix
+          [disabled]="!this.cipher.viewPassword"
           type="button"
           [appCopyClick]="field.value"
           showToast

From 4525dbcab7d42af9f9a91bdd7313cfc4748506b0 Mon Sep 17 00:00:00 2001
From: --global <>
Date: Wed, 18 Dec 2024 14:29:13 -0500
Subject: [PATCH 2/4] Fixing defects on PM-13938

---
 .../components/custom-fields/custom-fields.component.html    | 2 +-
 .../custom-fields/custom-fields-v2.component.html            | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index 63941c6a467..fab3c8f1ab1 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -46,7 +46,7 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
             bitSuffix
             bitPasswordInputToggle
             data-testid="visibility-for-custom-hidden-field"
-            [disabled]="!canViewPasswords(i)"
+            *ngIf="canViewPasswords(i)"
             (toggledChange)="logHiddenEvent($event)"
           ></button>
         </bit-form-field>
diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
index 79099d08c2c..591ed2e53d8 100644
--- a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
+++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
@@ -28,7 +28,6 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
         <input
           readonly
           bitInput
-          [disabled]="!this.cipher.viewPassword"
           type="password"
           [value]="field.value"
           aria-readonly="true"
@@ -37,7 +36,7 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
         <button
           bitSuffix
           type="button"
-          [disabled]="!this.cipher.viewPassword"
+          *ngIf="this.cipher.viewPassword"
           bitIconButton
           bitPasswordInputToggle
           (toggledChange)="logHiddenEvent($event)"
@@ -45,7 +44,7 @@ <h2 bitTypography="h6">{{ "customFields" | i18n }}</h2>
         <button
           bitIconButton="bwi-clone"
           bitSuffix
-          [disabled]="!this.cipher.viewPassword"
+          *ngIf="this.cipher.viewPassword"
           type="button"
           [appCopyClick]="field.value"
           showToast

From 6c61320d54571c01c613a82358a501d8ec26075c Mon Sep 17 00:00:00 2001
From: --global <>
Date: Wed, 18 Dec 2024 15:11:25 -0500
Subject: [PATCH 3/4] undoing unecessary change

---
 .../custom-fields/custom-fields.component.ts  | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
index 88bdc72f028..d723bad5751 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.ts
@@ -156,22 +156,15 @@ export class CustomFieldsComponent implements OnInit, AfterViewInit {
         value = field.value === "true" ? true : false;
       }
 
-      const formGroup = this.formBuilder.group<CustomField>({
-        type: field.type,
-        name: field.name,
-        value: value,
-        linkedId: field.linkedId,
-        newField: false,
-      });
-
-      if (
-        field.type === FieldType.Hidden &&
-        !this.cipherFormContainer.originalCipherView.viewPassword
-      ) {
-        formGroup.get("value")?.disable();
-      }
-
-      this.fields.push(formGroup);
+      this.fields.push(
+        this.formBuilder.group<CustomField>({
+          type: field.type,
+          name: field.name,
+          value: value,
+          linkedId: field.linkedId,
+          newField: false,
+        }),
+      );
     });
 
     // Disable the form if in partial-edit mode

From 30bc31e1286544f076091934fb598ba85c9ebc0a Mon Sep 17 00:00:00 2001
From: --global <>
Date: Thu, 19 Dec 2024 16:31:41 -0500
Subject: [PATCH 4/4] Updating tests

---
 .../custom-fields.component.spec.ts             | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
index 0c0fa1b4184..aae1099caf2 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.spec.ts
@@ -111,7 +111,7 @@ describe("CustomFieldsComponent", () => {
       ]);
     });
 
-    it("forbids a user to view hidden fields when the cipher `viewPassword` is false", () => {
+    it("when `viewPassword` is false the user cannot see the view toggle option", () => {
       originalCipherView.viewPassword = false;
       originalCipherView.fields = mockFieldViews;
 
@@ -121,7 +121,20 @@ describe("CustomFieldsComponent", () => {
 
       const button = fixture.debugElement.query(By.directive(BitPasswordInputToggleDirective));
 
-      expect(button.nativeElement.disabled).toBe(true);
+      expect(button).toBeFalsy();
+    });
+
+    it("when `viewPassword` is true the user can see the view toggle option", () => {
+      originalCipherView.viewPassword = true;
+      originalCipherView.fields = mockFieldViews;
+
+      component.ngOnInit();
+
+      fixture.detectChanges();
+
+      const button = fixture.debugElement.query(By.directive(BitPasswordInputToggleDirective));
+
+      expect(button).toBeTruthy();
     });
 
     describe("linkedFieldOptions", () => {