internal 0.1.59__tar.gz → 0.1.60__tar.gz

{internal-0.1.59 → internal-0.1.60}/PKG-INFO

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

{internal-0.1.59 → internal-0.1.60}/pyproject.toml

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

{internal-0.1.59 → internal-0.1.60}/src/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-0.1.59 → internal-0.1.60}/src/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-0.1.59/src/internal/jwt/const.py

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

internal-0.1.59/src/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-0.1.59/src/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'))