Initial connect is working

    * custom_components/daikin_residential_altherma/__init__.py:
    * custom_components/daikin_residential_altherma/config_flow.py:
    * custom_components/daikin_residential_altherma/daikin_api.py:

Author: jwillemsen

custom_components/daikin_residential_altherma/__init__.py

@@ -7,6 +7,7 @@
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, SERVICE_RELOAD
 from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DOMAIN, DAIKIN_API, DAIKIN_DEVICES, CONF_TOKENSET
 
@@ -77,8 +78,13 @@ async def _handle_reload(service):
 
 async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     """Establish connection with Daikin."""
+    implementation = (
+        await config_entry_oauth2_flow.async_get_config_entry_implementation(
+            hass, entry
+        )
+    )
 
-    daikin_api = DaikinApi(hass, entry)
+    daikin_api = DaikinApi(hass, entry, implementation)
     await daikin_api.getCloudDeviceDetails()
 
     devices = await daikin_api.getCloudDevices()

custom_components/daikin_residential_altherma/config_flow.py

@@ -43,7 +43,6 @@ async def async_oauth_create_entry(self, data: dict) -> FlowResult:
 
         return await super().async_oauth_create_entry(data)
 
-
     async def async_step_user(self, user_input: dict | None = None) -> FlowResult:
         """Handle a flow start."""
         await self.async_set_unique_id(DOMAIN)
@@ -67,7 +66,6 @@ async def async_step_reauth_confirm(
         if user_input is None:
             return self.async_show_form(step_id="reauth_confirm")
 
-
     @property
     def logger(self) -> logging.Logger:
         """Return logger."""

custom_components/daikin_residential_altherma/daikin_api.py

@@ -14,6 +14,8 @@
 
 from homeassistant.util import Throttle
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant import config_entries, core
 
 from .const import DOMAIN, DAIKIN_DEVICES, CONF_TOKENSET
 
@@ -32,15 +34,24 @@
 class DaikinApi:
     """Daikin Residential API."""
 
-    def __init__(self, hass, entry):
+    def __init__(self,
+                hass: core.HomeAssistant,
+                entry: config_entries.ConfigEntry,
+                implementation: config_entry_oauth2_flow.AbstractOAuth2Implementation,):
         """Initialize a new Daikin Residential Altherma API."""
         _LOGGER.debug("Initialing Daikin Residential Altherma API...")
         self.hass = hass
         self._config_entry = entry
-        self.tokenSet = None
+        self.session = config_entry_oauth2_flow.OAuth2Session(
+            hass, entry, implementation
+        )
+
+        self.tokenSet = []
+
+#        if entry is not None:
+#            self.tokenSet = entry.data[CONF_TOKENSET].copy()
 
-        if entry is not None:
-            self.tokenSet = entry.data[CONF_TOKENSET].copy()
+        #self.tokenSet["access_token"] = self.session.token
 
         configuration = {
             "issuer": DAIKIN_ISSUER,
@@ -70,18 +81,19 @@ async def doBearerRequest(self, resourceUrl, options=None, refreshed=False):
             raise Exception("Missing TokenSet. Please repeat Authentication process.")
 
         if not resourceUrl.startswith("http"):
-            resourceUrl = "https://api.prod.unicloud.edc.dknadmin.be" + resourceUrl
+            resourceUrl = "https://api.onecta.daikineurope.com" + resourceUrl
 
         headers = {
             "user-agent": "Daikin/1.6.1.4681 CFNetwork/1209 Darwin/20.2.0",
             "x-api-key": "xw6gvOtBHq5b1pyceadRp6rujSNSZdjx2AqT03iC",
-            "Authorization": "Bearer " + self.tokenSet["access_token"],
+            "Authorization": "Bearer " + self.session.token["access_token"],
             "Content-Type": "application/json",
         }
 
         async with self._cloud_lock:
             _LOGGER.debug("BEARER REQUEST URL: %s", resourceUrl)
             _LOGGER.debug("BEARER REQUEST HEADERS: %s", headers)
+            _LOGGER.debug("TOKEN: %s", self.session.token["access_token"])
             if (
                 options is not None
                 and "method" in options