refactor: run: Fetch server settings in get_api_key, not get_login_id.

This centralizes the requests calls for this logic into only get_api_key.

Tests updated (now simplified).

Author: neiljp

tests/cli/test_run.py

@@ -55,16 +55,13 @@ def test_in_color(color: str, code: str, text: str = "some text") -> None:
     ],
 )
 def test_get_login_id(mocker: MockerFixture, json: Dict[str, bool], label: str) -> None:
-    response = mocker.Mock(json=lambda: json)
-    mocked_get = mocker.patch("requests.get", return_value=response)
     mocked_styled_input = mocker.patch(
         MODULE + ".styled_input", return_value="input return value"
     )
 
-    result = get_login_id("REALM_URL")
+    result = get_login_id(json)
 
     assert result == "input return value"
-    mocked_get.assert_called_with(url="REALM_URL/api/v1/server_settings")
     mocked_styled_input.assert_called_with(label + ": ")
 
 

zulipterminal/cli/run.py

@@ -11,7 +11,7 @@
 import traceback
 from enum import Enum
 from os import path, remove
-from typing import Dict, List, NamedTuple, Optional, Tuple
+from typing import Any, Dict, List, NamedTuple, Optional, Tuple
 
 import requests
 from urwid import display_common, set_encoding
@@ -206,10 +206,9 @@ def styled_input(label: str) -> str:
     return input(in_color("blue", label))
 
 
-def get_login_id(realm_url: str) -> str:
-    res_json = requests.get(url=f"{realm_url}/api/v1/server_settings").json()
-    require_email_format_usernames = res_json["require_email_format_usernames"]
-    email_auth_enabled = res_json["email_auth_enabled"]
+def get_login_id(server_properties: Dict[str, Any]) -> str:
+    require_email_format_usernames = server_properties["require_email_format_usernames"]
+    email_auth_enabled = server_properties["email_auth_enabled"]
 
     if not require_email_format_usernames and email_auth_enabled:
         label = "Email or Username: "
@@ -225,8 +224,11 @@ def get_login_id(realm_url: str) -> str:
 def get_api_key(realm_url: str) -> Optional[Tuple[str, str]]:
     from getpass import getpass
 
-    login_id = get_login_id(realm_url)
+    server_properties = requests.get(url=f"{realm_url}/api/v1/server_settings").json()
+
+    login_id = get_login_id(server_properties)
     password = getpass(in_color("blue", "Password: "))
+
     response = requests.post(
         url=f"{realm_url}/api/v1/fetch_api_key",
         data={