Call the v2 identity service /3pid/unbind endpoint, rather than v1. (#13240)

Vetchu · web-flow · commit cc1071598ad4 · 2022-07-13T19:43:17.000+01:00
* Drop support for v1 unbind

Signed-off-by: Jacek Kusnierz &lt;jacek.kusnierz@tum.de&gt;

* Add changelog

Signed-off-by: Jacek Kusnierz &lt;jacek.kusnierz@tum.de&gt;

* Update changelog.d/13240.misc
diff --git a/changelog.d/13240.misc b/changelog.d/13240.misc
@@ -0,0 +1 @@
+Call the v2 identity service `/3pid/unbind` endpoint, rather than v1.
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
@@ -281,8 +281,8 @@ async def try_unbind_threepid_with_id_server(
                 "id_server must be a valid hostname with optional port and path components",
             )
 
-        url = "https://%s/_matrix/identity/api/v1/3pid/unbind" % (id_server,)
-        url_bytes = b"/_matrix/identity/api/v1/3pid/unbind"
+        url = "https://%s/_matrix/identity/v2/3pid/unbind" % (id_server,)
+        url_bytes = b"/_matrix/identity/v2/3pid/unbind"
 
         content = {
             "mxid": mxid,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Call the v2 identity service `/3pid/unbind` endpoint, rather than v1.
Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,8 @@ async def try_unbind_threepid_with_id_server(`
`281`	`281`	`"id_server must be a valid hostname with optional port and path components",`
`282`	`282`	`)`
`283`	`283`
`284`		`- url = "https://%s/_matrix/identity/api/v1/3pid/unbind" % (id_server,)`
`285`		`- url_bytes = b"/_matrix/identity/api/v1/3pid/unbind"`
	`284`	`+ url = "https://%s/_matrix/identity/v2/3pid/unbind" % (id_server,)`
	`285`	`+ url_bytes = b"/_matrix/identity/v2/3pid/unbind"`
`286`	`286`
`287`	`287`	`content = {`
`288`	`288`	`"mxid": mxid,`