From 31c9cdf74203feeb01c09080760e21c99838452f Mon Sep 17 00:00:00 2001
From: Max Michels <6703026+maxmichels@users.noreply.github.com>
Date: Sun, 24 May 2026 19:25:39 +0200
Subject: [PATCH] Replace duplicate constants in xthings_cloud with
 homeassistant.const imports (#172076)

---
 homeassistant/components/xthings_cloud/__init__.py    |  3 ++-
 homeassistant/components/xthings_cloud/config_flow.py | 10 ++--------
 homeassistant/components/xthings_cloud/const.py       |  8 --------
 homeassistant/components/xthings_cloud/coordinator.py |  3 ++-
 tests/components/xthings_cloud/conftest.py            |  8 ++------
 tests/components/xthings_cloud/test_config_flow.py    |  9 ++-------
 6 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/homeassistant/components/xthings_cloud/__init__.py b/homeassistant/components/xthings_cloud/__init__.py
index dffd91a78e4f..4259c3e1f759 100644
--- a/homeassistant/components/xthings_cloud/__init__.py
+++ b/homeassistant/components/xthings_cloud/__init__.py
@@ -2,10 +2,11 @@
 
 from ha_xthings_cloud import XthingsCloudApiClient
 
+from homeassistant.const import CONF_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONF_TOKEN, PLATFORMS
+from .const import PLATFORMS
 from .coordinator import XthingsCloudConfigEntry, XthingsCloudCoordinator
 
 
diff --git a/homeassistant/components/xthings_cloud/config_flow.py b/homeassistant/components/xthings_cloud/config_flow.py
index 7bdcb8fdd206..ddc32314ccde 100644
--- a/homeassistant/components/xthings_cloud/config_flow.py
+++ b/homeassistant/components/xthings_cloud/config_flow.py
@@ -10,17 +10,11 @@ from ha_xthings_cloud import (
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, CONF_TOKEN
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.instance_id import async_get as async_get_instance_id
 
-from .const import (
-    CONF_EMAIL,
-    CONF_PASSWORD,
-    CONF_REFRESH_TOKEN,
-    CONF_TOKEN,
-    DOMAIN,
-    LOGGER,
-)
+from .const import CONF_REFRESH_TOKEN, DOMAIN, LOGGER
 
 ERROR_CODE_MAP: dict[int, str] = {
     20001: "token_invalid",
diff --git a/homeassistant/components/xthings_cloud/const.py b/homeassistant/components/xthings_cloud/const.py
index 39c6dbb55aad..4aa4d2967c78 100644
--- a/homeassistant/components/xthings_cloud/const.py
+++ b/homeassistant/components/xthings_cloud/const.py
@@ -7,15 +7,7 @@ from homeassistant.const import Platform
 DOMAIN = "xthings_cloud"
 LOGGER = logging.getLogger(__package__)
 
-# pylint: disable-next=home-assistant-duplicate-const
-CONF_EMAIL = "email"
-# pylint: disable-next=home-assistant-duplicate-const
-CONF_PASSWORD = "password"
-# pylint: disable-next=home-assistant-duplicate-const
-CONF_TOKEN = "token"
 CONF_REFRESH_TOKEN = "refresh_token"
-# pylint: disable-next=home-assistant-duplicate-const
-CONF_CLIENT_ID = "client_id"
 CONF_INSTANCE_ID = "instance_id"
 
 # Polling interval (seconds)
diff --git a/homeassistant/components/xthings_cloud/coordinator.py b/homeassistant/components/xthings_cloud/coordinator.py
index 430c5b98cfa0..91faed82c6f7 100644
--- a/homeassistant/components/xthings_cloud/coordinator.py
+++ b/homeassistant/components/xthings_cloud/coordinator.py
@@ -11,12 +11,13 @@ from ha_xthings_cloud import (
 )
 
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_REFRESH_TOKEN, CONF_TOKEN, DEFAULT_SCAN_INTERVAL, DOMAIN, LOGGER
+from .const import CONF_REFRESH_TOKEN, DEFAULT_SCAN_INTERVAL, DOMAIN, LOGGER
 
 type XthingsCloudConfigEntry = ConfigEntry[XthingsCloudCoordinator]
 
diff --git a/tests/components/xthings_cloud/conftest.py b/tests/components/xthings_cloud/conftest.py
index f121d9f3f805..1271fd5038ed 100644
--- a/tests/components/xthings_cloud/conftest.py
+++ b/tests/components/xthings_cloud/conftest.py
@@ -5,12 +5,8 @@ from unittest.mock import AsyncMock, patch
 
 import pytest
 
-from homeassistant.components.xthings_cloud.const import (
-    CONF_EMAIL,
-    CONF_REFRESH_TOKEN,
-    CONF_TOKEN,
-    DOMAIN,
-)
+from homeassistant.components.xthings_cloud.const import CONF_REFRESH_TOKEN, DOMAIN
+from homeassistant.const import CONF_EMAIL, CONF_TOKEN
 
 from .const import MOCK_EMAIL, MOCK_REFRESH_TOKEN, MOCK_TOKEN, MOCK_USER_ID
 
diff --git a/tests/components/xthings_cloud/test_config_flow.py b/tests/components/xthings_cloud/test_config_flow.py
index 182d1756f1f0..e044b642191f 100644
--- a/tests/components/xthings_cloud/test_config_flow.py
+++ b/tests/components/xthings_cloud/test_config_flow.py
@@ -5,14 +5,9 @@ from unittest.mock import AsyncMock
 from ha_xthings_cloud import XthingsCloudApiError, XthingsCloudAuthError
 import pytest
 
-from homeassistant.components.xthings_cloud.const import (
-    CONF_EMAIL,
-    CONF_PASSWORD,
-    CONF_REFRESH_TOKEN,
-    CONF_TOKEN,
-    DOMAIN,
-)
+from homeassistant.components.xthings_cloud.const import CONF_REFRESH_TOKEN, DOMAIN
 from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType