From 899f6cf1a34d3ba274460b2612948cf5a8df7828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 10 Dec 2019 22:41:29 +0200
Subject: [PATCH] Re-authorize Huawei LTE on login required error (#29597)

* Re-authorize Huawei LTE on login required error

Closes https://github.com/home-assistant/home-assistant/issues/29531

* Eliminate one indented "else" block

* Convert get_data from inline to instance method

* Use .get instead of [] for checking subscriptions for clarity
---
 .../components/huawei_lte/__init__.py         | 65 +++++++++++--------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/homeassistant/components/huawei_lte/__init__.py b/homeassistant/components/huawei_lte/__init__.py
index 4a5614543e9..531529b17cd 100644
--- a/homeassistant/components/huawei_lte/__init__.py
+++ b/homeassistant/components/huawei_lte/__init__.py
@@ -157,40 +157,53 @@ class Router:
         """Get router connections for device registry."""
         return {(dr.CONNECTION_NETWORK_MAC, self.mac)} if self.mac else set()
 
+    def _get_data(self, key: str, func: Callable[[None], Any]) -> None:
+        if not self.subscriptions.get(key):
+            return
+        _LOGGER.debug("Getting %s for subscribers %s", key, self.subscriptions[key])
+        try:
+            self.data[key] = func()
+        except ResponseErrorNotSupportedException:
+            _LOGGER.info(
+                "%s not supported by device, excluding from future updates", key
+            )
+            self.subscriptions.pop(key)
+        except ResponseErrorLoginRequiredException:
+            if isinstance(self.connection, AuthorizedConnection):
+                _LOGGER.debug("Trying to authorize again...")
+                if self.connection.enforce_authorized_connection():
+                    _LOGGER.debug(
+                        "...success, %s will be updated by a future periodic run", key,
+                    )
+                else:
+                    _LOGGER.debug("...failed")
+                return
+            _LOGGER.info(
+                "%s requires authorization, excluding from future updates", key
+            )
+            self.subscriptions.pop(key)
+        finally:
+            _LOGGER.debug("%s=%s", key, self.data.get(key))
+
     def update(self) -> None:
         """Update router data."""
 
-        def get_data(key: str, func: Callable[[None], Any]) -> None:
-            if not self.subscriptions[key]:
-                return
-            _LOGGER.debug("Getting %s for subscribers %s", key, self.subscriptions[key])
-            try:
-                self.data[key] = func()
-            except ResponseErrorNotSupportedException:
-                _LOGGER.info(
-                    "%s not supported by device, excluding from future updates", key
-                )
-                self.subscriptions.pop(key)
-            except ResponseErrorLoginRequiredException:
-                _LOGGER.info(
-                    "%s requires authorization, excluding from future updates", key
-                )
-                self.subscriptions.pop(key)
-            finally:
-                _LOGGER.debug("%s=%s", key, self.data.get(key))
-
-        get_data(KEY_DEVICE_INFORMATION, self.client.device.information)
+        self._get_data(KEY_DEVICE_INFORMATION, self.client.device.information)
         if self.data.get(KEY_DEVICE_INFORMATION):
             # Full information includes everything in basic
             self.subscriptions.pop(KEY_DEVICE_BASIC_INFORMATION, None)
-        get_data(KEY_DEVICE_BASIC_INFORMATION, self.client.device.basic_information)
-        get_data(KEY_DEVICE_SIGNAL, self.client.device.signal)
-        get_data(KEY_DIALUP_MOBILE_DATASWITCH, self.client.dial_up.mobile_dataswitch)
-        get_data(KEY_MONITORING_STATUS, self.client.monitoring.status)
-        get_data(
+        self._get_data(
+            KEY_DEVICE_BASIC_INFORMATION, self.client.device.basic_information
+        )
+        self._get_data(KEY_DEVICE_SIGNAL, self.client.device.signal)
+        self._get_data(
+            KEY_DIALUP_MOBILE_DATASWITCH, self.client.dial_up.mobile_dataswitch
+        )
+        self._get_data(KEY_MONITORING_STATUS, self.client.monitoring.status)
+        self._get_data(
             KEY_MONITORING_TRAFFIC_STATISTICS, self.client.monitoring.traffic_statistics
         )
-        get_data(KEY_WLAN_HOST_LIST, self.client.wlan.host_list)
+        self._get_data(KEY_WLAN_HOST_LIST, self.client.wlan.host_list)
 
         self.signal_update()