diff --git a/homeassistant/components/melcloud/config_flow.py b/homeassistant/components/melcloud/config_flow.py index ff0b06d3775..87fe14dce81 100644 --- a/homeassistant/components/melcloud/config_flow.py +++ b/homeassistant/components/melcloud/config_flow.py @@ -5,7 +5,6 @@ from __future__ import annotations import asyncio from collections.abc import Mapping from http import HTTPStatus -import logging from typing import Any from aiohttp import ClientError, ClientResponseError @@ -18,8 +17,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession from .const import DOMAIN -_LOGGER = logging.getLogger(__name__) - class FlowHandler(ConfigFlow, domain=DOMAIN): """Handle a config flow.""" @@ -37,8 +34,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN): async def _create_client( self, username: str, - *, - password: str | None = None, + password: str, token: str | None = None, ) -> ConfigFlowResult: """Create client.""" @@ -46,13 +42,13 @@ class FlowHandler(ConfigFlow, domain=DOMAIN): async with asyncio.timeout(10): if (acquired_token := token) is None: acquired_token = await pymelcloud.login( - username, - password, - async_get_clientsession(self.hass), + email=username, + password=password, + session=async_get_clientsession(self.hass), ) await pymelcloud.get_devices( - acquired_token, - async_get_clientsession(self.hass), + token=acquired_token, + session=async_get_clientsession(self.hass), ) except ClientResponseError as err: if err.status in (HTTPStatus.UNAUTHORIZED, HTTPStatus.FORBIDDEN): @@ -78,8 +74,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN): {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str} ), ) - username = user_input[CONF_USERNAME] - return await self._create_client(username, password=user_input[CONF_PASSWORD]) + return await self._create_client( + username=user_input[CONF_USERNAME], password=user_input[CONF_PASSWORD] + ) async def async_step_reauth( self, entry_data: Mapping[str, Any] @@ -118,9 +115,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN): try: async with asyncio.timeout(10): acquired_token = await pymelcloud.login( - user_input[CONF_USERNAME], - user_input[CONF_PASSWORD], - async_get_clientsession(self.hass), + email=user_input[CONF_USERNAME], + password=user_input[CONF_PASSWORD], + session=async_get_clientsession(self.hass), ) except (ClientResponseError, AttributeError) as err: if ( @@ -134,10 +131,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN): errors["base"] = "invalid_auth" else: errors["base"] = "cannot_connect" - except ( - TimeoutError, - ClientError, - ): + except (TimeoutError, ClientError): errors["base"] = "cannot_connect" return acquired_token, errors @@ -155,9 +149,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN): try: async with asyncio.timeout(10): acquired_token = await pymelcloud.login( - user_input[CONF_USERNAME], - user_input[CONF_PASSWORD], - async_get_clientsession(self.hass), + email=user_input[CONF_USERNAME], + password=user_input[CONF_PASSWORD], + session=async_get_clientsession(self.hass), ) except (ClientResponseError, AttributeError) as err: if (