evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up accessing storage.Store helper via hass (#72009)

Browse source
This commit is contained in:
Franck Nijhof 2022-05-17 18:45:57 +02:00 • committed by GitHub
parent c8f700c803
commit 5f44d0f8f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 101 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

12
homeassistant/auth/providers/homeassistant.py
View file

@ -14,6 +14,7 @@ from homeassistant.const import CONF_ID
from homeassistant.core import HomeAssistant, callback
from homeassistant.data_entry_flow import FlowResult
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.storage import Store
from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
from ..models import Credentials, UserMeta
@ -60,8 +61,8 @@ class Data:
def __init__(self, hass: HomeAssistant) -> None:
"""Initialize the user data store."""
self.hass = hass
self._store = hass.helpers.storage.Store(
STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
self._store = Store(
hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
)
self._data: dict[str, Any] | None = None
# Legacy mode will allow usernames to start/end with whitespace
@ -79,7 +80,9 @@ class Data:
async def async_load(self) -> None:
"""Load stored data."""
if (data := await self._store.async_load()) is None:
if (data := await self._store.async_load()) is None or not isinstance(
data, dict
):
data = {"users": []}
seen: set[str] = set()
@ -203,7 +206,8 @@ class Data:
async def async_save(self) -> None:
"""Save data."""
await self._store.async_save(self._data)
if self._data is not None:
await self._store.async_save(self._data)
@AUTH_PROVIDERS.register("homeassistant")