diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
| commit | 8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5 (patch) | |
| tree | b1ebd402c0805f475500c9f36a0356322bf26f13 /synapse/rest | |
| parent | Fix pep8 codestyle warnings (diff) | |
| parent | Merge branch 'develop' into http_client_refactor (diff) | |
| download | synapse-8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5.tar.xz | |
Merge pull request #20 from matrix-org/http_client_refactor
Http client refactor
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/register.py | 3 |
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 = { |