Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-02-07 10:35:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not try to login if the user authenticated via other means

Browse Source
This commit is contained in:
Will Hunt 2020-09-15 18:10:32 +01:00
parent 625bde3305
commit 73fa84a6e5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pantalaimon/daemon.py
View File

@ -553,7 +553,7 @@ class ProxyDaemon:
return user return user
async def start_pan_client(self, access_token, user, user_id, password): async def start_pan_client(self, access_token, user, user_id, password, device_id=None):
client = ClientInfo(user_id, access_token) client = ClientInfo(user_id, access_token)
self.client_info[access_token] = client self.client_info[access_token] = client
self.store.save_server_user(self.name, user_id) self.store.save_server_user(self.name, user_id)
@ -578,11 +578,17 @@ class ProxyDaemon:
store_class=self.client_store_class, store_class=self.client_store_class,
media_info=self.media_info, media_info=self.media_info,
) )
response = await pan_client.login(password, "pantalaimon")
if not isinstance(response, LoginResponse): if password == "":
await pan_client.close() # If password is blank, we cannot login normally and must
return # fall back to using the provided device_id.
pan_client.restore_login(user_id, device_id, access_token)
else:
response = await pan_client.login(password, "pantalaimon")
if not isinstance(response, LoginResponse):
await pan_client.close()
return
logger.info(f"Succesfully started new background sync client for " f"{user_id}") logger.info(f"Succesfully started new background sync client for " f"{user_id}")
@ -646,13 +652,14 @@ class ProxyDaemon:
if response.status == 200 and json_response: if response.status == 200 and json_response:
user_id = json_response.get("user_id", None) user_id = json_response.get("user_id", None)
access_token = json_response.get("access_token", None) access_token = json_response.get("access_token", None)
device_id = json_response.get("device_id", None)
if user_id and access_token: if user_id and access_token:
logger.info( logger.info(
f"User: {user} succesfully logged in, starting " f"User: {user} succesfully logged in, starting "
f"a background sync client." f"a background sync client."
) )
await self.start_pan_client(access_token, user, user_id, password) await self.start_pan_client(access_token, user, user_id, password, device_id)
return web.Response( return web.Response(
status=response.status, status=response.status,