mirror of
https://github.com/matrix-org/pantalaimon.git
synced 2025-03-10 16:30:06 -04:00
daemon: Move the login user finding out of the login function.
This commit is contained in:
parent
e5558c5a1a
commit
ae770b3a67
@ -89,6 +89,20 @@ class ProxyDaemon:
|
|||||||
) as resp:
|
) as resp:
|
||||||
return(web.Response(text=await resp.text()))
|
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):
|
async def login(self, request):
|
||||||
try:
|
try:
|
||||||
body = await request.json()
|
body = await request.json()
|
||||||
@ -109,16 +123,7 @@ class ProxyDaemon:
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
identifier = body.get("identifier", None)
|
user = self._get_login_user(body)
|
||||||
|
|
||||||
if identifier:
|
|
||||||
user = identifier.get("user", None)
|
|
||||||
|
|
||||||
if not user:
|
|
||||||
user = body.get("user", "")
|
|
||||||
else:
|
|
||||||
user = body.get("user", "")
|
|
||||||
|
|
||||||
password = body.get("password", "")
|
password = body.get("password", "")
|
||||||
device_id = body.get("device_id", "")
|
device_id = body.get("device_id", "")
|
||||||
device_name = body.get("initial_device_display_name", "pantalaimon")
|
device_name = body.get("initial_device_display_name", "pantalaimon")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user