Merge branch 'master' into todo_entity

RogerSelwyn · Oct 31, 2023 · 30f804a · 30f804a
2 parents 782b75d + 3da9de8
commit 30f804a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/custom_components/o365/__init__.py b/custom_components/o365/__init__.py
@@ -1,16 +1,16 @@
 """Main initialisation code."""
 import copy
 import functools as ft
+import json
 import logging
 import os
 import shutil
 
 import yaml
 from homeassistant.const import CONF_ENABLED
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from oauthlib.oauth2.rfc6749.errors import InvalidClientError
-
 from O365 import Account, FileSystemTokenBackend
+from oauthlib.oauth2.rfc6749.errors import InvalidClientError
 
 from .classes.permissions import Permissions
 from .const import (
@@ -151,7 +151,15 @@ async def _async_setup_account(hass, account_conf, conf_type):
             main_resource=main_resource,
         )
     )
-    is_authenticated = account.is_authenticated
+    try:
+        is_authenticated = account.is_authenticated
+    except json.decoder.JSONDecodeError as err:
+        _LOGGER.warning(
+            "Token corrupt for account - please delete and re-authenticate: %s. Error - %s",
+            account_name,
+            err,
+        )
+        return
 
     permissions, failed_permissions = perms.validate_permissions()
     check_token = None

diff --git a/custom_components/o365/manifest.json b/custom_components/o365/manifest.json
@@ -15,5 +15,5 @@
     "O365==2.0.28",
     "BeautifulSoup4>=4.10.0"
   ],
-  "version": "v4.4.3b1"
+  "version": "v4.4.3b2"
 }