fmt
This commit is contained in:
@@ -7,10 +7,8 @@ from settings import ADMIN_SECRET, AUTH_URL
|
||||
from utils.logger import root_logger as logger
|
||||
|
||||
# Список разрешенных заголовков
|
||||
ALLOWED_HEADERS = [
|
||||
'Authorization',
|
||||
'Content-Type'
|
||||
]
|
||||
ALLOWED_HEADERS = ["Authorization", "Content-Type"]
|
||||
|
||||
|
||||
async def check_auth(req):
|
||||
"""
|
||||
@@ -27,18 +25,18 @@ async def check_auth(req):
|
||||
- user_roles: list[str] - Список ролей пользователя.
|
||||
"""
|
||||
token = req.headers.get("Authorization")
|
||||
|
||||
host = req.headers.get('host', '')
|
||||
|
||||
host = req.headers.get("host", "")
|
||||
logger.debug(f"check_auth: host={host}")
|
||||
auth_url = AUTH_URL
|
||||
if '.dscrs.site' in host or 'localhost' in host:
|
||||
if ".dscrs.site" in host or "localhost" in host:
|
||||
auth_url = "https://auth.dscrs.site/graphql"
|
||||
user_id = ""
|
||||
user_roles = []
|
||||
if token:
|
||||
# Проверяем и очищаем токен от префикса Bearer если он есть
|
||||
if token.startswith('Bearer '):
|
||||
token = token.split('Bearer ')[-1].strip()
|
||||
if token.startswith("Bearer "):
|
||||
token = token.split("Bearer ")[-1].strip()
|
||||
# Logging the authentication token
|
||||
logger.debug(f"TOKEN: {token}")
|
||||
query_name = "validate_jwt_token"
|
||||
@@ -46,9 +44,7 @@ async def check_auth(req):
|
||||
variables = {"params": {"token_type": "access_token", "token": token}}
|
||||
|
||||
# Только необходимые заголовки для GraphQL запроса
|
||||
headers = {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
headers = {"Content-Type": "application/json"}
|
||||
|
||||
gql = {
|
||||
"query": f"query {operation}($params: ValidateJWTTokenInput!)"
|
||||
|
@@ -20,7 +20,7 @@ from settings import ADMIN_SECRET, WEBHOOK_SECRET
|
||||
async def check_webhook_existence():
|
||||
"""
|
||||
Проверяет существование вебхука для user.login события
|
||||
|
||||
|
||||
Returns:
|
||||
tuple: (bool, str, str) - существует ли вебхук, его id и endpoint если существует
|
||||
"""
|
||||
@@ -28,11 +28,8 @@ async def check_webhook_existence():
|
||||
if not ADMIN_SECRET:
|
||||
logger.error("ADMIN_SECRET is not set")
|
||||
return False, None, None
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"X-Authorizer-Admin-Secret": ADMIN_SECRET
|
||||
}
|
||||
|
||||
headers = {"Content-Type": "application/json", "X-Authorizer-Admin-Secret": ADMIN_SECRET}
|
||||
|
||||
operation = "GetWebhooks"
|
||||
query_name = "_webhooks"
|
||||
@@ -63,17 +60,14 @@ async def create_webhook_endpoint():
|
||||
"""
|
||||
logger.info("create_webhook_endpoint called")
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"X-Authorizer-Admin-Secret": ADMIN_SECRET
|
||||
}
|
||||
headers = {"Content-Type": "application/json", "X-Authorizer-Admin-Secret": ADMIN_SECRET}
|
||||
|
||||
exists, webhook_id, current_endpoint = await check_webhook_existence()
|
||||
|
||||
|
||||
# Определяем endpoint в зависимости от окружения
|
||||
host = os.environ.get('HOST', 'core.dscrs.site')
|
||||
host = os.environ.get("HOST", "core.dscrs.site")
|
||||
endpoint = f"https://{host}/new-author"
|
||||
|
||||
|
||||
if exists:
|
||||
# Если вебхук существует, но с другим endpoint или с модифицированным именем
|
||||
if current_endpoint != endpoint or webhook_id:
|
||||
|
Reference in New Issue
Block a user