Bug fix for reauthentication #28

Author: erikkastelec

custom_components/wemportal/coordinator.py

@@ -8,7 +8,7 @@
     DataUpdateCoordinator,
     UpdateFailed,
 )
-from .exceptions import WemPortalError
+from .exceptions import ServerError, WemPortalError
 from .const import _LOGGER, DEFAULT_TIMEOUT
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from .wemportalapi import WemPortalApi
@@ -41,16 +41,26 @@ async def _async_update_data(self):
             try:
                 return await self.hass.async_add_executor_job(self.api.fetch_data)
             except WemPortalError as exc:
-                _LOGGER.error("Error fetching data from wemportal", exc_info=exc)
-                _LOGGER.error("Creating new wemportal api instance")
-                # TODO: This is a temporary solution and should be removed when api cause from #28 is resolved
-                try:
-                    new_api = WemPortalApi(
-                        self.config_entry.data.get(CONF_USERNAME),
-                        self.config_entry.data.get(CONF_PASSWORD),
-                        self.config_entry.options,
-                    )
-                    self.api = new_api
-                except Exception:
-                    pass
-                raise UpdateFailed from exc
+                
+                if isinstance(exc.__cause__, ServerError):
+                    _LOGGER.error("Creating new wemportal api instance")
+                    # TODO: This is a temporary solution and should be removed when api cause from #28 is resolved
+                    try:
+                        new_api = WemPortalApi(
+                            self.config_entry.data.get(CONF_USERNAME),
+                            self.config_entry.data.get(CONF_PASSWORD),
+                            self.config_entry.options,
+                        )
+                        self.api = new_api
+                    except Exception as exc2:
+                        raise UpdateFailed from exc2
+                    try:
+                        return await self.hass.async_add_executor_job(self.api.fetch_data)
+                    except WemPortalError as exc2:
+                        _LOGGER.error("Error fetching data from wemportal", exc_info=exc)
+                        raise UpdateFailed from exc2
+                else:
+                    _LOGGER.error("Error fetching data from wemportal", exc_info=exc)
+                    raise UpdateFailed from exc
+                    
+                

custom_components/wemportal/wemportalapi.py

@@ -195,7 +195,11 @@ def api_login(self):
         except reqs.exceptions.HTTPError as exc:
             self.valid_login = False
             response_status, response_message = self.get_response_details(response)
-            if response.status_code == 400:
+            if response is None:
+                raise UnknownAuthError(
+                    f"Authentication Error: Encountered an unknown authentication error."
+                ) from exc
+            elif response.status_code == 400:
                 raise AuthError(
                     f"Authentication Error: Check if your login credentials are correct. Received response code: {response.status_code}, response: {response.content}. Server returned internal status code: {response_status} and message: {response_message}"
                 ) from exc
@@ -213,13 +217,14 @@ def api_login(self):
     def get_response_details(self, response: reqs.Response):
         server_status = ""
         server_message = ""
-        try:
-            response_data = response.json()
-            # Status we get back from server
-            server_status = response_data["Status"]
-            server_message = response_data["Message"]
-        except KeyError:
-            pass
+        if response:
+            try:
+                response_data = response.json()
+                # Status we get back from server
+                server_status = response_data["Status"]
+                server_message = response_data["Message"]
+            except KeyError:
+                pass
         return server_status, server_message
 
     def make_api_call(
@@ -238,7 +243,7 @@ def make_api_call(
                 )
             response.raise_for_status()
         except Exception as exc:
-            if response.status_code == 401 and not login_retry:
+            if response and response.status_code == 401 and not login_retry:
                 self.api_login()
                 headers = headers or self.headers
                 time.sleep(delay)