summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--synapse/handlers/admin.py7
-rw-r--r--synapse/handlers/register.py6
2 files changed, 5 insertions, 8 deletions
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py
index 5ba3c7039a..04fa58df65 100644
--- a/synapse/handlers/admin.py
+++ b/synapse/handlers/admin.py
@@ -42,16 +42,15 @@ class AdminHandler(BaseHandler):
 
         ret = {
             "user_id": user.to_string(),
-            "devices": [
-                {
-                    "device_id": None,
+            "devices": {
+                "": {
                     "sessions": [
                         {
                             "connections": connections,
                         }
                     ]
                 },
-            ],
+            },
         }
 
         defer.returnValue(ret)
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 5166bc7b62..a037da0f70 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -42,6 +42,7 @@ class RegistrationHandler(BaseHandler):
 
         self.distributor = hs.get_distributor()
         self.distributor.declare("registered_user")
+        self.captch_client = CaptchaServerHttpClient(hs)
 
     @defer.inlineCallbacks
     def check_username(self, localpart):
@@ -306,10 +307,7 @@ class RegistrationHandler(BaseHandler):
         """
         Used only by c/s api v1
         """
-        # TODO: get this from the homeserver rather than creating a new one for
-        # each request
-        client = CaptchaServerHttpClient(self.hs)
-        data = yield client.post_urlencoded_get_raw(
+        data = yield self.captcha_client.post_urlencoded_get_raw(
             "http://www.google.com:80/recaptcha/api/verify",
             args={
                 'privatekey': private_key,