Move org id to core

Author: Hinton

Cargo.lock

@@ -17,14 +17,14 @@ keywords.workspace = true
 [features]
 internal = ["dep:zxcvbn"]
 no-memory-hardening = [
-    "bitwarden-crypto/no-memory-hardening"
+    "bitwarden-crypto/no-memory-hardening",
 ] # Disable memory hardening features
 secrets = [] # Secrets manager API
 uniffi = ["bitwarden-crypto/uniffi", "dep:uniffi"] # Uniffi bindings
 wasm = [
     "bitwarden-error/wasm",
     "dep:wasm-bindgen",
-    "dep:tsify-next"
+    "dep:tsify-next",
 ] # WASM support
 
 [dependencies]
@@ -33,6 +33,7 @@ bitwarden-api-api = { workspace = true }
 bitwarden-api-identity = { workspace = true }
 bitwarden-crypto = { workspace = true }
 bitwarden-error = { workspace = true }
+bitwarden-uuid = { workspace = true }
 chrono = { workspace = true, features = ["std"] }
 # We don't use this directly (it's used by rand), but we need it here to enable WASM support
 getrandom = { version = ">=0.2.9, <0.3", features = ["js"] }

crates/bitwarden-core/Cargo.toml

@@ -0,0 +1,3 @@
+use bitwarden_uuid::uuid;
+
+uuid!(pub OrganizationId);

crates/bitwarden-core/src/ids.rs

@@ -25,3 +25,6 @@ mod util;
 
 pub use bitwarden_crypto::ZeroizingAllocator;
 pub use client::{Client, ClientSettings, DeviceType};
+
+mod ids;
+pub use ids::*;

crates/bitwarden-core/src/lib.rs

@@ -1,4 +1,5 @@
-use bitwarden_vault::{Cipher, CipherListView, CipherView, Fido2CredentialView, OrganizationId};
+use bitwarden_core::OrganizationId;
+use bitwarden_vault::{Cipher, CipherListView, CipherView, Fido2CredentialView};
 use uuid::Uuid;
 
 use crate::{error::Error, Result};

crates/bitwarden-uniffi/src/vault/ciphers.rs

@@ -28,7 +28,6 @@ bitwarden-api-api = { workspace = true }
 bitwarden-core = { workspace = true, features = ["internal"] }
 bitwarden-crypto = { workspace = true }
 bitwarden-error = { workspace = true }
-bitwarden-uuid = { workspace = true }
 chrono = { workspace = true }
 data-encoding = ">=2.0, <3"
 hmac = ">=0.12.1, <0.13"

crates/bitwarden-vault/Cargo.toml

@@ -1,15 +1,13 @@
-use bitwarden_core::Client;
+use bitwarden_core::{Client, OrganizationId};
 use bitwarden_crypto::IdentifyKey;
-use bitwarden_uuid::uuid;
+
 #[cfg(feature = "wasm")]
 use wasm_bindgen::prelude::*;
 
 use crate::{
     Cipher, CipherError, CipherListView, CipherView, DecryptError, EncryptError, VaultClient,
 };
 
-uuid!(pub OrganizationId);
-
 #[cfg_attr(feature = "wasm", wasm_bindgen)]
 pub struct CiphersClient {
     pub(crate) client: Client,

crates/bitwarden-vault/src/cipher/cipher_client.rs

@@ -22,7 +22,7 @@ pub use cipher::{
     Cipher, CipherError, CipherListView, CipherListViewType, CipherRepromptType, CipherType,
     CipherView,
 };
-pub use cipher_client::{CiphersClient, OrganizationId};
+pub use cipher_client::CiphersClient;
 pub use field::FieldView;
 pub use identity::IdentityView;
 pub use login::{