1 files changed, 9 insertions, 8 deletions
diff --git a/src/api/auth/device.rs b/src/api/auth/device.rs
index 44fbd2a..5201073 100644
--- a/src/api/auth/device.rs
+++ b/src/api/auth/device.rs
@@ -1,11 +1,11 @@
 use std::time::Duration;
 use std::{collections::HashMap, sync::Arc};
 
-use chrono::{DateTime, Utc};
 use futures::future::join_all;
 use rocket::{serde::json::Json, State};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
+use time::OffsetDateTime;
 
 use crate::api::auth::{WithSession, WithVerifiedFxaLogin, WithVerifiedSession};
 use crate::api::{Empty, EMPTY};
@@ -13,7 +13,7 @@ use crate::db::DbConn;
 use crate::push::PushClient;
 use crate::utils::DeferAction;
 use crate::{
-    api::{auth, serialize_dt_opt},
+    api::auth,
     auth::Authenticated,
     db::Db,
     types::{
@@ -39,7 +39,8 @@ fn map_error(e: sqlx::Error) -> auth::Error {
 pub(crate) struct Info {
     isCurrentDevice: bool,
     id: DeviceID,
-    lastAccessTime: i64,
+    #[serde(with = "time::serde::timestamp")]
+    lastAccessTime: OffsetDateTime,
     name: String,
     r#type: String,
     pushCallback: Option<String>,
@@ -62,7 +63,7 @@ fn device_to_json(current: Option<&DeviceID>, dev: Device) -> Info {
     Info {
         isCurrentDevice: Some(&dev.device_id) == current,
         id: dev.device_id,
-        lastAccessTime: dev.last_active.timestamp(),
+        lastAccessTime: dev.last_active,
         name: dev.name,
         r#type: dev.type_,
         pushCallback: pcb,
@@ -356,11 +357,11 @@ pub(crate) struct AttachedClient {
     isCurrentSession: bool,
     deviceType: Option<String>,
     name: Option<String>,
-    #[serde(serialize_with = "serialize_dt_opt")]
-    createdTime: Option<DateTime<Utc>>,
+    #[serde(with = "time::serde::timestamp::option")]
+    createdTime: Option<OffsetDateTime>,
     // MISSING createdTimeFormatted
-    #[serde(serialize_with = "serialize_dt_opt")]
-    lastAccessTime: Option<DateTime<Utc>>,
+    #[serde(with = "time::serde::timestamp::option")]
+    lastAccessTime: Option<OffsetDateTime>,
     // MISSING lastAccessTimeFormatted
     // MISSING approximateLastAccessTime
     // MISSING approximateLastAccessTimeFormatted