summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-01-08 14:24:41 +0000
committerGitHub <noreply@github.com>2021-01-08 14:24:41 +0000
commit12f79da587413b75bfc1a0b47bbd02587da0d2cf (patch)
treea98f144d4f86f9571962ef6b611cc8eb40c6b7b1 /synapse
parentFix validate_config on nested objects (#9054) (diff)
parentchangelog (diff)
downloadsynapse-12f79da587413b75bfc1a0b47bbd02587da0d2cf.tar.xz
Merge pull request #9036 from matrix-org/rav/multi_idp/tests
Add tests for the IdP picker
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v1/login.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index ebc346105b..be938df962 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -319,9 +319,9 @@ class SsoRedirectServlet(RestServlet):
         # register themselves with the main SSOHandler.
         if hs.config.cas_enabled:
             hs.get_cas_handler()
-        elif hs.config.saml2_enabled:
+        if hs.config.saml2_enabled:
             hs.get_saml_handler()
-        elif hs.config.oidc_enabled:
+        if hs.config.oidc_enabled:
             hs.get_oidc_handler()
         self._sso_handler = hs.get_sso_handler()