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

Remove unnecessary CONF_NAME usage in Habitica integration (#149595)

Browse Source
This commit is contained in:
Manu 2025-07-29 08:55:32 +02:00 committed by GitHub
parent 3c1aa9d9de
commit 62ee1fbc64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/habitica/config_flow.py
View File

@ -164,7 +164,6 @@ class HabiticaConfigFlow(ConfigFlow, domain=DOMAIN):
data={ data={
CONF_API_USER: str(login.id), CONF_API_USER: str(login.id),
CONF_API_KEY: login.apiToken, CONF_API_KEY: login.apiToken,
CONF_NAME: user.profile.name, # needed for api_call action
CONF_URL: DEFAULT_URL, CONF_URL: DEFAULT_URL,
CONF_VERIFY_SSL: True, CONF_VERIFY_SSL: True,
}, },
@ -200,7 +199,6 @@ class HabiticaConfigFlow(ConfigFlow, domain=DOMAIN):
data={ data={
**user_input, **user_input,
CONF_URL: user_input.get(CONF_URL, DEFAULT_URL), CONF_URL: user_input.get(CONF_URL, DEFAULT_URL),
CONF_NAME: user.profile.name, # needed for api_call action
}, },
) )

7
homeassistant/components/habitica/coordinator.py
View File

@ -23,7 +23,6 @@ from habiticalib import (
) )
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_NAME
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ( from homeassistant.exceptions import (
ConfigEntryAuthFailed, ConfigEntryAuthFailed,
@ -106,12 +105,6 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
translation_placeholders={"reason": str(e)}, translation_placeholders={"reason": str(e)},
) from e ) from e
if not self.config_entry.data.get(CONF_NAME):
self.hass.config_entries.async_update_entry(
self.config_entry,
data={**self.config_entry.data, CONF_NAME: user.data.profile.name},
)
async def _async_update_data(self) -> HabiticaData: async def _async_update_data(self) -> HabiticaData:
try: try:
user = (await self.habitica.get_user()).data user = (await self.habitica.get_user()).data

4
homeassistant/components/habitica/entity.py
View File

@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
from yarl import URL from yarl import URL
from homeassistant.const import CONF_NAME, CONF_URL from homeassistant.const import CONF_URL
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
from homeassistant.helpers.entity import EntityDescription from homeassistant.helpers.entity import EntityDescription
from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.helpers.update_coordinator import CoordinatorEntity
@ -37,7 +37,7 @@ class HabiticaBase(CoordinatorEntity[HabiticaDataUpdateCoordinator]):
entry_type=DeviceEntryType.SERVICE, entry_type=DeviceEntryType.SERVICE,
manufacturer=MANUFACTURER, manufacturer=MANUFACTURER,
model=NAME, model=NAME,
name=coordinator.config_entry.data[CONF_NAME], name=coordinator.data.user.profile.name,
configuration_url=( configuration_url=(
URL(coordinator.config_entry.data[CONF_URL]) URL(coordinator.config_entry.data[CONF_URL])
/ "profile" / "profile"

5
tests/components/habitica/test_config_flow.py
View File

@ -16,7 +16,6 @@ from homeassistant.components.habitica.const import (
from homeassistant.config_entries import SOURCE_USER from homeassistant.config_entries import SOURCE_USER
from homeassistant.const import ( from homeassistant.const import (
CONF_API_KEY, CONF_API_KEY,
CONF_NAME,
CONF_PASSWORD, CONF_PASSWORD,
CONF_URL, CONF_URL,
CONF_USERNAME, CONF_USERNAME,
@ -96,7 +95,6 @@ async def test_form_login(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> N
CONF_API_USER: TEST_API_USER, CONF_API_USER: TEST_API_USER,
CONF_API_KEY: TEST_API_KEY, CONF_API_KEY: TEST_API_KEY,
CONF_URL: DEFAULT_URL, CONF_URL: DEFAULT_URL,
CONF_NAME: "test-user",
CONF_VERIFY_SSL: True, CONF_VERIFY_SSL: True,
} }
assert result["result"].unique_id == TEST_API_USER assert result["result"].unique_id == TEST_API_USER
@ -151,7 +149,6 @@ async def test_form_login_errors(
CONF_API_USER: TEST_API_USER, CONF_API_USER: TEST_API_USER,
CONF_API_KEY: TEST_API_KEY, CONF_API_KEY: TEST_API_KEY,
CONF_URL: DEFAULT_URL, CONF_URL: DEFAULT_URL,
CONF_NAME: "test-user",
CONF_VERIFY_SSL: True, CONF_VERIFY_SSL: True,
} }
assert result["result"].unique_id == TEST_API_USER assert result["result"].unique_id == TEST_API_USER
@ -219,7 +216,6 @@ async def test_form_advanced(hass: HomeAssistant, mock_setup_entry: AsyncMock) -
CONF_API_USER: TEST_API_USER, CONF_API_USER: TEST_API_USER,
CONF_API_KEY: TEST_API_KEY, CONF_API_KEY: TEST_API_KEY,
CONF_URL: DEFAULT_URL, CONF_URL: DEFAULT_URL,
CONF_NAME: "test-user",
CONF_VERIFY_SSL: True, CONF_VERIFY_SSL: True,
} }
assert result["result"].unique_id == TEST_API_USER assert result["result"].unique_id == TEST_API_USER
@ -275,7 +271,6 @@ async def test_form_advanced_errors(
CONF_API_USER: TEST_API_USER, CONF_API_USER: TEST_API_USER,
CONF_API_KEY: TEST_API_KEY, CONF_API_KEY: TEST_API_KEY,
CONF_URL: DEFAULT_URL, CONF_URL: DEFAULT_URL,
CONF_NAME: "test-user",
CONF_VERIFY_SSL: True, CONF_VERIFY_SSL: True,
} }
assert result["result"].unique_id == TEST_API_USER assert result["result"].unique_id == TEST_API_USER