refactor(server-ng): move password crypto into server_common

core/server-ng/src/auth.rs

@@ -31,7 +31,7 @@ use iggy_binary_protocol::RequestHeader;
 use iggy_common::{IggyTimestamp, PersonalAccessToken, UserStatus};
 use message_bus::MessageBus;
 use metadata::impls::metadata::StreamsFrontend;
-use server::streaming::utils::crypto;
+use server_common::crypto;
 use std::cell::RefCell;
 use std::rc::Rc;
 use tracing::warn;

core/server-ng/src/users.rs

@@ -31,8 +31,7 @@ use iggy_binary_protocol::codec::{WireDecode, WireEncode};
 use iggy_binary_protocol::requests::users::{ChangePasswordRequest, CreateUserRequest};
 use iggy_binary_protocol::{Operation, RequestHeader};
 use iggy_common::IggyError;
-use server::streaming::utils::crypto;
-use server_common::Message;
+use server_common::{Message, crypto};
 
 /// Replace a raw wire password with its Argon2 hash before replication.
 ///

core/server/Cargo.toml

@@ -42,7 +42,6 @@ systemd = ["dep:sd-notify"]
 [dependencies]
 ahash = { workspace = true }
 anyhow = { workspace = true }
-argon2 = { workspace = true }
 async-channel = { workspace = true }
 async_zip = { workspace = true }
 axum = { workspace = true }
@@ -79,7 +78,6 @@ opentelemetry-semantic-conventions = { workspace = true }
 opentelemetry_sdk = { workspace = true }
 papaya = { workspace = true }
 prometheus-client = { workspace = true }
-rand = { workspace = true }
 ringbuffer = { workspace = true }
 rmp-serde = { workspace = true }
 rolling-file = { workspace = true }

core/server/src/streaming/utils/mod.rs

@@ -16,7 +16,7 @@
 // under the License.
 
 pub mod address;
-pub mod crypto;
 pub mod file;
 pub mod ptr;
 pub use iggy_common::random_id;
+pub use server_common::crypto;

core/server_common/Cargo.toml

@@ -25,6 +25,7 @@ publish = false
 
 [dependencies]
 aligned-vec = { workspace = true }
+argon2 = { workspace = true }
 bytemuck = { workspace = true }
 bytes = { workspace = true }
 compio = { workspace = true }
@@ -36,6 +37,7 @@ iggy_binary_protocol = { workspace = true }
 iggy_common = { workspace = true }
 lending-iterator = { workspace = true }
 moka = { workspace = true }
+rand = { workspace = true }
 rcgen = { workspace = true }
 rustls = { workspace = true }
 smallvec = { workspace = true }

core/server_common/src/lib.rs

@@ -19,6 +19,7 @@ pub mod bootstrap;
 mod buffer;
 mod certificates;
 mod consensus_message;
+pub mod crypto;
 mod deduplication;
 pub mod diagnostics;
 pub mod executor;