Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Fix a bug introduced in v1.67.0 where not specifying a config file or…
Browse files Browse the repository at this point in the history
… a server URL would lead to the `register_new_matrix_user` script failing. (#14637)
  • Loading branch information
reivilibre authored Dec 7, 2022
1 parent d69bf3b commit 96251af
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog.d/14637.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in v1.67.0 where not specifying a config file or a server URL would lead to the `register_new_matrix_user` script failing.
5 changes: 3 additions & 2 deletions synapse/_scripts/register_new_matrix_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,15 @@ def main() -> None:

args = parser.parse_args()

config: Optional[Dict[str, Any]] = None
if "config" in args and args.config:
config = yaml.safe_load(args.config)

if args.shared_secret:
secret = args.shared_secret
else:
# argparse should check that we have either config or shared secret
assert config
assert config is not None

secret = config.get("registration_shared_secret")
secret_file = config.get("registration_shared_secret_path")
Expand All @@ -244,7 +245,7 @@ def main() -> None:

if args.server_url:
server_url = args.server_url
elif config:
elif config is not None:
server_url = _find_client_listener(config)
if not server_url:
server_url = _DEFAULT_SERVER_URL
Expand Down

0 comments on commit 96251af

Please sign in to comment.