From 6fb86f179a34252b3ff027b395951130e9cc5a9e Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 22 Jan 2024 19:09:33 -1000 Subject: [PATCH] Use new config entry update/abort helper in bond (#108690) Use new config entry update/abort helper in bond uses the new helper from https://github.com/home-assistant/core/pull/108034 --- homeassistant/components/bond/config_flow.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/bond/config_flow.py b/homeassistant/components/bond/config_flow.py index da8e6781bfa..26b485127f2 100644 --- a/homeassistant/components/bond/config_flow.py +++ b/homeassistant/components/bond/config_flow.py @@ -16,7 +16,7 @@ from homeassistant.components import zeroconf from homeassistant.config_entries import ConfigEntryState from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME from homeassistant.core import HomeAssistant -from homeassistant.data_entry_flow import AbortFlow, FlowResult +from homeassistant.data_entry_flow import FlowResult from homeassistant.helpers.aiohttp_client import async_get_clientsession from .const import DOMAIN @@ -105,7 +105,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): host: str = discovery_info.host bond_id = name.partition(".")[0] await self.async_set_unique_id(bond_id) - hass = self.hass for entry in self._async_current_entries(): if entry.unique_id != bond_id: continue @@ -114,13 +113,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): token := await async_get_token(self.hass, host) ): updates[CONF_ACCESS_TOKEN] = token - new_data = {**entry.data, **updates} - changed = new_data != dict(entry.data) - if changed: - hass.config_entries.async_update_entry(entry, data=new_data) - entry_id = entry.entry_id - hass.async_create_task(hass.config_entries.async_reload(entry_id)) - raise AbortFlow("already_configured") + return self.async_update_reload_and_abort( + entry, data={**entry.data, **updates}, reason="already_configured" + ) self._discovered = {CONF_HOST: host, CONF_NAME: bond_id} await self._async_try_automatic_configure()