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

Defer google calendar integration reload to a task to avoid races of reload during setup (#72608)

Browse source
This commit is contained in:
Allen Porter 2022-05-28 20:28:22 -07:00 • committed by GitHub
parent 6a3d2e54a2
commit e7e48cd9f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 101 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
homeassistant/components/google/api.py
View file

@ -19,6 +19,7 @@ from oauth2client.client import (
)
from homeassistant.components.application_credentials import AuthImplementation
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import CALLBACK_TYPE, HomeAssistant
from homeassistant.helpers import config_entry_oauth2_flow
from homeassistant.helpers.event import async_track_time_interval
@ -127,8 +128,17 @@ class DeviceFlow:
)
def get_feature_access(hass: HomeAssistant) -> FeatureAccess:
def get_feature_access(
hass: HomeAssistant, config_entry: ConfigEntry | None = None
) -> FeatureAccess:
"""Return the desired calendar feature access."""
if (
config_entry
and config_entry.options
and CONF_CALENDAR_ACCESS in config_entry.options
):
return FeatureAccess[config_entry.options[CONF_CALENDAR_ACCESS]]
# This may be called during config entry setup without integration setup running when there
# is no google entry in configuration.yaml
return cast(