From 641c017655abf62699713a609ac1200e0d2c5059 Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Thu, 30 May 2019 00:28:12 +1000
Subject: [PATCH 1/2] serve CAS over r0

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

diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index 5180e9eaf169..029039c162fd 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -386,7 +386,7 @@ def on_GET(self, request):
             b"redirectUrl": args[b"redirectUrl"][0]
         }).encode('ascii')
         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({
             b"service": b"%s?%s" % (hs_redirect_url, client_redirect_url_param)
         }).encode('ascii')
@@ -395,7 +395,7 @@ def on_GET(self, request):
 
 
 class CasTicketServlet(ClientV1RestServlet):
-    PATTERNS = client_path_patterns("/login/cas/ticket", releases=())
+    PATTERNS = client_path_patterns("/login/cas/ticket")
 
     def __init__(self, hs):
         super(CasTicketServlet, self).__init__(hs)

From eadf1bcf274643501572e889f758685502ec9c97 Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Thu, 30 May 2019 00:29:33 +1000
Subject: [PATCH 2/2] changelog

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

diff --git a/changelog.d/5286.feature b/changelog.d/5286.feature
new file mode 100644
index 000000000000..81860279a32e
--- /dev/null
+++ b/changelog.d/5286.feature
@@ -0,0 +1 @@
+CAS login will now hit the r0 API, not the deprecated v1 one.