bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-08 03:23:23 +00:00
Code Issues Releases Wiki Activity

PM-1575 Added discoverable passkeys and WIP non-discoverable ones

Browse Source
This commit is contained in:
Federico Maccaroni
2023-05-16 22:00:09 +02:00
parent cdb890ea69
commit 5731499044
32 changed files with 339 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Core/Services/CipherService.cs
View File

@@ -176,6 +176,7 @@ namespace Bit.Core.Services
OrganizationId = model.OrganizationId,
Type = model.Type,
CollectionIds = model.CollectionIds,
CreationDate = model.CreationDate,
RevisionDate = model.RevisionDate,
Reprompt = model.Reprompt
};
@@ -1147,6 +1148,22 @@ namespace Bit.Core.Services
"LicenseNumber"
}, key);
break;
case CipherType.Fido2Key:
cipher.Fido2Key = new Fido2Key();
await EncryptObjPropertyAsync(model.Fido2Key, cipher.Fido2Key, new HashSet<string>
{
nameof(Fido2Key.NonDiscoverableId),
nameof(Fido2Key.KeyType),
nameof(Fido2Key.KeyAlgorithm),
nameof(Fido2Key.KeyCurve),
nameof(Fido2Key.KeyValue),
nameof(Fido2Key.RpId),
nameof(Fido2Key.RpName),
nameof(Fido2Key.UserHandle),
nameof(Fido2Key.UserName),
nameof(Fido2Key.Counter)
}, key);
break;
default:
throw new Exception("Unknown cipher type.");
}
@@ -1229,8 +1246,8 @@ namespace Bit.Core.Services
public int Compare(CipherView a, CipherView b)
{
var aName = a?.Name;
var bName = b?.Name;
var aName = a?.ComparableName;
var bName = b?.ComparableName;
if (aName == null && bName != null)
{
return -1;
@@ -1243,19 +1260,6 @@ namespace Bit.Core.Services
{
return 0;
}
var result = _i18nService.StringComparer.Compare(aName, bName);
if (result != 0 || a.Type != CipherType.Login || b.Type != CipherType.Login)
{
return result;
}
if (a.Login.Username != null)
{
aName += a.Login.Username;
}
if (b.Login.Username != null)
{
bName += b.Login.Username;
}
return _i18nService.StringComparer.Compare(aName, bName);
}
}