Add more logging for refresh process // renew refresh token if returned from api

Improve readability and copy-paste functionality of docker command

README.md

@@ -129,7 +129,17 @@ The following steps are required for authentication in exactly this order:
 Just install this addon with the following command.
 Please note to fill in your settings inside the environment variables.
 
-`docker run -d --pull=always -e CONF_updateInterval=300 -e CONF_babelLocale='de' -e CONF_mqtt='@json {"broker": "", "username": "", "password": "", "port": 1883}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "", "vccapikey": ["key1", "key2"]}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`
+<pre>
+<code>docker run -d --pull=always \
+  -e CONF_updateInterval=300 \
+  -e CONF_babelLocale='de' \
+  -e CONF_mqtt='@json {"broker": "", "username": "", "password": "", "port": 1883}' \
+  -e CONF_volvoData='@json {"username": "", "password": "", "vin": "", "vccapikey": ["key1", "key2"]}' \
+  -e TZ='Europe/Berlin' \
+  --name volvo2mqtt \
+  ghcr.io/dielee/volvo2mqtt:latest
+</code>
+</pre>
 
 <b>HA Add-On:</b><br>
 

src/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.12.2
+
+### 🚀 Features:
+
+- Add more logging for refresh process
+- Update refresh token, if volvo API returns a new one
+
 ## v1.12.1
 
 ### 🐛 Bug Fixes:

src/config.yaml

@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.12.1"
+version: "1.12.2"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"

src/const.py

@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.12.1"
+VERSION = "v1.12.2"
 
 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

@@ -48,6 +48,10 @@ def authorize(renew_tokenfile=False):
             logging.warning("Detected corrupted token file, restarting auth process")
             authorize(True)
             return
+        except KeyError:
+            logging.warning("Token file missing refresh_token, restarting auth process")
+            authorize(True)
+            return
     else:
         logging.info("Starting login with OTP")
         auth_session = requests.session()
@@ -171,8 +175,9 @@ def send_otp(auth_session, data):
 
 
 def refresh_auth():
-    logging.info("Refreshing credentials")
     global refresh_token
+    logging.info("Refreshing credentials with token " + refresh_token)
+
     headers = {
         "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
         "content-type": "application/x-www-form-urlencoded",
@@ -194,14 +199,16 @@ def refresh_auth():
         token_path = util.get_token_path()
         refresh_data = auth.json()
 
-        f = open(token_path)
+        if not "refresh_token" in refresh_data:
-        try:
+            f = open(token_path)
-            data = json.load(f)
+            try:
-            refresh_token = data["refresh_token"]
+                data = json.load(f)
-        except ValueError:
+                refresh_data["refresh_token"] = data["refresh_token"]
-            raise Exception("Cannot refresh token!")
+            except ValueError:
+                raise Exception("Cannot refresh token!")
+        else:
+            logging.info("New refresh token found, updating!")
 
-        refresh_data["refresh_token"] = refresh_token
         util.save_to_json(refresh_data, token_path)
         session.headers.update({"authorization": "Bearer " + refresh_data["access_token"]})