diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-03-08 10:20:41 +0000 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-03-08 10:20:41 +0000 |
| commit | f40131b4d98766e5f341a406a0f24e470d763ee9 (patch) | |
| tree | f694a2cfe324606734155df34b6830fab31df6eb /synapse/api/auth.py | |
| parent | Merge pull request #626 from matrix-org/erikj/visibility (diff) | |
| parent | Fix tests (diff) | |
| download | synapse-f40131b4d98766e5f341a406a0f24e470d763ee9.tar.xz | |
Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id
Send the user ID matching the guest access token
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 183245443c..3038df4ab8 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -534,7 +534,7 @@ class Auth(object): ) access_token = request.args["access_token"][0] - user_info = yield self._get_user_by_access_token(access_token) + user_info = yield self.get_user_by_access_token(access_token) user = user_info["user"] token_id = user_info["token_id"] is_guest = user_info["is_guest"] @@ -595,7 +595,7 @@ class Auth(object): defer.returnValue(user_id) @defer.inlineCallbacks - def _get_user_by_access_token(self, token): + def get_user_by_access_token(self, token): """ Get a registered user's ID. Args: |