summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-02 16:36:32 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-03-02 16:36:32 +0000
commit2e7fad87d4d2bbae40c06850a49be3df2ab70248 (patch)
tree409b30e1dfc1bfd0951e5497a9fce4bb6418ce5a /synapse/config/homeserver.py
parentCast a coroutine into a Deferred in the federation base (#6996) (diff)
parentAdd a confirmation step to the SSO login flow (diff)
downloadsynapse-2e7fad87d4d2bbae40c06850a49be3df2ab70248.tar.xz
Merge branch 'anoabolivier/sso-confirm' into 'release-v1.11.1'
Add a confirmation step to the SSO login flow

See merge request new-vector/synapse!2
Diffstat (limited to 'synapse/config/homeserver.py')
-rw-r--r--synapse/config/homeserver.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py

index 6e348671c7..b4bca08b20 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -38,6 +38,7 @@ from .saml2_config import SAML2Config from .server import ServerConfig from .server_notices_config import ServerNoticesConfig from .spam_checker import SpamCheckerConfig +from .sso import SSOConfig from .stats import StatsConfig from .third_party_event_rules import ThirdPartyRulesConfig from .tls import TlsConfig @@ -65,6 +66,7 @@ class HomeServerConfig(RootConfig): KeyConfig, SAML2Config, CasConfig, + SSOConfig, JWTConfig, PasswordConfig, EmailConfig,