diff options
| author | Sean <squahtx@users.noreply.github.com> | 2021-09-09 17:59:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 17:59:59 +0100 |
| commit | 273b6861f284e3e51c87c32060ad9f078cedeed7 (patch) | |
| tree | efbfbf1341915c59d2ee6df84fe20d285f7eaa86 /synapse/handlers | |
| parent | Prefer room v9 for restricted rooms. (#10772) (diff) | |
| download | synapse-273b6861f284e3e51c87c32060ad9f078cedeed7.tar.xz | |
Remove unstable MSC2858 API, including `experimental.msc2858_enabled` config option (#10693)
Signed-off-by: Sean Quah <seanq@element.io>
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/cas.py | 1 | ||||
| -rw-r--r-- | synapse/handlers/oidc.py | 3 | ||||
| -rw-r--r-- | synapse/handlers/saml.py | 1 | ||||
| -rw-r--r-- | synapse/handlers/sso.py | 5 |
4 files changed, 0 insertions, 10 deletions
diff --git a/synapse/handlers/cas.py b/synapse/handlers/cas.py index 0325f86e20..47ddabbe46 100644 --- a/synapse/handlers/cas.py +++ b/synapse/handlers/cas.py @@ -82,7 +82,6 @@ class CasHandler: # the SsoIdentityProvider protocol type. self.idp_icon = None self.idp_brand = None - self.unstable_idp_brand = None self._sso_handler = hs.get_sso_handler() diff --git a/synapse/handlers/oidc.py b/synapse/handlers/oidc.py index eca8f16040..648fcf76f8 100644 --- a/synapse/handlers/oidc.py +++ b/synapse/handlers/oidc.py @@ -338,9 +338,6 @@ class OidcProvider: # optional brand identifier for this auth provider self.idp_brand = provider.idp_brand - # Optional brand identifier for the unstable API (see MSC2858). - self.unstable_idp_brand = provider.unstable_idp_brand - self._sso_handler = hs.get_sso_handler() self._sso_handler.register_identity_provider(self) diff --git a/synapse/handlers/saml.py b/synapse/handlers/saml.py index e6e71e9729..0066d570c5 100644 --- a/synapse/handlers/saml.py +++ b/synapse/handlers/saml.py @@ -80,7 +80,6 @@ class SamlHandler(BaseHandler): # the SsoIdentityProvider protocol type. self.idp_icon = None self.idp_brand = None - self.unstable_idp_brand = None # a map from saml session id to Saml2SessionData object self._outstanding_requests_dict: Dict[str, Saml2SessionData] = {} diff --git a/synapse/handlers/sso.py b/synapse/handlers/sso.py index 0e6ebb574e..0fdc6dd9e7 100644 --- a/synapse/handlers/sso.py +++ b/synapse/handlers/sso.py @@ -104,11 +104,6 @@ class SsoIdentityProvider(Protocol): """Optional branding identifier""" return None - @property - def unstable_idp_brand(self) -> Optional[str]: - """Optional brand identifier for the unstable API (see MSC2858).""" - return None - @abc.abstractmethod async def handle_redirect_request( self, |