diff options
| author | David Baker <dave@matrix.org> | 2016-09-09 19:11:34 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-09-09 19:11:34 +0100 |
| commit | b91e2833b3b59d6a8d104d8f6304383e68de2086 (patch) | |
| tree | 4df820b06f89d7cb98ec6f75a99be4eebbd92ef6 /synapse/rest/client/v1/transactions.py | |
| parent | Add index to event_push_actions (diff) | |
| parent | Merge pull request #1096 from matrix-org/markjh/get_access_token (diff) | |
| download | synapse-b91e2833b3b59d6a8d104d8f6304383e68de2086.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_query_fast
Diffstat (limited to 'synapse/rest/client/v1/transactions.py')
| -rw-r--r-- | synapse/rest/client/v1/transactions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/transactions.py b/synapse/rest/client/v1/transactions.py index bdccf464a5..2f2c9d0881 100644 --- a/synapse/rest/client/v1/transactions.py +++ b/synapse/rest/client/v1/transactions.py @@ -17,6 +17,8 @@ to ensure idempotency when performing PUTs using the REST API.""" import logging +from synapse.api.auth import get_access_token_from_request + logger = logging.getLogger(__name__) @@ -90,6 +92,6 @@ class HttpTransactionStore(object): return response def _get_key(self, request): - token = request.args["access_token"][0] + token = get_access_token_from_request(request) path_without_txn_id = request.path.rsplit("/", 1)[0] return path_without_txn_id + "/" + token |