From bbd8f3f59d5d4fd250fb1e4d9773233d27f4e6da Mon Sep 17 00:00:00 2001
From: urec56 <yur.afonin2017@yandex.ru>
Date: Sat, 3 Feb 2024 22:16:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D0=B2=D0=B5=D0=B1=D1=81=D0=BE=D0=BA=D0=B5=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D1=87=D0=B0=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/pages/router.py      | 7 +++++--
 app/templates/chat.html  | 2 +-
 app/users/chat/router.py | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/pages/router.py b/app/pages/router.py
index efc94fb..29c6c83 100644
--- a/app/pages/router.py
+++ b/app/pages/router.py
@@ -1,6 +1,9 @@
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, Depends
 from fastapi.templating import Jinja2Templates
 
+from app.users.dependencies import get_current_user
+from app.users.models import Users
+
 router = APIRouter(
     prefix="/pages",
     tags=["Страницы"]
@@ -15,7 +18,7 @@ async def base(request: Request):
 
 
 @router.get("/chat")
-def get_chat_page(request: Request):
+async def get_chat_page(request: Request):
     return templates.TemplateResponse("chat.html", {"request": request})
 
 
diff --git a/app/templates/chat.html b/app/templates/chat.html
index 385742e..4371425 100644
--- a/app/templates/chat.html
+++ b/app/templates/chat.html
@@ -39,7 +39,7 @@
 
     let chat_id = 2
     document.querySelector("#ws-id").textContent = chat_id;
-    let ws = new WebSocket(`ws://localhost:8000/chat/ws/${chat_id}?user_id=1`);
+    let ws = new WebSocket(`ws://localhost:8000/chat/ws/${chat_id}?user_id=2`);
     ws.onmessage = function (event) {
         appendMessage(event.data)
     };
diff --git a/app/users/chat/router.py b/app/users/chat/router.py
index 923ebc8..7b37e77 100644
--- a/app/users/chat/router.py
+++ b/app/users/chat/router.py
@@ -16,9 +16,9 @@ router = APIRouter(
 
 
 @router.get("")
-async def root():
-    print(await validate_user_access_to_chat(1, 2))
-    pass
+async def root(user: Users = Depends(get_current_user)):
+    print(user)
+    return user.id
 
 
 @router.post("", status_code=status.HTTP_201_CREATED)