mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 01:00:54 +00:00
Use a flag rather than a new route for the public policy
This also means that the template now has optional parameters, which will need to be documented somehow.
This commit is contained in:
parent
f9d34a763c
commit
537d0b7b36
3 changed files with 25 additions and 17 deletions
|
@ -471,7 +471,7 @@ class AuthHandler(BaseHandler):
|
|||
"policies": [{
|
||||
"name": "Privacy Policy",
|
||||
"version": self.hs.config.user_consent_version,
|
||||
"url": "%s/_matrix/consent/public" % (self.hs.config.public_baseurl,),
|
||||
"url": "%s/_matrix/consent?public=true" % (self.hs.config.public_baseurl,),
|
||||
}],
|
||||
}
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ class AuthRestServlet(RestServlet):
|
|||
|
||||
html = TERMS_TEMPLATE % {
|
||||
'session': session,
|
||||
'terms_url': "%s/_matrix/consent/public" % (
|
||||
'terms_url': "%s/_matrix/consent?public=true" % (
|
||||
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" % (
|
||||
'terms_url': "%s/_matrix/consent?public=true" % (
|
||||
self.hs.config.public_baseurl,
|
||||
),
|
||||
'myurl': "%s/auth/%s/fallback/web" % (
|
||||
|
|
|
@ -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
|
||||
from synapse.http.servlet import parse_string, parse_boolean
|
||||
from synapse.types import UserID
|
||||
|
||||
# language to use for the templates. TODO: figure this out from Accept-Language
|
||||
|
@ -137,27 +137,35 @@ class ConsentResource(Resource):
|
|||
request (twisted.web.http.Request):
|
||||
"""
|
||||
|
||||
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)
|
||||
public_version = parse_boolean(request, "public", default=False)
|
||||
|
||||
self._check_hash(username, userhmac)
|
||||
version = self._default_consent_version
|
||||
username = None
|
||||
userhmac = None
|
||||
has_consented = False
|
||||
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)
|
||||
|
||||
if username.startswith('@'):
|
||||
qualified_user_id = username
|
||||
else:
|
||||
qualified_user_id = UserID(username, self.hs.hostname).to_string()
|
||||
self._check_hash(username, userhmac)
|
||||
|
||||
u = yield self.store.get_user_by_id(qualified_user_id)
|
||||
if u is None:
|
||||
raise NotFoundError("Unknown user")
|
||||
if username.startswith('@'):
|
||||
qualified_user_id = username
|
||||
else:
|
||||
qualified_user_id = UserID(username, self.hs.hostname).to_string()
|
||||
|
||||
u = yield self.store.get_user_by_id(qualified_user_id)
|
||||
if u is None:
|
||||
raise NotFoundError("Unknown user")
|
||||
has_consented = u["consent_version"] == version
|
||||
|
||||
try:
|
||||
self._render_template(
|
||||
request, "%s.html" % (version,),
|
||||
user=username, userhmac=userhmac, version=version,
|
||||
has_consented=(u["consent_version"] == version),
|
||||
has_consented=has_consented, public_version=public_version,
|
||||
)
|
||||
except TemplateNotFound:
|
||||
raise NotFoundError("Unknown policy version")
|
||||
|
|
Loading…
Reference in a new issue