Merge pull request #1096 from matrix-org/markjh/get_access_token

Add helper function for getting access_tokens from requests
This commit is contained in:
Mark Haines 2016-09-09 17:09:27 +01:00 committed by GitHub
commit dbff7e9436
6 changed files with 67 additions and 27 deletions

View file

@ -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