fix: fix processing or httpx response for orjson

zabuldon · Mar 5, 2023 · e34126f · e34126f
1 parent 2f7a07c
commit e34126f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/teslajsonpy/connection.py b/teslajsonpy/connection.py
@@ -208,7 +208,7 @@ async def __open(
                 elif resp.status_code == 408:
                     raise TeslaException(resp.status_code, "vehicle_unavailable")
                 raise TeslaException(resp.status_code)
-            data = orjson.loads(resp)  # pylint: disable=no-member
+            data = orjson.loads(resp.text)  # pylint: disable=no-member
             if data.get("error"):
                 # known errors:
                 #     'vehicle unavailable: {:error=>"vehicle unavailable:"}',
@@ -451,7 +451,7 @@ async def get_authorization_code(
                     #         }
                     #     ]
                     # }
-                    mfa_json = orjson.loads(mfa_resp)  # pylint: disable=no-member
+                    mfa_json = orjson.loads(mfa_resp.text)  # pylint: disable=no-member
                     if len(mfa_json.get("data", [])) >= 1:
                         factor_id = mfa_json["data"][mfa_device]["id"]
                     if not mfa_code:
@@ -473,7 +473,7 @@ async def get_authorization_code(
                         },
                     )
                     _process_resp(mfa_resp)
-                    mfa_json = orjson.loads(mfa_resp)  # pylint: disable=no-member
+                    mfa_json = orjson.loads(mfa_resp.text)  # pylint: disable=no-member
                     if not (
                         mfa_json["data"].get("approved")
                         and mfa_json["data"].get("valid")
@@ -535,7 +535,7 @@ async def get_sso_auth_token(self, code):
             str(self.auth_domain.with_path("/oauth2/v3/token")),
             data=oauth,
         )
-        return orjson.loads(auth)  # pylint: disable=no-member
+        return orjson.loads(auth.text)  # pylint: disable=no-member
 
     async def refresh_access_token(self, refresh_token):
         """Refresh access token from sso."""
@@ -554,7 +554,7 @@ async def refresh_access_token(self, refresh_token):
             str(self.auth_domain.with_path("/oauth2/v3/token")),
             data=oauth,
         )
-        return orjson.loads(auth)  # pylint: disable=no-member
+        return orjson.loads(auth.text)  # pylint: disable=no-member
 
     async def get_bearer_token(self, access_token):
         """Get bearer token. This is used by the owners API."""
@@ -574,7 +574,7 @@ async def get_bearer_token(self, access_token):
         auth = await self.websession.post(
             "https://owner-api.teslamotors.com/oauth/token", headers=head, data=oauth
         )
-        return orjson.loads(auth)  # pylint: disable=no-member
+        return orjson.loads(auth.text)  # pylint: disable=no-member
 
 
 def get_inputs(soup: BeautifulSoup, searchfield=None) -> Dict[str, str]:

diff --git a/teslajsonpy/teslaproxy.py b/teslajsonpy/teslaproxy.py
@@ -111,7 +111,7 @@ async def test_url(
                 )
             self.waf_retry = 0
         if get_content_type(resp) == "application/json":
-            text = orjson.loads(resp)  # pylint: disable=no-member
+            text = orjson.loads(resp.text)  # pylint: disable=no-member
             _LOGGER.debug("Json response: %s", text)
 
     @staticmethod