Clean up ondilo ico oauth2 (#139927)

homeassistant/components/ondilo_ico/__init__.py

@@ -1,27 +1,37 @@
 """The Ondilo ICO integration."""
 
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers import config_entry_oauth2_flow, config_validation as cv
+from homeassistant.helpers.typing import ConfigType
 
 from .api import OndiloClient
-from .config_flow import OndiloIcoOAuth2FlowHandler
-from .const import DOMAIN
+from .const import DOMAIN, OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET
 from .coordinator import OndiloIcoPoolsCoordinator
-from .oauth_impl import OndiloOauth2Implementation
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 PLATFORMS = [Platform.SENSOR]
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Ondilo ICO integration."""
+    # Import the default client credential.
+    await async_import_client_credential(
+        hass,
+        DOMAIN,
+        ClientCredential(OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET, name="Ondilo ICO"),
+    )
+
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Ondilo ICO from a config entry."""
-
-    OndiloIcoOAuth2FlowHandler.async_register_implementation(
-        hass,
-        OndiloOauth2Implementation(hass),
-    )
-
     implementation = (
         await config_entry_oauth2_flow.async_get_config_entry_implementation(
             hass, entry

homeassistant/components/ondilo_ico/api.py

@@ -1,15 +1,12 @@
 """API for Ondilo ICO bound to Home Assistant OAuth."""
 
 from asyncio import run_coroutine_threadsafe
-import logging
 
 from ondilo import Ondilo
 
 from homeassistant import config_entries, core
 from homeassistant.helpers import config_entry_oauth2_flow
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class OndiloClient(Ondilo):
     """Provide Ondilo ICO authentication tied to an OAuth2 based config entry."""

homeassistant/components/ondilo_ico/application_credentials.py

@@ -0,0 +1,14 @@
+"""Application credentials platform for Ondilo ICO."""
+
+from homeassistant.components.application_credentials import AuthorizationServer
+from homeassistant.core import HomeAssistant
+
+from .const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
+
+
+async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
+    """Return authorization server."""
+    return AuthorizationServer(
+        authorize_url=OAUTH2_AUTHORIZE,
+        token_url=OAUTH2_TOKEN,
+    )

homeassistant/components/ondilo_ico/config_flow.py

@@ -3,11 +3,14 @@
 import logging
 from typing import Any
 
+from homeassistant.components.application_credentials import (
+    ClientCredential,
+    async_import_client_credential,
+)
 from homeassistant.config_entries import ConfigFlowResult
 from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
 
-from .const import DOMAIN
-from .oauth_impl import OndiloOauth2Implementation
+from .const import DOMAIN, OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET
 
 
 class OndiloIcoOAuth2FlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
@@ -18,14 +21,13 @@ class OndiloIcoOAuth2FlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle a flow initialized by the user."""
-        await self.async_set_unique_id(DOMAIN)
-
-        self.async_register_implementation(
+        """Handle a flow start."""
+        # Import the default client credential.
+        await async_import_client_credential(
             self.hass,
-            OndiloOauth2Implementation(self.hass),
+            DOMAIN,
+            ClientCredential(OAUTH2_CLIENT_ID, OAUTH2_CLIENT_SECRET, name="Ondilo ICO"),
         )
-
         return await super().async_step_user(user_input)
 
     @property

homeassistant/components/ondilo_ico/const.py

@@ -4,5 +4,5 @@ DOMAIN = "ondilo_ico"
 
 OAUTH2_AUTHORIZE = "https://interop.ondilo.com/oauth2/authorize"
 OAUTH2_TOKEN = "https://interop.ondilo.com/oauth2/token"
-OAUTH2_CLIENTID = "customer_api"
-OAUTH2_CLIENTSECRET = ""
+OAUTH2_CLIENT_ID = "customer_api"
+OAUTH2_CLIENT_SECRET = ""

homeassistant/components/ondilo_ico/manifest.json

@@ -3,7 +3,7 @@
   "name": "Ondilo ICO",
   "codeowners": ["@JeromeHXP"],
   "config_flow": true,
-  "dependencies": ["auth"],
+  "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/ondilo_ico",
   "integration_type": "hub",
   "iot_class": "cloud_polling",

homeassistant/components/ondilo_ico/oauth_impl.py

@@ -1,32 +0,0 @@
-"""Local implementation of OAuth2 specific to Ondilo to hard code client id and secret and return a proper name."""
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.config_entry_oauth2_flow import LocalOAuth2Implementation
-
-from .const import (
-    DOMAIN,
-    OAUTH2_AUTHORIZE,
-    OAUTH2_CLIENTID,
-    OAUTH2_CLIENTSECRET,
-    OAUTH2_TOKEN,
-)
-
-
-class OndiloOauth2Implementation(LocalOAuth2Implementation):
-    """Local implementation of OAuth2 specific to Ondilo to hard code client id and secret and return a proper name."""
-
-    def __init__(self, hass: HomeAssistant) -> None:
-        """Just init default class with default values."""
-        super().__init__(
-            hass,
-            DOMAIN,
-            OAUTH2_CLIENTID,
-            OAUTH2_CLIENTSECRET,
-            OAUTH2_AUTHORIZE,
-            OAUTH2_TOKEN,
-        )
-
-    @property
-    def name(self) -> str:
-        """Name of the implementation."""
-        return "Ondilo"

homeassistant/generated/application_credentials.py

@@ -25,6 +25,7 @@ APPLICATION_CREDENTIALS = [
     "neato",
     "nest",
     "netatmo",
+    "ondilo_ico",
     "onedrive",
     "point",
     "senz",

tests/components/ondilo_ico/conftest.py

@@ -7,6 +7,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 
 from homeassistant.components.ondilo_ico.const import DOMAIN
+from homeassistant.util.json import JsonArrayType
 
 from tests.common import (
     MockConfigEntry,
@@ -71,7 +72,7 @@ def ico_details2() -> dict[str, Any]:
 
 
 @pytest.fixture(scope="package")
-def last_measures() -> list[dict[str, Any]]:
+def last_measures() -> JsonArrayType:
     """Pool measurements."""
     return load_json_array_fixture("last_measures.json", DOMAIN)
 

tests/components/ondilo_ico/test_config_flow.py

@@ -4,15 +4,13 @@ from unittest.mock import patch
 
 import pytest
 
-from homeassistant import config_entries, setup
+from homeassistant import config_entries
 from homeassistant.components.ondilo_ico.const import (
     DOMAIN,
     OAUTH2_AUTHORIZE,
-    OAUTH2_CLIENTID,
-    OAUTH2_CLIENTSECRET,
+    OAUTH2_CLIENT_ID as CLIENT_ID,
     OAUTH2_TOKEN,
 )
-from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 from homeassistant.helpers import config_entry_oauth2_flow
@@ -21,13 +19,12 @@ from tests.common import MockConfigEntry
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import ClientSessionGenerator
 
-CLIENT_ID = OAUTH2_CLIENTID
-CLIENT_SECRET = OAUTH2_CLIENTSECRET
 
-
-async def test_abort_if_existing_entry(hass: HomeAssistant) -> None:
+async def test_abort_if_existing_entry(
+    hass: HomeAssistant, config_entry: MockConfigEntry
+) -> None:
     """Check flow abort when an entry already exist."""
-    MockConfigEntry(domain=DOMAIN).add_to_hass(hass)
+    config_entry.add_to_hass(hass)
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -43,15 +40,6 @@ async def test_full_flow(
     aioclient_mock: AiohttpClientMocker,
 ) -> None:
     """Check full flow."""
-    assert await setup.async_setup_component(
-        hass,
-        DOMAIN,
-        {
-            DOMAIN: {CONF_CLIENT_ID: CLIENT_ID, CONF_CLIENT_SECRET: CLIENT_SECRET},
-            "http": {"base_url": "https://example.com"},
-        },
-    )
-
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )

tests/components/ondilo_ico/test_sensor.py

@@ -45,7 +45,9 @@ async def test_no_ico_for_one_pool(
     # Only the second pool is created
     assert len(hass.states.async_all()) == 7
     assert hass.states.get("sensor.pool_1_temperature") is None
-    assert hass.states.get("sensor.pool_2_rssi").state == next(
+    state = hass.states.get("sensor.pool_2_rssi")
+    assert state is not None
+    assert state.state == next(
         str(item["value"]) for item in last_measures if item["data_type"] == "rssi"
     )