Minor fixes

Author: Bre77

tesla_fleet_api/teslafleetapi.py

@@ -106,22 +106,24 @@ async def _request(
             if access_token := await self.refresh_hook():
                 self.access_token = access_token
 
+        headers = {
+            "Authorization": f"Bearer {self.access_token}",
+            "X-Library": f"python tesla_fleet_api {VERSION}",
+        }
+
         # Remove None values from params and json
         if params:
             params = {k: v for k, v in params.items() if v is not None}
             LOGGER.debug("Parameters: %s", params)
         if json:
             json = {k: v for k, v in json.items() if v is not None}
             LOGGER.debug("Body: %s", dumps(json))
+            headers["Content-Type"] = "application/json"
 
         async with self.session.request(
             method,
             f"{self.server}/{path}",
-            headers={
-                "Authorization": f"Bearer {self.access_token}",
-                "Content-Type": "application/json",
-                "X-Library": f"python tesla_fleet_api {VERSION}",
-            },
+            headers=headers,
             json=json,
             params=params,
         ) as resp:

tesla_fleet_api/teslafleetoauth.py

@@ -45,7 +45,7 @@ def get_login_url(self, scopes: list[Scope], state: str = "login") -> str:
         """Get the login URL."""
         if self.redirect_uri is None:
             raise ValueError("Redirect URI is missing")
-        return f"https://auth.tesla.com/oauth2/v3/authorize?response_type=code&prompt=login&client_id={self.client_id}&redirect_uri={self.redirect_uri}&scope={'+'.join(scopes)}&state={state}"
+        return f"https://auth.tesla.com/oauth2/v3/authorize?response_type=code&client_id={self.client_id}&redirect_uri={self.redirect_uri}&scope={'+'.join(scopes)}&state={state}"
 
     async def get_refresh_token(self, code: str) -> None:
         """Get the refresh token."""

tesla_fleet_api/teslemetry.py

@@ -96,11 +96,11 @@ async def server_side_polling(
             )
         ).get("response")
 
-    async def vehicle_force_refresh(self, vin: str) -> dict[str, Any]:
+    async def vehicle_data_refresh(self, vin: str) -> dict[str, Any]:
         """Force a refresh of the vehicle data."""
         return await self._request(
             Method.GET,
-            f"api/force/{vin}",
+            f"api/refresh/{vin}",
         )
 
     async def _request(

tesla_fleet_api/vehicle.py

@@ -44,7 +44,7 @@ def specific_signed(
 
     def pre2021(self, vin: str) -> bool:
         """Checks if a vehicle is a pre-2021 model S or X."""
-        return vin[9] <= "L" and vin[3] in ["S", "X"]
+        return vin[3] in ["S", "X"] and (vin[9] <= "L" or (vin[9] == "M" and vin[7] in ['1', '2', '3', '4']))
 
     async def actuate_trunk(
         self, vehicle_tag: str | int, which_trunk: Trunk | str

tesla_fleet_api/vehiclesigned.py

@@ -22,14 +22,11 @@
 from .vehiclespecific import VehicleSpecific
 
 from .pb2.universal_message_pb2 import (
-    # OPERATIONSTATUS_OK,
-    MESSAGEFAULT_ERROR_INCORRECT_EPOCH,
     OPERATIONSTATUS_WAIT,
     OPERATIONSTATUS_ERROR,
     DOMAIN_VEHICLE_SECURITY,
     DOMAIN_INFOTAINMENT,
     Domain,
-    # MessageFault_E,
     RoutableMessage,
 )
 from .pb2.car_server_pb2 import (
@@ -215,9 +212,10 @@ async def _handshake(self, domain: int) -> None:
                 ec.SECP256R1(), vehicle_public_key
             ),
         )
+        key = hashlib.sha1(shared).digest()[:16]
 
         self._sessions[domain] = Session(
-            key=hashlib.sha1(shared).digest()[:16],
+            key=key,
             counter=info.counter,
             epoch=info.epoch,
             delta=int(time.time()) - info.clock_time,