Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Register the login redirect endpoint for v3 #11451

Merged
merged 3 commits into from
Dec 1, 2021
Merged

Register the login redirect endpoint for v3 #11451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e0ce64
Tuple, not list.
clokep Nov 29, 2021
fd318b4
Register login redirect endpoint for v3.
clokep Nov 29, 2021
8e0f3ae
Newsfragment
clokep Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11451.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion synapse/rest/client/login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_.~-]+)$"
)
]

Expand Down
4 changes: 2 additions & 2 deletions synapse/rest/client/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,12 +1138,12 @@ async def on_POST(


class RoomHierarchyRestServlet(RestServlet):
PATTERNS = [
PATTERNS = (
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
re.compile(
"^/_matrix/client/(v1|unstable/org.matrix.msc2946)"
"/rooms/(?P<room_id>[^/]*)/hierarchy$"
),
]
)

def __init__(self, hs: "HomeServer"):
super().__init__()
Expand Down