Move search module inside account module.

saveoursecrets · Nov 27, 2023 · 816dde7 · 816dde7
1 parent 27af483
commit 816dde7
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/commands/secret.rs b/src/commands/secret.rs
@@ -7,10 +7,9 @@ use terminal_banner::{Banner, Padding};
 
 use sos_net::sdk::{
     account::{
-        search::{ArchiveFilter, DocumentView},
+        search::{ArchiveFilter, DocumentView, Document},
         AccountRef,
     },
-    search::Document,
     vault::{
         secret::{Secret, SecretId, SecretMeta, SecretRef, SecretRow},
         Summary, VaultRef,

diff --git a/src/helpers/secret.rs b/src/helpers/secret.rs
@@ -10,7 +10,7 @@ use terminal_banner::{Banner, Padding};
 use secrecy::{ExposeSecret, SecretString};
 use sos_net::sdk::{
     hex,
-    search::Document,
+    account::search::Document,
     secrecy,
     url::Url,
     vault::{

diff --git a/tests/integration/account_manager.rs b/tests/integration/account_manager.rs
@@ -8,10 +8,10 @@ use sos_net::sdk::{
         files::FileStorage,
         Account, DelegatedPassphrase, AccountsList,
         LocalProvider,
+        search::SearchIndex,
     },
     hex,
     passwd::diceware::generate_passphrase,
-    search::SearchIndex,
     vault::{secret::SecretId, Gatekeeper, VaultId},
     vfs,
 };

diff --git a/workspace/migrate/src/import/csv/bitwarden.rs b/workspace/migrate/src/import/csv/bitwarden.rs
@@ -149,7 +149,7 @@ mod test {
 
     use sos_sdk::{
         passwd::diceware::generate_passphrase,
-        search::SearchIndex,
+        account::search::SearchIndex,
         vault::{Gatekeeper, VaultBuilder},
     };
     use std::sync::Arc;

diff --git a/workspace/migrate/src/import/csv/chrome.rs b/workspace/migrate/src/import/csv/chrome.rs
@@ -99,7 +99,7 @@ mod test {
 
     use sos_sdk::{
         passwd::diceware::generate_passphrase,
-        search::SearchIndex,
+        account::search::SearchIndex,
         vault::{Gatekeeper, VaultBuilder},
     };
     use std::sync::Arc;

diff --git a/workspace/migrate/src/import/csv/dashlane.rs b/workspace/migrate/src/import/csv/dashlane.rs
@@ -662,7 +662,7 @@ mod test {
 
     use sos_sdk::{
         passwd::diceware::generate_passphrase,
-        search::SearchIndex,
+        account::search::SearchIndex,
         vault::{secret::Secret, Gatekeeper, VaultBuilder},
     };
     use std::sync::Arc;

diff --git a/workspace/migrate/src/import/csv/firefox.rs b/workspace/migrate/src/import/csv/firefox.rs
@@ -105,7 +105,7 @@ mod test {
 
     use sos_sdk::{
         passwd::diceware::generate_passphrase,
-        search::SearchIndex,
+        account::search::SearchIndex,
         vault::{Gatekeeper, VaultBuilder},
     };
     use std::sync::Arc;

diff --git a/workspace/migrate/src/import/csv/macos.rs b/workspace/migrate/src/import/csv/macos.rs
@@ -107,7 +107,7 @@ mod test {
 
     use sos_sdk::{
         passwd::diceware::generate_passphrase,
-        search::SearchIndex,
+        account::search::SearchIndex,
         vault::{Gatekeeper, VaultBuilder},
     };
     use std::sync::Arc;

diff --git a/workspace/migrate/src/import/csv/mod.rs b/workspace/migrate/src/import/csv/mod.rs
@@ -18,8 +18,8 @@ use url::Url;
 use vcard4::Vcard;
 
 use sos_sdk::{
+    account::search::SearchIndex,
     crypto::AccessKey,
-    search::SearchIndex,
     vault::{
         secret::{IdentityKind, Secret, SecretMeta},
         Gatekeeper, Vault,

diff --git a/workspace/migrate/src/import/csv/one_password.rs b/workspace/migrate/src/import/csv/one_password.rs
@@ -168,7 +168,7 @@ mod test {
 
     use sos_sdk::{
         passwd::diceware::generate_passphrase,
-        search::SearchIndex,
+        account::search::SearchIndex,
         vault::{Gatekeeper, VaultBuilder},
     };
     use std::sync::Arc;

diff --git a/workspace/migrate/src/import/keychain/mod.rs b/workspace/migrate/src/import/keychain/mod.rs
@@ -20,8 +20,8 @@ use std::{
 };
 
 use sos_sdk::{
+    account::search::SearchIndex,
     crypto::AccessKey,
-    search::SearchIndex,
     vault::{
         secret::{Secret, SecretMeta},
         Gatekeeper, Vault,

diff --git a/workspace/net/src/client/account/user_storage.rs b/workspace/net/src/client/account/user_storage.rs
@@ -14,7 +14,7 @@ use sos_sdk::{
         archive::{
             AccountBackup, ExtractFilesLocation, Inventory, RestoreOptions,
         },
-        search::UserIndex,
+        search::{UserIndex, DocumentCount, SearchIndex},
         Account, AccountBuilder, AccountData, AccountHandler, AccountInfo,
         AuthenticatedUser, DelegatedPassphrase, DetachedView,
         AccountsList, LocalProvider, NewAccount, SecretOptions, UserPaths,
@@ -28,7 +28,6 @@ use sos_sdk::{
         Event, EventKind, EventReducer, ReadEvent, WriteEvent,
     },
     mpc::generate_keypair,
-    search::{DocumentCount, SearchIndex},
     signer::ecdsa::Address,
     vault::{
         secret::{Secret, SecretData, SecretId, SecretMeta, SecretType},

diff --git a/workspace/sdk/Cargo.toml b/workspace/sdk/Cargo.toml
@@ -20,7 +20,7 @@ contacts = []
 security-report = []
 
 [dependencies]
-sos-vfs = "0.1"
+sos-vfs = "0.2"
 async-trait = "0.1"
 async-recursion = "1"
 aes-gcm = { version = "0.10.1", features = ["std"] }

diff --git a/workspace/sdk/src/account/account.rs b/workspace/sdk/src/account/account.rs
@@ -19,6 +19,7 @@ use crate::{
         AccountBuilder, AccountInfo, AuthenticatedUser, 
         DelegatedPassphrase, AccountsList, LocalProvider, NewAccount,
         UserPaths,
+        search::{DocumentCount, SearchIndex},
     },
     commit::{CommitHash, CommitProof, CommitState},
     crypto::{AccessKey, SecureAccessKey},
@@ -28,7 +29,6 @@ use crate::{
         Event, EventKind, EventReducer, ReadEvent, WriteEvent,
     },
     mpc::generate_keypair,
-    search::{DocumentCount, SearchIndex},
     signer::ecdsa::Address,
     vault::{
         secret::{Secret, SecretData, SecretId, SecretMeta, SecretType},
@@ -52,7 +52,7 @@ use async_trait::async_trait;
 
 use super::{files::FileProgress, search::UserIndex};
 
-/// Account handler provides is notified of account changes.
+/// Account handler is notified of account changes.
 #[async_trait::async_trait]
 pub trait AccountHandler {
     /// Data associated with this handler.

diff --git a/workspace/sdk/src/account/archive/backup.rs b/workspace/sdk/src/account/archive/backup.rs
@@ -22,13 +22,13 @@ use crate::{
         archive::{ArchiveItem, Inventory, Reader, Writer},
         identity::Identity,
         AccountInfo, DelegatedPassphrase, AccountsList, UserPaths,
+        search::SearchIndex,
     },
     constants::{EVENT_LOG_EXT, VAULT_EXT},
     crypto::AccessKey,
     decode, encode,
     events::{FolderEventLog, WriteEvent},
     passwd::ChangePassword,
-    search::SearchIndex,
     sha2::{Digest, Sha256},
     vault::{
         secret::SecretId, Gatekeeper, Summary, Vault, VaultAccess, VaultId,

diff --git a/workspace/sdk/src/account/identity.rs b/workspace/sdk/src/account/identity.rs
@@ -19,11 +19,11 @@ use urn::Urn;
 use web3_address::ethereum::Address;
 
 use crate::{
+    account::search::SearchIndex,
     commit::{CommitHash, CommitProof, CommitState},
     constants::{LOGIN_AGE_KEY_URN, LOGIN_SIGNING_KEY_URN},
     crypto::KeyDerivation,
     decode,
-    search::SearchIndex,
     signer::{
         ecdsa::{BoxedEcdsaSigner, SingleParty},
         Signer,

diff --git a/workspace/sdk/src/account/login.rs b/workspace/sdk/src/account/login.rs
@@ -9,12 +9,13 @@ use urn::Urn;
 use web3_address::ethereum::Address;
 
 use crate::{
-    account::{AccountInfo, DelegatedPassphrase, AccountsList, UserPaths},
+    account::{AccountInfo, DelegatedPassphrase, AccountsList, UserPaths,
+    search::SearchIndex,
+    },
     constants::{DEVICE_KEY_URN, VAULT_EXT},
     crypto::AccessKey,
     encode,
     events::{AuditEvent, Event, EventKind},
-    search::SearchIndex,
     signer::{
         ed25519::{self, BoxedEd25519Signer, VerifyingKey},
         Signer,

diff --git a/workspace/sdk/src/account/provider.rs b/workspace/sdk/src/account/provider.rs
@@ -3,6 +3,7 @@ use crate::{
     account::{
         archive::RestoreTargets, AccountStatus, NewAccount,
         UserPaths,
+        search::SearchIndex,
     },
     commit::{CommitHash, CommitTree},
     constants::VAULT_EXT,
@@ -13,7 +14,6 @@ use crate::{
         ReadEvent, WriteEvent,
     },
     passwd::{diceware::generate_passphrase, ChangePassword},
-    search::SearchIndex,
     vault::{
         secret::{Secret, SecretData, SecretId, SecretMeta},
         Gatekeeper, Header, Summary, Vault, VaultAccess, VaultBuilder,

diff --git a/workspace/sdk/src/search.rs → workspace/sdk/src/account/search/index.rs b/workspace/sdk/src/search.rs → workspace/sdk/src/account/search/index.rs
diff --git a/workspace/sdk/src/account/search.rs → workspace/sdk/src/account/search/mod.rs b/workspace/sdk/src/account/search.rs → workspace/sdk/src/account/search/mod.rs
@@ -1,17 +1,17 @@
 //! Account search index.
 use std::{collections::HashSet, sync::Arc};
-
+use tokio::sync::RwLock;
 use crate::{
     crypto::AccessKey,
-    search::{Document, DocumentCount, SearchIndex},
     vault::{
         secret::{SecretId, SecretType},
         Gatekeeper, Vault, VaultId,
     },
     vcard4, Result,
 };
 
-use tokio::sync::RwLock;
+mod index;
+pub use index::*;
 
 /// Modify and query a search index.
 pub struct UserIndex {

diff --git a/workspace/sdk/src/lib.rs b/workspace/sdk/src/lib.rs
@@ -24,7 +24,6 @@ pub mod prelude;
 #[cfg(feature = "recovery")]
 pub mod recovery;
 
-pub mod search;
 pub mod signer;
 mod timestamp;
 pub mod vault;

diff --git a/workspace/sdk/src/prelude.rs b/workspace/sdk/src/prelude.rs
@@ -8,7 +8,6 @@ pub use crate::constants::*;
 pub use crate::crypto::*;
 pub use crate::events::*;
 pub use crate::formats::*;
-pub use crate::search::*;
 pub use crate::signer::ecdsa::Address;
 pub use crate::vault::secret::*;
 pub use crate::vault::*;

diff --git a/workspace/sdk/src/vault/gatekeeper.rs b/workspace/sdk/src/vault/gatekeeper.rs
@@ -1,9 +1,9 @@
 //! Gatekeeper manages access to a vault.
 use crate::{
+    account::search::SearchIndex,
     crypto::{AccessKey, KeyDerivation, PrivateKey},
     decode, encode,
     events::{ReadEvent, WriteEvent},
-    search::SearchIndex,
     vault::{
         secret::{Secret, SecretId, SecretMeta},
         SharedAccess, Summary, Vault, VaultAccess, VaultCommit, VaultEntry,