some-fixes

services/auth.py

@@ -1,23 +1,17 @@
 from functools import wraps
-
 from httpx import AsyncClient, HTTPError
-
 from settings import AUTH_URL
 
-INTERNAL_AUTH_SERVER = "auth.discours.io" not in AUTH_URL
-
 
 async def check_auth(req):
-    print("%r" % req)
     token = req.headers.get("Authorization")
+    headers = {"Authorization": token, "Content-Type": "application/json"}  # "Bearer " + removed
     print(f"[services.auth] checking auth token: {token}")
 
-    query_name = "getSession" if INTERNAL_AUTH_SERVER else "session"
-    query_type = "mutation" if INTERNAL_AUTH_SERVER else "query"
+    query_name = "getSession" if "v2." in AUTH_URL else "session"
+    query_type = "mutation" if "v2." in AUTH_URL else "query"
     operation = "GetUserId"
 
-    headers = {"Authorization": token, "Content-Type": "application/json"}  # "Bearer " + removed
-
     gql = {
         "query": query_type + " " + operation + " { " + query_name + " { user { id } } " + " }",
         "operationName": operation,
@@ -26,21 +20,15 @@ async def check_auth(req):
 
     async with AsyncClient(timeout=30.0) as client:
         response = await client.post(AUTH_URL, headers=headers, json=gql)
-        print(f"[services.auth] response: {response.status_code} {response.text}")
+        print(f"[services.auth] {AUTH_URL} response: {response.status_code}")
         if response.status_code != 200:
             return False, None
         r = response.json()
-        try:
-            user_id = (
-                r.get("data", {}).get(query_name, {}).get("user", {}).get("id", None)
-                if INTERNAL_AUTH_SERVER
-                else r.get("data", {}).get(query_name, {}).get("user", {}).get("id", None)
-            )
+        if r:
+            user_id = r.get("data", {}).get(query_name, {}).get("user", {}).get("id", None)
             is_authenticated = user_id is not None
             return is_authenticated, user_id
-        except Exception as e:
-            print(f"{e}: {r}")
-            return False, None
+    return False, None
 
 
 def login_required(f):