summary refs log tree commit diff
path: root/synapse/rest/client/v1/transactions.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-09-09 17:09:27 +0100
committerGitHub <noreply@github.com>2016-09-09 17:09:27 +0100
commitdbff7e94362afdebaebe678215fba34589394fcf (patch)
treedb75c5d7a395a8b66bc6c1eca746f8bc4ab6cfd1 /synapse/rest/client/v1/transactions.py
parentMerge pull request #1091 from matrix-org/paul/third-party-lookup (diff)
parentAdd helper function for getting access_tokens from requests (diff)
downloadsynapse-dbff7e94362afdebaebe678215fba34589394fcf.tar.xz
Merge pull request #1096 from matrix-org/markjh/get_access_token
Add helper function for getting access_tokens from requests
Diffstat (limited to 'synapse/rest/client/v1/transactions.py')
-rw-r--r--synapse/rest/client/v1/transactions.py4
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