Merge pull request #289 from alandtse/no_bearer_token_step

Remove get bearer token step
zabuldon · Mar 23, 2022 · a7c1190 · a7c1190
2 parents ba0fcd9 + 0bdc5a5
commit a7c1190
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -17,17 +17,21 @@ max-line-length = 88
 # H301: on mport per line
 # W503: Line break occurred before a binary operator
 # E203: Whitespace before ':'
+# E251: E251 unexpected spaces around keyword / parameter equals
 # D202 No blank lines allowed after function docstring
 # W504 line break after binary operator
 # H102 missing apache
+# E701 multiple statements on one line (colon)
 ignore =
     E501,
     H301,
     W503,
     E203,
+    E251,
     D202,
     W504,
-    H102
+    H102,
+    E701
 
 [isort]
 # https://github.com/timothycrosley/isort

diff --git a/teslajsonpy/connection.py b/teslajsonpy/connection.py
@@ -49,7 +49,7 @@ def __init__(
         refresh_token: Text = None,
         authorization_token: Text = None,
         expiration: int = 0,
-        auth_domain: str = AUTH_DOMAIN
+        auth_domain: str = AUTH_DOMAIN,
     ) -> None:
         """Initialize connection object."""
         self.user_agent: Text = "Model S 2.1.79 (SM-G900V; Android REL 4.4.4; en_US"
@@ -147,10 +147,6 @@ async def post(self, command, method="post", data=None, url=""):
                 self.code = None
                 self.sso_oauth = {}
                 raise IncompleteCredentials("Need oauth credentials")
-            auth = await self.get_bearer_token(
-                access_token=self.sso_oauth.get("access_token")
-            )
-            _LOGGER.debug("Received bearer token %s", auth)
             if auth.get("created_at"):
                 # use server time if available
                 self.__sethead(
@@ -565,6 +561,7 @@ async def refresh_access_token(self, refresh_token):
 
     async def get_bearer_token(self, access_token):
         """Get bearer token. This is used by the owners API."""
+        # This appears deprecated as of March 21, 2022: https://github.com/timdorr/tesla-api/issues/548
         # https://tesla-api.timdorr.com/api-basics/authentication#step-4-exchange-bearer-token-for-access-token
         if not access_token:
             _LOGGER.debug("Missing access token")

diff --git a/teslajsonpy/controller.py b/teslajsonpy/controller.py
@@ -774,7 +774,9 @@ def _calculate_next_interval(self, vin: Text) -> int:
                 vin=vin, timestamp=cur_time, shift_state=self.shift_state(vin=vin)
             )
         if self.is_in_gear(vin=vin):
-            driving_interval = min(DRIVING_INTERVAL, self.get_update_interval_vin(vin=vin))
+            driving_interval = min(
+                DRIVING_INTERVAL, self.get_update_interval_vin(vin=vin)
+            )
             if self.__update_state[vin] != "driving":
                 self.__update_state[vin] = "driving"
                 _LOGGER.debug(
@@ -1548,7 +1550,9 @@ def update_interval(self, value: int) -> None:
             _LOGGER.debug("Update interval set to %s.", value)
             self._update_interval = int(value)
 
-    def set_update_interval_vin(self, car_id: Text = None, vin: Text = None, value: int = None) -> None:
+    def set_update_interval_vin(
+        self, car_id: Text = None, vin: Text = None, value: int = None
+    ) -> None:
         """Set update interval for specific vin."""
 
         if car_id and not vin:

diff --git a/teslajsonpy/homeassistant/binary_sensor.py b/teslajsonpy/homeassistant/binary_sensor.py
@@ -214,14 +214,16 @@ def refresh(self) -> None:
         self.attrs["vehicle_id"] = self.vehicle_id()
         self.attrs["vin"] = self.vin()
         self.attrs["id"] = self.id()
-        self.attrs["update_interval"] = self._controller.get_update_interval_vin(vin=self._vin)
+        self.attrs["update_interval"] = self._controller.get_update_interval_vin(
+            vin=self._vin
+        )
         vehicle_data = {
             "climate_state": self._controller.get_climate_params(self._id),
             "charge_state": self._controller.get_charging_params(self._id),
             "vehicle_state": self._controller.get_state_params(self._id),
             "vehicle_config": self._controller.get_config_params(self._id),
             "drive_state": self._controller.get_drive_params(self._id),
-            "gui_settings": self._controller.get_gui_params(self._id)
+            "gui_settings": self._controller.get_gui_params(self._id),
         }
         self.attrs["vehicle_data"] = dumps(vehicle_data)
 

diff --git a/teslajsonpy/homeassistant/gps.py b/teslajsonpy/homeassistant/gps.py
@@ -48,7 +48,11 @@ def __init__(self, data, controller):
 
     def get_location(self):
         """Return the current location."""
-        if self.__longitude is not None and self.__latitude is not None and self.__heading is not None:
+        if (
+            self.__longitude is not None
+            and self.__latitude is not None
+            and self.__heading is not None
+        ):
             self.__location = {
                 "longitude": self.__longitude,
                 "latitude": self.__latitude,