code · pull · Jul 31, 2025 · Jul 31, 2025 · Jul 31, 2025 · Jul 31, 2025
diff --git a/homeassistant/auth/models.py b/homeassistant/auth/models.py
@@ -33,7 +33,10 @@ class AuthFlowContext(FlowContext, total=False):
     redirect_uri: str
 
 
-AuthFlowResult = FlowResult[AuthFlowContext, tuple[str, str]]
+class AuthFlowResult(FlowResult[AuthFlowContext, tuple[str, str]], total=False):
+    """Typed result dict for auth flow."""
+
+    result: Credentials  # Only present if type is CREATE_ENTRY
 
 
 @attr.s(slots=True)

diff --git a/homeassistant/components/auth/login_flow.py b/homeassistant/components/auth/login_flow.py
@@ -268,7 +268,7 @@ async def _async_flow_result_to_response(
         result.pop("data")
         result.pop("context")
 
-        result_obj: Credentials = result.pop("result")
+        result_obj = result.pop("result")
 
         # Result can be None if credential was never linked to a user before.
         user = await hass.auth.async_get_user_by_credentials(result_obj)
@@ -281,7 +281,8 @@ async def _async_flow_result_to_response(
             )
 
         process_success_login(request)
-        result["result"] = self._store_result(client_id, result_obj)
+        # We overwrite the Credentials object with the string code to retrieve it.
+        result["result"] = self._store_result(client_id, result_obj)  # type: ignore[typeddict-item]
 
         return self.json(result)
 

diff --git a/homeassistant/components/config/config_entries.py b/homeassistant/components/config/config_entries.py
@@ -146,8 +146,9 @@ def _prepare_config_flow_result_json(
         return prepare_result_json(result)
 
     data = result.copy()
-    entry: config_entries.ConfigEntry = data["result"]
-    data["result"] = entry.as_json_fragment
+    entry: config_entries.ConfigEntry = data["result"]  # type: ignore[typeddict-item]
+    # We overwrite the ConfigEntry object with its json representation.
+    data["result"] = entry.as_json_fragment  # type: ignore[typeddict-unknown-key]
     data.pop("data")
     data.pop("context")
     return data

diff --git a/homeassistant/components/growatt_server/manifest.json b/homeassistant/components/growatt_server/manifest.json
@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/growatt_server",
   "iot_class": "cloud_polling",
   "loggers": ["growattServer"],
-  "requirements": ["growattServer==1.6.0"]
+  "requirements": ["growattServer==1.7.1"]
 }
diff --git a/homeassistant/components/repairs/issue_handler.py b/homeassistant/components/repairs/issue_handler.py
@@ -89,8 +89,6 @@ async def async_finish_flow(
         """
         if result.get("type") != data_entry_flow.FlowResultType.ABORT:
             ir.async_delete_issue(self.hass, flow.handler, flow.init_data["issue_id"])
-        if "result" not in result:
-            result["result"] = None
         return result
 
 

diff --git a/homeassistant/components/xiaomi_ble/manifest.json b/homeassistant/components/xiaomi_ble/manifest.json
@@ -24,5 +24,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/xiaomi_ble",
   "iot_class": "local_push",
-  "requirements": ["xiaomi-ble==1.1.0"]
+  "requirements": ["xiaomi-ble==1.2.0"]
 }
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
@@ -298,8 +298,10 @@ class ConfigFlowContext(FlowContext, total=False):
 class ConfigFlowResult(FlowResult[ConfigFlowContext, str], total=False):
     """Typed result dict for config flow."""
 
+    # Extra keys, only present if type is CREATE_ENTRY
     minor_version: int
     options: Mapping[str, Any]
+    result: ConfigEntry
     subentries: Iterable[ConfigSubentryData]
     version: int
 
@@ -3345,7 +3347,6 @@ async def async_finish_flow(
             ),
         )
 
-        result["result"] = True
         return result
 
 
@@ -3508,7 +3509,6 @@ async def async_finish_flow(
             ):
                 self.hass.config_entries.async_schedule_reload(entry.entry_id)
 
-        result["result"] = True
         return result
 
     async def _async_setup_preview(

diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
@@ -142,7 +142,6 @@ class FlowResult(TypedDict, Generic[_FlowContextT, _HandlerT], total=False):
     progress_task: asyncio.Task[Any] | None
     reason: str
     required: bool
-    result: Any
     step_id: str
     title: str
     translation_domain: str

diff --git a/homeassistant/helpers/data_entry_flow.py b/homeassistant/helpers/data_entry_flow.py
@@ -35,7 +35,7 @@ def _prepare_result_json(
         """Convert result to JSON."""
         if result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY:
             data = result.copy()
-            data.pop("result")
+            assert "result" not in result
             data.pop("data")
             data.pop("context")
             return data

diff --git a/requirements_all.txt b/requirements_all.txt
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
diff --git a/tests/components/cloud/test_repairs.py b/tests/components/cloud/test_repairs.py
@@ -236,7 +236,6 @@ async def test_legacy_subscription_repair_flow_timeout(
         "handler": "cloud",
         "reason": "operation_took_too_long",
         "description_placeholders": None,
-        "result": None,
     }
 
     assert issue_registry.async_get_issue(

diff --git a/tests/components/generic_hygrostat/snapshots/test_config_flow.ambr b/tests/components/generic_hygrostat/snapshots/test_config_flow.ambr
@@ -15,7 +15,6 @@
 # ---
 # name: test_options[create_entry]
   FlowResultSnapshot({
-    'result': True,
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
   })
 # ---

diff --git a/tests/components/generic_thermostat/snapshots/test_config_flow.ambr b/tests/components/generic_thermostat/snapshots/test_config_flow.ambr
@@ -39,7 +39,6 @@
 # ---
 # name: test_options[create_entry]
   FlowResultSnapshot({
-    'result': True,
     'type': <FlowResultType.CREATE_ENTRY: 'create_entry'>,
   })
 # ---

diff --git a/tests/components/hassio/test_repairs.py b/tests/components/hassio/test_repairs.py
@@ -471,7 +471,6 @@ async def test_mount_failed_repair_flow_error(
         "flow_id": flow_id,
         "handler": "hassio",
         "reason": "apply_suggestion_fail",
-        "result": None,
         "description_placeholders": None,
     }
 

diff --git a/tests/components/homeassistant_sky_connect/test_config_flow.py b/tests/components/homeassistant_sky_connect/test_config_flow.py
@@ -211,7 +211,6 @@ async def mock_async_step_pick_firmware_zigbee(self, data):
         )
 
     assert create_result["type"] is FlowResultType.CREATE_ENTRY
-    assert create_result["result"] is True
 
     assert config_entry.data == {
         "firmware": "ezsp",

diff --git a/tests/components/homeassistant_yellow/test_config_flow.py b/tests/components/homeassistant_yellow/test_config_flow.py
@@ -406,7 +406,6 @@ async def mock_install_firmware_step(
         )
 
     assert create_result["type"] is FlowResultType.CREATE_ENTRY
-    assert create_result["result"] is True
 
     assert config_entry.data == {
         "firmware": fw_type.value,

diff --git a/tests/components/jewish_calendar/test_config_flow.py b/tests/components/jewish_calendar/test_config_flow.py
@@ -110,7 +110,6 @@ async def test_options_reconfigure(
             CONF_CANDLE_LIGHT_MINUTES: DEFAULT_CANDLE_LIGHT + 1,
         },
     )
-    assert result["result"]
 
     # The value of the "upcoming_shabbat_candle_lighting" sensor should be the new value
     assert config_entry.options[CONF_CANDLE_LIGHT_MINUTES] == DEFAULT_CANDLE_LIGHT + 1

diff --git a/tests/components/repairs/test_websocket_api.py b/tests/components/repairs/test_websocket_api.py
@@ -599,7 +599,6 @@ async def test_fix_issue_aborted(
         "handler": "fake_integration",
         "reason": "not_given",
         "description_placeholders": None,
-        "result": None,
     }
 
     await ws_client.send_json({"id": 4, "type": "repairs/list_issues"})