diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-04-19 19:16:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-19 19:16:34 +0100 |
commit | 71f0623de968f07292d5a092e9197f7513ab6cde (patch) | |
tree | 11034db4ceb3e2910510f88fd4287fc38c7a1f79 /synapse/config/_base.pyi | |
parent | Sanity check identity server passed to bind/unbind. (#9802) (diff) | |
download | synapse-71f0623de968f07292d5a092e9197f7513ab6cde.tar.xz |
Port "Allow users to click account renewal links multiple times without hitting an 'Invalid Token' page #74" from synapse-dinsic (#9832)
This attempts to be a direct port of https://github.com/matrix-org/synapse-dinsic/pull/74 to mainline. There was some fiddling required to deal with the changes that have been made to mainline since (mainly dealing with the split of `RegistrationWorkerStore` from `RegistrationStore`, and the changes made to `self.make_request` in test code).
Diffstat (limited to 'synapse/config/_base.pyi')
-rw-r--r-- | synapse/config/_base.pyi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/_base.pyi b/synapse/config/_base.pyi index e896fd34e2..ddec356a07 100644 --- a/synapse/config/_base.pyi +++ b/synapse/config/_base.pyi @@ -1,6 +1,7 @@ from typing import Any, Iterable, List, Optional from synapse.config import ( + account_validity, api, appservice, auth, @@ -59,6 +60,7 @@ class RootConfig: captcha: captcha.CaptchaConfig voip: voip.VoipConfig registration: registration.RegistrationConfig + account_validity: account_validity.AccountValidityConfig metrics: metrics.MetricsConfig api: api.ApiConfig appservice: appservice.AppServiceConfig |