diff options
| author | Travis Ralston <travisr@matrix.org> | 2022-02-22 04:20:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 11:20:45 +0000 |
| commit | d7cb0dcbaa59c9e16f9b46415dbc645735dce8f4 (patch) | |
| tree | 0ac783688ee9b13def1d9053fe73a03baf59b19f | |
| parent | remote join processing: get create event from state, not auth_chain (#12039) (diff) | |
| download | synapse-d7cb0dcbaa59c9e16f9b46415dbc645735dce8f4.tar.xz | |
Use v3 endpoints for fallback auth (Matrix 1.1) (#12019)
| -rw-r--r-- | changelog.d/12019.misc | 1 | ||||
| -rw-r--r-- | synapse/rest/client/auth.py | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/12019.misc b/changelog.d/12019.misc new file mode 100644 index 0000000000..b2186320ea --- /dev/null +++ b/changelog.d/12019.misc @@ -0,0 +1 @@ +Use Matrix v1.1 endpoints (`/_matrix/client/v3/auth/...`) in fallback auth HTML forms. \ No newline at end of file diff --git a/synapse/rest/client/auth.py b/synapse/rest/client/auth.py index 9c15a04338..e0b2b80e5b 100644 --- a/synapse/rest/client/auth.py +++ b/synapse/rest/client/auth.py @@ -62,7 +62,7 @@ class AuthRestServlet(RestServlet): if stagetype == LoginType.RECAPTCHA: html = self.recaptcha_template.render( session=session, - myurl="%s/r0/auth/%s/fallback/web" + myurl="%s/v3/auth/%s/fallback/web" % (CLIENT_API_PREFIX, LoginType.RECAPTCHA), sitekey=self.hs.config.captcha.recaptcha_public_key, ) @@ -74,7 +74,7 @@ class AuthRestServlet(RestServlet): self.hs.config.server.public_baseurl, self.hs.config.consent.user_consent_version, ), - myurl="%s/r0/auth/%s/fallback/web" + myurl="%s/v3/auth/%s/fallback/web" % (CLIENT_API_PREFIX, LoginType.TERMS), ) @@ -118,7 +118,7 @@ class AuthRestServlet(RestServlet): # Authentication failed, let user try again html = self.recaptcha_template.render( session=session, - myurl="%s/r0/auth/%s/fallback/web" + myurl="%s/v3/auth/%s/fallback/web" % (CLIENT_API_PREFIX, LoginType.RECAPTCHA), sitekey=self.hs.config.captcha.recaptcha_public_key, error=e.msg, @@ -143,7 +143,7 @@ class AuthRestServlet(RestServlet): self.hs.config.server.public_baseurl, self.hs.config.consent.user_consent_version, ), - myurl="%s/r0/auth/%s/fallback/web" + myurl="%s/v3/auth/%s/fallback/web" % (CLIENT_API_PREFIX, LoginType.TERMS), error=e.msg, ) |