diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2017-11-30 01:51:38 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2017-11-30 01:51:38 +0000 |
| commit | f397153dfc4020744e1cf8687abb01d4b7885a7a (patch) | |
| tree | 342da238d1e7de6178731ad6a040bf9c3de16ce1 /synapse/rest/client/v1/admin.py | |
| parent | specify default user_directory_include_pattern (diff) | |
| parent | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments (diff) | |
| download | synapse-f397153dfc4020744e1cf8687abb01d4b7885a7a.tar.xz | |
Merge branch 'develop' into matthew/search-all-local-users
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 1197158fdc..5022808ea9 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -137,8 +137,8 @@ class DeactivateAccountRestServlet(ClientV1RestServlet): PATTERNS = client_path_patterns("/admin/deactivate/(?P<target_user_id>[^/]*)") def __init__(self, hs): - self._auth_handler = hs.get_auth_handler() super(DeactivateAccountRestServlet, self).__init__(hs) + self._deactivate_account_handler = hs.get_deactivate_account_handler() @defer.inlineCallbacks def on_POST(self, request, target_user_id): @@ -149,7 +149,7 @@ class DeactivateAccountRestServlet(ClientV1RestServlet): if not is_admin: raise AuthError(403, "You are not a server admin") - yield self._auth_handler.deactivate_account(target_user_id) + yield self._deactivate_account_handler.deactivate_account(target_user_id) defer.returnValue((200, {})) @@ -309,7 +309,7 @@ class ResetPasswordRestServlet(ClientV1RestServlet): super(ResetPasswordRestServlet, self).__init__(hs) self.hs = hs self.auth = hs.get_auth() - self.auth_handler = hs.get_auth_handler() + self._set_password_handler = hs.get_set_password_handler() @defer.inlineCallbacks def on_POST(self, request, target_user_id): @@ -330,7 +330,7 @@ class ResetPasswordRestServlet(ClientV1RestServlet): logger.info("new_password: %r", new_password) - yield self.auth_handler.set_password( + yield self._set_password_handler.set_password( target_user_id, new_password, requester ) defer.returnValue((200, {})) |