diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:23:06 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:23:06 +0100 |
| commit | a0b181bd17cb7ec2a43ed2dbdeb1bb40f3f4373c (patch) | |
| tree | 7f136968479fe90438c30e252d364fd4fd72fc01 /synapse/rest/client/v1/pusher.py | |
| parent | Merge pull request #244 from matrix-org/markjh/refresh_tokens (diff) | |
| download | synapse-a0b181bd17cb7ec2a43ed2dbdeb1bb40f3f4373c.tar.xz | |
Remove completely unused concepts from codebase
Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 4 |
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'], |