From f8c76f42e366a4392c15b3e83b595e9b7a6198be Mon Sep 17 00:00:00 2001
From: Raphael Hehl <7577984+RaHehl@users.noreply.github.com>
Date: Wed, 26 Nov 2025 17:59:49 +0100
Subject: [PATCH] Add session clearing on config entry removal for UniFi
 Protect integration (#157360)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 .../components/unifiprotect/__init__.py       | 20 ++++-
 tests/components/unifiprotect/test_init.py    | 80 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/unifiprotect/__init__.py b/homeassistant/components/unifiprotect/__init__.py
index 97a5ca67186..b801219cb2e 100644
--- a/homeassistant/components/unifiprotect/__init__.py
+++ b/homeassistant/components/unifiprotect/__init__.py
@@ -15,7 +15,7 @@ from uiprotect.exceptions import BadRequest, ClientError, NotAuthorized
 # diagnostics module will not be imported in the executor.
 from uiprotect.test_util.anonymize import anonymize_data  # noqa: F401
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import CONF_API_KEY, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import (
@@ -172,6 +172,24 @@ async def async_unload_entry(hass: HomeAssistant, entry: UFPConfigEntry) -> bool
     return unload_ok
 
 
+async def async_remove_entry(hass: HomeAssistant, entry: UFPConfigEntry) -> None:
+    """Handle removal of a config entry."""
+    # Clear the stored session credentials when the integration is removed
+    if entry.state is ConfigEntryState.LOADED:
+        # Integration is loaded, use the existing API client
+        try:
+            await entry.runtime_data.api.clear_session()
+        except Exception as err:  # noqa: BLE001
+            _LOGGER.warning("Failed to clear session credentials: %s", err)
+    else:
+        # Integration is not loaded, create temporary client to clear session
+        protect = async_create_api_client(hass, entry)
+        try:
+            await protect.clear_session()
+        except Exception as err:  # noqa: BLE001
+            _LOGGER.warning("Failed to clear session credentials: %s", err)
+
+
 async def async_remove_config_entry_device(
     hass: HomeAssistant, config_entry: UFPConfigEntry, device_entry: dr.DeviceEntry
 ) -> bool:
diff --git a/tests/components/unifiprotect/test_init.py b/tests/components/unifiprotect/test_init.py
index 0776feece54..17f67acdee6 100644
--- a/tests/components/unifiprotect/test_init.py
+++ b/tests/components/unifiprotect/test_init.py
@@ -113,6 +113,86 @@ async def test_unload(hass: HomeAssistant, ufp: MockUFPFixture, light: Light) ->
     assert ufp.api.async_disconnect_ws.called
 
 
+async def test_remove_entry(hass: HomeAssistant, ufp: MockUFPFixture) -> None:
+    """Test removal of unifiprotect entry clears session."""
+
+    await init_entry(hass, ufp, [])
+    assert ufp.entry.state is ConfigEntryState.LOADED
+
+    # Mock clear_session method
+    ufp.api.clear_session = AsyncMock()
+
+    await hass.config_entries.async_remove(ufp.entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Verify clear_session was called
+    assert ufp.api.clear_session.called
+
+
+async def test_remove_entry_not_loaded(
+    hass: HomeAssistant, ufp: MockUFPFixture
+) -> None:
+    """Test removal of unloaded unifiprotect entry still clears session."""
+
+    # Add entry but don't load it
+    ufp.entry.add_to_hass(hass)
+
+    # Mock clear_session method
+    ufp.api.clear_session = AsyncMock()
+
+    with patch(
+        "homeassistant.components.unifiprotect.async_create_api_client",
+        return_value=ufp.api,
+    ):
+        await hass.config_entries.async_remove(ufp.entry.entry_id)
+        await hass.async_block_till_done()
+
+    # Verify clear_session was called even though entry wasn't loaded
+    assert ufp.api.clear_session.called
+
+
+async def test_remove_entry_clear_session_fails(
+    hass: HomeAssistant, ufp: MockUFPFixture
+) -> None:
+    """Test removal succeeds even when clear_session fails."""
+    await init_entry(hass, ufp, [])
+    assert ufp.entry.state is ConfigEntryState.LOADED
+
+    # Mock clear_session to raise an exception
+    ufp.api.clear_session = AsyncMock(side_effect=PermissionError("Permission denied"))
+
+    # Should not raise - removal should succeed
+    await hass.config_entries.async_remove(ufp.entry.entry_id)
+    await hass.async_block_till_done()
+
+    # Verify clear_session was attempted
+    assert ufp.api.clear_session.called
+
+
+async def test_remove_entry_not_loaded_clear_session_fails(
+    hass: HomeAssistant, ufp: MockUFPFixture
+) -> None:
+    """Test removal succeeds when not loaded and clear_session fails."""
+    # Don't initialize the integration - entry is not loaded
+    ufp.entry.add_to_hass(hass)
+    assert ufp.entry.state is not ConfigEntryState.LOADED
+
+    # Mock clear_session to raise an exception for the temporary client
+    with patch(
+        "homeassistant.components.unifiprotect.async_create_api_client"
+    ) as mock_create:
+        mock_api = Mock(spec=ProtectApiClient)
+        mock_api.clear_session = AsyncMock(side_effect=OSError("Read-only file system"))
+        mock_create.return_value = mock_api
+
+        # Should not raise - removal should succeed
+        await hass.config_entries.async_remove(ufp.entry.entry_id)
+        await hass.async_block_till_done()
+
+        # Verify clear_session was attempted
+        assert mock_api.clear_session.called
+
+
 async def test_setup_too_old(
     hass: HomeAssistant, ufp: MockUFPFixture, old_nvr: NVR
 ) -> None: