Fix authentication error handling and trigger reauth flow (#385)

Closes #159

Author: sebr

custom_components/bhyve/__init__.py

@@ -74,9 +74,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     try:
         if await client.login() is False:
+            _LOGGER.warning("Invalid credentials for %s", entry.data[CONF_USERNAME])
             msg = "Invalid credentials"
             raise ConfigEntryAuthFailed(msg)
     except AuthenticationError as err:
+        _LOGGER.warning("Authentication failed for %s", entry.data[CONF_USERNAME])
         raise ConfigEntryAuthFailed(err) from err
     except BHyveError as err:
         raise ConfigEntryNotReady(err) from err
@@ -177,6 +179,12 @@ async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
+    data = hass.data[DOMAIN].get(entry.entry_id)
+    if data:
+        client = data.get("client")
+        if client:
+            await client.stop()
+
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         hass.data[DOMAIN].pop(entry.entry_id)
 

custom_components/bhyve/coordinator.py

@@ -7,6 +7,7 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING, Any
 
+from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import (
@@ -122,8 +123,8 @@ async def _async_update_data(self) -> dict[str, Any]:
             return data  # noqa: TRY300
 
         except AuthenticationError as err:
-            msg = "Authentication failed"
-            raise UpdateFailed(msg) from err
+            _LOGGER.warning("Authentication failed, triggering reauth: %s", err)
+            raise ConfigEntryAuthFailed from err
         except BHyveError as err:
             msg = f"Error communicating with API: {err}"
             raise UpdateFailed(msg) from err

custom_components/bhyve/pybhyve/client.py

@@ -82,6 +82,12 @@ async def _request(
             try:
                 resp.raise_for_status()
                 return await resp.json(content_type=None)
+            except ClientResponseError as err:
+                if err.status in (401, 403):
+                    _LOGGER.warning("Authentication error from %s: %s", url, err.status)
+                    raise AuthenticationError from err
+                msg = f"Error requesting data from {url}: {err}"
+                raise RequestError(msg) from err
             except Exception as err:
                 msg = f"Error requesting data from {url}: {err}"
                 raise RequestError(msg) from err
@@ -168,7 +174,7 @@ async def login(self) -> bool:
                 self._token = response["orbit_session_token"]
 
             except ClientResponseError as response_err:
-                if response_err.status == 400:  # noqa: PLR2004
+                if response_err.status in (401, 403):
                     raise AuthenticationError from response_err
                 raise RequestError from response_err
             except Exception as err: