diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-12 15:49:37 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-12 15:49:37 +0100 |
| commit | 415c2f05491ce65a4fc34326519754cd1edd9c54 (patch) | |
| tree | 85f397b2fca667a430299a694d701cd6abe5822a /synapse/rest/client/v2_alpha/register.py | |
| parent | Merge branch 'develop' into auth (diff) | |
| download | synapse-415c2f05491ce65a4fc34326519754cd1edd9c54.tar.xz | |
Simplify LoginHander and AuthHandler
* Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly
Diffstat (limited to 'synapse/rest/client/v2_alpha/register.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index b5926f9ca6..012c447e88 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -50,7 +50,6 @@ class RegisterRestServlet(RestServlet): self.auth_handler = hs.get_handlers().auth_handler self.registration_handler = hs.get_handlers().registration_handler self.identity_handler = hs.get_handlers().identity_handler - self.login_handler = hs.get_handlers().login_handler @defer.inlineCallbacks def on_POST(self, request): @@ -143,7 +142,7 @@ class RegisterRestServlet(RestServlet): if reqd not in threepid: logger.info("Can't add incomplete 3pid") else: - yield self.login_handler.add_threepid( + yield self.auth_handler.add_threepid( user_id, threepid['medium'], threepid['address'], |