discours.io/inbox
5
0
Fork 0
Code Pull Requests Actions Wiki Activity

some-fixes-graphql

Browse Source
This commit is contained in:
Untone 2023-10-12 15:28:12 +03:00
parent f6ef50f878
commit 405dbb49cf
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resolvers/load.py
View File

@ -51,7 +51,7 @@ async def load_chats(_, info, limit: int = 50, offset: int = 0):
members_online = (await redis.execute("SMEMBERS", "authors-online")) or [] members_online = (await redis.execute("SMEMBERS", "authors-online")) or []
chats = [] chats = []
if len(cids) == 0: if len(cids) == 0:
print("[resolvers.load] no chats for user {}, create one with Discours (id=2)") print(f"[resolvers.load] no chats for user with id={author_id}, create one with Discours (id=2)")
r = await create_chat(None, info, members=[2]) # member with id = 1 is discours r = await create_chat(None, info, members=[2]) # member with id = 1 is discours
cids.append(r["chat"]["id"]) cids.append(r["chat"]["id"])
for cid in cids: for cid in cids:

18
services/auth.py
View File

@ -32,13 +32,17 @@ async def check_auth(req):
if response.status_code != 200: if response.status_code != 200:
return False, None return False, None
r = response.json() r = response.json()
user_id = ( try:
r.get("data", {}).get(query_name, {}).get("user", {}).get("id", None) user_id = (
if INTERNAL_AUTH_SERVER r.get("data", {}).get(query_name, {}).get("user", {}).get("id", None)
else r.get("data", {}).get(query_name, {}).get("user", {}).get("id", None) if INTERNAL_AUTH_SERVER
) else r.get("data", {}).get(query_name, {}).get("user", {}).get("id", None)
is_authenticated = user_id is not None )
return is_authenticated, user_id is_authenticated = user_id is not None
return is_authenticated, user_id
except Exception as e:
print(f"response contains no proper data: {r}")
return False, None
def login_required(f): def login_required(f):