Fix re-auth with OTP while app runtime #251

README.md

@@ -21,6 +21,7 @@ If you like my work:<br>
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/U7U8MFXCF)
 
 ## Confirmed working with
+- EX30 BEV (2024)
 - XC40 BEV (2024)
 - XC40 BEV (2023)
 - XC40 BEV (2022)

src/CHANGELOG.md

@@ -1,5 +1,27 @@
+## v1.10.4
+### 🐛 Bug Fixes:
+
+- re-fix bug if app needs to be re-authenticated with OTP while runtime
+
+## v1.10.3
+### 🐛 Bug Fixes:
+
+- Add more info logging for credential refresh process
+- Fix bug if app needs to be re-authenticated with OTP while runtime
+ 
+## v1.10.2
+### 🐛 Bug Fixes:
+
+- Remove unused multiplier options #239
+
+## v1.10.1
+### 🚀 Features:
+
+- Optimize logging for vcc-api-key check #238
+
 ## v1.10.0
 ### 🚀 Features:
+
 - Remove unused multiplier options
 
 ### 🐛 Bug Fixes:

src/config.yaml

@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.10.0"
+version: "1.10.4"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
@@ -27,9 +27,6 @@ options:
     vin: ""
     vccapikey:
         - null
-    odometerMultiplier: 1
-    averageSpeedDivider: 1
-    averageFuelConsumptionMultiplier: 1
 schema:
   updateInterval: int(60,)
   babelLocale: str

src/const.py

@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.10.0"
+VERSION = "v1.10.4"
 
 OAUTH_TOKEN_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 OAUTH_AUTH_URL = "https://volvoid.eu.volvocars.com/as/authorization.oauth2"

src/volvo.py

@@ -161,6 +161,7 @@ def send_otp(auth_session, data):
         raise Exception ("No OTP found, exting...")
 
     auth = auth_session.post(next_url, data=json.dumps(body))
+    mqtt.otp_code = None
     if auth.status_code == 200:
         return auth.json()
     else:
@@ -198,6 +199,7 @@ def refresh_auth():
         token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
         refresh_token = data["refresh_token"]
     else:
+        logging.warning("Refreshing credentials failed!: " + str(auth.status_code) + " Message: " + auth.text)
         authorize(renew_tokenfile=True)
 
 
@@ -311,9 +313,17 @@ def check_vcc_api_key(test_key, extended_until=None):
                 logging.warning("VCCAPIKEY " + test_key + " is extended and will be reusable at: "
                                 + format_datetime(extended_until, format="medium", locale=settings["babelLocale"]))
         else:
-            logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+            if "error" in data:
+                logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+            else:
+                logging.warning("VCCAPIKEY " + test_key + " isn't working! Statuscode " + str(response.status_code) +
+                                " Message: " + response.text)
     else:
-        logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+        if "error" in data:
+            logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+        else:
+            logging.warning("VCCAPIKEY " + test_key + " isn't working! Statuscode " + str(response.status_code) +
+                            " Message: " + response.text)
     return True, extended_until