diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-12-01 07:25:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 07:25:58 -0500 |
| commit | a265fbd397ae72b2d3ea4c9310591ff1d0f3e05c (patch) | |
| tree | 5a0e7d594faeac294e1ae1557fc21505a7747d87 | |
| parent | Update openid.md (diff) | |
| download | synapse-a265fbd397ae72b2d3ea4c9310591ff1d0f3e05c.tar.xz | |
Register the login redirect endpoint for v3. (#11451)
As specified for Matrix v1.1.
| -rw-r--r-- | changelog.d/11451.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/client/login.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/room.py | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/changelog.d/11451.bugfix b/changelog.d/11451.bugfix new file mode 100644 index 0000000000..960714d0f9 --- /dev/null +++ b/changelog.d/11451.bugfix @@ -0,0 +1 @@ +Add support for the `/_matrix/client/v3/login/sso/redirect/{idpId}` API from Matrix v1.1. This endpoint was overlooked when support for v3 endpoints was added in v1.48.0rc1. diff --git a/synapse/rest/client/login.py b/synapse/rest/client/login.py index 09f378f919..a66ee4fb3d 100644 --- a/synapse/rest/client/login.py +++ b/synapse/rest/client/login.py @@ -513,7 +513,7 @@ class SsoRedirectServlet(RestServlet): re.compile( "^" + CLIENT_API_PREFIX - + "/r0/login/sso/redirect/(?P<idp_id>[A-Za-z0-9_.~-]+)$" + + "/(r0|v3)/login/sso/redirect/(?P<idp_id>[A-Za-z0-9_.~-]+)$" ) ] diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py index 73d0f7c950..99f303c88e 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -1138,12 +1138,12 @@ class RoomSpaceSummaryRestServlet(RestServlet): class RoomHierarchyRestServlet(RestServlet): - PATTERNS = [ + PATTERNS = ( re.compile( "^/_matrix/client/(v1|unstable/org.matrix.msc2946)" "/rooms/(?P<room_id>[^/]*)/hierarchy$" ), - ] + ) def __init__(self, hs: "HomeServer"): super().__init__() |