From 3e0ce6471fdcba3edb1ccb615a71884f5b44260d Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Mon, 29 Nov 2021 15:00:01 -0500
Subject: [PATCH 1/3] Tuple, not list.

---
 synapse/rest/client/room.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py
index 73d0f7c95002..99f303c88e34 100644
--- 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__()

From fd318b4a8f12e4e933d5ce1b7b3e5f5154a43030 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Mon, 29 Nov 2021 15:02:35 -0500
Subject: [PATCH 2/3] Register login redirect endpoint for v3.

---
 synapse/rest/client/login.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/rest/client/login.py b/synapse/rest/client/login.py
index 09f378f91967..a66ee4fb3d4e 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_.~-]+)$"
         )
     ]
 

From 8e0f3ae52bcffc7f0d50f9841ad986fd10ea59b9 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Mon, 29 Nov 2021 15:33:39 -0500
Subject: [PATCH 3/3] Newsfragment

---
 changelog.d/11451.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/11451.bugfix

diff --git a/changelog.d/11451.bugfix b/changelog.d/11451.bugfix
new file mode 100644
index 000000000000..960714d0f9a4
--- /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.