From ae9106effd767e634ce6ebd7af83f5c9409e2dd0 Mon Sep 17 00:00:00 2001
From: Simone Chemelli <simone.chemelli@gmail.com>
Date: Thu, 26 Oct 2023 21:34:59 +0200
Subject: [PATCH] Improve exception handling for Vodafone Station (#102761)

* improve exception handling for Vodafone Station

* address review comment

* apply review comment

* better except handling (bump library)

* cleanup
---
 .../vodafone_station/coordinator.py           | 22 +++++++++++--------
 .../components/vodafone_station/manifest.json |  2 +-
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/vodafone_station/coordinator.py b/homeassistant/components/vodafone_station/coordinator.py
index 38fc80ac3af..a2cddcf9a65 100644
--- a/homeassistant/components/vodafone_station/coordinator.py
+++ b/homeassistant/components/vodafone_station/coordinator.py
@@ -95,15 +95,19 @@ class VodafoneStationRouter(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         """Update router data."""
         _LOGGER.debug("Polling Vodafone Station host: %s", self._host)
         try:
-            logged = await self.api.login()
-        except exceptions.CannotConnect as err:
-            _LOGGER.warning("Connection error for %s", self._host)
-            raise UpdateFailed(f"Error fetching data: {repr(err)}") from err
-        except exceptions.CannotAuthenticate as err:
-            raise ConfigEntryAuthFailed from err
-
-        if not logged:
-            raise ConfigEntryAuthFailed
+            try:
+                await self.api.login()
+            except exceptions.CannotAuthenticate as err:
+                raise ConfigEntryAuthFailed from err
+            except (
+                exceptions.CannotConnect,
+                exceptions.AlreadyLogged,
+                exceptions.GenericLoginError,
+            ) as err:
+                raise UpdateFailed(f"Error fetching data: {repr(err)}") from err
+        except (ConfigEntryAuthFailed, UpdateFailed):
+            await self.api.close()
+            raise
 
         utc_point_in_time = dt_util.utcnow()
         data_devices = {
diff --git a/homeassistant/components/vodafone_station/manifest.json b/homeassistant/components/vodafone_station/manifest.json
index 628c25b987e..2a1814c83d0 100644
--- a/homeassistant/components/vodafone_station/manifest.json
+++ b/homeassistant/components/vodafone_station/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/vodafone_station",
   "iot_class": "local_polling",
   "loggers": ["aiovodafone"],
-  "requirements": ["aiovodafone==0.4.1"]
+  "requirements": ["aiovodafone==0.4.2"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 67d95d5e188..9e0b30ab7f8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -375,7 +375,7 @@ aiounifi==64
 aiovlc==0.1.0
 
 # homeassistant.components.vodafone_station
-aiovodafone==0.4.1
+aiovodafone==0.4.2
 
 # homeassistant.components.waqi
 aiowaqi==2.1.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index cb3b6482e3c..d3c0abf88ee 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -350,7 +350,7 @@ aiounifi==64
 aiovlc==0.1.0
 
 # homeassistant.components.vodafone_station
-aiovodafone==0.4.1
+aiovodafone==0.4.2
 
 # homeassistant.components.waqi
 aiowaqi==2.1.0