diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-05-30 00:55:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 00:55:18 +1000 |
| commit | 532b825ed9dff2faec1360fa3ee3734e0d782bd3 (patch) | |
| tree | 1aabf5f5d4cd85984fe83169a13ea5a452ec862e | |
| parent | Fix error when downloading thumbnail with width/height param missing (#5258) (diff) | |
| download | synapse-532b825ed9dff2faec1360fa3ee3734e0d782bd3.tar.xz | |
Serve CAS login over r0 (#5286)
| -rw-r--r-- | changelog.d/5286.feature | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v1/login.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/5286.feature b/changelog.d/5286.feature new file mode 100644 index 0000000000..81860279a3 --- /dev/null +++ b/changelog.d/5286.feature @@ -0,0 +1 @@ +CAS login will now hit the r0 API, not the deprecated v1 one. diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 5180e9eaf1..029039c162 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -386,7 +386,7 @@ class CasRedirectServlet(RestServlet): 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 @@ class CasRedirectServlet(RestServlet): 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) |