Refactor datetime usage in token generation and logging setup; improve consistency and readability.

Author: Vianney Veremme

config/logging.py

@@ -12,12 +12,12 @@ def setup_logging():
     logger.setLevel(logging.DEBUG)
 
     # Create a file handler that rotates logs daily
-    timestamp = datetime.datetime.now().strftime("%Y-%m-%d")
+    current_time = datetime.datetime.now().strftime("%Y-%m-%d")
 
     # Create a directory for logs if it doesn't exist
     if not os.path.exists(LOGS_DIRECTORY):
         os.makedirs(LOGS_DIRECTORY)
-    log_filename = f"{LOGS_DIRECTORY}/{timestamp}.log"
+    log_filename = f"{LOGS_DIRECTORY}/{current_time}.log"
 
     # Set up timed rotating file handler
     file_handler = TimedRotatingFileHandler(

jwtoken/tokens.py

@@ -30,10 +30,11 @@ def generate_refresh_token(person_id: int) -> str:
     kid = get_active_kid()
     private_key = load_private_key(kid)
 
+    current_time = datetime.now(timezone.utc)
     payload = {
         "person_id": person_id,
-        "exp": datetime.now(timezone.utc) + JWT_REFRESH_TOKEN_EXPIRY,  # Expiration
-        "iat": datetime.now(timezone.utc),  # Issued at
+        "exp": current_time + JWT_REFRESH_TOKEN_EXPIRY,  # Expiration
+        "iat": current_time,  # Issued at
         "token_type": "refresh",
     }
     headers = {"kid": kid}

tests/test_jwtoken/test_invalid_token.py

@@ -34,20 +34,22 @@ def public_key(active_kid):
 
 @pytest.fixture
 def sample_payload(sample_person_id):
+    current_time = datetime.now(timezone.utc)
     return {
         "person_id": sample_person_id,
-        "exp": datetime.now(timezone.utc) + timedelta(minutes=10),
-        "iat": datetime.now(timezone.utc),
+        "exp": current_time + timedelta(minutes=10),
+        "iat": current_time,
         "token_type": "access",
     }
 
 
 def test_hs256_forged_token_rejected(sample_person_id, public_key, active_kid):
     headers = {"kid": active_kid, "alg": "HS256"}
+    current_time = datetime.now(timezone.utc)
     payload = {
         "person_id": sample_person_id,
-        "exp": datetime.now(timezone.utc) + timedelta(minutes=10),
-        "iat": datetime.now(timezone.utc),
+        "exp": current_time + timedelta(minutes=10),
+        "iat": current_time,
         "token_type": "access",
     }
 

tests/test_jwtoken/test_verify_token.py

@@ -38,12 +38,13 @@ def test_verify_token_invalid_type(sample_person_id):
     private_key = load_private_key(kid)
 
     # Create a token with token_type = "invalid"
+    current_time = datetime.now(timezone.utc)
     token = jwt.encode(
         {
             "person_id": sample_person_id,
             "token_type": "invalid",
-            "exp": datetime.now(timezone.utc) + timedelta(minutes=5),
-            "iat": datetime.now(timezone.utc),
+            "exp": current_time + timedelta(minutes=5),
+            "iat": current_time,
         },
         private_key,
         algorithm="RS256",
@@ -60,12 +61,13 @@ def test_verify_expired_token(sample_person_id):
     kid = get_active_kid()
     private_key = load_private_key(kid)
 
+    current_time = datetime.now(timezone.utc)
     expired_token = jwt.encode(
         {
             "person_id": sample_person_id,
             "token_type": "access",
-            "exp": datetime.now(timezone.utc) - timedelta(seconds=1),
-            "iat": datetime.now(timezone.utc) - timedelta(hours=1),
+            "exp": current_time - timedelta(seconds=1),
+            "iat": current_time - timedelta(hours=1),
         },
         private_key,
         algorithm="RS256",

tests/test_routes/test_authentication/test_refresh.py

@@ -1,4 +1,4 @@
-import datetime
+from datetime import datetime, timedelta, timezone
 
 import jwt
 import pytest
@@ -20,12 +20,11 @@ def sample_expired_token(sample_person_id) -> str:
     kid = get_active_kid()
     private_key = load_private_key(kid)
 
+    current_time = datetime.now(timezone.utc)
     payload = {
         "person_id": sample_person_id,
-        "exp": datetime.datetime.now(datetime.timezone.utc)
-        - datetime.timedelta(seconds=1),  # Already expired
-        "iat": datetime.datetime.now(datetime.timezone.utc)
-        - datetime.timedelta(hours=1),
+        "exp": current_time - timedelta(seconds=1),  # Already expired
+        "iat": current_time - timedelta(hours=1),
         "token_type": "refresh",
     }
 

utility/jwtoken/keys_cleanup.py

@@ -13,7 +13,7 @@
 
 
 def cleanup_old_keys():
-    now = datetime.now(timezone.utc)
+    current_time = datetime.now(timezone.utc)
     active_kid = get_active_kid()
 
     for kid_dir in KEYS_DIR.iterdir():
@@ -28,7 +28,7 @@ def cleanup_old_keys():
         with open(created_at_file, "r") as f:
             created_at = datetime.fromisoformat(f.read().strip())
 
-        if (now - created_at) > timedelta(days=EXPIRY_DAYS):
+        if (current_time - created_at) > timedelta(days=EXPIRY_DAYS):
             print(f"Deleting expired key: {kid_dir.name}")
             for item in kid_dir.iterdir():
                 item.unlink()