diff --git a/src/Android/Assets/bwi-font.ttf b/src/Android/Assets/bwi-font.ttf
index 7c7afd4cd..f9b63283e 100644
Binary files a/src/Android/Assets/bwi-font.ttf and b/src/Android/Assets/bwi-font.ttf differ
diff --git a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
index ea21df7dc..b5150b003 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs
@@ -31,7 +31,7 @@ namespace Bit.App.Controls
public bool ShowIconImage
{
get => WebsiteIconsEnabled
- && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
+ && !string.IsNullOrWhiteSpace(Cipher.LaunchUri)
&& IconImageSource != null;
}
@@ -41,7 +41,7 @@ namespace Bit.App.Controls
{
if (_iconImageSource == string.Empty) // default value since icon source can return null
{
- _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
+ _iconImageSource = IconImageHelper.GetIconImage(Cipher);
}
return _iconImageSource;
}
diff --git a/src/App/Pages/Vault/BaseCipherViewModel.cs b/src/App/Pages/Vault/BaseCipherViewModel.cs
index 871d8aa24..9cbfe7e83 100644
--- a/src/App/Pages/Vault/BaseCipherViewModel.cs
+++ b/src/App/Pages/Vault/BaseCipherViewModel.cs
@@ -37,6 +37,8 @@ namespace Bit.App.Pages
set => SetProperty(ref _cipher, value, additionalPropertyNames: AdditionalPropertiesToRaiseOnCipherChanged);
}
+ public string CreationDate => string.Format(AppResources.CreatedX, Cipher.CreationDate.ToShortDateString());
+
public AsyncCommand CheckPasswordCommand { get; }
protected async Task CheckPasswordAsync()
diff --git a/src/App/Pages/Vault/CipherAddEditPage.xaml b/src/App/Pages/Vault/CipherAddEditPage.xaml
index 552a5ac02..453da9146 100644
--- a/src/App/Pages/Vault/CipherAddEditPage.xaml
+++ b/src/App/Pages/Vault/CipherAddEditPage.xaml
@@ -223,6 +223,17 @@
AutomationId="RegeneratePasswordButton" />
+
+
+
@@ -639,6 +650,38 @@
AutomationId="IdentityCountryEntry" />
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
index b722d0b25..eb7519ecc 100644
--- a/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherAddEditPageViewModel.cs
@@ -88,7 +88,6 @@ namespace Bit.App.Pages
_watchDeviceService = ServiceContainer.Resolve();
_accountsManager = ServiceContainer.Resolve();
-
GeneratePasswordCommand = new Command(GeneratePassword);
TogglePasswordCommand = new Command(TogglePassword);
ToggleCardNumberCommand = new Command(ToggleCardNumber);
@@ -297,6 +296,7 @@ namespace Bit.App.Pages
public bool IsIdentity => Cipher?.Type == CipherType.Identity;
public bool IsCard => Cipher?.Type == CipherType.Card;
public bool IsSecureNote => Cipher?.Type == CipherType.SecureNote;
+ public bool IsFido2Key => Cipher?.Type == CipherType.Fido2Key;
public bool ShowUris => IsLogin && Cipher.Login.HasUris;
public bool ShowAttachments => Cipher.HasAttachments;
public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
@@ -309,6 +309,7 @@ namespace Bit.App.Pages
public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
public bool HasTotpValue => IsLogin && !string.IsNullOrEmpty(Cipher?.Login?.Totp);
public string SetupTotpText => $"{BitwardenIcons.Camera} {AppResources.SetupTotp}";
+ public bool ShowPasskeyInfo => Cipher?.Login?.Fido2Key != null && !CloneMode;
public void Init()
{
@@ -367,6 +368,11 @@ namespace Bit.App.Pages
{
Cipher.OrganizationId = OrganizationId;
}
+ if (Cipher.Type == CipherType.Login)
+ {
+ // passkeys can't be cloned
+ Cipher.Login.Fido2Key = null;
+ }
}
if (appOptions?.OtpData != null && Cipher.Type == CipherType.Login)
{
diff --git a/src/App/Pages/Vault/CipherDetailsPage.xaml b/src/App/Pages/Vault/CipherDetailsPage.xaml
index f99196a6f..8aaf74706 100644
--- a/src/App/Pages/Vault/CipherDetailsPage.xaml
+++ b/src/App/Pages/Vault/CipherDetailsPage.xaml
@@ -45,7 +45,7 @@
x:Name="_attachmentsItem" x:Key="attachmentsItem" />
-
@@ -195,6 +195,16 @@
+
+
@@ -569,6 +579,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/App/Pages/Vault/CipherDetailsPage.xaml.cs b/src/App/Pages/Vault/CipherDetailsPage.xaml.cs
index 52c9cbf7e..d0566fe96 100644
--- a/src/App/Pages/Vault/CipherDetailsPage.xaml.cs
+++ b/src/App/Pages/Vault/CipherDetailsPage.xaml.cs
@@ -204,19 +204,6 @@ namespace Bit.App.Pages
}
}
- private async void Clone_Clicked(object sender, System.EventArgs e)
- {
- if (DoOnce())
- {
- if (!await _vm.PromptPasswordAsync())
- {
- return;
- }
- var page = new CipherAddEditPage(_vm.CipherId, cloneMode: true, cipherDetailsPage: this);
- await Navigation.PushModalAsync(new NavigationPage(page));
- }
- }
-
private async void More_Clicked(object sender, System.EventArgs e)
{
if (!DoOnce())
@@ -267,8 +254,7 @@ namespace Bit.App.Pages
}
else if (selection == AppResources.Clone)
{
- var page = new CipherAddEditPage(_vm.CipherId, cloneMode: true, cipherDetailsPage: this);
- await Navigation.PushModalAsync(new NavigationPage(page));
+ _vm.CloneCommand.Execute(null);
}
}
@@ -302,13 +288,13 @@ namespace Bit.App.Pages
{
ToolbarItems.Remove(_collectionsItem);
}
- if (!ToolbarItems.Contains(_cloneItem))
+ if (_vm.Cipher.Type != Core.Enums.CipherType.Fido2Key && !ToolbarItems.Contains(_cloneItem))
{
ToolbarItems.Insert(1, _cloneItem);
}
if (!ToolbarItems.Contains(_shareItem))
{
- ToolbarItems.Insert(2, _shareItem);
+ ToolbarItems.Insert(_vm.Cipher.Type == Core.Enums.CipherType.Fido2Key ? 1 : 2, _shareItem);
}
}
else
diff --git a/src/App/Pages/Vault/CipherDetailsPageViewModel.cs b/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
index f0005ecf2..d58143e23 100644
--- a/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
+++ b/src/App/Pages/Vault/CipherDetailsPageViewModel.cs
@@ -68,7 +68,8 @@ namespace Bit.App.Pages
CopyCommand = new AsyncCommand((id) => CopyAsync(id, null), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
CopyUriCommand = new AsyncCommand(uriView => CopyAsync("LoginUri", uriView.Uri), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
CopyFieldCommand = new AsyncCommand(field => CopyAsync(field.Type == FieldType.Hidden ? "H_FieldValue" : "FieldValue", field.Value), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
- LaunchUriCommand = new Command(LaunchUri);
+ LaunchUriCommand = new Command(LaunchUri);
+ CloneCommand = new AsyncCommand(CloneAsync, onException: ex => HandleException(ex), allowsMultipleExecutions: false);
TogglePasswordCommand = new Command(TogglePassword);
ToggleCardNumberCommand = new Command(ToggleCardNumber);
ToggleCardCodeCommand = new Command(ToggleCardCode);
@@ -81,6 +82,7 @@ namespace Bit.App.Pages
public ICommand CopyUriCommand { get; set; }
public ICommand CopyFieldCommand { get; set; }
public Command LaunchUriCommand { get; set; }
+ public ICommand CloneCommand { get; set; }
public Command TogglePasswordCommand { get; set; }
public Command ToggleCardNumberCommand { get; set; }
public Command ToggleCardCodeCommand { get; set; }
@@ -146,6 +148,7 @@ namespace Bit.App.Pages
public bool IsIdentity => Cipher?.Type == Core.Enums.CipherType.Identity;
public bool IsCard => Cipher?.Type == Core.Enums.CipherType.Card;
public bool IsSecureNote => Cipher?.Type == Core.Enums.CipherType.SecureNote;
+ public bool IsFido2Key => Cipher?.Type == Core.Enums.CipherType.Fido2Key;
public FormattedString ColoredPassword => GeneratedValueFormatter.Format(Cipher.Login.Password);
public FormattedString UpdatedText
{
@@ -645,6 +648,11 @@ namespace Bit.App.Pages
text = Cipher.Card.Code;
name = AppResources.SecurityCode;
}
+ else if (id == "Fido2KeyApplication")
+ {
+ text = Cipher.Fido2Key?.LaunchUri;
+ name = AppResources.Application;
+ }
if (text != null)
{
@@ -668,14 +676,25 @@ namespace Bit.App.Pages
}
}
- private void LaunchUri(LoginUriView uri)
+ private void LaunchUri(ILaunchableView launchableView)
{
- if (uri.CanLaunch && (Page as BaseContentPage).DoOnce())
+ if (launchableView.CanLaunch && (Page as BaseContentPage).DoOnce())
{
- _platformUtilsService.LaunchUri(uri.LaunchUri);
+ _platformUtilsService.LaunchUri(launchableView.LaunchUri);
}
}
+ private async Task CloneAsync()
+ {
+ if (!await CanCloneAsync() || !await PromptPasswordAsync())
+ {
+ return;
+ }
+
+ var page = new CipherAddEditPage(CipherId, cloneMode: true, cipherDetailsPage: Page as CipherDetailsPage);
+ await Page.Navigation.PushModalAsync(new NavigationPage(page));
+ }
+
public async Task PromptPasswordAsync()
{
if (Cipher.Reprompt == CipherRepromptType.None || _passwordReprompted)
@@ -685,5 +704,15 @@ namespace Bit.App.Pages
return _passwordReprompted = await _passwordRepromptService.ShowPasswordPromptAsync();
}
+
+ private async Task CanCloneAsync()
+ {
+ if (Cipher.Type == CipherType.Login && Cipher.Login?.Fido2Key != null)
+ {
+ return await _platformUtilsService.ShowDialogAsync(AppResources.ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem, AppResources.PasskeyWillNotBeCopied, AppResources.Yes, AppResources.No);
+ }
+
+ return true;
+ }
}
}
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
index d4583d71c..a87287e05 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
@@ -60,6 +60,9 @@ namespace Bit.App.Pages
case CipherType.Identity:
_name = AppResources.TypeIdentity;
break;
+ case CipherType.Fido2Key:
+ _name = AppResources.Passkey;
+ break;
default:
break;
}
@@ -108,6 +111,9 @@ namespace Bit.App.Pages
case CipherType.Identity:
_icon = BitwardenIcons.IdCard;
break;
+ case CipherType.Fido2Key:
+ _icon = BitwardenIcons.Passkey;
+ break;
default:
_icon = BitwardenIcons.Globe;
break;
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
index 9b5acd5b2..da10a11a3 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -235,34 +235,17 @@ namespace Bit.App.Pages
{
AddTotpGroupItem(groupedItems, uppercaseGroupNames);
- groupedItems.Add(new GroupingsPageListGroup(
- AppResources.Types, 4, uppercaseGroupNames, !hasFavorites)
+ var types = new CipherType[] { CipherType.Login, CipherType.Card, CipherType.Identity, CipherType.SecureNote };
+ var typesGroup = new GroupingsPageListGroup(AppResources.Types, types.Length, uppercaseGroupNames, !hasFavorites);
+ foreach (CipherType t in types)
{
- new GroupingsPageListItem
+ typesGroup.Add(new GroupingsPageListItem
{
- Type = CipherType.Login,
- ItemCount = (_typeCounts.ContainsKey(CipherType.Login) ?
- _typeCounts[CipherType.Login] : 0).ToString("N0")
- },
- new GroupingsPageListItem
- {
- Type = CipherType.Card,
- ItemCount = (_typeCounts.ContainsKey(CipherType.Card) ?
- _typeCounts[CipherType.Card] : 0).ToString("N0")
- },
- new GroupingsPageListItem
- {
- Type = CipherType.Identity,
- ItemCount = (_typeCounts.ContainsKey(CipherType.Identity) ?
- _typeCounts[CipherType.Identity] : 0).ToString("N0")
- },
- new GroupingsPageListItem
- {
- Type = CipherType.SecureNote,
- ItemCount = (_typeCounts.ContainsKey(CipherType.SecureNote) ?
- _typeCounts[CipherType.SecureNote] : 0).ToString("N0")
- },
- });
+ Type = t,
+ ItemCount = _typeCounts.GetValueOrDefault(t).ToString("N0")
+ });
+ }
+ groupedItems.Add(typesGroup);
}
if (NestedFolders?.Any() ?? false)
{
@@ -584,7 +567,9 @@ namespace Bit.App.Pages
}
else if (Type != null)
{
- Filter = c => c.Type == Type.Value && !c.IsDeleted;
+ Filter = c => !c.IsDeleted
+ &&
+ Type.Value.IsEqualToOrCanSignIn(c.Type);
}
else if (FolderId != null)
{
@@ -651,14 +636,11 @@ namespace Bit.App.Pages
NoFolderCiphers.Add(c);
}
- if (_typeCounts.ContainsKey(c.Type))
- {
- _typeCounts[c.Type] = _typeCounts[c.Type] + 1;
- }
- else
- {
- _typeCounts.Add(c.Type, 1);
- }
+ // Fido2Key ciphers should be counted as Login ciphers
+ var countType = c.Type == CipherType.Fido2Key ? CipherType.Login : c.Type;
+ _typeCounts[countType] = _typeCounts.TryGetValue(countType, out var currentTypeCount)
+ ? currentTypeCount + 1
+ : 1;
}
if (c.IsDeleted)
diff --git a/src/App/Pages/Vault/SharePage.xaml b/src/App/Pages/Vault/SharePage.xaml
index b3c660bcd..da484eae3 100644
--- a/src/App/Pages/Vault/SharePage.xaml
+++ b/src/App/Pages/Vault/SharePage.xaml
@@ -15,7 +15,7 @@
-
+
diff --git a/src/App/Pages/Vault/SharePage.xaml.cs b/src/App/Pages/Vault/SharePage.xaml.cs
index b97c203f4..0e94b39cc 100644
--- a/src/App/Pages/Vault/SharePage.xaml.cs
+++ b/src/App/Pages/Vault/SharePage.xaml.cs
@@ -32,19 +32,6 @@ namespace Bit.App.Pages
await LoadOnAppearedAsync(_scrollView, true, () => _vm.LoadAsync());
}
- protected override void OnDisappearing()
- {
- base.OnDisappearing();
- }
-
- private async void Save_Clicked(object sender, System.EventArgs e)
- {
- if (DoOnce())
- {
- await _vm.SubmitAsync();
- }
- }
-
private async void Close_Clicked(object sender, System.EventArgs e)
{
if (DoOnce())
diff --git a/src/App/Pages/Vault/SharePageViewModel.cs b/src/App/Pages/Vault/SharePageViewModel.cs
index c7e3cfbb1..ccea0ee4a 100644
--- a/src/App/Pages/Vault/SharePageViewModel.cs
+++ b/src/App/Pages/Vault/SharePageViewModel.cs
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using System.Windows.Input;
using Bit.App.Abstractions;
using Bit.App.Resources;
using Bit.Core.Abstractions;
@@ -8,6 +9,7 @@ using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.Models.View;
using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
namespace Bit.App.Pages
{
@@ -34,6 +36,8 @@ namespace Bit.App.Pages
Collections = new ExtendedObservableCollection();
OrganizationOptions = new List>();
PageTitle = AppResources.MoveToOrganization;
+
+ MoveCommand = new AsyncCommand(MoveAsync, onException: ex => HandleException(ex), allowsMultipleExecutions: false);
}
public string CipherId { get; set; }
@@ -62,6 +66,8 @@ namespace Bit.App.Pages
set => SetProperty(ref _hasOrganizations, value);
}
+ public ICommand MoveCommand { get; }
+
public async Task LoadAsync()
{
var allCollections = await _collectionService.GetAllDecryptedAsync();
@@ -84,7 +90,7 @@ namespace Bit.App.Pages
FilterCollections();
}
- public async Task SubmitAsync()
+ public async Task MoveAsync()
{
var selectedCollectionIds = Collections?.Where(c => c.Checked).Select(c => c.Collection.Id);
if (!selectedCollectionIds?.Any() ?? true)
@@ -107,8 +113,15 @@ namespace Bit.App.Pages
try
{
await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
- await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
+ var error = await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
await _deviceActionService.HideLoadingAsync();
+
+ if (error == ICipherService.ShareWithServerError.DuplicatedPasskeyInOrg)
+ {
+ _platformUtilsService.ShowToast(null, null, AppResources.ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey);
+ return false;
+ }
+
var movedItemToOrgText = string.Format(AppResources.MovedItemToOrg, cipherView.Name,
(await _organizationService.GetAsync(OrganizationId)).Name);
_platformUtilsService.ShowToast("success", null, movedItemToOrgText);
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index fedf8ac38..a2112ae2e 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -553,6 +553,15 @@ namespace Bit.App.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Application.
+ ///
+ public static string Application {
+ get {
+ return ResourceManager.GetString("Application", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Approve login requests.
///
@@ -949,6 +958,15 @@ namespace Bit.App.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Available for two-step login.
+ ///
+ public static string AvailableForTwoStepLogin {
+ get {
+ return ResourceManager.GetString("AvailableForTwoStepLogin", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to A verification code was sent to your email.
///
@@ -1570,6 +1588,15 @@ namespace Bit.App.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Copy application.
+ ///
+ public static string CopyApplication {
+ get {
+ return ResourceManager.GetString("CopyApplication", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Copy link.
///
@@ -1678,6 +1705,15 @@ namespace Bit.App.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Created {0}.
+ ///
+ public static string CreatedX {
+ get {
+ return ResourceManager.GetString("CreatedX", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Creating account....
///
@@ -4786,6 +4822,33 @@ namespace Bit.App.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Passkey.
+ ///
+ public static string Passkey {
+ get {
+ return ResourceManager.GetString("Passkey", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Passkeys.
+ ///
+ public static string Passkeys {
+ get {
+ return ResourceManager.GetString("Passkeys", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Passkey will not be copied.
+ ///
+ public static string PasskeyWillNotBeCopied {
+ get {
+ return ResourceManager.GetString("PasskeyWillNotBeCopied", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Passphrase.
///
@@ -6201,6 +6264,15 @@ namespace Bit.App.Resources {
}
///
+ /// Looks up a localized string similar to The passkey will not be copied to the cloned item. Do you want to continue cloning this item?.
+ ///
+ public static string ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem {
+ get {
+ return ResourceManager.GetString("ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem", resourceCulture);
+
+ }
+ }
+
/// Looks up a localized string similar to There are no blocked URIs.
///
public static string ThereAreNoBlockedURIs {
@@ -6263,6 +6335,16 @@ namespace Bit.App.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to This item cannot be shared with the organization because there is one already with the same passkey..
+ ///
+ public static string ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey {
+ get {
+ return ResourceManager.GetString("ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePassk" +
+ "ey", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to This request is no longer valid.
///
@@ -7235,6 +7317,15 @@ namespace Bit.App.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to You cannot edit passkey application because it would invalidate the passkey.
+ ///
+ public static string YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey {
+ get {
+ return ResourceManager.GetString("YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Your account has been permanently deleted.
///
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 57e3e3b00..313327ded 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -2628,6 +2628,34 @@ Do you want to switch to this account?
Current master password
+
+ Passkey
+
+
+ Passkeys
+
+
+ Created {0}
+ To state the date in which the cipher was created: Created 03/21/2023
+
+
+ Application
+
+
+ You cannot edit passkey application because it would invalidate the passkey
+
+
+ Passkey will not be copied
+
+
+ The passkey will not be copied to the cloned item. Do you want to continue cloning this item?
+
+
+ Copy application
+
+
+ Available for two-step login
+
Master password re-prompt help
@@ -2640,6 +2668,9 @@ Do you want to switch to this account?
Invalid API token
+
+ This item cannot be shared with the organization because there is one already with the same passkey.
+
Block auto-fill
diff --git a/src/App/Utilities/AppHelpers.cs b/src/App/Utilities/AppHelpers.cs
index 48c0fb73a..49086a18b 100644
--- a/src/App/Utilities/AppHelpers.cs
+++ b/src/App/Utilities/AppHelpers.cs
@@ -78,6 +78,18 @@ namespace Bit.App.Utilities
options.Add(AppResources.CopyNotes);
}
}
+ if (cipher.Type == Core.Enums.CipherType.Fido2Key)
+ {
+ if (!string.IsNullOrWhiteSpace(cipher.Fido2Key.UserName))
+ {
+ options.Add(AppResources.CopyUsername);
+ }
+ if (cipher.Fido2Key.CanLaunch)
+ {
+ options.Add(AppResources.Launch);
+ }
+ }
+
var selection = await page.DisplayActionSheet(cipher.Name, AppResources.Cancel, null, options.ToArray());
if (await vaultTimeoutService.IsLockedAsync())
{
@@ -96,7 +108,7 @@ namespace Bit.App.Utilities
}
else if (selection == AppResources.CopyUsername)
{
- await clipboardService.CopyTextAsync(cipher.Login.Username);
+ await clipboardService.CopyTextAsync(cipher.Type == CipherType.Login ? cipher.Login.Username : cipher.Fido2Key.UserName);
platformUtilsService.ShowToastForCopiedValue(AppResources.Username);
}
else if (selection == AppResources.CopyPassword)
@@ -121,9 +133,9 @@ namespace Bit.App.Utilities
}
}
}
- else if (selection == AppResources.Launch)
+ else if (selection == AppResources.Launch && cipher.CanLaunch)
{
- platformUtilsService.LaunchUri(cipher.Login.LaunchUri);
+ platformUtilsService.LaunchUri(cipher.LaunchUri);
}
else if (selection == AppResources.CopyNumber)
{
diff --git a/src/App/Utilities/IconGlyphExtensions.cs b/src/App/Utilities/IconGlyphExtensions.cs
index d7c6c35ac..d3b33f9f4 100644
--- a/src/App/Utilities/IconGlyphExtensions.cs
+++ b/src/App/Utilities/IconGlyphExtensions.cs
@@ -8,25 +8,20 @@ namespace Bit.App.Utilities
{
public static string GetIcon(this CipherView cipher)
{
- string icon = null;
switch (cipher.Type)
{
case CipherType.Login:
- icon = GetLoginIconGlyph(cipher);
- break;
+ return GetLoginIconGlyph(cipher);
case CipherType.SecureNote:
- icon = BitwardenIcons.StickyNote;
- break;
+ return BitwardenIcons.StickyNote;
case CipherType.Card:
- icon = BitwardenIcons.CreditCard;
- break;
+ return BitwardenIcons.CreditCard;
case CipherType.Identity:
- icon = BitwardenIcons.IdCard;
- break;
- default:
- break;
+ return BitwardenIcons.IdCard;
+ case CipherType.Fido2Key:
+ return BitwardenIcons.Passkey;
}
- return icon;
+ return null;
}
static string GetLoginIconGlyph(CipherView cipher)
diff --git a/src/App/Utilities/IconImageConverter.cs b/src/App/Utilities/IconImageConverter.cs
index e81ec7959..87ad2391b 100644
--- a/src/App/Utilities/IconImageConverter.cs
+++ b/src/App/Utilities/IconImageConverter.cs
@@ -13,31 +13,29 @@ namespace Bit.App.Utilities
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var cipher = value as CipherView;
- return GetIcon(cipher);
+ return IconImageHelper.GetIconImage(cipher);
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
-
- private string GetIcon(CipherView cipher)
- {
- string icon = null;
- switch (cipher.Type)
- {
- case CipherType.Login:
- icon = IconImageHelper.GetLoginIconImage(cipher);
- break;
- default:
- break;
- }
- return icon;
- }
}
public static class IconImageHelper
{
+ public static string GetIconImage(CipherView cipher)
+ {
+ switch (cipher.Type)
+ {
+ case CipherType.Login:
+ return IconImageHelper.GetLoginIconImage(cipher);
+ case CipherType.Fido2Key:
+ return IconImageHelper.GetFido2KeyIconImage(cipher);
+ }
+ return null;
+ }
+
public static string GetLoginIconImage(CipherView cipher)
{
string image = null;
@@ -67,6 +65,26 @@ namespace Bit.App.Utilities
return image;
}
+ public static string GetFido2KeyIconImage(CipherView cipher)
+ {
+ var hostnameUri = cipher.Fido2Key.LaunchUri;
+ if (!hostnameUri.Contains("."))
+ {
+ return null;
+ }
+
+ if (!hostnameUri.Contains("://"))
+ {
+ hostnameUri = string.Concat("https://", hostnameUri);
+ }
+ if (hostnameUri.StartsWith("http"))
+ {
+ return GetIconUrl(hostnameUri);
+ }
+
+ return null;
+ }
+
private static string GetIconUrl(string hostnameUri)
{
IEnvironmentService _environmentService = ServiceContainer.Resolve("environmentService");
@@ -85,7 +103,6 @@ namespace Bit.App.Utilities
}
}
return string.Format("{0}/{1}/icon.png", iconsUrl, hostname);
-
}
}
}
diff --git a/src/Core/Abstractions/ICipherService.cs b/src/Core/Abstractions/ICipherService.cs
index e34aaa068..d68b0dc93 100644
--- a/src/Core/Abstractions/ICipherService.cs
+++ b/src/Core/Abstractions/ICipherService.cs
@@ -10,6 +10,12 @@ namespace Bit.Core.Abstractions
{
public interface ICipherService
{
+ public enum ShareWithServerError
+ {
+ None,
+ DuplicatedPasskeyInOrg
+ }
+
Task ClearAsync(string userId);
Task ClearCacheAsync();
Task DeleteAsync(List ids);
@@ -31,7 +37,7 @@ namespace Bit.Core.Abstractions
Task SaveCollectionsWithServerAsync(Cipher cipher);
Task SaveNeverDomainAsync(string domain);
Task SaveWithServerAsync(Cipher cipher);
- Task ShareWithServerAsync(CipherView cipher, string organizationId, HashSet collectionIds);
+ Task ShareWithServerAsync(CipherView cipher, string organizationId, HashSet collectionIds);
Task UpdateLastUsedDateAsync(string id);
Task UpsertAsync(CipherData cipher);
Task UpsertAsync(List cipher);
diff --git a/src/Core/BitwardenIcons.cs b/src/Core/BitwardenIcons.cs
index 2ca47edf5..d9a74e990 100644
--- a/src/Core/BitwardenIcons.cs
+++ b/src/Core/BitwardenIcons.cs
@@ -114,5 +114,6 @@
public const string ViewCellMenu = "\xe5d3";
public const string Device = "\xe986";
public const string Suitcase = "\xe98c";
+ public const string Passkey = "\xe99f";
}
}
diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
index 73863f580..6614bab34 100644
--- a/src/Core/Constants.cs
+++ b/src/Core/Constants.cs
@@ -63,6 +63,9 @@
public const int Argon2MemoryInMB = 64;
public const int Argon2Parallelism = 4;
public const int MasterPasswordMinimumChars = 12;
+ public const string DefaultFido2KeyType = "public-key";
+ public const string DefaultFido2KeyAlgorithm = "ECDSA";
+ public const string DefaultFido2KeyCurve = "P-256";
public static readonly string[] AndroidAllClearCipherCacheKeys =
{
diff --git a/src/Core/Enums/CipherType.cs b/src/Core/Enums/CipherType.cs
index 0aca94864..cefa35182 100644
--- a/src/Core/Enums/CipherType.cs
+++ b/src/Core/Enums/CipherType.cs
@@ -7,6 +7,7 @@
Login = 1,
SecureNote = 2,
Card = 3,
- Identity = 4
+ Identity = 4,
+ Fido2Key = 5
}
}
diff --git a/src/Core/Models/Api/Fido2KeyApi.cs b/src/Core/Models/Api/Fido2KeyApi.cs
new file mode 100644
index 000000000..61f2444af
--- /dev/null
+++ b/src/Core/Models/Api/Fido2KeyApi.cs
@@ -0,0 +1,37 @@
+using Bit.Core.Models.Domain;
+using Bit.Core.Models.Export;
+
+namespace Bit.Core.Models.Api
+{
+ public class Fido2KeyApi
+ {
+ public Fido2KeyApi()
+ {
+ }
+
+ public Fido2KeyApi(Fido2Key fido2Key)
+ {
+ NonDiscoverableId = fido2Key.NonDiscoverableId?.EncryptedString;
+ KeyType = fido2Key.KeyType?.EncryptedString;
+ KeyAlgorithm = fido2Key.KeyAlgorithm?.EncryptedString;
+ KeyCurve = fido2Key.KeyCurve?.EncryptedString;
+ KeyValue = fido2Key.KeyValue?.EncryptedString;
+ RpId = fido2Key.RpId?.EncryptedString;
+ RpName = fido2Key.RpName?.EncryptedString;
+ UserHandle = fido2Key.UserHandle?.EncryptedString;
+ UserName = fido2Key.UserName?.EncryptedString;
+ Counter = fido2Key.Counter?.EncryptedString;
+ }
+
+ public string NonDiscoverableId { get; set; }
+ public string KeyType { get; set; } = Constants.DefaultFido2KeyType;
+ public string KeyAlgorithm { get; set; } = Constants.DefaultFido2KeyAlgorithm;
+ public string KeyCurve { get; set; } = Constants.DefaultFido2KeyCurve;
+ public string KeyValue { get; set; }
+ public string RpId { get; set; }
+ public string RpName { get; set; }
+ public string UserHandle { get; set; }
+ public string UserName { get; set; }
+ public string Counter { get; set; }
+ }
+}
diff --git a/src/Core/Models/Api/LoginApi.cs b/src/Core/Models/Api/LoginApi.cs
index b611c2eb8..42d32f343 100644
--- a/src/Core/Models/Api/LoginApi.cs
+++ b/src/Core/Models/Api/LoginApi.cs
@@ -10,5 +10,6 @@ namespace Bit.Core.Models.Api
public string Password { get; set; }
public DateTime? PasswordRevisionDate { get; set; }
public string Totp { get; set; }
+ public Fido2KeyApi Fido2Key { get; set; }
}
}
diff --git a/src/Core/Models/Data/CipherData.cs b/src/Core/Models/Data/CipherData.cs
index c571771a7..f8bd1a648 100644
--- a/src/Core/Models/Data/CipherData.cs
+++ b/src/Core/Models/Data/CipherData.cs
@@ -21,6 +21,8 @@ namespace Bit.Core.Models.Data
OrganizationUseTotp = response.OrganizationUseTotp;
Favorite = response.Favorite;
RevisionDate = response.RevisionDate;
+ CreationDate = response.CreationDate;
+ DeletedDate = response.DeletedDate;
Type = response.Type;
Name = response.Name;
Notes = response.Notes;
@@ -43,6 +45,9 @@ namespace Bit.Core.Models.Data
case Enums.CipherType.Identity:
Identity = new IdentityData(response.Identity);
break;
+ case Enums.CipherType.Fido2Key:
+ Fido2Key = new Fido2KeyData(response.Fido2Key);
+ break;
default:
break;
}
@@ -61,7 +66,6 @@ namespace Bit.Core.Models.Data
Fields = response.Fields?.Select(f => new FieldData(f)).ToList();
Attachments = response.Attachments?.Select(a => new AttachmentData(a)).ToList();
PasswordHistory = response.PasswordHistory?.Select(ph => new PasswordHistoryData(ph)).ToList();
- DeletedDate = response.DeletedDate;
}
public string Id { get; set; }
@@ -73,6 +77,8 @@ namespace Bit.Core.Models.Data
public bool OrganizationUseTotp { get; set; }
public bool Favorite { get; set; }
public DateTime RevisionDate { get; set; }
+ public DateTime CreationDate { get; set; }
+ public DateTime? DeletedDate { get; set; }
public Enums.CipherType Type { get; set; }
public string Name { get; set; }
public string Notes { get; set; }
@@ -80,11 +86,11 @@ namespace Bit.Core.Models.Data
public SecureNoteData SecureNote { get; set; }
public CardData Card { get; set; }
public IdentityData Identity { get; set; }
+ public Fido2KeyData Fido2Key { get; set; }
public List Fields { get; set; }
public List Attachments { get; set; }
public List PasswordHistory { get; set; }
public List CollectionIds { get; set; }
- public DateTime? DeletedDate { get; set; }
public Enums.CipherRepromptType Reprompt { get; set; }
}
}
diff --git a/src/Core/Models/Data/Fido2KeyData.cs b/src/Core/Models/Data/Fido2KeyData.cs
new file mode 100644
index 000000000..234406eee
--- /dev/null
+++ b/src/Core/Models/Data/Fido2KeyData.cs
@@ -0,0 +1,34 @@
+using Bit.Core.Models.Api;
+
+namespace Bit.Core.Models.Data
+{
+ public class Fido2KeyData : Data
+ {
+ public Fido2KeyData() { }
+
+ public Fido2KeyData(Fido2KeyApi apiData)
+ {
+ NonDiscoverableId = apiData.NonDiscoverableId;
+ KeyType = apiData.KeyType;
+ KeyAlgorithm = apiData.KeyAlgorithm;
+ KeyCurve = apiData.KeyCurve;
+ KeyValue = apiData.KeyValue;
+ RpId = apiData.RpId;
+ RpName = apiData.RpName;
+ UserHandle = apiData.UserHandle;
+ UserName = apiData.UserName;
+ Counter = apiData.Counter;
+ }
+
+ public string NonDiscoverableId { get; set; }
+ public string KeyType { get; set; } = Constants.DefaultFido2KeyType;
+ public string KeyAlgorithm { get; set; } = Constants.DefaultFido2KeyAlgorithm;
+ public string KeyCurve { get; set; } = Constants.DefaultFido2KeyCurve;
+ public string KeyValue { get; set; }
+ public string RpId { get; set; }
+ public string RpName { get; set; }
+ public string UserHandle { get; set; }
+ public string UserName { get; set; }
+ public string Counter { get; set; }
+ }
+}
diff --git a/src/Core/Models/Data/LoginData.cs b/src/Core/Models/Data/LoginData.cs
index 286c542ed..1460e0b17 100644
--- a/src/Core/Models/Data/LoginData.cs
+++ b/src/Core/Models/Data/LoginData.cs
@@ -16,6 +16,7 @@ namespace Bit.Core.Models.Data
PasswordRevisionDate = data.PasswordRevisionDate;
Totp = data.Totp;
Uris = data.Uris?.Select(u => new LoginUriData(u)).ToList();
+ Fido2Key = data.Fido2Key != null ? new Fido2KeyData(data.Fido2Key) : null;
}
public List Uris { get; set; }
@@ -23,5 +24,6 @@ namespace Bit.Core.Models.Data
public string Password { get; set; }
public DateTime? PasswordRevisionDate { get; set; }
public string Totp { get; set; }
+ public Fido2KeyData Fido2Key { get; set; }
}
}
diff --git a/src/Core/Models/Domain/Cipher.cs b/src/Core/Models/Domain/Cipher.cs
index d744f6a57..a5b6fcba4 100644
--- a/src/Core/Models/Domain/Cipher.cs
+++ b/src/Core/Models/Domain/Cipher.cs
@@ -29,6 +29,7 @@ namespace Bit.Core.Models.Domain
Edit = obj.Edit;
ViewPassword = obj.ViewPassword;
RevisionDate = obj.RevisionDate;
+ CreationDate = obj.CreationDate;
CollectionIds = obj.CollectionIds != null ? new HashSet(obj.CollectionIds) : null;
LocalData = localData;
Reprompt = obj.Reprompt;
@@ -47,6 +48,9 @@ namespace Bit.Core.Models.Domain
case Enums.CipherType.Identity:
Identity = new Identity(obj.Identity, alreadyEncrypted);
break;
+ case CipherType.Fido2Key:
+ Fido2Key = new Fido2Key(obj.Fido2Key, alreadyEncrypted);
+ break;
default:
break;
}
@@ -68,16 +72,18 @@ namespace Bit.Core.Models.Domain
public bool Edit { get; set; }
public bool ViewPassword { get; set; }
public DateTime RevisionDate { get; set; }
+ public DateTime CreationDate { get; set; }
+ public DateTime? DeletedDate { get; set; }
public Dictionary LocalData { get; set; }
public Login Login { get; set; }
public Identity Identity { get; set; }
public Card Card { get; set; }
public SecureNote SecureNote { get; set; }
+ public Fido2Key Fido2Key { get; set; }
public List Attachments { get; set; }
public List Fields { get; set; }
public List PasswordHistory { get; set; }
public HashSet CollectionIds { get; set; }
- public DateTime? DeletedDate { get; set; }
public CipherRepromptType Reprompt { get; set; }
public async Task DecryptAsync()
@@ -103,6 +109,9 @@ namespace Bit.Core.Models.Domain
case Enums.CipherType.Identity:
model.Identity = await Identity.DecryptAsync(OrganizationId);
break;
+ case Enums.CipherType.Fido2Key:
+ model.Fido2Key = await Fido2Key.DecryptAsync(OrganizationId);
+ break;
default:
break;
}
@@ -167,6 +176,7 @@ namespace Bit.Core.Models.Domain
OrganizationUseTotp = OrganizationUseTotp,
Favorite = Favorite,
RevisionDate = RevisionDate,
+ CreationDate = CreationDate,
Type = Type,
CollectionIds = CollectionIds.ToList(),
DeletedDate = DeletedDate,
@@ -191,6 +201,9 @@ namespace Bit.Core.Models.Domain
case Enums.CipherType.Identity:
c.Identity = Identity.ToIdentityData();
break;
+ case Enums.CipherType.Fido2Key:
+ c.Fido2Key = Fido2Key.ToFido2KeyData();
+ break;
default:
break;
}
diff --git a/src/Core/Models/Domain/Fido2Key.cs b/src/Core/Models/Domain/Fido2Key.cs
new file mode 100644
index 000000000..05c5741dd
--- /dev/null
+++ b/src/Core/Models/Domain/Fido2Key.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.Core.Models.Data;
+using Bit.Core.Models.View;
+
+namespace Bit.Core.Models.Domain
+{
+ public class Fido2Key : Domain
+ {
+ public static HashSet EncryptableProperties => new HashSet
+ {
+ nameof(NonDiscoverableId),
+ nameof(KeyType),
+ nameof(KeyAlgorithm),
+ nameof(KeyCurve),
+ nameof(KeyValue),
+ nameof(RpId),
+ nameof(RpName),
+ nameof(UserHandle),
+ nameof(UserName),
+ nameof(Counter)
+ };
+
+ public Fido2Key() { }
+
+ public Fido2Key(Fido2KeyData data, bool alreadyEncrypted = false)
+ {
+ BuildDomainModel(this, data, EncryptableProperties, alreadyEncrypted);
+ }
+
+ public EncString NonDiscoverableId { get; set; }
+ public EncString KeyType { get; set; }
+ public EncString KeyAlgorithm { get; set; }
+ public EncString KeyCurve { get; set; }
+ public EncString KeyValue { get; set; }
+ public EncString RpId { get; set; }
+ public EncString RpName { get; set; }
+ public EncString UserHandle { get; set; }
+ public EncString UserName { get; set; }
+ public EncString Counter { get; set; }
+
+ public async Task DecryptAsync(string orgId)
+ {
+ return await DecryptObjAsync(new Fido2KeyView(), this, EncryptableProperties, orgId);
+ }
+
+ public Fido2KeyData ToFido2KeyData()
+ {
+ var data = new Fido2KeyData();
+ BuildDataModel(this, data, EncryptableProperties);
+ return data;
+ }
+ }
+}
diff --git a/src/Core/Models/Domain/Login.cs b/src/Core/Models/Domain/Login.cs
index 00c0ab07b..9968f43a6 100644
--- a/src/Core/Models/Domain/Login.cs
+++ b/src/Core/Models/Domain/Login.cs
@@ -15,6 +15,7 @@ namespace Bit.Core.Models.Domain
{
PasswordRevisionDate = obj.PasswordRevisionDate;
Uris = obj.Uris?.Select(u => new LoginUri(u, alreadyEncrypted)).ToList();
+ Fido2Key = obj.Fido2Key != null ? new Fido2Key(obj.Fido2Key, alreadyEncrypted) : null;
BuildDomainModel(this, obj, new HashSet
{
"Username",
@@ -28,6 +29,7 @@ namespace Bit.Core.Models.Domain
public EncString Password { get; set; }
public DateTime? PasswordRevisionDate { get; set; }
public EncString Totp { get; set; }
+ public Fido2Key Fido2Key { get; set; }
public async Task DecryptAsync(string orgId)
{
@@ -45,6 +47,10 @@ namespace Bit.Core.Models.Domain
view.Uris.Add(await uri.DecryptAsync(orgId));
}
}
+ if (Fido2Key != null)
+ {
+ view.Fido2Key = await Fido2Key.DecryptAsync(orgId);
+ }
return view;
}
@@ -62,6 +68,10 @@ namespace Bit.Core.Models.Domain
{
l.Uris = Uris.Select(u => u.ToLoginUriData()).ToList();
}
+ if (Fido2Key != null)
+ {
+ l.Fido2Key = Fido2Key.ToFido2KeyData();
+ }
return l;
}
}
diff --git a/src/Core/Models/Request/CipherRequest.cs b/src/Core/Models/Request/CipherRequest.cs
index 82c029751..121abc2f8 100644
--- a/src/Core/Models/Request/CipherRequest.cs
+++ b/src/Core/Models/Request/CipherRequest.cs
@@ -30,7 +30,8 @@ namespace Bit.Core.Models.Request
Username = cipher.Login.Username?.EncryptedString,
Password = cipher.Login.Password?.EncryptedString,
PasswordRevisionDate = cipher.Login.PasswordRevisionDate,
- Totp = cipher.Login.Totp?.EncryptedString
+ Totp = cipher.Login.Totp?.EncryptedString,
+ Fido2Key = cipher.Login.Fido2Key != null ? new Fido2KeyApi(cipher.Login.Fido2Key) : null
};
break;
case CipherType.Card:
@@ -73,6 +74,9 @@ namespace Bit.Core.Models.Request
Type = cipher.SecureNote.Type
};
break;
+ case CipherType.Fido2Key:
+ Fido2Key = new Fido2KeyApi(cipher.Fido2Key);
+ break;
default:
break;
}
@@ -118,6 +122,7 @@ namespace Bit.Core.Models.Request
public SecureNoteApi SecureNote { get; set; }
public CardApi Card { get; set; }
public IdentityApi Identity { get; set; }
+ public Fido2KeyApi Fido2Key { get; set; }
public List Fields { get; set; }
public List PasswordHistory { get; set; }
public Dictionary Attachments { get; set; }
diff --git a/src/Core/Models/Response/CipherResponse.cs b/src/Core/Models/Response/CipherResponse.cs
index 070d41eee..5247c4522 100644
--- a/src/Core/Models/Response/CipherResponse.cs
+++ b/src/Core/Models/Response/CipherResponse.cs
@@ -18,6 +18,7 @@ namespace Bit.Core.Models.Response
public CardApi Card { get; set; }
public IdentityApi Identity { get; set; }
public SecureNoteApi SecureNote { get; set; }
+ public Fido2KeyApi Fido2Key { get; set; }
public bool Favorite { get; set; }
public bool Edit { get; set; }
public bool ViewPassword { get; set; } = true; // Fallback for old server versions
@@ -28,5 +29,6 @@ namespace Bit.Core.Models.Response
public List CollectionIds { get; set; }
public DateTime? DeletedDate { get; set; }
public CipherRepromptType Reprompt { get; set; }
+ public DateTime CreationDate { get; set; }
}
}
diff --git a/src/Core/Models/View/CipherView.cs b/src/Core/Models/View/CipherView.cs
index 6bec74ee4..a29ebb38c 100644
--- a/src/Core/Models/View/CipherView.cs
+++ b/src/Core/Models/View/CipherView.cs
@@ -6,7 +6,7 @@ using Bit.Core.Models.Domain;
namespace Bit.Core.Models.View
{
- public class CipherView : View
+ public class CipherView : View, ILaunchableView
{
public CipherView() { }
@@ -23,6 +23,7 @@ namespace Bit.Core.Models.View
LocalData = c.LocalData;
CollectionIds = c.CollectionIds;
RevisionDate = c.RevisionDate;
+ CreationDate = c.CreationDate;
DeletedDate = c.DeletedDate;
Reprompt = c.Reprompt;
}
@@ -42,11 +43,13 @@ namespace Bit.Core.Models.View
public IdentityView Identity { get; set; }
public CardView Card { get; set; }
public SecureNoteView SecureNote { get; set; }
+ public Fido2KeyView Fido2Key { get; set; }
public List Attachments { get; set; }
public List Fields { get; set; }
public List PasswordHistory { get; set; }
public HashSet CollectionIds { get; set; }
public DateTime RevisionDate { get; set; }
+ public DateTime CreationDate { get; set; }
public DateTime? DeletedDate { get; set; }
public CipherRepromptType Reprompt { get; set; }
@@ -64,6 +67,8 @@ namespace Bit.Core.Models.View
return Card;
case CipherType.Identity:
return Identity;
+ case CipherType.Fido2Key:
+ return Fido2Key;
default:
break;
}
@@ -110,5 +115,10 @@ namespace Bit.Core.Models.View
return LinkedFieldOptions.Find(lfo => lfo.Value == id).Key;
}
+ public string ComparableName => Name + Login?.Username + Fido2Key?.UserName;
+
+ public bool CanLaunch => Login?.CanLaunch == true || Fido2Key?.CanLaunch == true;
+
+ public string LaunchUri => Login?.LaunchUri ?? Fido2Key?.LaunchUri;
}
}
diff --git a/src/Core/Models/View/Fido2KeyView.cs b/src/Core/Models/View/Fido2KeyView.cs
new file mode 100644
index 000000000..dcdddd8a8
--- /dev/null
+++ b/src/Core/Models/View/Fido2KeyView.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.View
+{
+ public class Fido2KeyView : ItemView, ILaunchableView
+ {
+ public string NonDiscoverableId { get; set; }
+ public string KeyType { get; set; } = Constants.DefaultFido2KeyType;
+ public string KeyAlgorithm { get; set; } = Constants.DefaultFido2KeyAlgorithm;
+ public string KeyCurve { get; set; } = Constants.DefaultFido2KeyCurve;
+ public string KeyValue { get; set; }
+ public string RpId { get; set; }
+ public string RpName { get; set; }
+ public string UserHandle { get; set; }
+ public string UserName { get; set; }
+ public string Counter { get; set; }
+
+ public override string SubTitle => UserName;
+ public override List> LinkedFieldOptions => new List>();
+ public bool CanLaunch => !string.IsNullOrEmpty(RpId);
+ public string LaunchUri => $"https://{RpId}";
+
+ public bool IsUniqueAgainst(Fido2KeyView fido2View) => fido2View?.RpId != RpId || fido2View?.UserName != UserName;
+ }
+}
diff --git a/src/Core/Models/View/ILaunchableView.cs b/src/Core/Models/View/ILaunchableView.cs
new file mode 100644
index 000000000..2156d3140
--- /dev/null
+++ b/src/Core/Models/View/ILaunchableView.cs
@@ -0,0 +1,8 @@
+namespace Bit.Core.Models.View
+{
+ public interface ILaunchableView
+ {
+ bool CanLaunch { get; }
+ string LaunchUri { get; }
+ }
+}
diff --git a/src/Core/Models/View/LoginUriView.cs b/src/Core/Models/View/LoginUriView.cs
index 62ca2dd39..44874ab1c 100644
--- a/src/Core/Models/View/LoginUriView.cs
+++ b/src/Core/Models/View/LoginUriView.cs
@@ -7,7 +7,7 @@ using Bit.Core.Utilities;
namespace Bit.Core.Models.View
{
- public class LoginUriView : View
+ public class LoginUriView : View, ILaunchableView
{
private HashSet _canLaunchWhitelist = new HashSet
{
diff --git a/src/Core/Models/View/LoginView.cs b/src/Core/Models/View/LoginView.cs
index 850082115..94a735dc6 100644
--- a/src/Core/Models/View/LoginView.cs
+++ b/src/Core/Models/View/LoginView.cs
@@ -20,6 +20,8 @@ namespace Bit.Core.Models.View
public DateTime? PasswordRevisionDate { get; set; }
public string Totp { get; set; }
public List Uris { get; set; }
+ public Fido2KeyView Fido2Key { get; set; }
+
public string Uri => HasUris ? Uris[0].Uri : null;
public string MaskedPassword => Password != null ? "••••••••" : null;
public override string SubTitle => Username;
diff --git a/src/Core/Services/CipherService.cs b/src/Core/Services/CipherService.cs
index e289a1ae6..b56c7f0cf 100644
--- a/src/Core/Services/CipherService.cs
+++ b/src/Core/Services/CipherService.cs
@@ -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
};
@@ -531,8 +532,13 @@ namespace Bit.Core.Services
await UpsertAsync(data);
}
- public async Task ShareWithServerAsync(CipherView cipher, string organizationId, HashSet collectionIds)
+ public async Task ShareWithServerAsync(CipherView cipher, string organizationId, HashSet collectionIds)
{
+ if (!await ValidateCanBeSharedWithOrgAsync(cipher, organizationId))
+ {
+ return ICipherService.ShareWithServerError.DuplicatedPasskeyInOrg;
+ }
+
var attachmentTasks = new List();
if (cipher.Attachments != null)
{
@@ -553,6 +559,34 @@ namespace Bit.Core.Services
var userId = await _stateService.GetActiveUserIdAsync();
var data = new CipherData(response, userId, collectionIds);
await UpsertAsync(data);
+
+ return ICipherService.ShareWithServerError.None;
+ }
+
+ private async Task ValidateCanBeSharedWithOrgAsync(CipherView cipher, string organizationId)
+ {
+ if (cipher.Login?.Fido2Key is null && cipher.Fido2Key is null)
+ {
+ return true;
+ }
+
+ var decCiphers = await GetAllDecryptedAsync();
+ var orgCiphers = decCiphers.Where(c => c.OrganizationId == organizationId);
+ if (cipher.Login?.Fido2Key != null)
+ {
+ return !orgCiphers.Any(c => !cipher.Login.Fido2Key.IsUniqueAgainst(c.Login?.Fido2Key)
+ ||
+ !cipher.Login.Fido2Key.IsUniqueAgainst(c.Fido2Key));
+ }
+
+ if (cipher.Fido2Key != null)
+ {
+ return !orgCiphers.Any(c => !cipher.Fido2Key.IsUniqueAgainst(c.Login?.Fido2Key)
+ ||
+ !cipher.Fido2Key.IsUniqueAgainst(c.Fido2Key));
+ }
+
+ return true;
}
public async Task SaveAttachmentRawWithServerAsync(Cipher cipher, string filename, byte[] data)
@@ -1104,6 +1138,11 @@ namespace Bit.Core.Services
cipher.Login.Uris.Add(loginUri);
}
}
+ if (model.Login.Fido2Key != null)
+ {
+ cipher.Login.Fido2Key = new Fido2Key();
+ await EncryptObjPropertyAsync(model.Login.Fido2Key, cipher.Login.Fido2Key, Fido2Key.EncryptableProperties, key);
+ }
break;
case CipherType.SecureNote:
cipher.SecureNote = new SecureNote
@@ -1147,6 +1186,10 @@ namespace Bit.Core.Services
"LicenseNumber"
}, key);
break;
+ case CipherType.Fido2Key:
+ cipher.Fido2Key = new Fido2Key();
+ await EncryptObjPropertyAsync(model.Fido2Key, cipher.Fido2Key, Fido2Key.EncryptableProperties, key);
+ break;
default:
throw new Exception("Unknown cipher type.");
}
@@ -1229,8 +1272,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 +1286,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);
}
}
diff --git a/src/Core/Utilities/CipherTypeExtensions.cs b/src/Core/Utilities/CipherTypeExtensions.cs
new file mode 100644
index 000000000..b306fc4ce
--- /dev/null
+++ b/src/Core/Utilities/CipherTypeExtensions.cs
@@ -0,0 +1,14 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Utilities
+{
+ public static class CipherTypeExtensions
+ {
+ public static bool IsEqualToOrCanSignIn(this CipherType type, CipherType type2)
+ {
+ return type == type2
+ ||
+ (type == CipherType.Login && type2 == CipherType.Fido2Key);
+ }
+ }
+}
diff --git a/src/iOS.Autofill/Resources/bwi-font.ttf b/src/iOS.Autofill/Resources/bwi-font.ttf
index 7c7afd4cd..f9b63283e 100644
Binary files a/src/iOS.Autofill/Resources/bwi-font.ttf and b/src/iOS.Autofill/Resources/bwi-font.ttf differ
diff --git a/src/iOS.Extension/Resources/bwi-font.ttf b/src/iOS.Extension/Resources/bwi-font.ttf
index 51281cb41..f9b63283e 100644
Binary files a/src/iOS.Extension/Resources/bwi-font.ttf and b/src/iOS.Extension/Resources/bwi-font.ttf differ
diff --git a/src/iOS/Resources/bwi-font.ttf b/src/iOS/Resources/bwi-font.ttf
index 7c7afd4cd..f9b63283e 100644
Binary files a/src/iOS/Resources/bwi-font.ttf and b/src/iOS/Resources/bwi-font.ttf differ