Skip to content

Commit 7e73062

Browse files
authored
Tidy after 0.17 release (#730)
* Remove ensure_db() and fix test spec for db context. * Remove unused dependency from ipc crate. * Remove all direct dependencies on once_cell. Remove obsolete async_once_cell dependency. The once_cell crate is still in the tree as a transient dependency but we don't directly depend on it anymore, instead we use the types now available in std. * Remove obsolete feature flags. * Rename constructor. To be more consistent with AccountId::random(). * Prepare browser extension service crate. * Enable clipboard feature. * Use BackendTarget::infer() in extension service entrypoint. * Enable feature. * Update description. * Update features. * Update features and tokio::main. * Bump patch version. * Update lock file. * Bump patch versions. * Update feature flags, bump patch version. * Hide functions from docs. These functions should be used via the sos_backend crate now. * Remove re-exports from sos-vault. * Bump patch versions. * The event_log module in sos_database is now private. * Remove obsolete constants from sos-protocol. * Prune doc comment. * Configure docs.rs build for reducers crate.
1 parent dcd2121 commit 7e73062

File tree

61 files changed

+228
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+228
-172
lines changed

Cargo.lock

Lines changed: 27 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ members = [
1111
"crates/core",
1212
"crates/database",
1313
"crates/database_upgrader",
14+
"crates/extension_service",
1415
"crates/external_files",
1516
"crates/filesystem",
1617
"crates/keychain_parser",
@@ -139,8 +140,6 @@ ed25519-dalek = { version = "2.1.1", features = ["rand_core"] }
139140
sha1 = "0.10.6"
140141
sha2 = "0.10.6"
141142
sha3 = "0.10.6"
142-
once_cell = "1"
143-
async-once-cell = "0.5"
144143
rand = "0.8"
145144
semver = { version = "1", features = ["serde"] }
146145
url = { version = "2", features = ["serde"] }

crates/account/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sos-account"
3-
version = "0.17.0"
3+
version = "0.17.3"
44
edition = "2021"
55
description = "Local accounts for the Save Our Secrets SDK"
66
homepage = "https://saveoursecrets.com"
@@ -35,7 +35,6 @@ files = [
3535
"sos-backend/files",
3636
"sos-login/files",
3737
"sos-client-storage/files",
38-
"dep:walkdir",
3938
]
4039
search = ["sos-search", "sos-client-storage/search"]
4140

@@ -77,7 +76,6 @@ sha2 = { workspace = true, optional = true }
7776
# async_zip = { workspace = true, optional = true }
7877
xclipboard = { workspace = true, optional = true }
7978
serde_json_path = { workspace = true, optional = true }
80-
walkdir = { workspace = true, optional = true }
8179
tokio = { version = "1", default-features = false, features = ["rt", "sync", "macros", "io-util"] }
8280
# sanitize-filename = { workspace = true, optional = true }
8381
futures-util = { workspace = true, optional = true }

crates/account/src/builder.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,7 @@ impl AccountBuilder {
322322
BackendTarget::FileSystem(_) => {
323323
paths.ensure().await?;
324324
}
325-
BackendTarget::Database(_, _) => {
326-
paths.ensure_db().await?;
327-
}
325+
BackendTarget::Database(_, _) => {}
328326
}
329327

330328
let mut user = Identity::new(self.target.clone());

crates/account/src/error.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@ pub enum Error {
153153
#[error(transparent)]
154154
TimeZone(#[from] time_tz::system::Error),
155155

156-
/// Error generated when walking a directory.
157-
#[cfg(feature = "files")]
158-
#[error(transparent)]
159-
Walk(#[from] walkdir::Error),
160-
161156
/// Error generated when stripping a prefix from a path.
162157
#[cfg(feature = "files")]
163158
#[error(transparent)]
@@ -186,6 +181,9 @@ impl ErrorExt for Error {
186181
matches!(
187182
self,
188183
Error::Authentication(AuthenticationError::NotAuthenticated)
184+
| Error::Storage(sos_client_storage::Error::Authentication(
185+
AuthenticationError::NotAuthenticated
186+
))
189187
)
190188
}
191189

crates/account/src/local_account.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use sos_core::{
2727
ReadEvent, WriteEvent,
2828
},
2929
AccountId, AccountRef, AuthenticationError, FolderRef, Paths, SecretId,
30-
UtcDateTime, VaultCommit, VaultId,
30+
UtcDateTime, VaultCommit, VaultFlags, VaultId,
3131
};
3232
use sos_filesystem::write_exclusive;
3333
use sos_login::{
@@ -39,7 +39,6 @@ use sos_sync::{CreateSet, StorageEventLogs};
3939
use sos_vault::{
4040
secret::{Secret, SecretMeta, SecretPath, SecretRow, SecretType},
4141
BuilderCredentials, Header, SecretAccess, Summary, Vault, VaultBuilder,
42-
VaultFlags,
4342
};
4443
use sos_vfs as vfs;
4544
use std::{
@@ -706,7 +705,7 @@ impl Account for LocalAccount {
706705
.authenticated_user_mut()
707706
.ok_or(AuthenticationError::NotAuthenticated)?;
708707

709-
let signer = DeviceSigner::new_random();
708+
let signer = DeviceSigner::random();
710709
let target = self.target.clone();
711710
let manager = authenticated_user
712711
.identity_mut()?

crates/account/src/traits.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@ use sos_core::{
1313
device::{DevicePublicKey, TrustedDevice},
1414
events::{AccountEvent, DeviceEvent, EventRecord, ReadEvent, WriteEvent},
1515
AccountId, ErrorExt, FolderRef, Paths, SecretId, UtcDateTime,
16-
VaultCommit, VaultId,
16+
VaultCommit, VaultFlags, VaultId,
1717
};
1818
use sos_login::{
1919
device::{DeviceManager, DeviceSigner},
2020
PublicIdentity,
2121
};
2222
use sos_sync::CreateSet;
23-
use sos_vault::secret::SecretType;
2423
use sos_vault::{
25-
secret::{Secret, SecretMeta, SecretPath, SecretRow},
26-
Summary, Vault, VaultFlags,
24+
secret::{Secret, SecretMeta, SecretPath, SecretRow, SecretType},
25+
Summary, Vault,
2726
};
2827
use std::{collections::HashMap, path::Path, sync::Arc};
2928

crates/backend/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sos-backend"
3-
version = "0.17.0"
3+
version = "0.17.1"
44
edition = "2021"
55
description = "Backend storage abstraction for the Save Our Secrets SDK"
66
homepage = "https://saveoursecrets.com"

crates/backend/src/folder.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use sos_core::{
55
crypto::AccessKey,
66
encode,
77
events::{EventLog, EventRecord, ReadEvent, WriteEvent},
8-
AccountId, VaultFlags,
8+
AccountId, VaultFlags, VaultId,
99
};
10-
use sos_core::{constants::EVENT_LOG_EXT, decode};
10+
use sos_core::{constants::EVENT_LOG_EXT, decode, VaultCommit};
1111
use sos_database::{
1212
entity::{FolderEntity, FolderRecord, SecretRecord},
1313
VaultDatabaseWriter,
@@ -17,7 +17,7 @@ use sos_reducers::FolderReducer;
1717
use sos_vault::{
1818
secret::{Secret, SecretId, SecretMeta, SecretRow},
1919
AccessPoint as VaultAccessPoint, EncryptedEntry, SecretAccess, Vault,
20-
VaultCommit, VaultId, VaultMeta,
20+
VaultMeta,
2121
};
2222
use sos_vfs as vfs;
2323
use std::{path::Path, sync::Arc};

crates/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sos-core"
3-
version = "0.17.0"
3+
version = "0.17.1"
44
edition = "2021"
55
description = "Core types for the Save Our Secrets SDK"
66
homepage = "https://saveoursecrets.com"

0 commit comments

Comments
 (0)