jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 14:17:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only reload Withings config entry on reauth (#101638)

Browse Source 
* Only reload on reauth

* Reload if entry is loaded

* Make async_cloudhook_generate_url protected

* Fix feedback
This commit is contained in:
Joost Lekkerkerker 2023-10-12 12:56:10 +02:00 committed by GitHub
parent dcb3dc254d
commit 8e3c665fd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/withings/__init__.py
View File

@ -43,14 +43,7 @@ from homeassistant.helpers.issue_registry import IssueSeverity, async_create_iss
from homeassistant.helpers.typing import ConfigType from homeassistant.helpers.typing import ConfigType
from .api import ConfigEntryWithingsApi from .api import ConfigEntryWithingsApi
from .const import ( from .const import CONF_PROFILES, CONF_USE_WEBHOOK, DEFAULT_TITLE, DOMAIN, LOGGER
CONF_CLOUDHOOK_URL,
CONF_PROFILES,
CONF_USE_WEBHOOK,
DEFAULT_TITLE,
DOMAIN,
LOGGER,
)
from .coordinator import WithingsDataUpdateCoordinator from .coordinator import WithingsDataUpdateCoordinator
PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR] PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
@ -82,6 +75,7 @@ CONFIG_SCHEMA = vol.Schema(
) )
SUBSCRIBE_DELAY = timedelta(seconds=5) SUBSCRIBE_DELAY = timedelta(seconds=5)
UNSUBSCRIBE_DELAY = timedelta(seconds=1) UNSUBSCRIBE_DELAY = timedelta(seconds=1)
CONF_CLOUDHOOK_URL = "cloudhook_url"
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@ -152,7 +146,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
_: Any, _: Any,
) -> None: ) -> None:
if cloud.async_active_subscription(hass): if cloud.async_active_subscription(hass):
webhook_url = await async_cloudhook_generate_url(hass, entry) webhook_url = await _async_cloudhook_generate_url(hass, entry)
else: else:
webhook_url = webhook_generate_url(hass, entry.data[CONF_WEBHOOK_ID]) webhook_url = webhook_generate_url(hass, entry.data[CONF_WEBHOOK_ID])
@ -200,7 +194,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
entry.async_on_unload(async_call_later(hass, 1, register_webhook)) entry.async_on_unload(async_call_later(hass, 1, register_webhook))
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
entry.async_on_unload(entry.add_update_listener(update_listener))
return True return True
@ -214,11 +207,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
return unload_ok return unload_ok
async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
"""Handle options update."""
await hass.config_entries.async_reload(entry.entry_id)
async def async_subscribe_webhooks( async def async_subscribe_webhooks(
client: ConfigEntryWithingsApi, webhook_url: str client: ConfigEntryWithingsApi, webhook_url: str
) -> None: ) -> None:
@ -266,7 +254,7 @@ async def async_unsubscribe_webhooks(client: ConfigEntryWithingsApi) -> None:
) )
async def async_cloudhook_generate_url(hass: HomeAssistant, entry: ConfigEntry) -> str: async def _async_cloudhook_generate_url(hass: HomeAssistant, entry: ConfigEntry) -> str:
"""Generate the full URL for a webhook_id.""" """Generate the full URL for a webhook_id."""
if CONF_CLOUDHOOK_URL not in entry.data: if CONF_CLOUDHOOK_URL not in entry.data:
webhook_id = entry.data[CONF_WEBHOOK_ID] webhook_id = entry.data[CONF_WEBHOOK_ID]

1
homeassistant/components/withings/config_flow.py
View File

@ -76,6 +76,7 @@ class WithingsFlowHandler(
self.hass.config_entries.async_update_entry( self.hass.config_entries.async_update_entry(
self.reauth_entry, data={**self.reauth_entry.data, **data} self.reauth_entry, data={**self.reauth_entry.data, **data}
) )
await self.hass.config_entries.async_reload(self.reauth_entry.entry_id)
return self.async_abort(reason="reauth_successful") return self.async_abort(reason="reauth_successful")
return self.async_abort(reason="wrong_account") return self.async_abort(reason="wrong_account")

1
homeassistant/components/withings/const.py
View File

@ -5,7 +5,6 @@ import logging
DEFAULT_TITLE = "Withings" DEFAULT_TITLE = "Withings"
CONF_PROFILES = "profiles" CONF_PROFILES = "profiles"
CONF_USE_WEBHOOK = "use_webhook" CONF_USE_WEBHOOK = "use_webhook"
CONF_CLOUDHOOK_URL = "cloudhook_url"
DATA_MANAGER = "data_manager" DATA_MANAGER = "data_manager"