carconnectivity-connector-skoda 0.7__py3-none-any.whl → 0.7.1a1__py3-none-any.whl

{carconnectivity_connector_skoda-0.7.dist-info → carconnectivity_connector_skoda-0.7.1a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.7
+Version: 0.7.1a1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License
@@ -40,7 +40,7 @@ License-File: LICENSE
 Requires-Dist: carconnectivity>=0.7
 Requires-Dist: oauthlib~=3.2.2
 Requires-Dist: requests~=2.32.3
-Requires-Dist: jwt~=1.3.1
+Requires-Dist: pyjwt~=2.10
 Requires-Dist: paho-mqtt~=2.1.0
 Dynamic: license-file
 

{carconnectivity_connector_skoda-0.7.dist-info → carconnectivity_connector_skoda-0.7.1a1.dist-info}/RECORD

@@ -1,23 +1,23 @@
-carconnectivity_connector_skoda-0.7.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_skoda-0.7.1a1.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_connectors/skoda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/skoda/_version.py,sha256=pz35JP40uhhjvpunO5XmeQhmrllFsoC46JzXGE2quqw,506
+carconnectivity_connectors/skoda/_version.py,sha256=pHY61gdymelMNQrdzvkKkynJJ2qr-0ukqQESii8vWCM,513
 carconnectivity_connectors/skoda/capability.py,sha256=wH563-XUb_TnT8di1qDjnj-cY-cNHcAT6z7mx21LhSQ,4770
 carconnectivity_connectors/skoda/charging.py,sha256=7DPNiTWFhxiiEFKVnbIIU2TCmkpmcMWx_zsHXGXFpAQ,6856
 carconnectivity_connectors/skoda/climatization.py,sha256=Jut468SkxjPBDTqroWFvDifVPfJBxGjsFed5pc4kZkg,1768
 carconnectivity_connectors/skoda/command_impl.py,sha256=wDCI3Bka5pXlbyI4yVFS353TgFGyiBHBkERpP2g0A9w,3230
-carconnectivity_connectors/skoda/connector.py,sha256=Lgg-_ySEgtvjGEFNTa5215ZJa8OYVEyGFolgPhV8mMA,146134
+carconnectivity_connectors/skoda/connector.py,sha256=c-PavWSf1TNO5v773nmiP8vnxikRF6GdTl-hIO-_shA,146247
 carconnectivity_connectors/skoda/error.py,sha256=ffxzvjmci7vtp9Q1K4DR1kBF0kTJxN5Gluci3kDBkEI,2459
 carconnectivity_connectors/skoda/mqtt_client.py,sha256=D9_e_Bz842ULYKlRWd4JmosalhTtYr9DtCuvWrT3WQw,39126
 carconnectivity_connectors/skoda/vehicle.py,sha256=q5gwe-_yPfE_-aEc17UQ-Q0Z46IN7PCpNG5jLw5PZl0,3981
 carconnectivity_connectors/skoda/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/skoda/auth/auth_util.py,sha256=dGLUbUre0HBsTg_Ii5vW34f8DLrCykYJYCyzEvUBBEE,4434
 carconnectivity_connectors/skoda/auth/my_skoda_session.py,sha256=lSh23SFJs8opjmPwHTv-KNIKDep_WY4aItSP4Zq7bT8,10396
-carconnectivity_connectors/skoda/auth/openid_session.py,sha256=5JfR-gS1uKpE8DD-sx5Qvw6zv-OJhzcRlt0D-cm38-Y,16832
+carconnectivity_connectors/skoda/auth/openid_session.py,sha256=dGj0FNBEz_NvYXvi5Wi0iYOzLWxPmNGtftb6ae3TVTE,16769
 carconnectivity_connectors/skoda/auth/session_manager.py,sha256=Uf1vujuDBYUCAXhYToOsZkgbTtfmY3Qe0ICTfwomBpI,2899
 carconnectivity_connectors/skoda/auth/skoda_web_session.py,sha256=tapjCRRPBu3tHrDoKmtuAlQhgxktib3oWTB8MHEzZTY,10816
 carconnectivity_connectors/skoda/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
 carconnectivity_connectors/skoda/ui/connector_ui.py,sha256=lLjwoakRaU0S80hAVwVi4JA1wtHycGHcoM2-7S9qsqI,1386
-carconnectivity_connector_skoda-0.7.dist-info/METADATA,sha256=l43xSHbtcW1miuJdp7el4wdFpyaGKc_vaggWQI5eNH4,5378
-carconnectivity_connector_skoda-0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-carconnectivity_connector_skoda-0.7.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_skoda-0.7.dist-info/RECORD,,
+carconnectivity_connector_skoda-0.7.1a1.dist-info/METADATA,sha256=9G4Dn8TUMCSRrH5F5XwqXexqcfjY2_C2NOc7eeya8xI,5383
+carconnectivity_connector_skoda-0.7.1a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+carconnectivity_connector_skoda-0.7.1a1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_skoda-0.7.1a1.dist-info/RECORD,,

carconnectivity_connectors/skoda/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7'
-__version_tuple__ = version_tuple = (0, 7)
+__version__ = version = '0.7.1a1'
+__version_tuple__ = version_tuple = (0, 7, 1)

carconnectivity_connectors/skoda/auth/openid_session.py

@@ -7,7 +7,7 @@ import time
 from datetime import datetime, timezone
 import logging
 import requests
-from jwt import JWT
+import jwt
 
 from oauthlib.common import UNICODE_ASCII_CHARACTER_SET, generate_nonce, generate_token
 from oauthlib.oauth2.rfc6749.parameters import parse_authorization_code_response, parse_token_response, prepare_grant_uri
@@ -153,8 +153,7 @@ class OpenIDSession(requests.Session):
                     new_token['expires_in'] = self._token['expires_in']
                 else:
                     if 'id_token' in new_token:
-                        jwt_instance = JWT()
-                        meta_data = jwt_instance.decode(new_token['id_token'], do_verify=False)
+                        meta_data = jwt.decode(new_token['id_token'], do_verify=False)
                         if 'exp' in meta_data:
                             new_token['expires_at'] = meta_data['exp']
                             expires_at = datetime.fromtimestamp(meta_data['exp'], tz=timezone.utc)

carconnectivity_connectors/skoda/connector.py

@@ -378,7 +378,8 @@ class Connector(BaseConnector):
             if vehicle_to_update is not None and isinstance(vehicle_to_update, SkodaVehicle) and vehicle_to_update.is_managed_by_connector(self):
                 vehicle_to_update = self.fetch_vehicle_status(vehicle_to_update)
                 if vehicle_to_update.capabilities is not None and vehicle_to_update.capabilities.enabled:
-                    if vehicle_to_update.capabilities.has_capability('MEASUREMENTS', check_status_ok=True):
+                    if vehicle_to_update.capabilities.has_capability('MEASUREMENTS', check_status_ok=True) or \
+                            vehicle_to_update.capabilities.has_capability('CHARGING', check_status_ok=True):
                         vehicle_to_update = self.fetch_driving_range(vehicle_to_update)
                     if vehicle_to_update.capabilities.has_capability('READINESS', check_status_ok=True):
                         vehicle_to_update = self.fetch_connection_status(vehicle_to_update)