From 7e679a03880f7c3156f1617298f7678a81d949ca Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 19 Sep 2019 17:27:48 +0100 Subject: [PATCH 1/3] Drop support for bind param on POST /account/3pid --- synapse/rest/client/v2_alpha/account.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index afaaeeacdd6f..04465ebcef3f 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -521,10 +521,6 @@ def on_POST(self, request): user_id, threepid["medium"], threepid["address"], threepid["validated_at"] ) - if "bind" in body and body["bind"]: - logger.debug("Binding threepid %s to %s", threepid, user_id) - yield self.identity_handler.bind_threepid(threepid_creds, user_id) - return 200, {} From 675577ba7e1d746b0efa1fc06a42ee164b8302bd Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 19 Sep 2019 17:44:19 +0100 Subject: [PATCH 2/3] Add changelog --- changelog.d/6067.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6067.feature diff --git a/changelog.d/6067.feature b/changelog.d/6067.feature new file mode 100644 index 000000000000..72685961c964 --- /dev/null +++ b/changelog.d/6067.feature @@ -0,0 +1 @@ +Remove `bind` parameter from Client Server POST `/account` endpoint as per [MSC2290](https://github.com/matrix-org/matrix-doc/pull/2290/). \ No newline at end of file From 39959fda7c98b4b50832fc9f64d99707d617df12 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 19 Sep 2019 18:11:46 +0100 Subject: [PATCH 3/3] Blacklist sytests --- sytest-blacklist | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sytest-blacklist b/sytest-blacklist index 11785fd43f90..04698cb06856 100644 --- a/sytest-blacklist +++ b/sytest-blacklist @@ -29,3 +29,12 @@ Enabling an unknown default rule fails with 404 # Blacklisted due to https://github.com/matrix-org/synapse/issues/1663 New federated private chats get full presence information (SYN-115) + +# Blacklisted temporarily due to https://github.com/matrix-org/matrix-doc/pull/2290 +# These sytests need to be updated with new endpoints, which will come in a later PR +# That PR will also remove this blacklist +Can bind 3PID via home server +Can bind and unbind 3PID via homeserver +3PIDs are unbound after account deactivation +Can bind and unbind 3PID via /unbind by specifying the identity server +Can bind and unbind 3PID via /unbind without specifying the identity server