0.2.19-fixes

services/auth.py

@@ -6,6 +6,25 @@ from starlette.exceptions import HTTPException
 from settings import AUTH_URL, AUTH_SECRET
 
 
+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:
+                    data = await response.json()
+                    errors = data.get("errors")
+                    if errors:
+                        print(f"[services.auth] errors: {errors}")
+                    else:
+                        return data
+    except Exception as e:
+        # Handling and logging exceptions during authentication check
+        print(f"[services.auth] request_data error: {e}")
+        return None
+
+
+
 async def check_auth(req) -> str | None:
     token = req.headers.get("Authorization")
     user_id = ""
@@ -14,9 +33,6 @@ async def check_auth(req) -> str | None:
         print(f"[services.auth] checking auth token: {token}")
         query_name = "validate_jwt_token"
         operation = "ValidateToken"
-        headers = {
-            "Content-Type": "application/json",
-        }
         variables = {
             "params": {
                 "token_type": "access_token",
@@ -29,52 +45,30 @@ async def check_auth(req) -> str | None:
             "variables": variables,
             "operationName": operation,
         }
-        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:
-                        data = await response.json()
-                        errors = data.get("errors")
-                        if errors:
-                            print(f"[services.auth] errors: {errors}")
-                        else:
-                            user_id = data.get("data", {}).get(query_name, {}).get("claims", {}).get("sub")
-                            return user_id
-        except Exception as e:
-            # Handling and logging exceptions during authentication check
-            print(f"[services.auth] {e}")
+        data = await request_data(gql)
+        if data:
+            user_id = data.get("data", {}).get(query_name, {}).get("claims", {}).get("sub")
+            return user_id
 
     if not user_id:
         raise HTTPException(status_code=401, detail="Unauthorized")
 
 
-async def add_author_role(author_id):
-    print(f"[services.auth] add author role for author with id {author_id}")
+async def add_user_role(user_id):
+    print(f"[services.auth] add author role for user_id: {user_id}")
     query_name = "_update_user"
     operation = "UpdateUserRoles"
     headers = {"Content-Type": "application/json", "x-authorizer-admin-secret": AUTH_SECRET}
-    variables = {"params": {"roles": "author, reader"}}
+    variables = {"params": {"roles": "author, reader", "id": user_id}}
     gql = {
         "query": f"mutation {operation}($params: UpdateUserInput!) {{ {query_name}(params: $params) {{ id roles }} }}",
         "variables": variables,
         "operationName": operation,
     }
-    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:
-                    data = await response.json()
-                    errors = data.get("errors")
-                    if errors:
-                        print(f"[services.auth] errors: {errors}")
-                    else:
-                        user_id = data.get("data", {}).get(query_name, {}).get("id")
-                        return user_id
-    except Exception as e:
-        print(f"[services.auth] {e}")
-
+    data = await request_data(gql, headers)
+    if data:
+        user_id = data.get("data", {}).get(query_name, {}).get("id")
+        return user_id
 
 def login_required(f):
     @wraps(f)
@@ -84,7 +78,7 @@ def login_required(f):
         req = context.get("request")
         user_id = await check_auth(req)
         if user_id:
-            context["user_id"] = user_id
+            context["user_id"] = user_id.strip()
         return await f(*args, **kwargs)
 
     return decorated_function
@@ -96,7 +90,7 @@ def auth_request(f):
         req = args[0]
         user_id = await check_auth(req)
         if user_id:
-            req["user_id"] = user_id
+            req["user_id"] = user_id.strip()
         return await f(*args, **kwargs)
 
     return decorated_function