Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments

Improve comments on get_user_by_access_token
pull/2727/head
Richard van der Hoff 2017-11-29 17:57:06 +00:00 committed by GitHub
commit 624c46eb06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -270,7 +270,11 @@ class Auth(object):
rights (str): The operation being performed; the access token must
allow this.
Returns:
dict : dict that includes the user and the ID of their access token.
Deferred[dict]: dict that includes:
`user` (UserID)
`is_guest` (bool)
`token_id` (int|None): access token id. May be None if guest
`device_id` (str|None): device corresponding to access token
Raises:
AuthError if no user by that token exists or the token is invalid.
"""