diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-01-28 17:19:28 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-28 17:19:28 +0000 |
| commit | 26c8fff19ebfca3914305f820b29897db8ea4fca (patch) | |
| tree | c346408ce8f8ced5d1cb2e8dce4ea7fb934bb37e /synapse/rest/client/v1/voip.py | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ... (diff) | |
| download | synapse-26c8fff19ebfca3914305f820b29897db8ea4fca.tar.xz | |
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
Diffstat (limited to 'synapse/rest/client/v1/voip.py')
| -rw-r--r-- | synapse/rest/client/v1/voip.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py index 822d863ce6..11d08fbced 100644 --- a/synapse/rest/client/v1/voip.py +++ b/synapse/rest/client/v1/voip.py @@ -28,7 +28,7 @@ class VoipRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request): - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) turnUris = self.hs.config.turn_uris turnSecret = self.hs.config.turn_shared_secret |