Change to parse

bitwarden · Sep 19, 2023 · b053be1 · b053be1
1 parent 34dc51c
commit b053be1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/crates/bitwarden/src/secrets_manager/projects/project_response.rs b/crates/bitwarden/src/secrets_manager/projects/project_response.rs
@@ -8,7 +8,6 @@ use crate::{
     client::encryption_settings::EncryptionSettings,
     crypto::{Decryptable, EncString},
     error::{Error, Result},
-    util::parse_date,
 };
 
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
@@ -39,8 +38,14 @@ impl ProjectResponse {
             organization_id,
             name,
 
-            creation_date: parse_date(&response.creation_date.ok_or(Error::MissingFields)?)?,
-            revision_date: parse_date(&response.revision_date.ok_or(Error::MissingFields)?)?,
+            creation_date: response
+                .creation_date
+                .ok_or(Error::MissingFields)?
+                .parse()?,
+            revision_date: response
+                .revision_date
+                .ok_or(Error::MissingFields)?
+                .parse()?,
         })
     }
 }
diff --git a/crates/bitwarden/src/secrets_manager/secrets/secret_response.rs b/crates/bitwarden/src/secrets_manager/secrets/secret_response.rs
@@ -10,7 +10,6 @@ use crate::{
     client::encryption_settings::EncryptionSettings,
     crypto::{Decryptable, EncString},
     error::{Error, Result},
-    util::parse_date,
 };
 
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
@@ -81,8 +80,14 @@ impl SecretResponse {
             value,
             note,
 
-            creation_date: parse_date(&response.creation_date.ok_or(Error::MissingFields)?)?,
-            revision_date: parse_date(&response.revision_date.ok_or(Error::MissingFields)?)?,
+            creation_date: response
+                .creation_date
+                .ok_or(Error::MissingFields)?
+                .parse()?,
+            revision_date: response
+                .revision_date
+                .ok_or(Error::MissingFields)?
+                .parse()?,
         })
     }
 }

diff --git a/crates/bitwarden/src/util.rs b/crates/bitwarden/src/util.rs
@@ -5,7 +5,6 @@ use base64::{
     engine::{DecodePaddingMode, GeneralPurpose, GeneralPurposeConfig},
     Engine,
 };
-use chrono::{DateTime, Utc};
 
 use crate::error::Result;
 
@@ -51,11 +50,6 @@ pub fn decode_token(token: &str) -> Result<JWTToken> {
     Ok(serde_json::from_slice(&decoded)?)
 }
 
-/// Parse a date in RFC3339 format
-pub(crate) fn parse_date(date: &str) -> Result<DateTime<Utc>> {
-    Ok(DateTime::parse_from_rfc3339(date)?.with_timezone(&Utc))
-}
-
 #[cfg(test)]
 mod tests {
     #[test]