From 7af050429157e709ef9e7a006a6161d05869ff56 Mon Sep 17 00:00:00 2001 From: qaz741wsd856 Date: Sun, 11 Jan 2026 17:29:45 +0000 Subject: [PATCH] refactor: remove unnecessary serialization conditions for KDF parameters in identity and user models --- src/handlers/identity.rs | 4 ++-- src/models/sync.rs | 10 ---------- src/models/user.rs | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/handlers/identity.rs b/src/handlers/identity.rs index 0124a66..c98640b 100644 --- a/src/handlers/identity.rs +++ b/src/handlers/identity.rs @@ -88,9 +88,9 @@ pub struct TokenResponse { kdf: i32, #[serde(rename = "KdfIterations")] kdf_iterations: i32, - #[serde(rename = "KdfMemory", skip_serializing_if = "Option::is_none")] + #[serde(rename = "KdfMemory")] kdf_memory: Option, - #[serde(rename = "KdfParallelism", skip_serializing_if = "Option::is_none")] + #[serde(rename = "KdfParallelism")] kdf_parallelism: Option, #[serde(rename = "ResetMasterPassword")] reset_master_password: bool, diff --git a/src/models/sync.rs b/src/models/sync.rs index b25f691..62cb216 100644 --- a/src/models/sync.rs +++ b/src/models/sync.rs @@ -13,12 +13,6 @@ pub struct Profile { pub avatar_color: Option, pub email: String, pub id: String, - pub kdf: i32, - pub kdf_iterations: i32, - #[serde(skip_serializing_if = "Option::is_none")] - pub kdf_memory: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub kdf_parallelism: Option, #[serde(skip_serializing_if = "Option::is_none")] pub master_password_hint: Option, pub security_stamp: String, @@ -53,10 +47,6 @@ impl Profile { name: user.name, avatar_color: user.avatar_color, email: user.email, - kdf: user.kdf_type, - kdf_iterations: user.kdf_iterations, - kdf_memory: user.kdf_memory, - kdf_parallelism: user.kdf_parallelism, master_password_hint: user.master_password_hint, security_stamp: user.security_stamp, object: "profile".to_string(), diff --git a/src/models/user.rs b/src/models/user.rs index 59f8ef5..4d2da57 100644 --- a/src/models/user.rs +++ b/src/models/user.rs @@ -124,9 +124,7 @@ mod bool_from_int { pub struct PreloginResponse { pub kdf: i32, pub kdf_iterations: i32, - #[serde(skip_serializing_if = "Option::is_none")] pub kdf_memory: Option, - #[serde(skip_serializing_if = "Option::is_none")] pub kdf_parallelism: Option, }