From cc7656099d882735507c41ea6efcba961f53b7ec Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 5 May 2022 12:11:52 +0100
Subject: [PATCH] Fix typo in some instances of
enable_registration_token_3pid_bypass. (#12639)
---
changelog.d/12639.bugfix | 1 +
synapse/config/registration.py | 4 ++--
synapse/handlers/ui_auth/checkers.py | 2 +-
synapse/rest/client/register.py | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 changelog.d/12639.bugfix
diff --git a/changelog.d/12639.bugfix b/changelog.d/12639.bugfix
new file mode 100644
index 0000000000..c01596282c
--- /dev/null
+++ b/changelog.d/12639.bugfix
@@ -0,0 +1 @@
+Add new `enable_registration_token_3pid_bypass` configuration option to allow registrations via token as an alternative to verifying a 3pid.
\ No newline at end of file
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 70eb7e6a97..d2d0425e62 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -43,8 +43,8 @@ class RegistrationConfig(Config):
self.registration_requires_token = config.get(
"registration_requires_token", False
)
- self.enable_registration_token_3pid_bypasss = config.get(
- "enable_registration_token_3pid_bypasss", False
+ self.enable_registration_token_3pid_bypass = config.get(
+ "enable_registration_token_3pid_bypass", False
)
self.registration_shared_secret = config.get("registration_shared_secret")
diff --git a/synapse/handlers/ui_auth/checkers.py b/synapse/handlers/ui_auth/checkers.py
index e2a441066d..05cebb5d4d 100644
--- a/synapse/handlers/ui_auth/checkers.py
+++ b/synapse/handlers/ui_auth/checkers.py
@@ -258,7 +258,7 @@ class RegistrationTokenAuthChecker(UserInteractiveAuthChecker):
self.hs = hs
self._enabled = bool(
hs.config.registration.registration_requires_token
- ) or bool(hs.config.registration.enable_registration_token_3pid_bypasss)
+ ) or bool(hs.config.registration.enable_registration_token_3pid_bypass)
self.store = hs.get_datastores().main
def is_enabled(self) -> bool:
diff --git a/synapse/rest/client/register.py b/synapse/rest/client/register.py
index 47b6db1ebf..e8e51a9c66 100644
--- a/synapse/rest/client/register.py
+++ b/synapse/rest/client/register.py
@@ -930,7 +930,7 @@ def _calculate_registration_flows(
flows.append([LoginType.MSISDN, LoginType.EMAIL_IDENTITY])
# Add a flow that doesn't require any 3pids, if the config requests it.
- if config.registration.enable_registration_token_3pid_bypasss:
+ if config.registration.enable_registration_token_3pid_bypass:
flows.append([LoginType.REGISTRATION_TOKEN])
# Prepend m.login.terms to all flows if we're requiring consent
--
GitLab