summary refs log tree commit diff
path: root/synapse/handlers/identity.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-24 11:27:38 +0100
committerDavid Baker <dave@matrix.org>2015-04-24 11:27:38 +0100
commita21861962608726a5fe443762421c80119517778 (patch)
tree9b5ba7684facf3662a0a08df2baf2b1c9ed2683e /synapse/handlers/identity.py
parentpep8 (diff)
downloadsynapse-a21861962608726a5fe443762421c80119517778.tar.xz
Use underscores instead of camelcase for id server stuff
Diffstat (limited to 'synapse/handlers/identity.py')
-rw-r--r--synapse/handlers/identity.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index 5c72635915..3ddd834c61 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -44,19 +44,19 @@ class IdentityHandler(BaseHandler):
         # XXX: make this configurable!
         # trustedIdServers = ['matrix.org', 'localhost:8090']
         trustedIdServers = ['matrix.org']
-        if not creds['idServer'] in trustedIdServers:
+        if not creds['id_server'] in trustedIdServers:
             logger.warn('%s is not a trusted ID server: rejecting 3pid ' +
-                        'credentials', creds['idServer'])
+                        'credentials', creds['id_server'])
             defer.returnValue(None)
 
         data = {}
         try:
             data = yield http_client.get_json(
                 "http://%s%s" % (
-                    creds['idServer'],
+                    creds['id_server'],
                     "/_matrix/identity/api/v1/3pid/getValidated3pid"
                 ),
-                {'sid': creds['sid'], 'clientSecret': creds['clientSecret']}
+                {'sid': creds['sid'], 'client_secret': creds['client_secret']}
             )
         except CodeMessageException as e:
             data = json.loads(e.msg)
@@ -75,11 +75,11 @@ class IdentityHandler(BaseHandler):
             data = yield http_client.post_urlencoded_get_json(
                 # XXX: Change when ID servers are all HTTPS
                 "http://%s%s" % (
-                    creds['idServer'], "/_matrix/identity/api/v1/3pid/bind"
+                    creds['id_server'], "/_matrix/identity/api/v1/3pid/bind"
                 ),
                 {
                     'sid': creds['sid'],
-                    'clientSecret': creds['clientSecret'],
+                    'client_secret': creds['client_secret'],
                     'mxid': mxid,
                 }
             )