refactor: remove unnecessary serialization conditions for KDF parameters in identity and user models
This commit is contained in:
parent
843cbda2a3
commit
7af0504291
3 changed files with 2 additions and 14 deletions
|
|
@ -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<i32>,
|
||||
#[serde(rename = "KdfParallelism", skip_serializing_if = "Option::is_none")]
|
||||
#[serde(rename = "KdfParallelism")]
|
||||
kdf_parallelism: Option<i32>,
|
||||
#[serde(rename = "ResetMasterPassword")]
|
||||
reset_master_password: bool,
|
||||
|
|
|
|||
|
|
@ -13,12 +13,6 @@ pub struct Profile {
|
|||
pub avatar_color: Option<String>,
|
||||
pub email: String,
|
||||
pub id: String,
|
||||
pub kdf: i32,
|
||||
pub kdf_iterations: i32,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub kdf_memory: Option<i32>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub kdf_parallelism: Option<i32>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub master_password_hint: Option<String>,
|
||||
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(),
|
||||
|
|
|
|||
|
|
@ -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<i32>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub kdf_parallelism: Option<i32>,
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue