Skip to content

Commit 81239e9

Browse files
committed
fixup! feat(crypto): add user-key id tracking
1 parent a399f93 commit 81239e9

4 files changed

Lines changed: 8 additions & 0 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/bitwarden-core/src/key_management/master_password.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ pub struct MasterPasswordUnlockData {
6363
/// through its own channel.
6464
#[serde(default, skip_serializing_if = "Option::is_none")]
6565
#[cfg_attr(feature = "wasm", tsify(optional))]
66+
#[cfg_attr(feature = "uniffi", uniffi(default = None))]
6667
pub user_key_id: Option<KeyId>,
6768
}
6869

crates/bitwarden-uniffi/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ bitwarden-exporters = { workspace = true, features = ["uniffi"] }
3333
bitwarden-fido = { workspace = true, features = ["uniffi"] }
3434
bitwarden-generators = { workspace = true, features = ["uniffi"] }
3535
bitwarden-importers = { workspace = true, features = ["uniffi"] }
36+
bitwarden-km-sync-handler = { workspace = true, features = ["uniffi"] }
3637
bitwarden-organizations = { workspace = true, features = ["uniffi"] }
3738
bitwarden-pm = { workspace = true, features = ["uniffi"] }
3839
bitwarden-policies = { workspace = true, features = ["uniffi"] }

crates/bitwarden-uniffi/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ impl Client {
8282
self.0.user_crypto_management()
8383
}
8484

85+
/// Key management operations that run on every sync.
86+
pub fn km_sync_handler(&self) -> bitwarden_km_sync_handler::KmSyncHandlerClient {
87+
self.0.km_sync_handler()
88+
}
89+
8590
/// Vault item operations
8691
pub fn vault(&self) -> VaultClient {
8792
VaultClient(self.0.vault())

0 commit comments

Comments
 (0)