summary refs log tree commit diff
path: root/synapse/rest/register.py
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-11-20 17:41:56 +0000
committerDavid Baker <dbkr@matrix.org>2014-11-20 17:41:56 +0000
commite377d3365293a25a9f4d38706da60f2c221fdf89 (patch)
treee20adc94d762f36500b93a655b19e4fb8852747a /synapse/rest/register.py
parentOops, I removed this param. (diff)
downloadsynapse-e377d3365293a25a9f4d38706da60f2c221fdf89.tar.xz
Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
Diffstat (limited to 'synapse/rest/register.py')
-rw-r--r--synapse/rest/register.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/rest/register.py b/synapse/rest/register.py
index 5c15614ea9..a51f77034a 100644
--- a/synapse/rest/register.py
+++ b/synapse/rest/register.py
@@ -222,6 +222,7 @@ class RegisterRestServlet(RestServlet):
 
         threepidCreds = register_json['threepidCreds']
         handler = self.handlers.registration_handler
+        logger.debug("Registering email. threepidcreds: %s" % (threepidCreds))
         yield handler.register_email(threepidCreds)
         session["threepidCreds"] = threepidCreds  # store creds for next stage
         session[LoginType.EMAIL_IDENTITY] = True  # mark email as done
@@ -232,6 +233,7 @@ class RegisterRestServlet(RestServlet):
 
     @defer.inlineCallbacks
     def _do_password(self, request, register_json, session):
+        yield
         if (self.hs.config.enable_registration_captcha and
                 not session[LoginType.RECAPTCHA]):
             # captcha should've been done by this stage!
@@ -259,6 +261,7 @@ class RegisterRestServlet(RestServlet):
         )
 
         if session[LoginType.EMAIL_IDENTITY]:
+            logger.debug("Binding emails %s to %s" % (session["threepidCreds"], user_id))
             yield handler.bind_emails(user_id, session["threepidCreds"])
 
         result = {