diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-09-09 16:29:10 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-09-09 16:33:15 +0100 |
| commit | 8aee5aa06807210c17ad0e58e4f237fcf2d052f9 (patch) | |
| tree | 2519b7e5fb3358cbd300a0d3dc73f305814fe967 /synapse/rest/client/v1/logout.py | |
| parent | Merge pull request #1092 from matrix-org/erikj/transaction_queue_check (diff) | |
| download | synapse-8aee5aa06807210c17ad0e58e4f237fcf2d052f9.tar.xz | |
Add helper function for getting access_tokens from requests
Rather than reimplementing the token parsing in the various places. This will make it easier to change the token parsing to allow access_tokens in HTTP headers.
Diffstat (limited to 'synapse/rest/client/v1/logout.py')
| -rw-r--r-- | synapse/rest/client/v1/logout.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/synapse/rest/client/v1/logout.py b/synapse/rest/client/v1/logout.py index 9bff02ee4e..1358d0acab 100644 --- a/synapse/rest/client/v1/logout.py +++ b/synapse/rest/client/v1/logout.py @@ -15,7 +15,7 @@ from twisted.internet import defer -from synapse.api.errors import AuthError, Codes +from synapse.api.auth import get_access_token_from_request from .base import ClientV1RestServlet, client_path_patterns @@ -37,13 +37,7 @@ class LogoutRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_POST(self, request): - try: - access_token = request.args["access_token"][0] - except KeyError: - raise AuthError( - self.TOKEN_NOT_FOUND_HTTP_STATUS, "Missing access token.", - errcode=Codes.MISSING_TOKEN - ) + access_token = get_access_token_from_request(request) yield self.store.delete_access_token(access_token) defer.returnValue((200, {})) |