Include a version query string arg for the consent route

This commit is contained in:
Travis Ralston 2018-10-31 13:19:28 -06:00
parent d1e7b9c44c
commit a8d41c6aff
2 changed files with 8 additions and 3 deletions

View File

@ -473,7 +473,10 @@ class AuthHandler(BaseHandler):
"version": self.hs.config.user_consent_version, "version": self.hs.config.user_consent_version,
"en": { "en": {
"name": "Privacy Policy", "name": "Privacy Policy",
"url": "%s/_matrix/consent" % (self.hs.config.public_baseurl,), "url": "%s/_matrix/consent?v=%s" % (
self.hs.config.public_baseurl,
self.hs.config.user_consent_version,
),
}, },
}, },
}, },

View File

@ -161,8 +161,9 @@ class AuthRestServlet(RestServlet):
html = TERMS_TEMPLATE % { html = TERMS_TEMPLATE % {
'session': session, 'session': session,
'terms_url': "%s/_matrix/consent" % ( 'terms_url': "%s/_matrix/consent?v=%s" % (
self.hs.config.public_baseurl, self.hs.config.public_baseurl,
self.hs.config.user_consent_version,
), ),
'myurl': "%s/auth/%s/fallback/web" % ( 'myurl': "%s/auth/%s/fallback/web" % (
CLIENT_V2_ALPHA_PREFIX, LoginType.TERMS CLIENT_V2_ALPHA_PREFIX, LoginType.TERMS
@ -241,8 +242,9 @@ class AuthRestServlet(RestServlet):
else: else:
html = TERMS_TEMPLATE % { html = TERMS_TEMPLATE % {
'session': session, 'session': session,
'terms_url': "%s/_matrix/consent" % ( 'terms_url': "%s/_matrix/consent?v=%s" % (
self.hs.config.public_baseurl, self.hs.config.public_baseurl,
self.hs.config.user_consent_version,
), ),
'myurl': "%s/auth/%s/fallback/web" % ( 'myurl': "%s/auth/%s/fallback/web" % (
CLIENT_V2_ALPHA_PREFIX, LoginType.TERMS CLIENT_V2_ALPHA_PREFIX, LoginType.TERMS