Merge pull request #932 from matrix-org/rav/register_refactor

Further registration refactoring
This commit is contained in:
David Baker 2016-07-20 11:03:33 +01:00 committed by GitHub
commit e967bc86e7
5 changed files with 57 additions and 22 deletions

View file

@ -60,6 +60,7 @@ class RegisterRestServlet(ClientV1RestServlet):
# TODO: persistent storage
self.sessions = {}
self.enable_registration = hs.config.enable_registration
self.auth_handler = hs.get_auth_handler()
def on_GET(self, request):
if self.hs.config.enable_registration_captcha:
@ -299,9 +300,10 @@ class RegisterRestServlet(ClientV1RestServlet):
user_localpart = register_json["user"].encode("utf-8")
handler = self.handlers.registration_handler
(user_id, token) = yield handler.appservice_register(
user_id = yield handler.appservice_register(
user_localpart, as_token
)
token = yield self.auth_handler.issue_access_token(user_id)
self._remove_session(session)
defer.returnValue({
"user_id": user_id,