discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

auth-cached-fix-2
All checks were successful
Deploy to core / deploy (push) Successful in 1m31s
Details

Browse Source
This commit is contained in:
Untone 2024-02-19 15:31:51 +03:00
parent e5edc97ab1
commit 74233e96ff
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
services/auth.py
View File

@ -112,17 +112,16 @@ def login_required(f):
user_id = '' user_id = ''
user_roles = [] user_roles = []
info = args[1] info = args[1]
context = info.context
req = context.get('request')
try: try:
req = info.context.get('request')
[user_id, user_roles] = await check_auth(req) [user_id, user_roles] = await check_auth(req)
except Exception as e: except Exception as e:
logger.error(f"Failed to authenticate user: {e}") logger.error(f"Failed to authenticate user: {e}")
if user_id: if user_id:
logger.info(f' got {user_id} roles: {user_roles}') logger.info(f' got {user_id} roles: {user_roles}')
context['user_id'] = user_id.strip() info.context['user_id'] = user_id.strip()
context['roles'] = user_roles info.context['roles'] = user_roles
return await f(*args, **kwargs) return await f(*args, **kwargs)
return decorated_function return decorated_function
@ -131,18 +130,18 @@ def login_required(f):
def auth_request(f): def auth_request(f):
@wraps(f) @wraps(f)
async def decorated_function(*args, **kwargs): async def decorated_function(*args, **kwargs):
req = args[0]
user_id = '' user_id = ''
user_roles = [] user_roles = []
req = {}
try: try:
req = args[0]
[user_id, user_roles] = await check_auth(req) [user_id, user_roles] = await check_auth(req)
except Exception as e: except Exception as e:
logger.error(f"Failed to authenticate user: {e}") logger.error(f"Failed to authenticate user: {e}")
if user_id: if user_id:
logger.info(f' got {user_id} roles: {user_roles}') logger.info(f' got {user_id} roles: {user_roles}')
req['user_id'] = user_id.strip() req['user_id'] = user_id.strip()
req['roles'] = user_roles req['roles'] = user_roles
return await f(*args, **kwargs) return await f(*args, **kwargs)
return decorated_function return decorated_function