Dont exit on fail. Handle when homeserver_url doesn't have schema

hintjen · Aug 5, 2024 · a35fc70 · a35fc70
1 parent 45aceac
commit a35fc70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/fractal/cli/controllers/auth.py b/fractal/cli/controllers/auth.py
@@ -79,6 +79,9 @@ def login(
                 MatrixHomeserver,
             )
 
+            if not homeserver_url.startswith(("http://", "https://")):
+                homeserver_url = f"https://{homeserver_url}"
+
             try:
                 hs = MatrixHomeserver.objects.get(url=homeserver_url)
                 MatrixCredentials.objects.create(

diff --git a/fractal/cli/controllers/registration.py b/fractal/cli/controllers/registration.py
@@ -35,7 +35,7 @@ async def _register_local(
             ]  # type: ignore
         except Exception as e:
             print(f"No synapse server running locally: {e}.")
-            exit(1)
+            raise Exception(f"No synapse server running locally: {e}")
 
         username = parse_matrix_id(matrix_id)[0]
         if not homeserver_url:
@@ -47,9 +47,9 @@ async def _register_local(
         )
         if result.exit_code != 0:
             print(result.output.decode("utf-8"))
-            exit(1)
+            raise Exception(f"Failed to create user: {result.output.decode('utf-8')}")
 
-        if not homeserver_url.startswith("http://") or homeserver_url.startswith("https://"):
+        if not homeserver_url.startswith(("http://", "https://")):
             homeserver_url = f"https://{homeserver_url}"
 
         async with MatrixClient(homeserver_url) as client: