Cleanup old token code

    * custom_components/daikin_residential_altherma/__init__.py:
    * custom_components/daikin_residential_altherma/config_flow.py:
    * custom_components/daikin_residential_altherma/const.py:
    * custom_components/daikin_residential_altherma/daikin_api.py:
    * custom_components/daikin_residential_altherma/diagnostics.py:
    * custom_components/daikin_residential_altherma/manifest.json:

Author: jwillemsen

custom_components/daikin_residential_altherma/__init__.py

@@ -3,20 +3,20 @@
 import datetime
 import logging
 import voluptuous as vol
+from aiohttp import ClientError
 
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, SERVICE_RELOAD
+from homeassistant.const import SERVICE_RELOAD
 from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import DOMAIN, DAIKIN_API, DAIKIN_DEVICES, CONF_TOKENSET
+from .const import DOMAIN, DAIKIN_API, DAIKIN_DEVICES
 
 from .daikin_api import DaikinApi
 
 _LOGGER = logging.getLogger(__name__)
 
-ENTRY_IS_SETUP = "daikin_entry_is_setup"
-
 MIN_TIME_BETWEEN_UPDATES = datetime.timedelta(seconds=15)
 SCAN_INTERVAL = datetime.timedelta(seconds=30)
 
@@ -30,17 +30,6 @@
 
 COMPONENT_TYPES = ["climate", "sensor", "water_heater", "switch", "select"]
 
-CONFIG_SCHEMA = vol.Schema(
-    vol.All(
-        {
-            DOMAIN: vol.Schema(
-                {vol.Required(CONF_EMAIL): str, vol.Required(CONF_PASSWORD): str}
-            )
-        }
-    ),
-    extra=vol.ALLOW_EXTRA,
-)
-
 async def async_setup(hass, config):
     """Setup the Daikin Residential component."""
 
@@ -50,8 +39,6 @@ async def _handle_reload(service):
         try:
             daikin_api = hass.data[DOMAIN][DAIKIN_API]
             data = daikin_api._config_entry.data.copy()
-            await daikin_api.retrieveAccessToken(data[CONF_EMAIL], data[CONF_PASSWORD])
-            data[CONF_TOKENSET] = daikin_api.tokenSet
             hass.config_entries.async_update_entry(
                 entry=daikin_api._config_entry, data=data
             )
@@ -85,6 +72,12 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     )
 
     daikin_api = DaikinApi(hass, entry, implementation)
+
+    try:
+        await daikin_api.async_get_access_token()
+    except ClientError as err:
+        raise ConfigEntryNotReady from err
+
     await daikin_api.getCloudDeviceDetails()
 
     devices = await daikin_api.getCloudDevices()

custom_components/daikin_residential_altherma/config_flow.py

@@ -5,14 +5,12 @@
 from typing import Any
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
 from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.data_entry_flow import FlowResult
 
 from .daikin_api import DaikinApi
 from .const import DOMAIN
 
-CONF_USER_ID = "user_id"
 _LOGGER = logging.getLogger(__name__)
 
 class FlowHandler(
@@ -31,6 +29,8 @@ def extra_authorize_data(self) -> dict[str, str]:
         """Extra data that needs to be appended to the authorize url."""
         return {
             "scope": "openid onecta:basic.integration",
+            "client_id": "emU20GdJDiiUxI_HnFGz69dD",
+            "client_secret": "TNL1ePwnOkf6o2gKiI8InS8nVwTz2G__VYkv6WznzJGUnwLHLTmKYp-7RZc6FA3yS6D0Wgj_snvqsU5H_LPHQA",
         }
 
     async def async_oauth_create_entry(self, data: dict) -> FlowResult:

custom_components/daikin_residential_altherma/const.py

@@ -2,7 +2,6 @@
 
 from homeassistant.const import (
     CONF_DEVICE_CLASS,
-    CONF_TOKEN,
     CONF_ICON,
     CONF_NAME,
     CONF_TYPE,
@@ -25,8 +24,6 @@
 
 DOMAIN = "daikin_residential_altherma"
 
-CONF_TOKENSET = CONF_TOKEN + "set"
-
 DAIKIN_DATA = "daikin_data"
 DAIKIN_API = "daikin_api"
 DAIKIN_DEVICES = "daikin_devices"