Regstration with email in v2

This commit is contained in:
David Baker 2015-04-15 15:50:38 +01:00
parent 4eb6d66b45
commit a19b739909
6 changed files with 123 additions and 29 deletions

View file

@ -74,7 +74,7 @@ class RegisterRestServlet(RestServlet):
)
is_using_shared_secret = True
else:
authed, result = yield self.auth_handler.check_auth([
authed, result, params = yield self.auth_handler.check_auth([
[LoginType.RECAPTCHA],
[LoginType.EMAIL_IDENTITY, LoginType.RECAPTCHA],
], body, self.hs.get_ip_from_request(request))
@ -90,10 +90,10 @@ class RegisterRestServlet(RestServlet):
if not can_register:
raise SynapseError(403, "Registration has been disabled")
if 'username' not in body or 'password' not in body:
if 'username' not in params or 'password' not in params:
raise SynapseError(400, "", Codes.MISSING_PARAM)
desired_username = body['username']
new_password = body['password']
desired_username = params['username']
new_password = params['password']
(user_id, token) = yield self.registration_handler.register(
localpart=desired_username,