diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-06-02 14:31:35 +0100 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-06-02 14:31:35 +0100 |
| commit | fb2193cc63c8297238423f0df547d4527a41eefc (patch) | |
| tree | c62b3850a6fefbde1e8ab3bf63b8f279dd3075f0 /synapse/handlers | |
| parent | Disable INCLUDE_ALL_UNREAD_NOTIFS (diff) | |
| parent | Split out the auth handler (diff) | |
| download | synapse-fb2193cc63c8297238423f0df547d4527a41eefc.tar.xz | |
Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler
Split out the auth handler
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/register.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py index c0069e23d6..d28e07f0d9 100644 --- a/synapse/handlers/__init__.py +++ b/synapse/handlers/__init__.py @@ -24,7 +24,6 @@ from .federation import FederationHandler from .profile import ProfileHandler from .directory import DirectoryHandler from .admin import AdminHandler -from .auth import AuthHandler from .identity import IdentityHandler from .receipts import ReceiptsHandler from .search import SearchHandler @@ -50,7 +49,6 @@ class Handlers(object): self.directory_handler = DirectoryHandler(hs) self.admin_handler = AdminHandler(hs) self.receipts_handler = ReceiptsHandler(hs) - self.auth_handler = AuthHandler(hs) self.identity_handler = IdentityHandler(hs) self.search_handler = SearchHandler(hs) self.room_context_handler = RoomContextHandler(hs) diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 16f33f8371..bbc07b045e 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -413,7 +413,7 @@ class RegistrationHandler(BaseHandler): defer.returnValue((user_id, token)) def auth_handler(self): - return self.hs.get_handlers().auth_handler + return self.hs.get_auth_handler() @defer.inlineCallbacks def guest_access_token_for(self, medium, address, inviter_user_id): |