fix: middlewaer acces token auth

api/api/endpoints/account.py

@@ -9,9 +9,6 @@ from fastapi import (
     status,
 )
 
-from fastapi import FastAPI
-
-from fastapi_jwt_auth import AuthJWT
 
 from sqlalchemy.ext.asyncio import AsyncConnection
 
@@ -19,10 +16,10 @@ from api.db.connection.session import get_connection_dep
 
 from api.db.logic.account import get_user_id, update_user_id, create_user,get_user_login
 
-from api.schemas.account.account import User,Role,Status
+from api.schemas.account.account import User,Status
 from api.schemas.endpoints.account import UserUpdate
 
-from api.services.access_token_validadtion import AccessTokenValidadtion
+
 from api.services.user_role_validation import db_user_role_validation
 from api.services.update_data_validation import update_user_data_changes
 
@@ -36,11 +33,12 @@ api_router = APIRouter(
 
 @api_router.get("/{user_id}")
 async def get_account(user_id: int,
-                     connection: AsyncConnection = Depends(get_connection_dep),
-                     Authorize: AuthJWT = Depends()):
+                    request: Request,
+                    connection: AsyncConnection = Depends(get_connection_dep)
+                    ):
 
-    current_user = AccessTokenValidadtion(Authorize)
 
+    current_user = request.state.current_user
     authorize_user = await db_user_role_validation(connection, current_user)
 
     user = await get_user_id(connection, user_id)
@@ -55,11 +53,12 @@ async def get_account(user_id: int,
 
 @api_router.post("")
 async def create_account(
-    user: UserUpdate,
-    connection: AsyncConnection = Depends(get_connection_dep),
-    Authorize: AuthJWT = Depends()
-):
-    current_user = AccessTokenValidadtion(Authorize)
+                        user: UserUpdate,
+                        request: Request,
+                        connection: AsyncConnection = Depends(get_connection_dep)
+                    ):
+
+    current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
 
@@ -81,12 +80,13 @@ async def create_account(
 
 @api_router.put("/{user_id}")
 async def update_account(
-    user_id: int,
-    user_update: UserUpdate,
-    connection: AsyncConnection = Depends(get_connection_dep),
-    Authorize: AuthJWT = Depends()
-):
-    current_user = AccessTokenValidadtion(Authorize)
+                        user_id: int,
+                        request: Request,
+                        user_update: UserUpdate,
+                        connection: AsyncConnection = Depends(get_connection_dep)
+                    ):
+
+    current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)
 
@@ -114,11 +114,13 @@ async def update_account(
 
 @api_router.delete("/{user_id}")
 async def delete_account(
-    user_id: int,
-    connection: AsyncConnection = Depends(get_connection_dep),
-    Authorize: AuthJWT = Depends()
-):
-    current_user = AccessTokenValidadtion(Authorize)
+                        user_id: int,
+                        request: Request,
+                        connection: AsyncConnection = Depends(get_connection_dep)
+                    ):
+
+
+    current_user = request.state.current_user
 
     authorize_user = await db_user_role_validation(connection, current_user)