fix: standardize API datetime formats and use UTC-aware objects

app/models/core.py

@@ -2,6 +2,7 @@
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
+from app.utils.helpers import fix_datetime_timezone
 from .validators import StringArrayValidator
 
 
@@ -46,6 +47,13 @@ class CoreResponse(CoreBase):
 
     model_config = ConfigDict(from_attributes=True)
 
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def validator_date(cls, v):
+        if not v:
+            return v
+        return fix_datetime_timezone(v)
+
 
 class CoreResponseList(BaseModel):
     count: int

app/models/stats.py

@@ -3,6 +3,7 @@
 
 from pydantic import BaseModel, field_validator
 
+from app.utils.helpers import fix_datetime_timezone
 from .validators import NumericValidatorMixin
 
 
@@ -18,6 +19,13 @@ class StatList(BaseModel):
     start: dt
     end: dt
 
+    @field_validator("start", "end", mode="before")
+    @classmethod
+    def validator_date(cls, v):
+        if not v:
+            return v
+        return fix_datetime_timezone(v)
+
 
 class UserUsageStat(BaseModel):
     total_traffic: int
@@ -27,6 +35,13 @@ class UserUsageStat(BaseModel):
     def cast_to_int(cls, v):
         return NumericValidatorMixin.cast_to_int(v)
 
+    @field_validator("period_start", mode="before")
+    @classmethod
+    def validator_date(cls, v):
+        if not v:
+            return v
+        return fix_datetime_timezone(v)
+
 
 class UserUsageStatsList(StatList):
     stats: dict[int, list[UserUsageStat]]
@@ -41,6 +56,13 @@ class NodeUsageStat(BaseModel):
     def cast_to_int(cls, v):
         return NumericValidatorMixin.cast_to_int(v)
 
+    @field_validator("period_start", mode="before")
+    @classmethod
+    def validator_date(cls, v):
+        if not v:
+            return v
+        return fix_datetime_timezone(v)
+
 
 class NodeUsageStatsList(StatList):
     stats: dict[int, list[NodeUsageStat]]
@@ -72,6 +94,13 @@ class NodeStats(BaseModel):
     def cast_to_float(cls, v):
         return NumericValidatorMixin.cast_to_float(v)
 
+    @field_validator("period_start", mode="before")
+    @classmethod
+    def validator_date(cls, v):
+        if not v:
+            return v
+        return fix_datetime_timezone(v)
+
 
 class NodeStatsList(StatList):
     stats: list[NodeStats]

app/models/user.py

@@ -109,6 +109,13 @@ class UserNotificationResponse(User):
     def cast_to_int(cls, v):
         return NumericValidatorMixin.cast_to_int(v)
 
+    @field_validator("created_at", "edit_at", "online_at", mode="before")
+    @classmethod
+    def validator_date(cls, v):
+        if not v:
+            return v
+        return fix_datetime_timezone(v)
+
 
 class UserResponse(UserNotificationResponse):
     admin: AdminBase | None = Field(default=None)
@@ -140,6 +147,13 @@ class UserSubscriptionUpdateSchema(BaseModel):
 
     model_config = ConfigDict(from_attributes=True)
 
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def validator_date(cls, v):
+        if not v:
+            return v
+        return fix_datetime_timezone(v)
+
 
 class UserSubscriptionUpdateList(BaseModel):
     updates: list[UserSubscriptionUpdateSchema] = Field(default_factory=list)

app/utils/jwt.py

@@ -19,7 +19,7 @@ async def get_secret_key():
 
 
 async def create_admin_token(username: str, is_sudo=False) -> str:
-    data = {"sub": username, "access": "sudo" if is_sudo else "admin", "iat": datetime.utcnow()}
+    data = {"sub": username, "access": "sudo" if is_sudo else "admin", "iat": datetime.now(timezone.utc)}
     if JWT_ACCESS_TOKEN_EXPIRE_MINUTES > 0:
         expire = datetime.now(timezone.utc) + timedelta(minutes=JWT_ACCESS_TOKEN_EXPIRE_MINUTES)
         data["exp"] = expire