internal 0.1.58__py3-none-any.whl → 0.1.60__py3-none-any.whl

internal/base_config.py

@@ -37,12 +37,5 @@ class BaseConfig(BaseSettings):
     THIRD_PARTY_BASE_URL: str = ""
     SCHEDULER_BASE_URL: str = ""
 
-    # JWT
-    JWT_ALGORITHM: str = 'HS512'
-    JWT_SECRET_KEY: str = ""
-    JWT_ACCESS_TOKEN_EXPIRES_SECONDS: int = 86400
-    JWT_REFRESH_TOKEN_EXPIRES_SECONDS: int = 604800  # 7days
-    JWT_ERROR_MESSAGE_KEY: str = "message"
-
     class Config:
         case_sensitive = False

internal/http/requests.py

@@ -5,10 +5,18 @@ from fastapi import FastAPI
 from ..exception.internal_exception import GatewayTimeoutException, BadGatewayException
 
 
-async def async_request(app: FastAPI, method, url, **kwargs):
+async def async_request(app: FastAPI, method, url, token, **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 "headers" in kwargs.keys():
+            kwargs.get("headers")["Authorization"] = f"Bearer {token}"
+        else:
+            kwargs["headers"] = {
+                "Authorization": f"Bearer {token}"
+            }
+
     try:
         async with httpx.AsyncClient(timeout=timeout) as client:
             response = await client.request(method, url, **kwargs)

internal/http/responses.py

@@ -24,7 +24,7 @@ async def async_response(data=None, message=None, code=None, page_no=None, total
         return data
 
     if isinstance(data, httpx.Response):
-        return data
+        return JSONResponse(status_code=status_code, content=data.json())
 
     ret = {}
     if isinstance(data, list):

{internal-0.1.58.dist-info → internal-0.1.60.dist-info}/METADATA

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

{internal-0.1.58.dist-info → internal-0.1.60.dist-info}/RECORD

@@ -1,5 +1,5 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/base_config.py,sha256=GFuigDWbvG257qOc2cfdz3KgHUIKiXOU0E7pnD5zOQA,1247
+internal/base_config.py,sha256=M2HMhJAerOHppSqy1O2J0tGrC5cTGmouf3Cyu0YfIXo,1020
 internal/base_factory.py,sha256=vgJogtay7GHUqPdGFm9iGRUEvRCncl4KskweviZTk58,6434
 internal/const.py,sha256=U1S9r7bjtHgad2oYQoHO19s8D4V0WDUG-L-haV4UaIw,1025
 internal/database.py,sha256=MyRLlb0W8FB8Odq0UQpN3R7OD3yUPWgJXsZRuDWQC_w,1010
@@ -11,18 +11,14 @@ internal/ext/amazon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 internal/ext/amazon/aws/__init__.py,sha256=2YFjb-rHG1JaZGZiZffYDesgTAJjDshOqQbswOYzhP8,834
 internal/ext/amazon/aws/const.py,sha256=l4WMg5bKWujwOKABBkCO2zclNg3abnYOfbhD7DG8GsA,109
 internal/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/http/requests.py,sha256=Np0uIzHJjJ4S0yeet3dgTJEkQaDo9BkW3gLdqsahCeA,1040
-internal/http/responses.py,sha256=qo5cxLaJ2RdmscqweINC-RXEJ2NzKwjyM6LjXfQjjjM,1507
+internal/http/requests.py,sha256=b4VwkVh4jBzZAl6rKLtHRjNXI_F-QLBpjzMPHEPB39Q,1285
+internal/http/responses.py,sha256=JW6CA11MDhM_RwIvZzr0mThUdga3EyYsuG9dfTAxZxw,1561
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=R5MmO5oa5-ORPV_adkegLVCwsVio2zFOuQFGiby3khs,340
-internal/jwt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/jwt/const.py,sha256=s8MMB4RJycBBvC4ahd7vcDT-1aTKO3GeaSTUK_DWpwM,65
-internal/jwt/interface.py,sha256=dtynYvsE4OojmdgUYH3LEz2FCeYa0ZmlrejwbZT8UxQ,1129
-internal/jwt/service.py,sha256=iLB5W_wN5I5vYXfyq5GQttcQmngSF-jT4OSkotIsFzI,2531
 internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/model/base_model.py,sha256=gNbixWuGiK8Tbe78wHuLneZ8p3fwMwQRKurBDrGoh6s,1874
 internal/model/operate.py,sha256=3mOs7eQ2CPnCB6i6UQBOp8VdTPmVnayaUFqUEDOKoTY,1493
 internal/utils.py,sha256=0SubS0iUhDvjSX1F4TykasA5-enYJzt2VH-f7_0BnjI,1509
-internal-0.1.58.dist-info/METADATA,sha256=cXGiOMza3RablSkZ1YbE8nS5AQtUAdZfqeG31cJWZX8,625
-internal-0.1.58.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-internal-0.1.58.dist-info/RECORD,,
+internal-0.1.60.dist-info/METADATA,sha256=lbtD1Q28xOIkxRhfftkwkPaqWUJUpfH9VT_tXY8H0MM,625
+internal-0.1.60.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+internal-0.1.60.dist-info/RECORD,,

internal/jwt/const.py

@@ -1,2 +0,0 @@
-JWT_AES_KEY = "aEJkxXqO1HOlq2dJ"
-JWT_AES_IV = "c0K38tnJIQu5C7DC"

internal/jwt/interface.py

@@ -1,58 +0,0 @@
-from dataclasses import dataclass
-
-from ..interface.base_interface import InternalBaseInterface
-
-
-@dataclass
-class JWTUserInterface(InternalBaseInterface):
-    id: str
-    name: str
-    phone: str
-    mobile: str
-    email: str
-    title: str
-    organization_parent: str
-    organization_id: str
-    ext_user_id: str
-    ext_dealer_code: str
-    ext_dept_code: str
-    ext_dept_name: str
-    line_id: str
-    line_url: str
-    role: str
-    avatar: str = None
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-
-@dataclass
-class JWTCustomerInterface(InternalBaseInterface):
-    id: str
-    ccid: str
-    name: str
-    phone: str
-    mobile: str
-    email: str
-    title: str
-    organization_parent: str
-    organization_id: str
-    ext_user_id: str
-    ext_dealer_code: str
-    ext_dept_code: str
-    ext_dept_name: str
-    line_id: str
-    line_url: str
-    role: str
-    avatar: str = None
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-
-@dataclass
-class JWTTokenInterface(InternalBaseInterface):
-    data: str
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)

internal/jwt/service.py

@@ -1,57 +0,0 @@
-# import base64
-# import json
-# from typing import Union
-#
-# from cryptography.hazmat.backends import default_backend
-# from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-# from fastapi import HTTPException
-# from fastapi.security import OAuth2PasswordBearer
-# from jose import JWTError, jwt
-#
-# from jwt.const import JWT_AES_KEY, JWT_AES_IV
-# from jwt.interface import JWTUserInterface, JWTTokenInterface
-#
-# oauth2_scheme_user = OAuth2PasswordBearer(tokenUrl=f"auth/user/cruisys_token")
-#
-#
-# class JWTService:
-#     @staticmethod
-#     async def create_jwt_token(data: dict, app_config) -> str:
-#         jwt_user_interface = JWTUserInterface(**data)
-#         cipher_str = await JWTService.encrypt_aes_plain(jwt_user_interface)
-#         jwt_token_interface = JWTTokenInterface(data=cipher_str)
-#         token = jwt.encode(jwt_token_interface.to_dict(), app_config.JWT_SECRET_KEY,
-#                            algorithm=app_config.JWT_ALGORITHM)
-#         return token
-#
-#     @staticmethod
-#     async def decode_jwt_token(token: str, app_config) -> Union[dict, JWTUserInterface, HTTPException]:
-#         try:
-#             payload = jwt.decode(token, app_config.JWT_SECRET_KEY, algorithms=[app_config.JWT_ALGORITHM])
-#             plain_obj = await JWTService.decrypt_aes_cipher(JWTTokenInterface(**payload))
-#             jwt_user_interface = JWTUserInterface(**plain_obj)
-#             return jwt_user_interface
-#         except JWTError:
-#             raise HTTPException(status_code=401, detail="Invalid token")
-#
-#     @staticmethod
-#     async def encrypt_aes_plain(interface: JWTUserInterface):
-#         plaintext = json.dumps(interface.to_dict()).encode('utf-8')
-#
-#         cipher = Cipher(algorithms.AES(JWT_AES_KEY.encode('utf-8')), modes.CFB(JWT_AES_IV.encode('utf-8')),
-#                         backend=default_backend())
-#         encryptor = cipher.encryptor()
-#         ciphertext = encryptor.update(plaintext) + encryptor.finalize()
-#
-#         return base64.b64encode(ciphertext).decode('utf-8')
-#
-#     @staticmethod
-#     async def decrypt_aes_cipher(interface: JWTTokenInterface):
-#         ciphertext = base64.b64decode(interface.data)
-#
-#         cipher = Cipher(algorithms.AES(JWT_AES_KEY.encode('utf-8')), modes.CFB(JWT_AES_IV.encode('utf-8')),
-#                         backend=default_backend())
-#         decryptor = cipher.decryptor()
-#         plaintext = decryptor.update(ciphertext) + decryptor.finalize()
-#
-#         return json.loads(plaintext.decode('utf-8'))