Merge pull request #7685 from matrix-org/babolivier/3pid_r0

Enable 3PID add/bind/unbind endpoints on r0 routes
This commit is contained in:
Brendan Abolivier 2020-06-15 16:46:23 +01:00 committed by GitHub
commit 356243f08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

1
changelog.d/7685.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug introduced on v1.15.0 which meant that some 3PID management endpoints were not accessible on the correct URL.

View File

@ -682,7 +682,7 @@ class ThreepidRestServlet(RestServlet):
class ThreepidAddRestServlet(RestServlet): class ThreepidAddRestServlet(RestServlet):
PATTERNS = client_patterns("/account/3pid/add$", releases=(), unstable=True) PATTERNS = client_patterns("/account/3pid/add$")
def __init__(self, hs): def __init__(self, hs):
super(ThreepidAddRestServlet, self).__init__() super(ThreepidAddRestServlet, self).__init__()
@ -733,7 +733,7 @@ class ThreepidAddRestServlet(RestServlet):
class ThreepidBindRestServlet(RestServlet): class ThreepidBindRestServlet(RestServlet):
PATTERNS = client_patterns("/account/3pid/bind$", releases=(), unstable=True) PATTERNS = client_patterns("/account/3pid/bind$")
def __init__(self, hs): def __init__(self, hs):
super(ThreepidBindRestServlet, self).__init__() super(ThreepidBindRestServlet, self).__init__()
@ -762,7 +762,7 @@ class ThreepidBindRestServlet(RestServlet):
class ThreepidUnbindRestServlet(RestServlet): class ThreepidUnbindRestServlet(RestServlet):
PATTERNS = client_patterns("/account/3pid/unbind$", releases=(), unstable=True) PATTERNS = client_patterns("/account/3pid/unbind$")
def __init__(self, hs): def __init__(self, hs):
super(ThreepidUnbindRestServlet, self).__init__() super(ThreepidUnbindRestServlet, self).__init__()