From 2c00e1ecd9774463d687559d5df38b2a76340b32 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 15 Sep 2014 15:38:29 +0100
Subject: [PATCH] Be consistent when associating keys with login types for
 registration/login.

---
 cmdclient/console.py                          | 2 +-
 synapse/rest/register.py                      | 2 +-
 tests/rest/utils.py                           | 2 +-
 webclient/components/matrix/matrix-service.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmdclient/console.py b/cmdclient/console.py
index 5a9d4c3c4..d9c6ec6a7 100755
--- a/cmdclient/console.py
+++ b/cmdclient/console.py
@@ -162,7 +162,7 @@ class SynapseCmd(cmd.Cmd):
             "type": "m.login.password"
         }
         if "userid" in args:
-            body["user_id"] = args["userid"]
+            body["user"] = args["userid"]
         if password:
             body["password"] = password
 
diff --git a/synapse/rest/register.py b/synapse/rest/register.py
index fe8f0ed23..c2c80e70c 100644
--- a/synapse/rest/register.py
+++ b/synapse/rest/register.py
@@ -192,7 +192,7 @@ class RegisterRestServlet(RestServlet):
             raise SynapseError(400, "Captcha is required.")
 
         password = register_json["password"].encode("utf-8")
-        desired_user_id = (register_json["user_id"].encode("utf-8") if "user_id"
+        desired_user_id = (register_json["user"].encode("utf-8") if "user"
                           in register_json else None)
         if desired_user_id and urllib.quote(desired_user_id) != desired_user_id:
             raise SynapseError(
diff --git a/tests/rest/utils.py b/tests/rest/utils.py
index 25ed1388c..579441fb4 100644
--- a/tests/rest/utils.py
+++ b/tests/rest/utils.py
@@ -99,7 +99,7 @@ class RestTestCase(unittest.TestCase):
             "POST",
             "/register",
             json.dumps({
-                "user_id": user_id,
+                "user": user_id,
                 "password": "test",
                 "type": "m.login.password"
             }))
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 35ebca961..069e02e93 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -100,7 +100,7 @@ angular.module('matrixService', [])
         }
         else if (loginType === "m.login.password") {
             data = {
-                user_id: userName,
+                user: userName,
                 password: password
             };
         }