carconnectivity-connector-skoda 0.8__tar.gz → 0.8.1a1__tar.gz

{carconnectivity_connector_skoda-0.8 → carconnectivity_connector_skoda-0.8.1a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.8
+Version: 0.8.1a1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_skoda-0.8 → carconnectivity_connector_skoda-0.8.1a1}/src/carconnectivity_connector_skoda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-connector-skoda
-Version: 0.8
+Version: 0.8.1a1
 Summary: CarConnectivity connector for Skoda services
 Author: Till Steinbach
 License: MIT License

carconnectivity_connector_skoda-0.8.1a1/src/carconnectivity_connectors/skoda/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '0.8.1a1'
+__version_tuple__ = version_tuple = (0, 8, 1, 'a1')
+
+__commit_id__ = commit_id = 'g1d80033cd'

{carconnectivity_connector_skoda-0.8 → carconnectivity_connector_skoda-0.8.1a1}/src/carconnectivity_connectors/skoda/auth/openid_session.py

@@ -1,4 +1,4 @@
-"""Implements a session class that handles OpenID authentication."""
+ """Implements a session class that handles OpenID authentication."""
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
@@ -165,6 +165,10 @@ class OpenIDSession(requests.Session):
             # If expires_in is set and expires_at is not set we calculate expires_at from expires_in using the current time
             if 'expires_in' in new_token and 'expires_at' not in new_token:
                 new_token['expires_at'] = time.time() + int(new_token.get('expires_in'))
+        if new_token['expires_in'] > 3600:
+            LOG.warning('unexpected Token expires_in > 3600s (%d)', new_token['expires_in'])
+        if new_token['expires_at'] > (time.time() + 3600):
+            LOG.warning('unexpected Token expires_at after more than 3600s')
         self._token = new_token
 
     @property

{carconnectivity_connector_skoda-0.8 → carconnectivity_connector_skoda-0.8.1a1}/src/carconnectivity_connectors/skoda/connector.py

@@ -407,7 +407,7 @@ class Connector(BaseConnector):
         if vehicle is not None:
             if vehicle.connection_state is not None and vehicle.connection_state.enabled \
                     and vehicle.connection_state.value == GenericVehicle.ConnectionState.OFFLINE:
-                vehicle.state._set_value(GenericVehicle.State.OFFLINE)
+                vehicle.state._set_value(GenericVehicle.State.OFFLINE)  # pylint: disable=protected-access
             elif vehicle.in_motion is not None and vehicle.in_motion.enabled and vehicle.in_motion.value:
                 vehicle.state._set_value(GenericVehicle.State.IGNITION_ON)  # pylint: disable=protected-access
             elif vehicle.position is not None and vehicle.position.enabled and vehicle.position.position_type is not None \

{carconnectivity_connector_skoda-0.8 → carconnectivity_connector_skoda-0.8.1a1}/src/carconnectivity_connectors/skoda/mqtt_client.py

@@ -70,6 +70,8 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
         self.delayed_access_function_timers: Dict[str, threading.Timer] = {}
 
         self.tls_set(cert_reqs=ssl.CERT_NONE)
+        
+        self._retry_refresh_login_once = True
 
     def connect(self, *args, **kwargs) -> MQTTErrorCode:
         """
@@ -321,6 +323,7 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             self._skoda_connector.car_connectivity.garage.add_observer(observer=self._on_carconnectivity_vehicle_enabled,
                                                                        flag=observer_flags,
                                                                        priority=Observable.ObserverPriority.USER_MID)
+            self._retry_refresh_login_once = True
             self._subscribe_vehicles()
 
         # Handle different reason codes
@@ -338,6 +341,10 @@ class SkodaMQTTClient(Client):  # pylint: disable=too-many-instance-attributes
             LOG.error('Could not connect (%s): Client identifier not valid', reason_code)
         elif reason_code == 134:
             LOG.error('Could not connect (%s): Bad user name or password', reason_code)
+            if self._retry_refresh_login_once == True:
+                self._retry_refresh_login_once = False
+                LOG.info('trying a relogin once to resolve the error')
+                self._skoda_connector.session.login()
         elif reason_code == 135:
             LOG.error('Could not connect (%s): Not authorized', reason_code)
         elif reason_code == 136:

carconnectivity_connector_skoda-0.8/src/carconnectivity_connectors/skoda/_version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '0.8'
-__version_tuple__ = version_tuple = (0, 8)