jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-30 08:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use HassKey in application_credentials (#127069)

Browse Source 
Use HassKey in application_credentials
This commit is contained in:
epenet 2024-09-30 09:17:33 +02:00 committed by GitHub
parent 812be801ce
commit 20d4031ed4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/application_credentials/__init__.py
View File

@ -36,6 +36,7 @@ from homeassistant.loader import (
async_get_integration, async_get_integration,
) )
from homeassistant.util import slugify from homeassistant.util import slugify
from homeassistant.util.hass_dict import HassKey
__all__ = ["ClientCredential", "AuthorizationServer", "async_import_client_credential"] __all__ = ["ClientCredential", "AuthorizationServer", "async_import_client_credential"]
@ -45,7 +46,7 @@ DOMAIN = "application_credentials"
STORAGE_KEY = DOMAIN STORAGE_KEY = DOMAIN
STORAGE_VERSION = 1 STORAGE_VERSION = 1
DATA_STORAGE = "storage" DATA_COMPONENT: HassKey[ApplicationCredentialsStorageCollection] = HassKey(DOMAIN)
CONF_AUTH_DOMAIN = "auth_domain" CONF_AUTH_DOMAIN = "auth_domain"
DEFAULT_IMPORT_NAME = "Import from configuration.yaml" DEFAULT_IMPORT_NAME = "Import from configuration.yaml"
@ -150,7 +151,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
id_manager, id_manager,
) )
await storage_collection.async_load() await storage_collection.async_load()
hass.data[DOMAIN][DATA_STORAGE] = storage_collection hass.data[DATA_COMPONENT] = storage_collection
collection.DictStorageCollectionWebsocket( collection.DictStorageCollectionWebsocket(
storage_collection, DOMAIN, DOMAIN, CREATE_FIELDS, UPDATE_FIELDS storage_collection, DOMAIN, DOMAIN, CREATE_FIELDS, UPDATE_FIELDS
@ -175,7 +176,6 @@ async def async_import_client_credential(
"""Import an existing credential from configuration.yaml.""" """Import an existing credential from configuration.yaml."""
if DOMAIN not in hass.data: if DOMAIN not in hass.data:
raise ValueError("Integration 'application_credentials' not setup") raise ValueError("Integration 'application_credentials' not setup")
storage_collection = hass.data[DOMAIN][DATA_STORAGE]
item = { item = {
CONF_DOMAIN: domain, CONF_DOMAIN: domain,
CONF_CLIENT_ID: credential.client_id, CONF_CLIENT_ID: credential.client_id,
@ -183,7 +183,7 @@ async def async_import_client_credential(
CONF_AUTH_DOMAIN: auth_domain if auth_domain else domain, CONF_AUTH_DOMAIN: auth_domain if auth_domain else domain,
} }
item[CONF_NAME] = credential.name if credential.name else DEFAULT_IMPORT_NAME item[CONF_NAME] = credential.name if credential.name else DEFAULT_IMPORT_NAME
await storage_collection.async_import_item(item) await hass.data[DATA_COMPONENT].async_import_item(item)
class AuthImplementation(config_entry_oauth2_flow.LocalOAuth2Implementation): class AuthImplementation(config_entry_oauth2_flow.LocalOAuth2Implementation):
@ -222,8 +222,7 @@ async def _async_provide_implementation(
if not platform: if not platform:
return [] return []
storage_collection = hass.data[DOMAIN][DATA_STORAGE] credentials = hass.data[DATA_COMPONENT].async_client_credentials(domain)
credentials = storage_collection.async_client_credentials(domain)
if hasattr(platform, "async_get_auth_implementation"): if hasattr(platform, "async_get_auth_implementation"):
return [ return [
await platform.async_get_auth_implementation(hass, auth_domain, credential) await platform.async_get_auth_implementation(hass, auth_domain, credential)
@ -246,8 +245,7 @@ async def _async_config_entry_app_credentials(
): ):
return None return None
storage_collection = hass.data[DOMAIN][DATA_STORAGE] for item in hass.data[DATA_COMPONENT].async_items():
for item in storage_collection.async_items():
item_id = item[CONF_ID] item_id = item[CONF_ID]
if ( if (
item[CONF_DOMAIN] == config_entry.domain item[CONF_DOMAIN] == config_entry.domain