From 20fdf391a64bee7d7d9392bdf0ea3edae7bef5df Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 19 Sep 2019 14:15:46 +0100 Subject: [PATCH 1/4] Use unstable prefix for 3PID unbind API --- synapse/rest/client/v2_alpha/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index afaaeeacdd6f..c971a6d7315f 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -529,7 +529,7 @@ def on_POST(self, request): class ThreepidUnbindRestServlet(RestServlet): - PATTERNS = client_patterns("/account/3pid/unbind$") + PATTERNS = client_patterns("/account/3pid/unbind$", unstable=True) def __init__(self, hs): super(ThreepidUnbindRestServlet, self).__init__() From ea23ce90c2306d624f059489811bda21a5d1c2a5 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 19 Sep 2019 14:18:48 +0100 Subject: [PATCH 2/4] News --- changelog.d/6062.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6062.bugfix diff --git a/changelog.d/6062.bugfix b/changelog.d/6062.bugfix new file mode 100644 index 000000000000..93ecfe588d72 --- /dev/null +++ b/changelog.d/6062.bugfix @@ -0,0 +1 @@ +Use unstable prefix for 3PID unbind API. From aade649f1e7dbeae231993de3b5c3cec1105ebe1 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 19 Sep 2019 14:31:58 +0100 Subject: [PATCH 3/4] Remove from r0 as well --- synapse/rest/client/v2_alpha/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index c971a6d7315f..ce1487dbc56d 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -529,7 +529,7 @@ def on_POST(self, request): class ThreepidUnbindRestServlet(RestServlet): - PATTERNS = client_patterns("/account/3pid/unbind$", unstable=True) + PATTERNS = client_patterns("/account/3pid/unbind$", releases=(), unstable=True) def __init__(self, hs): super(ThreepidUnbindRestServlet, self).__init__() From 7b65f0539e3457e1dabc39fc6abe0f8706246a5a Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 19 Sep 2019 14:43:21 +0100 Subject: [PATCH 4/4] Update old news --- changelog.d/5980.feature | 2 +- changelog.d/6062.bugfix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.d/5980.feature b/changelog.d/5980.feature index f25d8d81d9ef..e20117cf1c45 100644 --- a/changelog.d/5980.feature +++ b/changelog.d/5980.feature @@ -1 +1 @@ -Add POST /_matrix/client/r0/account/3pid/unbind endpoint from MSC2140 for unbinding a 3PID from an identity server without removing it from the homeserver user account. \ No newline at end of file +Add POST /_matrix/client/unstable/account/3pid/unbind endpoint from MSC2140 for unbinding a 3PID from an identity server without removing it from the homeserver user account. diff --git a/changelog.d/6062.bugfix b/changelog.d/6062.bugfix index 93ecfe588d72..e20117cf1c45 100644 --- a/changelog.d/6062.bugfix +++ b/changelog.d/6062.bugfix @@ -1 +1 @@ -Use unstable prefix for 3PID unbind API. +Add POST /_matrix/client/unstable/account/3pid/unbind endpoint from MSC2140 for unbinding a 3PID from an identity server without removing it from the homeserver user account.