diff options
| author | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
| commit | d8a6c734fa1ab6681431c43885ced627e5e672e0 (patch) | |
| tree | 4ba6a510997e38e829c6a6b0aa53caace4e7b872 /synapse/api/auth.py | |
| parent | Copy dict in update_membership too (diff) | |
| parent | Merge pull request #2723 from matrix-org/matthew/search-all-local-users (diff) | |
| download | synapse-d8a6c734fa1ab6681431c43885ced627e5e672e0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 72858cca1f..ac0a3655a5 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -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. """ |