Include a version query string arg for the consent route

2 files changed, 8 insertions, 3 deletions

diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py

index d143522d9a..85fc1fc525 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -473,7 +473,10 @@ class AuthHandler(BaseHandler):
                     "version": self.hs.config.user_consent_version,
                     "en": {
                         "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,
+                        ),
                     },
                 },
             },
diff --git a/synapse/rest/client/v2_alpha/auth.py b/synapse/rest/client/v2_alpha/auth.py

index 6f90935b22..a8d8ed6590 100644
--- a/synapse/rest/client/v2_alpha/auth.py
+++ b/synapse/rest/client/v2_alpha/auth.py
@@ -161,8 +161,9 @@ class AuthRestServlet(RestServlet):
 
             html = TERMS_TEMPLATE % {
                 'session': session,
-                'terms_url': "%s/_matrix/consent" % (
+                'terms_url': "%s/_matrix/consent?v=%s" % (
                     self.hs.config.public_baseurl,
+                    self.hs.config.user_consent_version,
                 ),
                 'myurl': "%s/auth/%s/fallback/web" % (
                     CLIENT_V2_ALPHA_PREFIX, LoginType.TERMS
@@ -241,8 +242,9 @@ class AuthRestServlet(RestServlet):
             else:
                 html = TERMS_TEMPLATE % {
                     'session': session,
-                    'terms_url': "%s/_matrix/consent" % (
+                    'terms_url': "%s/_matrix/consent?v=%s" % (
                         self.hs.config.public_baseurl,
+                        self.hs.config.user_consent_version,
                     ),
                     'myurl': "%s/auth/%s/fallback/web" % (
                         CLIENT_V2_ALPHA_PREFIX, LoginType.TERMS