summary refs log tree commit diff
path: root/synapse/handlers/login.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-02 13:57:48 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-02 14:03:26 +0100
commit4f11518934c3e032a763f115a73261414d67f87b (patch)
tree030ed29a6bbf57f706be58bcdcde8536bfafe5d0 /synapse/handlers/login.py
parentMerge branch 'master' into develop (diff)
downloadsynapse-4f11518934c3e032a763f115a73261414d67f87b.tar.xz
Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers
Diffstat (limited to 'synapse/handlers/login.py')
-rw-r--r--synapse/handlers/login.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py

index 80ffdd2726..3f152e18f0 100644 --- a/synapse/handlers/login.py +++ b/synapse/handlers/login.py
@@ -17,7 +17,7 @@ from twisted.internet import defer from ._base import BaseHandler from synapse.api.errors import LoginError, Codes -from synapse.http.client import PlainHttpClient +from synapse.http.client import IdentityServerHttpClient from synapse.util.emailutils import EmailException import synapse.util.emailutils as emailutils @@ -97,10 +97,10 @@ class LoginHandler(BaseHandler): @defer.inlineCallbacks def _query_email(self, email): - httpCli = PlainHttpClient(self.hs) + httpCli = IdentityServerHttpClient(self.hs) data = yield httpCli.get_json( 'matrix.org:8090', # TODO FIXME This should be configurable. "/_matrix/identity/api/v1/lookup?medium=email&address=" + "%s" % urllib.quote(email) ) - defer.returnValue(data) \ No newline at end of file + defer.returnValue(data)