Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-2270] Renamed Fido2Key.userName to Fido2Key.userDisplayName #3172

Merged
merged 3 commits into from
Sep 1, 2023
Merged

[PM-2270] Renamed Fido2Key.userName to Fido2Key.userDisplayName #3172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcd6879
Renamed fido2key property username to userDisplayName
gbubemismith Aug 10, 2023
829c34d
Merge branch 'EC-598-beeep-properly-store-passkeys-in-bitwarden' into…
gbubemismith Aug 31, 2023
e225b17
Merge branch 'EC-598-beeep-properly-store-passkeys-in-bitwarden' into…
gbubemismith Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Api/Vault/Models/CipherFido2KeyModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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; }
Expand All @@ -78,7 +78,7 @@ public CipherLoginFido2KeyData ToCipherLoginFido2KeyData()
RpId = RpId,
RpName = RpName,
UserHandle = UserHandle,
UserName = UserName,
UserDisplayName = UserDisplayName,
Counter = Counter,
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Vault/Models/Request/CipherRequestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Vault/Models/Data/CipherFido2KeyData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
2 changes: 1 addition & 1 deletion src/Core/Vault/Models/Data/CipherLoginFido2KeyData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}