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-1859] Renamed NonDiscoverableId to credentialId #3198

Merged
merged 3 commits into from
Sep 7, 2023
Merged

[PM-1859] Renamed NonDiscoverableId to credentialId #3198

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
776a3a1
PM-1859 Refactor to credentialId
LRNcardozoWDF Aug 15, 2023
925892c
PM-1859 Removed unnecessary import
LRNcardozoWDF Aug 15, 2023
2cf5917
Merge branch 'EC-598-beeep-properly-store-passkeys-in-bitwarden' into…
coroiu Sep 7, 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 @@ -9,7 +9,7 @@ public CipherFido2KeyModel() { }

public CipherFido2KeyModel(CipherFido2KeyData data)
{
NonDiscoverableId = data.NonDiscoverableId;
CredentialId = data.CredentialId;
KeyType = data.KeyType;
KeyAlgorithm = data.KeyAlgorithm;
KeyCurve = data.KeyCurve;
Expand All @@ -23,7 +23,7 @@ public CipherFido2KeyModel(CipherFido2KeyData data)

public CipherFido2KeyModel(CipherLoginFido2KeyData data)
{
NonDiscoverableId = data.NonDiscoverableId;
CredentialId = data.CredentialId;
KeyType = data.KeyType;
KeyAlgorithm = data.KeyAlgorithm;
KeyCurve = data.KeyCurve;
Expand All @@ -37,7 +37,7 @@ public CipherFido2KeyModel(CipherLoginFido2KeyData data)

[EncryptedString]
[EncryptedStringLength(1000)]
public string NonDiscoverableId { get; set; }
public string CredentialId { get; set; }
[EncryptedString]
[EncryptedStringLength(1000)]
public string KeyType { get; set; }
Expand Down Expand Up @@ -70,7 +70,7 @@ public CipherLoginFido2KeyData ToCipherLoginFido2KeyData()
{
return new CipherLoginFido2KeyData
{
NonDiscoverableId = NonDiscoverableId,
CredentialId = CredentialId,
KeyType = KeyType,
KeyAlgorithm = KeyAlgorithm,
KeyCurve = KeyCurve,
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 @@ -242,7 +242,7 @@ private CipherFido2KeyData ToCipherFido2KeyData()
Fields = Fields?.Select(f => f.ToCipherFieldData()),
PasswordHistory = PasswordHistory?.Select(ph => ph.ToCipherPasswordHistoryData()),

NonDiscoverableId = Fido2Key.NonDiscoverableId,
CredentialId = Fido2Key.CredentialId,
KeyAlgorithm = Fido2Key.KeyAlgorithm,
KeyType = Fido2Key.KeyType,
KeyCurve = Fido2Key.KeyCurve,
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 @@ -4,7 +4,7 @@ public class CipherFido2KeyData : CipherData
{
public CipherFido2KeyData() { }

public string NonDiscoverableId { get; set; }
public string CredentialId { get; set; }
public string KeyType { get; set; }
public string KeyAlgorithm { get; set; }
public string KeyCurve { get; set; }
Expand Down
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 @@ -4,7 +4,7 @@ public class CipherLoginFido2KeyData
{
public CipherLoginFido2KeyData() { }

public string NonDiscoverableId { get; set; }
public string CredentialId { get; set; }
public string KeyType { get; set; }
public string KeyAlgorithm { get; set; }
public string KeyCurve { get; set; }
Expand Down
Loading