fix: add restart action to legacy OAuth repair (#2211)

* fix: add restart action to legacy OAuth repair

* fix: match Home Assistant fixable repair schema

* test: cover legacy OAuth repair lifecycle

---------

Co-authored-by: Claude <noreply@anthropic.com>

Author: kingpanther13

custom_components/ha_mcp_tools/embedded_setup.py

@@ -519,7 +519,7 @@ def _async_update_legacy_oauth_issue(hass: HomeAssistant, restart_needed: bool)
             hass,
             DOMAIN,
             ISSUE_LEGACY_OAUTH_RESTART,
-            is_fixable=False,
+            is_fixable=True,
             severity=ir.IssueSeverity.WARNING,
             translation_key=ISSUE_LEGACY_OAUTH_RESTART,
         )

custom_components/ha_mcp_tools/repairs.py

@@ -0,0 +1,51 @@
+"""Repair flows for the HA-MCP Custom Component."""
+
+from __future__ import annotations
+
+from typing import Any
+
+import voluptuous as vol
+from homeassistant import data_entry_flow
+from homeassistant.components.repairs import RepairsFlow
+from homeassistant.core import HomeAssistant
+
+
+class LegacyOAuthRestartRepairFlow(RepairsFlow):
+    """Confirm and apply a legacy OAuth change by restarting Home Assistant."""
+
+    async def async_step_init(
+        self, user_input: dict[str, str] | None = None
+    ) -> data_entry_flow.FlowResult:
+        """Open the restart confirmation step."""
+        return await self.async_step_confirm()
+
+    async def async_step_confirm(
+        self, user_input: dict[str, str] | None = None
+    ) -> data_entry_flow.FlowResult:
+        """Restart Home Assistant after the user confirms the repair."""
+        if user_input is not None:
+            # Wait for HA to validate the config and schedule the restart. If the
+            # service rejects the request, the exception prevents flow completion
+            # and the repair remains registered. The next startup independently
+            # re-evaluates whether the OAuth change is still pending.
+            await self.hass.services.async_call(
+                "homeassistant",
+                "restart",
+                {},
+                blocking=True,
+            )
+            return self.async_create_entry(data={})
+
+        return self.async_show_form(
+            step_id="confirm",
+            data_schema=vol.Schema({}),
+        )
+
+
+async def async_create_fix_flow(
+    hass: HomeAssistant,
+    issue_id: str,
+    data: dict[str, Any] | None,
+) -> RepairsFlow:
+    """Create the click-to-restart flow for the legacy OAuth repair."""
+    return LegacyOAuthRestartRepairFlow()

custom_components/ha_mcp_tools/strings.json

@@ -108,7 +108,14 @@
         },
         "legacy_oauth_restart": {
             "title": "Restart Home Assistant to apply the legacy OAuth change",
-            "description": "The legacy OAuth authentication mode registers its own /authorize and /token web endpoints, which Home Assistant can only bind or release when it fully restarts - whether you just turned this mode on, turned it off, or changed its Client ID/Secret. Restart Home Assistant (Settings - System - Restart) to apply the change; until then the previous behavior stays in effect."
+            "fix_flow": {
+                "step": {
+                    "confirm": {
+                        "title": "Restart Home Assistant?",
+                        "description": "Submitting this form will restart Home Assistant and apply the legacy OAuth change.\n\nClick **Submit** to restart now."
+                    }
+                }
+            }
         }
     },
     "selector": {

custom_components/ha_mcp_tools/translations/en.json

@@ -108,7 +108,14 @@
         },
         "legacy_oauth_restart": {
             "title": "Restart Home Assistant to apply the legacy OAuth change",
-            "description": "The legacy OAuth authentication mode registers its own /authorize and /token web endpoints, which Home Assistant can only bind or release when it fully restarts - whether you just turned this mode on, turned it off, or changed its Client ID/Secret. Restart Home Assistant (Settings - System - Restart) to apply the change; until then the previous behavior stays in effect."
+            "fix_flow": {
+                "step": {
+                    "confirm": {
+                        "title": "Restart Home Assistant?",
+                        "description": "Submitting this form will restart Home Assistant and apply the legacy OAuth change.\n\nClick **Submit** to restart now."
+                    }
+                }
+            }
         }
     },
     "selector": {

tests/src/unit/test_component_repairs.py

@@ -0,0 +1,125 @@
+"""Regression tests for the HA-MCP component's actionable restart repair.
+
+Issue #2210: the legacy OAuth restart warning must offer a fix flow that
+restarts Home Assistant instead of only allowing the issue to be ignored.
+"""
+
+from __future__ import annotations
+
+import json
+import sys
+from pathlib import Path
+from types import ModuleType
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+
+from ._embedded_stubs import install
+
+install()
+
+
+class _RepairsFlow:
+    """Small HA RepairsFlow stand-in with real flow-result behavior."""
+
+    def async_show_form(self, *, step_id, data_schema):
+        return {"type": "form", "step_id": step_id, "data_schema": data_schema}
+
+    def async_create_entry(self, *, data):
+        return {"type": "create_entry", "data": data}
+
+
+data_entry_flow = ModuleType("homeassistant.data_entry_flow")
+data_entry_flow.FlowResult = dict
+sys.modules["homeassistant.data_entry_flow"] = data_entry_flow
+sys.modules["homeassistant"].data_entry_flow = data_entry_flow
+
+repairs_platform = ModuleType("homeassistant.components.repairs")
+repairs_platform.RepairsFlow = _RepairsFlow
+sys.modules["homeassistant.components.repairs"] = repairs_platform
+
+
+def _load_repairs_module():
+    from custom_components.ha_mcp_tools import repairs
+
+    return repairs
+
+
+async def test_legacy_oauth_fix_flow_restarts_home_assistant_blocking():
+    """A missing/wrong restart service call would leave the repair unresolved."""
+    repairs = _load_repairs_module()
+    hass = MagicMock()
+    hass.services.async_call = AsyncMock()
+    flow = await repairs.async_create_fix_flow(
+        hass,
+        "legacy_oauth_restart",
+        None,
+    )
+    flow.hass = hass
+
+    result = await flow.async_step_confirm({})
+
+    hass.services.async_call.assert_awaited_once_with(
+        "homeassistant",
+        "restart",
+        {},
+        blocking=True,
+    )
+    assert result == {"type": "create_entry", "data": {}}
+
+
+async def test_legacy_oauth_fix_flow_prompts_before_restart():
+    """Opening the repair must show confirmation without restarting HA."""
+    repairs = _load_repairs_module()
+    hass = MagicMock()
+    hass.services.async_call = AsyncMock()
+    flow = await repairs.async_create_fix_flow(
+        hass,
+        "legacy_oauth_restart",
+        None,
+    )
+    flow.hass = hass
+
+    result = await flow.async_step_init()
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "confirm"
+    hass.services.async_call.assert_not_awaited()
+
+
+async def test_legacy_oauth_fix_flow_does_not_complete_rejected_restart():
+    """A rejected restart must leave the repair flow—and issue—unfinished."""
+    repairs = _load_repairs_module()
+    hass = MagicMock()
+    hass.services.async_call = AsyncMock(side_effect=RuntimeError("restart rejected"))
+    flow = await repairs.async_create_fix_flow(
+        hass,
+        "legacy_oauth_restart",
+        None,
+    )
+    flow.hass = hass
+    flow.async_create_entry = MagicMock()
+
+    with pytest.raises(RuntimeError, match="restart rejected"):
+        await flow.async_step_confirm({})
+
+    flow.async_create_entry.assert_not_called()
+
+
+@pytest.mark.parametrize(
+    "catalog_path",
+    [
+        "custom_components/ha_mcp_tools/strings.json",
+        "custom_components/ha_mcp_tools/translations/en.json",
+    ],
+)
+def test_legacy_oauth_repair_catalog_has_fix_flow(catalog_path):
+    """Both HA English catalogs must render the actionable confirmation flow."""
+    root = Path(__file__).parents[3]
+    catalog = json.loads((root / catalog_path).read_text())
+
+    issue = catalog["issues"]["legacy_oauth_restart"]
+    assert "description" not in issue
+    confirm = issue["fix_flow"]["step"]["confirm"]
+    assert confirm["title"]
+    assert confirm["description"]

tests/src/unit/test_embedded_setup.py

@@ -172,6 +172,9 @@ async def test_legacy_restart_needed_files_repair(self, fake_manager, monkeypatc
             if esetup.ISSUE_LEGACY_OAUTH_RESTART in c.args
         ]
         assert created, "legacy-OAuth restart repair was not filed"
+        assert created[0].kwargs["is_fixable"] is True
+        cleared = {c.args[2] for c in esetup.ir.async_delete_issue.call_args_list}
+        assert esetup.ISSUE_LEGACY_OAUTH_RESTART not in cleared
         # The same restart-needed verdict must thread into the connect-URL
         # surfacing so the log carries the first-enable "not live" caveat --
         # deleting that kwarg would silently drop the caveat.