auth-uncache

services/auth.py

@@ -1,10 +1,8 @@
 from functools import wraps
 import logging
-import time
 
 from aiohttp import ClientSession
 from starlette.exceptions import HTTPException
-from cachetools import TTLCache
 
 from settings import AUTH_URL, AUTH_SECRET
 
@@ -13,11 +11,10 @@ logging.basicConfig()
 logger = logging.getLogger("\t[services.auth]\t")
 logger.setLevel(logging.DEBUG)
 
-# Define a TTLCache with a time-to-live of 1800 seconds
-token_cache = TTLCache(maxsize=99999, ttl=1800)
 
 async def request_data(gql, headers = { "Content-Type": "application/json" }):
     try:
+        # Asynchronous HTTP request to the authentication server
         async with ClientSession() as session:
             async with session.post(AUTH_URL, json=gql, headers=headers) as response:
                 if response.status == 200:
@@ -28,10 +25,17 @@ async def request_data(gql, headers={"Content-Type": "application/json"}):
                     else:
                         return data
     except Exception as e:
+        # Handling and logging exceptions during authentication check
         logger.error(f"[services.auth] request_data error: {e}")
         return None
 
-async def user_id_from_token(token):
+
+
+async def check_auth(req) -> str | None:
+    token = req.headers.get("Authorization")
+    user_id = ""
+    if token:
+        # Logging the authentication token
         logger.error(f"[services.auth] checking auth token: {token}")
         query_name = "validate_jwt_token"
         operation = "ValidateToken"
@@ -49,35 +53,13 @@ async def user_id_from_token(token):
         }
         data = await request_data(gql)
         if data:
-        expires_in = data.get("data", {}).get(query_name, {}).get("claims", {}).get("expires_in")
             user_id = data.get("data", {}).get(query_name, {}).get("claims", {}).get("sub")
-        if expires_in is not None and user_id is not None:
-            if expires_in < 100:
-                # Token will expire soon, remove it from cache
-                token_cache.pop(token, None)
-            else:
-                expires_at = time.time() + expires_in
-                return user_id, expires_at
-
-async def check_auth(req) -> str | None:
-    token = req.headers.get("Authorization")
-    # Manually manage cache using a dictionary
-    cached_result = token_cache.get(token)
-    if cached_result:
-        user_id, expires_at = cached_result
-        if expires_at > time.time():
-            return user_id
-
-    # If not in cache, fetch from user_id_from_token and update cache
-    result = await user_id_from_token(token)
-    if result:
-        user_id, expires_at = result
-        token_cache[token] = (user_id, expires_at)
-        if expires_at > time.time():
             return user_id
 
+    if not user_id:
         raise HTTPException(status_code=401, detail="Unauthorized")
 
+
 async def add_user_role(user_id):
     logger.info(f"[services.auth] add author role for user_id: {user_id}")
     query_name = "_update_user"