summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-29 13:49:44 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-29 13:49:44 +0100
commit784aaa53dfcd25643088d9347e58b5a746f71f21 (patch)
treed1209dc7994aaa650fc2a4765eb501c0fbfb66d7 /synapse/handlers
parentAdd config for setting the recaptcha verify api endpoint, so we can test it i... (diff)
parentSYN-395: Fix CAPTCHA, don't double decode json (diff)
downloadsynapse-784aaa53dfcd25643088d9347e58b5a746f71f21.tar.xz
Merge branch 'develop' into markjh/SYT-8-recaptcha
Conflicts:
	synapse/handlers/auth.py
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/auth.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 4b442a8358..63071653a3 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -199,6 +199,7 @@ class AuthHandler(BaseHandler):
             # Twisted is silly
             data = pde.response
             resp_body = simplejson.loads(data)
+
         if 'success' in resp_body and resp_body['success']:
             defer.returnValue(True)
         raise LoginError(401, "", errcode=Codes.UNAUTHORIZED)