New config version with data stored in options

Author: AfonsoFGarcia

custom_components/bluecon/ConfigEntryNotificationInfoStorage.py

@@ -1,25 +1,31 @@
 from bluecon import INotificationInfoStorage
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
 from typing import Any
 
 class ConfigEntryNotificationInfoStorage(INotificationInfoStorage):
-    def __init__(self, entry: ConfigEntry):
+    def __init__(self, hass: HomeAssistant, entry: ConfigEntry):
         self.__entry = entry
+        self.__hass = hass
 
     def retrieveCredentials(self) -> dict[str, dict[str, Any]] | None:
-        return self.__entry.data["credentials"]
+        return self.__entry.options["credentials"]
 
     def storeCredentials(self, credentials: dict[str, dict[str, Any]]):
-        self.__entry.data["credentials"] = credentials
+        new = {**self.__entry.options,
+                      "credentials": credentials}
+        self.__hass.config_entries.async_update_entry(self.__entry, options=new)
 
     def retrievePersistentIds(self) -> list[str] | None:
-        return self.__entry.data["persistentIds"]
+        return self.__entry.options["persistentIds"]
 
     def storePersistentId(self, persistentId: str):
-        stored_persistent_ids = self.__entry.data["persistentIds"]
+        stored_persistent_ids = self.__entry.options["persistentIds"]
         if stored_persistent_ids is None:
             stored_persistent_ids = []
 
         stored_persistent_ids.append(persistentId)
 
-        self.__entry.data["persistentIds"] = stored_persistent_ids
+        new = {**self.__entry.options,
+                      "persistentIds": stored_persistent_ids}
+        self.__hass.config_entries.async_update_entry(self.__entry, options=new)

custom_components/bluecon/ConfigEntryOAuthTokenStorage.py

@@ -1,12 +1,16 @@
 from bluecon import IOAuthTokenStorage, OAuthToken
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
 
 class ConfigEntryOAuthTokenStorage(IOAuthTokenStorage):
-    def __init__(self, entry: ConfigEntry):
+    def __init__(self, hass: HomeAssistant, entry: ConfigEntry):
         self.__entry = entry
+        self.__hass = hass
 
     def retrieveOAuthToken(self) -> OAuthToken:
-        return OAuthToken.fromJson(self.__entry.data["token"])
+        return OAuthToken.fromJson(self.__entry.options["token"])
 
     def storeOAuthToken(self, oAuthToken: OAuthToken):
-        self.__entry.data["token"] = oAuthToken.toJson()
+        new = {**self.__entry.options,
+                      "token": oAuthToken.toJson()}
+        self.__hass.config_entries.async_update_entry(self.__entry, options=new)

custom_components/bluecon/__init__.py

@@ -61,7 +61,11 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry):
             "credentials": credentials,
             "persistentIds": persistentIds
         }
-        config_entry.version = 2
-        hass.config_entries.async_update_entry(config_entry, data=new)
+        config_entry.version = 3
+        hass.config_entries.async_update_entry(config_entry, data={}, options=new)
+    if config_entry.version == 2:
+        new = {**config_entry.data}
+        config_entry.version = 3
+        hass.config_entries.async_update_entry(config_entry, data={}, options=new)
 
     return True

custom_components/bluecon/config_flow.py

@@ -13,7 +13,7 @@
 from . import DOMAIN
 
 class BlueConConfigFlow(ConfigFlow, domain = DOMAIN):
-    VERSION = 2
+    VERSION = 3
 
     async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult:
         error_info: dict[str, str] = {}
@@ -44,4 +44,4 @@ async def async_step_user(self, user_input: dict[str, Any] | None = None) -> Flo
 
     @callback
     def _async_finish_flow(self):
-        return self.async_create_entry(title = DOMAIN, data = {"token": self.__oAuthToken, "credentials": None, "persistentIds": None})
+        return self.async_create_entry(title = DOMAIN, data = {}, options = {"token": self.__oAuthToken, "credentials": None, "persistentIds": None})

custom_components/bluecon/manifest.json

@@ -1,7 +1,7 @@
 {
     "domain": "bluecon",
     "name": "Fermax Blue",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "documentation": "https://hass-bluecon.afonsogarcia.dev/",
     "issue_tracker": "https://github.com/AfonsoFGarcia/hass-bluecon/issues",
     "requirements": ["bluecon==0.1.0", "aiohttp", "oscrypto", "protobuf", "http-ece"],