Vorkout/connect
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: middlewaer acces token auth

Browse Source
This commit is contained in:
TheNoxium
2025-04-29 21:16:59 +05:00
parent b90b70568c
commit 19f8236b47
8 changed files with 164 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/api/endpoints/__init__.py
View File

@@ -1,10 +1,10 @@
from api.endpoints.auth import api_router as auth_router
from api.endpoints.pofile import api_router as pofile_router
from api.endpoints.profile import api_router as profile_router
from api.endpoints.account import api_router as account_router
from api.endpoints.keyring import api_router as keyring_router
list_of_routes = [
auth_router,
pofile_router,
profile_router,
account_router,
keyring_router]

50
api/api/endpoints/account.py
View File

@@ -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)

22
api/api/endpoints/auth.py
View File

@@ -26,8 +26,6 @@ from api.services.auth import authenticate_user
from api.db.logic.auth import add_new_refresh_token,upgrade_old_refresh_token
from api.db.logic.account import get_user_login
from api.schemas.endpoints.auth import Auth
api_router = APIRouter(
@@ -54,13 +52,13 @@ def get_config():
return Settings()
@api_router.post("/")
@api_router.post("")
async def login_for_access_token(
user: Auth,
response: Response,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends(),
):
user: Auth,
response: Response,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends(),
):
"""Авторизирует, выставляет токены в куки."""
@@ -109,10 +107,10 @@ async def login_for_access_token(
@api_router.post("/refresh")
async def refresh(
request: Request,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends()):
"""Обновляет access токен."""
request: Request,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends()
):
refresh_token = request.cookies.get("refresh_token_cookie")
print("Refresh Token:", refresh_token)

54
api/api/endpoints/keyring.py
View File

@@ -9,22 +9,19 @@ from fastapi import (
status,
)
from fastapi_jwt_auth import AuthJWT
from sqlalchemy.ext.asyncio import AsyncConnection
from api.db.connection.session import get_connection_dep
from api.db.logic.account import get_user_login
from api.db.logic.keyring import get_key_id,create_key,update_key_id
from api.schemas.account.account import Role,Status
from api.schemas.account.account import Status
from api.schemas.endpoints.account_keyring import AccountKeyringUpdate
from api.schemas.account.account_keyring import AccountKeyring
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_key_data_changes
@@ -38,10 +35,11 @@ api_router = APIRouter(
@api_router.get("/{user_id}/{key_id}")
async def get_keyring(
key_id: str,
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)
@@ -57,14 +55,14 @@ async def get_keyring(
@api_router.post("/{user_id}/{key_id}")
async def create_keyring(
user_id: int,
key_id: str,
key: AccountKeyringUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends()
):
user_id: int,
key_id: str,
request: Request,
key: AccountKeyringUpdate,
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)
@@ -84,13 +82,14 @@ async def create_keyring(
@api_router.put("/{user_id}/{key_id}")
async def update_keyring(
user_id: int,
key_id: str,
keyring_update: AccountKeyringUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends()
):
current_user = AccessTokenValidadtion(Authorize)
user_id: int,
key_id: str,
request: Request,
keyring_update: AccountKeyringUpdate,
connection: AsyncConnection = Depends(get_connection_dep)
):
current_user = request.state.current_user
authorize_user = await db_user_role_validation(connection, current_user)
@@ -119,12 +118,13 @@ async def update_keyring(
@api_router.delete("/{user_id}/{key_id}")
async def delete_keyring(
user_id: int,
key_id: str,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends()
):
current_user = AccessTokenValidadtion(Authorize)
user_id: int,
key_id: str,
request: Request,
connection: AsyncConnection = Depends(get_connection_dep)
):
current_user = request.state.current_user
authorize_user = await db_user_role_validation(connection, current_user)

43
api/api/endpoints/pofile.py → api/api/endpoints/profile.py
View File

@@ -9,7 +9,6 @@ from fastapi import (
status,
)
from fastapi_jwt_auth import AuthJWT
from sqlalchemy.ext.asyncio import AsyncConnection
@@ -19,28 +18,22 @@ from api.services.update_data_validation import update_user_data_changes
from api.schemas.endpoints.account import UserUpdate
from api.services.access_token_validadtion import AccessTokenValidadtion
api_router = APIRouter(
prefix="/pofile",
prefix="/profile",
tags=["User accountModel"],
)
@api_router.get("/{user_id}")
async def get_pofile(user_id: int,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends()):
current_user = AccessTokenValidadtion(Authorize)
authorize_user = await get_user_login(connection, current_user)
if authorize_user.id != user_id :
raise HTTPException(
status_code=status.HTTP_409_CONFLICT,
detail="The provided data already exists in the database")
async def get_profile(
user_id: int,
request: Request,
connection: AsyncConnection = Depends(get_connection_dep),
):
# Извлекаем текущего пользователя из request.state
current_user = request.state.current_user
user = await get_user_id(connection, user_id)
@@ -53,21 +46,15 @@ async def get_pofile(user_id: int,
@api_router.put("/{user_id}")
async def update_pofile(
user_id: int,
user_updata: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
Authorize: AuthJWT = Depends()
):
async def update_profile(
user_id: int,
request: Request,
user_updata: UserUpdate,
connection: AsyncConnection = Depends(get_connection_dep),
current_user = AccessTokenValidadtion(Authorize)
):
authorize_user = await get_user_login(connection, current_user)
if authorize_user.id != user_id :
raise HTTPException(
status_code=status.HTTP_409_CONFLICT,
detail="The provided data already exists in the database")
current_user = request.state.current_user
user = await get_user_id(connection, user_id)
if user is None: