diff options
| author | David Baker <dave@matrix.org> | 2016-11-18 17:07:35 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-11-18 17:07:35 +0000 |
| commit | 544722bad23fc31056b9240189c3cbbbf0ffd3f9 (patch) | |
| tree | 519033a2736e4e33084616bad6599492552358cd /synapse/rest | |
| parent | Bump changelog and version (diff) | |
| download | synapse-544722bad23fc31056b9240189c3cbbbf0ffd3f9.tar.xz | |
Work around client replacing reg params
Works around https://github.com/vector-im/vector-android/issues/715 and equivalent for iOS
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 68d18a9b82..b20d9a1095 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -169,6 +169,18 @@ class RegisterRestServlet(RestServlet): 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) registered_user_id = None if session_id: |