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

Allow password_auth_providers to return a callback

Browse source 
... so that they have a way to record access tokens.
This commit is contained in:
Richard van der Hoff 2017-10-31 15:15:51 +00:00
parent 846a94fbc9
commit 4c8f94ac94
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
synapse/handlers/auth.py
View file

@ -517,7 +517,8 @@ class AuthHandler(BaseHandler):
login_submission (dict): the whole of the login submission
(including 'type' and other relevant fields)
Returns:
Deferred[str]: canonical user id
Deferred[str, func]: canonical user id, and optional callback
to be called once the access token and device id are issued
Raises:
StoreError if there was a problem accessing the database
SynapseError if there was a problem with the request
@ -581,11 +582,13 @@ class AuthHandler(BaseHandler):
),
)
returned_user_id = yield provider.check_auth(
result = yield provider.check_auth(
username, login_type, login_dict,
)
if returned_user_id:
defer.returnValue(returned_user_id)
if result:
if isinstance(result, str):
result = (result, None)
defer.returnValue(result)
if login_type == LoginType.PASSWORD:
known_login_type = True
@ -595,7 +598,7 @@ class AuthHandler(BaseHandler):
)
if canonical_user_id:
defer.returnValue(canonical_user_id)
defer.returnValue((canonical_user_id, None))
if not known_login_type:
raise SynapseError(400, "Unknown login type %s" % login_type)