summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-31 16:31:48 +0000
committerGitHub <noreply@github.com>2018-08-31 16:31:48 +0000
commit99178f86025f881b74b1a609a73d5920e701eddb (patch)
treeae140eb5def07a0ecf98fd4e0178107e3ba6113c /synapse/handlers
parentPort storage/ to Python 3 (#3725) (diff)
parentassert rather than warn (diff)
downloadsynapse-99178f86025f881b74b1a609a73d5920e701eddb.tar.xz
Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration
fix bug where preserved threepid user comes to sign up and server is …
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/register.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index f03ee1476b..1e53f2c635 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -125,6 +125,7 @@ class RegistrationHandler(BaseHandler):
         guest_access_token=None,
         make_guest=False,
         admin=False,
+        threepid=None,
     ):
         """Registers a new client on the server.
 
@@ -145,7 +146,7 @@ class RegistrationHandler(BaseHandler):
             RegistrationError if there was a problem registering.
         """
 
-        yield self.auth.check_auth_blocking()
+        yield self.auth.check_auth_blocking(threepid=threepid)
         password_hash = None
         if password:
             password_hash = yield self.auth_handler().hash(password)