mdb-engine 0.1.6__py3-none-any.whl → 0.4.12__py3-none-any.whl

mdb_engine/auth/token_lifecycle.py

@@ -8,7 +8,7 @@ This module is part of MDB_ENGINE - MongoDB Engine.
 
 import logging
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any
 
 from ..config import ACCESS_TOKEN_TTL as CONFIG_ACCESS_TTL
 from .jwt import extract_token_metadata
@@ -16,7 +16,7 @@ from .jwt import extract_token_metadata
 logger = logging.getLogger(__name__)
 
 
-def get_token_expiry_time(token: str, secret_key: str) -> Optional[datetime]:
+def get_token_expiry_time(token: str, secret_key: str) -> datetime | None:
     """
     Get the expiration time of a token.
 
@@ -31,7 +31,7 @@ def get_token_expiry_time(token: str, secret_key: str) -> Optional[datetime]:
         metadata = extract_token_metadata(token, secret_key)
         if metadata and metadata.get("exp"):
             exp_timestamp = metadata["exp"]
-            if isinstance(exp_timestamp, (int, float)):
+            if isinstance(exp_timestamp, int | float):
                 return datetime.utcfromtimestamp(exp_timestamp)
         return None
     except (ValueError, TypeError, AttributeError, KeyError) as e:
@@ -40,7 +40,7 @@ def get_token_expiry_time(token: str, secret_key: str) -> Optional[datetime]:
 
 
 def is_token_expiring_soon(
-    token: str, secret_key: str, threshold_seconds: Optional[int] = None
+    token: str, secret_key: str, threshold_seconds: int | None = None
 ) -> bool:
     """
     Check if a token is expiring soon.
@@ -68,9 +68,7 @@ def is_token_expiring_soon(
         return False
 
 
-def should_refresh_token(
-    token: str, secret_key: str, refresh_threshold: Optional[int] = None
-) -> bool:
+def should_refresh_token(token: str, secret_key: str, refresh_threshold: int | None = None) -> bool:
     """
     Determine if a token should be refreshed.
 
@@ -97,7 +95,7 @@ def should_refresh_token(
         return False
 
 
-def get_token_age(token: str, secret_key: str) -> Optional[float]:
+def get_token_age(token: str, secret_key: str) -> float | None:
     """
     Get the age of a token in seconds.
 
@@ -112,7 +110,7 @@ def get_token_age(token: str, secret_key: str) -> Optional[float]:
         metadata = extract_token_metadata(token, secret_key)
         if metadata and metadata.get("iat"):
             iat_timestamp = metadata["iat"]
-            if isinstance(iat_timestamp, (int, float)):
+            if isinstance(iat_timestamp, int | float):
                 issued_at = datetime.utcfromtimestamp(iat_timestamp)
                 age = (datetime.utcnow() - issued_at).total_seconds()
                 return age
@@ -122,7 +120,7 @@ def get_token_age(token: str, secret_key: str) -> Optional[float]:
         return None
 
 
-def get_time_until_expiry(token: str, secret_key: str) -> Optional[float]:
+def get_time_until_expiry(token: str, secret_key: str) -> float | None:
     """
     Get time until token expiry in seconds.
 
@@ -146,7 +144,7 @@ def get_time_until_expiry(token: str, secret_key: str) -> Optional[float]:
 
 
 def validate_token_version(
-    token: str, secret_key: str, required_version: Optional[str] = None
+    token: str, secret_key: str, required_version: str | None = None
 ) -> bool:
     """
     Validate token version compatibility.
@@ -177,7 +175,7 @@ def validate_token_version(
         return False
 
 
-def get_token_info(token: str, secret_key: str) -> Optional[Dict[str, Any]]:
+def get_token_info(token: str, secret_key: str) -> dict[str, Any] | None:
     """
     Get comprehensive token information.
 

mdb_engine/auth/token_store.py

@@ -8,11 +8,13 @@ This module is part of MDB_ENGINE - MongoDB Engine.
 
 import logging
 from datetime import datetime, timedelta
-from typing import Optional
 
 try:
-    from pymongo.errors import (ConnectionFailure, OperationFailure,
-                                ServerSelectionTimeoutError)
+    from pymongo.errors import (
+        ConnectionFailure,
+        OperationFailure,
+        ServerSelectionTimeoutError,
+    )
 except ImportError:
     ConnectionFailure = Exception
     OperationFailure = Exception
@@ -54,9 +56,7 @@ class TokenBlacklist:
 
         try:
             # Create unique index on jti
-            await self.collection.create_index(
-                "jti", unique=True, name="jti_unique_idx"
-            )
+            await self.collection.create_index("jti", unique=True, name="jti_unique_idx")
 
             # Create TTL index on expires_at (auto-delete expired entries)
             await self.collection.create_index(
@@ -78,9 +78,9 @@ class TokenBlacklist:
     async def revoke_token(
         self,
         jti: str,
-        user_id: Optional[str] = None,
-        expires_at: Optional[datetime] = None,
-        reason: Optional[str] = None,
+        user_id: str | None = None,
+        expires_at: datetime | None = None,
+        reason: str | None = None,
     ) -> bool:
         """
         Revoke a token by adding it to the blacklist.
@@ -110,9 +110,7 @@ class TokenBlacklist:
             }
 
             # Use upsert to handle duplicate jti gracefully
-            await self.collection.update_one(
-                {"jti": jti}, {"$set": blacklist_entry}, upsert=True
-            )
+            await self.collection.update_one({"jti": jti}, {"$set": blacklist_entry}, upsert=True)
 
             logger.debug(f"Token {jti} added to blacklist (reason: {reason})")
             return True
@@ -158,15 +156,11 @@ class TokenBlacklist:
             ValueError,
             TypeError,
         ) as e:
-            logger.error(
-                f"Error checking token revocation status for {jti}: {e}", exc_info=True
-            )
+            logger.error(f"Error checking token revocation status for {jti}: {e}", exc_info=True)
             # On error, assume not revoked (fail open for availability)
             return False
 
-    async def revoke_all_user_tokens(
-        self, user_id: str, reason: Optional[str] = None
-    ) -> int:
+    async def revoke_all_user_tokens(self, user_id: str, reason: str | None = None) -> int:
         """
         Revoke all tokens for a specific user.
 
@@ -189,8 +183,7 @@ class TokenBlacklist:
                 "user_id": user_id,
                 "revoked_at": datetime.utcnow(),
                 "reason": reason or "logout_all",
-                "expires_at": datetime.utcnow()
-                + timedelta(days=30),  # Keep for 30 days
+                "expires_at": datetime.utcnow() + timedelta(days=30),  # Keep for 30 days
             }
 
             # Use upsert to update or create marker
@@ -213,9 +206,7 @@ class TokenBlacklist:
             ValueError,
             TypeError,
         ) as e:
-            logger.error(
-                f"Error revoking all tokens for user {user_id}: {e}", exc_info=True
-            )
+            logger.error(f"Error revoking all tokens for user {user_id}: {e}", exc_info=True)
             return 0
 
     async def is_user_revoked(self, user_id: str) -> bool:
@@ -231,9 +222,7 @@ class TokenBlacklist:
         try:
             await self.ensure_indexes()
 
-            marker = await self.collection.find_one(
-                {"user_id": user_id, "type": "user_revocation"}
-            )
+            marker = await self.collection.find_one({"user_id": user_id, "type": "user_revocation"})
 
             if marker:
                 # Check if marker hasn't expired
@@ -269,9 +258,7 @@ class TokenBlacklist:
             Number of entries deleted
         """
         try:
-            result = await self.collection.delete_many(
-                {"expires_at": {"$lt": datetime.utcnow()}}
-            )
+            result = await self.collection.delete_many({"expires_at": {"$lt": datetime.utcnow()}})
             deleted_count = result.deleted_count
             if deleted_count > 0:
                 logger.info(f"Cleared {deleted_count} expired blacklist entries")
@@ -283,7 +270,5 @@ class TokenBlacklist:
             ValueError,
             TypeError,
         ) as e:
-            logger.error(
-                f"Error clearing expired blacklist entries: {e}", exc_info=True
-            )
+            logger.error(f"Error clearing expired blacklist entries: {e}", exc_info=True)
             return 0