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

Merge erikj/user_dedup to develop

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-08-26 13:42:45 +01:00
parent a2355fae7e
commit d3c0e48859
4 changed files with 50 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,10 +83,11 @@ class LoginRestServlet(ClientV1RestServlet):
if not user_id.startswith('@'):
user_id = UserID.create(
user_id, self.hs.hostname).to_string()
user_id, self.hs.hostname
).to_string()
auth_handler = self.handlers.auth_handler
access_token, refresh_token = yield auth_handler.login_with_password(
user_id, access_token, refresh_token = yield auth_handler.login_with_password(
user_id=user_id,
password=login_submission["password"])