hyundai-kia-connect-api 3.17.0__py2.py3-none-any.whl → 3.17.2__py2.py3-none-any.whl

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,17 @@ 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 +122,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 +165,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 +173,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 +186,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 +207,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 +232,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/KiaUvoApiAU.py

@@ -53,7 +53,9 @@ from .utils import (
 _LOGGER = logging.getLogger(__name__)
 
 USER_AGENT_OK_HTTP: str = "okhttp/3.12.0"
-USER_AGENT_MOZILLA: str = "Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19"  # noqa
+USER_AGENT_MOZILLA: str = (
+    "Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19"  # noqa
+)
 
 
 def _check_response_for_errors(response: dict) -> None:
@@ -104,12 +106,16 @@ 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"
             self.APP_ID: str = "f9ccfdac-a48d-4c57-bd32-9116963c24ed"  # Android app ID
-            self.BASIC_AUTHORIZATION: str = "Basic ODU1YzcyZGYtZGZkNy00MjMwLWFiMDMtNjdjYmY5MDJiYjFjOmU2ZmJ3SE0zMllOYmhRbDBwdmlhUHAzcmY0dDNTNms5MWVjZUEzTUpMZGJkVGhDTw=="
+            self.BASIC_AUTHORIZATION: str = (
+                "Basic ODU1YzcyZGYtZGZkNy00MjMwLWFiMDMtNjdjYmY5MDJiYjFjOmU2ZmJ3SE0zMllOYmhRbDBwdmlhUHAzcmY0dDNTNms5MWVjZUEzTUpMZGJkVGhDTw=="
+            )
 
         self.USER_API_URL: str = "https://" + self.BASE_URL + "/api/v1/user/"
         self.SPA_API_URL: str = "https://" + self.BASE_URL + "/api/v1/spa/"
@@ -225,11 +231,10 @@ class KiaUvoApiAU(ApiImpl):
             if int(value) > 1260:
                 value = dt.datetime.strptime(str(value), "%H%M").time()
             else:
-                if timesection == 0:
-                    value = str(value) + " AM"
-                elif timesection == 1:
-                    value = str(value) + " PM"
-                value = dt.datetime.strptime(value, "%I%M %p").time()
+                d = dt.datetime.strptime(str(value), "%I%M")
+                if timesection > 0:
+                    d += dt.timedelta(hours=12)
+                value = d.time()
         return value
 
     def update_vehicle_with_cached_state(self, token: Token, vehicle: Vehicle) -> None:

{hyundai_kia_connect_api-3.17.0.dist-info → hyundai_kia_connect_api-3.17.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.17.0
+Version: 3.17.2
 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.17.0.dist-info → hyundai_kia_connect_api-3.17.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 hyundai_kia_connect_api/ApiImpl.py,sha256=1j5FRTQIILrSzQU6oE5i4J_l8cVvYuMGBmQn-kL7zyg,5018
 hyundai_kia_connect_api/HyundaiBlueLinkAPIUSA.py,sha256=FVWDzmkO_jsc_r4WzufgxaJkeVYhf9UAw9A6r37b-Dc,26750
-hyundai_kia_connect_api/KiaUvoAPIUSA.py,sha256=zDSnfUtdExnb1e-x6-qQgqd5nlDaWIHqQyPCrOilPIs,30522
-hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=PCqlh00MEOnCcYpZn9zTk2rdPVdDuI62HXeLEgPz9os,48728
+hyundai_kia_connect_api/KiaUvoAPIUSA.py,sha256=kQo3PA_FktsAHhdugZi0lrpMcp96WNXcvBJPbIJIcfY,31217
+hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=ncAUEWqepHwYTZqu7JDNAozguucqqIg-HKPvpN_54CE,48738
 hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=7bcDLcJ3JLLoWldPy514eKhWUAo1Gb1mu_3SaXno4v8,30358
 hyundai_kia_connect_api/KiaUvoApiCN.py,sha256=MjXdDdm1wDVvFZhgg8AjAF6X2SB-AIFMTE5iRmr80QM,47384
 hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=GqJhJWJ8vD07OG6dIOj5nammzr7822TNcW031A6AQUw,68001
@@ -12,9 +12,9 @@ hyundai_kia_connect_api/__init__.py,sha256=6UwXW6Lj5VnRtWNOt_0dLFdOYlcbysHCc6ol_
 hyundai_kia_connect_api/const.py,sha256=C25jgV79u7SZF5xDy96gol_CekIkyI4h3goTyDEmng0,1967
 hyundai_kia_connect_api/exceptions.py,sha256=m7gyDnvA5OVAK4EXSP_ZwE0s0uV8HsGUV0tiYwqofK0,1343
 hyundai_kia_connect_api/utils.py,sha256=rfhERPXkzqelsaieLtiAyN9xDDTheNyKX5aBPRLrHf4,1117
-hyundai_kia_connect_api-3.17.0.dist-info/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
-hyundai_kia_connect_api-3.17.0.dist-info/LICENSE,sha256=AsZwIRViAze7ObwO6V6IB0q4caXv6DJS2-3dsU1FWy8,1069
-hyundai_kia_connect_api-3.17.0.dist-info/METADATA,sha256=Kay6dlQAO1DVPOma1LWjQzk0s1Z8KJpdyonUJL_jXxc,5770
-hyundai_kia_connect_api-3.17.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-hyundai_kia_connect_api-3.17.0.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
-hyundai_kia_connect_api-3.17.0.dist-info/RECORD,,
+hyundai_kia_connect_api-3.17.2.dist-info/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
+hyundai_kia_connect_api-3.17.2.dist-info/LICENSE,sha256=AsZwIRViAze7ObwO6V6IB0q4caXv6DJS2-3dsU1FWy8,1069
+hyundai_kia_connect_api-3.17.2.dist-info/METADATA,sha256=zqlBsOOCvbM23zLOxiJdjUsw-M5Bpee8Qa7YttFRg2g,5770
+hyundai_kia_connect_api-3.17.2.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+hyundai_kia_connect_api-3.17.2.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
+hyundai_kia_connect_api-3.17.2.dist-info/RECORD,,