Skip to content
Snippets Groups Projects
Unverified Commit 532b825e authored by Amber Brown's avatar Amber Brown Committed by GitHub
Browse files

Serve CAS login over r0 (#5286)

parent 30858ff4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
changelog.d/5286.feature 0 → 100644
+ 1
− 0
View file @ 532b825e
CAS login will now hit the r0 API, not the deprecated v1 one.
synapse/rest/client/v1/login.py
+ 2
− 2
View file @ 532b825e
...@@ -386,7 +386,7 @@ class CasRedirectServlet(RestServlet): ...@@ -386,7 +386,7 @@ class CasRedirectServlet(RestServlet):
b"redirectUrl": args[b"redirectUrl"][0] b"redirectUrl": args[b"redirectUrl"][0]
}).encode('ascii') }).encode('ascii')
hs_redirect_url = (self.cas_service_url + hs_redirect_url = (self.cas_service_url +
b"/_matrix/client/api/v1/login/cas/ticket") b"/_matrix/client/r0/login/cas/ticket")
service_param = urllib.parse.urlencode({ service_param = urllib.parse.urlencode({
b"service": b"%s?%s" % (hs_redirect_url, client_redirect_url_param) b"service": b"%s?%s" % (hs_redirect_url, client_redirect_url_param)
}).encode('ascii') }).encode('ascii')
...@@ -395,7 +395,7 @@ class CasRedirectServlet(RestServlet): ...@@ -395,7 +395,7 @@ class CasRedirectServlet(RestServlet):
class CasTicketServlet(ClientV1RestServlet): class CasTicketServlet(ClientV1RestServlet):
PATTERNS = client_path_patterns("/login/cas/ticket", releases=()) PATTERNS = client_path_patterns("/login/cas/ticket")
def __init__(self, hs): def __init__(self, hs):
super(CasTicketServlet, self).__init__(hs) super(CasTicketServlet, self).__init__(hs)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment