internal 0.1.64__tar.gz → 0.1.66__tar.gz

{internal-0.1.64 → internal-0.1.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 0.1.64
+Version: 0.1.66
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-0.1.64 → internal-0.1.66}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "0.1.64"
+version = "0.1.66"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"

{internal-0.1.64 → internal-0.1.66}/src/internal/http/requests.py

@@ -5,16 +5,16 @@ from fastapi import FastAPI
 from ..exception.internal_exception import GatewayTimeoutException, BadGatewayException
 
 
-async def async_request(app: FastAPI, method, url, token=None, **kwargs):
+async def async_request(app: FastAPI, method, url, current_user: dict = None, **kwargs):
     timeout = httpx.Timeout(connect=app.state.config.REQUEST_CONN_TIMEOUT, read=app.state.config.REQUEST_READ_TIMEOUT,
                             write=app.state.config.REQUEST_WRITE_TIMEOUT, pool=app.state.config.REQUEST_POOL_TIMEOUT)
 
-    if token:
+    if current_user and "access_token" in current_user:
         if "headers" in kwargs.keys():
-            kwargs.get("headers")["Authorization"] = f"Bearer {token}"
+            kwargs.get("headers")["Authorization"] = f"Bearer {current_user.get('access_token')}"
         else:
             kwargs["headers"] = {
-                "Authorization": f"Bearer {token}"
+                "Authorization": f"Bearer {current_user.get('access_token')}"
             }
 
     try:

{internal-0.1.64 → internal-0.1.66}/src/internal/http/responses.py

@@ -6,7 +6,8 @@ from fastapi.responses import JSONResponse
 from beanie import Document, Link
 
 
-async def async_generate_content(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None):
+async def async_response(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None,
+                         status_code=status.HTTP_200_OK):
     def _serialize(data):
         if isinstance(data, Document):
             link_field_list = []
@@ -45,14 +46,4 @@ async def async_generate_content(data=None, message=None, code=None, page_no=Non
     else:
         ret['data'] = data
 
-    return ret
-
-
-async def async_response(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None,
-                         status_code=status.HTTP_200_OK):
-    content = await async_generate_content(data=data, message=message, code=code, page_no=page_no, total_num=total_num,
-                                           page_size=page_size)
-    if isinstance(content, JSONResponse):
-        return content
-
-    return JSONResponse(status_code=status_code, content=content)
+    return JSONResponse(status_code=status_code, content=ret)