summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-09-23 21:46:34 +0200
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-09-23 20:46:34 +0100
commit2b071a2ff1ce59c5b7a4930c471470c739c5efe2 (patch)
tree9a0529a6a718ac632c36ffc05caa57e6d3464851
parentMerge pull request #6064 from matrix-org/rav/saml_config_cleanup (diff)
downloadsynapse-2b071a2ff1ce59c5b7a4930c471470c739c5efe2.tar.xz
Add an unstable feature flag for separate add/bind 3pid APIs (#6044)
Add a m.separate_add_and_bind flag set to True. See MSC2290's Backward Compatibility section for details.
-rw-r--r--changelog.d/6044.feature1
-rw-r--r--synapse/rest/client/versions.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/6044.feature b/changelog.d/6044.feature
new file mode 100644

index 0000000000..7dc05d4845 --- /dev/null +++ b/changelog.d/6044.feature
@@ -0,0 +1 @@ +Add an unstable feature flag for separate add/bind 3pid APIs. \ No newline at end of file diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index fdab0ddb42..1044ae7b4e 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py
@@ -63,6 +63,8 @@ class VersionsRestServlet(RestServlet): # verification itself, there is no need to ask the user for `id_server` to # be supplied. "m.require_identity_server": False, + # as per MSC2290 + "m.separate_add_and_bind": True, }, }, )