summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-07-10 17:01:26 +0100
committerGitHub <noreply@github.com>2019-07-10 17:01:26 +0100
commit8ab3444fdf374491b2f5fcf4a572f6144d339499 (patch)
treef18add4be57430895ce41d413ac09de82641f9ad
parentRemove access-token support from RegistrationStore.register (#5642) (diff)
parentTypo (diff)
downloadsynapse-8ab3444fdf374491b2f5fcf4a572f6144d339499.tar.xz
Merge pull request #5658 from matrix-org/babolivier/is-json
Send 3PID bind requests as JSON data
-rw-r--r--changelog.d/5658.bugfix1
-rw-r--r--synapse/handlers/identity.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/5658.bugfix b/changelog.d/5658.bugfix
new file mode 100644
index 0000000000..f6ae906a9a
--- /dev/null
+++ b/changelog.d/5658.bugfix
@@ -0,0 +1 @@
+Fix 3PID bind requests being sent to identity servers as `application/x-form-www-urlencoded` data, which is deprecated.
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index c82b1933f2..546d6169e9 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -118,7 +118,7 @@ class IdentityHandler(BaseHandler):
             raise SynapseError(400, "No client_secret in creds")
 
         try:
-            data = yield self.http_client.post_urlencoded_get_json(
+            data = yield self.http_client.post_json_get_json(
                 "https://%s%s" % (id_server, "/_matrix/identity/api/v1/3pid/bind"),
                 {"sid": creds["sid"], "client_secret": client_secret, "mxid": mxid},
             )