forked from MirrorHub/synapse
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. (#14637)
This commit is contained in:
parent
d69bf3b24c
commit
96251af50d
1
changelog.d/14637.bugfix
Normal file
1
changelog.d/14637.bugfix
Normal file
|
@ -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.
|
|
@ -222,6 +222,7 @@ 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)
|
||||
|
||||
|
@ -229,7 +230,7 @@ def main() -> None:
|
|||
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")
|
||||
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue