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

Try to reconnect to UniFi on 403 (#109067)

Browse source
This commit is contained in:
Robert Svensson 2024-01-29 21:39:15 +01:00 • committed by GitHub
parent 6f88cd3273
commit f1392f8519
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
homeassistant/components/unifi/__init__.py
View file

@ -36,8 +36,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
try: try:
api = await get_unifi_controller(hass, config_entry.data) api = await get_unifi_controller(hass, config_entry.data)
controller = UniFiController(hass, config_entry, api)
await controller.initialize()
except CannotConnect as err: except CannotConnect as err:
raise ConfigEntryNotReady from err raise ConfigEntryNotReady from err
@ -45,7 +43,10 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
except AuthenticationRequired as err: except AuthenticationRequired as err:
raise ConfigEntryAuthFailed from err raise ConfigEntryAuthFailed from err
controller = UniFiController(hass, config_entry, api)
await controller.initialize()
hass.data[UNIFI_DOMAIN][config_entry.entry_id] = controller hass.data[UNIFI_DOMAIN][config_entry.entry_id] = controller
await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS) await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
controller.async_update_device_registry() controller.async_update_device_registry()

9
homeassistant/components/unifi/controller.py
View file

@ -501,6 +501,7 @@ async def get_unifi_controller(
except ( except (
asyncio.TimeoutError, asyncio.TimeoutError,
aiounifi.BadGateway, aiounifi.BadGateway,
aiounifi.Forbidden,
aiounifi.ServiceUnavailable, aiounifi.ServiceUnavailable,
aiounifi.RequestError, aiounifi.RequestError,
aiounifi.ResponseError, aiounifi.ResponseError,
@ -510,14 +511,6 @@ async def get_unifi_controller(
) )
raise CannotConnect from err raise CannotConnect from err
except aiounifi.Forbidden as err:
LOGGER.warning(
"Access forbidden to UniFi Network at %s, check access rights: %s",
config[CONF_HOST],
err,
)
raise AuthenticationRequired from err
except aiounifi.LoginRequired as err: except aiounifi.LoginRequired as err:
LOGGER.warning( LOGGER.warning(
"Connected to UniFi Network at %s but login required: %s", "Connected to UniFi Network at %s but login required: %s",

2
tests/components/unifi/test_controller.py
View file

@ -461,11 +461,11 @@ async def test_get_unifi_controller_verify_ssl_false(hass: HomeAssistant) -> Non
[ [
(asyncio.TimeoutError, CannotConnect), (asyncio.TimeoutError, CannotConnect),
(aiounifi.BadGateway, CannotConnect), (aiounifi.BadGateway, CannotConnect),
(aiounifi.Forbidden, CannotConnect),
(aiounifi.ServiceUnavailable, CannotConnect), (aiounifi.ServiceUnavailable, CannotConnect),
(aiounifi.RequestError, CannotConnect), (aiounifi.RequestError, CannotConnect),
(aiounifi.ResponseError, CannotConnect), (aiounifi.ResponseError, CannotConnect),
(aiounifi.Unauthorized, AuthenticationRequired), (aiounifi.Unauthorized, AuthenticationRequired),
(aiounifi.Forbidden, AuthenticationRequired),
(aiounifi.LoginRequired, AuthenticationRequired), (aiounifi.LoginRequired, AuthenticationRequired),
(aiounifi.AiounifiException, AuthenticationRequired), (aiounifi.AiounifiException, AuthenticationRequired),
], ],