diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-18 10:23:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-18 10:23:37 +0100 |
| commit | 131bdf9bb177a337a57f0a3f746ec019dbc5ace6 (patch) | |
| tree | 8c26a82d488990d55c2ab51ded91fd7219ccbb8c /synapse/rest | |
| parent | Remove pointless newline (diff) | |
| parent | Move get_events functions to storage.events (diff) | |
| download | synapse-131bdf9bb177a337a57f0a3f746ec019dbc5ace6.tar.xz | |
Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/perf
Diffstat (limited to 'synapse/rest')
| -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']: |