summary refs log tree commit diff
path: root/synapse/rest/client/v1/pusher.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-08-25 17:19:06 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-08-25 17:19:06 +0100
commitee3fa1a99c4a5436804bb6ada0b0ac18db9e1d1b (patch)
tree710bc81019543d7c2fd9eabc6dfd45680b4efcfd /synapse/rest/client/v1/pusher.py
parentMerge pull request #247 from matrix-org/markjh/tox (diff)
parentFix up one more reference (diff)
downloadsynapse-ee3fa1a99c4a5436804bb6ada0b0ac18db9e1d1b.tar.xz
Merge pull request #248 from matrix-org/deviceid
Remove completely unused concepts from codebase
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
-rw-r--r--synapse/rest/client/v1/pusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py
index c83287c028..3aabc93b8b 100644
--- a/synapse/rest/client/v1/pusher.py
+++ b/synapse/rest/client/v1/pusher.py
@@ -27,7 +27,7 @@ class PusherRestServlet(ClientV1RestServlet):
 
     @defer.inlineCallbacks
     def on_POST(self, request):
-        user, client = yield self.auth.get_user_by_req(request)
+        user, token_id = yield self.auth.get_user_by_req(request)
 
         content = _parse_json(request)
 
@@ -65,7 +65,7 @@ class PusherRestServlet(ClientV1RestServlet):
         try:
             yield pusher_pool.add_pusher(
                 user_name=user.to_string(),
-                access_token=client.token_id,
+                access_token=token_id,
                 profile_tag=content['profile_tag'],
                 kind=content['kind'],
                 app_id=content['app_id'],