Rely on the lack of ?u to represent public access

also general cleanup

synapse/rest/client/v2_alpha/auth.py

@@ -164,7 +164,7 @@ class AuthRestServlet(RestServlet):
 
             html = TERMS_TEMPLATE % {
                 'session': session,
-                'terms_url': "%s/_matrix/consent?public=true" % (
+                'terms_url': "%s/_matrix/consent" % (
                     self.hs.config.public_baseurl,
                 ),
                 'myurl': "%s/auth/%s/fallback/web" % (
@@ -244,7 +244,7 @@ class AuthRestServlet(RestServlet):
             else:
                 html = TERMS_TEMPLATE % {
                     'session': session,
-                    'terms_url': "%s/_matrix/consent?public=true" % (
+                    'terms_url': "%s/_matrix/consent" % (
                         self.hs.config.public_baseurl,
                     ),
                     'myurl': "%s/auth/%s/fallback/web" % (

synapse/rest/consent/consent_resource.py

@@ -30,7 +30,7 @@ from twisted.web.server import NOT_DONE_YET
 from synapse.api.errors import NotFoundError, StoreError, SynapseError
 from synapse.config import ConfigError
 from synapse.http.server import finish_request, wrap_html_request_handler
-from synapse.http.servlet import parse_string, parse_boolean
+from synapse.http.servlet import parse_string
 from synapse.types import UserID
 
 # language to use for the templates. TODO: figure this out from Accept-Language
@@ -137,16 +137,12 @@ class ConsentResource(Resource):
             request (twisted.web.http.Request):
         """
 
-        public_version = parse_boolean(request, "public", default=False)
-
-        version = self._default_consent_version
-        username = None
+        version = parse_string(request, "v", default=self._default_consent_version)
+        username = parse_string(request, "u", required=False, default="")
         userhmac = None
         has_consented = False
+        public_version = username != ""
         if not public_version:
-            version = parse_string(request, "v",
-                                default=self._default_consent_version)
-            username = parse_string(request, "u", required=True)
             userhmac = parse_string(request, "h", required=True, encoding=None)
 
             self._check_hash(username, userhmac)