diff options
| author | David Baker <dave@matrix.org> | 2015-05-14 12:03:13 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-05-14 12:03:13 +0100 |
| commit | c37a6e151ff551bb4ec243d5d237761c2ed6b914 (patch) | |
| tree | 700b779e1f157d8362b82ece973efbd293ed3560 /synapse | |
| parent | Add ID generator for push_rules_enable to #resolve SYN-378 (diff) | |
| download | synapse-c37a6e151ff551bb4ec243d5d237761c2ed6b914.tar.xz | |
Make shared secret registration work again
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 3640fb4a29..72dfb876c5 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -82,8 +82,10 @@ class RegisterRestServlet(RestServlet): [LoginType.EMAIL_IDENTITY] ] + result = None if service: is_application_server = True + params = body elif 'mac' in body: # Check registration-specific shared secret auth if 'username' not in body: @@ -92,6 +94,7 @@ class RegisterRestServlet(RestServlet): body['username'], body['mac'] ) is_using_shared_secret = True + params = body else: authed, result, params = yield self.auth_handler.check_auth( flows, body, self.hs.get_ip_from_request(request) @@ -118,7 +121,7 @@ class RegisterRestServlet(RestServlet): password=new_password ) - if LoginType.EMAIL_IDENTITY in result: + if result and LoginType.EMAIL_IDENTITY in result: threepid = result[LoginType.EMAIL_IDENTITY] for reqd in ['medium', 'address', 'validated_at']: |