update for api update from 2024/07/25

keys/src/lib.rs

@@ -103,28 +103,31 @@ pub enum ApiKeyPermissions {
 }
 
 mod timestamp_parser {
-    use chrono::NaiveDateTime;
+    use chrono::{DateTime, NaiveDateTime, Utc};
     use serde::{Deserialize, Deserializer, Serializer};
 
     pub fn deserialize<'de, D>(d: D) -> Result<NaiveDateTime, D::Error>
     where
         D: Deserializer<'de>,
     {
         let timestamp = i64::deserialize(d)?;
-        Ok(NaiveDateTime::from_timestamp_opt(timestamp, 0)
-            .expect("invalid or out-of-range datetime"))
+        Ok(DateTime::<Utc>::from_timestamp(timestamp, 0)
+            .expect("invalid or out-of-range datetime")
+            .naive_utc())
     }
 
     pub fn serialize<S>(dt: &NaiveDateTime, s: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
     {
-        s.serialize_i64(dt.timestamp())
+        s.serialize_i64(dt.and_utc().timestamp())
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use chrono::DateTime;
+
     use super::*;
 
     const VALID_MAIN_KEY: &str =
@@ -146,7 +149,9 @@ mod tests {
         };
         assert_eq!(
             subkey.expires,
-            NaiveDateTime::from_timestamp_opt(1702136340, 0).unwrap()
+            DateTime::<Utc>::from_timestamp(1702136340, 0)
+                .unwrap()
+                .naive_utc()
         );
         assert_eq!(subkey.permissions, vec![ApiKeyPermissions::Account]);
         assert_eq!(subkey.urls, Some(vec!["/v2/tokeninfo".to_string()]));
@@ -160,7 +165,7 @@ mod tests {
         };
         assert_eq!(
             subkey.expires,
-            NaiveDateTime::from_timestamp_opt(1701599984, 0).unwrap()
+            DateTime::from_timestamp(1701599984, 0).unwrap().naive_utc()
         );
         assert_eq!(subkey.permissions, vec![ApiKeyPermissions::Account]);
         assert_eq!(subkey.urls, None);

model/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gw2lib-model"
-version = "2.1.5"
+version = "2.2.0"
 authors = ["Greaka <[email protected]>"]
 edition = "2021"
 workspace = "../"

model/src/authenticated/account.rs

@@ -21,6 +21,8 @@ pub enum Access {
     HeartOfThorns,
     PathOfFire,
     EndOfDragons,
+    SecretsOfTheObscure,
+    JanthirWilds,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]