carconnectivity-connector-seatcupra 0.1a7__tar.gz → 0.1a8__tar.gz

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a7
+Version: 0.1a8
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License
@@ -68,6 +68,7 @@ In your carconnectivity.json configuration add a section for the seatcupra conne
             {
                 "type": "seatcupra",
                 "config": {
+                    "brand": "cupra",
                     "username": "test@test.de",
                     "password": "testpassword123"
                 }
@@ -76,6 +77,8 @@ In your carconnectivity.json configuration add a section for the seatcupra conne
     }
 }
 ```
+`brand` (`seat` or `cupra`) defines what login is used. MyCupra or MySeat account. Your credentials will work with both, but you may need to consent again to the terms and conditions when you use the "wrong" brand.
+
 ### Credentials
 If you do not want to provide your username or password inside the configuration you have to create a ".netrc" file at the appropriate location (usually this is your home folder):
 ```

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/README.md

@@ -24,6 +24,7 @@ In your carconnectivity.json configuration add a section for the seatcupra conne
             {
                 "type": "seatcupra",
                 "config": {
+                    "brand": "cupra",
                     "username": "test@test.de",
                     "password": "testpassword123"
                 }
@@ -32,6 +33,8 @@ In your carconnectivity.json configuration add a section for the seatcupra conne
     }
 }
 ```
+`brand` (`seat` or `cupra`) defines what login is used. MyCupra or MySeat account. Your credentials will work with both, but you may need to consent again to the terms and conditions when you use the "wrong" brand.
+
 ### Credentials
 If you do not want to provide your username or password inside the configuration you have to create a ".netrc" file at the appropriate location (usually this is your home folder):
 ```

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/doc/Config.md

@@ -13,6 +13,7 @@ These are the valid options for the Seat Cupra Connector
                 "config": {
                     "log_level": "error", // set the connectos log level
                     "interval": 300, // Interval in which the server is checked in seconds
+                    "brand": "seat", //Brand of the vehicle ("seat" or "cupra"), defines if MySeat or MyCupra account is used
                     "username": "test@test.de", // Username of your Seat/Cupra Account
                     "password": "testpassword123", // Username of your Seat/Cupra Account
                     "spin": 1234, //S-Pin used for some special commands like locking/unlocking

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/src/carconnectivity_connector_seatcupra.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: carconnectivity-connector-seatcupra
-Version: 0.1a7
+Version: 0.1a8
 Summary: CarConnectivity connector for Seat and Cupra services
 Author: Till Steinbach
 License: MIT License
@@ -68,6 +68,7 @@ In your carconnectivity.json configuration add a section for the seatcupra conne
             {
                 "type": "seatcupra",
                 "config": {
+                    "brand": "cupra",
                     "username": "test@test.de",
                     "password": "testpassword123"
                 }
@@ -76,6 +77,8 @@ In your carconnectivity.json configuration add a section for the seatcupra conne
     }
 }
 ```
+`brand` (`seat` or `cupra`) defines what login is used. MyCupra or MySeat account. Your credentials will work with both, but you may need to consent again to the terms and conditions when you use the "wrong" brand.
+
 ### Credentials
 If you do not want to provide your username or password inside the configuration you have to create a ".netrc" file at the appropriate location (usually this is your home folder):
 ```

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/src/carconnectivity_connectors/seatcupra/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1a7'
+__version__ = version = '0.1a8'
 __version_tuple__ = version_tuple = (0, 1)

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/src/carconnectivity_connectors/seatcupra/auth/my_cupra_session.py

@@ -23,7 +23,7 @@ from carconnectivity_connectors.seatcupra.auth.openid_session import AccessType
 from carconnectivity_connectors.seatcupra.auth.vw_web_session import VWWebSession
 
 if TYPE_CHECKING:
-    from typing import Tuple, Dict
+    from typing import Tuple, Dict, Any
 
 
 LOG: logging.Logger = logging.getLogger("carconnectivity.connectors.seatcupra.auth")
@@ -33,22 +33,40 @@ class MyCupraSession(VWWebSession):
     """
     MyCupraSession class handles the authentication and session management for Cupras's MyCupra service.
     """
-    def __init__(self, session_user, **kwargs) -> None:
-        super(MyCupraSession, self).__init__(client_id='3c756d46-f1ba-4d78-9f9a-cff0d5292d51@apps_vw-dilab_com',
-                                             refresh_url='https://identity.vwgroup.io/oidc/v1/token',
-                                             scope='openid profile nickname birthdate phone',
-                                             redirect_uri='cupra://oauth-callback',
-                                             state=None,
-                                             session_user=session_user,
-                                             **kwargs)
-
-        self.headers = CaseInsensitiveDict({
-            'accept': '*/*',
-            'content-type': 'application/json',
-            'user-agent': 'CUPRAApp%20-%20Store/20220503 CFNetwork/1333.0.4 Darwin/21.5.0',
-            'accept-language': 'de-de',
-            'accept-encoding': 'gzip, deflate, br'
-        })
+    def __init__(self, session_user, is_seat: bool, **kwargs) -> None:
+        self.is_seat: bool = is_seat
+        if self.is_seat:
+            super(MyCupraSession, self).__init__(client_id='99a5b77d-bd88-4d53-b4e5-a539c60694a3@apps_vw-dilab_com',
+                                                refresh_url='https://identity.vwgroup.io/oidc/v1/token',
+                                                scope='openid profile nickname birthdate phone',
+                                                redirect_uri='seat://oauth-callback',
+                                                state=None,
+                                                session_user=session_user,
+                                                **kwargs)
+
+            self.headers = CaseInsensitiveDict({
+                'accept': '*/*',
+                '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',
+                'accept-encoding': 'gzip, deflate, br'
+            })
+        else:
+            super(MyCupraSession, self).__init__(client_id='3c756d46-f1ba-4d78-9f9a-cff0d5292d51@apps_vw-dilab_com',
+                                                refresh_url='https://identity.vwgroup.io/oidc/v1/token',
+                                                scope='openid profile nickname birthdate phone',
+                                                redirect_uri='cupra://oauth-callback',
+                                                state=None,
+                                                session_user=session_user,
+                                                **kwargs)
+
+            self.headers = CaseInsensitiveDict({
+                'accept': '*/*',
+                'content-type': 'application/json',
+                'user-agent': 'CUPRAApp%20-%20Store/20220503 CFNetwork/1333.0.4 Darwin/21.5.0',
+                'accept-language': 'de-de',
+                'accept-encoding': 'gzip, deflate, br'
+            })
 
     def login(self):
         super(MyCupraSession, self).login()
@@ -57,8 +75,12 @@ class MyCupraSession(VWWebSession):
         # perform web authentication
         response = self.do_web_auth(authorization_url_str)
         # fetch tokens from web authentication response
-        self.fetch_tokens('https://identity.vwgroup.io/oidc/v1/token',
-                          authorization_response=response)
+        if self.is_seat:
+            return 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)
 
     def refresh(self) -> None:
         # refresh tokens from refresh endpoint
@@ -92,15 +114,23 @@ class MyCupraSession(VWWebSession):
 
         if self.token is not None and all(key in self.token for key in ('state', 'id_token', 'access_token', 'code')):
             # Generate json body for token request
-            body: Dict[str, str] = {
-                'state': self.token['state'],
-                'id_token': self.token['id_token'],
-                'redirect_uri': self.redirect_uri,
-                'client_id': self.client_id,
-                'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
-                'code': self.token['code'],
-                'grant_type': 'authorization_code'
-                }
+            if self.is_seat:
+                body: Dict[str, Any] = {'state': self.token['state'],
+                                        'id_token': self.token['id_token'],
+                                        'redirect_uri': self.redirect_uri,
+                                        'client_id': self.client_id,
+                                        'code': self.token['code'],
+                                        'grant_type': 'authorization_code'
+                                        }
+            else:
+                body: Dict[str, Any] = {'state': self.token['state'],
+                                        'id_token': self.token['id_token'],
+                                        'redirect_uri': self.redirect_uri,
+                                        'client_id': self.client_id,
+                                        'client_secret': 'eb8814e641c81a2640ad62eeccec11c98effc9bccd4269ab7af338b50a94b3a2',
+                                        'code': self.token['code'],
+                                        'grant_type': 'authorization_code'
+                                        }
 
             request_headers: CaseInsensitiveDict = dict(self.headers)  # pyright: ignore reportAssignmentType
             request_headers['content-type'] = 'application/x-www-form-urlencoded; charset=utf-8'

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/src/carconnectivity_connectors/seatcupra/auth/session_manager.py

@@ -47,11 +47,13 @@ class Service(Enum):
 
     Attributes:
         MY_CUPRA (str): Represents the 'MyCupra' service.
+        MY_SEAT (str): Represents the 'MySeat' service.
 
     Methods:
         __str__() -> str: Returns the string representation of the service.
     """
     MY_CUPRA = 'MyCupra'
+    MY_SEAT = 'MySeat'
 
     def __str__(self) -> str:
         return self.value
@@ -127,7 +129,9 @@ class SessionManager():
             cache = self.cache[identifier]
 
         if service == Service.MY_CUPRA:
-            session = MyCupraSession(session_user=session_user, token=token, metadata=metadata, cache=cache)
+            session = MyCupraSession(session_user=session_user, is_seat=False, token=token, metadata=metadata, cache=cache)
+        elif service == Service.MY_SEAT:
+            session = MyCupraSession(session_user=session_user, is_seat=True, token=token, metadata=metadata, cache=cache)
         else:
             raise ValueError(f"Unsupported service: {service}")
 

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/src/carconnectivity_connectors/seatcupra/auth/vw_web_session.py

@@ -121,6 +121,9 @@ class VWWebSession(OpenIDSession):
                 raise RetrievalError('Temporary server error during login')
 
             if 'Location' not in response.headers:
+                if 'consent' in url:
+                    raise AuthenticationError('Could not find Location in headers, probably due to missing consent. '
+                                              'Check that you configured the correct brand or try visiting: ' + url)
                 raise APICompatibilityError('Forwarding without Location in headers')
 
             url = response.headers['Location']

{carconnectivity_connector_seatcupra-0.1a7 → carconnectivity_connector_seatcupra-0.1a8}/src/carconnectivity_connectors/seatcupra/connector.py

@@ -129,17 +129,30 @@ class Connector(BaseConnector):
             self.active_config['max_age'] = config['max_age']
         self.interval._set_value(timedelta(seconds=self.active_config['interval']))  # pylint: disable=protected-access
 
+        if 'brand' in config:
+            if config['brand'] not in ['seat', 'cupra']:
+                raise ValueError('Brand must be either "seat" or "cupra"')
+            self.active_config['brand'] = config['brand']
+        else:
+            self.active_config['brand'] = 'cupra'
+
         if self.active_config['username'] is None or self.active_config['password'] is None:
             raise AuthenticationError('Username or password not provided')
 
+        if self.active_config['brand'] == 'cupra':
+            service = Service.MY_CUPRA
+        elif self.active_config['brand'] == 'seat':
+            service = Service.MY_SEAT
+        else:
+            raise ValueError('Brand must be either "seat" or "cupra"')
         self._manager: SessionManager = SessionManager(tokenstore=car_connectivity.get_tokenstore(), cache=car_connectivity.get_cache())
-        session: requests.Session = self._manager.get_session(Service.MY_CUPRA, SessionUser(username=self.active_config['username'],
-                                                                                            password=self.active_config['password']))
+        session: requests.Session = self._manager.get_session(service, SessionUser(username=self.active_config['username'],
+                                                                                   password=self.active_config['password']))
         if not isinstance(session, MyCupraSession):
             raise AuthenticationError('Could not create session')
         self.session: MyCupraSession = session
         self.session.retries = 3
-        self.session.timeout = 180
+        self.session.timeout = 30
         self.session.refresh()
 
         self._elapsed: List[timedelta] = []