Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-03-10 16:30:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Move the login user finding out of the login function.

Browse Source
This commit is contained in:
Damir Jelić 2019-04-03 14:57:09 +02:00
parent e5558c5a1a
commit ae770b3a67
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pantalaimon/daemon.py
View File

@ -89,6 +89,20 @@ class ProxyDaemon:
) as resp:
return(web.Response(text=await resp.text()))
def _get_login_user(self, body):
identifier = body.get("identifier", None)
if identifier:
user = identifier.get("user", None)
if not user:
user = body.get("user", "")
else:
user = body.get("user", "")
return user
async def login(self, request):
try:
body = await request.json()
@ -109,16 +123,7 @@ class ProxyDaemon:
})
)
identifier = body.get("identifier", None)
if identifier:
user = identifier.get("user", None)
if not user:
user = body.get("user", "")
else:
user = body.get("user", "")
user = self._get_login_user(body)
password = body.get("password", "")
device_id = body.get("device_id", "")
device_name = body.get("initial_device_display_name", "pantalaimon")