From ed77f270c5a1e7c2d019a98f64ce69195c70ef5f Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Fri, 1 Sep 2023 11:11:28 -0400
Subject: [PATCH] Renamed fido2key property username to userDisplayName (#3172)

---
 src/Api/Vault/Models/CipherFido2KeyModel.cs           | 8 ++++----
 src/Api/Vault/Models/Request/CipherRequestModel.cs    | 2 +-
 src/Core/Vault/Models/Data/CipherFido2KeyData.cs      | 2 +-
 src/Core/Vault/Models/Data/CipherLoginFido2KeyData.cs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Api/Vault/Models/CipherFido2KeyModel.cs b/src/Api/Vault/Models/CipherFido2KeyModel.cs
index 95b8c3fdd41b..d4c031856e39 100644
--- a/src/Api/Vault/Models/CipherFido2KeyModel.cs
+++ b/src/Api/Vault/Models/CipherFido2KeyModel.cs
@@ -17,7 +17,7 @@ public CipherFido2KeyModel(CipherFido2KeyData data)
         RpId = data.RpId;
         RpName = data.RpName;
         UserHandle = data.UserHandle;
-        UserName = data.UserName;
+        UserDisplayName = data.UserDisplayName;
         Counter = data.Counter;
     }
 
@@ -31,7 +31,7 @@ public CipherFido2KeyModel(CipherLoginFido2KeyData data)
         RpId = data.RpId;
         RpName = data.RpName;
         UserHandle = data.UserHandle;
-        UserName = data.UserName;
+        UserDisplayName = data.UserDisplayName;
         Counter = data.Counter;
     }
 
@@ -61,7 +61,7 @@ public CipherFido2KeyModel(CipherLoginFido2KeyData data)
     public string UserHandle { get; set; }
     [EncryptedString]
     [EncryptedStringLength(1000)]
-    public string UserName { get; set; }
+    public string UserDisplayName { get; set; }
     [EncryptedString]
     [EncryptedStringLength(1000)]
     public string Counter { get; set; }
@@ -78,7 +78,7 @@ public CipherLoginFido2KeyData ToCipherLoginFido2KeyData()
             RpId = RpId,
             RpName = RpName,
             UserHandle = UserHandle,
-            UserName = UserName,
+            UserDisplayName = UserDisplayName,
             Counter = Counter,
         };
     }
diff --git a/src/Api/Vault/Models/Request/CipherRequestModel.cs b/src/Api/Vault/Models/Request/CipherRequestModel.cs
index 358125520332..4c47dacfb619 100644
--- a/src/Api/Vault/Models/Request/CipherRequestModel.cs
+++ b/src/Api/Vault/Models/Request/CipherRequestModel.cs
@@ -250,7 +250,7 @@ private CipherFido2KeyData ToCipherFido2KeyData()
             RpId = Fido2Key.RpId,
             RpName = Fido2Key.RpName,
             UserHandle = Fido2Key.UserHandle,
-            UserName = Fido2Key.UserName,
+            UserDisplayName = Fido2Key.UserDisplayName,
             Counter = Fido2Key.Counter
         };
     }
diff --git a/src/Core/Vault/Models/Data/CipherFido2KeyData.cs b/src/Core/Vault/Models/Data/CipherFido2KeyData.cs
index c7f5fb3df1a8..73a16470d3cb 100644
--- a/src/Core/Vault/Models/Data/CipherFido2KeyData.cs
+++ b/src/Core/Vault/Models/Data/CipherFido2KeyData.cs
@@ -12,6 +12,6 @@ public CipherFido2KeyData() { }
     public string RpId { get; set; }
     public string RpName { get; set; }
     public string UserHandle { get; set; }
-    public string UserName { get; set; }
+    public string UserDisplayName { get; set; }
     public string Counter { get; set; }
 }
diff --git a/src/Core/Vault/Models/Data/CipherLoginFido2KeyData.cs b/src/Core/Vault/Models/Data/CipherLoginFido2KeyData.cs
index b8ff1ece3783..2b7a13c407d1 100644
--- a/src/Core/Vault/Models/Data/CipherLoginFido2KeyData.cs
+++ b/src/Core/Vault/Models/Data/CipherLoginFido2KeyData.cs
@@ -12,6 +12,6 @@ public CipherLoginFido2KeyData() { }
     public string RpId { get; set; }
     public string RpName { get; set; }
     public string UserHandle { get; set; }
-    public string UserName { get; set; }
+    public string UserDisplayName { get; set; }
     public string Counter { get; set; }
 }