Merge a91399b3a8 into 06488539b0

.gitignore

@@ -148,7 +148,6 @@ publish/
 
 # NuGet Packages
 *.nupkg
-!**/Xamarin.AndroidX.Credentials.1.0.0.nupkg
 # The packages folder can be ignored because of Package Restore
 **/packages/*
 # except build/, which is used as an MSBuild target.

lib/android/Xamarin.AndroidX.Credentials/net8.0-android/Xamarin.AndroidX.Credentials.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Xamarin.AndroidX.Credentials</name>
-    </assembly>
-    <members>
-    </members>
-</doc>

nuget.config

@@ -2,6 +2,5 @@
 <configuration>
     <packageSources>
         <add key="MAUI Nightly builds" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/maui-nightly/nuget/v3/index.json" />
-        <add key="Local AndroidX Credentials" value="lib/android/Xamarin.AndroidX.Credentials" />
     </packageSources>
 </configuration>

src/App/App.csproj

@@ -117,13 +117,10 @@
 	  <Folder Include="Platforms\Android\Services\" />
 	  <Folder Include="Platforms\Android\Tiles\" />
 	  <Folder Include="Platforms\Android\Utilities\" />
-	  <Folder Include="Platforms\Android\Resources\drawable-xxxhdpi\" />
-	  <Folder Include="Resources\Raw\" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
 	  <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
 	  <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.7.2.1" />
-      <PackageReference Include="Xamarin.AndroidX.Credentials" Version="1.0.0" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' AND !$(DefineConstants.Contains(FDROID))">
 	  <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.5" />
@@ -259,13 +256,8 @@
 	  <None Remove="Platforms\iOS\Resources\more_vert.png" />
 	  <None Remove="Platforms\iOS\Resources\logo_white.png" />
 	  <None Remove="Platforms\iOS\Resources\logo%402x.png" />
-	  <None Remove="Platforms\Android\Resources\drawable-xxxhdpi\" />
-	  <None Remove="Resources\Raw\" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
 		<BundleResource Include="Platforms\iOS\PrivacyInfo.xcprivacy" LogicalName="PrivacyInfo.xcprivacy" />
 	</ItemGroup>
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-	  <MauiAsset Include="Resources\Raw\fido2_priviliged_allow_list.json" LogicalName="fido2_priviliged_allow_list.json" />
-	</ItemGroup>
 </Project>

src/App/Platforms/Android/Autofill/CredentialHelpers.cs

@@ -1,303 +0,0 @@
-using System.Text.Json.Nodes;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using AndroidX.Credentials;
-using AndroidX.Credentials.Exceptions;
-using AndroidX.Credentials.Provider;
-using AndroidX.Credentials.WebAuthn;
-using Bit.App.Abstractions;
-using Bit.App.Droid.Utilities;
-using Bit.Core.Abstractions;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-using Bit.Core.Utilities.Fido2.Extensions;
-using Bit.Droid;
-using Org.Json;
-using Activity = Android.App.Activity;
-using Drawables = Android.Graphics.Drawables;
-
-namespace Bit.App.Platforms.Android.Autofill
-{
-    public static class CredentialHelpers
-    {
-        public static async Task<List<CredentialEntry>> PopulatePasskeyDataAsync(CallingAppInfo callingAppInfo,
-            BeginGetPublicKeyCredentialOption option, Context context, bool hasVaultBeenUnlockedInThisTransaction)
-        {
-            var passkeyEntries = new List<CredentialEntry>();
-            var requestOptions = new PublicKeyCredentialRequestOptions(option.RequestJson);
-
-            var authenticator = Bit.Core.Utilities.ServiceContainer.Resolve<IFido2AuthenticatorService>();
-            var credentials = await authenticator.SilentCredentialDiscoveryAsync(requestOptions.RpId);
-
-            // We need to change the request code for every pending intent on mapping the credential so the extras are not overriten by the last
-            // credential entry created.
-            int requestCodeAddition = 0;
-            passkeyEntries = credentials.Select(credential => MapCredential(credential, option, context, hasVaultBeenUnlockedInThisTransaction, Bit.Droid.Autofill.CredentialProviderService.UniqueGetRequestCode + requestCodeAddition++) as CredentialEntry).ToList();
-
-            return passkeyEntries;
-        }
-
-        private static PublicKeyCredentialEntry MapCredential(Fido2AuthenticatorDiscoverableCredentialMetadata credential, BeginGetPublicKeyCredentialOption option, Context context, bool hasVaultBeenUnlockedInThisTransaction, int requestCode)
-        {
-            var credDataBundle = new Bundle();
-            credDataBundle.PutByteArray(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialIdIntentExtra, credential.Id);
-
-            var intent = new Intent(context, typeof(Bit.Droid.Autofill.CredentialProviderSelectionActivity))
-                .SetAction(Bit.Droid.Autofill.CredentialProviderService.GetFido2IntentAction).SetPackage(Constants.PACKAGE_NAME);
-            intent.PutExtra(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialDataIntentExtra, credDataBundle);
-            intent.PutExtra(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialProviderCipherId, credential.CipherId);
-            intent.PutExtra(Bit.Core.Utilities.Fido2.CredentialProviderConstants.CredentialHasVaultBeenUnlockedInThisTransactionExtra, hasVaultBeenUnlockedInThisTransaction);
-            var pendingIntent = PendingIntent.GetActivity(context, requestCode, intent,
-                PendingIntentFlags.Mutable | PendingIntentFlags.UpdateCurrent);
-
-            return new PublicKeyCredentialEntry.Builder(
-                        context,
-                        credential.UserName ?? "No username",
-                        pendingIntent,
-                        option)
-                    .SetDisplayName(credential.UserName ?? "No username")
-                    .SetIcon(Drawables.Icon.CreateWithResource(context, Microsoft.Maui.Resource.Drawable.icon))
-                    .Build();
-        }
-
-        private static PublicKeyCredentialCreationOptions GetPublicKeyCredentialCreationOptionsFromJson(string json)
-        {
-            var request = new PublicKeyCredentialCreationOptions(json);
-            var jsonObj = new JSONObject(json);
-            var authenticatorSelection = jsonObj.GetJSONObject("authenticatorSelection");
-            request.AuthenticatorSelection = new AndroidX.Credentials.WebAuthn.AuthenticatorSelectionCriteria(
-                authenticatorSelection.OptString("authenticatorAttachment", "platform"),
-                authenticatorSelection.OptString("residentKey", null),
-                authenticatorSelection.OptBoolean("requireResidentKey", false),
-                authenticatorSelection.OptString("userVerification", "preferred"));
-
-            return request;
-        }
-
-        public static async Task CreateCipherPasskeyAsync(ProviderCreateCredentialRequest getRequest, Activity activity)
-        {
-            var callingRequest = getRequest?.CallingRequest as CreatePublicKeyCredentialRequest;
-
-            if (callingRequest is null)
-            {
-                if (ServiceContainer.TryResolve<IDeviceActionService>(out var deviceActionService))
-                {
-                    await deviceActionService.DisplayAlertAsync(AppResources.ErrorCreatingPasskey, string.Empty, AppResources.Ok);
-                }
-                FailAndFinish();
-                return;
-            }
-
-            var credentialCreationOptions = GetPublicKeyCredentialCreationOptionsFromJson(callingRequest.RequestJson);
-            var origin = await ValidateCallingAppInfoAndGetOriginAsync(getRequest.CallingAppInfo, credentialCreationOptions.Rp.Id);
-
-            if (origin is null)
-            {
-                if (ServiceContainer.TryResolve<IDeviceActionService>(out var deviceActionService))
-                {
-                    await deviceActionService.DisplayAlertAsync(AppResources.ErrorCreatingPasskey, AppResources.PasskeysNotSupportedForThisApp, AppResources.Ok);
-                }
-                FailAndFinish();
-                return;
-            }
-
-            var rp = new Core.Utilities.Fido2.PublicKeyCredentialRpEntity()
-            {
-                Id = credentialCreationOptions.Rp.Id,
-                Name = credentialCreationOptions.Rp.Name
-            };
-
-            var user = new Core.Utilities.Fido2.PublicKeyCredentialUserEntity()
-            {
-                Id = credentialCreationOptions.User.GetId(),
-                Name = credentialCreationOptions.User.Name,
-                DisplayName = credentialCreationOptions.User.DisplayName
-            };
-
-            var pubKeyCredParams = new List<Core.Utilities.Fido2.PublicKeyCredentialParameters>();
-            foreach (var pubKeyCredParam in credentialCreationOptions.PubKeyCredParams)
-            {
-                pubKeyCredParams.Add(new Core.Utilities.Fido2.PublicKeyCredentialParameters() { Alg = Convert.ToInt32(pubKeyCredParam.Alg), Type = pubKeyCredParam.Type });
-            }
-
-            var excludeCredentials = new List<Core.Utilities.Fido2.PublicKeyCredentialDescriptor>();
-            foreach (var excludeCred in credentialCreationOptions.ExcludeCredentials)
-            {
-                excludeCredentials.Add(new Core.Utilities.Fido2.PublicKeyCredentialDescriptor() { Id = excludeCred.GetId(), Type = excludeCred.Type, Transports = excludeCred.Transports.ToArray() });
-            }
-
-            var authenticatorSelection = new Core.Utilities.Fido2.AuthenticatorSelectionCriteria()
-            {
-                UserVerification = credentialCreationOptions.AuthenticatorSelection.UserVerification,
-                ResidentKey = credentialCreationOptions.AuthenticatorSelection.ResidentKey,
-                RequireResidentKey = credentialCreationOptions.AuthenticatorSelection.RequireResidentKey
-            };
-
-            var timeout = Convert.ToInt32(credentialCreationOptions.Timeout);
-
-            var credentialCreateParams = new Fido2ClientCreateCredentialParams()
-            {
-                Challenge = credentialCreationOptions.GetChallenge(),
-                Origin = origin,
-                PubKeyCredParams = pubKeyCredParams.ToArray(),
-                Rp = rp,
-                User = user,
-                Timeout = timeout,
-                Attestation = credentialCreationOptions.Attestation,
-                AuthenticatorSelection = authenticatorSelection,
-                ExcludeCredentials = excludeCredentials.ToArray(),
-                Extensions = MapExtensionsFromJson(credentialCreationOptions),
-                SameOriginWithAncestors = true
-            };
-
-            var credentialExtraCreateParams = new Fido2ExtraCreateCredentialParams
-            (
-                callingRequest.GetClientDataHash(),
-                getRequest.CallingAppInfo?.PackageName
-            );
-
-            var fido2MediatorService = ServiceContainer.Resolve<IFido2MediatorService>();
-            var clientCreateCredentialResult = await fido2MediatorService.CreateCredentialAsync(credentialCreateParams, credentialExtraCreateParams);
-            if (clientCreateCredentialResult == null)
-            {
-                FailAndFinish();
-                return;
-            }
-
-            var transportsArray = new JSONArray();
-            if (clientCreateCredentialResult.Transports != null)
-            {
-                foreach (var transport in clientCreateCredentialResult.Transports)
-                {
-                    transportsArray.Put(transport);
-                }
-            }
-
-            var responseInnerAndroidJson = new JSONObject();
-            if (clientCreateCredentialResult.ClientDataJSON != null)
-            {
-                responseInnerAndroidJson.Put("clientDataJSON", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.ClientDataJSON));
-            }
-            responseInnerAndroidJson.Put("authenticatorData", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.AuthData));
-            responseInnerAndroidJson.Put("attestationObject", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.AttestationObject));
-            responseInnerAndroidJson.Put("transports", transportsArray);
-            responseInnerAndroidJson.Put("publicKeyAlgorithm", clientCreateCredentialResult.PublicKeyAlgorithm);
-            responseInnerAndroidJson.Put("publicKey", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.PublicKey));
-
-            var rootAndroidJson = new JSONObject();
-            rootAndroidJson.Put("id", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.CredentialId));
-            rootAndroidJson.Put("rawId", CoreHelpers.Base64UrlEncode(clientCreateCredentialResult.CredentialId));
-            rootAndroidJson.Put("authenticatorAttachment", "platform");
-            rootAndroidJson.Put("type", "public-key");
-            rootAndroidJson.Put("clientExtensionResults", MapExtensionsToJson(clientCreateCredentialResult.Extensions));
-            rootAndroidJson.Put("response", responseInnerAndroidJson);
-
-            var result = new Intent();
-            var publicKeyResponse = new CreatePublicKeyCredentialResponse(rootAndroidJson.ToString());
-            PendingIntentHandler.SetCreateCredentialResponse(result, publicKeyResponse);
-
-            activity.SetResult(Result.Ok, result);
-            activity.Finish();
-
-            void FailAndFinish()
-            {
-                var result = new Intent();
-                PendingIntentHandler.SetCreateCredentialException(result, new CreateCredentialUnknownException());
-
-                activity.SetResult(Result.Ok, result);
-                activity.Finish();
-            }
-        }
-
-        private static Fido2CreateCredentialExtensionsParams MapExtensionsFromJson(PublicKeyCredentialCreationOptions options)
-        {
-            if (options == null || !options.Json.Has("extensions"))
-            {
-                return null;
-            }
-
-            var extensions = options.Json.GetJSONObject("extensions");
-            return new Fido2CreateCredentialExtensionsParams
-            {
-                CredProps = extensions.Has("credProps") && extensions.GetBoolean("credProps")
-            };
-        }
-
-        private static JSONObject MapExtensionsToJson(Fido2CreateCredentialExtensionsResult extensions)
-        {
-            if (extensions == null)
-            {
-                return null;
-            }
-
-            var extensionsJson = new JSONObject();
-            if (extensions.CredProps != null)
-            {
-                var credPropsJson = new JSONObject();
-                credPropsJson.Put("rk", extensions.CredProps.Rk);
-                extensionsJson.Put("credProps", credPropsJson);
-            }
-
-            return extensionsJson;
-        }
-
-        public static async Task<string> LoadFido2PriviligedAllowedListAsync()
-        {
-            try
-            {
-                using var stream = await FileSystem.OpenAppPackageFileAsync("fido2_priviliged_allow_list.json");
-                using var reader = new StreamReader(stream);
-
-                return reader.ReadToEnd();
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public static async Task<string> ValidateCallingAppInfoAndGetOriginAsync(CallingAppInfo callingAppInfo, string rpId)
-        {
-            if (callingAppInfo.Origin is null)
-            {
-                return await ValidateAssetLinksAndGetOriginAsync(callingAppInfo, rpId);
-            }
-
-            var priviligedAllowedList = await LoadFido2PriviligedAllowedListAsync();
-            if (priviligedAllowedList is null)
-            {
-                throw new InvalidOperationException("Could not load Fido2 priviliged allowed list");
-            }
-
-            try
-            {
-                return callingAppInfo.GetOrigin(priviligedAllowedList);
-            }
-            catch (Java.Lang.IllegalStateException)
-            {
-                return null; // not priviliged
-            }
-            catch (Java.Lang.IllegalArgumentException)
-            {
-                return null; // wrong list format
-            }
-        }
-
-        private static async Task<string> ValidateAssetLinksAndGetOriginAsync(CallingAppInfo callingAppInfo, string rpId)
-        {
-            if (!ServiceContainer.TryResolve<IAssetLinksService>(out var assetLinksService))
-            {
-                throw new InvalidOperationException("Can't resolve IAssetLinksService");
-            }
-
-            var normalizedFingerprint = callingAppInfo.GetLatestCertificationFingerprint();
-
-            var isValid = await assetLinksService.ValidateAssetLinksAsync(rpId, callingAppInfo.PackageName, normalizedFingerprint);
-
-            return isValid ? callingAppInfo.GetAndroidOrigin() : null;
-        }
-    }
-}

src/App/Platforms/Android/Autofill/CredentialProviderSelectionActivity.cs

@@ -1,172 +0,0 @@
-using Android.App;
-using Android.Content;
-using Android.Content.PM;
-using Android.OS;
-using AndroidX.Credentials;
-using AndroidX.Credentials.Provider;
-using AndroidX.Credentials.WebAuthn;
-using Bit.App.Droid.Utilities;
-using Bit.App.Abstractions;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Utilities.Fido2;
-using Bit.Core.Services;
-using Bit.App.Platforms.Android.Autofill;
-using AndroidX.Credentials.Exceptions;
-using Org.Json;
-
-namespace Bit.Droid.Autofill
-{
-    [Activity(
-        NoHistory = true,
-        LaunchMode = LaunchMode.SingleTop)]
-    public class CredentialProviderSelectionActivity : MauiAppCompatActivity
-    {
-        private LazyResolve<IFido2MediatorService> _fido2MediatorService = new LazyResolve<IFido2MediatorService>();
-        private LazyResolve<IFido2AndroidGetAssertionUserInterface> _fido2GetAssertionUserInterface = new LazyResolve<IFido2AndroidGetAssertionUserInterface>();
-        private LazyResolve<IVaultTimeoutService> _vaultTimeoutService = new LazyResolve<IVaultTimeoutService>();
-        private LazyResolve<IStateService> _stateService = new LazyResolve<IStateService>();
-        private LazyResolve<ICipherService> _cipherService = new LazyResolve<ICipherService>();
-        private LazyResolve<IUserVerificationMediatorService> _userVerificationMediatorService = new LazyResolve<IUserVerificationMediatorService>();
-        private LazyResolve<IDeviceActionService> _deviceActionService = new LazyResolve<IDeviceActionService>();
-
-        protected override void OnCreate(Bundle bundle)
-        {
-            Intent?.Validate();
-            base.OnCreate(bundle);
-
-            var cipherId = Intent?.GetStringExtra(CredentialProviderConstants.CredentialProviderCipherId);
-            if (string.IsNullOrEmpty(cipherId))
-            {
-                Finish();
-                return;
-            }
-
-            GetCipherAndPerformFido2AuthAsync(cipherId).FireAndForget();
-        }
-
-        //Used to avoid crash on MAUI when doing back
-        public override void OnBackPressed()
-        {
-            Finish();
-        }
-
-        private async Task GetCipherAndPerformFido2AuthAsync(string cipherId)
-        {
-            string RpId = string.Empty;
-            try
-            {
-                var getRequest = PendingIntentHandler.RetrieveProviderGetCredentialRequest(Intent);
-
-                if (getRequest is null)
-                {
-                    FailAndFinish();
-                    return;
-                }
-
-                var credentialOption = getRequest.CredentialOptions.FirstOrDefault();
-                var credentialPublic = credentialOption as GetPublicKeyCredentialOption;
-
-                var requestOptions = new PublicKeyCredentialRequestOptions(credentialPublic.RequestJson);
-                RpId = requestOptions.RpId;
-
-                var requestInfo = Intent.GetBundleExtra(CredentialProviderConstants.CredentialDataIntentExtra);
-                var credentialId = requestInfo?.GetByteArray(CredentialProviderConstants.CredentialIdIntentExtra);
-                var hasVaultBeenUnlockedInThisTransaction = Intent.GetBooleanExtra(CredentialProviderConstants.CredentialHasVaultBeenUnlockedInThisTransactionExtra, false);
-
-                var packageName = getRequest.CallingAppInfo.PackageName;
-
-                var origin = await CredentialHelpers.ValidateCallingAppInfoAndGetOriginAsync(getRequest.CallingAppInfo, RpId);
-                if (origin is null)
-                {
-                    await _deviceActionService.Value.DisplayAlertAsync(AppResources.ErrorReadingPasskey, AppResources.PasskeysNotSupportedForThisApp, AppResources.Ok);
-                    FailAndFinish();
-                    return;
-                }
-
-                _fido2GetAssertionUserInterface.Value.Init(
-                    cipherId,
-                    false,
-                    () => hasVaultBeenUnlockedInThisTransaction,
-                    RpId
-                );
-
-                var clientAssertParams = new Fido2ClientAssertCredentialParams
-                {
-                    Challenge = requestOptions.GetChallenge(),
-                    RpId = RpId,
-                    AllowCredentials = new Core.Utilities.Fido2.PublicKeyCredentialDescriptor[] { new Core.Utilities.Fido2.PublicKeyCredentialDescriptor { Id = credentialId } },
-                    Origin = origin,
-                    SameOriginWithAncestors = true,
-                    UserVerification = requestOptions.UserVerification
-                };
-
-                var extraAssertParams = new Fido2ExtraAssertCredentialParams
-                (
-                    getRequest.CallingAppInfo.Origin != null ? credentialPublic.GetClientDataHash() : null,
-                    packageName
-                );
-
-                var assertResult = await _fido2MediatorService.Value.AssertCredentialAsync(clientAssertParams, extraAssertParams);
-
-                var result = new Intent();
-
-                var responseInnerAndroidJson = new JSONObject();
-                if (assertResult.ClientDataJSON != null)
-                {
-                    responseInnerAndroidJson.Put("clientDataJSON", CoreHelpers.Base64UrlEncode(assertResult.ClientDataJSON));
-                }
-                responseInnerAndroidJson.Put("authenticatorData", CoreHelpers.Base64UrlEncode(assertResult.AuthenticatorData));
-                responseInnerAndroidJson.Put("signature", CoreHelpers.Base64UrlEncode(assertResult.Signature));
-                responseInnerAndroidJson.Put("userHandle", CoreHelpers.Base64UrlEncode(assertResult.SelectedCredential.UserHandle));
-
-                var rootAndroidJson = new JSONObject();
-                rootAndroidJson.Put("id", CoreHelpers.Base64UrlEncode(assertResult.SelectedCredential.Id));
-                rootAndroidJson.Put("rawId", CoreHelpers.Base64UrlEncode(assertResult.SelectedCredential.Id));
-                rootAndroidJson.Put("authenticatorAttachment", "platform");
-                rootAndroidJson.Put("type", "public-key");
-                rootAndroidJson.Put("clientExtensionResults", new JSONObject());
-                rootAndroidJson.Put("response", responseInnerAndroidJson);
-
-                var json = rootAndroidJson.ToString();
-
-                var cred = new PublicKeyCredential(json);
-                var credResponse = new GetCredentialResponse(cred);
-                PendingIntentHandler.SetGetCredentialResponse(result, credResponse);
-
-                await MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    SetResult(Result.Ok, result);
-                    Finish();
-                });
-            }
-            catch (NotAllowedError)
-            {
-                await MainThread.InvokeOnMainThreadAsync(async () =>
-                {
-                    await _deviceActionService.Value.DisplayAlertAsync(AppResources.ErrorReadingPasskey, string.Format(AppResources.ThereWasAProblemReadingAPasskeyForXTryAgainLater, RpId), AppResources.Ok);
-                    FailAndFinish();
-                });
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                await MainThread.InvokeOnMainThreadAsync(async () =>
-                {
-                    await _deviceActionService.Value.DisplayAlertAsync(AppResources.ErrorReadingPasskey, string.Format(AppResources.ThereWasAProblemReadingAPasskeyForXTryAgainLater, RpId), AppResources.Ok);
-                    FailAndFinish();
-                });
-            }
-        }
-
-        private void FailAndFinish()
-        {
-            var result = new Intent();
-            PendingIntentHandler.SetGetCredentialException(result, new GetCredentialUnknownException());
-
-            SetResult(Result.Ok, result);
-            Finish();
-        }
-    }
-}

src/App/Platforms/Android/Autofill/CredentialProviderService.cs

@@ -1,168 +0,0 @@
-using Android;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using AndroidX.Credentials.Provider;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using AndroidX.Credentials.Exceptions;
-using Bit.App.Droid.Utilities;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Droid.Autofill
-{
-    [Service(Permission = Manifest.Permission.BindCredentialProviderService, Label = "Bitwarden", Exported = true)]
-    [IntentFilter(new string[] { "android.service.credentials.CredentialProviderService" })]
-    [MetaData("android.credentials.provider", Resource = "@xml/provider")]
-    [Register("com.x8bit.bitwarden.Autofill.CredentialProviderService")]
-    public class CredentialProviderService : AndroidX.Credentials.Provider.CredentialProviderService
-    {
-        public const string GetFido2IntentAction = "PACKAGE_NAME.GET_PASSKEY";
-        public const string CreateFido2IntentAction = "PACKAGE_NAME.CREATE_PASSKEY";
-        public const int UniqueGetRequestCode = 94556023;
-        public const int UniqueCreateRequestCode = 94556024;
-
-        private readonly LazyResolve<IVaultTimeoutService> _vaultTimeoutService = new LazyResolve<IVaultTimeoutService>();
-        private readonly LazyResolve<IStateService> _stateService = new LazyResolve<IStateService>();
-        private readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
-
-        public override async void OnBeginCreateCredentialRequest(BeginCreateCredentialRequest request,
-            CancellationSignal cancellationSignal, IOutcomeReceiver callback)
-        {
-            try
-            {
-                var response = await ProcessCreateCredentialsRequestAsync(request);
-                if (response != null)
-                {
-                    await MainThread.InvokeOnMainThreadAsync(() => callback.OnResult(response));
-                    return;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.Value.Exception(ex);
-            }
-            MainThread.BeginInvokeOnMainThread(() => callback.OnError(AppResources.ErrorCreatingPasskey));
-        }
-
-        public override async void OnBeginGetCredentialRequest(BeginGetCredentialRequest request,
-            CancellationSignal cancellationSignal, IOutcomeReceiver callback)
-        {
-            try
-            {
-                await _vaultTimeoutService.Value.CheckVaultTimeoutAsync();
-                var locked = await _vaultTimeoutService.Value.IsLockedAsync();
-                if (!locked)
-                {
-                    var response = await ProcessGetCredentialsRequestAsync(request);
-                    callback.OnResult(response);
-                    return;
-                }
-
-                var intent = new Intent(ApplicationContext, typeof(MainActivity));
-                intent.PutExtra(CredentialProviderConstants.Fido2CredentialAction, CredentialProviderConstants.Fido2CredentialGet);
-                var pendingIntent = PendingIntent.GetActivity(ApplicationContext, UniqueGetRequestCode, intent,
-                    AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true));
-
-                var unlockAction = new AuthenticationAction(AppResources.Unlock, pendingIntent);
-
-                var unlockResponse = new BeginGetCredentialResponse.Builder()
-                    .SetAuthenticationActions(new List<AuthenticationAction>() { unlockAction } )
-                    .Build();
-                callback.OnResult(unlockResponse);
-            }
-            catch (GetCredentialException e)
-            {
-                _logger.Value.Exception(e);
-                callback.OnError(e.ErrorMessage ?? AppResources.ErrorReadingPasskey);
-            }
-            catch (Exception e)
-            {
-                _logger.Value.Exception(e);
-                callback.OnError(AppResources.ErrorReadingPasskey);
-            }
-        }
-
-        private async Task<BeginCreateCredentialResponse> ProcessCreateCredentialsRequestAsync(
-            BeginCreateCredentialRequest request)
-        {
-            if (request == null) { return null; }
-
-            if (request is BeginCreatePasswordCredentialRequest beginCreatePasswordCredentialRequest)
-            {
-                //This flow can be used if Password flow needs to be implemented
-                throw new NotImplementedException();
-                //return HandleCreatePasswordQuery(beginCreatePasswordCredentialRequest);
-            }
-            else if (request is BeginCreatePublicKeyCredentialRequest beginCreatePublicKeyCredentialRequest)
-            {
-                return await HandleCreatePasskeyQueryAsync(beginCreatePublicKeyCredentialRequest);
-            }
-
-            return null;
-        }
-
-        private async Task<BeginCreateCredentialResponse> HandleCreatePasskeyQueryAsync(BeginCreatePublicKeyCredentialRequest optionRequest)
-        {
-            var intent = new Intent(ApplicationContext, typeof(MainActivity));
-            intent.PutExtra(CredentialProviderConstants.Fido2CredentialAction, CredentialProviderConstants.Fido2CredentialCreate);
-            var pendingIntent = PendingIntent.GetActivity(ApplicationContext, UniqueCreateRequestCode, intent,
-                AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true));
-
-            var userEmail = await GetSafeActiveAccountEmailAsync();
-
-            var createEntryBuilder = new CreateEntry.Builder(userEmail ?? AppResources.Bitwarden, pendingIntent)
-                .SetDescription(userEmail != null
-                                    ? string.Format(AppResources.YourPasskeyWillBeSavedToYourBitwardenVaultForX, userEmail)
-                                    : AppResources.YourPasskeyWillBeSavedToYourBitwardenVault)
-                .Build();
-
-            var createCredentialResponse = new BeginCreateCredentialResponse.Builder()
-                .AddCreateEntry(createEntryBuilder);
-
-            return createCredentialResponse.Build();
-        }
-
-        private async Task<BeginGetCredentialResponse> ProcessGetCredentialsRequestAsync(
-            BeginGetCredentialRequest request)
-        {
-            var credentialEntries = new List<CredentialEntry>();
-
-            foreach (var option in request.BeginGetCredentialOptions.OfType<BeginGetPublicKeyCredentialOption>())
-            {
-                credentialEntries.AddRange(await Bit.App.Platforms.Android.Autofill.CredentialHelpers.PopulatePasskeyDataAsync(request.CallingAppInfo, option, ApplicationContext, false));
-            }
-
-            if (!credentialEntries.Any())
-            {
-                return new BeginGetCredentialResponse();
-            }
-
-            return new BeginGetCredentialResponse.Builder()
-                .SetCredentialEntries(credentialEntries)
-                .Build();
-        }
-
-        public override void OnClearCredentialStateRequest(ProviderClearCredentialStateRequest request,
-            CancellationSignal cancellationSignal, IOutcomeReceiver callback)
-        {
-            callback.OnResult(null);
-        }
-
-        private async Task<string> GetSafeActiveAccountEmailAsync()
-        {
-            try
-            {
-                return await _stateService.Value.GetEmailAsync();
-            }
-            catch (Exception ex)
-            {
-                // if it throws to get the user's email then we log and continue showing a more generic message
-                _logger.Value.Exception(ex);
-                return null;
-            }
-        }
-    }
-}

src/App/Platforms/Android/Autofill/Fido2GetAssertionUserInterface.cs

@@ -1,77 +0,0 @@
-using Bit.Core.Abstractions;
-using Bit.Core.Services;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.App.Platforms.Android.Autofill
-{
-    public interface IFido2AndroidGetAssertionUserInterface : IFido2GetAssertionUserInterface
-    {
-        void Init(string cipherId,
-            bool userVerified,
-            Func<bool> hasVaultBeenUnlockedInThisTransaction,
-            string rpId);
-    }
-
-    public class Fido2GetAssertionUserInterface : Core.Utilities.Fido2.Fido2GetAssertionUserInterface, IFido2AndroidGetAssertionUserInterface
-    {
-        private readonly IStateService _stateService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ICipherService _cipherService;
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-
-        public Fido2GetAssertionUserInterface(IStateService stateService, 
-            IVaultTimeoutService vaultTimeoutService,
-            ICipherService cipherService,
-            IUserVerificationMediatorService userVerificationMediatorService)
-        {
-            _stateService = stateService;
-            _vaultTimeoutService = vaultTimeoutService;
-            _cipherService = cipherService;
-            _userVerificationMediatorService = userVerificationMediatorService;
-        }
-
-        public void Init(string cipherId,
-            bool userVerified,
-            Func<bool> hasVaultBeenUnlockedInThisTransaction,
-            string rpId)
-        {
-            Init(cipherId, 
-                userVerified, 
-                EnsureAuthenAndVaultUnlockedAsync, 
-                hasVaultBeenUnlockedInThisTransaction, 
-                (cipherId, userVerificationPreference) => VerifyUserAsync(cipherId, userVerificationPreference, rpId, hasVaultBeenUnlockedInThisTransaction()));
-        }
-
-        public async Task EnsureAuthenAndVaultUnlockedAsync()
-        {
-            if (!await _stateService.IsAuthenticatedAsync() || await _vaultTimeoutService.IsLockedAsync())
-            {
-                // this should never happen but just in case.
-                throw new InvalidOperationException("Not authed or vault locked");
-            }
-        }
-
-        private async Task<bool> VerifyUserAsync(string selectedCipherId, Fido2UserVerificationPreference userVerificationPreference, string rpId, bool vaultUnlockedDuringThisTransaction)
-        {
-            try
-            {
-                var encrypted = await _cipherService.GetAsync(selectedCipherId);
-                var cipher = await encrypted.DecryptAsync();
-
-                var userVerification = await _userVerificationMediatorService.VerifyUserForFido2Async(
-                    new Fido2UserVerificationOptions(
-                        cipher?.Reprompt == Core.Enums.CipherRepromptType.Password,
-                        userVerificationPreference,
-                        vaultUnlockedDuringThisTransaction,
-                        rpId)
-                    );
-                return !userVerification.IsCancelled && userVerification.Result;
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                return false;
-            }
-        }
-    }
-}

src/App/Platforms/Android/Autofill/Fido2MakeCredentialUserInterface.cs

@@ -1,202 +0,0 @@
-using Bit.App.Abstractions;
-using Bit.Core.Abstractions;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.App.Platforms.Android.Autofill
-{
-    public class Fido2MakeCredentialUserInterface : IFido2MakeCredentialConfirmationUserInterface
-    {
-        private readonly IStateService _stateService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
-        private readonly ICipherService _cipherService;
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private LazyResolve<IMessagingService> _messagingService = new LazyResolve<IMessagingService>();
-
-        private TaskCompletionSource<(string cipherId, bool? userVerified)> _confirmCredentialTcs;
-        private TaskCompletionSource<bool> _unlockVaultTcs;
-        private Fido2UserVerificationOptions? _currentDefaultUserVerificationOptions;
-        private Func<bool> _checkHasVaultBeenUnlockedInThisTransaction;
-
-        public Fido2MakeCredentialUserInterface(IStateService stateService,
-            IVaultTimeoutService vaultTimeoutService,
-            ICipherService cipherService,
-            IUserVerificationMediatorService userVerificationMediatorService,
-            IDeviceActionService deviceActionService,
-            IPlatformUtilsService platformUtilsService)
-        {
-            _stateService = stateService;
-            _vaultTimeoutService = vaultTimeoutService;
-            _cipherService = cipherService;
-            _userVerificationMediatorService = userVerificationMediatorService;
-            _deviceActionService = deviceActionService;
-            _platformUtilsService = platformUtilsService;
-        }
-
-        public bool HasVaultBeenUnlockedInThisTransaction => _checkHasVaultBeenUnlockedInThisTransaction?.Invoke() == true;
-
-        public bool IsConfirmingNewCredential => _confirmCredentialTcs?.Task != null && !_confirmCredentialTcs.Task.IsCompleted;
-        public bool IsWaitingUnlockVault => _unlockVaultTcs?.Task != null && !_unlockVaultTcs.Task.IsCompleted;
-
-        public async Task<(string CipherId, bool UserVerified)> ConfirmNewCredentialAsync(Fido2ConfirmNewCredentialParams confirmNewCredentialParams)
-        {
-            _confirmCredentialTcs?.TrySetCanceled();
-            _confirmCredentialTcs = null;
-            _confirmCredentialTcs = new TaskCompletionSource<(string cipherId, bool? userVerified)>();
-
-            _currentDefaultUserVerificationOptions = new Fido2UserVerificationOptions(false, confirmNewCredentialParams.UserVerificationPreference, HasVaultBeenUnlockedInThisTransaction, confirmNewCredentialParams.RpId);
-            
-            _messagingService.Value.Send(Bit.Core.Constants.CredentialNavigateToAutofillCipherMessageCommand, confirmNewCredentialParams);
-
-            var (cipherId, isUserVerified) = await _confirmCredentialTcs.Task;
-
-            var verified = isUserVerified;
-            if (verified is null)
-            {
-                var userVerification = await VerifyUserAsync(cipherId, confirmNewCredentialParams.UserVerificationPreference, confirmNewCredentialParams.RpId);
-                // TODO: If cancelled then let the user choose another cipher.
-                // I think this can be done by showing a message to the uesr and recursive calling of this method ConfirmNewCredentialAsync
-                verified = !userVerification.IsCancelled && userVerification.Result;
-            }
-
-            if (cipherId is null)
-            {
-                return await CreateNewLoginForFido2CredentialAsync(confirmNewCredentialParams, verified.Value);
-            }
-
-            return (cipherId, verified.Value);
-        }
-
-        private async Task<(string CipherId, bool UserVerified)> CreateNewLoginForFido2CredentialAsync(Fido2ConfirmNewCredentialParams confirmNewCredentialParams, bool userVerified)
-        {
-            if (!userVerified && await _userVerificationMediatorService.ShouldEnforceFido2RequiredUserVerificationAsync(new Fido2UserVerificationOptions
-                (
-                    false,
-                    confirmNewCredentialParams.UserVerificationPreference,
-                    true,
-                    confirmNewCredentialParams.RpId
-                )))
-            {
-                return (null, false);
-            }
-
-            try
-            {
-                await _deviceActionService.ShowLoadingAsync(AppResources.Loading);
-
-                var cipherId = await _cipherService.CreateNewLoginForPasskeyAsync(confirmNewCredentialParams);
-
-                await _deviceActionService.HideLoadingAsync();
-
-                return (cipherId, userVerified);
-            }
-            catch
-            {
-                await _deviceActionService.HideLoadingAsync();
-                throw;
-            }
-        }
-
-        public async Task EnsureUnlockedVaultAsync()
-        {
-            if (!await _stateService.IsAuthenticatedAsync()
-                ||
-                await _vaultTimeoutService.IsLoggedOutByTimeoutAsync()
-                ||
-                await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
-            {
-                await NavigateAndWaitForUnlockAsync(Bit.Core.Enums.NavigationTarget.HomeLogin);
-                return;
-            }
-
-            if (!await _vaultTimeoutService.IsLockedAsync())
-            {
-                return;
-            }
-
-            await NavigateAndWaitForUnlockAsync(Bit.Core.Enums.NavigationTarget.Lock);
-        }
-
-        private async Task NavigateAndWaitForUnlockAsync(Bit.Core.Enums.NavigationTarget navTarget)
-        {
-            _unlockVaultTcs?.TrySetCanceled();
-            _unlockVaultTcs = new TaskCompletionSource<bool>();
-
-            _messagingService.Value.Send(Bit.Core.Constants.NavigateToMessageCommand, navTarget);
-
-            await _unlockVaultTcs.Task;
-        }
-
-        public Task InformExcludedCredentialAsync(string[] existingCipherIds)
-        {
-            // TODO: Show excluded credential to the user in some screen.
-            return Task.FromResult(true);
-        }
-
-        public void SetCheckHasVaultBeenUnlockedInThisTransaction(Func<bool> checkHasVaultBeenUnlockedInThisTransaction)
-        {
-            _checkHasVaultBeenUnlockedInThisTransaction = checkHasVaultBeenUnlockedInThisTransaction;
-        }
-
-        public void Confirm(string cipherId, bool? userVerified) => _confirmCredentialTcs?.TrySetResult((cipherId, userVerified));
-        public void ConfirmVaultUnlocked() => _unlockVaultTcs?.TrySetResult(true);
-
-        public async Task ConfirmAsync(string cipherId, bool alreadyHasFido2Credential, bool? userVerified)
-        {
-            if (alreadyHasFido2Credential
-                &&
-                !await _platformUtilsService.ShowDialogAsync(
-                    AppResources.ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey,
-                    AppResources.OverwritePasskey,
-                    AppResources.Yes,
-                    AppResources.No))
-            {
-                return;
-            }
-
-            Confirm(cipherId, userVerified);
-        }
-
-        public void Cancel() => _confirmCredentialTcs?.TrySetCanceled();
-
-        public void OnConfirmationException(Exception ex) => _confirmCredentialTcs?.TrySetException(ex);
-
-        private async Task<CancellableResult<bool>> VerifyUserAsync(string selectedCipherId, Fido2UserVerificationPreference userVerificationPreference, string rpId)
-        {
-            try
-            {
-                if (selectedCipherId is null && userVerificationPreference == Fido2UserVerificationPreference.Discouraged)
-                {
-                    return new CancellableResult<bool>(false);
-                }
-
-                var shouldCheckMasterPasswordReprompt = false;
-                if (selectedCipherId != null)
-                {
-                    var encrypted = await _cipherService.GetAsync(selectedCipherId);
-                    var cipher = await encrypted.DecryptAsync();
-                    shouldCheckMasterPasswordReprompt = cipher?.Reprompt == Core.Enums.CipherRepromptType.Password;
-                }
-
-                return await _userVerificationMediatorService.VerifyUserForFido2Async(
-                    new Fido2UserVerificationOptions(
-                        shouldCheckMasterPasswordReprompt,
-                        userVerificationPreference,
-                        HasVaultBeenUnlockedInThisTransaction,
-                        rpId)
-                    );
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                return new CancellableResult<bool>(false);
-            }
-        }
-
-        public Fido2UserVerificationOptions? GetCurrentUserVerificationOptions() => _currentDefaultUserVerificationOptions;
-    }
-}

src/App/Platforms/Android/MainActivity.cs

@@ -24,7 +24,6 @@ using Bit.App.Droid.Utilities;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using FileProvider = AndroidX.Core.Content.FileProvider;
-using Bit.Core.Utilities.Fido2;
 
 namespace Bit.Droid
 {
@@ -168,13 +167,6 @@ namespace Bit.Droid
             base.OnNewIntent(intent);
             try
             {
-                if (intent?.GetStringExtra(CredentialProviderConstants.Fido2CredentialAction) == CredentialProviderConstants.Fido2CredentialCreate
-                    &&
-                    _appOptions != null)
-                {
-                    _appOptions.HasUnlockedInThisTransaction = false;
-                }
-
                 if (intent?.GetStringExtra("uri") is string uri)
                 {
                     _messagingService.Send(App.App.POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE);
@@ -333,15 +325,12 @@ namespace Bit.Droid
 
         private AppOptions GetOptions()
         {
-            var fido2CredentialAction = Intent.GetStringExtra(CredentialProviderConstants.Fido2CredentialAction);
             var options = new AppOptions
             {
                 Uri = Intent.GetStringExtra("uri") ?? Intent.GetStringExtra(AutofillConstants.AutofillFrameworkUri),
                 MyVaultTile = Intent.GetBooleanExtra("myVaultTile", false),
                 GeneratorTile = Intent.GetBooleanExtra("generatorTile", false),
                 FromAutofillFramework = Intent.GetBooleanExtra(AutofillConstants.AutofillFramework, false),
-                Fido2CredentialAction = fido2CredentialAction,
-                FromFido2Framework = !string.IsNullOrWhiteSpace(fido2CredentialAction),
                 CreateSend = GetCreateSendRequest(Intent)
             };
             var fillType = Intent.GetIntExtra(AutofillConstants.AutofillFrameworkFillType, 0);

src/App/Platforms/Android/MainApplication.cs

@@ -20,10 +20,7 @@ using Bit.App.Utilities;
 using Bit.App.Pages;
 using Bit.App.Utilities.AccountManagement;
 using Bit.App.Controls;
-using Bit.App.Platforms.Android.Autofill;
 using Bit.Core.Enums;
-using Bit.Core.Services.UserVerification;
-
 #if !FDROID
 using Android.Gms.Security;
 #endif
@@ -88,57 +85,6 @@ namespace Bit.Droid
                     ServiceContainer.Resolve<IWatchDeviceService>(),
                     ServiceContainer.Resolve<IConditionedAwaiterManager>());
                 ServiceContainer.Register<IAccountsManager>("accountsManager", accountsManager);
-
-                var userPinService = new UserPinService(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<ICryptoService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>());
-                ServiceContainer.Register<IUserPinService>(userPinService);
-
-                var userVerificationMediatorService = new UserVerificationMediatorService(
-                    ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService"),
-                    ServiceContainer.Resolve<IPasswordRepromptService>("passwordRepromptService"),
-                    userPinService,
-                    deviceActionService,
-                    ServiceContainer.Resolve<IUserVerificationService>());
-                ServiceContainer.Register<IUserVerificationMediatorService>(userVerificationMediatorService);
-
-                var fido2AuthenticatorService = new Fido2AuthenticatorService(
-                    ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<ISyncService>(),
-                    ServiceContainer.Resolve<ICryptoFunctionService>(),
-                    userVerificationMediatorService);
-                ServiceContainer.Register<IFido2AuthenticatorService>(fido2AuthenticatorService);
-
-                var fido2GetAssertionUserInterface = new Fido2GetAssertionUserInterface(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>(),
-                    ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<IUserVerificationMediatorService>());
-                ServiceContainer.Register<IFido2AndroidGetAssertionUserInterface>(fido2GetAssertionUserInterface);                
-
-                var fido2MakeCredentialUserInterface = new Fido2MakeCredentialUserInterface(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IVaultTimeoutService>(),
-                    ServiceContainer.Resolve<ICipherService>(),
-                    ServiceContainer.Resolve<IUserVerificationMediatorService>(),
-                    ServiceContainer.Resolve<IDeviceActionService>(),
-                    ServiceContainer.Resolve<IPlatformUtilsService>());
-                ServiceContainer.Register<IFido2MakeCredentialConfirmationUserInterface>(fido2MakeCredentialUserInterface);
-
-                var fido2ClientService = new Fido2ClientService(
-                    ServiceContainer.Resolve<IStateService>(),
-                    ServiceContainer.Resolve<IEnvironmentService>(),
-                    ServiceContainer.Resolve<ICryptoFunctionService>(),
-                    ServiceContainer.Resolve<IFido2AuthenticatorService>(),
-                    fido2GetAssertionUserInterface,
-                    fido2MakeCredentialUserInterface);
-                ServiceContainer.Register<IFido2ClientService>(fido2ClientService);
-
-                ServiceContainer.Register<IFido2MediatorService>(new Fido2MediatorService(
-                    fido2AuthenticatorService,
-                    fido2ClientService,
-                    ServiceContainer.Resolve<ICipherService>()));
             }
 #if !FDROID
             if (Build.VERSION.SdkInt <= BuildVersionCodes.Kitkat)
@@ -214,6 +160,7 @@ namespace Bit.Droid
             var cryptoFunctionService = new PclCryptoFunctionService(cryptoPrimitiveService);
             var cryptoService = new CryptoService(stateService, cryptoFunctionService, logger);
             var biometricService = new BiometricService(stateService, cryptoService);
+            var userPinService = new UserPinService(stateService, cryptoService);
             var passwordRepromptService = new MobilePasswordRepromptService(platformUtilsService, cryptoService, stateService);
 
             ServiceContainer.Register<ISynchronousStorageService>(preferencesStorage);
@@ -237,6 +184,7 @@ namespace Bit.Droid
             ServiceContainer.Register<ICryptoService>("cryptoService", cryptoService);
             ServiceContainer.Register<IPasswordRepromptService>("passwordRepromptService", passwordRepromptService);
             ServiceContainer.Register<IAvatarImageSourcePool>("avatarImageSourcePool", new AvatarImageSourcePool());
+            ServiceContainer.Register<IUserPinService>(userPinService);
 
             // Push
 #if FDROID

src/App/Platforms/Android/Resources/xml/provider.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<credential-provider xmlns:android="http://schemas.android.com/apk/res/android">
-    <capabilities>
-        <capability name="androidx.credentials.TYPE_PUBLIC_KEY_CREDENTIAL" />
-    </capabilities>
-</credential-provider>

src/App/Platforms/Android/Services/AutofillHandler.cs

@@ -1,11 +1,11 @@
-using Android.App;
+using System.Linq;
+using System.Threading.Tasks;
+using Android.App;
 using Android.App.Assist;
 using Android.Content;
-using Android.Credentials;
 using Android.OS;
 using Android.Provider;
 using Android.Views.Autofill;
-using Bit.App.Abstractions;
 using Bit.Core.Resources.Localization;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
@@ -37,42 +37,6 @@ namespace Bit.Droid.Services
             _eventService = eventService;
         }
 
-        public bool CredentialProviderServiceEnabled()
-        {
-            if (Build.VERSION.SdkInt < BuildVersionCodes.UpsideDownCake)
-            {
-                return false;
-            }
-
-            try
-            {
-                var activity = (MainActivity)Platform.CurrentActivity;
-                if (activity == null)
-                {
-                    return false;
-                }
-
-                var credManager = activity.GetSystemService(Java.Lang.Class.FromType(typeof(CredentialManager))) as CredentialManager;
-                if (credManager == null)
-                {
-                    return false;
-                }
-
-                var credentialProviderServiceComponentName = new ComponentName(activity, Java.Lang.Class.FromType(typeof(CredentialProviderService)));
-                return credManager.IsEnabledCredentialProviderService(credentialProviderServiceComponentName);
-            }
-            catch (Java.Lang.NullPointerException) 
-            {
-                // CredentialManager API is not working fully and may return a NullPointerException even if the CredentialProviderService is working and enabled
-                // Info Here: https://developer.android.com/reference/android/credentials/CredentialManager#isEnabledCredentialProviderService(android.content.ComponentName)
-                return false;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
         public bool AutofillServiceEnabled()
         {
             if (Build.VERSION.SdkInt < BuildVersionCodes.O)
@@ -199,17 +163,7 @@ namespace Bit.Droid.Services
             return Accessibility.AccessibilityHelpers.OverlayPermitted();
         }
 
-        public void DisableCredentialProviderService()
-        {
-            try
-            {
-                // We should try to find a way to programmatically disable the provider service when the API allows for it.
-                // For now we'll take the user to Credential Settings so they can manually disable it
-                var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-                deviceActionService.OpenCredentialProviderSettings();
-            }
-            catch { }
-        }
+        
 
         public void DisableAutofillService()
         {

src/App/Platforms/Android/Services/DeviceActionService.cs

@@ -1,4 +1,6 @@
-using Android.App;
+using System;
+using System.Threading.Tasks;
+using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.Nfc;
@@ -9,20 +11,16 @@ using Android.Text.Method;
 using Android.Views;
 using Android.Views.InputMethods;
 using Android.Widget;
-using AndroidX.Credentials;
 using Bit.App.Abstractions;
 using Bit.Core.Resources.Localization;
 using Bit.App.Utilities;
 using Bit.App.Utilities.Prompts;
 using Bit.Core.Abstractions;
+using Bit.Core.Enums;
 using Bit.App.Droid.Utilities;
-using Bit.App.Models;
-using Bit.Droid.Autofill;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android;
 using Resource = Bit.Core.Resource;
 using Application = Android.App.Application;
-using Bit.Core.Services;
-using Bit.Core.Utilities.Fido2;
 
 namespace Bit.Droid.Services
 {
@@ -205,7 +203,7 @@ namespace Bit.Droid.Services
             string text = null, string okButtonText = null, string cancelButtonText = null,
             bool numericKeyboard = false, bool autofocus = true, bool password = false)
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return Task.FromResult<string>(null);
@@ -262,7 +260,7 @@ namespace Bit.Droid.Services
 
         public Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config)
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return Task.FromResult<ValidatablePromptResponse?>(null);
@@ -339,7 +337,7 @@ namespace Bit.Droid.Services
 
         public void RateApp()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             try
             {
                 var rateIntent = RateIntentForUrl("market://details", activity);
@@ -372,14 +370,14 @@ namespace Bit.Droid.Services
 
         public bool SupportsNfc()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             var manager = activity.GetSystemService(Context.NfcService) as NfcManager;
             return manager.DefaultAdapter?.IsEnabled ?? false;
         }
 
         public bool SupportsCamera()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             return activity.PackageManager.HasSystemFeature(PackageManager.FeatureCamera);
         }
 
@@ -395,7 +393,7 @@ namespace Bit.Droid.Services
 
         public Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons)
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return Task.FromResult<string>(null);
@@ -476,7 +474,7 @@ namespace Bit.Droid.Services
 
         public void OpenAccessibilityOverlayPermissionSettings()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             try
             {
                 var intent = new Intent(Settings.ActionManageOverlayPermission);
@@ -503,32 +501,11 @@ namespace Bit.Droid.Services
             }
         }
 
-        public void OpenCredentialProviderSettings()
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            try
-            {
-                var pendingIntent = ICredentialManager.Create(activity).CreateSettingsPendingIntent();
-                pendingIntent.Send();
-            }
-            catch (ActivityNotFoundException)
-            {
-                var alertBuilder = new AlertDialog.Builder(activity);
-                alertBuilder.SetMessage(AppResources.BitwardenCredentialProviderGoToSettings);
-                alertBuilder.SetCancelable(true);
-                alertBuilder.SetPositiveButton(AppResources.Ok, (sender, args) =>
-                {
-                    (sender as AlertDialog)?.Cancel();
-                });
-                alertBuilder.Create().Show();
-            }
-        }
-
         public void OpenAccessibilitySettings()
         {
             try
             {
-                var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+                var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
                 var intent = new Intent(Settings.ActionAccessibilitySettings);
                 activity.StartActivity(intent);
             }
@@ -537,7 +514,7 @@ namespace Bit.Droid.Services
 
         public void OpenAutofillSettings()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             try
             {
                 var intent = new Intent(Settings.ActionRequestSetAutofillService);
@@ -565,92 +542,10 @@ namespace Bit.Droid.Services
             // ref: https://developer.android.com/reference/android/os/SystemClock#elapsedRealtime()
             return SystemClock.ElapsedRealtime();
         }
-
-        public async Task ExecuteFido2CredentialActionAsync(AppOptions appOptions)
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            if (activity == null || string.IsNullOrWhiteSpace(appOptions.Fido2CredentialAction))
-            {
-                return;
-            }
-
-            if (appOptions.Fido2CredentialAction == CredentialProviderConstants.Fido2CredentialGet)
-            {
-                await ExecuteFido2GetCredentialAsync(appOptions);
-            }
-            else if (appOptions.Fido2CredentialAction == CredentialProviderConstants.Fido2CredentialCreate)
-            {
-                await ExecuteFido2CreateCredentialAsync();
-            }
-
-            // Clear CredentialAction and FromFido2Framework values to avoid erratic behaviors in subsequent navigation/flows
-            // For Fido2CredentialGet these are no longer needed as a new Activity will be initiated.
-            // For Fido2CredentialCreate the app will rely on IFido2MakeCredentialConfirmationUserInterface.IsConfirmingNewCredential
-            appOptions.Fido2CredentialAction = null;
-            appOptions.FromFido2Framework = false;
-        }
-
-        private async Task ExecuteFido2GetCredentialAsync(AppOptions appOptions)
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            if (activity == null) 
-            {
-                return; 
-            }
-
-            try
-            {
-                var request = AndroidX.Credentials.Provider.PendingIntentHandler.RetrieveBeginGetCredentialRequest(activity.Intent);
-                var response = new AndroidX.Credentials.Provider.BeginGetCredentialResponse();;
-                var credentialEntries = new List<AndroidX.Credentials.Provider.CredentialEntry>();
-                foreach (var option in request.BeginGetCredentialOptions.OfType<AndroidX.Credentials.Provider.BeginGetPublicKeyCredentialOption>())
-                {
-                    credentialEntries.AddRange(await Bit.App.Platforms.Android.Autofill.CredentialHelpers.PopulatePasskeyDataAsync(request.CallingAppInfo, option, activity, appOptions.HasUnlockedInThisTransaction));
-                }
-
-                if (credentialEntries.Any())
-                {
-                    response = new AndroidX.Credentials.Provider.BeginGetCredentialResponse.Builder()
-                        .SetCredentialEntries(credentialEntries)
-                        .Build();
-                }
-
-                var result = new Android.Content.Intent();
-                AndroidX.Credentials.Provider.PendingIntentHandler.SetBeginGetCredentialResponse(result, response);
-                activity.SetResult(Result.Ok, result);
-                activity.Finish();
-            }
-            catch (Exception ex)
-            {
-                Bit.Core.Services.LoggerHelper.LogEvenIfCantBeResolved(ex);
-
-                activity.SetResult(Result.Canceled);
-                activity.Finish();
-            }
-        }
-
-        private async Task ExecuteFido2CreateCredentialAsync()
-        {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
-            if (activity == null) { return; }
-
-            try
-            {
-                var getRequest = AndroidX.Credentials.Provider.PendingIntentHandler.RetrieveProviderCreateCredentialRequest(activity.Intent);
-                await Bit.App.Platforms.Android.Autofill.CredentialHelpers.CreateCipherPasskeyAsync(getRequest, activity);
-            }
-            catch (Exception ex)
-            {
-                Bit.Core.Services.LoggerHelper.LogEvenIfCantBeResolved(ex);
-
-                activity.SetResult(Result.Canceled);
-                activity.Finish();
-            }
-        }
         
         public void CloseMainApp()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = (MainActivity)Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
             if (activity == null)
             {
                 return;
@@ -664,8 +559,6 @@ namespace Bit.Droid.Services
             return true;
         }
 
-        public bool SupportsCredentialProviderService() => Build.VERSION.SdkInt >= BuildVersionCodes.UpsideDownCake;
-
         public bool SupportsAutofillServices() => Build.VERSION.SdkInt >= BuildVersionCodes.O;
 
         public bool SupportsInlineAutofill() => Build.VERSION.SdkInt >= BuildVersionCodes.R;
@@ -691,7 +584,7 @@ namespace Bit.Droid.Services
 
         public float GetSystemFontSizeScale()
         {
-            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
+            var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity as MainActivity;
             return activity?.Resources?.Configuration?.FontScale ?? 1;
         }
         

src/App/Platforms/Android/Utilities/CallingAppInfoExtensions.cs

@@ -1,37 +0,0 @@
-using Android.OS;
-using AndroidX.Credentials.Provider;
-using Bit.Core.Utilities;
-using Java.Security;
-
-namespace Bit.App.Droid.Utilities
-{
-    public static class CallingAppInfoExtensions
-    {
-        public static string GetAndroidOrigin(this CallingAppInfo callingAppInfo)
-        {
-            if (Build.VERSION.SdkInt < BuildVersionCodes.P || callingAppInfo?.SigningInfo?.GetApkContentsSigners().Any() != true)
-            {
-                return null;
-            }
-
-            var cert = callingAppInfo.SigningInfo.GetApkContentsSigners()[0].ToByteArray();
-            var md = MessageDigest.GetInstance("SHA-256");
-            var certHash = md.Digest(cert);
-            return $"android:apk-key-hash:{CoreHelpers.Base64UrlEncode(certHash)}";
-        }
-
-        public static string GetLatestCertificationFingerprint(this CallingAppInfo callingAppInfo)
-        {
-            if (callingAppInfo.SigningInfo.HasMultipleSigners)
-            {
-                return null;
-            }
-
-            var signature = callingAppInfo.SigningInfo.GetSigningCertificateHistory()[0].ToByteArray();
-            var md = MessageDigest.GetInstance("SHA-256");
-            var digestedSignature = md.Digest(signature);
-            var normalizedFingerprint = string.Join(":", digestedSignature.Select(b => b.ToString("X2")));
-            return normalizedFingerprint;
-        }
-    }
-}

src/App/Platforms/iOS/AppDelegate.cs

@@ -88,7 +88,7 @@ namespace Bit.iOS
                                 Core.Constants.AutofillNeedsIdentityReplacementKey);
                             if (needsAutofillReplacement.GetValueOrDefault())
                             {
-                                await ASHelpers.ReplaceAllIdentitiesAsync();
+                                await ASHelpers.ReplaceAllIdentities();
                             }
                         }
                         else if (message.Command == "showAppExtension")
@@ -102,7 +102,7 @@ namespace Bit.iOS
                                 var success = value as bool?;
                                 if (success.GetValueOrDefault() && _deviceActionService.SystemMajorVersion() >= 12)
                                 {
-                                    await ASHelpers.ReplaceAllIdentitiesAsync();
+                                    await ASHelpers.ReplaceAllIdentities();
                                 }
                             }
                         }
@@ -114,21 +114,22 @@ namespace Bit.iOS
                                 return;
                             }
 
-                            if (await ASHelpers.IdentitiesSupportIncrementalAsync())
+                            if (await ASHelpers.IdentitiesCanIncremental())
                             {
                                 var cipherId = message.Data as string;
                                 if (message.Command == "addedCipher" && !string.IsNullOrWhiteSpace(cipherId))
                                 {
-                                    var identity = await ASHelpers.GetCipherPasswordIdentityAsync(cipherId);
+                                    var identity = await ASHelpers.GetCipherIdentityAsync(cipherId);
                                     if (identity == null)
                                     {
                                         return;
                                     }
-                                    await ASCredentialIdentityStoreExtensions.SaveCredentialIdentitiesAsync(identity);
+                                    await ASCredentialIdentityStore.SharedStore?.SaveCredentialIdentitiesAsync(
+                                        new ASPasswordCredentialIdentity[] { identity });
                                     return;
                                 }
                             }
-                            await ASHelpers.ReplaceAllIdentitiesAsync();
+                            await ASHelpers.ReplaceAllIdentities();
                         }
                         else if (message.Command == "deletedCipher" || message.Command == "softDeletedCipher")
                         {
@@ -137,27 +138,28 @@ namespace Bit.iOS
                                 return;
                             }
 
-                            if (await ASHelpers.IdentitiesSupportIncrementalAsync())
+                            if (await ASHelpers.IdentitiesCanIncremental())
                             {
-                                var identity = ASHelpers.ToPasswordCredentialIdentity(
+                                var identity = ASHelpers.ToCredentialIdentity(
                                     message.Data as Bit.Core.Models.View.CipherView);
                                 if (identity == null)
                                 {
                                     return;
                                 }
-                                await ASCredentialIdentityStoreExtensions.RemoveCredentialIdentitiesAsync(identity);
+                                await ASCredentialIdentityStore.SharedStore?.RemoveCredentialIdentitiesAsync(
+                                    new ASPasswordCredentialIdentity[] { identity });
                                 return;
                             }
-                            await ASHelpers.ReplaceAllIdentitiesAsync();
+                            await ASHelpers.ReplaceAllIdentities();
                         }
                         else if (message.Command == "logout" && UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                         {
-                            await ASCredentialIdentityStore.SharedStore.RemoveAllCredentialIdentitiesAsync();
+                            await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
                         }
                         else if ((message.Command == "softDeletedCipher" || message.Command == "restoredCipher")
                             && UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                         {
-                            await ASHelpers.ReplaceAllIdentitiesAsync();
+                            await ASHelpers.ReplaceAllIdentities();
                         }
                         else if (message.Command == AppHelpers.VAULT_TIMEOUT_ACTION_CHANGED_MESSAGE_COMMAND)
                         {
@@ -166,12 +168,12 @@ namespace Bit.iOS
                             {
                                 if (UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
                                 {
-                                    await ASCredentialIdentityStore.SharedStore.RemoveAllCredentialIdentitiesAsync();
+                                    await ASCredentialIdentityStore.SharedStore?.RemoveAllCredentialIdentitiesAsync();
                                 }
                             }
                             else
                             {
-                                await ASHelpers.ReplaceAllIdentitiesAsync();
+                                await ASHelpers.ReplaceAllIdentities();
                             }
                         }
                     }

src/App/Resources/Raw/fido2_priviliged_allow_list.json

@@ -1,481 +0,0 @@
-{
-    "apps": [
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.android.chrome",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "F0:FD:6C:5B:41:0F:25:CB:25:C3:B5:33:46:C8:97:2F:AE:30:F8:EE:74:11:DF:91:04:80:AD:6B:2D:60:DB:83"
-            },
-            {
-              "build": "userdebug",
-              "cert_fingerprint_sha256": "19:75:B2:F1:71:77:BC:89:A5:DF:F3:1F:9E:64:A6:CA:E2:81:A5:3D:C1:D1:D5:9B:1D:14:7F:E1:C8:2A:FA:00"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.chrome.beta",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "DA:63:3D:34:B6:9E:63:AE:21:03:B4:9D:53:CE:05:2F:C5:F7:F3:C5:3A:AB:94:FD:C2:A2:08:BD:FD:14:24:9C"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "3D:7A:12:23:01:9A:A3:9D:9E:A0:E3:43:6A:B7:C0:89:6B:FB:4F:B6:79:F4:DE:5F:E7:C2:3F:32:6C:8F:99:4A"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.chrome.dev",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "90:44:EE:5F:EE:4B:BC:5E:21:DD:44:66:54:31:C4:EB:1F:1F:71:A3:27:16:A0:BC:92:7B:CB:B3:92:33:CA:BF"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "3D:7A:12:23:01:9A:A3:9D:9E:A0:E3:43:6A:B7:C0:89:6B:FB:4F:B6:79:F4:DE:5F:E7:C2:3F:32:6C:8F:99:4A"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.chrome.canary",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "20:19:DF:A1:FB:23:EF:BF:70:C5:BC:D1:44:3C:5B:EA:B0:4F:3F:2F:F4:36:6E:9A:C1:E3:45:76:39:A2:4C:FC"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "org.chromium.chrome",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "C6:AD:B8:B8:3C:6D:4C:17:D2:92:AF:DE:56:FD:48:8A:51:D3:16:FF:8F:2C:11:C5:41:02:23:BF:F8:A7:DB:B3"
-            },
-            {
-              "build": "userdebug",
-              "cert_fingerprint_sha256": "19:75:B2:F1:71:77:BC:89:A5:DF:F3:1F:9E:64:A6:CA:E2:81:A5:3D:C1:D1:D5:9B:1D:14:7F:E1:C8:2A:FA:00"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.google.android.apps.chrome",
-          "signatures": [
-            {
-              "build": "userdebug",
-              "cert_fingerprint_sha256": "19:75:B2:F1:71:77:BC:89:A5:DF:F3:1F:9E:64:A6:CA:E2:81:A5:3D:C1:D1:D5:9B:1D:14:7F:E1:C8:2A:FA:00"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "org.mozilla.fennec_webauthndebug",
-          "signatures": [
-            {
-              "build": "userdebug",
-              "cert_fingerprint_sha256": "BD:AE:82:02:80:D2:AF:B7:74:94:EF:22:58:AA:78:A9:AE:A1:36:41:7E:8B:C2:3D:C9:87:75:2E:6F:48:E8:48"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "org.mozilla.firefox",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "A7:8B:62:A5:16:5B:44:94:B2:FE:AD:9E:76:A2:80:D2:2D:93:7F:EE:62:51:AE:CE:59:94:46:B2:EA:31:9B:04"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "org.mozilla.firefox_beta",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "A7:8B:62:A5:16:5B:44:94:B2:FE:AD:9E:76:A2:80:D2:2D:93:7F:EE:62:51:AE:CE:59:94:46:B2:EA:31:9B:04"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "org.mozilla.focus",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "62:03:A4:73:BE:36:D6:4E:E3:7F:87:FA:50:0E:DB:C7:9E:AB:93:06:10:AB:9B:9F:A4:CA:7D:5C:1F:1B:4F:FC"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "org.mozilla.fennec_aurora",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "BC:04:88:83:8D:06:F4:CA:6B:F3:23:86:DA:AB:0D:D8:EB:CF:3E:77:30:78:74:59:F6:2F:B3:CD:14:A1:BA:AA"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "org.mozilla.rocket",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "86:3A:46:F0:97:39:32:B7:D0:19:9B:54:91:12:74:1C:2D:27:31:AC:72:EA:11:B7:52:3A:A9:0A:11:BF:56:91"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.microsoft.emmx.canary",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "01:E1:99:97:10:A8:2C:27:49:B4:D5:0C:44:5D:C8:5D:67:0B:61:36:08:9D:0A:76:6A:73:82:7C:82:A1:EA:C9"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.microsoft.emmx.dev",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "01:E1:99:97:10:A8:2C:27:49:B4:D5:0C:44:5D:C8:5D:67:0B:61:36:08:9D:0A:76:6A:73:82:7C:82:A1:EA:C9"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.microsoft.emmx.beta",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "01:E1:99:97:10:A8:2C:27:49:B4:D5:0C:44:5D:C8:5D:67:0B:61:36:08:9D:0A:76:6A:73:82:7C:82:A1:EA:C9"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.microsoft.emmx",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "01:E1:99:97:10:A8:2C:27:49:B4:D5:0C:44:5D:C8:5D:67:0B:61:36:08:9D:0A:76:6A:73:82:7C:82:A1:EA:C9"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.microsoft.emmx.rolling",
-          "signatures": [
-            {
-              "build": "userdebug",
-              "cert_fingerprint_sha256": "32:A2:FC:74:D7:31:10:58:59:E5:A8:5D:F1:6D:95:F1:02:D8:5B:22:09:9B:80:64:C5:D8:91:5C:61:DA:D1:E0"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.microsoft.emmx.local",
-          "signatures": [
-            {
-              "build": "userdebug",
-              "cert_fingerprint_sha256": "32:A2:FC:74:D7:31:10:58:59:E5:A8:5D:F1:6D:95:F1:02:D8:5B:22:09:9B:80:64:C5:D8:91:5C:61:DA:D1:E0"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.brave.browser",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "9C:2D:B7:05:13:51:5F:DB:FB:BC:58:5B:3E:DF:3D:71:23:D4:DC:67:C9:4F:FD:30:63:61:C1:D7:9B:BF:18:AC"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.brave.browser_beta",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "9C:2D:B7:05:13:51:5F:DB:FB:BC:58:5B:3E:DF:3D:71:23:D4:DC:67:C9:4F:FD:30:63:61:C1:D7:9B:BF:18:AC"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.brave.browser_nightly",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "9C:2D:B7:05:13:51:5F:DB:FB:BC:58:5B:3E:DF:3D:71:23:D4:DC:67:C9:4F:FD:30:63:61:C1:D7:9B:BF:18:AC"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "app.vanadium.browser",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "C6:AD:B8:B8:3C:6D:4C:17:D2:92:AF:DE:56:FD:48:8A:51:D3:16:FF:8F:2C:11:C5:41:02:23:BF:F8:A7:DB:B3"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.vivaldi.browser",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "E8:A7:85:44:65:5B:A8:C0:98:17:F7:32:76:8F:56:89:B1:66:2E:C4:B2:BC:5A:0B:C0:EC:13:8D:33:CA:3D:1E"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.vivaldi.browser.snapshot",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "E8:A7:85:44:65:5B:A8:C0:98:17:F7:32:76:8F:56:89:B1:66:2E:C4:B2:BC:5A:0B:C0:EC:13:8D:33:CA:3D:1E"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.vivaldi.browser.sopranos",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "E8:A7:85:44:65:5B:A8:C0:98:17:F7:32:76:8F:56:89:B1:66:2E:C4:B2:BC:5A:0B:C0:EC:13:8D:33:CA:3D:1E"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.citrix.Receiver",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "3D:D1:12:67:10:69:AB:36:4E:F9:BE:73:9A:B7:B5:EE:15:E1:CD:E9:D8:75:7B:1B:F0:64:F5:0C:55:68:9A:49"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "CE:B2:23:D7:77:09:F2:B6:BC:0B:3A:78:36:F5:A5:AF:4C:E1:D3:55:F4:A7:28:86:F7:9D:F8:0D:C9:D6:12:2E"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "AA:D0:D4:57:E6:33:C3:78:25:77:30:5B:C1:B2:D9:E3:81:41:C7:21:DF:0D:AA:6E:29:07:2F:C4:1D:34:F0:AB"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.android.browser",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "C9:00:9D:01:EB:F9:F5:D0:30:2B:C7:1B:2F:E9:AA:9A:47:A4:32:BB:A1:73:08:A3:11:1B:75:D7:B2:14:90:25"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.sec.android.app.sbrowser",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "34:DF:0E:7A:9F:1C:F1:89:2E:45:C0:56:B4:97:3C:D8:1C:CF:14:8A:40:50:D1:1A:EA:4A:C5:A6:5F:90:0A:42"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.sec.android.app.sbrowser.beta",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "34:DF:0E:7A:9F:1C:F1:89:2E:45:C0:56:B4:97:3C:D8:1C:CF:14:8A:40:50:D1:1A:EA:4A:C5:A6:5F:90:0A:42"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.google.android.gms",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "7C:E8:3C:1B:71:F3:D5:72:FE:D0:4C:8D:40:C5:CB:10:FF:75:E6:D8:7D:9D:F6:FB:D5:3F:04:68:C2:90:50:53"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "D2:2C:C5:00:29:9F:B2:28:73:A0:1A:01:0D:E1:C8:2F:BE:4D:06:11:19:B9:48:14:DD:30:1D:AB:50:CB:76:78"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "F0:FD:6C:5B:41:0F:25:CB:25:C3:B5:33:46:C8:97:2F:AE:30:F8:EE:74:11:DF:91:04:80:AD:6B:2D:60:DB:83"
-            },
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "19:75:B2:F1:71:77:BC:89:A5:DF:F3:1F:9E:64:A6:CA:E2:81:A5:3D:C1:D1:D5:9B:1D:14:7F:E1:C8:2A:FA:00"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.yandex.browser",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "AC:A4:05:DE:D8:B2:5C:B2:E8:C6:DA:69:42:5D:2B:43:07:D0:87:C1:27:6F:C0:6A:D5:94:27:31:CC:C5:1D:BA"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.yandex.browser.beta",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "AC:A4:05:DE:D8:B2:5C:B2:E8:C6:DA:69:42:5D:2B:43:07:D0:87:C1:27:6F:C0:6A:D5:94:27:31:CC:C5:1D:BA"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.yandex.browser.alpha",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "AC:A4:05:DE:D8:B2:5C:B2:E8:C6:DA:69:42:5D:2B:43:07:D0:87:C1:27:6F:C0:6A:D5:94:27:31:CC:C5:1D:BA"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.yandex.browser.corp",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "AC:A4:05:DE:D8:B2:5C:B2:E8:C6:DA:69:42:5D:2B:43:07:D0:87:C1:27:6F:C0:6A:D5:94:27:31:CC:C5:1D:BA"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.yandex.browser.canary",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "1D:A9:CB:AE:2D:CC:C6:A5:8D:6C:94:7B:E9:4C:DB:B7:33:D6:5D:A4:D1:77:0F:A1:4A:53:64:CB:4A:28:EB:49"
-            }
-          ]
-        }
-      },
-      {
-        "type": "android",
-        "info": {
-          "package_name": "com.yandex.browser.broteam",
-          "signatures": [
-            {
-              "build": "release",
-              "cert_fingerprint_sha256": "1D:A9:CB:AE:2D:CC:C6:A5:8D:6C:94:7B:E9:4C:DB:B7:33:D6:5D:A4:D1:77:0F:A1:4A:53:64:CB:4A:28:EB:49"
-            }
-          ]
-        }
-      }
-    ]
-  }
-  

src/Core/Abstractions/IApiService.cs

@@ -1,4 +1,9 @@
-using Bit.Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Request;
 using Bit.Core.Models.Response;
@@ -95,6 +100,5 @@ namespace Bit.Core.Abstractions
         Task<bool> GetDevicesExistenceByTypes(DeviceType[] deviceTypes);
         Task<ConfigResponse> GetConfigsAsync();
         Task<string> GetFastmailAccountIdAsync(string apiKey);
-        Task<List<Utilities.DigitalAssetLinks.Statement>> GetDigitalAssetLinksForRpAsync(string rpId);
     }
 }

src/Core/Abstractions/IAssetLinksService.cs

@@ -1,7 +0,0 @@
-namespace Bit.Core.Services
-{
-    public interface IAssetLinksService
-    {
-        Task<bool> ValidateAssetLinksAsync(string rpId, string packageName, string normalizedFingerprint);
-    }
-}

src/Core/Abstractions/IAutofillHandler.cs

@@ -4,7 +4,6 @@ namespace Bit.Core.Abstractions
 {
     public interface IAutofillHandler
     {
-        bool CredentialProviderServiceEnabled();
         bool AutofillServicesEnabled();
         bool SupportsAutofillService();
         void Autofill(CipherView cipher);
@@ -12,7 +11,6 @@ namespace Bit.Core.Abstractions
         bool AutofillAccessibilityServiceRunning();
         bool AutofillAccessibilityOverlayPermitted();
         bool AutofillServiceEnabled();
-        void DisableCredentialProviderService();
         void DisableAutofillService();
     }
 }

src/Core/Abstractions/ICipherService.cs

@@ -1,4 +1,7 @@
-using Bit.Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Domain;
 using Bit.Core.Models.View;
@@ -34,8 +37,6 @@ namespace Bit.Core.Abstractions
         Task<byte[]> DownloadAndDecryptAttachmentAsync(string cipherId, AttachmentView attachment, string organizationId);
         Task SoftDeleteWithServerAsync(string id);
         Task RestoreWithServerAsync(string id);
-        Task<string> CreateNewLoginForPasskeyAsync(Fido2ConfirmNewCredentialParams newPasskeyParams);
-        Task CopyTotpCodeIfNeededAsync(CipherView cipher);
         Task<bool> VerifyOrganizationHasUnassignedItemsAsync();
     }
 }

src/Core/Abstractions/IConditionedAwaiterManager.cs

@@ -1,10 +1,12 @@
-namespace Bit.Core.Abstractions
+using System;
+using System.Threading.Tasks;
+
+namespace Bit.Core.Abstractions
 {
     public enum AwaiterPrecondition
     {
         EnvironmentUrlsInited,
-        AndroidWindowCreated,
-        AutofillIOSExtensionViewDidAppear
+        AndroidWindowCreated
     }
 
     public interface IConditionedAwaiterManager
@@ -12,6 +14,5 @@
         Task GetAwaiterForPrecondition(AwaiterPrecondition awaiterPrecondition);
         void SetAsCompleted(AwaiterPrecondition awaiterPrecondition);
         void SetException(AwaiterPrecondition awaiterPrecondition, Exception ex);
-        void Recreate(AwaiterPrecondition awaiterPrecondition);
     }
 }

src/Core/Abstractions/ICryptoFunctionService.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
 
 namespace Bit.Core.Abstractions
 {

src/Core/Abstractions/IDeviceActionService.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Bit.App.Models;
 using Bit.App.Utilities.Prompts;
 using Bit.Core.Enums;
 using Bit.Core.Models;
@@ -29,7 +28,6 @@ namespace Bit.App.Abstractions
         bool SupportsNfc();
         bool SupportsCamera();
         bool SupportsFido2();
-        bool SupportsCredentialProviderService();
         bool SupportsAutofillServices();
         bool SupportsInlineAutofill();
         bool SupportsDrawOver();
@@ -38,10 +36,8 @@ namespace Bit.App.Abstractions
         void RateApp();
         void OpenAccessibilitySettings();
         void OpenAccessibilityOverlayPermissionSettings();
-        void OpenCredentialProviderSettings();
         void OpenAutofillSettings();
         long GetActiveTime();
-        Task ExecuteFido2CredentialActionAsync(AppOptions appOptions);
         void CloseMainApp();
         float GetSystemFontSizeScale();
         Task OnAccountSwitchCompleteAsync();

src/Core/Abstractions/IFido2AuthenticatorService.cs

@@ -1,12 +0,0 @@
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Abstractions
-{
-    public interface IFido2AuthenticatorService
-    {
-        Task<Fido2AuthenticatorMakeCredentialResult> MakeCredentialAsync(Fido2AuthenticatorMakeCredentialParams makeCredentialParams, IFido2MakeCredentialUserInterface userInterface);
-        Task<Fido2AuthenticatorGetAssertionResult> GetAssertionAsync(Fido2AuthenticatorGetAssertionParams assertionParams, IFido2GetAssertionUserInterface userInterface);
-        // TODO: Should this return a List? Or maybe IEnumerable?
-        Task<Fido2AuthenticatorDiscoverableCredentialMetadata[]> SilentCredentialDiscoveryAsync(string rpId);
-    }
-}

src/Core/Abstractions/IFido2ClientService.cs

@@ -1,37 +0,0 @@
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Abstractions
-{
-    /// <summary>
-    /// This class represents an abstraction of the WebAuthn Client as described by W3C:
-    /// https://www.w3.org/TR/webauthn-3/#webauthn-client
-    ///
-    /// The WebAuthn Client is an intermediary entity typically implemented in the user agent
-    /// (in whole, or in part). Conceptually, it underlies the Web Authentication API and embodies
-    /// the implementation of the Web Authentication API's operations.
-    ///
-    /// It is responsible for both marshalling the inputs for the underlying authenticator operations,
-    /// and for returning the results of the latter operations to the Web Authentication API's callers.
-    /// </summary>
-    public interface IFido2ClientService
-    {
-        /// <summary>
-        /// Allows WebAuthn Relying Party scripts to request the creation of a new public key credential source.
-        /// For more information please see: https://www.w3.org/TR/webauthn-3/#sctn-createCredential
-        /// </summary>
-        /// <param name="createCredentialParams">The parameters for the credential creation operation</param>
-        /// <param name="extraParams">Extra parameters for the credential creation operation</param>
-        /// <returns>The new credential</returns>
-        Task<Fido2ClientCreateCredentialResult> CreateCredentialAsync(Fido2ClientCreateCredentialParams createCredentialParams, Fido2ExtraCreateCredentialParams extraParams);
-
-        /// <summary>
-        /// Allows WebAuthn Relying Party scripts to discover and use an existing public key credential, with the user’s consent.
-        /// Relying Party script can optionally specify some criteria to indicate what credential sources are acceptable to it.
-        /// For more information please see: https://www.w3.org/TR/webauthn-3/#sctn-getAssertion
-        /// </summary>
-        /// <param name="assertCredentialParams">The parameters for the credential assertion operation</param>
-        /// <param name="extraParams">Extra parameters for the credential assertion operation</param>
-        /// <returns>The asserted credential</returns>
-        Task<Fido2ClientAssertCredentialResult> AssertCredentialAsync(Fido2ClientAssertCredentialParams assertCredentialParams, Fido2ExtraAssertCredentialParams extraParams);
-    }
-}

src/Core/Abstractions/IFido2GetAssertionUserInterface.cs

@@ -1,20 +0,0 @@
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Abstractions 
-{
-    public struct Fido2GetAssertionUserInterfaceCredential
-    {
-        public string CipherId { get; set; }
-        public Fido2UserVerificationPreference UserVerificationPreference { get; set; }
-    }
-
-    public interface IFido2GetAssertionUserInterface : IFido2UserInterface
-    {
-        /// <summary>
-        /// Ask the user to pick a credential from a list of existing credentials.
-        /// </summary>
-        /// <param name="credentials">The credentials that the user can pick from, and if the user must be verified before completing the operation</param>
-        /// <returns>The ID of the cipher that contains the credentials the user picked, and if the user was verified before completing the operation</returns>
-        Task<(string CipherId, bool UserVerified)> PickCredentialAsync(Fido2GetAssertionUserInterfaceCredential[] credentials);
-    }
-}

src/Core/Abstractions/IFido2MakeCredentialConfirmationUserInterface.cs

@@ -1,66 +0,0 @@
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Abstractions
-{
-    public interface IFido2MakeCredentialConfirmationUserInterface : IFido2MakeCredentialUserInterface
-    {
-        /// <summary>
-        /// Call this method after the user chose where to save the new Fido2 credential.
-        /// </summary>
-        /// <param name="cipherId">
-        /// Cipher ID where to save the new credential.
-        /// If <c>null</c> a new default passkey cipher item will be created
-        /// </param>
-        /// <param name="userVerified">
-        /// Whether the user has been verified or not.
-        /// If <c>null</c> verification has not taken place yet.
-        /// </param>
-        void Confirm(string cipherId, bool? userVerified);
-
-        /// <summary>
-        /// Call this method after the user chose where to save the new Fido2 credential.
-        /// </summary>
-        /// <param name="cipherId">
-        /// Cipher ID where to save the new credential.
-        /// If <c>null</c> a new default passkey cipher item will be created
-        /// </param>
-        /// <param name="alreadyHasFido2Credential">
-        /// If the cipher corresponding to the <paramref name="cipherId"/> already has a Fido2 credential.
-        /// </param>
-        /// <param name="userVerified">
-        /// Whether the user has been verified or not.
-        /// If <c>null</c> verification has not taken place yet.
-        /// </param>
-        Task ConfirmAsync(string cipherId, bool alreadyHasFido2Credential, bool? userVerified);
-
-        /// <summary>
-        /// Cancels the current flow to make a credential
-        /// </summary>
-        void Cancel();
-
-        /// <summary>
-        /// Call this if an exception needs to happen on the credential making process
-        /// </summary>
-        void OnConfirmationException(Exception ex);
-
-        
-        /// <summary>
-        /// True if we are already confirming a new credential.
-        /// </summary>
-        bool IsConfirmingNewCredential { get; }
-
-        /// <summary>
-        /// Call this after the vault was unlocked so that Fido2 credential creation can proceed.
-        /// </summary>
-        void ConfirmVaultUnlocked();
-
-        /// <summary>
-        /// True if we are waiting for the vault to be unlocked.
-        /// </summary>
-        bool IsWaitingUnlockVault { get; }
-
-        Fido2UserVerificationOptions? GetCurrentUserVerificationOptions();
-
-        void SetCheckHasVaultBeenUnlockedInThisTransaction(Func<bool> checkHasVaultBeenUnlockedInThisTransaction);
-    }
-}

src/Core/Abstractions/IFido2MakeCredentialUserInterface.cs

@@ -1,44 +0,0 @@
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Abstractions 
-{
-    public struct Fido2ConfirmNewCredentialParams
-    {
-        ///<summary>
-        /// The name of the credential.
-        ///</summary>
-        public string CredentialName { get; set; }
-
-        ///<summary>
-        /// The name of the user.
-        ///</summary>
-        public string UserName { get; set; }
-
-        /// <summary>
-        /// The preference to whether or not the user must be verified before completing the operation.
-        /// </summary>
-        public Fido2UserVerificationPreference UserVerificationPreference { get; set; }
-
-        /// <summary>
-        /// The relying party identifier
-        /// </summary>
-        public string RpId { get; set; }
-    }
-
-    public interface IFido2MakeCredentialUserInterface : IFido2UserInterface
-    {
-        /// <summary>
-        /// Inform the user that the operation was cancelled because their vault contains excluded credentials.
-        /// </summary>
-        /// <param name="existingCipherIds">The IDs of the excluded credentials.</param>
-        /// <returns>When user has confirmed the message</returns>
-        Task InformExcludedCredentialAsync(string[] existingCipherIds);
-
-        /// <summary>
-        /// Ask the user to confirm the creation of a new credential.
-        /// </summary>
-        /// <param name="confirmNewCredentialParams">The parameters to use when asking the user to confirm the creation of a new credential.</param>
-        /// <returns>The ID of the cipher where the new credential should be saved, and if the user was verified before completing the operation</returns>
-        Task<(string CipherId, bool UserVerified)> ConfirmNewCredentialAsync(Fido2ConfirmNewCredentialParams confirmNewCredentialParams);
-    }
-}

src/Core/Abstractions/IFido2MediatorService.cs

@@ -1,14 +0,0 @@
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Abstractions
-{
-    public interface IFido2MediatorService
-    {
-        Task<Fido2ClientCreateCredentialResult> CreateCredentialAsync(Fido2ClientCreateCredentialParams createCredentialParams, Fido2ExtraCreateCredentialParams extraParams);
-        Task<Fido2ClientAssertCredentialResult> AssertCredentialAsync(Fido2ClientAssertCredentialParams assertCredentialParams, Fido2ExtraAssertCredentialParams extraParams);
-
-        Task<Fido2AuthenticatorMakeCredentialResult> MakeCredentialAsync(Fido2AuthenticatorMakeCredentialParams makeCredentialParams, IFido2MakeCredentialUserInterface userInterface);
-        Task<Fido2AuthenticatorGetAssertionResult> GetAssertionAsync(Fido2AuthenticatorGetAssertionParams assertionParams, IFido2GetAssertionUserInterface userInterface);
-        Task<Fido2AuthenticatorDiscoverableCredentialMetadata[]> SilentCredentialDiscoveryAsync(string rpId);
-    }
-}

src/Core/Abstractions/IFido2UserInterface.cs

@@ -1,17 +0,0 @@
-namespace Bit.Core.Abstractions
-{
-    public interface IFido2UserInterface
-    {
-        /// <summary>
-        /// Whether the vault has been unlocked during this transaction
-        /// </summary>
-        bool HasVaultBeenUnlockedInThisTransaction { get; }
-
-        /// <summary>
-        /// Make sure that the vault is unlocked.
-        /// This should open a window and ask the user to login or unlock the vault if necessary.
-        /// </summary>
-        /// <returns>When vault has been unlocked.</returns>
-        Task EnsureUnlockedVaultAsync();
-    }
-}

src/Core/Abstractions/IPasswordRepromptService.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 
 namespace Bit.App.Abstractions
 {
@@ -9,7 +10,5 @@ namespace Bit.App.Abstractions
         Task<bool> PromptAndCheckPasswordIfNeededAsync(CipherRepromptType repromptType = CipherRepromptType.Password);
 
         Task<(string password, bool valid)> ShowPasswordPromptAndGetItAsync();
-
-        Task<bool> ShouldByPassMasterPasswordRepromptAsync();
     }
 }

src/Core/Abstractions/IPlatformUtilsService.cs

@@ -1,4 +1,7 @@
-using Bit.Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Abstractions
 {
@@ -26,7 +29,7 @@ namespace Bit.Core.Abstractions
         bool SupportsDuo();
         Task<bool> SupportsBiometricAsync();
         Task<bool> IsBiometricIntegrityValidAsync(string bioIntegritySrcKey = null);
-        Task<bool?> AuthenticateBiometricAsync(string text = null, string fallbackText = null, Action fallback = null, bool logOutOnTooManyAttempts = false, bool allowAlternativeAuthentication = false);
+        Task<bool> AuthenticateBiometricAsync(string text = null, string fallbackText = null, Action fallback = null, bool logOutOnTooManyAttempts = false);
         long GetActiveTime();
     }
 }

src/Core/Abstractions/IStateService.cs

@@ -186,7 +186,6 @@ namespace Bit.Core.Abstractions
         Task<BwRegion?> GetActiveUserRegionAsync();
         Task<BwRegion?> GetPreAuthRegionAsync();
         Task SetPreAuthRegionAsync(BwRegion value);
-        Task ReloadStateAsync();
         Task<bool> GetShouldCheckOrganizationUnassignedItemsAsync(string userId = null);
         Task SetShouldCheckOrganizationUnassignedItemsAsync(bool shouldCheck, string userId = null);
         [Obsolete("Use GetPinKeyEncryptedUserKeyAsync instead, left for migration purposes")]

src/Core/Abstractions/IUserPinService.cs

@@ -1,12 +1,9 @@
-using Bit.Core.Services;
+using System.Threading.Tasks;
 
 namespace Bit.Core.Abstractions
 {
     public interface IUserPinService
     {
-        Task<bool> IsPinLockEnabledAsync();
         Task SetupPinAsync(string pin, bool requireMasterPasswordOnRestart);
-        Task<bool> VerifyPinAsync(string inputPin);
-        Task<bool> VerifyPinAsync(string inputPin, string email, KdfConfig kdfConfig, PinLockType pinLockType);
     }
 }

src/Core/Abstractions/IUserVerificationMediatorService.cs

@@ -1,28 +0,0 @@
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Abstractions
-{
-    public interface IUserVerificationMediatorService
-    {
-        Task<CancellableResult<bool>> VerifyUserForFido2Async(Fido2UserVerificationOptions options);
-        Task<bool> CanPerformUserVerificationPreferredAsync(Fido2UserVerificationOptions options);
-        Task<bool> ShouldPerformMasterPasswordRepromptAsync(Fido2UserVerificationOptions options);
-        Task<bool> ShouldEnforceFido2RequiredUserVerificationAsync(Fido2UserVerificationOptions options);
-        Task<CancellableResult<UVResult>> PerformOSUnlockAsync();
-        Task<CancellableResult<UVResult>> VerifyPinCodeAsync();
-        Task<CancellableResult<UVResult>> VerifyMasterPasswordAsync(bool isMasterPasswordReprompt);
-
-        public struct UVResult
-        {
-            public UVResult(bool canPerform, bool isVerified)
-            {
-                CanPerform = canPerform;
-                IsVerified = isVerified;
-            }
-
-            public bool CanPerform { get; set; }
-            public bool IsVerified { get; set; }
-        }
-    }
-}

src/Core/Abstractions/IUserVerificationService.cs

@@ -1,11 +1,11 @@
-using Bit.Core.Enums;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Abstractions
 {
     public interface IUserVerificationService
     {
         Task<bool> VerifyUser(string secret, VerificationType verificationType);
-        Task<bool> VerifyMasterPasswordAsync(string masterPassword);
         Task<bool> HasMasterPasswordAsync(bool checkMasterKeyHash = false);
     }
 }

src/Core/App.xaml.cs

@@ -14,7 +14,6 @@ using Bit.Core.Models.Response;
 using Bit.Core.Pages;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
 
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
 namespace Bit.App
@@ -38,9 +37,6 @@ namespace Bit.App
         private readonly IPushNotificationService _pushNotificationService;
         private readonly IConfigService _configService;
         private readonly ILogger _logger;
-#if ANDROID
-        private LazyResolve<IFido2MakeCredentialConfirmationUserInterface> _fido2MakeCredentialConfirmationUserInterface = new LazyResolve<IFido2MakeCredentialConfirmationUserInterface>();
-#endif
 
         private static bool _isResumed;
         // these variables are static because the app is launching new activities on notification click, creating new instances of App. 
@@ -108,10 +104,7 @@ namespace Bit.App
                 Options.MyVaultTile = appOptions.MyVaultTile;
                 Options.GeneratorTile = appOptions.GeneratorTile;
                 Options.FromAutofillFramework = appOptions.FromAutofillFramework;
-                Options.FromFido2Framework = appOptions.FromFido2Framework;
-                Options.Fido2CredentialAction = appOptions.Fido2CredentialAction;
                 Options.CreateSend = appOptions.CreateSend;
-                Options.HasUnlockedInThisTransaction = appOptions.HasUnlockedInThisTransaction;
             }
         }
 
@@ -127,15 +120,6 @@ namespace Bit.App
                 return new Window(new NavigationPage()); //No actual page needed. Only used for auto-filling the fields directly (externally)
             }
 
-            //When executing from CredentialProviderSelectionActivity we don't have "Options" so we need to filter "manually"
-            //In the CredentialProviderSelectionActivity we don't need to show any Page, so we just create a "dummy" Window with a NavigationPage to avoid crashing.
-            if (activationState != null 
-                && activationState.State.ContainsKey("CREDENTIAL_DATA") 
-                && activationState.State.ContainsKey("credentialProviderCipherId"))
-            {
-                return new Window(new NavigationPage()); //No actual page needed. Only used for auto-filling the fields directly (externally)
-            }
-
             _isResumed = true;
             return new ResumeWindow(new NavigationPage(new AndroidNavigationRedirectPage(Options)));
         }
@@ -198,6 +182,7 @@ namespace Bit.App
                 {
                     var details = message.Data as DialogDetails;
                     ArgumentNullException.ThrowIfNull(details);
+                    ArgumentNullException.ThrowIfNull(MainPage);
                     
                     var confirmed = true;
                     var confirmText = string.IsNullOrWhiteSpace(details.ConfirmText) ?
@@ -207,14 +192,12 @@ namespace Bit.App
                     {
                         if (!string.IsNullOrWhiteSpace(details.CancelText))
                         {
-                            ArgumentNullException.ThrowIfNull(MainPage);
-
                             confirmed = await MainPage.DisplayAlert(details.Title, details.Text, confirmText,
                                 details.CancelText);
                         }
                         else
                         {
-                            await _deviceActionService.DisplayAlertAsync(details.Title, details.Text, confirmText);
+                            await MainPage.DisplayAlert(details.Title, details.Text, confirmText);
                         }
                         _messagingService.Send("showDialogResolve", new Tuple<int, bool>(details.DialogId, confirmed));
                     }
@@ -235,17 +218,17 @@ namespace Bit.App
                     await _accountsManager.NavigateOnAccountChangeAsync();
                 }
                 else if (message.Command == POP_ALL_AND_GO_TO_TAB_GENERATOR_MESSAGE ||
-                         message.Command == POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE ||
-                         message.Command == POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE ||
-                         message.Command == POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE ||
-                         message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
+                    message.Command == POP_ALL_AND_GO_TO_TAB_MYVAULT_MESSAGE ||
+                    message.Command == POP_ALL_AND_GO_TO_TAB_SEND_MESSAGE ||
+                    message.Command == POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE ||
+                    message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
                 {
                     if (message.Command == DeepLinkContext.NEW_OTP_MESSAGE)
                     {
                         Options.OtpData = new OtpData((string)message.Data);
                     }
 
-                    await MainThread.InvokeOnMainThreadAsync(ExecuteNavigationAction);
+                    await MainThread.InvokeOnMainThreadAsync(ExecuteNavigationAction); 
                     async Task ExecuteNavigationAction()
                     {
                         if (MainPage is TabsPage tabsPage)
@@ -256,7 +239,6 @@ namespace Bit.App
                             {
                                 await tabsPage.Navigation.PopModalAsync(false);
                             }
-
                             if (message.Command == POP_ALL_AND_GO_TO_AUTOFILL_CIPHERS_MESSAGE)
                             {
                                 MainPage = new NavigationPage(new CipherSelectionPage(Options));
@@ -284,19 +266,6 @@ namespace Bit.App
                         }
                     }
                 }
-                else if (message.Command == Constants.CredentialNavigateToAutofillCipherMessageCommand && message.Data is Fido2ConfirmNewCredentialParams createParams)
-                {
-                    ArgumentNullException.ThrowIfNull(MainPage);
-                    ArgumentNullException.ThrowIfNull(Options);
-                    await MainThread.InvokeOnMainThreadAsync(NavigateToCipherSelectionPageAction);
-                    void NavigateToCipherSelectionPageAction()
-                    {
-                        Options.Uri = createParams.RpId;
-                        Options.SaveUsername = createParams.UserName;
-                        Options.SaveName = createParams.CredentialName;
-                        MainPage = new NavigationPage(new CipherSelectionPage(Options));
-                    }
-                }
                 else if (message.Command == "convertAccountToKeyConnector")
                 {
                     ArgumentNullException.ThrowIfNull(MainPage);
@@ -335,26 +304,12 @@ namespace Bit.App
                     || message.Command == "unlocked"
                     || message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED)
                 {
-#if ANDROID
-                    if (message.Command == AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED && _fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-                    {
-                        _fido2MakeCredentialConfirmationUserInterface.Value.OnConfirmationException(new AccountSwitchedException());
-                    }
-#endif
-
                     lock (_processingLoginRequestLock)
                     {
                         // lock doesn't allow for async execution
                         CheckPasswordlessLoginRequestsAsync().Wait();
                     }
                 }
-                else if (message.Command == Constants.NavigateToMessageCommand && message.Data is NavigationTarget navigationTarget)
-                {
-                    await MainThread.InvokeOnMainThreadAsync(() =>
-                    {
-                        Navigate(navigationTarget, null);
-                    });
-                }
            }
            catch (Exception ex)
            {
@@ -725,15 +680,6 @@ namespace Bit.App
             // If we are in background we add the Navigation Actions to a queue to execute when the app resumes.
             // Links: https://github.com/dotnet/maui/issues/11501 and https://bitwarden.atlassian.net/wiki/spaces/NMME/pages/664862722/MainPage+Assignments+not+working+on+Android+on+Background+or+App+resume
 #if ANDROID
-            if (_fido2MakeCredentialConfirmationUserInterface != null && _fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-            {
-                // if it's creating passkey
-                // and we have an active pending TaskCompletionSource
-                // then we let the Fido2 Authenticator flow manage the navigation to avoid issues
-                // like duplicated navigation to lock page.
-                return;
-            }
-
             if (!_isResumed)
             {
                 _onResumeActions.Enqueue(() => NavigateImpl(navTarget, navParams));

src/Core/Constants.cs

@@ -49,8 +49,6 @@ namespace Bit.Core
         public const string UnassignedItemsBannerFlag = "unassigned-items-banner";
         public const string RegionEnvironment = "regionEnvironment";
         public const string DuoCallback = "bitwarden://duo-callback";
-        public const string NavigateToMessageCommand = "navigateTo";
-        public const string CredentialNavigateToAutofillCipherMessageCommand = "credentialNavigateToAutofillCipher";
 
         /// <summary>
         /// This key is used to store the value of "ShouldConnectToWatch" of the last user that had logged in

src/Core/Controls/CipherViewCell/CipherViewCell.xaml

@@ -50,7 +50,7 @@
         HorizontalOptions="Center"
         VerticalOptions="Center"
         StyleClass="list-icon, list-icon-platform"
-        Text="{Binding ., Converter={StaticResource iconGlyphConverter}}"
+        Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
         ShouldUpdateFontSizeDynamicallyForAccesibility="True"
         AutomationProperties.IsInAccessibleTree="False"
         AutomationId="CipherTypeIcon" />

src/Core/Controls/Settings/ExternalLinkSubtitleItemView.xaml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<controls:BaseSettingItemView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:controls="clr-namespace:Bit.App.Controls" 
-    xmlns:core="clr-namespace:Bit.Core"
-    x:Class="Bit.App.Controls.ExternalLinkSubtitleItemView"
-    x:Name="_contentView"
-    ControlTemplate="{StaticResource SettingControlTemplate}">
-    <controls:BaseSettingItemView.GestureRecognizers>
-        <TapGestureRecognizer Tapped="ContentView_Tapped" />
-    </controls:BaseSettingItemView.GestureRecognizers>
-
-    <controls:IconLabel
-        Text="{Binding Source={x:Static core:BitwardenIcons.ExternalLink}}"
-        TextColor="{DynamicResource TextColor}"
-        FontSize="25"
-        Margin="6,0,7,0"
-        HorizontalOptions="End"
-        VerticalOptions="Center"
-        SemanticProperties.Description="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}" />
-</controls:BaseSettingItemView>

src/Core/Controls/Settings/ExternalLinkSubtitleItemView.xaml.cs

@@ -1,26 +0,0 @@
-using System.Windows.Input;
-
-namespace Bit.App.Controls
-{
-    public partial class ExternalLinkSubtitleItemView : BaseSettingItemView
-    {
-        public static readonly BindableProperty GoToLinkCommandProperty = BindableProperty.Create(
-            nameof(GoToLinkCommand), typeof(ICommand), typeof(ExternalLinkSubtitleItemView));
-
-        public ExternalLinkSubtitleItemView()
-        {
-            InitializeComponent();
-        }
-
-        public ICommand GoToLinkCommand
-        {
-            get => GetValue(GoToLinkCommandProperty) as ICommand;
-            set => SetValue(GoToLinkCommandProperty, value);
-        }
-
-        void ContentView_Tapped(System.Object sender, System.EventArgs e)
-        {
-            GoToLinkCommand?.Execute(null);
-        }
-    }
-}

src/Core/Core.csproj

@@ -34,7 +34,6 @@
 	  <PackageReference Include="CsvHelper" Version="30.0.1" />
 	  <PackageReference Include="LiteDB" Version="5.0.17" />
 	  <PackageReference Include="PCLCrypto" Version="2.1.40-alpha" />
-	  <PackageReference Include="System.Formats.Cbor" Version="8.0.0" />
 	  <PackageReference Include="zxcvbn-core" Version="7.0.92" />
 	  <PackageReference Include="MessagePack.MSBuild.Tasks" Version="2.5.124">
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -53,7 +52,6 @@
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
 	  <PackageReference Include="Xamarin.AndroidX.AutoFill" Version="1.1.0.18" />
 	  <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.7.2.1" />
-      <PackageReference Include="Xamarin.AndroidX.Credentials" Version="1.0.0" />
 	</ItemGroup>
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' AND !$(DefineConstants.Contains(FDROID))">
 	  <PackageReference Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.5" />
@@ -77,14 +75,14 @@
     <Folder Include="Utilities\Automation\" />
     <Folder Include="Utilities\Prompts\" />
     <Folder Include="Resources\Localization\" />
-    <Folder Include="Utilities\Fido2\" />
     <Folder Include="Controls\Picker\" />
     <Folder Include="Controls\Avatar\" />
-    <Folder Include="Services\UserVerification\" />
     <Folder Include="Utilities\WebAuthenticatorMAUI\" />
-    <Folder Include="Resources\Images\" />
   </ItemGroup>
 	<ItemGroup>
+	  <MauiImage Include="Resources\Images\dotnet_bot.svg">
+	    <BaseSize>168,208</BaseSize>
+	  </MauiImage>
 	  <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 		<MauiFont Include="Resources\Fonts\*" />
 	</ItemGroup>
@@ -93,9 +91,6 @@
       <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
       <Generator>PublicResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-		<Compile Update="Controls\Settings\ExternalLinkSubtitleItemView.xaml.cs">
-		  <DependentUpon>ExternalLinkSubtitleItemView.xaml</DependentUpon>
-		</Compile>
 		<Compile Update="Pages\AndroidNavigationRedirectPage.xaml.cs">
 		  <DependentUpon>AndroidNavigationRedirectPage.xaml</DependentUpon>
 		</Compile>
@@ -106,25 +101,13 @@
     </Compile>
 	</ItemGroup>
 	<ItemGroup>
-	  <MauiXaml Update="Controls\Settings\ExternalLinkSubtitleItemView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	  <MauiXaml Update="Pages\AndroidNavigationRedirectPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	</ItemGroup>
 	<ItemGroup>
-	  <None Remove="Utilities\Fido2\" />
 	  <None Remove="Controls\Picker\" />
 	  <None Remove="Controls\Avatar\" />
-	  <None Remove="Services\UserVerification\" />
 	  <None Remove="Utilities\WebAuthenticatorMAUI\" />
-	  <None Remove="Resources\Images\" />
-	  <None Remove="Resources\Images\empty_items_state_dark.svg" />
-	  <None Remove="Resources\Images\empty_items_state.svg" />
-	</ItemGroup>
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-	  <MauiImage Include="Resources\Images\empty_items_state.svg" />
-	  <MauiImage Include="Resources\Images\empty_items_state_dark.svg" />
 	</ItemGroup>
 </Project>

src/Core/Models/Api/Fido2CredentialApi.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Models.Domain;
+using System;
+using Bit.Core.Models.Domain;
 
 namespace Bit.Core.Models.Api
 {
@@ -20,7 +21,6 @@ namespace Bit.Core.Models.Api
             RpName = fido2Key.RpName?.EncryptedString;
             UserHandle = fido2Key.UserHandle?.EncryptedString;
             UserName = fido2Key.UserName?.EncryptedString;
-            UserDisplayName = fido2Key.UserDisplayName?.EncryptedString;
             Counter = fido2Key.Counter?.EncryptedString;
             CreationDate = fido2Key.CreationDate;
         }
@@ -35,7 +35,6 @@ namespace Bit.Core.Models.Api
         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; }
         public DateTime CreationDate { get; set; }
     }

src/Core/Models/AppOptions.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using System;
+using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
 namespace Bit.App.Models
@@ -8,8 +9,6 @@ namespace Bit.App.Models
         public bool MyVaultTile { get; set; }
         public bool GeneratorTile { get; set; }
         public bool FromAutofillFramework { get; set; }
-        public bool FromFido2Framework { get; set; }
-        public string Fido2CredentialAction { get; set; }
         public CipherType? FillType { get; set; }
         public string Uri { get; set; }
         public CipherType? SaveType { get; set; }
@@ -26,7 +25,6 @@ namespace Bit.App.Models
         public bool CopyInsteadOfShareAfterSaving { get; set; }
         public bool HideAccountSwitcher { get; set; }
         public OtpData? OtpData { get; set; }
-        public bool HasUnlockedInThisTransaction { get; set; }
         public bool HasJustLoggedInOrUnlocked { get; set; }
 
         public void SetAllFrom(AppOptions o)
@@ -38,7 +36,6 @@ namespace Bit.App.Models
             MyVaultTile = o.MyVaultTile;
             GeneratorTile = o.GeneratorTile;
             FromAutofillFramework = o.FromAutofillFramework;
-            Fido2CredentialAction = o.Fido2CredentialAction;
             FillType = o.FillType;
             Uri = o.Uri;
             SaveType = o.SaveType;
@@ -55,7 +52,6 @@ namespace Bit.App.Models
             CopyInsteadOfShareAfterSaving = o.CopyInsteadOfShareAfterSaving;
             HideAccountSwitcher = o.HideAccountSwitcher;
             OtpData = o.OtpData;
-            HasUnlockedInThisTransaction = o.HasUnlockedInThisTransaction;
         }
     }
 }

src/Core/Models/Data/Fido2CredentialData.cs

@@ -19,7 +19,6 @@ namespace Bit.Core.Models.Data
             RpName = apiData.RpName;
             UserHandle = apiData.UserHandle;
             UserName = apiData.UserName;
-            UserDisplayName = apiData.UserDisplayName;
             Counter = apiData.Counter;
             CreationDate = apiData.CreationDate;
         }
@@ -34,7 +33,6 @@ namespace Bit.Core.Models.Data
         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; }
         public DateTime CreationDate { get; set; }
     }

src/Core/Models/Domain/Fido2Credential.cs

@@ -1,4 +1,8 @@
-using Bit.Core.Models.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.Core.Models.Data;
 using Bit.Core.Models.View;
 
 namespace Bit.Core.Models.Domain
@@ -17,7 +21,6 @@ namespace Bit.Core.Models.Domain
             nameof(RpName),
             nameof(UserHandle),
             nameof(UserName),
-            nameof(UserDisplayName),
             nameof(Counter)
         };
 
@@ -45,7 +48,6 @@ namespace Bit.Core.Models.Domain
         public EncString RpName { get; set; }
         public EncString UserHandle { get; set; }
         public EncString UserName { get; set; }
-        public EncString UserDisplayName { get; set; }
         public EncString Counter { get; set; }
         public DateTime CreationDate { get; set; }
 

src/Core/Models/Domain/SymmetricCryptoKey.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Enums;
+using System;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Domain
 {
@@ -8,7 +9,7 @@ namespace Bit.Core.Models.Domain
         {
             if (key == null)
             {
-                throw new ArgumentKeyNullException(nameof(key));
+                throw new Exception("Must provide key.");
             }
 
             if (encType == null)
@@ -23,7 +24,7 @@ namespace Bit.Core.Models.Domain
                 }
                 else
                 {
-                    throw new InvalidKeyOperationException("Unable to determine encType.");
+                    throw new Exception("Unable to determine encType.");
                 }
             }
 
@@ -47,7 +48,7 @@ namespace Bit.Core.Models.Domain
             }
             else
             {
-                throw new InvalidKeyOperationException("Unsupported encType/key length.");
+                throw new Exception("Unsupported encType/key length.");
             }
 
             if (Key != null)
@@ -71,32 +72,6 @@ namespace Bit.Core.Models.Domain
         public string KeyB64 { get; set; }
         public string EncKeyB64 { get; set; }
         public string MacKeyB64 { get; set; }
-
-        public class ArgumentKeyNullException : ArgumentNullException
-        {
-            public ArgumentKeyNullException(string paramName) : base(paramName)
-            {
-            }
-
-            public ArgumentKeyNullException(string message, Exception innerException) : base(message, innerException)
-            {
-            }
-
-            public ArgumentKeyNullException(string paramName, string message) : base(paramName, message)
-            {
-            }
-        }
-
-        public class InvalidKeyOperationException : InvalidOperationException
-        {
-            public InvalidKeyOperationException(string message) : base(message)
-            {
-            }
-
-            public InvalidKeyOperationException(string message, Exception innerException) : base(message, innerException)
-            {
-            }
-        }
     }
 
     public class UserKey : SymmetricCryptoKey

src/Core/Models/View/CipherView.cs

@@ -1,7 +1,8 @@
-using Bit.Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Utilities;
 
 namespace Bit.Core.Models.View
 {
@@ -51,7 +52,7 @@ namespace Bit.Core.Models.View
         public DateTime? DeletedDate { get; set; }
         public CipherRepromptType Reprompt { get; set; }
         public CipherKey Key { get; set; }
-        
+
         public ItemView Item
         {
             get
@@ -121,14 +122,5 @@ namespace Bit.Core.Models.View
         public bool IsClonable => OrganizationId is null;
 
         public bool HasFido2Credential => Type == CipherType.Login && Login?.HasFido2Credentials == true;
-
-        public string GetMainFido2CredentialUsername()
-        {
-            return Login?.MainFido2Credential?.UserName
-                    .FallbackOnNullOrWhiteSpace(Login?.MainFido2Credential?.UserDisplayName)
-                    .FallbackOnNullOrWhiteSpace(Login?.Username)
-                    .FallbackOnNullOrWhiteSpace(Name)
-                    .FallbackOnNullOrWhiteSpace(AppResources.UnknownAccount);
-        }
     }
 }

src/Core/Models/View/Fido2CredentialView.cs

@@ -1,7 +1,7 @@
-using System.Text.Json.Serialization;
+using System;
+using System.Collections.Generic;
 using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
-using Bit.Core.Utilities;
 
 namespace Bit.Core.Models.View
 {
@@ -26,42 +26,13 @@ namespace Bit.Core.Models.View
         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; }
         public DateTime CreationDate { get; set; }
 
-        [JsonIgnore]
-        public int CounterValue {
-            get => int.TryParse(Counter, out var counter) ? counter : 0;
-            set => Counter = value.ToString();
-        }
-
-        [JsonIgnore]
-        public byte[] UserHandleValue {
-            get => UserHandle == null ? null : CoreHelpers.Base64UrlDecode(UserHandle);
-            set => UserHandle = value == null ? null : CoreHelpers.Base64UrlEncode(value);
-        }
-
-        [JsonIgnore]
-        public byte[] KeyBytes {
-            get => KeyValue == null ? null : CoreHelpers.Base64UrlDecode(KeyValue);
-            set => KeyValue = value == null ? null : CoreHelpers.Base64UrlEncode(value);
-        }
-
-        [JsonIgnore]
-        public bool DiscoverableValue {
-            get => bool.TryParse(Discoverable, out var discoverable) && discoverable;
-            set => Discoverable = value.ToString().ToLower();
-        }
-
-        [JsonIgnore]
         public override string SubTitle => UserName;
-        
         public override List<KeyValuePair<string, LinkedIdType>> LinkedFieldOptions => new List<KeyValuePair<string, LinkedIdType>>();
-        
-        [JsonIgnore]
+        public bool IsDiscoverable => !string.IsNullOrWhiteSpace(Discoverable);
         public bool CanLaunch => !string.IsNullOrEmpty(RpId);
-        [JsonIgnore]
         public string LaunchUri => $"https://{RpId}";
 
         public bool IsUniqueAgainst(Fido2CredentialView fido2View) => fido2View?.RpId != RpId || fido2View?.UserName != UserName;

src/Core/Models/View/LoginView.cs

@@ -1,4 +1,7 @@
-using Bit.Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Bit.Core.Enums;
 using Bit.Core.Models.Domain;
 
 namespace Bit.Core.Models.View

src/Core/Pages/Accounts/LockPage.xaml.cs

@@ -168,7 +168,7 @@ namespace Bit.App.Pages
                 var tasks = Task.Run(async () =>
                 {
                     await Task.Delay(50);
-                    _vm.SubmitCommand.Execute(null);
+                    MainThread.BeginInvokeOnMainThread(async () => await _vm.SubmitAsync());
                 });
             }
         }

src/Core/Pages/Accounts/LockPageViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Controls;
 using Bit.Core.Resources.Localization;
@@ -74,7 +73,7 @@ namespace Bit.App.Pages
 
             PageTitle = AppResources.VerifyMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
-            SubmitCommand = CreateDefaultAsyncRelayCommand(SubmitAsync, onException: _logger.Exception, allowsMultipleExecutions: false);
+            SubmitCommand = new Command(async () => await SubmitAsync());
 
             AccountSwitchingOverlayViewModel =
                 new AccountSwitchingOverlayViewModel(_stateService, _messagingService, _logger)
@@ -158,7 +157,7 @@ namespace Bit.App.Pages
 
         public AccountSwitchingOverlayViewModel AccountSwitchingOverlayViewModel { get; }
 
-        public ICommand SubmitCommand { get; }
+        public Command SubmitCommand { get; }
         public Command TogglePasswordCommand { get; }
 
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
@@ -234,8 +233,8 @@ namespace Bit.App.Pages
                 }
                 BiometricButtonVisible = true;
                 BiometricButtonText = AppResources.UseBiometricsToUnlock;
-
-                if (DeviceInfo.Platform == DevicePlatform.iOS)
+                // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
+                if (Device.RuntimePlatform == Device.iOS)
                 {
                     var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
                     BiometricButtonText = supportsFace ? AppResources.UseFaceIDToUnlock :
@@ -331,7 +330,6 @@ namespace Bit.App.Pages
                     Pin = string.Empty;
                     await AppHelpers.ResetInvalidUnlockAttemptsAsync();
                     await SetUserKeyAndContinueAsync(userKey);
-                    await Task.Delay(150); //Workaround Delay to avoid "duplicate" execution of SubmitAsync on Android when invoked from the ReturnCommand
                 }
             }
             catch (LegacyUserException)
@@ -420,7 +418,6 @@ namespace Bit.App.Pages
                 var userKey = await _cryptoService.DecryptUserKeyWithMasterKeyAsync(masterKey);
                 await _cryptoService.SetMasterKeyAsync(masterKey);
                 await SetUserKeyAndContinueAsync(userKey);
-                await Task.Delay(150); //Workaround Delay to avoid "duplicate" execution of SubmitAsync on Android when invoked from the ReturnCommand
 
                 // Re-enable biometrics
                 if (BiometricEnabled & !BiometricIntegrityValid)
@@ -518,7 +515,7 @@ namespace Bit.App.Pages
                 var success = await _platformUtilsService.AuthenticateBiometricAsync(null,
                     PinEnabled ? AppResources.PIN : AppResources.MasterPassword,
                     () => _secretEntryFocusWeakEventManager.RaiseEvent((int?)null, nameof(FocusSecretEntry)),
-                    !PinEnabled && !HasMasterPassword) ?? false;
+                    !PinEnabled && !HasMasterPassword);
 
                 await _stateService.SetBiometricLockedAsync(!success);
                 if (success)

src/Core/Pages/Settings/AutofillPage.xaml

@@ -5,7 +5,7 @@
     x:Class="Bit.App.Pages.AutofillPage"
     xmlns:pages="clr-namespace:Bit.App.Pages"
     xmlns:u="clr-namespace:Bit.App.Utilities"
-    Title="{u:I18n SetUpAutofill}">
+    Title="{u:I18n PasswordAutofill}">
 
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
@@ -15,22 +15,26 @@
         <StackLayout Spacing="5"
                  Padding="20, 20, 20, 30"
                  VerticalOptions="FillAndExpand">
-            <Label Text="{u:I18n GetInstantAccessToYourPasswordsAndPasskeys}"
+            <Label Text="{u:I18n ExtensionInstantAccess}"
                    HorizontalOptions="Center"
                    HorizontalTextAlignment="Center"
                    LineBreakMode="WordWrap"
                    StyleClass="text-lg"
                    Margin="0, 0, 0, 15" />
-            <Label Text="{u:I18n SetUpAutoFillDescriptionLong}"
+            <Label Text="{u:I18n AutofillTurnOn}"
                    HorizontalOptions="Center"
                    HorizontalTextAlignment="Center"
                    LineBreakMode="WordWrap"
                    Margin="0, 0, 0, 15" />
-            <Label Text="{u:I18n FirstDotGoToYourDeviceSettingsPasswordsPasswordOptions}"
+            <Label Text="{u:I18n AutofillTurnOn1}"
                    LineBreakMode="WordWrap" />
-            <Label Text="{u:I18n SecondDotTurnOnAutoFill}"
+            <Label Text="{u:I18n AutofillTurnOn2}"
                    LineBreakMode="WordWrap" />
-            <Label Text="{u:I18n ThirdDotSelectBitwardenToUseForPasswordsAndPasskeys}"
+            <Label Text="{u:I18n AutofillTurnOn3}"
+                   LineBreakMode="WordWrap" />
+            <Label Text="{u:I18n AutofillTurnOn4}"
+                   LineBreakMode="WordWrap" />
+            <Label Text="{u:I18n AutofillTurnOn5}"
                    LineBreakMode="WordWrap" />
             <Image Source="autofill-kb.png"
                    VerticalOptions="CenterAndExpand"

src/Core/Pages/Settings/AutofillSettingsPage.xaml

@@ -38,15 +38,6 @@
                 StyleClass="settings-item-view"
                 HorizontalOptions="FillAndExpand" />
 
-            <controls:ExternalLinkSubtitleItemView 
-                Title="{u:I18n PasskeyManagement}"
-                Subtitle="{u:I18n PasskeyManagementExplanationLong}"
-                IsVisible="{Binding SupportsCredentialProviderService}"
-                GoToLinkCommand="{Binding GoToCredentialProviderSettingsCommand}"
-                AutomationId="CredentialProviderServiceSwitch"
-                StyleClass="settings-item-view"
-                HorizontalOptions="FillAndExpand" />
-
             <controls:SwitchItemView
                 Title="{u:I18n Accessibility}"
                 Subtitle="{Binding UseAccessibilityDescription}"

src/Core/Pages/Settings/AutofillSettingsPageViewModel.android.cs

@@ -12,8 +12,6 @@ namespace Bit.App.Pages
         private bool _useDrawOver;
         private bool _askToAddLogin;
 
-        public bool SupportsCredentialProviderService => DeviceInfo.Platform == DevicePlatform.Android && _deviceActionService.SupportsCredentialProviderService();
-
         public bool SupportsAndroidAutofillServices => DeviceInfo.Platform == DevicePlatform.Android && _deviceActionService.SupportsAutofillServices();
 
         public bool UseAutofillServices
@@ -92,7 +90,6 @@ namespace Bit.App.Pages
         public AsyncRelayCommand ToggleUseDrawOverCommand { get; private set; }
         public AsyncRelayCommand ToggleAskToAddLoginCommand { get; private set; }
         public ICommand GoToBlockAutofillUrisCommand { get; private set; }
-        public ICommand GoToCredentialProviderSettingsCommand { get; private set; }
 
         private void InitAndroidCommands()
         {
@@ -102,7 +99,6 @@ namespace Bit.App.Pages
             ToggleUseDrawOverCommand = CreateDefaultAsyncRelayCommand(() => MainThread.InvokeOnMainThreadAsync(() => ToggleDrawOver()), () => _inited, allowsMultipleExecutions: false);
             ToggleAskToAddLoginCommand = CreateDefaultAsyncRelayCommand(ToggleAskToAddLoginAsync, () => _inited, allowsMultipleExecutions: false);
             GoToBlockAutofillUrisCommand = CreateDefaultAsyncRelayCommand(() => Page.Navigation.PushAsync(new BlockAutofillUrisPage()), allowsMultipleExecutions: false);
-            GoToCredentialProviderSettingsCommand = CreateDefaultAsyncRelayCommand(() => MainThread.InvokeOnMainThreadAsync(() => GoToCredentialProviderSettings()), () => _inited, allowsMultipleExecutions: false);
         }
 
         private async Task InitAndroidAutofillSettingsAsync()
@@ -134,17 +130,6 @@ namespace Bit.App.Pages
             });
         }
 
-        private async Task GoToCredentialProviderSettings()
-        {
-            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.SetBitwardenAsPasskeyManagerDescription, AppResources.ContinueToDeviceSettings,
-                AppResources.Continue,
-                AppResources.Cancel);
-            if (confirmed)
-            {
-                _deviceActionService.OpenCredentialProviderSettings();
-            }
-        }
-
         private void ToggleUseAutofillServices()
         {
             if (UseAutofillServices)

src/Core/Pages/Settings/SecuritySettingsPageViewModel.cs

@@ -370,7 +370,7 @@ namespace Bit.App.Pages
 
             if (!_supportsBiometric
                 ||
-                await _platformUtilsService.AuthenticateBiometricAsync(null, DeviceInfo.Platform == DevicePlatform.Android ? "." : null) != true)
+                !await _platformUtilsService.AuthenticateBiometricAsync(null, DeviceInfo.Platform == DevicePlatform.Android ? "." : null))
             {
                 _canUnlockWithBiometrics = false;
                 MainThread.BeginInvokeOnMainThread(() => TriggerPropertyChanged(nameof(CanUnlockWithBiometrics)));

src/Core/Pages/Vault/AutofillCiphersPageViewModel.cs

@@ -1,7 +1,6 @@
 using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core;
-using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
@@ -13,8 +12,6 @@ namespace Bit.App.Pages
     public class AutofillCiphersPageViewModel : CipherSelectionPageViewModel
     {
         private CipherType? _fillType;
-        private AppOptions _appOptions;
-        private readonly LazyResolve<IFido2MakeCredentialConfirmationUserInterface> _fido2MakeCredentialConfirmationUserInterface = new LazyResolve<IFido2MakeCredentialConfirmationUserInterface>();
 
         public string Uri { get; set; }
 
@@ -22,7 +19,6 @@ namespace Bit.App.Pages
         {
             Uri = appOptions?.Uri;
             _fillType = appOptions.FillType;
-            _appOptions = appOptions;
 
             string name = null;
             if (Uri?.StartsWith(Constants.AndroidAppProtocol) ?? false)
@@ -40,7 +36,6 @@ namespace Bit.App.Pages
             Name = name;
             PageTitle = string.Format(AppResources.ItemsForUri, Name ?? "--");
             NoDataText = string.Format(AppResources.NoItemsForUri, Name ?? "--");
-            AddNewItemText = _fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential ? AppResources.SavePasskeyAsNewLogin : AppResources.AddAnItem;
         }
 
         protected override async Task<List<GroupingsPageListGroup>> LoadGroupedItemsAsync()
@@ -48,11 +43,7 @@ namespace Bit.App.Pages
             var groupedItems = new List<GroupingsPageListGroup>();
             var ciphers = await _cipherService.GetAllDecryptedByUrlAsync(Uri, null);
 
-            var matching = ciphers.Item1?.Select(c => new CipherItemViewModel(c, WebsiteIconsEnabled)
-            {
-                UsePasskeyIconAsPlaceholderFallback = _fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential
-            }).ToList();
-
+            var matching = ciphers.Item1?.Select(c => new CipherItemViewModel(c, WebsiteIconsEnabled)).ToList();
             var hasMatching = matching?.Any() ?? false;
             if (matching?.Any() ?? false)
             {
@@ -87,12 +78,6 @@ namespace Bit.App.Pages
                 return;
             }
 
-            if (_fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-            {
-                await _fido2MakeCredentialConfirmationUserInterface.Value.ConfirmAsync(cipher.Id, cipher.Login.HasFido2Credentials, null);
-                return;
-            }
-
             if (!await _passwordRepromptService.PromptAndCheckPasswordIfNeededAsync(cipher.Reprompt))
             {
                 return;
@@ -145,30 +130,8 @@ namespace Bit.App.Pages
             }
         }
 
-        protected override async Task AddFabCipherAsync()
-        {
-            //Scenario for creating a new Fido2 credential on Android but showing the Cipher Page
-            if (_fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-            {
-                var pageForOther = new CipherAddEditPage(null, CipherType.Login, appOptions: _appOptions);
-                await Page.Navigation.PushModalAsync(new NavigationPage(pageForOther));
-                return;
-            }
-            else
-            {
-                await AddCipherAsync();
-            }
-        }
-
         protected override async Task AddCipherAsync()
         {
-            //Scenario for creating a new Fido2 credential on Android
-            if (_fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-            {
-                _fido2MakeCredentialConfirmationUserInterface.Value.Confirm(null, null);
-                return;
-            }
-
             if (_fillType.HasValue && _fillType != CipherType.Login)
             {
                 var pageForOther = new CipherAddEditPage(type: _fillType, fromAutofill: true);
@@ -180,13 +143,5 @@ namespace Bit.App.Pages
                 fromAutofill: true);
             await Page.Navigation.PushModalAsync(new NavigationPage(pageForLogin));
         }
-
-        public void Cancel()
-        {
-            if (_fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-            {
-                _fido2MakeCredentialConfirmationUserInterface.Value.Cancel();
-            }
-        }
     }
 }

src/Core/Pages/Vault/CipherAddEditPage.xaml

@@ -112,7 +112,7 @@
                            StyleClass="box-header, box-header-platform" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-input"
-                             IsVisible="{Binding TypeEditMode, Converter={StaticResource inverseBool}}">
+                             IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}">
                     <Label
                         Text="{u:I18n Type}"
                         StyleClass="box-label" />
@@ -649,11 +649,9 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     SemanticProperties.Description="{u:I18n URI}"
-                                    IsEnabled="{Binding BindingContext.IsFromFido2Framework, Source={x:Reference _page}, Converter={StaticResource inverseBool}}"
                                     AutomationId="LoginUriEntry" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
-                                    IsVisible="{Binding BindingContext.IsFromFido2Framework, Source={x:Reference _page}, Converter={StaticResource inverseBool}}"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
                                     Command="{Binding BindingContext.UriOptionsCommand, Source={x:Reference _page}}"
                                     CommandParameter="{Binding .}"
@@ -667,7 +665,6 @@
                     </BindableLayout.ItemTemplate>
                 </StackLayout>
                 <Button Text="{u:I18n NewUri}" StyleClass="box-button-row"
-                        IsVisible="{Binding IsFromFido2Framework, Converter={StaticResource inverseBool}}"
                         Clicked="NewUri_Clicked"
                         AutomationId="LoginAddNewUriButton"></Button>
             </StackLayout>

src/Core/Pages/Vault/CipherAddEditPage.xaml.cs

@@ -19,9 +19,6 @@ namespace Bit.App.Pages
         private readonly IAutofillHandler _autofillHandler;
         private readonly IVaultTimeoutService _vaultTimeoutService;
         private readonly IUserVerificationService _userVerificationService;
-#if ANDROID
-        private readonly LazyResolve<IFido2MakeCredentialConfirmationUserInterface> _fido2MakeCredentialConfirmationUserInterface = new LazyResolve<IFido2MakeCredentialConfirmationUserInterface>();
-#endif
 
         private CipherAddEditPageViewModel _vm;
         private bool _fromAutofill;
@@ -48,9 +45,6 @@ namespace Bit.App.Pages
             _appOptions = appOptions;
             _fromAutofill = fromAutofill;
             FromAutofillFramework = _appOptions?.FromAutofillFramework ?? false;
-#if ANDROID
-            FromAndroidFido2Framework = _fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential;
-#endif
             InitializeComponent();
             _vm = BindingContext as CipherAddEditPageViewModel;
             _vm.Page = this;
@@ -150,7 +144,6 @@ namespace Bit.App.Pages
         }
 
         public bool FromAutofillFramework { get; set; }
-        public bool FromAndroidFido2Framework { get; set; }
         public CipherAddEditPageViewModel ViewModel => _vm;
 
         protected override async void OnAppearing()

src/Core/Pages/Vault/CipherAddEditPageViewModel.cs

@@ -17,8 +17,6 @@ using Microsoft.Maui.Controls;
 using Microsoft.Maui;
 using Bit.App.Utilities;
 using CommunityToolkit.Mvvm.Input;
-using Bit.Core.Utilities.Fido2;
-using Bit.Core.Services;
 
 #nullable enable
 
@@ -39,9 +37,7 @@ namespace Bit.App.Pages
         private readonly IAutofillHandler _autofillHandler;
         private readonly IWatchDeviceService _watchDeviceService;
         private readonly IAccountsManager _accountsManager;
-        private readonly IFido2MakeCredentialConfirmationUserInterface _fido2MakeCredentialConfirmationUserInterface;
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-        
+
         private bool _showNotesSeparator;
         private bool _showPassword;
         private bool _showCardNumber;
@@ -96,11 +92,6 @@ namespace Bit.App.Pages
             _autofillHandler = ServiceContainer.Resolve<IAutofillHandler>();
             _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
             _accountsManager = ServiceContainer.Resolve<IAccountsManager>();
-            if (ServiceContainer.TryResolve<IFido2MakeCredentialConfirmationUserInterface>(out var fido2MakeService))
-            {
-                _fido2MakeCredentialConfirmationUserInterface = fido2MakeService;
-            }
-            _userVerificationMediatorService = ServiceContainer.Resolve<IUserVerificationMediatorService>(); 
 
             GeneratePasswordCommand = new Command(GeneratePassword);
             TogglePasswordCommand = new Command(TogglePassword);
@@ -301,9 +292,7 @@ namespace Bit.App.Pages
                 });
         }
         public bool ShowCollections => (!EditMode || CloneMode) && Cipher?.OrganizationId != null;
-        public bool IsFromFido2Framework { get; set; }
         public bool EditMode => !string.IsNullOrWhiteSpace(CipherId);
-        public bool TypeEditMode => !string.IsNullOrWhiteSpace(CipherId) || IsFromFido2Framework;
         public bool ShowOwnershipOptions => !EditMode || CloneMode;
         public bool OwnershipPolicyInEffect => ShowOwnershipOptions && !AllowPersonal;
         public bool CloneMode { get; set; }
@@ -335,7 +324,6 @@ namespace Bit.App.Pages
         public async Task<bool> LoadAsync(AppOptions appOptions = null)
         {
             _fromOtp = appOptions?.OtpData != null;
-            IsFromFido2Framework = _fido2MakeCredentialConfirmationUserInterface?.IsConfirmingNewCredential == true;
 
             var myEmail = await _stateService.GetEmailAsync();
             OwnershipOptions.Add(new KeyValuePair<string, string>(myEmail, null));
@@ -548,26 +536,6 @@ namespace Bit.App.Pages
             }
             try
             {
-                bool isFido2UserVerified = false;
-                if (IsFromFido2Framework)
-                {
-                    // Verify the user and prevent saving cipher if enforcing is needed and it's not verified.
-                    var userVerification = await VerifyUserAsync();
-                    if (userVerification.IsCancelled)
-                    {
-                        return false;
-                    }
-                    isFido2UserVerified = userVerification.Result;
-
-                    var options = _fido2MakeCredentialConfirmationUserInterface.GetCurrentUserVerificationOptions();
-
-                    if (!isFido2UserVerified && await _userVerificationMediatorService.ShouldEnforceFido2RequiredUserVerificationAsync(options.Value))
-                    {
-                        await _platformUtilsService.ShowDialogAsync(AppResources.ErrorCreatingPasskey, AppResources.SavePasskey);
-                        return false;
-                    }
-                }
-
                 await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
 
                 await _cipherService.SaveWithServerAsync(cipher);
@@ -586,11 +554,6 @@ namespace Bit.App.Pages
                     // Close and go back to app
                     _autofillHandler.CloseAutofill();
                 }
-                else if (IsFromFido2Framework)
-                {
-                    _fido2MakeCredentialConfirmationUserInterface.Confirm(cipher.Id, isFido2UserVerified);
-                    return true;
-                }
                 else if (_fromOtp)
                 {
                     await _accountsManager.StartDefaultNavigationFlowAsync(op => op.OtpData = null);
@@ -626,27 +589,6 @@ namespace Bit.App.Pages
             return false;
         }
 
-        private async Task<CancellableResult<bool>> VerifyUserAsync()
-        {
-            try
-            {
-                var options = _fido2MakeCredentialConfirmationUserInterface.GetCurrentUserVerificationOptions();
-                ArgumentNullException.ThrowIfNull(options);
-
-                if (options.Value.UserVerificationPreference == Fido2UserVerificationPreference.Discouraged)
-                {
-                    return new CancellableResult<bool>(false);
-                }
-
-                return await _userVerificationMediatorService.VerifyUserForFido2Async(options.Value);
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                return new CancellableResult<bool>(false);
-            }
-        }
-
         public async Task<bool> DeleteAsync()
         {
             if (Microsoft.Maui.Networking.Connectivity.NetworkAccess == Microsoft.Maui.Networking.NetworkAccess.None)

src/Core/Pages/Vault/CipherItemViewModel.cs

@@ -44,7 +44,5 @@ namespace Bit.App.Pages
         /// This is useful to check when the cell is being reused.
         /// </summary>
         public bool IconImageSuccesfullyLoaded { get; set; }
-
-        public bool UsePasskeyIconAsPlaceholderFallback { get; set; }
     }
 }

src/Core/Pages/Vault/CipherSelectionPage.xaml

@@ -78,13 +78,12 @@
                     Spacing="20"
                     IsVisible="{Binding ShowNoData}">
                     <Image
-                        x:Name="_emptyItemsPlaceholder"
                         Source="empty_items_state" />
                     <Label
                         Text="{Binding NoDataText}"
                         HorizontalTextAlignment="Center"></Label>
                     <Button
-                        Text="{Binding AddNewItemText}"
+                        Text="{u:I18n AddAnItem}"
                         Command="{Binding AddCipherCommand}" />
                 </StackLayout>
 
@@ -134,7 +133,7 @@
         <Button
             x:Name="_fab"
             ImageSource="plus.png"
-            Command="{Binding AddFabCipherCommand}"
+            Command="{Binding AddCipherCommand}"
             Style="{StaticResource btn-fab}"
             IsVisible="{OnPlatform iOS=false, Android=true}"
             AbsoluteLayout.LayoutFlags="PositionProportional"

src/Core/Pages/Vault/CipherSelectionPage.xaml.cs

@@ -115,8 +115,6 @@ namespace Bit.App.Pages
                     await _vm.LoadAsync();
                 }
             }, _mainContent);
-
-            UpdatePlaceholder();
         }
 
         protected override bool OnBackButtonPressed()
@@ -129,11 +127,6 @@ namespace Bit.App.Pages
 
 #if ANDROID
             _appOptions.Uri = null;
-
-            if (BindingContext is AutofillCiphersPageViewModel autofillVM)
-            {
-                autofillVM.Cancel();
-            }
 #endif
             return base.OnBackButtonPressed();
         }
@@ -182,27 +175,7 @@ namespace Bit.App.Pages
             if (DoOnce())
             {
                 _accountsManager.StartDefaultNavigationFlowAsync(op => op.OtpData = null).FireAndForget();
-
-                if (BindingContext is AutofillCiphersPageViewModel autofillVM)
-                {
-                    autofillVM.Cancel();
-                }
             }
         }
-
-        public override async Task UpdateOnThemeChanged()
-        {
-            await base.UpdateOnThemeChanged();
-
-            UpdatePlaceholder();
-        }
-
-        private void UpdatePlaceholder()
-        {
-#if ANDROID
-            MainThread.BeginInvokeOnMainThread(() =>
-                _emptyItemsPlaceholder.Source = ImageSource.FromFile(ThemeManager.UsingLightTheme ? "empty_items_state.png" : "empty_items_state_dark.png"));
-#endif
-        }
     }
 }

src/Core/Pages/Vault/CipherSelectionPageViewModel.cs

@@ -4,7 +4,6 @@ using Bit.App.Controls;
 using Bit.App.Utilities;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.View;
-using Bit.Core.Resources.Localization;
 using Bit.Core.Utilities;
 
 namespace Bit.App.Pages
@@ -23,7 +22,6 @@ namespace Bit.App.Pages
         protected bool _showNoData;
         protected bool _showList;
         protected string _noDataText;
-        protected string _addNewItemText;
         protected bool _websiteIconsEnabled;
 
         public CipherSelectionPageViewModel()
@@ -44,9 +42,6 @@ namespace Bit.App.Pages
             SelectCipherCommand = CreateDefaultAsyncRelayCommand<IGroupingsPageListItem>(SelectCipherAsync,
                 onException: ex => HandleException(ex),
                 allowsMultipleExecutions: false);
-            AddFabCipherCommand = CreateDefaultAsyncRelayCommand(AddFabCipherAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
             AddCipherCommand = CreateDefaultAsyncRelayCommand(AddCipherAsync,
                 onException: ex => HandleException(ex),
                 allowsMultipleExecutions: false);
@@ -55,8 +50,6 @@ namespace Bit.App.Pages
             {
                 AllowAddAccountRow = false
             };
-
-            AddNewItemText = AppResources.AddAnItem;
         }
 
         public string Name { get; set; }
@@ -67,7 +60,6 @@ namespace Bit.App.Pages
         public ICommand CipherOptionsCommand { get; set; }
         public ICommand SelectCipherCommand { get; set; }
         public ICommand AddCipherCommand { get; set; }
-        public ICommand AddFabCipherCommand { get; set; }
 
         public bool ShowNoData
         {
@@ -87,12 +79,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _noDataText, value);
         }
 
-        public string AddNewItemText
-        {
-            get => _addNewItemText;
-            set => SetProperty(ref _addNewItemText, value);
-        }
-
         public bool WebsiteIconsEnabled
         {
             get => _websiteIconsEnabled;
@@ -167,6 +153,5 @@ namespace Bit.App.Pages
         protected abstract Task SelectCipherAsync(IGroupingsPageListItem item);
 
         protected abstract Task AddCipherAsync();
-        protected abstract Task AddFabCipherAsync();
     }
 }

src/Core/Pages/Vault/CiphersPageViewModel.cs

@@ -7,7 +7,6 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
 
 namespace Bit.App.Pages
 {
@@ -22,10 +21,6 @@ namespace Bit.App.Pages
         private readonly IPasswordRepromptService _passwordRepromptService;
         private readonly IOrganizationService _organizationService;
         private readonly IPolicyService _policyService;
-#if ANDROID
-        private readonly LazyResolve<IFido2MakeCredentialConfirmationUserInterface> _fido2MakeCredentialConfirmationUserInterface = new LazyResolve<IFido2MakeCredentialConfirmationUserInterface>();
-#endif
-
         private CancellationTokenSource _searchCancellationTokenSource;
         private readonly ILogger _logger;
 
@@ -51,9 +46,6 @@ namespace Bit.App.Pages
             CipherOptionsCommand = CreateDefaultAsyncRelayCommand<CipherView>(cipher => Utilities.AppHelpers.CipherListOptions(Page, cipher, _passwordRepromptService),
                 onException: ex => HandleException(ex),
                 allowsMultipleExecutions: false);
-            AddFabCipherCommand = CreateDefaultAsyncRelayCommand(AddCipherAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
             AddCipherCommand = CreateDefaultAsyncRelayCommand(AddCipherAsync,
                 onException: ex => HandleException(ex),
                 allowsMultipleExecutions: false);
@@ -61,7 +53,6 @@ namespace Bit.App.Pages
 
         public ICommand CipherOptionsCommand { get; }
         public ICommand AddCipherCommand { get; }
-        public ICommand AddFabCipherCommand { get; }
         public ExtendedObservableCollection<CipherItemViewModel> Ciphers { get; set; }
         public Func<CipherView, bool> Filter { get; set; }
         public string AutofillUrl { get; set; }
@@ -177,14 +168,6 @@ namespace Bit.App.Pages
 
         public async Task SelectCipherAsync(CipherView cipher)
         {
-#if ANDROID
-            if (_fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-            {
-                await _fido2MakeCredentialConfirmationUserInterface.Value.ConfirmAsync(cipher.Id, cipher.Login.HasFido2Credentials, null);
-                return;
-            }
-#endif
-
             string selection = null;
 
             if (!string.IsNullOrWhiteSpace(AutofillUrl))

src/Core/Pages/Vault/OTPCipherSelectionPageViewModel.cs

@@ -70,10 +70,5 @@ namespace Bit.App.Pages
             var pageForLogin = new CipherAddEditPage(null, CipherType.Login, name: Name, appOptions: _appOptions);
             await Page.Navigation.PushModalAsync(new NavigationPage(pageForLogin));
         }
-
-        protected override async Task AddFabCipherAsync()
-        {
-            await AddCipherAsync();
-        }
     }
 }

src/Core/Resources/Images/dotnet_bot.svg

@@ -0,0 +1,95 @@
+<svg width="419" height="519" viewBox="0 0 419 519" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M284.432 247.568L284.004 221.881C316.359 221.335 340.356 211.735 355.308 193.336C382.408 159.996 372.893 108.183 372.786 107.659L398.013 102.831C398.505 105.432 409.797 167.017 375.237 209.53C355.276 234.093 324.719 246.894 284.432 247.568Z" fill="#8A6FE8"/>
+<path d="M331.954 109.36L361.826 134.245C367.145 138.676 375.055 137.959 379.497 132.639C383.928 127.32 383.211 119.41 377.891 114.969L348.019 90.0842C342.7 85.6531 334.79 86.3702 330.348 91.6896C325.917 97.0197 326.634 104.929 331.954 109.36Z" fill="#8A6FE8"/>
+<path d="M407.175 118.062L417.92 94.2263C420.735 87.858 417.856 80.4087 411.488 77.5831C405.12 74.7682 397.67 77.6473 394.845 84.0156L383.831 108.461L407.175 118.062Z" fill="#8A6FE8"/>
+<path d="M401.363 105.175L401.234 69.117C401.181 62.1493 395.498 56.541 388.53 56.5945C381.562 56.648 375.954 62.3313 376.007 69.2989L376.018 96.11L401.363 105.175Z" fill="#8A6FE8"/>
+<path d="M386.453 109.071L378.137 73.9548C376.543 67.169 369.757 62.9628 362.971 64.5575C356.185 66.1523 351.979 72.938 353.574 79.7237L362.04 115.482L386.453 109.071Z" fill="#8A6FE8"/>
+<path d="M381.776 142.261C396.359 142.261 408.181 130.44 408.181 115.857C408.181 101.274 396.359 89.4527 381.776 89.4527C367.194 89.4527 355.372 101.274 355.372 115.857C355.372 130.44 367.194 142.261 381.776 142.261Z" fill="url(#paint0_radial)"/>
+<path d="M248.267 406.979C248.513 384.727 245.345 339.561 222.376 301.736L199.922 315.372C220.76 349.675 222.323 389.715 221.841 407.182C221.798 408.627 235.263 409.933 248.267 406.979Z" fill="url(#paint1_linear)"/>
+<path d="M221.841 406.936L242.637 406.84L262.052 518.065L220.311 518.258C217.132 518.269 214.724 515.711 214.938 512.532L221.841 406.936Z" fill="#522CD5"/>
+<path d="M306.566 488.814C310.173 491.661 310.109 495.782 309.831 500.127L308.964 513.452C308.803 515.839 306.727 517.798 304.34 517.809L260.832 518.012C258.125 518.023 256.08 515.839 256.262 513.142L256.551 499.335C256.883 494.315 255.192 492.474 251.307 487.744C244.649 479.663 224.967 435.62 226.84 406.925L248.256 406.829C249.691 423.858 272.167 461.682 306.566 488.814Z" fill="url(#paint2_linear)"/>
+<path d="M309.82 500.127C310.023 497.088 310.077 494.176 308.889 491.715L254.635 491.961C256.134 494.166 256.765 496.092 256.562 499.314L256.273 513.121C256.091 515.828 258.146 518.012 260.843 517.99L304.34 517.798C306.727 517.787 308.803 515.828 308.964 513.442L309.82 500.127Z" fill="url(#paint3_radial)"/>
+<path d="M133.552 407.471C133.103 385.22 135.864 340.021 158.49 301.993L181.073 315.425C160.545 349.921 159.346 389.972 159.989 407.428C160.042 408.884 146.578 410.318 133.552 407.471Z" fill="url(#paint4_linear)"/>
+<path d="M110.798 497.152C110.765 494.187 111.204 491.575 112.457 487.23C131.882 434.132 133.52 407.364 133.52 407.364L159.999 407.246C159.999 407.246 161.819 433.512 181.716 486.427C183.289 490.195 183.471 493.641 183.674 496.831L183.792 513.816C183.803 516.374 181.716 518.483 179.158 518.494L177.873 518.504L116.781 518.782L115.496 518.793C112.927 518.804 110.83 516.728 110.819 514.159L110.798 497.152Z" fill="url(#paint5_linear)"/>
+<path d="M110.798 497.152C110.798 496.67 110.808 496.199 110.83 495.739C110.969 494.262 111.643 492.603 114.875 492.582L180.207 492.282C182.561 492.367 183.343 494.176 183.589 495.311C183.621 495.814 183.664 496.328 183.696 496.82L183.813 513.806C183.824 515.411 183.011 516.824 181.769 517.669C181.031 518.172 180.132 518.472 179.179 518.483L177.895 518.494L116.802 518.772L115.528 518.782C114.244 518.793 113.077 518.269 112.232 517.434C111.386 516.599 110.862 515.432 110.851 514.148L110.798 497.152Z" fill="url(#paint6_radial)"/>
+<path d="M314.979 246.348C324.162 210.407 318.008 181.777 318.008 181.777L326.452 181.734L326.656 181.574C314.262 115.75 256.326 66.0987 186.949 66.4198C108.796 66.773 45.7233 130.424 46.0765 208.577C46.4297 286.731 110.08 349.803 188.234 349.45C249.905 349.172 302.178 309.474 321.304 254.343C321.872 251.999 321.797 247.804 314.979 246.348Z" fill="url(#paint7_radial)"/>
+<path d="M310.237 279.035L65.877 280.148C71.3998 289.428 77.95 298.012 85.3672 305.761L290.972 304.829C298.336 297.005 304.8 288.368 310.237 279.035Z" fill="#D8CFF7"/>
+<path d="M235.062 312.794L280.924 312.585L280.74 272.021L234.877 272.23L235.062 312.794Z" fill="#512BD4"/>
+<path d="M243.001 297.626C242.691 297.626 242.434 297.53 242.22 297.327C242.006 297.123 241.899 296.866 241.899 296.588C241.899 296.299 242.006 296.042 242.22 295.839C242.434 295.625 242.691 295.528 243.001 295.528C243.312 295.528 243.568 295.635 243.782 295.839C243.996 296.042 244.114 296.299 244.114 296.588C244.114 296.877 244.007 297.123 243.793 297.327C243.568 297.519 243.312 297.626 243.001 297.626Z" fill="white"/>
+<path d="M255.192 297.434H253.212L247.967 289.203C247.839 289 247.721 288.775 247.636 288.55H247.593C247.636 288.786 247.657 289.299 247.657 290.091L247.668 297.444H245.912L245.891 286.228H247.999L253.062 294.265C253.276 294.597 253.415 294.833 253.479 294.95H253.511C253.458 294.651 253.437 294.148 253.437 293.441L253.426 286.217H255.17L255.192 297.434Z" fill="white"/>
+<path d="M263.733 297.412L257.589 297.423L257.568 286.206L263.465 286.195V287.779L259.387 287.79L259.398 290.969L263.155 290.958V292.532L259.398 292.542L259.409 295.86L263.733 295.85V297.412Z" fill="white"/>
+<path d="M272.445 287.758L269.298 287.769L269.32 297.401H267.5L267.479 287.769L264.343 287.779V286.195L272.434 286.174L272.445 287.758Z" fill="white"/>
+<path d="M315.279 246.337C324.355 210.836 318.457 182.483 318.308 181.798L171.484 182.462C171.484 182.462 162.226 181.563 162.268 190.018C162.311 198.463 162.761 222.341 162.878 248.746C162.9 254.172 167.363 256.773 170.863 256.751C170.874 256.751 311.618 252.213 315.279 246.337Z" fill="url(#paint8_radial)"/>
+<path d="M227.685 246.798C227.685 246.798 250.183 228.827 254.571 225.499C258.959 222.17 262.812 221.977 266.869 225.445C270.925 228.913 293.616 246.498 293.616 246.498L227.685 246.798Z" fill="#A08BE8"/>
+<path d="M320.748 256.141C320.748 256.141 324.943 248.414 315.279 246.348C315.289 246.305 170.927 246.894 170.927 246.894C167.566 246.905 163.232 244.925 162.846 241.671C162.857 244.004 162.878 246.369 162.889 248.756C162.91 253.68 166.582 256.27 169.878 256.698C170.21 256.73 170.542 256.773 170.874 256.773L180.742 256.73L320.748 256.141Z" fill="#512BD4"/>
+<path d="M206.4 233.214C212.511 233.095 217.302 224.667 217.102 214.39C216.901 204.112 211.785 195.878 205.674 195.997C199.563 196.116 194.772 204.544 194.973 214.821C195.173 225.099 200.289 233.333 206.4 233.214Z" fill="#512BD4"/>
+<path d="M306.249 214.267C306.356 203.989 301.488 195.605 295.377 195.541C289.266 195.478 284.225 203.758 284.118 214.037C284.011 224.315 288.878 232.699 294.99 232.763C301.101 232.826 306.142 224.545 306.249 214.267Z" fill="#512BD4"/>
+<path d="M205.905 205.291C208.152 203.022 211.192 202.016 214.157 202.262C215.912 205.495 217.014 209.733 217.111 214.389C217.164 217.3 216.811 220.04 216.158 222.513C212.669 223.519 208.752 222.662 205.979 219.922C201.912 215.909 201.88 209.348 205.905 205.291Z" fill="#8065E0"/>
+<path d="M294.996 204.285C297.255 202.016 300.294 200.999 303.259 201.256C305.164 204.628 306.309 209.209 306.256 214.239C306.224 216.808 305.892 219.259 305.303 221.485C301.793 222.523 297.843 221.678 295.061 218.916C291.004 214.892 290.972 208.342 294.996 204.285Z" fill="#8065E0"/>
+<path d="M11.6342 357.017C10.9171 354.716 -5.72611 300.141 21.3204 258.903C36.9468 235.078 63.3083 221.035 99.6664 217.15L102.449 243.276C74.3431 246.273 54.4676 256.345 43.3579 273.202C23.0971 303.941 36.5722 348.733 36.7113 349.183L11.6342 357.017Z" fill="url(#paint9_linear)"/>
+<path d="M95.1498 252.802C109.502 252.802 121.137 241.167 121.137 226.815C121.137 212.463 109.502 200.828 95.1498 200.828C80.7976 200.828 69.1628 212.463 69.1628 226.815C69.1628 241.167 80.7976 252.802 95.1498 252.802Z" fill="url(#paint10_radial)"/>
+<path d="M72.0098 334.434L33.4683 329.307C26.597 328.397 20.2929 333.214 19.3725 340.085C18.4627 346.956 23.279 353.26 30.1504 354.181L68.6919 359.308C75.5632 360.217 81.8673 355.401 82.7878 348.53C83.6975 341.658 78.8705 335.344 72.0098 334.434Z" fill="#8A6FE8"/>
+<path d="M3.73535 367.185L7.35297 393.076C8.36975 399.968 14.7702 404.731 21.6629 403.725C28.5556 402.708 33.3185 396.308 32.3124 389.415L28.5984 362.861L3.73535 367.185Z" fill="#8A6FE8"/>
+<path d="M15.5194 374.988L34.849 405.427C38.6058 411.292 46.4082 413.005 52.2735 409.248C58.1387 405.491 59.8512 397.689 56.0945 391.823L41.7953 369.144L15.5194 374.988Z" fill="#8A6FE8"/>
+<path d="M26.0511 363.739L51.8026 389.019C56.7688 393.911 64.7532 393.846 69.6445 388.88C74.5358 383.914 74.4715 375.929 69.516 371.038L43.2937 345.297L26.0511 363.739Z" fill="#8A6FE8"/>
+<path d="M26.4043 381.912C40.987 381.912 52.8086 370.091 52.8086 355.508C52.8086 340.925 40.987 329.104 26.4043 329.104C11.8216 329.104 0 340.925 0 355.508C0 370.091 11.8216 381.912 26.4043 381.912Z" fill="url(#paint11_radial)"/>
+<path d="M184.73 63.6308L157.819 66.5892L158.561 38.5412L177.888 36.4178L184.73 63.6308Z" fill="#8A6FE8"/>
+<path d="M170.018 41.647C180.455 39.521 187.193 29.3363 185.067 18.8988C182.941 8.46126 172.757 1.72345 162.319 3.84944C151.882 5.97543 145.144 16.1601 147.27 26.5976C149.396 37.0351 159.58 43.773 170.018 41.647Z" fill="#D8CFF7"/>
+<path d="M196.885 79.385C198.102 79.2464 198.948 78.091 198.684 76.8997C195.851 64.2818 183.923 55.5375 170.773 56.9926C157.622 58.4371 147.886 69.5735 147.865 82.4995C147.863 83.7232 148.949 84.6597 150.168 84.5316L196.885 79.385Z" fill="url(#paint12_radial)"/>
+<defs>
+<radialGradient id="paint0_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(382.004 103.457) scale(26.4058)">
+<stop stop-color="#8065E0"/>
+<stop offset="1" stop-color="#512BD4"/>
+</radialGradient>
+<linearGradient id="paint1_linear" x1="214.439" y1="303.482" x2="236.702" y2="409.505" gradientUnits="userSpaceOnUse">
+<stop stop-color="#522CD5"/>
+<stop offset="0.4397" stop-color="#8A6FE8"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="231.673" y1="404.144" x2="297.805" y2="522.048" gradientUnits="userSpaceOnUse">
+<stop stop-color="#522CD5"/>
+<stop offset="0.4397" stop-color="#8A6FE8"/>
+</linearGradient>
+<radialGradient id="paint3_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(280.957 469.555) rotate(-0.260742) scale(45.8326)">
+<stop offset="0.034" stop-color="#522CD5"/>
+<stop offset="0.9955" stop-color="#8A6FE8"/>
+</radialGradient>
+<linearGradient id="paint4_linear" x1="166.061" y1="303.491" x2="144.763" y2="409.709" gradientUnits="userSpaceOnUse">
+<stop stop-color="#522CD5"/>
+<stop offset="0.4397" stop-color="#8A6FE8"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="146.739" y1="407.302" x2="147.246" y2="518.627" gradientUnits="userSpaceOnUse">
+<stop stop-color="#522CD5"/>
+<stop offset="0.4397" stop-color="#8A6FE8"/>
+</linearGradient>
+<radialGradient id="paint6_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(148.63 470.023) rotate(179.739) scale(50.2476)">
+<stop offset="0.034" stop-color="#522CD5"/>
+<stop offset="0.9955" stop-color="#8A6FE8"/>
+</radialGradient>
+<radialGradient id="paint7_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(219.219 153.929) rotate(179.739) scale(140.935)">
+<stop offset="0.4744" stop-color="#A08BE8"/>
+<stop offset="0.8618" stop-color="#8065E0"/>
+</radialGradient>
+<radialGradient id="paint8_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(314.861 158.738) rotate(179.739) scale(146.053)">
+<stop offset="0.0933" stop-color="#E1DFDD"/>
+<stop offset="0.6573" stop-color="white"/>
+</radialGradient>
+<linearGradient id="paint9_linear" x1="54.1846" y1="217.159" x2="54.1846" y2="357.022" gradientUnits="userSpaceOnUse">
+<stop offset="0.3344" stop-color="#9780E6"/>
+<stop offset="0.8488" stop-color="#8A6FE8"/>
+</linearGradient>
+<radialGradient id="paint10_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(90.3494 218.071) rotate(-0.260742) scale(25.9924)">
+<stop stop-color="#8065E0"/>
+<stop offset="1" stop-color="#512BD4"/>
+</radialGradient>
+<radialGradient id="paint11_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(25.805 345.043) scale(26.4106)">
+<stop stop-color="#8065E0"/>
+<stop offset="1" stop-color="#512BD4"/>
+</radialGradient>
+<radialGradient id="paint12_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(169.113 67.3662) rotate(-32.2025) scale(21.0773)">
+<stop stop-color="#8065E0"/>
+<stop offset="1" stop-color="#512BD4"/>
+</radialGradient>
+</defs>
+</svg>
+
+

src/Core/Resources/Images/empty_items_state.svg

@@ -1,22 +0,0 @@
-<svg width="192" height="144" viewBox="0 0 192 144" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M89.5555 141.794H150.997" stroke="#89929F" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M109.305 124.239V141.794" stroke="#89929F" stroke-width="4" stroke-linejoin="round"/>
-<path d="M129.054 124.239V141.794" stroke="#89929F" stroke-width="4" stroke-linejoin="round"/>
-<rect x="50.0576" y="34.2716" width="139.34" height="89.9678" rx="4" fill="white" stroke="#89929F" stroke-width="4"/>
-<rect x="61.0293" y="44.1461" width="118.494" height="70.2188" rx="2" fill="#F0F0F0" stroke="#89929F" stroke-width="2"/>
-<path d="M172.833 55.7086H141.652" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M172.833 67.4015H151.396" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M141.652 67.4015H127.036" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M172.833 79.0944H159.191" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M148.473 79.0944H118.266" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M172.833 90.7873H141.652" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M130.934 90.7873H114.369" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M172.833 102.48H128.985" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M118.266 102.48H92.9316" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M82.2131 102.48H66.6226" stroke="#89929F" stroke-width="2" stroke-linecap="round"/>
-<path d="M31.9404 50.4821C31.9404 76.6557 53.4303 97.8736 79.9395 97.8736C106.449 97.8736 127.939 76.6557 127.939 50.4821C127.939 24.3084 106.449 3.09048 79.9395 3.09048C53.4303 3.09048 31.9404 24.3084 31.9404 50.4821Z" fill="white" stroke="#89929F" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.89833 125.292L6.0312 127.424C7.98382 129.377 11.1496 129.377 13.1023 127.424L42.0281 98.4987L49.6024 90.9244C50.2672 90.2528 50.119 89.1332 49.3407 88.5972C46.1849 86.4236 43.7021 83.7054 42.2973 81.8764C41.8348 81.2744 40.9352 81.1836 40.3984 81.7204L32.8241 89.2947L3.89833 118.221C1.94571 120.173 1.94571 123.339 3.89833 125.292Z" fill="#F0F0F0" stroke="#89929F" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<rect width="64.311" height="18.5138" rx="4" transform="matrix(-1 0 0 1 112.42 24.5275)" fill="#F0F0F0" stroke="#89929F" stroke-width="4"/>
-<path d="M83.4487 67.5038V77.4957C83.4487 79.7048 81.6579 81.4957 79.4487 81.4957H45.5107C44.3737 81.4957 43.2833 81.018 42.5568 80.1434C40.012 77.0798 37.6858 73.4766 35.5783 68.7585C34.4526 66.2387 36.3864 63.5038 39.1463 63.5038H79.4487C81.6579 63.5038 83.4487 65.2947 83.4487 67.5038Z" fill="#F0F0F0" stroke="#89929F" stroke-width="4" stroke-linecap="round"/>
-<path d="M111.445 78.2186V67.5038C111.445 65.2947 113.236 63.5038 115.445 63.5038H120.999C123.729 63.5038 125.544 66.1405 124.303 68.5721C122.306 72.483 119.526 77.0953 117.273 80.2207C116.684 81.0374 115.729 81.4957 114.722 81.4957C112.913 81.4957 111.445 80.0285 111.445 78.2186Z" fill="#F0F0F0" stroke="#89929F" stroke-width="4" stroke-linecap="round"/>
-</svg>

src/Core/Resources/Images/empty_items_state_dark.svg

@@ -1,22 +0,0 @@
-<svg width="164" height="124" viewBox="0 0 164 124" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M76.4954 121.109H128.977" stroke="#A3A3A3" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M93.3645 106.062V121.109" stroke="#A3A3A3" stroke-width="4" stroke-linejoin="round"/>
-<path d="M110.233 106.062V121.109" stroke="#A3A3A3" stroke-width="4" stroke-linejoin="round"/>
-<rect x="42.7576" y="28.9436" width="119.02" height="77.1181" rx="4" fill="#303030" stroke="#A3A3A3" stroke-width="4"/>
-<rect x="52.1292" y="37.4078" width="101.214" height="60.1898" rx="2" fill="#303030" stroke="#A3A3A3" stroke-width="2"/>
-<path d="M147.628 47.3188H120.995" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M147.628 57.3417H129.318" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M120.994 57.3417H108.51" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M147.628 67.3646H135.976" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M126.821 67.3646H101.019" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M147.628 77.3875H120.995" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M111.839 77.3875H97.6899" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M147.628 87.4103H110.175" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M101.019 87.4103H79.379" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M70.2236 87.4103H56.9067" stroke="#A3A3A3" stroke-width="2" stroke-linecap="round"/>
-<path d="M27.2824 42.8388C27.2824 65.2743 45.6384 83.4617 68.2817 83.4617C90.9249 83.4617 109.281 65.2743 109.281 42.8389C109.281 20.4035 90.9249 2.216 68.2817 2.216C45.6384 2.216 27.2824 20.4034 27.2824 42.8388Z" fill="#303030" stroke="#A3A3A3" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.83913 107.475L4.6422 108.281C6.59139 110.237 9.75165 110.237 11.7008 108.281L35.8989 83.9975L42.3686 77.505C42.9365 76.9294 42.8099 75.9697 42.1451 75.5102C39.4495 73.647 37.3288 71.3171 36.1288 69.7493C35.7339 69.2333 34.9654 69.1555 34.5069 69.6156L28.0372 76.1081L3.83913 100.391C1.88994 102.347 1.88994 105.519 3.83913 107.475Z" fill="#303030" stroke="#A3A3A3" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<rect width="54.9323" height="15.8695" rx="4" transform="matrix(-1 0 0 1 96.0254 20.5912)" fill="#303030" stroke="#A3A3A3" stroke-width="4"/>
-<path d="M71.2791 58.0008V65.4229C71.2791 67.6321 69.4882 69.4229 67.279 69.4229H39.1385C37.999 69.4229 36.905 68.9442 36.1843 68.0616C34.2078 65.6414 32.387 62.8248 30.722 59.2362C29.5612 56.7344 31.4973 54.0008 34.2552 54.0008H67.2791C69.4882 54.0008 71.2791 55.7917 71.2791 58.0008Z" fill="#303030" stroke="#A3A3A3" stroke-width="4" stroke-linecap="round"/>
-<path d="M95.193 66.6257V58.0008C95.193 55.7917 96.9839 54.0008 99.193 54.0008H102.55C105.279 54.0008 107.078 56.6299 105.813 59.0474C104.144 62.2377 101.962 65.8368 100.17 68.3309C99.6676 69.0302 98.8513 69.4229 97.9902 69.4229C96.4453 69.4229 95.193 68.1706 95.193 66.6257Z" fill="#303030" stroke="#A3A3A3" stroke-width="4" stroke-linecap="round"/>
-</svg>

src/Core/Resources/Localization/AppResources.Designer.cs

@@ -1318,15 +1318,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to We were unable to automatically open the Android credential provider settings menu for you. You can navigate to the credential provider settings menu manually from Android Settings &gt; System &gt; Passwords &amp; accounts &gt; Passwords, passkeys and data services..
-        /// </summary>
-        public static string BitwardenCredentialProviderGoToSettings {
-            get {
-                return ResourceManager.GetString("BitwardenCredentialProviderGoToSettings", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Bitwarden Help Center.
         /// </summary>
@@ -1543,15 +1534,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Choose a login to save this passkey to.
-        /// </summary>
-        public static string ChooseALoginToSaveThisPasskeyTo {
-            get {
-                return ResourceManager.GetString("ChooseALoginToSaveThisPasskeyTo", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Choose file.
         /// </summary>
@@ -1723,15 +1705,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Continue to device Settings?.
-        /// </summary>
-        public static string ContinueToDeviceSettings {
-            get {
-                return ResourceManager.GetString("ContinueToDeviceSettings", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Continue to Help center?.
         /// </summary>
@@ -2623,24 +2596,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Error creating passkey.
-        /// </summary>
-        public static string ErrorCreatingPasskey {
-            get {
-                return ResourceManager.GetString("ErrorCreatingPasskey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error reading passkey.
-        /// </summary>
-        public static string ErrorReadingPasskey {
-            get {
-                return ResourceManager.GetString("ErrorReadingPasskey", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to EU.
         /// </summary>
@@ -3181,15 +3136,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to 1. Go to your device&apos;s Settings &gt; Passwords &gt; Password Options.
-        /// </summary>
-        public static string FirstDotGoToYourDeviceSettingsPasswordsPasswordOptions {
-            get {
-                return ResourceManager.GetString("FirstDotGoToYourDeviceSettingsPasswordsPasswordOptions", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to First name.
         /// </summary>
@@ -3379,15 +3325,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Get instant access to your passwords and passkeys!.
-        /// </summary>
-        public static string GetInstantAccessToYourPasswordsAndPasskeys {
-            get {
-                return ResourceManager.GetString("GetInstantAccessToYourPasswordsAndPasskeys", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Get master password hint.
         /// </summary>
@@ -5218,15 +5155,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Overwrite passkey?.
-        /// </summary>
-        public static string OverwritePasskey {
-            get {
-                return ResourceManager.GetString("OverwritePasskey", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Ownership.
         /// </summary>
@@ -5245,24 +5173,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Passkey management.
-        /// </summary>
-        public static string PasskeyManagement {
-            get {
-                return ResourceManager.GetString("PasskeyManagement", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Use Bitwarden to save new passkeys and log in with passkeys stored in your vault..
-        /// </summary>
-        public static string PasskeyManagementExplanationLong {
-            get {
-                return ResourceManager.GetString("PasskeyManagementExplanationLong", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Passkeys.
         /// </summary>
@@ -5272,24 +5182,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Passkeys for {0}.
-        /// </summary>
-        public static string PasskeysForX {
-            get {
-                return ResourceManager.GetString("PasskeysForX", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Passkeys not supported for this app.
-        /// </summary>
-        public static string PasskeysNotSupportedForThisApp {
-            get {
-                return ResourceManager.GetString("PasskeysNotSupportedForThisApp", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Passkey will not be copied.
         /// </summary>
@@ -5470,15 +5362,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Passwords.
-        /// </summary>
-        public static string Passwords {
-            get {
-                return ResourceManager.GetString("Passwords", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to This password was not found in any known data breaches. It should be safe to use..
         /// </summary>
@@ -5488,15 +5371,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Passwords for {0}.
-        /// </summary>
-        public static string PasswordsForX {
-            get {
-                return ResourceManager.GetString("PasswordsForX", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Password type.
         /// </summary>
@@ -6011,24 +5885,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Save passkey.
-        /// </summary>
-        public static string SavePasskey {
-            get {
-                return ResourceManager.GetString("SavePasskey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Save passkey as new login.
-        /// </summary>
-        public static string SavePasskeyAsNewLogin {
-            get {
-                return ResourceManager.GetString("SavePasskeyAsNewLogin", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Saving....
         /// </summary>
@@ -6137,15 +5993,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to 2. Turn on AutoFill.
-        /// </summary>
-        public static string SecondDotTurnOnAutoFill {
-            get {
-                return ResourceManager.GetString("SecondDotTurnOnAutoFill", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Secure notes.
         /// </summary>
@@ -6407,15 +6254,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Set Bitwarden as your passkey provider in device settings..
-        /// </summary>
-        public static string SetBitwardenAsPasskeyManagerDescription {
-            get {
-                return ResourceManager.GetString("SetBitwardenAsPasskeyManagerDescription", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Set master password.
         /// </summary>
@@ -6479,24 +6317,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Set up auto-fill.
-        /// </summary>
-        public static string SetUpAutofill {
-            get {
-                return ResourceManager.GetString("SetUpAutofill", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to To set up password auto-fill and passkey management, set Bitwarden as your preferred provider in the iOS Settings..
-        /// </summary>
-        public static string SetUpAutoFillDescriptionLong {
-            get {
-                return ResourceManager.GetString("SetUpAutoFillDescriptionLong", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Set up TOTP.
         /// </summary>
@@ -6902,24 +6722,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to There was a problem creating a passkey for {0}. Try again later..
-        /// </summary>
-        public static string ThereWasAProblemCreatingAPasskeyForXTryAgainLater {
-            get {
-                return ResourceManager.GetString("ThereWasAProblemCreatingAPasskeyForXTryAgainLater", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There was a problem reading your passkey for {0}. Try again later..
-        /// </summary>
-        public static string ThereWasAProblemReadingAPasskeyForXTryAgainLater {
-            get {
-                return ResourceManager.GetString("ThereWasAProblemReadingAPasskeyForXTryAgainLater", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to The URI {0} is already blocked.
         /// </summary>
@@ -6929,15 +6731,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to 3. Select &quot;Bitwarden&quot; to use for passwords and passkeys.
-        /// </summary>
-        public static string ThirdDotSelectBitwardenToUseForPasswordsAndPasskeys {
-            get {
-                return ResourceManager.GetString("ThirdDotSelectBitwardenToUseForPasswordsAndPasskeys", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to 30 days.
         /// </summary>
@@ -6965,15 +6758,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to This item already contains a passkey. Are you sure you want to overwrite the current passkey?.
-        /// </summary>
-        public static string ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey {
-            get {
-                return ResourceManager.GetString("ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to This request is no longer valid.
         /// </summary>
@@ -7271,15 +7055,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Unknown account.
-        /// </summary>
-        public static string UnknownAccount {
-            get {
-                return ResourceManager.GetString("UnknownAccount", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unknown {0} error occurred..
         /// </summary>
@@ -7766,24 +7541,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Verification required by {0}.
-        /// </summary>
-        public static string VerificationRequiredByX {
-            get {
-                return ResourceManager.GetString("VerificationRequiredByX", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Verification required for this action. Set up an unlock method in Bitwarden to continue..
-        /// </summary>
-        public static string VerificationRequiredForThisActionSetUpAnUnlockMethodInBitwardenToContinue {
-            get {
-                return ResourceManager.GetString("VerificationRequiredForThisActionSetUpAnUnlockMethodInBitwardenToContinue", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Verify Face ID.
         /// </summary>
@@ -7811,15 +7568,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Verifying identity....
-        /// </summary>
-        public static string VerifyingIdentityEllipsis {
-            get {
-                return ResourceManager.GetString("VerifyingIdentityEllipsis", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Verify master password.
         /// </summary>
@@ -8126,24 +7874,6 @@ namespace Bit.Core.Resources.Localization {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Your passkey will be saved to your Bitwarden vault.
-        /// </summary>
-        public static string YourPasskeyWillBeSavedToYourBitwardenVault {
-            get {
-                return ResourceManager.GetString("YourPasskeyWillBeSavedToYourBitwardenVault", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Your passkey will be saved to your Bitwarden vault for {0}.
-        /// </summary>
-        public static string YourPasskeyWillBeSavedToYourBitwardenVaultForX {
-            get {
-                return ResourceManager.GetString("YourPasskeyWillBeSavedToYourBitwardenVaultForX", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Your request has been sent to your admin..
         /// </summary>

src/Core/Resources/Localization/AppResources.resx

@@ -421,9 +421,6 @@
   <data name="AutofillService" xml:space="preserve">
     <value>Auto-fill service</value>
   </data>
-  <data name="SetBitwardenAsPasskeyManagerDescription" xml:space="preserve">
-    <value>Set Bitwarden as your passkey provider in device settings.</value>
-  </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>Avoid ambiguous characters</value>
   </data>
@@ -1194,9 +1191,6 @@ Scanning will happen automatically.</value>
   <data name="WindowsHello" xml:space="preserve">
     <value>Windows Hello</value>
   </data>
-  <data name="BitwardenCredentialProviderGoToSettings" xml:space="preserve">
-    <value>We were unable to automatically open the Android credential provider settings menu for you. You can navigate to the credential provider settings menu manually from Android Settings &gt; System &gt; Passwords &amp; accounts &gt; Passwords, passkeys and data services.</value>
-  </data>
   <data name="BitwardenAutofillGoToSettings" xml:space="preserve">
     <value>We were unable to automatically open the Android autofill settings menu for you. You can navigate to the autofill settings menu manually from Android Settings &gt; System &gt; Languages and input &gt; Advanced &gt; Autofill service.</value>
   </data>
@@ -1822,9 +1816,6 @@ Scanning will happen automatically.</value>
   <data name="AccessibilityDrawOverPermissionAlert" xml:space="preserve">
     <value>Bitwarden needs attention - Turn on "Draw-Over" in "Auto-fill Services" from Bitwarden Settings</value>
   </data>
-  <data name="PasskeyManagement" xml:space="preserve">
-    <value>Passkey management</value>
-  </data>
   <data name="AutofillServices" xml:space="preserve">
     <value>Auto-fill services</value>
   </data>
@@ -2808,9 +2799,6 @@ Do you want to switch to this account?</value>
   <data name="XHours" xml:space="preserve">
     <value>{0} hours</value>
   </data>
-  <data name="PasskeyManagementExplanationLong" xml:space="preserve">
-    <value>Use Bitwarden to save new passkeys and log in with passkeys stored in your vault.</value>
-  </data>
   <data name="AutofillServicesExplanationLong" xml:space="preserve">
     <value>The Android Autofill Framework is used to assist in filling login information into other apps on your device.</value>
   </data>
@@ -2839,9 +2827,6 @@ Do you want to switch to this account?</value>
   <data name="ContinueToAppStore" xml:space="preserve">
     <value>Continue to app store?</value>
   </data>
-  <data name="ContinueToDeviceSettings" xml:space="preserve">
-    <value>Continue to device Settings?</value>
-  </data>
   <data name="TwoStepLoginDescriptionLong" xml:space="preserve">
     <value>Make your account more secure by setting up two-step login in the Bitwarden web app.</value>
   </data>
@@ -2892,27 +2877,6 @@ Do you want to switch to this account?</value>
   <data name="SetUpAnUnlockOptionToChangeYourVaultTimeoutAction" xml:space="preserve">
     <value>Set up an unlock option to change your vault timeout action.</value>
   </data>
-  <data name="ChooseALoginToSaveThisPasskeyTo" xml:space="preserve">
-    <value>Choose a login to save this passkey to</value>
-  </data>
-  <data name="SavePasskeyAsNewLogin" xml:space="preserve">
-    <value>Save passkey as new login</value>
-  </data>
-  <data name="SavePasskey" xml:space="preserve">
-    <value>Save passkey</value>
-  </data>
-  <data name="PasskeysForX" xml:space="preserve">
-    <value>Passkeys for {0}</value>
-  </data>
-  <data name="PasswordsForX" xml:space="preserve">
-    <value>Passwords for {0}</value>
-  </data>
-  <data name="OverwritePasskey" xml:space="preserve">
-    <value>Overwrite passkey?</value>
-  </data>
-  <data name="ThisItemAlreadyContainsAPasskeyAreYouSureYouWantToOverwriteTheCurrentPasskey" xml:space="preserve">
-    <value>This item already contains a passkey. Are you sure you want to overwrite the current passkey?</value>
-  </data>
   <data name="DuoTwoStepLoginIsRequiredForYourAccount" xml:space="preserve">
     <value>Duo two-step login is required for your account. </value>
   </data>
@@ -2922,59 +2886,6 @@ Do you want to switch to this account?</value>
   <data name="LaunchDuo" xml:space="preserve">
     <value>Launch Duo</value>
   </data>
-  <data name="VerificationRequiredByX" xml:space="preserve">
-    <value>Verification required by {0}</value>
-  </data>
-  <data name="VerificationRequiredForThisActionSetUpAnUnlockMethodInBitwardenToContinue" xml:space="preserve">
-    <value>Verification required for this action. Set up an unlock method in Bitwarden to continue.</value>
-  </data>
-  <data name="ErrorCreatingPasskey" xml:space="preserve">
-    <value>Error creating passkey</value>
-  </data>
-  <data name="ErrorReadingPasskey" xml:space="preserve">
-    <value>Error reading passkey</value>
-  </data>
-  <data name="ThereWasAProblemCreatingAPasskeyForXTryAgainLater" xml:space="preserve">
-    <value>There was a problem creating a passkey for {0}. Try again later.</value>
-    <comment>The parameter is the RpId</comment>
-  </data>
-  <data name="ThereWasAProblemReadingAPasskeyForXTryAgainLater" xml:space="preserve">
-    <value>There was a problem reading your passkey for {0}. Try again later.</value>
-    <comment>The parameter is the RpId</comment>
-  </data>
-  <data name="VerifyingIdentityEllipsis" xml:space="preserve">
-    <value>Verifying identity...</value>
-  </data>
-  <data name="Passwords" xml:space="preserve">
-    <value>Passwords</value>
-  </data>
-  <data name="UnknownAccount" xml:space="preserve">
-    <value>Unknown account</value>
-  </data>
-  <data name="SetUpAutofill" xml:space="preserve">
-    <value>Set up auto-fill</value>
-  </data>
-  <data name="GetInstantAccessToYourPasswordsAndPasskeys" xml:space="preserve">
-    <value>Get instant access to your passwords and passkeys!</value>
-  </data>
-  <data name="SetUpAutoFillDescriptionLong" xml:space="preserve">
-    <value>To set up password auto-fill and passkey management, set Bitwarden as your preferred provider in the iOS Settings.</value>
-  </data>
-  <data name="FirstDotGoToYourDeviceSettingsPasswordsPasswordOptions" xml:space="preserve">
-    <value>1. Go to your device's Settings &gt; Passwords &gt; Password Options</value>
-  </data>
-  <data name="SecondDotTurnOnAutoFill" xml:space="preserve">
-    <value>2. Turn on AutoFill</value>
-  </data>
-  <data name="ThirdDotSelectBitwardenToUseForPasswordsAndPasskeys" xml:space="preserve">
-    <value>3. Select "Bitwarden" to use for passwords and passkeys</value>
-  </data>
-  <data name="YourPasskeyWillBeSavedToYourBitwardenVault" xml:space="preserve">
-    <value>Your passkey will be saved to your Bitwarden vault</value>
-  </data>
-  <data name="YourPasskeyWillBeSavedToYourBitwardenVaultForX" xml:space="preserve">
-    <value>Your passkey will be saved to your Bitwarden vault for {0}</value>
-  </data>
   <data name="OrganizationUnassignedItemsMessageUSEUDescriptionLong" xml:space="preserve">
     <value>Unassigned organization items are no longer visible in the All Vaults view and only accessible via the Admin Console. Assign these items to a collection from the Admin Console to make them visible.</value>
   </data>
@@ -2987,7 +2898,4 @@ Do you want to switch to this account?</value>
   <data name="Notice" xml:space="preserve">
     <value>Notice</value>
   </data>
-  <data name="PasskeysNotSupportedForThisApp" xml:space="preserve">
-    <value>Passkeys not supported for this app</value>
-  </data>
 </root>

src/Core/Services/ApiService.cs

@@ -839,33 +839,6 @@ namespace Bit.Core.Services
             }
         }
 
-        public async Task<List<Utilities.DigitalAssetLinks.Statement>> GetDigitalAssetLinksForRpAsync(string rpId)
-        {
-            using (var httpclient = new HttpClient())
-            {
-                HttpResponseMessage response;
-                try
-                {
-                    httpclient.DefaultRequestHeaders.Add("Accept", "application/json");
-                    response = await httpclient.GetAsync(new Uri($"https://{rpId}/.well-known/assetlinks.json"));
-                }
-                catch (Exception e)
-                {
-                    throw new ApiException(HandleWebError(e));
-                }
-                if (!response.IsSuccessStatusCode)
-                {
-                    throw new ApiException(new ErrorResponse
-                    {
-                        StatusCode = response.StatusCode,
-                        Message = $"Digital Asset links Rp error: {(int)response.StatusCode} {response.ReasonPhrase}."
-                    });
-                }
-                var json = await response.Content.ReadAsStringAsync();
-                return JsonConvert.DeserializeObject<List<Utilities.DigitalAssetLinks.Statement>>(json);
-            }
-        }
-
         private ErrorResponse HandleWebError(Exception e)
         {
             return new ErrorResponse

src/Core/Services/AssetLinksService.cs

@@ -1,35 +0,0 @@
-using Bit.Core.Abstractions;
-
-namespace Bit.Core.Services
-{
-    public class AssetLinksService : IAssetLinksService
-    {
-        private readonly IApiService _apiService;
-
-        public AssetLinksService(IApiService apiService)
-        {
-            _apiService = apiService;
-        }
-
-        /// <summary>
-        /// Gets the digital asset links file associated with the <paramref name="rpId"/> and
-        /// validates that the <paramref name="packageName"/> and <paramref name="normalizedFingerprint"/> matches.
-        /// </summary>
-        /// <returns><c>True</c> if matches, <c>False</c> otherwise.</returns>
-        public async Task<bool> ValidateAssetLinksAsync(string rpId, string packageName, string normalizedFingerprint)
-        {
-            var statementList = await _apiService.GetDigitalAssetLinksForRpAsync(rpId);
-
-            return statementList
-                .Any(s => s.Target.Namespace == "android_app" 
-                            && 
-                            s.Target.PackageName == packageName
-                            &&
-                            s.Relation.Contains("delegate_permission/common.get_login_creds")
-                            &&
-                            s.Relation.Contains("delegate_permission/common.handle_all_urls")
-                            &&
-                            s.Target.Sha256CertFingerprints.Contains(normalizedFingerprint));
-        }
-    }
-}

src/Core/Services/CipherService.cs

@@ -34,8 +34,6 @@ namespace Bit.Core.Services
         private readonly II18nService _i18nService;
         private readonly Func<ISearchService> _searchService;
         private readonly IConfigService _configService;
-        private readonly ITotpService _totpService;
-        private readonly IClipboardService _clipboardService;
         private readonly string _clearCipherCacheKey;
         private readonly string[] _allClearCipherCacheKeys;
         private Dictionary<string, HashSet<string>> _domainMatchBlacklist = new Dictionary<string, HashSet<string>>
@@ -55,8 +53,6 @@ namespace Bit.Core.Services
             II18nService i18nService,
             Func<ISearchService> searchService,
             IConfigService configService,
-            ITotpService totpService,
-            IClipboardService clipboardService,
             string clearCipherCacheKey,
             string[] allClearCipherCacheKeys)
         {
@@ -69,8 +65,6 @@ namespace Bit.Core.Services
             _i18nService = i18nService;
             _searchService = searchService;
             _configService = configService;
-            _totpService = totpService;
-            _clipboardService = clipboardService;
             _clearCipherCacheKey = clearCipherCacheKey;
             _allClearCipherCacheKeys = allClearCipherCacheKeys;
         }
@@ -1310,51 +1304,6 @@ namespace Bit.Core.Services
             cipher.PasswordHistory = encPhs;
         }
 
-        public async Task<string> CreateNewLoginForPasskeyAsync(Fido2ConfirmNewCredentialParams newPasskeyParams)
-        {
-            var newCipher = new CipherView
-            {
-                Name = newPasskeyParams.CredentialName,
-                Type = CipherType.Login,
-                Login = new LoginView
-                {
-                    Username = newPasskeyParams.UserName,
-                    Uris = new List<LoginUriView>
-                    {
-                        new LoginUriView { Uri = newPasskeyParams.RpId }
-                    }
-                },
-                Card = new CardView(),
-                Identity = new IdentityView(),
-                SecureNote = new SecureNoteView
-                {
-                    Type = SecureNoteType.Generic
-                },
-                Reprompt = CipherRepromptType.None
-            };
-
-            var encryptedCipher = await EncryptAsync(newCipher);
-            await SaveWithServerAsync(encryptedCipher);
-
-            return encryptedCipher.Id;
-        }
-
-        public async Task CopyTotpCodeIfNeededAsync(CipherView cipher)
-        {
-            if (string.IsNullOrWhiteSpace(cipher?.Login?.Totp)
-                ||
-                await _stateService.GetDisableAutoTotpCopyAsync() == true)
-            {
-                return;
-            }
-
-            if (cipher.OrganizationUseTotp || await _stateService.CanAccessPremiumAsync())
-            {
-                var totpCode = await _totpService.GetCodeAsync(cipher.Login.Totp);
-                await _clipboardService.CopyTextAsync(totpCode);
-            }
-        }
-
         private class CipherLocaleComparer : IComparer<CipherView>
         {
             private readonly II18nService _i18nService;

src/Core/Services/ConditionedAwaiterManager.cs

@@ -1,4 +1,7 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 
 namespace Bit.Core.Services
@@ -8,8 +11,7 @@ namespace Bit.Core.Services
         private readonly ConcurrentDictionary<AwaiterPrecondition, TaskCompletionSource<bool>> _preconditionsTasks = new ConcurrentDictionary<AwaiterPrecondition, TaskCompletionSource<bool>>
         {
             [AwaiterPrecondition.EnvironmentUrlsInited] = new TaskCompletionSource<bool>(),
-            [AwaiterPrecondition.AndroidWindowCreated] = new TaskCompletionSource<bool>(),
-            [AwaiterPrecondition.AutofillIOSExtensionViewDidAppear] = new TaskCompletionSource<bool>()
+            [AwaiterPrecondition.AndroidWindowCreated] = new TaskCompletionSource<bool>()
         };
 
         public Task GetAwaiterForPrecondition(AwaiterPrecondition awaiterPrecondition)
@@ -37,15 +39,5 @@ namespace Bit.Core.Services
                 tcs.TrySetException(ex);
             }
         }
-
-        public void Recreate(AwaiterPrecondition awaiterPrecondition)
-        {
-            if (_preconditionsTasks.TryRemove(awaiterPrecondition, out var oldTcs))
-            {
-                oldTcs.TrySetCanceled();
-
-                _preconditionsTasks.TryAdd(awaiterPrecondition, new TaskCompletionSource<bool>());
-            }
-        }
     }
 }

src/Core/Services/Fido2AuthenticatorService.cs

@@ -1,539 +0,0 @@
-using Bit.Core.Abstractions;
-using Bit.Core.Models.View;
-using Bit.Core.Enums;
-using Bit.Core.Utilities.Fido2;
-using Bit.Core.Utilities;
-using System.Formats.Cbor;
-using System.Security.Cryptography;
-
-namespace Bit.Core.Services
-{
-    public class Fido2AuthenticatorService : IFido2AuthenticatorService
-    {
-        // AAGUID: d548826e-79b4-db40-a3d8-11116f7e8349
-        public static readonly byte[] AAGUID = new byte[] { 0xd5, 0x48, 0x82, 0x6e, 0x79, 0xb4, 0xdb, 0x40, 0xa3, 0xd8, 0x11, 0x11, 0x6f, 0x7e, 0x83, 0x49 };
-
-        private readonly ICipherService _cipherService;
-        private readonly ISyncService _syncService;
-        private readonly ICryptoFunctionService _cryptoFunctionService;
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-
-        public Fido2AuthenticatorService(ICipherService cipherService,
-            ISyncService syncService,
-            ICryptoFunctionService cryptoFunctionService,
-            IUserVerificationMediatorService userVerificationMediatorService)
-        {
-            _cipherService = cipherService;
-            _syncService = syncService;
-            _cryptoFunctionService = cryptoFunctionService;
-            _userVerificationMediatorService = userVerificationMediatorService;
-        }
-
-        public async Task<Fido2AuthenticatorMakeCredentialResult> MakeCredentialAsync(Fido2AuthenticatorMakeCredentialParams makeCredentialParams, IFido2MakeCredentialUserInterface userInterface)
-        {
-            if (makeCredentialParams.CredTypesAndPubKeyAlgs.All((p) => p.Alg != (int)Fido2AlgorithmIdentifier.ES256))
-            {
-                throw new NotSupportedError();
-            }
-
-            string cipherId = null;
-            var userVerified = false;
-            var accountSwitched = false;
-
-            do
-            {
-                try
-                {
-                    accountSwitched = false;
-
-                    await userInterface.EnsureUnlockedVaultAsync();
-                    await _syncService.FullSyncAsync(false);
-
-                    var existingCipherIds = await FindExcludedCredentialsAsync(
-                        makeCredentialParams.ExcludeCredentialDescriptorList
-                    );
-                    if (existingCipherIds.Length > 0)
-                    {
-                        await userInterface.InformExcludedCredentialAsync(existingCipherIds);
-                        throw new NotAllowedError();
-                    }
-
-                    (cipherId, userVerified) = await userInterface.ConfirmNewCredentialAsync(new Fido2ConfirmNewCredentialParams
-                    {
-                        CredentialName = makeCredentialParams.RpEntity.Name,
-                        UserName = makeCredentialParams.UserEntity.Name,
-                        UserVerificationPreference = makeCredentialParams.UserVerificationPreference,
-                        RpId = makeCredentialParams.RpEntity.Id
-                    });
-                }
-                catch (AccountSwitchedException)
-                {
-                    accountSwitched = true;
-                }
-            } while (accountSwitched);
-
-            string credentialId;
-            if (cipherId == null)
-            {
-                throw new NotAllowedError();
-            }
-
-            try
-            {
-                var keyPair = GenerateKeyPair();
-                var fido2Credential = CreateCredentialView(makeCredentialParams, keyPair.privateKey);
-
-                var encrypted = await _cipherService.GetAsync(cipherId);
-                var cipher = await encrypted.DecryptAsync();
-
-                if (!userVerified
-                    &&
-                    await _userVerificationMediatorService.ShouldEnforceFido2RequiredUserVerificationAsync(new Fido2UserVerificationOptions(
-                        cipher.Reprompt != CipherRepromptType.None,
-                        makeCredentialParams.UserVerificationPreference,
-                        userInterface.HasVaultBeenUnlockedInThisTransaction)))
-                {
-                    throw new NotAllowedError();
-                }
-
-                cipher.Login.Fido2Credentials = new List<Fido2CredentialView> { fido2Credential };
-                var reencrypted = await _cipherService.EncryptAsync(cipher);
-                await _cipherService.SaveWithServerAsync(reencrypted);
-                credentialId = fido2Credential.CredentialId;
-
-                var authData = await GenerateAuthDataAsync(
-                    rpId: makeCredentialParams.RpEntity.Id,
-                    counter: fido2Credential.CounterValue,
-                    userPresence: true,
-                    userVerification: userVerified,
-                    credentialId: credentialId.GuidToRawFormat(),
-                    publicKey: keyPair.publicKey
-                );
-
-                return new Fido2AuthenticatorMakeCredentialResult
-                {
-                    CredentialId = credentialId.GuidToRawFormat(),
-                    AttestationObject = EncodeAttestationObject(authData),
-                    AuthData = authData,
-                    PublicKey = keyPair.publicKey.ExportDer(),
-                    PublicKeyAlgorithm = (int)Fido2AlgorithmIdentifier.ES256,
-                };
-            }
-            catch (NotAllowedError)
-            {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                throw new UnknownError();
-            }
-        }
-
-        public async Task<Fido2AuthenticatorGetAssertionResult> GetAssertionAsync(Fido2AuthenticatorGetAssertionParams assertionParams, IFido2GetAssertionUserInterface userInterface)
-        {
-            List<CipherView> cipherOptions = new List<CipherView>();
-
-            string selectedCipherId = null;
-            var userVerified = false;
-            var accountSwitched = false;
-
-            do
-            {
-                try
-                {
-                    accountSwitched = false;
-
-                    await userInterface.EnsureUnlockedVaultAsync();
-                    await _syncService.FullSyncAsync(false);
-
-                    if (assertionParams.AllowCredentialDescriptorList?.Length > 0)
-                    {
-                        cipherOptions = await FindCredentialsByIdAsync(
-                            assertionParams.AllowCredentialDescriptorList,
-                            assertionParams.RpId
-                        );
-                    }
-                    else
-                    {
-                        cipherOptions = await FindCredentialsByRpAsync(assertionParams.RpId);
-                    }
-
-                    if (cipherOptions.Count == 0)
-                    {
-                        throw new NotAllowedError();
-                    }
-
-                    (selectedCipherId, userVerified) = await userInterface.PickCredentialAsync(
-                        cipherOptions.Select((cipher) => new Fido2GetAssertionUserInterfaceCredential
-                        {
-                            CipherId = cipher.Id,
-                            UserVerificationPreference = Fido2UserVerificationPreferenceExtensions.GetUserVerificationPreferenceFrom(assertionParams.UserVerificationPreference, cipher.Reprompt)
-                        }).ToArray()
-                    );
-
-                }
-                catch (AccountSwitchedException)
-                {
-                    accountSwitched = true;
-                }
-            } while (accountSwitched);
-
-            var selectedCipher = cipherOptions.FirstOrDefault((c) => c.Id == selectedCipherId);
-            if (selectedCipher == null)
-            {
-                throw new NotAllowedError();
-            }
-
-            if (!userVerified
-                &&
-                await _userVerificationMediatorService.ShouldEnforceFido2RequiredUserVerificationAsync(new Fido2UserVerificationOptions(
-                    selectedCipher.Reprompt != CipherRepromptType.None,
-                    assertionParams.UserVerificationPreference,
-                    userInterface.HasVaultBeenUnlockedInThisTransaction)))
-            {
-                throw new NotAllowedError();
-            }
-
-            try
-            {
-                var selectedFido2Credential = selectedCipher.Login.MainFido2Credential;
-                var selectedCredentialId = selectedFido2Credential.CredentialId;
-
-                await _cipherService.UpdateLastUsedDateAsync(selectedCipher.Id);
-
-                if (selectedFido2Credential.CounterValue != 0)
-                {
-                    ++selectedFido2Credential.CounterValue;
-                    var encrypted = await _cipherService.EncryptAsync(selectedCipher);
-                    await _cipherService.SaveWithServerAsync(encrypted);
-                }
-
-                var authenticatorData = await GenerateAuthDataAsync(
-                    rpId: selectedFido2Credential.RpId,
-                    userPresence: true,
-                    userVerification: userVerified,
-                    counter: selectedFido2Credential.CounterValue
-                );
-
-                var signature = GenerateSignature(
-                    authData: authenticatorData,
-                    clientDataHash: assertionParams.Hash,
-                    privateKey: selectedFido2Credential.KeyBytes
-                );
-
-                return new Fido2AuthenticatorGetAssertionResult
-                {
-                    SelectedCredential = new Fido2SelectedCredential
-                    {
-                        Id = selectedCredentialId.GuidToRawFormat(),
-                        UserHandle = selectedFido2Credential.UserHandleValue,
-                        Cipher = selectedCipher
-                    },
-                    AuthenticatorData = authenticatorData,
-                    Signature = signature
-                };
-            }
-            catch (Exception ex)
-            {
-                LoggerHelper.LogEvenIfCantBeResolved(ex);
-                throw new UnknownError();
-            }
-        }
-
-        public async Task<Fido2AuthenticatorDiscoverableCredentialMetadata[]> SilentCredentialDiscoveryAsync(string rpId)
-        {
-            var credentials = (await FindCredentialsByRpAsync(rpId)).Select(cipher => new Fido2AuthenticatorDiscoverableCredentialMetadata
-            {
-                Type = Constants.DefaultFido2CredentialType,
-                Id = cipher.Login.MainFido2Credential.CredentialId.GuidToRawFormat(),
-                RpId = cipher.Login.MainFido2Credential.RpId,
-                UserHandle = cipher.Login.MainFido2Credential.UserHandleValue,
-                UserName = cipher.Login.MainFido2Credential.UserName,
-                CipherId = cipher.Id,
-            }).ToArray();
-
-            return credentials;
-        }
-
-        /// <summary>
-        /// Finds existing crendetials and returns the `CipherId` for each one
-        /// </summary>
-        private async Task<string[]> FindExcludedCredentialsAsync(
-            PublicKeyCredentialDescriptor[] credentials
-        )
-        {
-            if (credentials == null || credentials.Length == 0)
-            {
-                return Array.Empty<string>();
-            }
-
-            var ids = new List<string>();
-
-            foreach (var credential in credentials)
-            {
-                try
-                {
-                    ids.Add(credential.Id.GuidToStandardFormat());
-                }
-                catch { }
-            }
-
-            if (ids.Count == 0)
-            {
-                return Array.Empty<string>();
-            }
-
-            var ciphers = await _cipherService.GetAllDecryptedAsync();
-            return ciphers
-                .FindAll(
-                    (cipher) =>
-                    !cipher.IsDeleted &&
-                    cipher.OrganizationId == null &&
-                    cipher.Type == CipherType.Login &&
-                    cipher.Login.HasFido2Credentials &&
-                    ids.Contains(cipher.Login.MainFido2Credential.CredentialId)
-                )
-                .Select((cipher) => cipher.Id)
-                .ToArray();
-        }
-
-        private async Task<List<CipherView>> FindCredentialsByIdAsync(PublicKeyCredentialDescriptor[] credentials, string rpId)
-        {
-            var ids = new List<string>();
-
-            foreach (var credential in credentials)
-            {
-                try
-                {
-                    ids.Add(credential.Id.GuidToStandardFormat());
-                }
-                catch { }
-            }
-
-            if (ids.Count == 0)
-            {
-                return new List<CipherView>();
-            }
-
-            var ciphers = await _cipherService.GetAllDecryptedAsync();
-            return ciphers.FindAll((cipher) =>
-                !cipher.IsDeleted &&
-                cipher.Type == CipherType.Login &&
-                cipher.Login.HasFido2Credentials &&
-                cipher.Login.MainFido2Credential.RpId == rpId &&
-                ids.Contains(cipher.Login.MainFido2Credential.CredentialId)
-            );
-        }
-
-        private async Task<List<CipherView>> FindCredentialsByRpAsync(string rpId)
-        {
-            var ciphers = await _cipherService.GetAllDecryptedAsync();
-            return ciphers.FindAll((cipher) =>
-                !cipher.IsDeleted &&
-                cipher.Type == CipherType.Login &&
-                cipher.Login.HasFido2Credentials &&
-                cipher.Login.MainFido2Credential.RpId == rpId &&
-                cipher.Login.MainFido2Credential.DiscoverableValue
-            );
-        }
-
-        // TODO: Move this to a separate service
-        private (PublicKey publicKey, byte[] privateKey) GenerateKeyPair()
-        {
-            var dsa = ECDsa.Create();
-            dsa.GenerateKey(ECCurve.NamedCurves.nistP256);
-            var privateKey = dsa.ExportPkcs8PrivateKey();
-
-            return (new PublicKey(dsa), privateKey);
-        }
-
-        private Fido2CredentialView CreateCredentialView(Fido2AuthenticatorMakeCredentialParams makeCredentialsParams, byte[] privateKey)
-        {
-            return new Fido2CredentialView
-            {
-                CredentialId = Guid.NewGuid().ToString(),
-                KeyType = Constants.DefaultFido2CredentialType,
-                KeyAlgorithm = Constants.DefaultFido2CredentialAlgorithm,
-                KeyCurve = Constants.DefaultFido2CredentialCurve,
-                KeyValue = CoreHelpers.Base64UrlEncode(privateKey),
-                RpId = makeCredentialsParams.RpEntity.Id,
-                UserHandle = CoreHelpers.Base64UrlEncode(makeCredentialsParams.UserEntity.Id),
-                UserName = makeCredentialsParams.UserEntity.Name,
-                CounterValue = 0,
-                RpName = makeCredentialsParams.RpEntity.Name,
-                UserDisplayName = makeCredentialsParams.UserEntity.DisplayName,
-                DiscoverableValue = makeCredentialsParams.RequireResidentKey,
-                CreationDate = DateTime.UtcNow
-            };
-        }
-
-        private async Task<byte[]> GenerateAuthDataAsync(
-            string rpId,
-            bool userVerification,
-            bool userPresence,
-            int counter,
-            byte[] credentialId = null,
-            PublicKey publicKey = null
-        )
-        {
-            var isAttestation = credentialId != null && publicKey != null;
-
-            List<byte> authData = new List<byte>();
-
-            var rpIdHash = await _cryptoFunctionService.HashAsync(rpId, CryptoHashAlgorithm.Sha256);
-            authData.AddRange(rpIdHash);
-
-            var flags = AuthDataFlags(
-                extensionData: false,
-                attestationData: isAttestation,
-                userVerification: userVerification,
-                userPresence: userPresence
-            );
-            authData.Add(flags);
-
-            authData.AddRange(new List<byte> {
-                (byte)(counter >> 24),
-                (byte)(counter >> 16),
-                (byte)(counter >> 8),
-                (byte)counter
-            });
-
-            if (isAttestation)
-            {
-                var attestedCredentialData = new List<byte>();
-
-                attestedCredentialData.AddRange(AAGUID);
-
-                // credentialIdLength (2 bytes) and credential Id
-                var credentialIdLength = new byte[] {
-                    (byte)((credentialId.Length - (credentialId.Length & 0xff)) / 256),
-                    (byte)(credentialId.Length & 0xff)
-                };
-                attestedCredentialData.AddRange(credentialIdLength);
-                attestedCredentialData.AddRange(credentialId);
-                attestedCredentialData.AddRange(publicKey.ExportCose());
-
-                authData.AddRange(attestedCredentialData);
-            }
-
-            return authData.ToArray();
-        }
-
-        private byte AuthDataFlags(bool extensionData, bool attestationData, bool userVerification, bool userPresence, bool backupEligibility = true, bool backupState = true)
-        {
-            byte flags = 0;
-
-            if (extensionData)
-            {
-                flags |= 0b1000000;
-            }
-
-            if (attestationData)
-            {
-                flags |= 0b01000000;
-            }
-
-            if (backupState)
-            {
-                flags |= 0b00010000;
-            }
-
-            if (backupEligibility)
-            {
-                flags |= 0b00001000;
-            }
-
-            if (userVerification)
-            {
-                flags |= 0b00000100;
-            }
-
-            if (userPresence)
-            {
-                flags |= 0b00000001;
-            }
-
-            return flags;
-        }
-
-        private byte[] EncodeAttestationObject(byte[] authData)
-        {
-            var attestationObject = new CborWriter(CborConformanceMode.Ctap2Canonical);
-            attestationObject.WriteStartMap(3);
-            attestationObject.WriteTextString("fmt");
-            attestationObject.WriteTextString("none");
-            attestationObject.WriteTextString("attStmt");
-            attestationObject.WriteStartMap(0);
-            attestationObject.WriteEndMap();
-            attestationObject.WriteTextString("authData");
-            attestationObject.WriteByteString(authData);
-            attestationObject.WriteEndMap();
-
-            return attestationObject.Encode();
-        }
-
-        // TODO: Move this to a separate service
-        private byte[] GenerateSignature(byte[] authData, byte[] clientDataHash, byte[] privateKey)
-        {
-            var sigBase = authData.Concat(clientDataHash).ToArray();
-            var dsa = ECDsa.Create();
-            dsa.ImportPkcs8PrivateKey(privateKey, out var bytesRead);
-
-            if (bytesRead == 0)
-            {
-                throw new Exception("Failed to import private key");
-            }
-
-            return dsa.SignData(sigBase, HashAlgorithmName.SHA256, DSASignatureFormat.Rfc3279DerSequence);
-        }
-
-        private class PublicKey
-        {
-            private readonly ECDsa _dsa;
-
-            public PublicKey(ECDsa dsa)
-            {
-                _dsa = dsa;
-            }
-
-            public byte[] X => _dsa.ExportParameters(false).Q.X;
-            public byte[] Y => _dsa.ExportParameters(false).Q.Y;
-
-            public byte[] ExportDer()
-            {
-                return _dsa.ExportSubjectPublicKeyInfo();
-            }
-
-            public byte[] ExportCose()
-            {
-                var result = new CborWriter(CborConformanceMode.Ctap2Canonical);
-                result.WriteStartMap(5);
-
-                // kty = EC2
-                result.WriteInt32(1);
-                result.WriteInt32(2);
-
-                // alg = ES256
-                result.WriteInt32(3);
-                result.WriteInt32((int)Fido2AlgorithmIdentifier.ES256);
-
-                // crv = P-256
-                result.WriteInt32(-1);
-                result.WriteInt32(1);
-
-                // x
-                result.WriteInt32(-2);
-                result.WriteByteString(X);
-
-                // y
-                result.WriteInt32(-3);
-                result.WriteByteString(Y);
-
-                result.WriteEndMap();
-
-                return result.Encode();
-            }
-        }
-    }
-}

src/Core/Services/Fido2ClientService.cs

@@ -1,298 +0,0 @@
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using Bit.Core.Abstractions;
-using Bit.Core.Enums;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-using Bit.Core.Utilities.Fido2.Extensions;
-
-namespace Bit.Core.Services
-{
-    public class Fido2ClientService : IFido2ClientService
-    {
-        private readonly IStateService _stateService;
-        private readonly IEnvironmentService _environmentService;
-        private readonly ICryptoFunctionService _cryptoFunctionService;
-        private readonly IFido2AuthenticatorService _fido2AuthenticatorService;
-        private readonly IFido2GetAssertionUserInterface _getAssertionUserInterface;
-        private readonly IFido2MakeCredentialUserInterface _makeCredentialUserInterface;
-
-        public Fido2ClientService(
-            IStateService stateService,
-            IEnvironmentService environmentService,
-            ICryptoFunctionService cryptoFunctionService,
-            IFido2AuthenticatorService fido2AuthenticatorService,
-            IFido2GetAssertionUserInterface getAssertionUserInterface,
-            IFido2MakeCredentialUserInterface makeCredentialUserInterface)
-        {
-            _stateService = stateService;
-            _environmentService = environmentService;
-            _cryptoFunctionService = cryptoFunctionService;
-            _fido2AuthenticatorService = fido2AuthenticatorService;
-            _getAssertionUserInterface = getAssertionUserInterface;
-            _makeCredentialUserInterface = makeCredentialUserInterface;
-        }
-
-        public async Task<Fido2ClientCreateCredentialResult> CreateCredentialAsync(Fido2ClientCreateCredentialParams createCredentialParams, Fido2ExtraCreateCredentialParams extraParams)
-        {
-            var blockedUris = await _stateService.GetAutofillBlacklistedUrisAsync();
-            var domain = CoreHelpers.GetHostname(createCredentialParams.Origin);
-            if (blockedUris != null && blockedUris.Contains(domain))
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.UriBlockedError,
-                    "Origin is blocked by the user");
-            }
-
-            if (!await _stateService.IsAuthenticatedAsync())
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.InvalidStateError,
-                    "No user is logged in");
-            }
-
-            if (createCredentialParams.Origin == _environmentService.GetWebVaultUrl())
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.NotAllowedError,
-                    "Saving Bitwarden credentials in a Bitwarden vault is not allowed");
-            }
-
-            if (!createCredentialParams.SameOriginWithAncestors)
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.NotAllowedError,
-                    "Credential creation is now allowed from embedded contexts with different origins");
-            }
-
-            if (createCredentialParams.User.Id.Length < 1 || createCredentialParams.User.Id.Length > 64)
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.TypeError,
-                    "The length of user.id is not between 1 and 64 bytes (inclusive)");
-            }
-
-            var isAndroidOrigin = createCredentialParams.Origin.StartsWith("android:apk-key-hash");
-            if (!isAndroidOrigin && !createCredentialParams.Origin.StartsWith("https://"))
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.SecurityError,
-                    "Origin is not a valid https origin");
-            }
-
-            if (!isAndroidOrigin && !Fido2DomainUtils.IsValidRpId(createCredentialParams.Rp.Id, createCredentialParams.Origin))
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.SecurityError,
-                    "RP ID cannot be used with this origin");
-            }
-
-            PublicKeyCredentialParameters[] credTypesAndPubKeyAlgs;
-            if (createCredentialParams.PubKeyCredParams?.Length > 0)
-            {
-                // Filter out all unsupported algorithms
-                credTypesAndPubKeyAlgs = createCredentialParams.PubKeyCredParams
-                    .Where(kp => kp.Alg == (int)Fido2AlgorithmIdentifier.ES256 && kp.Type == Constants.DefaultFido2CredentialType)
-                    .ToArray();
-            }
-            else
-            {
-                // Assign default algorithms
-                credTypesAndPubKeyAlgs = new PublicKeyCredentialParameters[]
-                {
-                    new PublicKeyCredentialParameters { Alg = (int) Fido2AlgorithmIdentifier.ES256, Type = Constants.DefaultFido2CredentialType },
-                    new PublicKeyCredentialParameters { Alg = (int) Fido2AlgorithmIdentifier.RS256, Type = Constants.DefaultFido2CredentialType }
-                };
-            }
-
-            if (credTypesAndPubKeyAlgs.Length == 0)
-            {
-                throw new Fido2ClientException(Fido2ClientException.ErrorCode.NotSupportedError, "No supported algorithms found");
-            }
-
-            byte[] clientDataJSONBytes = null;
-            var clientDataHash = extraParams.ClientDataHash;
-            if (clientDataHash == null)
-            {
-                var clientDataJsonObject = new JsonObject
-                {
-                    { "type", "webauthn.create" },
-                    { "challenge", CoreHelpers.Base64UrlEncode(createCredentialParams.Challenge) },
-                    { "origin", createCredentialParams.Origin },
-                    { "crossOrigin", !createCredentialParams.SameOriginWithAncestors }
-                    // tokenBinding: {} // Not supported
-                };
-                if (!string.IsNullOrWhiteSpace(extraParams.AndroidPackageName))
-                {
-                    clientDataJsonObject.Add("androidPackageName", extraParams.AndroidPackageName);
-                }
-                
-                clientDataJSONBytes = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(clientDataJsonObject));
-                clientDataHash = await _cryptoFunctionService.HashAsync(clientDataJSONBytes, CryptoHashAlgorithm.Sha256);
-            }
-            var makeCredentialParams = MapToMakeCredentialParams(createCredentialParams, credTypesAndPubKeyAlgs, clientDataHash);
-
-            try
-            {
-                var makeCredentialResult = await _fido2AuthenticatorService.MakeCredentialAsync(makeCredentialParams, _makeCredentialUserInterface);
-
-                Fido2CredPropsResult credProps = null;
-                if (createCredentialParams.Extensions?.CredProps == true)
-                {
-                    credProps = new Fido2CredPropsResult
-                    {
-                        Rk = makeCredentialParams.RequireResidentKey
-                    };
-                }
-
-                return new Fido2ClientCreateCredentialResult
-                {
-                    CredentialId = makeCredentialResult.CredentialId,
-                    AttestationObject = makeCredentialResult.AttestationObject,
-                    AuthData = makeCredentialResult.AuthData,
-                    ClientDataJSON = clientDataJSONBytes,
-                    PublicKey = makeCredentialResult.PublicKey,
-                    PublicKeyAlgorithm = makeCredentialResult.PublicKeyAlgorithm,
-                    Transports = createCredentialParams.Rp.Id == "google.com" ? new string[] { "internal", "usb" } : new string[] { "internal" }, // workaround for a bug on Google's side
-                    Extensions = new Fido2CreateCredentialExtensionsResult
-                    {
-                        CredProps = credProps
-                    }
-                };
-            }
-            catch (InvalidStateError)
-            {
-                throw new Fido2ClientException(Fido2ClientException.ErrorCode.InvalidStateError, "Unknown invalid state encountered");
-            }
-            catch (Exception)
-            {
-                throw new Fido2ClientException(Fido2ClientException.ErrorCode.UnknownError, $"An unknown error occurred");
-            }
-        }
-
-        public async Task<Fido2ClientAssertCredentialResult> AssertCredentialAsync(Fido2ClientAssertCredentialParams assertCredentialParams, Fido2ExtraAssertCredentialParams extraParams)
-        {
-            var blockedUris = await _stateService.GetAutofillBlacklistedUrisAsync();
-            var domain = CoreHelpers.GetHostname(assertCredentialParams.Origin);
-            if (blockedUris != null && blockedUris.Contains(domain))
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.UriBlockedError,
-                    "Origin is blocked by the user");
-            }
-
-            if (!await _stateService.IsAuthenticatedAsync())
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.InvalidStateError,
-                    "No user is logged in");
-            }
-
-            if (assertCredentialParams.Origin == _environmentService.GetWebVaultUrl())
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.NotAllowedError,
-                    "Saving Bitwarden credentials in a Bitwarden vault is not allowed");
-            }
-
-            var isAndroidOrigin = assertCredentialParams.Origin.StartsWith("android:apk-key-hash");
-            if (!isAndroidOrigin && !assertCredentialParams.Origin.StartsWith("https://"))
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.SecurityError,
-                    "Origin is not a valid https origin");
-            }
-
-            if (!isAndroidOrigin && !Fido2DomainUtils.IsValidRpId(assertCredentialParams.RpId, assertCredentialParams.Origin))
-            {
-                throw new Fido2ClientException(
-                    Fido2ClientException.ErrorCode.SecurityError,
-                    "RP ID cannot be used with this origin");
-            }
-
-            byte[] clientDataJSONBytes = null;
-            var clientDataHash = extraParams.ClientDataHash;
-            if (clientDataHash == null)
-            {
-                var clientDataJsonObject = new JsonObject
-                {
-                    { "type", "webauthn.get" },
-                    { "challenge", CoreHelpers.Base64UrlEncode(assertCredentialParams.Challenge) },
-                    { "origin", assertCredentialParams.Origin },
-                    { "crossOrigin", !assertCredentialParams.SameOriginWithAncestors }
-                    // tokenBinding: {} // Not supported
-                };
-                if (!string.IsNullOrWhiteSpace(extraParams.AndroidPackageName))
-                {
-                    clientDataJsonObject.Add("androidPackageName", extraParams.AndroidPackageName);
-                }
-
-                clientDataJSONBytes = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(clientDataJsonObject));
-                clientDataHash = await _cryptoFunctionService.HashAsync(clientDataJSONBytes, CryptoHashAlgorithm.Sha256);
-            }
-            var getAssertionParams = MapToGetAssertionParams(assertCredentialParams, clientDataHash);
-
-            try
-            {
-                var getAssertionResult = await _fido2AuthenticatorService.GetAssertionAsync(getAssertionParams, _getAssertionUserInterface);
-
-                return new Fido2ClientAssertCredentialResult
-                {
-                    AuthenticatorData = getAssertionResult.AuthenticatorData,
-                    ClientDataJSON = clientDataJSONBytes,
-                    Id = CoreHelpers.Base64UrlEncode(getAssertionResult.SelectedCredential.Id),
-                    RawId = getAssertionResult.SelectedCredential.Id,
-                    Signature = getAssertionResult.Signature,
-                    SelectedCredential = getAssertionResult.SelectedCredential,
-                    ClientDataHash = clientDataHash
-                };
-            }
-            catch (InvalidStateError)
-            {
-                throw new Fido2ClientException(Fido2ClientException.ErrorCode.InvalidStateError, "Unknown invalid state encountered");
-            }
-            catch (Exception)
-            {
-                throw new Fido2ClientException(Fido2ClientException.ErrorCode.UnknownError, $"An unknown error occurred");
-            }
-        }
-
-        private Fido2AuthenticatorMakeCredentialParams MapToMakeCredentialParams(
-            Fido2ClientCreateCredentialParams createCredentialParams,
-            PublicKeyCredentialParameters[] credTypesAndPubKeyAlgs,
-            byte[] clientDataHash)
-        {
-            var requireResidentKey = createCredentialParams.AuthenticatorSelection?.ResidentKey == "required" ||
-                createCredentialParams.AuthenticatorSelection?.ResidentKey == "preferred" ||
-                (createCredentialParams.AuthenticatorSelection?.ResidentKey == null &&
-                createCredentialParams.AuthenticatorSelection?.RequireResidentKey == true);
-
-            return new Fido2AuthenticatorMakeCredentialParams
-            {
-                RequireResidentKey = requireResidentKey,
-                UserVerificationPreference = Fido2UserVerificationPreferenceExtensions.ToFido2UserVerificationPreference(createCredentialParams.AuthenticatorSelection?.UserVerification),
-                ExcludeCredentialDescriptorList = createCredentialParams.ExcludeCredentials,
-                CredTypesAndPubKeyAlgs = credTypesAndPubKeyAlgs,
-                Hash = clientDataHash,
-                RpEntity = createCredentialParams.Rp,
-                UserEntity = createCredentialParams.User,
-                Extensions = createCredentialParams.Extensions
-            };
-        }
-
-        private Fido2AuthenticatorGetAssertionParams MapToGetAssertionParams(
-            Fido2ClientAssertCredentialParams assertCredentialParams,
-            byte[] cliendDataHash)
-        {
-            return new Fido2AuthenticatorGetAssertionParams
-            {
-                RpId = assertCredentialParams.RpId,
-                Challenge = assertCredentialParams.Challenge,
-                AllowCredentialDescriptorList = assertCredentialParams.AllowCredentials,
-                UserVerificationPreference = Fido2UserVerificationPreferenceExtensions.ToFido2UserVerificationPreference(assertCredentialParams?.UserVerification),
-                Hash = cliendDataHash
-            };
-        }
-    }
-}

src/Core/Services/Fido2MediatorService.cs

@@ -1,60 +0,0 @@
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Services
-{
-    public class Fido2MediatorService : IFido2MediatorService
-    {
-        private readonly IFido2AuthenticatorService _fido2AuthenticatorService;
-        private readonly IFido2ClientService _fido2ClientService;
-        private readonly ICipherService _cipherService;
-
-        public Fido2MediatorService(IFido2AuthenticatorService fido2AuthenticatorService,
-            IFido2ClientService fido2ClientService,
-            ICipherService cipherService)
-        {
-            _fido2AuthenticatorService = fido2AuthenticatorService;
-            _fido2ClientService = fido2ClientService;
-            _cipherService = cipherService;
-        }
-
-        public async Task<Fido2ClientAssertCredentialResult> AssertCredentialAsync(Fido2ClientAssertCredentialParams assertCredentialParams, Fido2ExtraAssertCredentialParams extraParams)
-        {
-            var result = await _fido2ClientService.AssertCredentialAsync(assertCredentialParams, extraParams);
-
-            if (result?.SelectedCredential?.Cipher != null)
-            {
-                await _cipherService.CopyTotpCodeIfNeededAsync(result.SelectedCredential.Cipher);
-            }
-
-            return result;
-        }
-
-        public Task<Fido2ClientCreateCredentialResult> CreateCredentialAsync(Fido2ClientCreateCredentialParams createCredentialParams, Fido2ExtraCreateCredentialParams extraParams)
-        {
-            return _fido2ClientService.CreateCredentialAsync(createCredentialParams, extraParams);
-        }
-
-        public async Task<Fido2AuthenticatorGetAssertionResult> GetAssertionAsync(Fido2AuthenticatorGetAssertionParams assertionParams, IFido2GetAssertionUserInterface userInterface)
-        {
-            var result = await _fido2AuthenticatorService.GetAssertionAsync(assertionParams, userInterface);
-
-            if (result?.SelectedCredential?.Cipher != null)
-            {
-                await _cipherService.CopyTotpCodeIfNeededAsync(result.SelectedCredential.Cipher);
-            }
-
-            return result;
-        }
-
-        public Task<Fido2AuthenticatorMakeCredentialResult> MakeCredentialAsync(Fido2AuthenticatorMakeCredentialParams makeCredentialParams, IFido2MakeCredentialUserInterface userInterface)
-        {
-            return _fido2AuthenticatorService.MakeCredentialAsync(makeCredentialParams, userInterface);
-        }
-
-        public Task<Fido2AuthenticatorDiscoverableCredentialMetadata[]> SilentCredentialDiscoveryAsync(string rpId)
-        {
-            return _fido2AuthenticatorService.SilentCredentialDiscoveryAsync(rpId);
-        }
-    }
-}

src/Core/Services/Logging/ClipLogger.cs

@@ -1,75 +0,0 @@
-//using System.Runtime.CompilerServices;
-//using System.Text;
-//using Bit.Core.Abstractions;
-
-//#if IOS
-//using UIKit;
-//#elif ANDROID
-//using Android.Content;
-//#endif
-
-//namespace Bit.Core.Services
-//{
-//   /// <summary>
-//   /// This logger can be used to help debug iOS extensions where we cannot use the .NET debugger yet
-//   /// so we can use this that copies the logs to the clipboard so one
-//   /// can paste them and analyze its output.
-//   /// </summary>
-//   public class ClipLogger : ILogger
-//   {
-//       private static readonly StringBuilder _currentBreadcrumbs = new StringBuilder();
-
-//       static ILogger _instance;
-//       public static ILogger Instance
-//       {
-//           get
-//           {
-//               if (_instance is null)
-//               {
-//                   _instance = new ClipLogger();
-//               }
-//               return _instance;
-//           }
-//       }
-
-//       protected ClipLogger()
-//       {
-//       }
-
-//       public static void Log(string breadcrumb)
-//       {
-//            var formattedText = $"{DateTime.Now.ToShortTimeString()}: {breadcrumb}";
-//            _currentBreadcrumbs.AppendLine(formattedText);
-
-//#if IOS
-//            MainThread.BeginInvokeOnMainThread(() => UIPasteboard.General.String = _currentBreadcrumbs.ToString());
-//#elif ANDROID
-//            var clipboardManager = Android.App.Application.Context.GetSystemService(Context.ClipboardService) as ClipboardManager;
-//            var clipData = ClipData.NewPlainText("bitwarden", _currentBreadcrumbs.ToString());
-//            clipboardManager.PrimaryClip = clipData;
-//            MainThread.BeginInvokeOnMainThread(() => UIPasteboard.General.String = _currentBreadcrumbs.ToString());
-//#endif
-//        }
-
-//       public void Error(string message, IDictionary<string, string> extraData = null, [CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "", [CallerLineNumber] int sourceLineNumber = 0)
-//       {
-//           var classAndMethod = $"{Path.GetFileNameWithoutExtension(sourceFilePath)}.{memberName}";
-//           var filePathAndLineNumber = $"{Path.GetFileName(sourceFilePath)}:{sourceLineNumber}";
-//           var properties = new Dictionary<string, string>
-//           {
-//               ["File"] = filePathAndLineNumber,
-//               ["Method"] = memberName
-//           };
-
-//           Log(message ?? $"Error found in: {classAndMethod}, {filePathAndLineNumber}");
-//       }
-
-//       public void Exception(Exception ex) => Log(ex?.ToString());
-
-//       public Task InitAsync() => Task.CompletedTask;
-
-//       public Task<bool> IsEnabled() => Task.FromResult(true);
-
-//       public Task SetEnabled(bool value) => Task.CompletedTask;
-//   }
-//}

src/Core/Services/Logging/LoggerHelper.cs

@@ -1,4 +1,5 @@
-using Bit.Core.Abstractions;
+using System;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Services
@@ -23,6 +24,7 @@ namespace Bit.Core.Services
                 // we need to track the error as well
                 Microsoft.AppCenter.Crashes.Crashes.TrackError(ex);
 #endif
+
             }
         }
     }

src/Core/Services/MobilePasswordRepromptService.cs

@@ -57,7 +57,7 @@ namespace Bit.App.Services
             return passwordValid;
         }
 
-        public async Task<bool> ShouldByPassMasterPasswordRepromptAsync()
+        private async Task<bool> ShouldByPassMasterPasswordRepromptAsync()
         {
             return await _cryptoService.GetMasterKeyHashAsync() is null;
         }

src/Core/Services/MobilePlatformUtilsService.cs

@@ -1,12 +1,19 @@
-using Bit.App.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.App.Abstractions;
 using Bit.App.Models;
+using Bit.Core.Resources.Localization;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Plugin.Fingerprint;
 using Plugin.Fingerprint.Abstractions;
+using Microsoft.Maui.ApplicationModel.DataTransfer;
+using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Devices;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;
 
 namespace Bit.App.Services
 {
@@ -238,34 +245,31 @@ namespace Bit.App.Services
             return await stateService.IsAccountBiometricIntegrityValidAsync(bioIntegritySrcKey);
         }
 
-        public async Task<bool?> AuthenticateBiometricAsync(string text = null, string fallbackText = null,
-            Action fallback = null, bool logOutOnTooManyAttempts = false, bool allowAlternativeAuthentication = false)
+        public async Task<bool> AuthenticateBiometricAsync(string text = null, string fallbackText = null,
+            Action fallback = null, bool logOutOnTooManyAttempts = false)
         {
             try
             {
                 if (text == null)
                 {
                     text = AppResources.BiometricsDirection;
-#if IOS
-                    var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
-                    text = supportsFace ? AppResources.FaceIDDirection : AppResources.FingerprintDirection;
-#endif
+                    // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
+                    if (Device.RuntimePlatform == Device.iOS)
+                    {
+                        var supportsFace = await _deviceActionService.SupportsFaceBiometricAsync();
+                        text = supportsFace ? AppResources.FaceIDDirection : AppResources.FingerprintDirection;
+                    }
                 }
                 var biometricRequest = new AuthenticationRequestConfiguration(AppResources.Bitwarden, text)
                 {
                     CancelTitle = AppResources.Cancel,
-                    FallbackTitle = fallbackText,
-                    AllowAlternativeAuthentication = allowAlternativeAuthentication
+                    FallbackTitle = fallbackText
                 };
                 var result = await CrossFingerprint.Current.AuthenticateAsync(biometricRequest);
                 if (result.Authenticated)
                 {
                     return true;
                 }
-                if (result.Status == FingerprintAuthenticationResultStatus.Canceled)
-                {
-                    return null;
-                }
                 if (result.Status == FingerprintAuthenticationResultStatus.FallbackRequested)
                 {
                     fallback?.Invoke();

src/Core/Services/PclCryptoFunctionService.cs

@@ -4,7 +4,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Models.Domain;
 using PCLCrypto;
 using static PCLCrypto.WinRTCrypto;
 

src/Core/Services/StateService.cs

@@ -1698,11 +1698,6 @@ namespace Bit.Core.Services
             await _storageService.SaveAsync(Constants.iOSExtensionActiveUserIdKey, userId);
         }
 
-        public async Task ReloadStateAsync()
-        {
-            _state = await GetStateFromStorageAsync() ?? new State();
-        }
-
         private async Task CheckStateAsync()
         {
             if (!_migrationChecked)
@@ -1714,7 +1709,7 @@ namespace Bit.Core.Services
 
             if (_state == null)
             {
-                await ReloadStateAsync();
+                _state = await GetStateFromStorageAsync() ?? new State();
             }
         }
 

src/Core/Services/UserPinService.cs

@@ -1,6 +1,5 @@
-using Bit.Core.Abstractions;
-using Bit.Core.Models.Domain;
-using Bit.Core.Services;
+using System.Threading.Tasks;
+using Bit.Core.Abstractions;
 
 namespace Bit.App.Services
 {
@@ -8,25 +7,11 @@ namespace Bit.App.Services
     {
         private readonly IStateService _stateService;
         private readonly ICryptoService _cryptoService;
-        private readonly IVaultTimeoutService _vaultTimeoutService;
 
-        public UserPinService(IStateService stateService, ICryptoService cryptoService, IVaultTimeoutService vaultTimeoutService)
+        public UserPinService(IStateService stateService, ICryptoService cryptoService)
         {
             _stateService = stateService;
             _cryptoService = cryptoService;
-            _vaultTimeoutService = vaultTimeoutService;
-        }
-
-        public async Task<bool> IsPinLockEnabledAsync()
-        {
-            var pinLockType = await _vaultTimeoutService.GetPinLockTypeAsync();
-
-            var ephemeralPinSet = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync()
-                ?? await _stateService.GetPinProtectedKeyAsync();
-
-            return (pinLockType == PinLockType.Transient && ephemeralPinSet != null)
-                ||
-                pinLockType == PinLockType.Persistent;
         }
 
         public async Task SetupPinAsync(string pin, bool requireMasterPasswordOnRestart)
@@ -49,59 +34,5 @@ namespace Bit.App.Services
                 await _stateService.SetPinKeyEncryptedUserKeyAsync(protectedPinKey);
             }
         }
-
-        public async Task<bool> VerifyPinAsync(string inputPin)
-        {
-            var (email, kdfConfig) = await _stateService.GetActiveUserCustomDataAsync(a => a?.Profile is null ? (null, default) : (a.Profile.Email, new KdfConfig(a.Profile)));
-            if (kdfConfig.Type is null)
-            {
-                return false;
-            }
-
-            return await VerifyPinAsync(inputPin, email, kdfConfig, await _vaultTimeoutService.GetPinLockTypeAsync());
-        }
-
-        public async Task<bool> VerifyPinAsync(string inputPin, string email, KdfConfig kdfConfig, PinLockType pinLockType)
-        {
-            EncString userKeyPin = null;
-            EncString oldPinProtected = null;
-            if (pinLockType == PinLockType.Persistent)
-            {
-                userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyAsync();
-                var oldEncryptedKey = await _stateService.GetPinProtectedAsync();
-                oldPinProtected = oldEncryptedKey != null ? new EncString(oldEncryptedKey) : null;
-            }
-            else if (pinLockType == PinLockType.Transient)
-            {
-                userKeyPin = await _stateService.GetPinKeyEncryptedUserKeyEphemeralAsync();
-                oldPinProtected = await _stateService.GetPinProtectedKeyAsync();
-            }
-
-            UserKey userKey;
-            if (oldPinProtected != null)
-            {
-                userKey = await _cryptoService.DecryptAndMigrateOldPinKeyAsync(
-                    pinLockType == PinLockType.Transient,
-                    inputPin,
-                    email,
-                    kdfConfig,
-                    oldPinProtected
-                );
-            }
-            else
-            {
-                userKey = await _cryptoService.DecryptUserKeyWithPinAsync(
-                    inputPin,
-                    email,
-                    kdfConfig,
-                    userKeyPin
-                );
-            }
-
-            var protectedPin = await _stateService.GetProtectedPinAsync();
-            var decryptedPin = await _cryptoService.DecryptToUtf8Async(new EncString(protectedPin), userKey);
-
-            return decryptedPin == inputPin;
-        }
     }
 }

src/Core/Services/UserVerification/Fido2UserVerificationPreferredServiceStrategy.cs

@@ -1,41 +0,0 @@
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Services.UserVerification
-{
-    public class Fido2UserVerificationPreferredServiceStrategy : IUserVerificationServiceStrategy
-    {
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-
-        public Fido2UserVerificationPreferredServiceStrategy(IUserVerificationMediatorService userVerificationMediatorService)
-        {
-            _userVerificationMediatorService = userVerificationMediatorService;
-        }
-
-        public async Task<CancellableResult<bool>> VerifyUserForFido2Async(Fido2UserVerificationOptions options)
-        {
-            if (options.HasVaultBeenUnlockedInTransaction)
-            {
-                return new CancellableResult<bool>(true);
-            }
-
-            if (options.OnNeedUITask != null)
-            {
-                await options.OnNeedUITask();
-            }
-
-            var osUnlockVerification = await _userVerificationMediatorService.PerformOSUnlockAsync();
-            if (osUnlockVerification.IsCancelled)
-            {
-                return new CancellableResult<bool>(false, true);
-            }
-            if (osUnlockVerification.Result.CanPerform)
-            {
-                return new CancellableResult<bool>(osUnlockVerification.Result.IsVerified);
-            }
-
-            return new CancellableResult<bool>(false);
-        }
-    }
-}

src/Core/Services/UserVerification/Fido2UserVerificationRequiredServiceStrategy.cs

@@ -1,71 +0,0 @@
-using Bit.Core.Abstractions;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Services.UserVerification
-{
-    public class Fido2UserVerificationRequiredServiceStrategy : IUserVerificationServiceStrategy
-    {
-        private readonly IUserVerificationMediatorService _userVerificationMediatorService;
-        private readonly IPlatformUtilsService _platformUtilsService;
-
-        public Fido2UserVerificationRequiredServiceStrategy(IUserVerificationMediatorService userVerificationMediatorService,
-            IPlatformUtilsService platformUtilsService)
-        {
-            _userVerificationMediatorService = userVerificationMediatorService;
-            _platformUtilsService = platformUtilsService;
-        }
-
-        public async Task<CancellableResult<bool>> VerifyUserForFido2Async(Fido2UserVerificationOptions options)
-        {
-            if (options.HasVaultBeenUnlockedInTransaction)
-            {
-                return new CancellableResult<bool>(true);
-            }
-
-            if (options.OnNeedUITask != null)
-            {
-                await options.OnNeedUITask();
-            }
-
-            var osUnlockVerification = await _userVerificationMediatorService.PerformOSUnlockAsync();
-            if (osUnlockVerification.IsCancelled)
-            {
-                return new CancellableResult<bool>(false, true);
-            }
-            if (osUnlockVerification.Result.CanPerform)
-            {
-                return new CancellableResult<bool>(osUnlockVerification.Result.IsVerified);
-            }
-
-            var pinVerification = await _userVerificationMediatorService.VerifyPinCodeAsync();
-            if (pinVerification.IsCancelled)
-            {
-                return new CancellableResult<bool>(false, true);
-            }
-            if (pinVerification.Result.CanPerform)
-            {
-                return new CancellableResult<bool>(pinVerification.Result.IsVerified);
-            }
-
-            var mpVerification = await _userVerificationMediatorService.VerifyMasterPasswordAsync(false);
-            if (mpVerification.IsCancelled)
-            {
-                return new CancellableResult<bool>(false, true);
-            }
-            if (mpVerification.Result.CanPerform)
-            {
-                return new CancellableResult<bool>(mpVerification.Result.IsVerified);
-            }
-
-            // TODO: Setup PIN code. For the sake of simplicity, we're not implementing this step now and just telling the user to do it in the main app.
-
-            await _platformUtilsService.ShowDialogAsync(AppResources.VerificationRequiredForThisActionSetUpAnUnlockMethodInBitwardenToContinue,
-                string.Format(AppResources.VerificationRequiredByX, options.RpId),
-                AppResources.Ok);
-
-            return new CancellableResult<bool>(false);
-        }
-    }
-}

src/Core/Services/UserVerification/IUserVerificationServiceStrategy.cs

@@ -1,10 +0,0 @@
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-
-namespace Bit.Core.Services.UserVerification
-{
-    public interface IUserVerificationServiceStrategy
-    {
-        Task<CancellableResult<bool>> VerifyUserForFido2Async(Fido2UserVerificationOptions options);
-    }
-}

src/Core/Services/UserVerification/UserVerificationMediatorService.cs

@@ -1,211 +0,0 @@
-using Bit.App.Abstractions;
-using Bit.Core.Abstractions;
-using Bit.Core.Models.Domain;
-using Bit.Core.Resources.Localization;
-using Bit.Core.Utilities;
-using Bit.Core.Utilities.Fido2;
-using Plugin.Fingerprint;
-using static Bit.Core.Abstractions.IUserVerificationMediatorService;
-using FingerprintAvailability = Plugin.Fingerprint.Abstractions.FingerprintAvailability;
-
-namespace Bit.Core.Services.UserVerification
-{
-    public class UserVerificationMediatorService : IUserVerificationMediatorService
-    {
-        private const byte MAX_ATTEMPTS = 5;
-
-        private readonly IPlatformUtilsService _platformUtilsService;
-        private readonly IPasswordRepromptService _passwordRepromptService;
-        private readonly IUserPinService _userPinService;
-        private readonly IDeviceActionService _deviceActionService;
-        private readonly IUserVerificationService _userVerificationService;
-
-        private readonly Dictionary<Fido2UserVerificationPreference, IUserVerificationServiceStrategy> _fido2UserVerificationStrategies = new Dictionary<Fido2UserVerificationPreference, IUserVerificationServiceStrategy>();
-
-        public UserVerificationMediatorService(
-            IPlatformUtilsService platformUtilsService,
-            IPasswordRepromptService passwordRepromptService,
-            IUserPinService userPinService,
-            IDeviceActionService deviceActionService,
-            IUserVerificationService userVerificationService)
-        {
-            _platformUtilsService = platformUtilsService;
-            _passwordRepromptService = passwordRepromptService;
-            _userPinService = userPinService;
-            _deviceActionService = deviceActionService;
-            _userVerificationService = userVerificationService;
-
-            _fido2UserVerificationStrategies.Add(Fido2UserVerificationPreference.Required, new Fido2UserVerificationRequiredServiceStrategy(this, _platformUtilsService));
-            _fido2UserVerificationStrategies.Add(Fido2UserVerificationPreference.Preferred, new Fido2UserVerificationPreferredServiceStrategy(this));
-        }
-
-        public async Task<CancellableResult<bool>> VerifyUserForFido2Async(Fido2UserVerificationOptions options)
-        {
-            if (await ShouldPerformMasterPasswordRepromptAsync(options))
-            {
-                if (options.OnNeedUITask != null)
-                {
-                    await options.OnNeedUITask();
-                }
-
-                var mpVerification = await VerifyMasterPasswordAsync(true);
-                return new CancellableResult<bool>(
-                    !mpVerification.IsCancelled && mpVerification.Result.CanPerform && mpVerification.Result.IsVerified, 
-                    mpVerification.IsCancelled
-                );
-            }
-
-            if (!_fido2UserVerificationStrategies.TryGetValue(options.UserVerificationPreference, out var userVerificationServiceStrategy))
-            {
-                return new CancellableResult<bool>(false, false);
-            }
-
-            return await userVerificationServiceStrategy.VerifyUserForFido2Async(options);
-        }
-
-        public async Task<bool> CanPerformUserVerificationPreferredAsync(Fido2UserVerificationOptions options)
-        {
-            if (await ShouldPerformMasterPasswordRepromptAsync(options))
-            {
-                return true;
-            }
-
-            return options.HasVaultBeenUnlockedInTransaction
-                   ||
-                   await CrossFingerprint.Current.GetAvailabilityAsync() == FingerprintAvailability.Available
-                   ||
-                   await CrossFingerprint.Current.GetAvailabilityAsync(true) == FingerprintAvailability.Available;
-        }
-
-        public async Task<bool> ShouldPerformMasterPasswordRepromptAsync(Fido2UserVerificationOptions options)
-        {
-            return options.ShouldCheckMasterPasswordReprompt && !await _passwordRepromptService.ShouldByPassMasterPasswordRepromptAsync();
-        }
-
-        public async Task<bool> ShouldEnforceFido2RequiredUserVerificationAsync(Fido2UserVerificationOptions options)
-        {
-            switch (options.UserVerificationPreference)
-            {
-                case Fido2UserVerificationPreference.Required:
-                    return true;
-                case Fido2UserVerificationPreference.Discouraged:
-                    return await ShouldPerformMasterPasswordRepromptAsync(options);
-                default:
-                    return await CanPerformUserVerificationPreferredAsync(options);
-            }
-        }
-
-        public async Task<CancellableResult<UVResult>> PerformOSUnlockAsync()
-        {
-            var availability = await CrossFingerprint.Current.GetAvailabilityAsync();
-            if (availability == FingerprintAvailability.Available)
-            {
-                var isValid = await _platformUtilsService.AuthenticateBiometricAsync(null, DeviceInfo.Platform == DevicePlatform.Android ? "." : null);
-                if (!isValid.HasValue)
-                {
-                    return new UVResult(false, false).AsCancellable(true);
-                }
-                return new UVResult(true, isValid.Value).AsCancellable();
-            }
-
-            var alternativeAuthAvailability = await CrossFingerprint.Current.GetAvailabilityAsync(true);
-            if (alternativeAuthAvailability == FingerprintAvailability.Available)
-            {
-                var isNonBioValid = await _platformUtilsService.AuthenticateBiometricAsync(null, DeviceInfo.Platform == DevicePlatform.Android ? "." : null, allowAlternativeAuthentication: true);
-                if (!isNonBioValid.HasValue)
-                {
-                    return new UVResult(false, false).AsCancellable(true);
-                }
-                return new UVResult(true, isNonBioValid.Value).AsCancellable();
-            }
-
-            return new UVResult(false, false).AsCancellable();
-        }
-
-        public async Task<CancellableResult<UVResult>> VerifyPinCodeAsync()
-        {
-            return await VerifyWithAttemptsAsync(async () =>
-            {
-                if (!await _userPinService.IsPinLockEnabledAsync())
-                {
-                    return new UVResult(false, false).AsCancellable();
-                }
-
-                var pin = await _deviceActionService.DisplayPromptAync(AppResources.EnterPIN,
-                    AppResources.VerifyPIN, null, AppResources.Ok, AppResources.Cancel, password: true);
-                if (pin is null)
-                {
-                    // cancelled by the user
-                    return new UVResult(true, false).AsCancellable(true);
-                }
-
-                try
-                {
-                    var isVerified = await _userPinService.VerifyPinAsync(pin);
-                    return new UVResult(true, isVerified).AsCancellable();
-                }
-                catch (SymmetricCryptoKey.ArgumentKeyNullException)
-                {
-                    return new UVResult(true, false).AsCancellable();
-                }
-                catch (SymmetricCryptoKey.InvalidKeyOperationException)
-                {
-                    return new UVResult(true, false).AsCancellable();
-                }
-            });
-        }
-
-        public async Task<CancellableResult<UVResult>> VerifyMasterPasswordAsync(bool isMasterPasswordReprompt)
-        {
-            return await VerifyWithAttemptsAsync(async () =>
-            {
-                if (!await _userVerificationService.HasMasterPasswordAsync(true))
-                {
-                    return new UVResult(false, false).AsCancellable();
-                }
-
-                var title = isMasterPasswordReprompt ? AppResources.PasswordConfirmation : AppResources.MasterPassword;
-                var body = isMasterPasswordReprompt ? AppResources.PasswordConfirmationDesc : string.Empty;
-
-                var (password, isValid) = await _platformUtilsService.ShowPasswordDialogAndGetItAsync(title, body, _userVerificationService.VerifyMasterPasswordAsync);
-                if (password is null)
-                {
-                    return new UVResult(true, false).AsCancellable(true);
-                }
-
-                return new UVResult(true, isValid).AsCancellable();
-            });
-        }
-
-        private async Task<CancellableResult<UVResult>> VerifyWithAttemptsAsync(Func<Task<CancellableResult<UVResult>>> verifyAsync)
-        {
-            byte attempts = 0;
-            do
-            {
-                var verification = await verifyAsync();
-                if (verification.IsCancelled)
-                {
-                    return new UVResult(false, false).AsCancellable(true);
-                }
-                if (!verification.Result.CanPerform)
-                {
-                    return new UVResult(false, false).AsCancellable();
-                }
-                if (verification.Result.IsVerified)
-                {
-                    return new UVResult(true, true).AsCancellable();
-                }
-            } while (++attempts < MAX_ATTEMPTS);
-
-            return new UVResult(true, false).AsCancellable();
-        }
-    }
-
-    public static class UVResultExtensions
-    {
-        public static CancellableResult<UVResult> AsCancellable(this UVResult result, bool isCancelled = false)
-        {
-            return new CancellableResult<UVResult>(result, isCancelled);
-        }
-    }
-}

src/Core/Services/UserVerificationService.cs

@@ -25,7 +25,7 @@ namespace Bit.Core.Services
             _keyConnectorService = keyConnectorService;
         }
 
-        public async Task<bool> VerifyUser(string secret, VerificationType verificationType)
+        async public Task<bool> VerifyUser(string secret, VerificationType verificationType)
         {
             if (string.IsNullOrEmpty(secret))
             {
@@ -61,12 +61,6 @@ namespace Bit.Core.Services
             return true;
         }
 
-        public async Task<bool> VerifyMasterPasswordAsync(string masterPassword)
-        {
-            var masterKey = await _cryptoService.GetOrDeriveMasterKeyAsync(masterPassword);
-            return await _cryptoService.CompareAndUpdateKeyHashAsync(masterPassword, masterKey);
-        }
-
         async private Task InvalidSecretErrorAsync(VerificationType verificationType)
         {
             var errorMessage = verificationType == VerificationType.OTP

src/Core/Utilities/AccountManagement/AccountsManager.cs

@@ -20,9 +20,6 @@ namespace Bit.App.Utilities.AccountManagement
         private readonly IMessagingService _messagingService;
         private readonly IWatchDeviceService _watchDeviceService;
         private readonly IConditionedAwaiterManager _conditionedAwaiterManager;
-#if ANDROID
-        private LazyResolve<IFido2MakeCredentialConfirmationUserInterface> _fido2MakeCredentialConfirmationUserInterface = new LazyResolve<IFido2MakeCredentialConfirmationUserInterface>();
-#endif
 
         Func<AppOptions> _getOptionsFunc;
         private IAccountsManagerHost _accountsManagerHost;
@@ -85,7 +82,7 @@ namespace Bit.App.Utilities.AccountManagement
             if (authed)
             {
                 if (await _vaultTimeoutService.IsLoggedOutByTimeoutAsync() ||
-                  await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
+                    await _vaultTimeoutService.ShouldLogOutByTimeoutAsync())
                 {
                     // TODO implement orgIdentifier flow to SSO Login page, same as email flow below
                     // var orgIdentifier = await _stateService.GetOrgIdentifierAsync();
@@ -103,19 +100,6 @@ namespace Bit.App.Utilities.AccountManagement
                 {
                     _accountsManagerHost.Navigate(NavigationTarget.AddEditCipher);
                 }
-#if ANDROID
-                else if (_fido2MakeCredentialConfirmationUserInterface.Value.IsConfirmingNewCredential)
-                {
-                    // If we are already confirming a credential we don't need to navigate again.
-                    // This could happen when switching accounts for example.
-                    return;
-                }
-#endif
-                else if (Options.FromFido2Framework)
-                {
-                    var deviceActionService = Bit.Core.Utilities.ServiceContainer.Resolve<IDeviceActionService>();
-                    deviceActionService.ExecuteFido2CredentialActionAsync(Options).FireAndForget();
-                }
                 else if (Options.Uri != null)
                 {
                     _accountsManagerHost.Navigate(NavigationTarget.AutofillCiphers);
@@ -265,10 +249,6 @@ namespace Bit.App.Utilities.AccountManagement
                 await _accountsManagerHost.UpdateThemeAsync();
                 _watchDeviceService.SyncDataToWatchAsync().FireAndForget();
                 _messagingService.Send(AccountsManagerMessageCommands.ACCOUNT_SWITCH_COMPLETED);
-                if (Options != null)
-                {
-                    Options.HasUnlockedInThisTransaction = false;
-                }
             });
         }
 

src/Core/Utilities/AppHelpers.cs

@@ -429,37 +429,11 @@ namespace Bit.App.Utilities
         {
             if (appOptions != null)
             {
-                // this is called after login in or unlocking so we can assume the vault has been unlocked in this transaction here.
-                appOptions.HasUnlockedInThisTransaction = true;
-                
-#if ANDROID
-                var fido2MakeCredentialConfirmationUserInterface = ServiceContainer.Resolve<IFido2MakeCredentialConfirmationUserInterface>();
-                fido2MakeCredentialConfirmationUserInterface.SetCheckHasVaultBeenUnlockedInThisTransaction(() => appOptions?.HasUnlockedInThisTransaction == true);
-#endif
-
                 if (appOptions.FromAutofillFramework && appOptions.SaveType.HasValue)
                 {
                     App.MainPage = new NavigationPage(new CipherAddEditPage(appOptions: appOptions));
                     return true;
                 }
-
-#if ANDROID
-                // If we are waiting for an unlock vault we don't want to trigger 'ExecuteFido2CredentialActionAsync' again,
-                // as it's already running. We just need to 'ConfirmUnlockVault' on the 'userVerificationMediatorService'.
-                if (fido2MakeCredentialConfirmationUserInterface.IsWaitingUnlockVault)
-                {
-                    fido2MakeCredentialConfirmationUserInterface.ConfirmVaultUnlocked();
-                    return true;
-                }
-#endif
-
-                if (appOptions.FromFido2Framework && !string.IsNullOrWhiteSpace(appOptions.Fido2CredentialAction))
-                {
-                    var deviceActionService = Bit.Core.Utilities.ServiceContainer.Resolve<IDeviceActionService>();
-                    deviceActionService.ExecuteFido2CredentialActionAsync(appOptions).FireAndForget();
-                    return true;
-                }
-
                 if (appOptions.Uri != null
                     ||
                     appOptions.OtpData != null)

src/Core/Utilities/CancellableResult.cs

@@ -1,15 +0,0 @@
-namespace Bit.Core.Utilities
-{
-    public readonly struct CancellableResult<T>
-    {
-        public CancellableResult(T result, bool isCancelled = false)
-        {
-            Result = result;
-            IsCancelled = isCancelled;
-        }
-
-        public T Result { get; }
-
-        public bool IsCancelled { get; }
-    }
-}

src/Core/Utilities/CoreHelpers.cs

@@ -38,38 +38,12 @@ namespace Bit.Core.Utilities
 #endif
         }
 
-        /// <summary>
-        /// Returns the host (and not port) of the given uri.
-        /// Does not support plain hostnames without a protocol.
-        /// 
-        /// Input => Output examples:
-        /// <para>https://bitwarden.com => bitwarden.com</para>
-        /// <para>https://login.bitwarden.com:1337 => login.bitwarden.com</para>
-        /// <para>https://sub.login.bitwarden.com:1337 => sub.login.bitwarden.com</para>
-        /// <para>https://localhost:8080 => localhost</para>
-        /// <para>localhost => null</para>
-        /// <para>bitwarden => null</para>
-        /// <para>127.0.0.1 => 127.0.0.1</para>
-        /// </summary>
         public static string GetHostname(string uriString)
         {
             var uri = GetUri(uriString);
             return string.IsNullOrEmpty(uri?.Host) ? null : uri.Host;
         }
 
-        /// <summary>
-        /// Returns the host and port of the given uri.
-        /// Does not support plain hostnames without 
-        /// 
-        /// Input => Output examples:
-        /// <para>https://bitwarden.com => bitwarden.com</para>
-        /// <para>https://login.bitwarden.com:1337 => login.bitwarden.com:1337</para>
-        /// <para>https://sub.login.bitwarden.com:1337 => sub.login.bitwarden.com:1337</para>
-        /// <para>https://localhost:8080 => localhost:8080</para>
-        /// <para>localhost => null</para>
-        /// <para>bitwarden => null</para>
-        /// <para>127.0.0.1 => 127.0.0.1</para>
-        /// </summary>
         public static string GetHost(string uriString)
         {
             var uri = GetUri(uriString);
@@ -87,19 +61,6 @@ namespace Bit.Core.Utilities
             return null;
         }
 
-        /// <summary>
-        /// Returns the second and top level domain of the given uri.
-        /// Does not support plain hostnames without 
-        /// 
-        /// Input => Output examples:
-        /// <para>https://bitwarden.com => bitwarden.com</para>
-        /// <para>https://login.bitwarden.com:1337 => bitwarden.com</para>
-        /// <para>https://sub.login.bitwarden.com:1337 => bitwarden.com</para>
-        /// <para>https://localhost:8080 => localhost</para>
-        /// <para>localhost => null</para>
-        /// <para>bitwarden => null</para>
-        /// <para>127.0.0.1 => 127.0.0.1</para>
-        /// </summary>
         public static string GetDomain(string uriString)
         {
             var uri = GetUri(uriString);

src/Core/Utilities/DigitalAssetLinks/Statement.cs

@@ -1,8 +0,0 @@
-namespace Bit.Core.Utilities.DigitalAssetLinks
-{
-    public class Statement
-    {
-        public IEnumerable<string> Relation { get; set; }
-        public Target Target { get; set; }
-    }
-}

src/Core/Utilities/DigitalAssetLinks/Target.cs

@@ -1,14 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Bit.Core.Utilities.DigitalAssetLinks
-{
-    public class Target
-    {
-        public string Namespace { get; set; }
-        [JsonProperty("package_name")]
-        public string PackageName { get; set; }
-        [JsonProperty("sha256_cert_fingerprints")]
-        public IEnumerable<string> Sha256CertFingerprints { get; set; }
-
-    }
-}