From 1c5b8c622248d4ee3b38b01a997eaa8844859beb Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Thu, 22 Aug 2019 14:47:34 +0100
Subject: Revert "Add "require_consent" parameter for registration"

This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0.
---
 synapse/handlers/register.py             | 14 ++------------
 synapse/replication/http/register.py     |  2 --
 synapse/rest/client/v2_alpha/register.py |  5 +----
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 5c92960d25..4631fab94e 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -150,7 +150,6 @@ class RegistrationHandler(BaseHandler):
         threepid=None,
         user_type=None,
         default_display_name=None,
-        require_consent=True,
         address=None,
         bind_emails=[],
     ):
@@ -168,7 +167,6 @@ class RegistrationHandler(BaseHandler):
               will be set to this. Defaults to 'localpart'.
             address (str|None): the IP address used to perform the registration.
             bind_emails (List[str]): list of emails to bind to this account.
-            require_consent (bool): Should the user be required to give consent.
         Returns:
             Deferred[str]: user_id
         Raises:
@@ -213,7 +211,6 @@ class RegistrationHandler(BaseHandler):
                 admin=admin,
                 user_type=user_type,
                 address=address,
-                require_consent=require_consent,
             )
 
             if self.hs.config.user_directory_search_all_users:
@@ -247,7 +244,7 @@ class RegistrationHandler(BaseHandler):
                     user_id = None
                     attempts += 1
 
-        if not self.hs.config.user_consent_at_registration and require_consent:
+        if not self.hs.config.user_consent_at_registration:
             yield self._auto_join_rooms(user_id)
         else:
             logger.info(
@@ -528,7 +525,6 @@ class RegistrationHandler(BaseHandler):
             ratelimit=False,
         )
 
-    @defer.inlineCallbacks
     def register_with_store(
         self,
         user_id,
@@ -540,7 +536,6 @@ class RegistrationHandler(BaseHandler):
         admin=False,
         user_type=None,
         address=None,
-        require_consent=True,
     ):
         """Register user in the datastore.
 
@@ -558,7 +553,7 @@ class RegistrationHandler(BaseHandler):
             user_type (str|None): type of user. One of the values from
                 api.constants.UserTypes, or None for a normal user.
             address (str|None): the IP address used to perform the registration.
-            require_consent (bool): Should the user be required to give consent.
+
         Returns:
             Deferred
         """
@@ -589,12 +584,8 @@ class RegistrationHandler(BaseHandler):
                 admin=admin,
                 user_type=user_type,
                 address=address,
-                require_consent=require_consent,
             )
         else:
-            if require_consent is False:
-                yield self.store.user_set_consent_version(user_id, "no-consent-required")
-
             return self.store.register_user(
                 user_id=user_id,
                 password_hash=password_hash,
@@ -606,7 +597,6 @@ class RegistrationHandler(BaseHandler):
                 user_type=user_type,
             )
 
-
     @defer.inlineCallbacks
     def register_device(self, user_id, device_id, initial_display_name, is_guest=False):
         """Register a device for a user and generate an access token.
diff --git a/synapse/replication/http/register.py b/synapse/replication/http/register.py
index 65702de082..3341320a87 100644
--- a/synapse/replication/http/register.py
+++ b/synapse/replication/http/register.py
@@ -72,7 +72,6 @@ class ReplicationRegisterServlet(ReplicationEndpoint):
             "admin": admin,
             "user_type": user_type,
             "address": address,
-            "require_consent": require_consent,
         }
 
     @defer.inlineCallbacks
@@ -89,7 +88,6 @@ class ReplicationRegisterServlet(ReplicationEndpoint):
             admin=content["admin"],
             user_type=content["user_type"],
             address=content["address"],
-            require_consent=content["require_consent"],
         )
 
         return (200, {})
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index 724231f364..05ea1459e3 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -525,9 +525,6 @@ class RegisterRestServlet(RestServlet):
         # downcased one in `username` for the mac calculation
         user = body["username"].encode("utf-8")
 
-        # do not require consent for this user (for example, bots)
-        require_consent = body.get("require_consent", True)
-
         # str() because otherwise hmac complains that 'unicode' does not
         # have the buffer interface
         got_mac = str(body["mac"])
@@ -545,7 +542,7 @@ class RegisterRestServlet(RestServlet):
             raise SynapseError(403, "HMAC incorrect")
 
         user_id = yield self.registration_handler.register_user(
-            localpart=username, password=password, require_consent=require_consent,
+            localpart=username, password=password
         )
 
         result = yield self._create_registration_details(user_id, body)
-- 
cgit 1.4.1