diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-30 11:18:28 +0000 |
| commit | ef9c4476a0eb653637040f86dd900252cad30567 (patch) | |
| tree | ad14ecbbb2a03ceb47f8fba558994edd3d71b9df /synapse/handlers/register.py | |
| parent | Fix SQL so that accepts we may want to persist events twice. (diff) | |
| parent | SYWEB-12: Add a 'Room Info' button which displays all state content. (diff) | |
| download | synapse-ef9c4476a0eb653637040f86dd900252cad30567.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 94b7890b5e..88eb51a8ed 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -64,9 +64,11 @@ class RegistrationHandler(BaseHandler): user_id = user.to_string() token = self._generate_token(user_id) - yield self.store.register(user_id=user_id, + yield self.store.register( + user_id=user_id, token=token, - password_hash=password_hash) + password_hash=password_hash + ) self.distributor.fire("registered_user", user) else: @@ -181,8 +183,11 @@ class RegistrationHandler(BaseHandler): data = yield httpCli.post_urlencoded_get_json( creds['idServer'], "/_matrix/identity/api/v1/3pid/bind", - {'sid': creds['sid'], 'clientSecret': creds['clientSecret'], - 'mxid': mxid} + { + 'sid': creds['sid'], + 'clientSecret': creds['clientSecret'], + 'mxid': mxid, + } ) defer.returnValue(data) @@ -223,5 +228,3 @@ class RegistrationHandler(BaseHandler): } ) defer.returnValue(data) - - |