carconnectivity-connector-seatcupra 0.1.1__py3-none-any.whl → 0.1.2a2__py3-none-any.whl

{carconnectivity_connector_seatcupra-0.1.1.dist-info → carconnectivity_connector_seatcupra-0.1.2a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1.1
+Version: 0.1.2a2
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License

{carconnectivity_connector_seatcupra-0.1.1.dist-info → carconnectivity_connector_seatcupra-0.1.2a2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 carconnectivity_connectors/seatcupra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_connectors/seatcupra/_version.py,sha256=Mmxse1R0ki5tjz9qzU8AQyqUsLt8nTyCAbYQp8R87PU,511
+carconnectivity_connectors/seatcupra/_version.py,sha256=kcEtUNV1MoltjNNCJ9JNa96CeRbiBTa6E9OHH2z9yL4,513
 carconnectivity_connectors/seatcupra/capability.py,sha256=936V06hOX8AuAMxL_S9wVyVa36Xw1bo9081X0xf5f94,5064
 carconnectivity_connectors/seatcupra/charging.py,sha256=BJe_5GEB0JkP78tpU6kyKpwuwjDZHvm-kt3PTlpQHeU,3336
 carconnectivity_connectors/seatcupra/climatization.py,sha256=0xxWlxrheAPzkVT8WRQtbm6ExZmVdgW7lUdOXyS_qWY,1695
@@ -8,14 +8,14 @@ carconnectivity_connectors/seatcupra/connector.py,sha256=llxFhVdpnL5MxmHbOej1wMi
 carconnectivity_connectors/seatcupra/vehicle.py,sha256=s0G-HqG5qcwStDxD3649KgLMa3lKPZ4TOGWRJEuQzsQ,3403
 carconnectivity_connectors/seatcupra/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_connectors/seatcupra/auth/auth_util.py,sha256=Y81h8fGOMSMgPtE4wI_TI9WgE_s43uaPjRLBBINhj4g,4433
-carconnectivity_connectors/seatcupra/auth/my_cupra_session.py,sha256=qq9TEeWjaZZKT8dLn4uvCf_tvogtdXG1qC95sSJsqwk,12894
-carconnectivity_connectors/seatcupra/auth/openid_session.py,sha256=dA0vE2YuckkMPeqJo2dEI0h8_XfohdCgdGkTyshPF7Q,16858
+carconnectivity_connectors/seatcupra/auth/my_cupra_session.py,sha256=VF_9U8fESLkndVaPn2W1ZxZwNr9-ndeaegeTVT5FyYk,13904
+carconnectivity_connectors/seatcupra/auth/openid_session.py,sha256=pGdTSt2zMtPWD4EY8MoZTj8lT6_krfa1Xt3Fyh877FA,16972
 carconnectivity_connectors/seatcupra/auth/session_manager.py,sha256=ZIDvC848T3fy6PgGqCl8A2SzaNhu2YG19Xam5kgp7SA,5635
 carconnectivity_connectors/seatcupra/auth/vw_web_session.py,sha256=CcI6m68IyRs6WsMDu-IsW3Dj85vyGiMmxvFqNETMHO0,10929
 carconnectivity_connectors/seatcupra/auth/helpers/blacklist_retry.py,sha256=f3wsiY5bpHDBxp7Va1Mv9nKJ4u3qnCHZZmDu78_AhMk,1251
 carconnectivity_connectors/seatcupra/ui/connector_ui.py,sha256=SNYnlcGJpbWhuLiIHD2l6H9IfSiMz3IgmvXsdossDnE,1412
-carconnectivity_connector_seatcupra-0.1.1.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
-carconnectivity_connector_seatcupra-0.1.1.dist-info/METADATA,sha256=Vh1baAcurqTyzfkXNO_Ts4GNO8nbFwXgpDS3r8kK2xs,5471
-carconnectivity_connector_seatcupra-0.1.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-carconnectivity_connector_seatcupra-0.1.1.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
-carconnectivity_connector_seatcupra-0.1.1.dist-info/RECORD,,
+carconnectivity_connector_seatcupra-0.1.2a2.dist-info/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_connector_seatcupra-0.1.2a2.dist-info/METADATA,sha256=Ob6zTmVEXHtW9XDNsSnm2um03RT0sARJVYkNcS1E7no,5473
+carconnectivity_connector_seatcupra-0.1.2a2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+carconnectivity_connector_seatcupra-0.1.2a2.dist-info/top_level.txt,sha256=KqA8GviZsDH4PtmnwSQsz0HB_w-TWkeEHLIRNo5dTaI,27
+carconnectivity_connector_seatcupra-0.1.2a2.dist-info/RECORD,,

carconnectivity_connectors/seatcupra/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.1'
-__version_tuple__ = version_tuple = (0, 1, 1)
+__version__ = version = '0.1.2a2'
+__version_tuple__ = version_tuple = (0, 1, 2)

carconnectivity_connectors/seatcupra/auth/my_cupra_session.py

@@ -46,6 +46,7 @@ class MyCupraSession(VWWebSession):
 
             self.headers = CaseInsensitiveDict({
                 'accept': '*/*',
+                'connection': 'keep-alive',
                 'content-type': 'application/json',
                 'user-agent': 'SEATApp/2.5.0 (com.seat.myseat.ola; build:202410171614; iOS 15.8.3) Alamofire/5.7.0 Mobile',
                 'accept-language': 'de-de',
@@ -62,6 +63,7 @@ class MyCupraSession(VWWebSession):
 
             self.headers = CaseInsensitiveDict({
                 'accept': '*/*',
+                'connection': 'keep-alive',
                 'content-type': 'application/json',
                 'user-agent': 'CUPRAApp%20-%20Store/20220503 CFNetwork/1333.0.4 Darwin/21.5.0',
                 'accept-language': 'de-de',
@@ -72,12 +74,15 @@ class MyCupraSession(VWWebSession):
         super(MyCupraSession, self).login()
         # retrieve authorization URL
         authorization_url_str: str = self.authorization_url(url='https://identity.vwgroup.io/oidc/v1/authorize')
-        # perform web authentication
-        response = self.do_web_auth(authorization_url_str)
+        if self.redirect_uri is not None and authorization_url_str.startswith(self.redirect_uri):
+            response = authorization_url_str.replace(self.redirect_uri + '#', 'https://egal?')
+        else:
+            # perform web authentication
+            response = self.do_web_auth(authorization_url_str)
         # fetch tokens from web authentication response
         if self.is_seat:
-            return self.fetch_tokens('https://ola.prod.code.seat.cloud.vwgroup.com/authorization/api/v1/token',
-                                     authorization_response=response)
+            self.fetch_tokens('https://ola.prod.code.seat.cloud.vwgroup.com/authorization/api/v1/token',
+                              authorization_response=response)
         else:
             self.fetch_tokens('https://identity.vwgroup.io/oidc/v1/token',
                               authorization_response=response)
@@ -217,27 +222,43 @@ class MyCupraSession(VWWebSession):
         if headers is None:
             headers = dict(self.headers)
 
-        body: Dict[str, str] = {
-            'client_id': self.client_id,
-            'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
-            'grant_type': 'refresh_token',
-            'refresh_token': self.refresh_token
-        }
+        if self.is_seat:
+            body: Dict[str, str] = {
+                'client_id': self.client_id,
+                'grant_type': 'refresh_token',
+                'refresh_token': self.refresh_token
+            }
+        else:
+            body: Dict[str, str] = {
+                'client_id': self.client_id,
+                'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
+                'grant_type': 'refresh_token',
+                'refresh_token': self.refresh_token
+            }
 
         headers['content-type'] = 'application/x-www-form-urlencoded; charset=utf-8'
 
-        # Request new tokens using the refresh token
-        token_response = self.post(
-            token_url,
-            data=body,
-            auth=auth,
-            timeout=timeout,
-            headers=headers,
-            verify=verify,
-            withhold_token=False,  # pyright: ignore reportCallIssue
-            proxies=proxies,
-            access_type=AccessType.NONE  # pyright: ignore reportCallIssue
-        )
+        tries = 0
+        while True:
+            try:
+                # Request new tokens using the refresh token
+                token_response = self.post(
+                    token_url,
+                    data=body,
+                    auth=auth,
+                    timeout=timeout,
+                    headers=headers,
+                    verify=verify,
+                    withhold_token=False,  # pyright: ignore reportCallIssue
+                    proxies=proxies,
+                    access_type=AccessType.NONE  # pyright: ignore reportCallIssue
+                )
+            except requests.exceptions.RequestException as err:
+                tries += 1
+                if tries >= 3:
+                    raise TemporaryAuthenticationError('Token could not be refreshed due to temporary MyCupra failure') from err
+            else:
+                break
         if token_response.status_code == requests.codes['unauthorized']:
             raise AuthenticationError('Refreshing tokens failed: Server requests new authorization')
         elif token_response.status_code in (requests.codes['internal_server_error'], requests.codes['service_unavailable'], requests.codes['gateway_timeout']):
@@ -263,7 +284,7 @@ class MyCupraSession(VWWebSession):
         token=None,
         timeout=None,
         **kwargs
-    ):
+    ) -> requests.Response:
         """Intercept all requests and add userId if present."""
         if not is_secure_transport(url):
             raise InsecureTransportError()

carconnectivity_connectors/seatcupra/auth/openid_session.py

@@ -116,7 +116,8 @@ class OpenIDSession(requests.Session):
                                      backoff_factor=0.1,
                                      status_forcelist=[500],
                                      status_blacklist=[429],
-                                     raise_on_status=False)
+                                     raise_on_status=False,
+                                     allowed_methods=None)  # set allowed_methods to None to retry on all methods
             self.mount('https://', HTTPAdapter(max_retries=retries))
 
     @property