Fix broken options flow (#113)

Trying to access self.hass in the constructor of an options flow does
not work as it has not been set yet. This change moves that code to
where it's actually used.

Author: postlund

custom_components/remote_homeassistant/config_flow.py

@@ -188,9 +188,6 @@ def __init__(self, config_entry):
         self.filters = None
         self.events = None
         self.options = None
-        self.remote = self.hass.data[DOMAIN][self.config_entry.entry_id][
-            CONF_REMOTE_CONNECTION
-        ]
 
     async def async_step_init(self, user_input=None):
         """Manage basic options."""
@@ -201,6 +198,10 @@ async def async_step_init(self, user_input=None):
         domains, _ = self._domains_and_entities()
         domains = set(domains + self.config_entry.options.get(CONF_LOAD_COMPONENTS, []))
 
+        remote = self.hass.data[DOMAIN][self.config_entry.entry_id][
+            CONF_REMOTE_CONNECTION
+        ]
+
         return self.async_show_form(
             step_id="init",
             data_schema=vol.Schema(
@@ -223,7 +224,7 @@ async def async_step_init(self, user_input=None):
                     vol.Optional(
                         CONF_SERVICES,
                         default=self._default(CONF_SERVICES),
-                    ): cv.multi_select(self.remote.proxy_services.services),
+                    ): cv.multi_select(remote.proxy_services.services),
                 }
             ),
         )

custom_components/remote_homeassistant/proxy_services.py

@@ -23,11 +23,11 @@ def __init__(self, hass, entry, remote):
     @property
     def services(self):
         """Return list of service names."""
-        services = []
+        result = []
         for domain, services in self.remote_services.items():
             for service in services.keys():
-                services.append(f"{domain}.{service}")
-        return sorted(services)
+                result.append(f"{domain}.{service}")
+        return sorted(result)
 
     async def load(self):
         """Call to make initial registration of services."""
@@ -55,7 +55,7 @@ async def _async_got_services(self, message):
             return
 
         description_cache = self.hass.data[SERVICE_DESCRIPTION_CACHE]
-        for service in self.entry.options[CONF_SERVICES]:
+        for service in self.entry.options.get(CONF_SERVICES, []):
             domain, service_name = service.split(".")
             service = service_prefix + service_name