hyundai-kia-connect-api 3.16.0__tar.gz → 3.17.1__tar.gz

{hyundai_kia_connect_api-3.16.0 → hyundai_kia_connect_api-3.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.16.0
+Version: 3.17.1
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/fuatakgun/hyundai_kia_connect_api
 Author: Fuat Akgun

{hyundai_kia_connect_api-3.16.0 → hyundai_kia_connect_api-3.17.1}/hyundai_kia_connect_api/KiaUvoAPIUSA.py

@@ -6,6 +6,7 @@ import logging
 import random
 import re
 import secrets
+import ssl
 import string
 import time
 import typing
@@ -14,6 +15,8 @@ from datetime import datetime
 import pytz
 import requests
 from requests import RequestException, Response
+from requests.adapters import HTTPAdapter
+from urllib3.util.ssl_ import create_urllib3_context
 
 from .ApiImpl import ApiImpl, ClimateRequestOptions
 from .Token import Token
@@ -31,6 +34,16 @@ from .utils import get_child_value
 _LOGGER = logging.getLogger(__name__)
 
 
+# This is the key part of our patch. We get the standard SSLContext that requests would
+# normally use, and add ciphers that Kia USA may need for compatibility.
+class KiaSSLAdapter(HTTPAdapter):
+    def init_poolmanager(self, *args, **kwargs):
+        context = create_urllib3_context(
+            ciphers='DEFAULT:@SECLEVEL=1', ssl_version=ssl.PROTOCOL_TLSv1_2)
+        kwargs['ssl_context'] = context
+        return super().init_poolmanager(*args, **kwargs)
+
+
 class AuthError(RequestException):
     """AuthError"""
 
@@ -108,6 +121,8 @@ class KiaUvoAPIUSA(ApiImpl):
 
         self.BASE_URL: str = "api.owners.kia.com"
         self.API_URL: str = "https://" + self.BASE_URL + "/apigw/v1/"
+        self.session = requests.Session()
+        self.session.mount("https://", KiaSSLAdapter())
 
     def api_headers(self) -> dict:
         offset = time.localtime().tm_gmtoff / 60 / 60
@@ -149,7 +164,7 @@ class KiaUvoAPIUSA(ApiImpl):
         self, token: Token, url: str, json_body: dict, vehicle: Vehicle
     ) -> Response:
         headers = self.authed_api_headers(token, vehicle)
-        return requests.post(url, json=json_body, headers=headers)
+        return self.session.post(url, json=json_body, headers=headers)
 
     @request_with_active_session
     @request_with_logging
@@ -157,7 +172,7 @@ class KiaUvoAPIUSA(ApiImpl):
         self, token: Token, url: str, vehicle: Vehicle
     ) -> Response:
         headers = self.authed_api_headers(token, vehicle)
-        return requests.get(url, headers=headers)
+        return self.session.get(url, headers=headers)
 
     def login(self, username: str, password: str) -> Token:
         """Login into cloud endpoints and return Token"""
@@ -170,7 +185,7 @@ class KiaUvoAPIUSA(ApiImpl):
             "userCredential": {"userId": username, "password": password},
         }
         headers = self.api_headers()
-        response = requests.post(url, json=data, headers=headers)
+        response = self.session.post(url, json=data, headers=headers)
         _LOGGER.debug(f"{DOMAIN} - Sign In Response {response.text}")
         session_id = response.headers.get("sid")
         if not session_id:
@@ -191,7 +206,7 @@ class KiaUvoAPIUSA(ApiImpl):
         url = self.API_URL + "ownr/gvl"
         headers = self.api_headers()
         headers["sid"] = token.access_token
-        response = requests.get(url, headers=headers)
+        response = self.session.get(url, headers=headers)
         _LOGGER.debug(f"{DOMAIN} - Get Vehicles Response {response.text}")
         response = response.json()
         result = []
@@ -216,7 +231,7 @@ class KiaUvoAPIUSA(ApiImpl):
         url = self.API_URL + "ownr/gvl"
         headers = self.api_headers()
         headers["sid"] = token.access_token
-        response = requests.get(url, headers=headers)
+        response = self.session.get(url, headers=headers)
         _LOGGER.debug(f"{DOMAIN} - Get Vehicles Response {response.text}")
         _LOGGER.debug(f"{DOMAIN} - Vehicles Type Passed in: {type(vehicles)}")
         _LOGGER.debug(f"{DOMAIN} - Vehicles Passed in: {vehicles}")

{hyundai_kia_connect_api-3.16.0 → hyundai_kia_connect_api-3.17.1}/hyundai_kia_connect_api/KiaUvoApiAU.py

@@ -106,7 +106,9 @@ class KiaUvoApiAU(ApiImpl):
             self.BASE_URL: str = "au-apigw.ccs.kia.com.au:8082"
             self.CCSP_SERVICE_ID: str = "8acb778a-b918-4a8d-8624-73a0beb64289"
             self.APP_ID: str = "4ad4dcde-be23-48a8-bc1c-91b94f5c06f8"  # Android app ID
-            self.BASIC_AUTHORIZATION: str = "Basic OGFjYjc3OGEtYjkxOC00YThkLTg2MjQtNzNhMGJlYjY0Mjg5OjdTY01NbTZmRVlYZGlFUEN4YVBhUW1nZVlkbFVyZndvaDRBZlhHT3pZSVMyQ3U5VA=="
+            self.BASIC_AUTHORIZATION: str = (
+                "Basic OGFjYjc3OGEtYjkxOC00YThkLTg2MjQtNzNhMGJlYjY0Mjg5OjdTY01NbTZmRVlYZGlFUEN4YVBhUW1nZVlkbFVyZndvaDRBZlhHT3pZSVMyQ3U5VA=="
+            )
         elif BRANDS[brand] == BRAND_HYUNDAI:
             self.BASE_URL: str = "au-apigw.ccs.hyundai.com.au:8080"
             self.CCSP_SERVICE_ID: str = "855c72df-dfd7-4230-ab03-67cbf902bb1c"
@@ -1028,7 +1030,9 @@ class KiaUvoApiAU(ApiImpl):
 
     def _get_stamp(self) -> str:
         if BRANDS[self.brand] == BRAND_KIA:
-            raise APIError("Kia is not supported in Australia")
+            cfb = base64.b64decode(
+                "IDbMgWBXgic4MAyMgf5PFFRAdGX5O3IyC3uvN3scCs0gDpTFDuyvBorlAH9JMM2/wMc="
+            )
         elif BRANDS[self.brand] == BRAND_HYUNDAI:
             cfb = base64.b64decode(
                 "V60WkEmyRQaAfrBF1623/7QL62MjLVbCHdItGzQ1g5T/hkmKmMVTaMHv4cKGzgD3gL8="

{hyundai_kia_connect_api-3.16.0 → hyundai_kia_connect_api-3.17.1}/hyundai_kia_connect_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.16.0
+Version: 3.17.1
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/fuatakgun/hyundai_kia_connect_api
 Author: Fuat Akgun

{hyundai_kia_connect_api-3.16.0 → hyundai_kia_connect_api-3.17.1}/setup.py

@@ -44,6 +44,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/fuatakgun/hyundai_kia_connect_api",
-    version="3.16.0",
+    version="3.17.1",
     zip_safe=False,
 )