From c18dc9b63b68bc83a02f0ac7b708a0cfdaf81314 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Tue, 19 Aug 2025 14:19:10 +0200
Subject: [PATCH] Fix icloud service calls (#150881)

---
 homeassistant/components/icloud/services.py | 23 +++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/icloud/services.py b/homeassistant/components/icloud/services.py
index dbb843e8216..44a2e5d52f7 100644
--- a/homeassistant/components/icloud/services.py
+++ b/homeassistant/components/icloud/services.py
@@ -8,7 +8,7 @@ from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.util import slugify
 
-from .account import IcloudAccount
+from .account import IcloudAccount, IcloudConfigEntry
 from .const import (
     ATTR_ACCOUNT,
     ATTR_DEVICE_NAME,
@@ -92,8 +92,10 @@ def lost_device(service: ServiceCall) -> None:
 def update_account(service: ServiceCall) -> None:
     """Call the update function of an iCloud account."""
     if (account := service.data.get(ATTR_ACCOUNT)) is None:
-        for account in service.hass.data[DOMAIN].values():
-            account.keep_alive()
+        # Update all accounts when no specific account is provided
+        entry: IcloudConfigEntry
+        for entry in service.hass.config_entries.async_loaded_entries(DOMAIN):
+            entry.runtime_data.keep_alive()
     else:
         _get_account(service.hass, account).keep_alive()
 
@@ -102,17 +104,12 @@ def _get_account(hass: HomeAssistant, account_identifier: str) -> IcloudAccount:
     if account_identifier is None:
         return None
 
-    icloud_account: IcloudAccount | None = hass.data[DOMAIN].get(account_identifier)
-    if icloud_account is None:
-        for account in hass.data[DOMAIN].values():
-            if account.username == account_identifier:
-                icloud_account = account
+    entry: IcloudConfigEntry
+    for entry in hass.config_entries.async_loaded_entries(DOMAIN):
+        if entry.runtime_data.username == account_identifier:
+            return entry.runtime_data
 
-    if icloud_account is None:
-        raise ValueError(
-            f"No iCloud account with username or name {account_identifier}"
-        )
-    return icloud_account
+    raise ValueError(f"No iCloud account with username or name {account_identifier}")
 
 
 @callback