From 7292b7c0ebf2dcc971349e0bd17dc041a49f94f4 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 23 Feb 2021 12:57:37 -0500 Subject: [PATCH] Add back the deprecated SAML endpoint. (#9474) --- changelog.d/9474.misc | 1 + synapse/rest/synapse/client/__init__.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelog.d/9474.misc diff --git a/changelog.d/9474.misc b/changelog.d/9474.misc new file mode 100644 index 0000000000..1b9a235292 --- /dev/null +++ b/changelog.d/9474.misc @@ -0,0 +1 @@ +Revert change in v1.28.0rc1 to remove the deprecated SAML endpoint. diff --git a/synapse/rest/synapse/client/__init__.py b/synapse/rest/synapse/client/__init__.py index 8588b6d271..9eeb970580 100644 --- a/synapse/rest/synapse/client/__init__.py +++ b/synapse/rest/synapse/client/__init__.py @@ -54,7 +54,12 @@ def build_synapse_client_resource_tree(hs: "HomeServer") -> Mapping[str, Resourc if hs.config.saml2_enabled: from synapse.rest.synapse.client.saml2 import SAML2Resource - resources["/_synapse/client/saml2"] = SAML2Resource(hs) + res = SAML2Resource(hs) + resources["/_synapse/client/saml2"] = res + + # This is also mounted under '/_matrix' for backwards-compatibility. + # To be removed in Synapse v1.32.0. + resources["/_matrix/saml2"] = res return resources