Move totp

Author: Hinton

crates/bitwarden-vault/src/totp_client.rs

@@ -3,9 +3,7 @@ use chrono::{DateTime, Utc};
 #[cfg(feature = "wasm")]
 use wasm_bindgen::prelude::*;
 
-use crate::{
-    generate_totp, generate_totp_cipher_view, CipherListView, TotpError, TotpResponse, VaultClient,
-};
+use crate::{generate_totp, generate_totp_cipher_view, CipherListView, TotpError, TotpResponse};
 
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
 pub struct TotpClient {
@@ -61,12 +59,3 @@ impl TotpClient {
         generate_totp_cipher_view(&mut key_store.context(), view, time)
     }
 }
-
-#[cfg_attr(feature = "wasm", wasm_bindgen)]
-impl VaultClient {
-    pub fn totp(&self) -> TotpClient {
-        TotpClient {
-            client: self.client.clone(),
-        }
-    }
-}

crates/bitwarden-vault/src/vault_client.rs

@@ -5,7 +5,7 @@ use wasm_bindgen::prelude::*;
 use crate::{
     sync::{sync, SyncError},
     AttachmentsClient, CiphersClient, CollectionsClient, FoldersClient, PasswordHistoryClient,
-    SyncRequest, SyncResponse,
+    SyncRequest, SyncResponse, TotpClient,
 };
 
 #[derive(Clone)]
@@ -60,6 +60,13 @@ impl VaultClient {
             client: self.client.clone(),
         }
     }
+
+    /// TOTP related operations.
+    pub fn totp(&self) -> TotpClient {
+        TotpClient {
+            client: self.client.clone(),
+        }
+    }
 }
 
 pub trait VaultClientExt {