summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-25 14:44:14 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-25 14:44:14 +0000
commit3fbf00399d7572c18a25b8f22948d4455b8fb617 (patch)
tree233062d68425da2feceb161cb9c0575c1b33868a
parentDocker: support SYNAPSE_WORKER envvar (#6058) (diff)
parentDrop support for bind param on POST /account/3pid (MSC2290) (#6067) (diff)
downloadsynapse-3fbf00399d7572c18a25b8f22948d4455b8fb617.tar.xz
Drop support for bind param on POST /account/3pid (MSC2290) (#6067)
-rw-r--r--changelog.d/6067.feature1
-rw-r--r--synapse/rest/client/v2_alpha/account.py4
2 files changed, 1 insertions, 4 deletions
diff --git a/changelog.d/6067.feature b/changelog.d/6067.feature
new file mode 100644

index 0000000000..72685961c9 --- /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 diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index c9815810d0..ed77c92dcf 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py
@@ -573,10 +573,6 @@ class ThreepidRestServlet(RestServlet): user_id, threepid["medium"], threepid["address"], threepid["validated_at"] ) - if not requester.app_service and ("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) - if self.hs.config.shadow_server: shadow_user = UserID( requester.user.localpart, self.hs.config.shadow_server.get("hs")