hyundai-kia-connect-api 3.32.2__tar.gz → 3.32.4__tar.gz

{hyundai_kia_connect_api-3.32.2 → hyundai_kia_connect_api-3.32.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hyundai_kia_connect_api
-Version: 3.32.2
+Version: 3.32.4
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api
 Author: Fuat Akgun

{hyundai_kia_connect_api-3.32.2 → hyundai_kia_connect_api-3.32.4}/hyundai_kia_connect_api/ApiImpl.py

@@ -89,6 +89,11 @@ class ApiImpl:
         """Get cached vehicle data and update Vehicle instance with it"""
         pass
 
+    def test_token(self, token: Token) -> bool:
+        """Test if token is valid
+        Use any dummy request to test if token is still valid"""
+        return True
+
     def check_action_status(
         self,
         token: Token,

{hyundai_kia_connect_api-3.32.2 → hyundai_kia_connect_api-3.32.4}/hyundai_kia_connect_api/KiaUvoApiCA.py

@@ -6,7 +6,6 @@ import time
 import datetime as dt
 import json
 import logging
-
 import pytz
 import requests
 
@@ -38,28 +37,12 @@ from .utils import (
     parse_datetime,
 )
 
-import ssl
-import urllib3
 
 CIPHERS = "ALL:@SECLEVEL=0"
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class cipherAdapter(requests.adapters.HTTPAdapter):
-    """
-    A HTTPAdapter that re-enables poor ciphers required by Hyundai.
-    """
-
-    def init_poolmanager(self, connections, maxsize, block=False):
-        context = ssl.create_default_context()
-        context.set_ciphers(CIPHERS)
-        context.options |= getattr(ssl, "OP_LEGACY_SERVER_CONNECT", 0x4)
-        self.poolmanager = urllib3.poolmanager.PoolManager(
-            ssl_version=ssl.PROTOCOL_TLS, ssl_context=context
-        )
-
-
 class KiaUvoApiCA(ApiImpl):
     """KiaUvoApiCA"""
 
@@ -89,7 +72,7 @@ class KiaUvoApiCA(ApiImpl):
             "host": self.BASE_URL,
             "origin": "https://" + self.BASE_URL,
             "referer": "https://" + self.BASE_URL + "/login",
-            "from": "SPA",
+            "from": "CWP",
             "language": "0",
             "offset": "0",
             "sec-fetch-dest": "empty",
@@ -102,7 +85,6 @@ class KiaUvoApiCA(ApiImpl):
     def sessions(self):
         if not self._sessions:
             self._sessions = requests.Session()
-            self._sessions.mount("https://" + self.BASE_URL, cipherAdapter())
         return self._sessions
 
     def _check_response_for_errors(self, response: dict) -> None:
@@ -133,11 +115,12 @@ class KiaUvoApiCA(ApiImpl):
         url = self.API_URL + "v2/login"
         data = {"loginId": username, "password": password}
         headers = self.API_HEADERS
+        headers.pop("accessToken", None)
         response = self.sessions.post(url, json=data, headers=headers)
         _LOGGER.debug(f"{DOMAIN} - Sign In Response {response.text}")
         response = response.json()
         self._check_response_for_errors(response)
-        response = response["result"]
+        response = response["result"]["token"]
         access_token = response["accessToken"]
         refresh_token = response["refreshToken"]
         _LOGGER.debug(f"{DOMAIN} - Access Token Value {access_token}")
@@ -153,6 +136,24 @@ class KiaUvoApiCA(ApiImpl):
             valid_until=valid_until,
         )
 
+    def test_token(self, token: Token) -> bool:
+        # Use "get number of notifications" as a dummy request to test the token
+        # Use this api because it's likely checked more frequently than other APIs, less
+        # chance to get banned. And it's short and simple.
+        url = self.API_URL + "ntcmsgcnt"
+        headers = self.API_HEADERS
+        headers["accessToken"] = token.access_token
+        response = self.sessions.post(url, headers=headers)
+        _LOGGER.debug(f"{DOMAIN} - Test Token Response {response.text}")
+        response = response.json()
+        token_errors = ["7403", "7602"]
+        if (
+            response["responseHeader"]["responseCode"] == 1
+            and response["error"]["errorCode"] in token_errors
+        ):
+            return False
+        return True
+
     def get_vehicles(self, token: Token) -> list[Vehicle]:
         url = self.API_URL + "vhcllst"
         headers = self.API_HEADERS

{hyundai_kia_connect_api-3.32.2 → hyundai_kia_connect_api-3.32.4}/hyundai_kia_connect_api/VehicleManager.py

@@ -134,7 +134,10 @@ class VehicleManager:
     def check_and_refresh_token(self) -> bool:
         if self.token is None:
             self.initialize()
-        if self.token.valid_until <= dt.datetime.now(pytz.utc):
+        if (
+            self.token.valid_until <= dt.datetime.now(pytz.utc)
+            or self.api.test_token(self.token) is False
+        ):
             _LOGGER.debug(f"{DOMAIN} - Refresh token expired")
             self.token: Token = self.api.login(self.username, self.password)
             self.token.pin = self.pin

{hyundai_kia_connect_api-3.32.2 → hyundai_kia_connect_api-3.32.4}/hyundai_kia_connect_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hyundai_kia_connect_api
-Version: 3.32.2
+Version: 3.32.4
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api
 Author: Fuat Akgun

{hyundai_kia_connect_api-3.32.2 → hyundai_kia_connect_api-3.32.4}/setup.py

@@ -47,6 +47,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api",
-    version="3.32.2",
+    version="3.32.4",
     zip_safe=False,
 )