diff options
author | Paul Evans <leonerd@leonerd.org.uk> | 2016-09-09 15:43:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-09 15:43:11 +0100 |
commit | 56f38d177694ca858594597a03567b7964ac44d8 (patch) | |
tree | c3239f27a6551f388a5e1211854d52edeee5071f /synapse/rest/client | |
parent | Merge pull request #1094 from matrix-org/paul/get-state-whole-event (diff) | |
parent | Log if rejecting 3PE query metadata result due to type check (diff) | |
download | synapse-56f38d177694ca858594597a03567b7964ac44d8.tar.xz |
Merge pull request #1091 from matrix-org/paul/third-party-lookup
Improvements to 3PE lookup API
Diffstat (limited to 'synapse/rest/client')
-rw-r--r-- | synapse/rest/client/v2_alpha/thirdparty.py | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/thirdparty.py b/synapse/rest/client/v2_alpha/thirdparty.py index 4f6f1a7e17..dca615927a 100644 --- a/synapse/rest/client/v2_alpha/thirdparty.py +++ b/synapse/rest/client/v2_alpha/thirdparty.py @@ -42,6 +42,29 @@ class ThirdPartyProtocolsServlet(RestServlet): defer.returnValue((200, protocols)) +class ThirdPartyProtocolServlet(RestServlet): + PATTERNS = client_v2_patterns("/thirdparty/protocol/(?P<protocol>[^/]+)$", + releases=()) + + def __init__(self, hs): + super(ThirdPartyProtocolServlet, self).__init__() + + self.auth = hs.get_auth() + self.appservice_handler = hs.get_application_service_handler() + + @defer.inlineCallbacks + def on_GET(self, request, protocol): + yield self.auth.get_user_by_req(request) + + protocols = yield self.appservice_handler.get_3pe_protocols( + only_protocol=protocol, + ) + if protocol in protocols: + defer.returnValue((200, protocols[protocol])) + else: + defer.returnValue((404, {"error": "Unknown protocol"})) + + class ThirdPartyUserServlet(RestServlet): PATTERNS = client_v2_patterns("/thirdparty/user(/(?P<protocol>[^/]+))?$", releases=()) @@ -92,5 +115,6 @@ class ThirdPartyLocationServlet(RestServlet): def register_servlets(hs, http_server): ThirdPartyProtocolsServlet(hs).register(http_server) + ThirdPartyProtocolServlet(hs).register(http_server) ThirdPartyUserServlet(hs).register(http_server) ThirdPartyLocationServlet(hs).register(http_server) |