From a640aa6e183b9121006f400961eb602ae61bf582 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 29 Aug 2019 11:53:49 +0100 Subject: [PATCH 1/2] Add m.id_access_token flag --- synapse/rest/client/versions.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py index 0e0919163267..c51c9e617d8b 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py @@ -44,7 +44,12 @@ def on_GET(self, request): "r0.5.0", ], # as per MSC1497: - "unstable_features": {"m.lazy_load_members": True}, + "unstable_features": { + "m.lazy_load_members": True, + # as per https://github.com/matrix-org/synapse/issues/5927 + # to be removed in r0.6.0 + "m.id_access_token": True, + }, }, ) From 6fcab5b4cf8759aaf2e6168b6d759f4cbf4e13f8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 29 Aug 2019 11:56:15 +0100 Subject: [PATCH 2/2] Add changelog --- changelog.d/5930.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5930.misc diff --git a/changelog.d/5930.misc b/changelog.d/5930.misc new file mode 100644 index 000000000000..81dcc10e6d43 --- /dev/null +++ b/changelog.d/5930.misc @@ -0,0 +1 @@ +Add temporary flag to /versions in unstable_features to indicate this Synapse supports receiving id_access_token parameters on calls to identity server-proxying endpoints. \ No newline at end of file