diff --git a/.env b/.env new file mode 100644 index 0000000..29db853 --- /dev/null +++ b/.env @@ -0,0 +1,7 @@ +API_AUTH_URL=http://localhost:8000 +API_CHAT_URL=http://localhost:8002 +LOG_DB_URL= +LOG_DATABASE_NAME=ws-server-logs +LOG_LEVEL=DEBUG +WS_HOST=0.0.0.0 +WS_PORT=8006 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 97a2a19..c307f92 100755 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ *.pem #Environment -.env +#.env .venv env/ venv/ diff --git a/src/mongodb_service.py b/src/mongodb_service.py index 3a8f5e4..37f232c 100644 --- a/src/mongodb_service.py +++ b/src/mongodb_service.py @@ -3,7 +3,6 @@ from pymongo.server_api import ServerApi from pymongo.asynchronous.database import AsyncDatabase from pymongo.database import Database -import uuid class MongoAsyncService: diff --git a/src/user_service.py b/src/user_service.py index 48b953c..b4f1888 100644 --- a/src/user_service.py +++ b/src/user_service.py @@ -11,7 +11,7 @@ def verify_token(token: str): result = False email = None try: - url = os.environ["API_URL"] + "/auth/validate-token" + url = os.environ["API_AUTH_URL"] + "/auth/validate-token" headers = {"Authorization": "Bearer " + token} response = requests.post(url, headers= headers) @@ -27,7 +27,7 @@ def verify_token(token: str): def save_message(message: Message, token: str): result = False try: - url = os.environ["API_URL"] + "/chat/save-message" + url = os.environ["API_CHAT_URL"] + "/chat/save-message" headers = { "Authorization": "Bearer " + token, "Content-Type": "application/json" @@ -46,7 +46,7 @@ def save_message(message: Message, token: str): def get_messages(user: str, token: str) -> list[Message] | None: result = None try: - url = os.environ["API_URL"] + "/chat/get-messages" + url = os.environ["API_CHAT_URL"] + "/chat/get-messages" headers = {"Authorization": "Bearer " + token} response = requests.get(url, headers= headers) @@ -61,7 +61,7 @@ def get_messages(user: str, token: str) -> list[Message] | None: def update_status(token: str, status: bool): result = False try: - url = str(f"{ os.environ["API_URL"] }/chat/change-status/?user_status={ status }") + url = str(f"{ os.environ["API_AUTH_URL"] }/user/change-status/?user_status={ status }") headers = {"Authorization": "Bearer " + token} response = requests.post(url, headers = headers)