diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-06-04 06:49:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 06:49:51 -0400 |
| commit | f8b9ead3ee16a03049a2e36ff9d9c204ea80abb8 (patch) | |
| tree | 14af748d85c4634c582173453efa57b89944d870 /synapse/rest | |
| parent | Cleanups to the OpenID Connect integration (#7628) (diff) | |
| download | synapse-f8b9ead3ee16a03049a2e36ff9d9c204ea80abb8.tar.xz | |
Advertise the token login type when OpenID Connect is enabled. (#7631)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 36aca82346..6ac7c5142b 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -99,25 +99,20 @@ class LoginRestServlet(RestServlet): flows.append({"type": LoginRestServlet.JWT_TYPE}) if self.cas_enabled: - flows.append({"type": LoginRestServlet.SSO_TYPE}) - # we advertise CAS for backwards compat, though MSC1721 renamed it # to SSO. flows.append({"type": LoginRestServlet.CAS_TYPE}) + if self.cas_enabled or self.saml2_enabled or self.oidc_enabled: + flows.append({"type": LoginRestServlet.SSO_TYPE}) # While its valid for us to advertise this login type generally, # synapse currently only gives out these tokens as part of the - # CAS login flow. + # SSO login flow. # Generally we don't want to advertise login flows that clients # don't know how to implement, since they (currently) will always # fall back to the fallback API if they don't understand one of the # login flow types returned. flows.append({"type": LoginRestServlet.TOKEN_TYPE}) - elif self.saml2_enabled: - flows.append({"type": LoginRestServlet.SSO_TYPE}) - flows.append({"type": LoginRestServlet.TOKEN_TYPE}) - elif self.oidc_enabled: - flows.append({"type": LoginRestServlet.SSO_TYPE}) flows.extend( ({"type": t} for t in self.auth_handler.get_supported_login_types()) |