summary refs log tree commit diff
path: root/synapse/config/registration.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-22 16:23:08 +0000
committerGitHub <noreply@github.com>2019-01-22 16:23:08 +0000
commit388c164aea32eb2d1e5883198d105ea77a7019f0 (patch)
treee4e5ca0a1e879392f2bbf1fbb5f9c516ba5350b0 /synapse/config/registration.py
parentMake key fetches use regular federation client (#4426) (diff)
parentfix line length (diff)
downloadsynapse-388c164aea32eb2d1e5883198d105ea77a7019f0.tar.xz
Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration
Config option to disable requesting MSISDN on registration
Diffstat (limited to 'synapse/config/registration.py')
-rw-r--r--synapse/config/registration.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 6c2b543b8c..fe520d6855 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -50,6 +50,10 @@ class RegistrationConfig(Config):
                 raise ConfigError('Invalid auto_join_rooms entry %s' % (room_alias,))
         self.autocreate_auto_join_rooms = config.get("autocreate_auto_join_rooms", True)
 
+        self.disable_msisdn_registration = (
+            config.get("disable_msisdn_registration", False)
+        )
+
     def default_config(self, generate_secrets=False, **kwargs):
         if generate_secrets:
             registration_shared_secret = 'registration_shared_secret: "%s"' % (
@@ -70,6 +74,11 @@ class RegistrationConfig(Config):
         #     - email
         #     - msisdn
 
+        # Explicitly disable asking for MSISDNs from the registration
+        # flow (overrides registrations_require_3pid if MSISDNs are set as required)
+        #
+        # disable_msisdn_registration = True
+
         # Mandate that users are only allowed to associate certain formats of
         # 3PIDs with accounts on this server.
         #