Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-06 12:45:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2615 from matrix-org/rav/break_auth_device_dep

Browse source 
Break dependency of auth_handler on device_handler
This commit is contained in:
David Baker 2017-11-01 16:06:31 +00:00 • committed by GitHub
commit e5e930aec3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/rest/client/v1/login.py
View file

@ -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 = {