Expose ClientManagedTokens to mobile (#470)

Expose `ClientManagedTokens` trait to mobile and require it on
constructor.

Author: Hinton

crates/bitwarden-core/src/client/internal.rs

@@ -65,6 +65,7 @@ pub(crate) enum Tokens {
 }
 
 /// Access tokens managed by client applications, such as the web or mobile apps.
+#[cfg_attr(feature = "uniffi", uniffi::export(with_foreign))]
 #[async_trait::async_trait]
 pub trait ClientManagedTokens: std::fmt::Debug + Send + Sync {
     /// Returns the access token, if available.

crates/bitwarden-uniffi/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt

@@ -22,6 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
+import com.bitwarden.core.ClientManagedTokens
 import com.bitwarden.core.DateTime
 import com.bitwarden.vault.Folder
 import com.bitwarden.core.InitOrgCryptoRequest
@@ -82,6 +83,12 @@ const val PIN = "1234"
 // We should separate keys for each user by appending the user_id
 const val BIOMETRIC_KEY = "biometric_key"
 
+class Token: ClientManagedTokens {
+    override suspend fun getAccessToken(): String? {
+        return null
+    }
+}
+
 class MainActivity : FragmentActivity() {
     private lateinit var biometric: Biometric
     private lateinit var client: Client
@@ -98,7 +105,7 @@ class MainActivity : FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         biometric = Biometric(this)
-        client = Client(null)
+        client = Client(Token(), null)
         http = httpClient()
 
         setContent {
@@ -172,7 +179,7 @@ class MainActivity : FragmentActivity() {
                         Button({
                             GlobalScope.launch {
                                 client.destroy()
-                                client = Client(null)
+                                client = Client(Token(), null)
                                 outputText.value = "OK"
                             }
                         }) {

crates/bitwarden-uniffi/src/lib.rs

@@ -2,8 +2,10 @@
 
 uniffi::setup_scaffolding!();
 
+use std::sync::Arc;
+
 use auth::AuthClient;
-use bitwarden_core::ClientSettings;
+use bitwarden_core::{client::internal::ClientManagedTokens, ClientSettings};
 
 #[allow(missing_docs)]
 pub mod auth;
@@ -35,14 +37,20 @@ pub struct Client(pub(crate) bitwarden_pm::PasswordManagerClient);
 impl Client {
     /// Initialize a new instance of the SDK client
     #[uniffi::constructor]
-    pub fn new(settings: Option<ClientSettings>) -> Self {
+    pub fn new(
+        token_provider: Arc<dyn ClientManagedTokens>,
+        settings: Option<ClientSettings>,
+    ) -> Self {
         init_logger();
         setup_error_converter();
 
         #[cfg(target_os = "android")]
         android_support::init();
 
-        Self(bitwarden_pm::PasswordManagerClient::new(settings))
+        Self(bitwarden_pm::PasswordManagerClient::new_with_client_tokens(
+            settings,
+            token_provider,
+        ))
     }
 
     /// Crypto operations

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

@@ -25,6 +25,12 @@ let PASSWORD = "asdfasdfasdf"
 
 let PIN = "1234"
 
+final class Token: ClientManagedTokens {
+    func getAccessToken() async -> String? {
+        return nil
+    }
+}
+
 struct ContentView: View {
     private var http: URLSession
 
@@ -38,7 +44,7 @@ struct ContentView: View {
             configuration: URLSessionConfiguration.default, delegate: IgnoreHttpsDelegate(),
             delegateQueue: nil)
 
-        client = Client(settings: nil)
+        client = Client(tokenProvider: Token(), settings: nil)
     }
 
     @State var setupBiometrics: Bool = true
@@ -104,7 +110,7 @@ struct ContentView: View {
             })
 
             Button(action: {
-                client = Client(settings: nil)
+                client = Client(tokenProvider: Token(), settings: nil)
             }, label: {
                 Text("Lock & reset client")
             }).padding()
@@ -213,7 +219,7 @@ struct ContentView: View {
         }
 
         if setupPin {
-            let pinOptions = try await clientCrypto.derivePinKey(pin: PIN)
+            let pinOptions = try clientCrypto.derivePinKey(pin: PIN)
 
             let defaults = UserDefaults.standard
             defaults.set(loginData.PrivateKey, forKey: "privateKey")
@@ -329,7 +335,7 @@ struct ContentView: View {
         let dateFormatter = ISO8601DateFormatter()
         dateFormatter.formatOptions = [.withFractionalSeconds]
 
-        let decryptedFolders = try await clientVault.folders().decryptList(
+        let decryptedFolders = try clientVault.folders().decryptList(
             folders: syncData.folders.map {
                 Folder(
                     id: $0.id, name: $0.name,