diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2023-03-16 10:35:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 10:35:31 +0000 |
| commit | 4953cd71dfbb1925dc4a477efd2ed48c2dfd70d6 (patch) | |
| tree | f1e17b835782865317d04e63b9b0f398d629f7c4 /synapse/rest | |
| parent | Preparatory work to fix the user directory assuming that any remote membershi... (diff) | |
| download | synapse-4953cd71dfbb1925dc4a477efd2ed48c2dfd70d6.tar.xz | |
Move Account Validity callbacks to a dedicated file (#15237)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/admin/users.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 357e9a574d..281e8fd0ad 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -683,19 +683,18 @@ class AccountValidityRenewServlet(RestServlet): PATTERNS = admin_patterns("/account_validity/validity$") def __init__(self, hs: "HomeServer"): - self.account_activity_handler = hs.get_account_validity_handler() + self.account_validity_handler = hs.get_account_validity_handler() + self.account_validity_module_callbacks = ( + hs.get_module_api_callbacks().account_validity + ) self.auth = hs.get_auth() async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]: await assert_requester_is_admin(self.auth, request) - if self.account_activity_handler.on_legacy_admin_request_callback: - expiration_ts = ( - await ( - self.account_activity_handler.on_legacy_admin_request_callback( - request - ) - ) + if self.account_validity_module_callbacks.on_legacy_admin_request_callback: + expiration_ts = await self.account_validity_module_callbacks.on_legacy_admin_request_callback( + request ) else: body = parse_json_object_from_request(request) @@ -706,7 +705,7 @@ class AccountValidityRenewServlet(RestServlet): "Missing property 'user_id' in the request body", ) - expiration_ts = await self.account_activity_handler.renew_account_for_user( + expiration_ts = await self.account_validity_handler.renew_account_for_user( body["user_id"], body.get("expiration_ts"), not body.get("enable_renewal_emails", True), |