cleaner

Author: matin

.vscode/settings.json

@@ -4,5 +4,10 @@
         "editor.insertSpaces": true,
         "editor.detectIndentation": false
     },
-    "python.analysis.typeCheckingMode": "basic"
+    "python.analysis.typeCheckingMode": "basic",
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
 }

garth/http.py

@@ -80,7 +80,7 @@ def configure(
         self.sess.mount("https://", adapter)
 
     @property
-    def username(self) -> str | None:
+    def username(self):
         if not self._username:
             self._username = self.connectapi(
                 "/userprofile-service/socialProfile"
@@ -97,7 +97,7 @@ def request(
         referrer: str | bool = False,
         headers: dict = {},
         **kwargs,
-    ):
+    ) -> Response:
         url = f"https://{subdomain}.{self.domain}{path}"
         if referrer is True and self.last_resp:
             headers["referer"] = self.last_resp.url
@@ -113,10 +113,10 @@ def request(
         self.last_resp.raise_for_status()
         return self.last_resp
 
-    def get(self, *args, **kwargs):
+    def get(self, *args, **kwargs) -> Response:
         return self.request("GET", *args, **kwargs)
 
-    def post(self, *args, **kwargs):
+    def post(self, *args, **kwargs) -> Response:
         return self.request("POST", *args, **kwargs)
 
     def login(self, *args):

garth/sso.py

@@ -42,13 +42,12 @@ def login(
         embedWidget="true",
         gauthHost=SSO,
     )
-    SIGNIN_PARAMS = dict(
-        id="gauth-widget",
+    SIGNIN_PARAMS = SSO_EMBED_PARAMS | dict(
+        gauthHost=SSO_EMBED,
         service=SSO_EMBED,
         source=SSO_EMBED,
         redirectAfterAccountLoginUrl=SSO_EMBED,
         redirectAfterAccountCreationUrl=SSO_EMBED,
-        gauthHost=SSO_EMBED,
     )
 
     # Set cookies
@@ -132,7 +131,7 @@ def handle_mfa(client: "http.Client", signin_params: dict) -> None:
     client.post(
         "sso",
         "/sso/verifyMFA/loginEnterMfaCode",
-        params=signin_params | dict(embedWidget="true"),
+        params=signin_params,
         referrer=True,
         data={
             "mfa-code": mfa_code,

garth/version.py

@@ -1 +1 @@
-__version__ = "0.4.2"
+__version__ = "0.4.3"

tests/cassettes/test_login_email_password_fail.yaml

@@ -30,7 +30,7 @@ def test_login_success(client: Client):
 @pytest.mark.vcr
 def test_login_success_mfa(monkeypatch, client: Client):
     def mock_input(_):
-        return "327751"
+        return "671091"
 
     monkeypatch.setattr("builtins.input", mock_input)
     oauth1, oauth2 = sso.login(