summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-10-29 00:12:07 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-10-29 00:12:07 +0000
commit1ef1b716e2d01c6aeb7f439c6265ed7d022e0eb4 (patch)
treea055391c672de05dc4180073eebe8673d875d225 /synapse/rest/client/v2_alpha
parentfix conflict and reinstate 6372dff771413c2b9cd5648cbb6de01a679ef801 (diff)
downloadsynapse-github/matthew/delegate_register.tar.xz
Diffstat (limited to 'synapse/rest/client/v2_alpha')
-rw-r--r--synapse/rest/client/v2_alpha/register.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py

index 7bbebd54ab..b80855b71f 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py
@@ -467,7 +467,6 @@ class RegisterRestServlet(RestServlet): pass guest_access_token = params.get("guest_access_token", None) - new_password = params.get("password", None) # XXX: don't we need to validate these for length etc like we did on # the ones from the JSON body earlier on in the method? @@ -477,12 +476,19 @@ class RegisterRestServlet(RestServlet): (registered_user_id, _) = yield self.registration_handler.register( localpart=desired_username, - password=new_password, + password=params.get("password", None), guest_access_token=guest_access_token, generate_token=False, display_name=desired_display_name, ) + if self.hs.config.chain_register: + yield self.registration_handler.chain_register( + localpart=desired_username, + auth_result=auth_result, + params=params, + ) + # remember that we've now registered that user account, and with # what user ID (since the user may not have specified) self.auth_handler.set_session_data(