diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-09-09 17:09:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 17:09:27 +0100 |
| commit | dbff7e94362afdebaebe678215fba34589394fcf (patch) | |
| tree | db75c5d7a395a8b66bc6c1eca746f8bc4ab6cfd1 /synapse/rest/client/v2_alpha/thirdparty.py | |
| parent | Merge pull request #1091 from matrix-org/paul/third-party-lookup (diff) | |
| parent | Add helper function for getting access_tokens from requests (diff) | |
| download | synapse-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/v2_alpha/thirdparty.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/thirdparty.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/thirdparty.py b/synapse/rest/client/v2_alpha/thirdparty.py index dca615927a..31f94bc6e9 100644 --- a/synapse/rest/client/v2_alpha/thirdparty.py +++ b/synapse/rest/client/v2_alpha/thirdparty.py @@ -80,7 +80,7 @@ class ThirdPartyUserServlet(RestServlet): yield self.auth.get_user_by_req(request) fields = request.args - del fields["access_token"] + fields.pop("access_token", None) results = yield self.appservice_handler.query_3pe( ThirdPartyEntityKind.USER, protocol, fields @@ -104,7 +104,7 @@ class ThirdPartyLocationServlet(RestServlet): yield self.auth.get_user_by_req(request) fields = request.args - del fields["access_token"] + fields.pop("access_token", None) results = yield self.appservice_handler.query_3pe( ThirdPartyEntityKind.LOCATION, protocol, fields |