fix: Service Endpoints & Code Cleanup

custom_components/audiconnect/audi_account.py

@@ -208,16 +208,29 @@ async def execute_vehicle_action(self, service):
             await self.connection.set_vehicle_window_heating(vin, False)
 
     async def start_climate_control(self, service):
-        _LOGGER.info("Initiating Start Climate Control Service...")
+        _LOGGER.debug("Initiating Start Climate Control Service...")
         vin = service.data.get(CONF_VIN).lower()
+        redacted_vin = "*" * (len(vin) - 4) + vin[-4:]
         # Optional Parameters
         temp_f = service.data.get(CONF_CLIMATE_TEMP_F, None)
         temp_c = service.data.get(CONF_CLIMATE_TEMP_C, None)
-        glass_heating = service.data.get(CONF_CLIMATE_GLASS, False)
-        seat_fl = service.data.get(CONF_CLIMATE_SEAT_FL, False)
-        seat_fr = service.data.get(CONF_CLIMATE_SEAT_FR, False)
-        seat_rl = service.data.get(CONF_CLIMATE_SEAT_RL, False)
-        seat_rr = service.data.get(CONF_CLIMATE_SEAT_RR, False)
+        glass_heating = service.data.get(CONF_CLIMATE_GLASS, None)
+        seat_fl = service.data.get(CONF_CLIMATE_SEAT_FL, None)
+        seat_fr = service.data.get(CONF_CLIMATE_SEAT_FR, None)
+        seat_rl = service.data.get(CONF_CLIMATE_SEAT_RL, None)
+        seat_rr = service.data.get(CONF_CLIMATE_SEAT_RR, None)
+
+        _LOGGER.debug(
+            "Sending command to start climate control for vehicle %s with settings - Temp(F): %s, Temp(C): %s, Glass Heating: %s, Seat FL: %s, Seat FR: %s, Seat RL: %s, Seat RR: %s",
+            redacted_vin,
+            temp_f,
+            temp_c,
+            glass_heating,
+            seat_fl,
+            seat_fr,
+            seat_rl,
+            seat_rr,
+        )
 
         await self.connection.start_climate_control(
             vin,

custom_components/audiconnect/audi_api.py

@@ -7,6 +7,7 @@
 from asyncio import TimeoutError, CancelledError
 from aiohttp import ClientResponseError
 from aiohttp.hdrs import METH_GET, METH_POST, METH_PUT
+from .const import HDR_XAPP_VERSION, HDR_USER_AGENT
 
 from typing import Dict
 
@@ -16,9 +17,6 @@
 
 
 class AudiAPI:
-    HDR_XAPP_VERSION = "4.23.1"
-    HDR_USER_AGENT = "Android/4.23.1 (Build 800240120.root project 'onetouch-android'.ext.buildTime) Android/11"
-
     def __init__(self, session, proxy=None):
         self.__token = None
         self.__xclientid = None
@@ -38,7 +36,7 @@ async def request(
         self,
         method,
         url,
-        data,
+        data=None,
         headers: Dict[str, str] = None,
         raw_reply: bool = False,
         raw_contents: bool = False,
@@ -129,9 +127,9 @@ def __get_headers(self):
         data = {
             "Accept": "application/json",
             "Accept-Charset": "utf-8",
-            "X-App-Version": self.HDR_XAPP_VERSION,
+            "X-App-Version": HDR_XAPP_VERSION,
             "X-App-Name": "myAudi",
-            "User-Agent": self.HDR_USER_AGENT,
+            "User-Agent": HDR_USER_AGENT,
         }
         if self.__token is not None:
             data["Authorization"] = "Bearer " + self.__token.get("access_token")

custom_components/audiconnect/audi_connect_account.py

@@ -300,17 +300,14 @@ async def start_climate_control(
         seat_rl: bool,
         seat_rr: bool,
     ):
+        redacted_vin = "*" * (len(vin) - 4) + vin[-4:]
         if not self._loggedin:
             await self.login()
 
         if not self._loggedin:
             return False
 
         try:
-            _LOGGER.debug(
-                f"Sending command to start climate control for vehicle {vin} with settings - Temp(F): {temp_f}, Temp(C): {temp_c}, Glass Heating: {glass_heating}, Seat FL: {seat_fl}, Seat FR: {seat_fr}, Seat RL: {seat_rl}, Seat RR: {seat_rr}"
-            )
-
             await self._audi_service.start_climate_control(
                 vin,
                 temp_f,
@@ -322,15 +319,20 @@ async def start_climate_control(
                 seat_rr,
             )
 
-            _LOGGER.debug(f"Successfully started climate control of vehicle {vin}")
+            _LOGGER.debug(
+                "Successfully started climate control of vehicle with VIN: %s",
+                redacted_vin,
+            )
 
             await self.notify(vin, ACTION_CLIMATISATION)
 
             return True
 
         except Exception as exception:
             _LOGGER.error(
-                f"Unable to start climate control of vehicle {vin}. Error: {exception}",
+                "Unable to start climate control of vehicle with VIN: %s. Error: %s",
+                redacted_vin,
+                exception,
                 exc_info=True,
             )
             return False