From 7f23425e59796b64faffca8b42f54dd41c08c827 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Mon, 15 Sep 2014 15:09:21 +0100
Subject: Updated cmdclient to use new registration logic.

---
 cmdclient/console.py | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'cmdclient')

diff --git a/cmdclient/console.py b/cmdclient/console.py
index 2e6b026762..5a9d4c3c4c 100755
--- a/cmdclient/console.py
+++ b/cmdclient/console.py
@@ -145,35 +145,50 @@ class SynapseCmd(cmd.Cmd):
         <noupdate> : Do not automatically clobber config values.
         """
         args = self._parse(line, ["userid", "noupdate"])
-        path = "/register"
 
         password = None
         pwd = None
         pwd2 = "_"
         while pwd != pwd2:
-            pwd = getpass.getpass("(Optional) Type a password for this user: ")
-            if len(pwd) == 0:
-                print "Not using a password for this user."
-                break
+            pwd = getpass.getpass("Type a password for this user: ")
             pwd2 = getpass.getpass("Retype the password: ")
-            if pwd != pwd2:
+            if pwd != pwd2 or len(pwd) == 0:
                 print "Password mismatch."
+                pwd = None
             else:
                 password = pwd
 
-        body = {}
+        body = {
+            "type": "m.login.password"
+        }
         if "userid" in args:
             body["user_id"] = args["userid"]
         if password:
             body["password"] = password
 
-        reactor.callFromThread(self._do_register, "POST", path, body,
+        reactor.callFromThread(self._do_register, body,
                                "noupdate" not in args)
 
     @defer.inlineCallbacks
-    def _do_register(self, method, path, data, update_config):
-        url = self._url() + path
-        json_res = yield self.http_client.do_request(method, url, data=data)
+    def _do_register(self, data, update_config):
+        # check the registration flows
+        url = self._url() + "/register"
+        json_res = yield self.http_client.do_request("GET", url)
+        print json.dumps(json_res, indent=4)
+
+        passwordFlow = None
+        for flow in json_res["flows"]:
+            if flow["type"] == "m.login.recaptcha" or ("stages" in flow and "m.login.recaptcha" in flow["stages"]):
+                print "Unable to register: Home server requires captcha."
+                return
+            if flow["type"] == "m.login.password" and "stages" not in flow:
+                passwordFlow = flow
+                break
+
+        if not passwordFlow:
+            return
+
+        json_res = yield self.http_client.do_request("POST", url, data=data)
         print json.dumps(json_res, indent=4)
         if update_config and "user_id" in json_res:
             self.config["user"] = json_res["user_id"]
-- 
cgit 1.4.1


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: 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(-)

(limited to 'cmdclient')

diff --git a/cmdclient/console.py b/cmdclient/console.py
index 5a9d4c3c4c..d9c6ec6a70 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 fe8f0ed23f..c2c80e70c7 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 25ed1388cf..579441fb4a 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 35ebca961c..069e02e939 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
             };
         }
-- 
cgit 1.4.1