summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorPauRE <prodrigestivill@gmail.com>2019-06-27 13:02:41 +0200
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-27 12:02:41 +0100
commit856ea04eb32f1f40c37d0534955d900fea2c7069 (patch)
tree76260d19ea52aa916c4b63753f19859ea4cbaa9c /synapse/rest
parentMerge pull request #5565 from matrix-org/rav/docker/fix_log_config (diff)
downloadsynapse-856ea04eb32f1f40c37d0534955d900fea2c7069.tar.xz
Fix JWT login (#5555)
* Fix JWT login with register

Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>

* Add pyjwt conditional dependency

Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>

* Added changelog file

Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>

* Improved changelog description

Signed-off-by: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/login.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index 4efb679a04..ede6bc8b1e 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -336,7 +336,7 @@ class LoginRestServlet(RestServlet):
             }
         else:
             user_id, access_token = (
-                yield self.handlers.registration_handler.register(localpart=user)
+                yield self.registration_handler.register(localpart=user)
             )
 
             device_id = login_submission.get("device_id")