Shield: Change to date time with fixed offset

Author: DanielleHuisman

.gitignore

@@ -163,4 +163,4 @@ target/
 book/book/
 
 # SeaORM
-packages/storage/shield-seaorm/src/entities_template/
+packages/storage/shield-sea-orm/src/entities_template/

packages/core/shield/src/user.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
 use async_trait::async_trait;
-use chrono::{DateTime, Utc};
+use chrono::{DateTime, FixedOffset};
 use serde::{Deserialize, Serialize};
 
 use crate::error::StorageError;
@@ -33,8 +33,8 @@ pub struct EmailAddress {
     pub is_primary: bool,
     pub is_verified: bool,
     pub verification_token: Option<String>,
-    pub verification_token_expired_at: Option<DateTime<Utc>>,
-    pub verified_at: Option<DateTime<Utc>>,
+    pub verification_token_expired_at: Option<DateTime<FixedOffset>>,
+    pub verified_at: Option<DateTime<FixedOffset>>,
     pub user_id: String,
 }
 
@@ -44,8 +44,8 @@ pub struct CreateEmailAddress {
     pub is_primary: bool,
     pub is_verified: bool,
     pub verification_token: Option<String>,
-    pub verification_token_expired_at: Option<DateTime<Utc>>,
-    pub verified_at: Option<DateTime<Utc>>,
+    pub verification_token_expired_at: Option<DateTime<FixedOffset>>,
+    pub verified_at: Option<DateTime<FixedOffset>>,
 }
 
 #[derive(Clone, Debug)]
@@ -54,8 +54,8 @@ pub struct UpdateEmailAddress {
     pub is_primary: Option<bool>,
     pub is_verified: Option<bool>,
     pub verification_token: Option<Option<String>>,
-    pub verification_token_expired_at: Option<Option<DateTime<Utc>>>,
-    pub verified_at: Option<Option<DateTime<Utc>>>,
+    pub verification_token_expired_at: Option<Option<DateTime<FixedOffset>>>,
+    pub verified_at: Option<Option<DateTime<FixedOffset>>>,
 }
 
 #[cfg(test)]

packages/providers/shield-oidc/src/connection.rs

@@ -1,4 +1,4 @@
-use chrono::{DateTime, Utc};
+use chrono::{DateTime, FixedOffset};
 
 #[derive(Clone, Debug)]
 pub struct OidcConnection {
@@ -8,7 +8,7 @@ pub struct OidcConnection {
     pub access_token: String,
     pub refresh_token: Option<String>,
     pub id_token: Option<String>,
-    pub expired_at: Option<DateTime<Utc>>,
+    pub expired_at: Option<DateTime<FixedOffset>>,
     pub scopes: Option<Vec<String>>,
     pub subprovider_id: String,
     pub user_id: String,
@@ -21,7 +21,7 @@ pub struct CreateOidcConnection {
     pub access_token: String,
     pub refresh_token: Option<String>,
     pub id_token: Option<String>,
-    pub expired_at: Option<DateTime<Utc>>,
+    pub expired_at: Option<DateTime<FixedOffset>>,
     pub scopes: Option<Vec<String>>,
     pub subprovider_id: String,
     pub user_id: String,
@@ -34,6 +34,6 @@ pub struct UpdateOidcConnection {
     pub access_token: Option<String>,
     pub refresh_token: Option<Option<String>>,
     pub id_token: Option<Option<String>>,
-    pub expired_at: Option<Option<DateTime<Utc>>>,
+    pub expired_at: Option<Option<DateTime<FixedOffset>>>,
     pub scopes: Option<Option<Vec<String>>>,
 }

packages/providers/shield-oidc/src/provider.rs

@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use chrono::{DateTime, Duration, Utc};
+use chrono::{DateTime, Duration, FixedOffset, Utc};
 use openidconnect::{
     core::{CoreAuthenticationFlow, CoreGenderClaim, CoreTokenResponse},
     reqwest::async_http_client,
@@ -463,7 +463,7 @@ type ParsedTokenResponse = (
     String,
     Option<String>,
     Option<String>,
-    Option<DateTime<Utc>>,
+    Option<DateTime<FixedOffset>>,
     Option<Vec<String>>,
 );
 
@@ -481,9 +481,10 @@ fn parse_token_response(
             .map(|id_token| id_token.to_string()),
         match token_response.expires_in() {
             Some(expires_in) => Some(
-                Utc::now()
+                (Utc::now()
                     + Duration::from_std(expires_in)
-                        .map_err(|err| ShieldError::Validation(err.to_string()))?,
+                        .map_err(|err| ShieldError::Validation(err.to_string()))?)
+                .into(),
             ),
             None => None,
         },

packages/storage/shield-sea-orm/src/entities/email_address.rs

@@ -8,15 +8,15 @@ use serde::{Deserialize, Serialize};
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
     #[sea_orm(unique)]
     pub email: String,
     pub is_primary: bool,
     pub is_verified: bool,
     pub verification_token: Option<String>,
-    pub verification_token_expired_at: Option<DateTimeUtc>,
-    pub verified_at: Option<DateTimeUtc>,
+    pub verification_token_expired_at: Option<DateTimeWithTimeZone>,
+    pub verified_at: Option<DateTimeWithTimeZone>,
     #[cfg(feature = "entity")]
     pub entity_id: Uuid,
     #[cfg(not(feature = "entity"))]

packages/storage/shield-sea-orm/src/entities/email_auth_token.rs

@@ -8,11 +8,11 @@ use serde::{Deserialize, Serialize};
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
     pub email: String,
     pub token: String,
-    pub expired_at: DateTimeUtc,
+    pub expired_at: DateTimeWithTimeZone,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

packages/storage/shield-sea-orm/src/entities/entity.rs

@@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize};
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
     #[sea_orm(column_type = "Text")]
     pub name: String,
 }

packages/storage/shield-sea-orm/src/entities/oauth_provider.rs

@@ -47,8 +47,8 @@ pub enum OauthProviderVisibility {
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
     pub name: String,
     pub slug: Option<String>,
     pub r#type: OauthProviderType,

packages/storage/shield-sea-orm/src/entities/oauth_provider_connection.rs

@@ -8,16 +8,16 @@ use serde::{Deserialize, Serialize};
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
     pub identifier: String,
     #[sea_orm(column_type = "Text")]
     pub token_type: String,
     #[sea_orm(column_type = "Text")]
     pub access_token: String,
     #[sea_orm(column_type = "Text", nullable)]
     pub refresh_token: Option<String>,
-    pub expired_at: Option<DateTimeUtc>,
+    pub expired_at: Option<DateTimeWithTimeZone>,
     #[sea_orm(column_type = "Text", nullable)]
     pub scopes: Option<String>,
     pub provider_id: Uuid,

packages/storage/shield-sea-orm/src/entities/oidc_provider.rs

@@ -43,8 +43,8 @@ pub enum OidcProviderVisibility {
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
     pub id: Uuid,
-    pub created_at: DateTimeUtc,
-    pub updated_at: DateTimeUtc,
+    pub created_at: DateTimeWithTimeZone,
+    pub updated_at: DateTimeWithTimeZone,
     pub name: String,
     pub slug: Option<String>,
     pub r#type: OidcProviderType,