summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-11-02 10:50:43 +0000
committerGitHub <noreply@github.com>2018-11-02 10:50:43 +0000
commit00f12e00f8b7cbc6990482e4d5babab07d0c8611 (patch)
treeb42a56aaadec1b50bf74938779c4c4df66f10234
parentMerge pull request #4135 from matrix-org/erikj/fix_state_res_none (diff)
parentChangelog (diff)
downloadsynapse-00f12e00f8b7cbc6990482e4d5babab07d0c8611.tar.xz
Merge pull request #4133 from matrix-org/travis/fix-terms-auth
Fix logic error that prevented guests from seeing the privacy policy
-rw-r--r--changelog.d/4133.feature1
-rw-r--r--synapse/rest/consent/consent_resource.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4133.feature b/changelog.d/4133.feature
new file mode 100644
index 0000000000..ef5cdaf5ec
--- /dev/null
+++ b/changelog.d/4133.feature
@@ -0,0 +1 @@
+Add `m.login.terms` to the registration flow when consent tracking is enabled. **This makes the template arguments conditionally optional on a new `public_version` variable - update your privacy templates to support this.**
diff --git a/synapse/rest/consent/consent_resource.py b/synapse/rest/consent/consent_resource.py
index 4cadd71d7e..89b82b0591 100644
--- a/synapse/rest/consent/consent_resource.py
+++ b/synapse/rest/consent/consent_resource.py
@@ -141,7 +141,7 @@ class ConsentResource(Resource):
         username = parse_string(request, "u", required=False, default="")
         userhmac = None
         has_consented = False
-        public_version = username != ""
+        public_version = username == ""
         if not public_version:
             userhmac = parse_string(request, "h", required=True, encoding=None)