This commit is contained in:
13
auth/core.py
13
auth/core.py
@@ -4,12 +4,14 @@
|
||||
"""
|
||||
|
||||
import time
|
||||
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
from auth.orm import Author
|
||||
from auth.state import AuthState
|
||||
from auth.tokens.storage import TokenStorage as TokenManager
|
||||
from auth.orm import Author
|
||||
from orm.community import CommunityAuthor
|
||||
from services.db import local_session
|
||||
from storage.db import local_session
|
||||
from settings import ADMIN_EMAILS as ADMIN_EMAILS_LIST
|
||||
from utils.logger import root_logger as logger
|
||||
|
||||
@@ -50,7 +52,7 @@ async def verify_internal_auth(token: str) -> tuple[int, list, bool]:
|
||||
with local_session() as session:
|
||||
try:
|
||||
# Author уже импортирован в начале файла
|
||||
|
||||
|
||||
author = session.query(Author).where(Author.id == user_id).one()
|
||||
|
||||
# Получаем роли
|
||||
@@ -112,14 +114,14 @@ async def get_auth_token_from_request(request) -> str | None:
|
||||
"""
|
||||
# Отложенный импорт для избежания циклических зависимостей
|
||||
from auth.decorators import get_auth_token
|
||||
|
||||
|
||||
return await get_auth_token(request)
|
||||
|
||||
|
||||
async def authenticate(request) -> AuthState:
|
||||
"""
|
||||
Получает токен из запроса и проверяет авторизацию.
|
||||
|
||||
|
||||
Args:
|
||||
request: Объект запроса
|
||||
|
||||
@@ -146,4 +148,3 @@ async def authenticate(request) -> AuthState:
|
||||
auth_state.author_id = str(user_id)
|
||||
auth_state.is_admin = is_admin
|
||||
return auth_state
|
||||
|
||||
|
||||
Reference in New Issue
Block a user