From 02a63d4a38605707d36a3124beeee62715156081 Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Wed, 18 Jun 2025 10:16:25 -0400
Subject: [PATCH] [PM-22725] [Defect]Title and Username are removed when
 editing Identity items (#15221)

* map sdk identity type back to null when undefined

* refactored views to have consistent pattern with other fromSdk methods
---
 .../common/src/vault/models/view/card.view.ts | 11 ++++++++-
 .../src/vault/models/view/identity.view.ts    | 23 ++++++++++++++++++-
 .../src/vault/models/view/login.view.ts       | 19 +++++++++------
 .../src/vault/models/view/secure-note.view.ts |  5 +++-
 .../src/vault/models/view/ssh-key.view.ts     | 10 ++++----
 5 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/libs/common/src/vault/models/view/card.view.ts b/libs/common/src/vault/models/view/card.view.ts
index 2adfbb39e89..dd7f5d6be57 100644
--- a/libs/common/src/vault/models/view/card.view.ts
+++ b/libs/common/src/vault/models/view/card.view.ts
@@ -157,6 +157,15 @@ export class CardView extends ItemView {
       return undefined;
     }
 
-    return Object.assign(new CardView(), obj);
+    const cardView = new CardView();
+
+    cardView.cardholderName = obj.cardholderName ?? null;
+    cardView.brand = obj.brand ?? null;
+    cardView.number = obj.number ?? null;
+    cardView.expMonth = obj.expMonth ?? null;
+    cardView.expYear = obj.expYear ?? null;
+    cardView.code = obj.code ?? null;
+
+    return cardView;
   }
 }
diff --git a/libs/common/src/vault/models/view/identity.view.ts b/libs/common/src/vault/models/view/identity.view.ts
index a75d11efd95..877940e4aea 100644
--- a/libs/common/src/vault/models/view/identity.view.ts
+++ b/libs/common/src/vault/models/view/identity.view.ts
@@ -169,6 +169,27 @@ export class IdentityView extends ItemView {
       return undefined;
     }
 
-    return Object.assign(new IdentityView(), obj);
+    const identityView = new IdentityView();
+
+    identityView.title = obj.title ?? null;
+    identityView.firstName = obj.firstName ?? null;
+    identityView.middleName = obj.middleName ?? null;
+    identityView.lastName = obj.lastName ?? null;
+    identityView.address1 = obj.address1 ?? null;
+    identityView.address2 = obj.address2 ?? null;
+    identityView.address3 = obj.address3 ?? null;
+    identityView.city = obj.city ?? null;
+    identityView.state = obj.state ?? null;
+    identityView.postalCode = obj.postalCode ?? null;
+    identityView.country = obj.country ?? null;
+    identityView.company = obj.company ?? null;
+    identityView.email = obj.email ?? null;
+    identityView.phone = obj.phone ?? null;
+    identityView.ssn = obj.ssn ?? null;
+    identityView.username = obj.username ?? null;
+    identityView.passportNumber = obj.passportNumber ?? null;
+    identityView.licenseNumber = obj.licenseNumber ?? null;
+
+    return identityView;
   }
 }
diff --git a/libs/common/src/vault/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts
index 6bdc23f42b1..c6e6ca001e4 100644
--- a/libs/common/src/vault/models/view/login.view.ts
+++ b/libs/common/src/vault/models/view/login.view.ts
@@ -116,13 +116,18 @@ export class LoginView extends ItemView {
       return undefined;
     }
 
-    const passwordRevisionDate =
-      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
-    const uris = obj.uris?.map((uri) => LoginUriView.fromSdkLoginUriView(uri)) || [];
+    const loginView = new LoginView();
 
-    return Object.assign(new LoginView(), obj, {
-      passwordRevisionDate,
-      uris,
-    });
+    loginView.username = obj.username ?? null;
+    loginView.password = obj.password ?? null;
+    loginView.passwordRevisionDate =
+      obj.passwordRevisionDate == null ? null : new Date(obj.passwordRevisionDate);
+    loginView.totp = obj.totp ?? null;
+    loginView.autofillOnPageLoad = obj.autofillOnPageLoad ?? null;
+    loginView.uris = obj.uris?.map((uri) => LoginUriView.fromSdkLoginUriView(uri)) || [];
+    // FIDO2 credentials are not decrypted here, they remain encrypted
+    loginView.fido2Credentials = null;
+
+    return loginView;
   }
 }
diff --git a/libs/common/src/vault/models/view/secure-note.view.ts b/libs/common/src/vault/models/view/secure-note.view.ts
index 075e4dfc520..8e7a6b4652d 100644
--- a/libs/common/src/vault/models/view/secure-note.view.ts
+++ b/libs/common/src/vault/models/view/secure-note.view.ts
@@ -37,6 +37,9 @@ export class SecureNoteView extends ItemView {
       return undefined;
     }
 
-    return Object.assign(new SecureNoteView(), obj);
+    const secureNoteView = new SecureNoteView();
+    secureNoteView.type = obj.type ?? null;
+
+    return secureNoteView;
   }
 }
diff --git a/libs/common/src/vault/models/view/ssh-key.view.ts b/libs/common/src/vault/models/view/ssh-key.view.ts
index a3d091e4c07..a83793678dc 100644
--- a/libs/common/src/vault/models/view/ssh-key.view.ts
+++ b/libs/common/src/vault/models/view/ssh-key.view.ts
@@ -55,10 +55,12 @@ export class SshKeyView extends ItemView {
       return undefined;
     }
 
-    const keyFingerprint = obj.fingerprint;
+    const sshKeyView = new SshKeyView();
 
-    return Object.assign(new SshKeyView(), obj, {
-      keyFingerprint,
-    });
+    sshKeyView.privateKey = obj.privateKey ?? null;
+    sshKeyView.publicKey = obj.publicKey ?? null;
+    sshKeyView.keyFingerprint = obj.fingerprint ?? null;
+
+    return sshKeyView;
   }
 }