This commit is contained in:
parent
74233e96ff
commit
09887bc516
|
@ -39,7 +39,7 @@ use_parentheses = true
|
||||||
ensure_newline_before_comments = true
|
ensure_newline_before_comments = true
|
||||||
line_length = 120
|
line_length = 120
|
||||||
|
|
||||||
[tool.ruff]
|
[lint]
|
||||||
select = ["E4", "E7", "E9", "F"]
|
select = ["E4", "E7", "E9", "F"]
|
||||||
ignore = []
|
ignore = []
|
||||||
line-length = 120
|
line-length = 120
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
import logging
|
import logging
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import List
|
|
||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
from dogpile.cache import make_region
|
from dogpile.cache import make_region
|
||||||
|
|
||||||
from settings import ADMIN_SECRET, AUTH_URL
|
from settings import ADMIN_SECRET, AUTH_URL
|
||||||
|
|
||||||
logger = logging.getLogger('\t[services.auth]\t')
|
logger = logging.getLogger('[services.auth]')
|
||||||
logger.setLevel(logging.DEBUG)
|
logger.setLevel(logging.DEBUG)
|
||||||
|
|
||||||
|
|
||||||
|
@ -54,11 +53,11 @@ def cache_auth_request(f):
|
||||||
|
|
||||||
# Измененная функция проверки аутентификации с кэшированием
|
# Измененная функция проверки аутентификации с кэшированием
|
||||||
@cache_auth_request
|
@cache_auth_request
|
||||||
async def check_auth(req) -> [str, List[str]]:
|
async def check_auth(req):
|
||||||
token = req.headers.get('Authorization')
|
token = req.headers.get('Authorization')
|
||||||
user_id = ''
|
user_id = ''
|
||||||
user_roles = []
|
user_roles = []
|
||||||
|
try:
|
||||||
if token:
|
if token:
|
||||||
# Logging the authentication token
|
# Logging the authentication token
|
||||||
logger.debug(f'{token}')
|
logger.debug(f'{token}')
|
||||||
|
@ -81,13 +80,15 @@ async def check_auth(req) -> [str, List[str]]:
|
||||||
user_data = data.get('data', {}).get(query_name, {}).get('claims', {})
|
user_data = data.get('data', {}).get(query_name, {}).get('claims', {})
|
||||||
user_id = user_data.get('sub')
|
user_id = user_data.get('sub')
|
||||||
user_roles = user_data.get('allowed_roles')
|
user_roles = user_data.get('allowed_roles')
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(e)
|
||||||
|
|
||||||
# Возвращаем пустые значения, если не удалось получить user_id и user_roles
|
# Возвращаем пустые значения, если не удалось получить user_id и user_roles
|
||||||
return [user_id, user_roles]
|
return [user_id, user_roles]
|
||||||
|
|
||||||
|
|
||||||
async def add_user_role(user_id):
|
async def add_user_role(user_id):
|
||||||
logger.info(f'[services.auth] add author role for user_id: {user_id}')
|
logger.info(f'add author role for user_id: {user_id}')
|
||||||
query_name = '_update_user'
|
query_name = '_update_user'
|
||||||
operation = 'UpdateUserRoles'
|
operation = 'UpdateUserRoles'
|
||||||
headers = {
|
headers = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user