summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-04-24 11:44:27 +0100
committerDavid Baker <dave@matrix.org>2015-04-24 11:44:27 +0100
commit7ac8a60c6fdd1555cc86203d7c78415d9d236661 (patch)
treeb59438531f99ef0058b963c05a2aec93d3bdff07 /synapse/rest/client
parentUse underscores instead of camelcase for id server stuff (diff)
downloadsynapse-7ac8a60c6fdd1555cc86203d7c78415d9d236661.tar.xz
More underscores
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/account.py4
-rw-r--r--synapse/rest/client/v2_alpha/register.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index 4d199bbbb8..394e6b3809 100644
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -130,7 +130,7 @@ class ThreepidRestServlet(RestServlet):
                 400, "Failed to auth 3pid", Codes.THREEPID_AUTH_FAILED
             )
 
-        for reqd in ['medium', 'address', 'validatedAt']:
+        for reqd in ['medium', 'address', 'validated_at']:
             if reqd not in threepid:
                 logger.warn("Couldn't add 3pid: invalid response from ID sevrer")
                 raise SynapseError(500, "Invalid response from ID Server")
@@ -139,7 +139,7 @@ class ThreepidRestServlet(RestServlet):
             auth_user.to_string(),
             threepid['medium'],
             threepid['address'],
-            threepid['validatedAt'],
+            threepid['validated_at'],
         )
 
         if 'bind' in body and body['bind']:
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index dd176c7e77..3640fb4a29 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -121,7 +121,7 @@ class RegisterRestServlet(RestServlet):
         if LoginType.EMAIL_IDENTITY in result:
             threepid = result[LoginType.EMAIL_IDENTITY]
 
-            for reqd in ['medium', 'address', 'validatedAt']:
+            for reqd in ['medium', 'address', 'validated_at']:
                 if reqd not in threepid:
                     logger.info("Can't add incomplete 3pid")
                 else:
@@ -129,7 +129,7 @@ class RegisterRestServlet(RestServlet):
                         user_id,
                         threepid['medium'],
                         threepid['address'],
-                        threepid['validatedAt'],
+                        threepid['validated_at'],
                     )
 
             if 'bind_email' in params and params['bind_email']: