diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-04-03 15:35:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 15:35:05 -0400 |
| commit | 694d8bed0e56366f080a49db0f930d635ca6cdf4 (patch) | |
| tree | b4a5fddf3cb5d5ae124bba9788483b6477fc1747 /synapse/handlers/auth.py | |
| parent | Extend web_client_location to handle absolute URLs (#7006) (diff) | |
| download | synapse-694d8bed0e56366f080a49db0f930d635ca6cdf4.tar.xz | |
Support CAS in UI Auth flows. (#7186)
Diffstat (limited to 'synapse/handlers/auth.py')
| -rw-r--r-- | synapse/handlers/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 7c09d15a72..892adb00b9 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -116,7 +116,7 @@ class AuthHandler(BaseHandler): self.hs = hs # FIXME better possibility to access registrationHandler later? self.macaroon_gen = hs.get_macaroon_generator() self._password_enabled = hs.config.password_enabled - self._saml2_enabled = hs.config.saml2_enabled + self._sso_enabled = hs.config.saml2_enabled or hs.config.cas_enabled # we keep this as a list despite the O(N^2) implication so that we can # keep PASSWORD first and avoid confusing clients which pick the first @@ -136,7 +136,7 @@ class AuthHandler(BaseHandler): # necessarily identical. Login types have SSO (and other login types) # added in the rest layer, see synapse.rest.client.v1.login.LoginRestServerlet.on_GET. ui_auth_types = login_types.copy() - if self._saml2_enabled: + if self._sso_enabled: ui_auth_types.append(LoginType.SSO) self._supported_ui_auth_types = ui_auth_types |