summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-08-30 15:22:51 +0100
committerGitHub <noreply@github.com>2019-08-30 15:22:51 +0100
commit4765f0cfd95f6160f32c75481651d125f343cd58 (patch)
tree440058fa2dbffe22ad5a9e7678fd249b3d1e65bf
parentRemoved unused jenkins/ folder and script (#5938) (diff)
downloadsynapse-4765f0cfd95f6160f32c75481651d125f343cd58.tar.xz
Add m.id_access_token flag (#5930)
Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043

Fixes #5927
-rw-r--r--changelog.d/5930.misc1
-rw-r--r--synapse/rest/client/versions.py7
2 files changed, 7 insertions, 1 deletions
diff --git a/changelog.d/5930.misc b/changelog.d/5930.misc
new file mode 100644
index 0000000000..81dcc10e6d
--- /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
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index 0e09191632..c51c9e617d 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -44,7 +44,12 @@ class VersionsRestServlet(RestServlet):
                     "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,
+                },
             },
         )