summary refs log tree commit diff
path: root/synapse/config/_base.pyi
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/_base.pyi
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/_base.pyi')
-rw-r--r--synapse/config/_base.pyi2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/_base.pyi b/synapse/config/_base.pyi
index 86bc965ee4..3053fc9d27 100644
--- a/synapse/config/_base.pyi
+++ b/synapse/config/_base.pyi
@@ -24,6 +24,7 @@ from synapse.config import (
     server,
     server_notices_config,
     spam_checker,
+    sso,
     stats,
     third_party_event_rules,
     tls,
@@ -57,6 +58,7 @@ class RootConfig:
     key: key.KeyConfig
     saml2: saml2_config.SAML2Config
     cas: cas.CasConfig
+    sso: sso.SSOConfig
     jwt: jwt_config.JWTConfig
     password: password.PasswordConfig
     email: emailconfig.EmailConfig