Fix token expiration being multiple types

Author: nickknissen

custom_components/monta/api.py

@@ -5,7 +5,7 @@
 import socket
 import logging
 import json
-from datetime import timedelta
+from datetime import timedelta, datetime
 
 import aiohttp
 import async_timeout
@@ -283,12 +283,11 @@ def _is_access_token_valid(self):
         if self._prefs[STORAGE_ACCESS_EXPIRE_TIME] is None:
             return False
 
-        _LOGGER.debug("[_is_access_token_valid] STORAGE_ACCESS_EXPIRE_TIME: %s, type: %s", self._prefs[STORAGE_ACCESS_EXPIRE_TIME], type(self._prefs[STORAGE_ACCESS_EXPIRE_TIME]))
+        expire_time = self._prefs[STORAGE_ACCESS_EXPIRE_TIME]
+        if isinstance(expire_time, str):
+            expire_time = dt_util.parse_datetime(self._prefs[STORAGE_ACCESS_EXPIRE_TIME])
 
-        if not isinstance(self._prefs[STORAGE_ACCESS_EXPIRE_TIME], str):
-            return False
 
-        expire_time = dt_util.parse_datetime(self._prefs[STORAGE_ACCESS_EXPIRE_TIME])
         preemptive_expire_time = expire_time - timedelta(
             seconds=PREEMPTIVE_REFRESH_TTL_IN_SECONDS
         )
@@ -303,12 +302,10 @@ def _is_refresh_token_valid(self):
         if self._prefs[STORAGE_REFRESH_EXPIRE_TIME] is None:
             return False
 
-        _LOGGER.debug("[_is_refresh_token_valid] STORAGE_REFRESH_EXPIRE_TIME: %s, type: %s", self._prefs[STORAGE_ACCESS_EXPIRE_TIME], type(self._prefs[STORAGE_REFRESH_EXPIRE_TIME]))
-
-        if not isinstance(self._prefs[STORAGE_REFRESH_EXPIRE_TIME], str):
-            return False
+        expire_time = self._prefs[STORAGE_REFRESH_EXPIRE_TIME]
+        if isinstance(expire_time, str):
+            expire_time = dt_util.parse_datetime(self._prefs[STORAGE_REFRESH_EXPIRE_TIME])
 
-        expire_time = dt_util.parse_datetime(self._prefs[STORAGE_REFRESH_EXPIRE_TIME])
         preemptive_expire_time = expire_time - timedelta(
             seconds=PREEMPTIVE_REFRESH_TTL_IN_SECONDS
         )