Register the login redirect endpoint for v3. (#11451)

As specified for Matrix v1.1.
matrix-org · Dec 1, 2021 · a265fbd · a265fbd
1 parent b9fef1a
commit a265fbd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/changelog.d/11451.bugfix 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
@@ -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
@@ -1138,12 +1138,12 @@ async def on_POST(
 
 
 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__()