pycupra 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

pycupra/__version__.py

@@ -3,4 +3,4 @@ pycupra - A Python 3 library for interacting with the My Cupra/My Seat portal.
 
 For more details and documentation, visit the github page at https://github.com/WulfgarW/pycupra
 """
-__version__ = "0.0.9"
+__version__ = "0.0.11"

pycupra/connection.py

@@ -24,7 +24,7 @@ from json import dumps as to_json
 from jwt.exceptions import ExpiredSignatureError
 import aiohttp
 from bs4 import BeautifulSoup
-from base64 import b64decode, b64encode
+from base64 import b64decode, b64encode, urlsafe_b64decode, urlsafe_b64encode
 from .__version__ import __version__ as lib_version
 from .utilities import read_config, json_loads
 from .vehicle import Vehicle
@@ -43,7 +43,6 @@ from .exceptions import (
 )
 
 from requests_oauthlib import OAuth2Session
-import base64
 from oauthlib.oauth2.rfc6749.parameters import parse_authorization_code_response, parse_token_response, prepare_grant_uri
 
 from aiohttp import ClientSession, ClientTimeout
@@ -267,10 +266,10 @@ class Connection:
             authorizationEndpoint = response_data['authorization_endpoint']
             authissuer = response_data['issuer']
             oauthClient = OAuth2Session(client_id=CLIENT_LIST[client].get('CLIENT_ID'), scope=CLIENT_LIST[client].get('SCOPE'), redirect_uri=CLIENT_LIST[client].get('REDIRECT_URL'))
-            code_verifier = base64.urlsafe_b64encode(os.urandom(40)).decode('utf-8')
+            code_verifier = urlsafe_b64encode(os.urandom(40)).decode('utf-8')
             code_verifier = re.sub('[^a-zA-Z0-9]+', '', code_verifier)
             code_challenge = hashlib.sha256(code_verifier.encode("utf-8")).digest()
-            code_challenge = base64.urlsafe_b64encode(code_challenge).decode("utf-8")
+            code_challenge = urlsafe_b64encode(code_challenge).decode("utf-8")
             code_challenge = code_challenge.replace("=", "")
             authorization_url, state = oauthClient.authorization_url(authorizationEndpoint, code_challenge=code_challenge, code_challenge_method='S256', 
                                                                         nonce=self._session_nonce, state=self._session_state)
@@ -613,7 +612,7 @@ class Connection:
                 # A new day has begun. Store _sessionRequestCounter in history and reset timestamp and counter
                 self._sessionRequestCounterHistory[self._sessionRequestTimestamp.strftime('%Y-%m-%d')]=self._sessionRequestCounter
                 _LOGGER.info(f'History of the number of API calls:')
-                for key, value in self._sessionRequestCounterHistory.items:
+                for key, value in self._sessionRequestCounterHistory.items():
                     _LOGGER.info(f'   Date: {key}: {value} API calls')
 
                 self._sessionRequestTimestamp= datetime.now(tz=None)

pycupra/dashboard.py

@@ -341,7 +341,7 @@ class DoorLock(Instrument):
     async def lock(self):
         try:
             response = await self.vehicle.set_lock('lock', self.spin)
-            await self.vehicle.update()
+            #await self.vehicle.update()
             if self.callback is not None:
                 self.callback()
             return response
@@ -352,7 +352,7 @@ class DoorLock(Instrument):
     async def unlock(self):
         try:
             response = await self.vehicle.set_lock('unlock', self.spin)
-            await self.vehicle.update()
+            #await self.vehicle.update()
             if self.callback is not None:
                 self.callback()
             return response
@@ -365,7 +365,7 @@ class DoorLock(Instrument):
         return dict(last_result = self.vehicle.lock_action_status)
 
 
-class TrunkLock(Instrument):
+"""class TrunkLock(Instrument):
     def __init__(self):
         super().__init__(component="lock", attr="trunk_locked", name="Trunk locked")
 
@@ -385,12 +385,12 @@ class TrunkLock(Instrument):
     def is_locked(self):
         return self.state
 
-    async def lock(self):
-        return None
-
-    async def unlock(self):
-        return None
+    #async def lock(self):
+    #    return None
 
+    #async def unlock(self):
+    #    return None
+"""
 # Switches
 class RequestHonkAndFlash(Switch):
     def __init__(self):
@@ -938,7 +938,7 @@ def create_instruments():
     return [
         Position(),
         DoorLock(),
-        TrunkLock(),
+        #TrunkLock(),
         RequestFlash(),
         RequestHonkAndFlash(),
         RequestRefresh(),