Work around client replacing reg params

Works around https://github.com/vector-im/vector-android/issues/715
and equivalent for iOS
This commit is contained in:
David Baker 2016-11-18 17:07:35 +00:00
parent 9d58ccc547
commit 544722bad2

View file

@ -169,6 +169,18 @@ class RegisterRestServlet(RestServlet):
guest_access_token = body.get("guest_access_token", None) guest_access_token = body.get("guest_access_token", None)
if (
'initial_device_display_name' in body and
'password' not in body
):
# ignore 'initial_device_display_name' if sent without
# a password to work around a client bug where it sent
# the 'initial_device_display_name' param alone, wiping out
# the original registration params
logger.warn("Ignoring initial_device_display_name without password")
del body['initial_device_display_name']
session_id = self.auth_handler.get_session_id(body) session_id = self.auth_handler.get_session_id(body)
registered_user_id = None registered_user_id = None
if session_id: if session_id: