fido: Make user verification availability synchronous

This function is intended to signal whether user verification may potentially
be available for the authenticator, not whether user verification will be
available for a particular request. Since this can be known ahead of time for
our clients, there is no need for this function to be async. Making this async
also aligns us closer with upstream.

Per-request availability checks should be done in the caller's implementation
of check_user().

Author: iinuwa

crates/bitwarden-fido/src/authenticator.rs

@@ -163,7 +163,7 @@ impl<'a> Fido2Authenticator<'a> {
                 options: passkey::types::ctap2::make_credential::Options {
                     rk: request.options.rk,
                     up: true,
-                    uv: self.convert_requested_uv(request.options.uv).await,
+                    uv: self.convert_requested_uv(request.options.uv),
                 },
                 pin_auth: None,
                 pin_protocol: None,
@@ -222,7 +222,7 @@ impl<'a> Fido2Authenticator<'a> {
                 options: passkey::types::ctap2::make_credential::Options {
                     rk: request.options.rk,
                     up: true,
-                    uv: self.convert_requested_uv(request.options.uv).await,
+                    uv: self.convert_requested_uv(request.options.uv),
                 },
                 pin_auth: None,
                 pin_protocol: None,
@@ -305,8 +305,8 @@ impl<'a> Fido2Authenticator<'a> {
         )
     }
 
-    async fn convert_requested_uv(&self, uv: UV) -> bool {
-        let verification_enabled = self.user_interface.is_verification_enabled().await;
+    fn convert_requested_uv(&self, uv: UV) -> bool {
+        let verification_enabled = self.user_interface.is_verification_enabled();
         match (uv, verification_enabled) {
             (UV::Preferred, true) => true,
             (UV::Preferred, false) => false,
@@ -656,17 +656,12 @@ impl passkey::authenticator::UserValidationMethod for UserValidationMethodImpl<'
         })
     }
 
-    async fn is_presence_enabled(&self) -> bool {
+    fn is_presence_enabled(&self) -> bool {
         true
     }
 
-    async fn is_verification_enabled(&self) -> Option<bool> {
-        Some(
-            self.authenticator
-                .user_interface
-                .is_verification_enabled()
-                .await,
-        )
+    fn is_verification_enabled(&self) -> Option<bool> {
+        Some(self.authenticator.user_interface.is_verification_enabled())
     }
 }
 

crates/bitwarden-fido/src/traits.rs

@@ -32,7 +32,7 @@ pub trait Fido2UserInterface: Send + Sync {
         options: CheckUserOptions,
         new_credential: Fido2CredentialNewView,
     ) -> Result<(CipherView, CheckUserResult), Fido2CallbackError>;
-    async fn is_verification_enabled(&self) -> bool;
+    fn is_verification_enabled(&self) -> bool;
 }
 
 #[allow(missing_docs)]

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

@@ -231,7 +231,7 @@ pub trait Fido2UserInterface: Send + Sync {
         options: CheckUserOptions,
         new_credential: Fido2CredentialNewView,
     ) -> Result<CheckUserAndPickCredentialForCreationResult, Fido2CallbackError>;
-    async fn is_verification_enabled(&self) -> bool;
+    fn is_verification_enabled(&self) -> bool;
 }
 
 #[uniffi::export(with_foreign)]
@@ -353,7 +353,7 @@ impl bitwarden_fido::Fido2UserInterface for UniffiTraitBridge<&dyn Fido2UserInte
             .map(|v| (v.cipher.cipher, v.check_user_result.into()))
             .map_err(Into::into)
     }
-    async fn is_verification_enabled(&self) -> bool {
-        self.0.is_verification_enabled().await
+    fn is_verification_enabled(&self) -> bool {
+        self.0.is_verification_enabled()
     }
 }

crates/bitwarden-uniffi/swift/iOS/App/ContentView.swift

@@ -408,7 +408,7 @@ class Fido2UserInterfaceImpl: Fido2UserInterface {
         return CheckUserResult(userPresent: true, userVerified: true)
     }
 
-    func isVerificationEnabled() async  -> Bool {
+    func isVerificationEnabled() -> Bool {
         true
     }
 }