diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-07-22 14:52:53 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-07-26 07:35:48 +0100 |
| commit | 436bffd15fb8382a0d2dddd3c6f7a077ba751da2 (patch) | |
| tree | d4c3857cb66386bf48f06293ae8ae28a558073ca /synapse/rest/client/v1 | |
| parent | Log when adding listeners (diff) | |
| download | synapse-436bffd15fb8382a0d2dddd3c6f7a077ba751da2.tar.xz | |
Implement deleting devices
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index e8b791519c..92fcae674a 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -152,7 +152,10 @@ class LoginRestServlet(ClientV1RestServlet): ) device_id = yield self._register_device(user_id, login_submission) access_token, refresh_token = ( - yield auth_handler.get_login_tuple_for_user_id(user_id, device_id) + yield auth_handler.get_login_tuple_for_user_id( + user_id, device_id, + login_submission.get("initial_device_display_name") + ) ) result = { "user_id": user_id, # may have changed @@ -173,7 +176,10 @@ class LoginRestServlet(ClientV1RestServlet): ) device_id = yield self._register_device(user_id, login_submission) access_token, refresh_token = ( - yield auth_handler.get_login_tuple_for_user_id(user_id, device_id) + yield auth_handler.get_login_tuple_for_user_id( + user_id, device_id, + login_submission.get("initial_device_display_name") + ) ) result = { "user_id": user_id, # may have changed @@ -262,7 +268,8 @@ class LoginRestServlet(ClientV1RestServlet): ) access_token, refresh_token = ( yield auth_handler.get_login_tuple_for_user_id( - registered_user_id, device_id + registered_user_id, device_id, + login_submission.get("initial_device_display_name") ) ) result = { |