summary refs log tree commit diff
path: root/synapse/handlers/identity.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-15 17:14:25 +0100
committerDavid Baker <dave@matrix.org>2015-04-15 17:14:25 +0100
commit766bd8e88077cbeabffc353d9735a3af190abe61 (patch)
tree0a45dbf99c1ae64d736ac640e45d3aad9ffde83d /synapse/handlers/identity.py
parentRegstration with email in v2 (diff)
downloadsynapse-766bd8e88077cbeabffc353d9735a3af190abe61.tar.xz
Dummy login so we can do the first POST request to get login flows without it just succeeding
Diffstat (limited to 'synapse/handlers/identity.py')
-rw-r--r--synapse/handlers/identity.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py

index 671d366e40..19896ce90d 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py
@@ -42,8 +42,8 @@ class IdentityHandler(BaseHandler): # each request http_client = SimpleHttpClient(self.hs) # XXX: make this configurable! - #trustedIdServers = ['matrix.org', 'localhost:8090'] - trustedIdServers = ['matrix.org'] + trustedIdServers = ['matrix.org', 'localhost:8090'] + #trustedIdServers = ['matrix.org'] if not creds['idServer'] in trustedIdServers: logger.warn('%s is not a trusted ID server: rejecting 3pid ' + 'credentials', creds['idServer']) @@ -52,7 +52,7 @@ class IdentityHandler(BaseHandler): data = {} try: data = yield http_client.get_json( - "https://%s%s" % ( + "http://%s%s" % ( creds['idServer'], "/_matrix/identity/api/v1/3pid/getValidated3pid" ),