diff options
| author | Jason Robinson <jasonr@matrix.org> | 2021-01-09 22:00:04 +0200 |
|---|---|---|
| committer | Jason Robinson <jasonr@matrix.org> | 2021-01-09 22:00:04 +0200 |
| commit | 2eb421b606c1ab3c720f510abbd6dc9ad25c0673 (patch) | |
| tree | f69dde7b789a3c8bfe06a12a46792c92ffa05a1d /synapse/rest | |
| parent | Implement clearing cache after deleting forward extremities (diff) | |
| parent | Keycloak mapping_provider example (#9037) (#9057) (diff) | |
| download | synapse-2eb421b606c1ab3c720f510abbd6dc9ad25c0673.tar.xz | |
Merge branch 'develop' into jaywink/admin-forward-extremities
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 4 |
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() |