From f09bc775b63cafe5400ce06a7647a87eb17ebb96 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 3 Sep 2019 19:24:45 +0100 Subject: [PATCH 1/4] Add m.id_access_token to /versions unstable_features --- 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 32b119cb2d6c6dfc022893742b5aef56b16be0cb Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 4 Sep 2019 16:23:41 +0100 Subject: [PATCH 2/4] Add changelog --- changelog.d/5974.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5974.feature diff --git a/changelog.d/5974.feature b/changelog.d/5974.feature new file mode 100644 index 000000000000..387a444fc433 --- /dev/null +++ b/changelog.d/5974.feature @@ -0,0 +1 @@ +Add m.id_access_token to unstable_features in /versions as per MSC2264. \ No newline at end of file From 059cd094a93f0363b90befe1792cdd6c8bb9e2f9 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:56:16 +0100 Subject: [PATCH 3/4] Update synapse/rest/client/versions.py --- synapse/rest/client/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py index aaf5a6847800..e69c6e71173e 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py @@ -51,7 +51,7 @@ def on_GET(self, request): "unstable_features": { "m.lazy_load_members": True, - # as per https://github.com/matrix-org/synapse/issues/5927 + # as per MSC2190, as amended by MSC2264 # to be removed in r0.6.0 "m.id_access_token": True, From 7edc82d90de356b2acb4e1dce3e55838df489f19 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Mon, 23 Sep 2019 18:59:21 +0100 Subject: [PATCH 4/4] Apply suggestions from code review --- synapse/rest/client/versions.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py index e69c6e71173e..fdab0ddb42b3 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py @@ -50,11 +50,9 @@ def on_GET(self, request): # as per MSC1497: "unstable_features": { "m.lazy_load_members": True, - # as per MSC2190, as amended by MSC2264 # to be removed in r0.6.0 "m.id_access_token": True, - # Advertise to clients that they need not include an `id_server` # parameter during registration or password reset, as Synapse now decides # itself which identity server to use (or none at all).