summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-25 17:23:05 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-25 17:23:05 +0100
commita2355fae7e72c00e2060eec1ca677548b40d96b6 (patch)
tree572b0ae4f2422374bd6b4efa1f7b70a9cc5aedb2 /synapse/api
parentMerge pull request #248 from matrix-org/deviceid (diff)
parentMerge branch 'deviceid' into removeadmin (diff)
downloadsynapse-a2355fae7e72c00e2060eec1ca677548b40d96b6.tar.xz
Merge pull request #251 from matrix-org/removeadmin
Stop looking up "admin", which we never read
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index b41e34e658..65ee1452ce 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -392,8 +392,7 @@ class Auth(object):
         Args:
             token (str): The access token to get the user by.
         Returns:
-            dict : dict that includes the user and whether the
-                user is a server admin.
+            dict : dict that includes the user and the ID of their access token.
         Raises:
             AuthError if no user by that token exists or the token is invalid.
         """
@@ -404,7 +403,6 @@ class Auth(object):
                 errcode=Codes.UNKNOWN_TOKEN
             )
         user_info = {
-            "admin": bool(ret.get("admin", False)),
             "user": UserID.from_string(ret.get("name")),
             "token_id": ret.get("token_id", None),
         }