Merge pull request #5 from CoMPaTech/updatefix

Ensure entity state updating

Author: CoMPaTech

README.md

@@ -30,6 +30,10 @@ Even though available does not mean it's stable yet, the HA part is solid but th
 
 # Changelog
 
+## APR 2022 [0.0.7]
+  - Fix sensory updates
+  - Potentially fix token expiration
+
 ## MAR 2022 [0.0.4]
   - Initial release
   - Creates a device for your bike in Home Assistant

custom_components/stromer/binary_sensor.py

@@ -75,6 +75,7 @@ def __init__(
         self._idx = idx
         self._ent = data[0]
         self._data = data[1]
+        self._coordinator = coordinator
 
         device_id = coordinator.data.bike_id
 
@@ -85,4 +86,4 @@ def __init__(
     @property
     def is_on(self) -> bool | None:
         """Return true if the binary sensor is on."""
-        return self._data
+        return self._coordinator.bike.bikedata.get(self._ent)

custom_components/stromer/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "stromer",
   "name": "Stromer e-bike",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "documentation": "https://github.com/CoMPaTech/stromer",
   "requirements": [],
   "codeowners": ["@CoMPaTech"],

custom_components/stromer/sensor.py

@@ -164,6 +164,7 @@ def __init__(
         self._idx = idx
         self._ent = data[0]
         self._data = data[1]
+        self._coordinator = coordinator
 
         device_id = coordinator.data.bike_id
 
@@ -174,4 +175,4 @@ def __init__(
     @property
     def state(self):
         """Return the state of the sensor."""
-        return self._data
+        return self._coordinator.bike.bikedata.get(self._ent)

custom_components/stromer/stromer.py

@@ -1,6 +1,6 @@
 """Stromer module for Home Assistant Core."""
 
-__version__ = "0.0.4"
+__version__ = "0.0.6"
 
 import json
 import logging
@@ -19,6 +19,7 @@ def __init__(self, username, password, client_id, client_secret, timeout=60):
         self.bike = {}
         self.status = {}
         self.position = {}
+        self.base_url = "https://api3.stromer-portal.ch"
 
         self._timeout = timeout
         self._username = username
@@ -37,7 +38,7 @@ async def stromer_connect(self):
         aio_timeout = aiohttp.ClientTimeout(total=self._timeout)
         self._websession = aiohttp.ClientSession(timeout=aio_timeout)
 
-        # Retrieve access token
+        # Retrieve authorization token
         await self.stromer_get_code()
         # LOGGER.debug("Stromer code: {}".format(self._code))
 
@@ -58,6 +59,7 @@ async def stromer_update(self):
         attempts = 0
         while attempts < 5:
             attempts += 1
+            await self.stromer_get_access_token()
             try:
                 LOGGER.debug("Stromer attempt: {}/5".format(attempts))
                 self.bike = await self.stromer_call_api(endpoint="bike/")
@@ -83,8 +85,7 @@ async def stromer_update(self):
                 LOGGER.debug("Stromer retry: {}/5".format(attempts))
 
     async def stromer_get_code(self):
-        base_url = "https://api3.stromer-portal.ch"
-        url = f"{base_url}/users/login/"
+        url = f"{self.base_url}/users/login/"
         res = await self._websession.get(url)
         cookie = res.headers.get("Set-Cookie")
         pattern = "=(.*?);"
@@ -110,13 +111,13 @@ async def stromer_get_code(self):
             url, data=data, headers=dict(Referer=url), allow_redirects=False
         )
         next_loc = res.headers.get("Location")
-        next_url = f"{base_url}{next_loc}"
+        next_url = f"{self.base_url}{next_loc}"
         res = await self._websession.get(next_url, allow_redirects=False)
         self._code = res.headers.get("Location")
         self._code = self._code.split("=")[1]
 
     async def stromer_get_access_token(self):
-        url = "https://api3.stromer-portal.ch/o/token/"
+        url = f"{self.base_url}/o/token/"
         data = {
             "grant_type": "authorization_code",
             "client_id": self._client_id,
@@ -130,7 +131,7 @@ async def stromer_get_access_token(self):
         self._token = token["access_token"]
 
     async def stromer_call_api(self, endpoint, data={}):
-        url = f"https://api3.stromer-portal.ch/rapi/mobile/v2/{endpoint}"
+        url = f"{self.base_url}/rapi/mobile/v2/{endpoint}"
         headers = {"Authorization": f"Bearer {self._token}"}
         # LOGGER.debug("token %s" % self._token)
         res = await self._websession.get(url, headers=headers, data={})