diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2017-11-01 16:06:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 16:06:31 +0000 |
| commit | e5e930aec3d71e4ac2db7ad395245d65cc42ebda (patch) | |
| tree | 8f608d8b62accec1687e6b61c51c3edba398c00f /synapse/rest | |
| parent | Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens (diff) | |
| parent | Break dependency of auth_handler on device_handler (diff) | |
| download | synapse-e5e930aec3d71e4ac2db7ad395245d65cc42ebda.tar.xz | |
Merge pull request #2615 from matrix-org/rav/break_auth_device_dep
Break dependency of auth_handler on device_handler
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 11a2aab84b..d25a68e753 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -229,7 +229,6 @@ class LoginRestServlet(ClientV1RestServlet): ) access_token = yield auth_handler.get_access_token_for_user_id( canonical_user_id, device_id, - login_submission.get("initial_device_display_name"), ) result = { @@ -251,7 +250,6 @@ class LoginRestServlet(ClientV1RestServlet): device_id = yield self._register_device(user_id, login_submission) access_token = yield auth_handler.get_access_token_for_user_id( user_id, device_id, - login_submission.get("initial_device_display_name"), ) result = { "user_id": user_id, # may have changed @@ -294,7 +292,6 @@ class LoginRestServlet(ClientV1RestServlet): ) access_token = yield auth_handler.get_access_token_for_user_id( registered_user_id, device_id, - login_submission.get("initial_device_display_name"), ) result = { diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index d9a8cdbbb5..a077146c89 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -566,7 +566,6 @@ class RegisterRestServlet(RestServlet): access_token = ( yield self.auth_handler.get_access_token_for_user_id( user_id, device_id=device_id, - initial_display_name=params.get("initial_device_display_name") ) ) |