From b6ea1e3d72211bc166dfc229ac7f9d4fe8362846 Mon Sep 17 00:00:00 2001 From: urec56 Date: Wed, 5 Jun 2024 17:40:37 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=D0=B5=D0=B1=D1=81=D0=BE=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chat/websocket.py | 25 ++++++++++++++----------- app/users/dependencies.py | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/chat/websocket.py b/app/chat/websocket.py index e8cc02e..97d5c0d 100644 --- a/app/chat/websocket.py +++ b/app/chat/websocket.py @@ -1,3 +1,4 @@ +import logging from typing import Annotated import websockets @@ -142,6 +143,7 @@ async def websocket_endpoint( # await AuthService.check_verificated_user_with_exc(uow=uow, user_id=user.id) # await AuthService.validate_user_access_to_chat(uow=uow, user_id=user.id, chat_id=chat_id) await manager.connect(chat_id, websocket) + logging.critical(authorization) await websocket.send_json({"headers": str(websocket.headers), "authorization": authorization}) try: while True: @@ -151,14 +153,15 @@ async def websocket_endpoint( except WebSocketDisconnect: manager.disconnect(chat_id, websocket) -# -# @router.post( -# "/ws/{chat_id}" -# ) -# async def websocket_endpoint( -# chat_id: int, -# token: str = Depends(get_token), -# ): -# url = f"ws://localhost:8000/api/chat/ws/{chat_id}" -# async with websockets.connect(url, extra_headers={"Authorization": f"Bearer {token}"}) as websocket: -# print(await websocket.recv()) + +@router.post( + "/ws/{chat_id}" +) +async def websocket_endpoint( + chat_id: int, + token: str = Depends(get_token), +): + logging.critical("Это сообщение уровня INFO") + url = f"ws://localhost:8000/api/chat/ws/{chat_id}" + async with websockets.connect(url, extra_headers={"Authorization": f"Bearer {token}"}) as websocket: + print(await websocket.recv()) diff --git a/app/users/dependencies.py b/app/users/dependencies.py index 14a2ea4..b6f3f6e 100644 --- a/app/users/dependencies.py +++ b/app/users/dependencies.py @@ -1,6 +1,6 @@ from typing import Annotated -from fastapi import Depends, Header, WebSocket +from fastapi import Depends, Header from fastapi.security import HTTPBearer from jose import JWTError, jwt, ExpiredSignatureError