diff options
Diffstat (limited to 'src/types.rs')
| -rw-r--r-- | src/types.rs | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/src/types.rs b/src/types.rs index 7699483..64b35a1 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,4 +1,3 @@ -use chrono::{DateTime, Utc};  use password_hash::{rand_core::OsRng, Output, SaltString};  use rand::RngCore;  use serde::{Deserialize, Serialize}; @@ -14,6 +13,7 @@ use std::{      ops::Deref,      str::FromStr,  }; +use time::OffsetDateTime;  use self::oauth::ScopeSet; @@ -271,7 +271,7 @@ pub(crate) struct UserSession {      pub(crate) uid: UserID,      pub(crate) req_hmac_key: HawkKey,      pub(crate) device_id: Option<DeviceID>, -    pub(crate) created_at: DateTime<Utc>, +    pub(crate) created_at: OffsetDateTime,      pub(crate) verified: bool,      pub(crate) verify_code: Option<String>,  } @@ -282,7 +282,7 @@ pub(crate) struct DeviceCommand {      pub(crate) command: String,      pub(crate) payload: Value,      #[allow(dead_code)] -    pub(crate) expires: DateTime<Utc>, +    pub(crate) expires: OffsetDateTime,      // NOTE this is a device ID, but we don't link it to the actual sender device      // because removing a device would also remove its queued commands. this mirrors      // what fxa does. @@ -332,7 +332,7 @@ impl Deref for DeviceCommands {  pub(crate) struct Device {      pub(crate) device_id: DeviceID,      // taken from session, otherwise UNIX_EPOCH -    pub(crate) last_active: DateTime<Utc>, +    pub(crate) last_active: OffsetDateTime,      pub(crate) name: String,      pub(crate) type_: String,      pub(crate) push: Option<DevicePush>, @@ -367,7 +367,7 @@ pub(crate) struct OauthAccessToken {      pub(crate) scope: ScopeSet,      pub(crate) parent_refresh: Option<OauthTokenID>,      pub(crate) parent_session: Option<SessionID>, -    pub(crate) expires_at: DateTime<Utc>, +    pub(crate) expires_at: OffsetDateTime,  }  #[derive(Debug)] @@ -386,7 +386,7 @@ pub(crate) struct OauthAuthorization {      pub(crate) access_type: OauthAccessType,      pub(crate) code_challenge: String,      pub(crate) keys_jwe: Option<String>, -    pub(crate) auth_at: DateTime<Utc>, +    pub(crate) auth_at: OffsetDateTime,  }  #[derive(Debug)] @@ -418,8 +418,8 @@ pub(crate) struct AttachedClient {      pub(crate) refresh_token_id: Option<OauthTokenID>,      pub(crate) device_type: Option<String>,      pub(crate) name: Option<String>, -    pub(crate) created_time: Option<DateTime<Utc>>, -    pub(crate) last_access_time: Option<DateTime<Utc>>, +    pub(crate) created_time: Option<OffsetDateTime>, +    pub(crate) last_access_time: Option<OffsetDateTime>,      pub(crate) scope: Option<String>,  } | 
