fix load_token call (#415)

* fix load_token call * lint
drc38 · Feb 14, 2025 · 1415a5c · 1415a5c
1 parent 84f4e3b
commit 1415a5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/custom_components/solarweb/__init__.py b/custom_components/solarweb/__init__.py
@@ -102,7 +102,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
 
     if login_password:
-        token = await hass.async_add_executor_job(load_token)
+        token = await hass.async_add_executor_job(load_token, hass)
         client.jwt_data = token
         client._jwt_headers = {"Authorization": "Bearer " + client.jwt_data.get(TOKEN)}
 
@@ -171,7 +171,9 @@ async def async_update_data(self):
         """Update data via library."""
         try:
             if self.expires:
-                if dt_util.parse_datetime(self.expires) >= dt_util.now():
+                if dt_util.parse_datetime(self.expires) >= dt_util.as_utc(
+                    dt_util.now()
+                ):
                     _LOGGER.debug(f"Token expired on: {self.expires}, refreshing")
                     await self.api.refresh_token()
                     await self.hass.async_add_executor_job(
@@ -212,7 +214,9 @@ async def async_update_data(self):
         """Update data via library."""
         try:
             if self.expires:
-                if dt_util.parse_datetime(self.expires) >= dt_util.now():
+                if dt_util.parse_datetime(self.expires) >= dt_util.as_utc(
+                    dt_util.now()
+                ):
                     _LOGGER.debug(f"Token expired on: {self.expires}, refreshing")
                     await self.api.refresh_token()
                     await self.hass.async_add_executor_job(

diff --git a/custom_components/solarweb/config_flow.py b/custom_components/solarweb/config_flow.py
@@ -58,8 +58,10 @@ async def _show_config_form(self, user_input, id="user"):
             data_schema=vol.Schema(
                 {
                     vol.Required(CONF_PV_ID): str,
-                    vol.Required(CONF_ACCESSKEY_ID, DEFAULT_ACCESSKEY_ID): str,
-                    vol.Required(CONF_ACCESSKEY_VALUE, DEFAULT_ACCESSKEY_VALUE): str,
+                    vol.Required(CONF_ACCESSKEY_ID, default=DEFAULT_ACCESSKEY_ID): str,
+                    vol.Required(
+                        CONF_ACCESSKEY_VALUE, default=DEFAULT_ACCESSKEY_VALUE
+                    ): str,
                     vol.Optional(CONF_LOGIN_NAME, None): str,
                     vol.Optional(CONF_LOGIN_PASSWORD, None): str,
                 }

diff --git a/custom_components/solarweb/const.py b/custom_components/solarweb/const.py
@@ -23,7 +23,7 @@
 CONF_PV_ID = "pvid"
 DEFAULT_ACCESSKEY_ID = "FKIAB4CDA71C0763413DA942DC756742318B"
 DEFAULT_ACCESSKEY_VALUE = "67315e19-6805-479e-994d-7193ee5f6125"
-TOKEN_FILE_NAME = "fronius_solarweb.jwt"
+TOKEN_FILE_NAME = "fronius_solarweb.json"
 TOKEN = "jwtToken"
 TOKEN_REFRESH = "refreshToken"
 TOKEN_EXPIRATION = "jwtTokenExpiration"