Compare commits
3 Commits
v0.3.0-dev
...
v0.3.0-v0.
Author | SHA1 | Date | |
---|---|---|---|
24aa60cb48 | |||
d8eadb8187 | |||
2b2e96c02d |
@@ -9,7 +9,6 @@ license = "MIT"
|
||||
serde = { version = "1.0.218", features = ["derive"] }
|
||||
serde_json = { version = "1.0.139" }
|
||||
rand = { version = "0.9" }
|
||||
time = { version = "0.3.41", features = ["macros", "serde"] }
|
||||
uuid = { version = "1.16.0", features = ["v4", "serde"] }
|
||||
[dev-dependencies]
|
||||
tempfile = { version = "3.19.1" }
|
||||
|
39
src/user.rs
39
src/user.rs
@@ -21,12 +21,12 @@ pub struct User {
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub lastname: String,
|
||||
pub email_verified: bool,
|
||||
pub date_created: Option<time::OffsetDateTime>,
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub date_created: String,
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub status: String,
|
||||
pub last_login: Option<time::OffsetDateTime>,
|
||||
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||
pub salt_id: uuid::Uuid,
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub last_login: String,
|
||||
}
|
||||
|
||||
impl Default for User {
|
||||
@@ -40,10 +40,9 @@ impl Default for User {
|
||||
firstname: String::new(),
|
||||
lastname: String::new(),
|
||||
email_verified: false,
|
||||
date_created: None,
|
||||
date_created: String::new(),
|
||||
status: String::new(),
|
||||
last_login: None,
|
||||
salt_id: uuid::Uuid::nil(),
|
||||
last_login: String::new(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -57,29 +56,3 @@ impl User {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub mod salt {
|
||||
use std::default::Default;
|
||||
|
||||
use crate::init;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||
pub struct Salt {
|
||||
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||
pub id: uuid::Uuid,
|
||||
#[serde(skip_serializing_if = "String::is_empty")]
|
||||
pub salt: String,
|
||||
}
|
||||
|
||||
impl Salt {
|
||||
pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
|
||||
if output_pretty {
|
||||
serde_json::to_string_pretty(&self)
|
||||
} else {
|
||||
serde_json::to_string(&self)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user