Improvements to Passkey uniffi API

Author: dani-garcia

Cargo.lock

@@ -1,7 +1,8 @@
 use std::{num::NonZeroU32, str::FromStr};
 
 use crate::{
-    AsymmetricEncString, CryptoError, EncString, SensitiveString, UniffiCustomTypeConverter,
+    AsymmetricEncString, CryptoError, EncString, SensitiveString, SensitiveVec,
+    UniffiCustomTypeConverter,
 };
 
 uniffi::custom_type!(NonZeroU32, u32);
@@ -59,3 +60,17 @@ impl UniffiCustomTypeConverter for SensitiveString {
         obj.expose().to_owned()
     }
 }
+
+uniffi::custom_type!(SensitiveVec, Vec<u8>);
+
+impl UniffiCustomTypeConverter for SensitiveVec {
+    type Builtin = Vec<u8>;
+
+    fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
+        Ok(SensitiveVec::new(Box::new(val)))
+    }
+
+    fn from_custom(obj: Self) -> Self::Builtin {
+        obj.expose().to_owned()
+    }
+}

crates/bitwarden-crypto/src/uniffi_support.rs

@@ -8,7 +8,7 @@ use bitwarden::{
         PublicKeyCredentialAuthenticatorAssertionResponse,
         PublicKeyCredentialAuthenticatorAttestationResponse,
     },
-    vault::{Cipher, CipherView, Fido2Credential, Fido2CredentialView},
+    vault::{Cipher, CipherView, Fido2CredentialNewView, Fido2CredentialView},
 };
 
 use crate::{error::Result, Client};
@@ -162,12 +162,12 @@ pub trait UserInterface: Send + Sync {
     ) -> Result<CheckUserResult>;
     async fn pick_credential_for_authentication(
         &self,
-        available_credentials: Vec<Cipher>,
+        available_credentials: Vec<CipherView>,
     ) -> Result<CipherViewWrapper>;
     async fn pick_credential_for_creation(
         &self,
-        available_credentials: Vec<Cipher>,
-        new_credential: Fido2Credential,
+        available_credentials: Vec<CipherView>,
+        new_credential: Fido2CredentialNewView,
     ) -> Result<CipherViewWrapper>;
 }
 
@@ -178,7 +178,7 @@ pub trait CredentialStore: Send + Sync {
         &self,
         ids: Option<Vec<Vec<u8>>>,
         rip_id: String,
-    ) -> Result<Vec<Cipher>>;
+    ) -> Result<Vec<CipherView>>;
 
     async fn save_credential(&self, cred: Cipher) -> Result<()>;
 }
@@ -195,7 +195,7 @@ impl bitwarden::platform::fido2::CredentialStore for UniffiTraitBridge<&dyn Cred
         &self,
         ids: Option<Vec<Vec<u8>>>,
         rip_id: String,
-    ) -> BitResult<Vec<Cipher>> {
+    ) -> BitResult<Vec<CipherView>> {
         self.0
             .find_credentials(ids, rip_id)
             .await
@@ -234,7 +234,7 @@ impl bitwarden::platform::fido2::UserInterface for UniffiTraitBridge<&dyn UserIn
     }
     async fn pick_credential_for_authentication(
         &self,
-        available_credentials: Vec<Cipher>,
+        available_credentials: Vec<CipherView>,
     ) -> BitResult<CipherView> {
         self.0
             .pick_credential_for_authentication(available_credentials)
@@ -244,8 +244,8 @@ impl bitwarden::platform::fido2::UserInterface for UniffiTraitBridge<&dyn UserIn
     }
     async fn pick_credential_for_creation(
         &self,
-        available_credentials: Vec<Cipher>,
-        new_credential: Fido2Credential,
+        available_credentials: Vec<CipherView>,
+        new_credential: Fido2CredentialNewView,
     ) -> BitResult<CipherView> {
         self.0
             .pick_credential_for_creation(available_credentials, new_credential)

crates/bitwarden-uniffi/src/platform/fido2.rs

@@ -1,4 +1,4 @@
-use bitwarden_crypto::{AsymmetricEncString, EncString, SensitiveString};
+use bitwarden_crypto::{AsymmetricEncString, EncString, SensitiveString, SensitiveVec};
 use uuid::Uuid;
 
 // Forward the type definitions to the main bitwarden crate
@@ -7,4 +7,5 @@ uniffi::ffi_converter_forward!(DateTime, bitwarden::UniFfiTag, crate::UniFfiTag)
 uniffi::ffi_converter_forward!(EncString, bitwarden::UniFfiTag, crate::UniFfiTag);
 uniffi::ffi_converter_forward!(AsymmetricEncString, bitwarden::UniFfiTag, crate::UniFfiTag);
 uniffi::ffi_converter_forward!(SensitiveString, bitwarden::UniFfiTag, crate::UniFfiTag);
+uniffi::ffi_converter_forward!(SensitiveVec, bitwarden::UniFfiTag, crate::UniFfiTag);
 uniffi::ffi_converter_forward!(Uuid, bitwarden::UniFfiTag, crate::UniFfiTag);

crates/bitwarden-uniffi/src/uniffi_support.rs

@@ -24,6 +24,8 @@ internal = [
 mobile = [
     "internal",
     "dep:uniffi",
+    "dep:passkey",
+    "dep:coset",
     "bitwarden-crypto/mobile",
     "bitwarden-generators/mobile",
 ] # Mobile-specific features
@@ -43,11 +45,13 @@ chrono = { version = ">=0.4.26, <0.5", features = [
     "serde",
     "std",
 ], default-features = false }
+coset = { version = "0.3.7", optional = true }
 # We don't use this directly (it's used by rand), but we need it here to enable WASM support
 getrandom = { version = ">=0.2.9, <0.3", features = ["js"] }
 hmac = ">=0.12.1, <0.13"
 log = ">=0.4.18, <0.5"
-passkey = { git = "https://github.com/bitwarden/passkey-rs", rev = "12da886102707f87ad97e499c857c0857ece0b85" }
+p256 = ">=0.13.2, <0.14"
+passkey = { git = "https://github.com/bitwarden/passkey-rs", rev = "12da886102707f87ad97e499c857c0857ece0b85", optional = true }
 rand = ">=0.8.5, <0.9"
 reqwest = { version = ">=0.12, <0.13", features = [
     "http2",

crates/bitwarden/Cargo.toml

@@ -8,6 +8,7 @@ use bitwarden_api_identity::apis::Error as IdentityError;
 use bitwarden_exporters::ExportError;
 #[cfg(feature = "internal")]
 use bitwarden_generators::{PassphraseError, PasswordError, UsernameError};
+#[cfg(feature = "mobile")]
 use passkey::client::WebauthnError;
 use reqwest::StatusCode;
 use thiserror::Error;
@@ -69,8 +70,9 @@ pub enum Error {
     #[error(transparent)]
     ExportError(#[from] ExportError),
 
+    #[cfg(feature = "mobile")]
     #[error("Webauthn error: {0:?}")]
-    WebauthnError(passkey::client::WebauthnError),
+    WebauthnError(WebauthnError),
 
     #[cfg(feature = "mobile")]
     #[error("Uniffi callback error: {0}")]
@@ -80,6 +82,7 @@ pub enum Error {
     Internal(Cow<'static, str>),
 }
 
+#[cfg(feature = "mobile")]
 impl From<WebauthnError> for Error {
     fn from(e: WebauthnError) -> Self {
         Self::WebauthnError(e)

crates/bitwarden/src/error.rs

@@ -1,6 +1,8 @@
+#[cfg(feature = "mobile")]
+use super::ClientFido2;
 use super::{
     generate_fingerprint::{generate_fingerprint, generate_user_fingerprint},
-    ClientFido2, FingerprintRequest, FingerprintResponse,
+    FingerprintRequest, FingerprintResponse,
 };
 use crate::{error::Result, Client};
 
@@ -19,6 +21,7 @@ impl<'a> ClientPlatform<'a> {
 
     /// At the moment this is just a stub implementation that doesn't do anything. It's here to make
     /// it possible to check the usability API on the native clients.
+    #[cfg(feature = "mobile")]
     pub fn fido2(&'a mut self) -> ClientFido2<'a> {
         ClientFido2 {
             client: self.client,