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

Aladdin connect unload cleanup (#71948)

Browse source
This commit is contained in:
mkmer 2022-05-23 08:13:21 -04:00 • committed by GitHub
parent fad766322c
commit 071f6d7099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 51 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

14
homeassistant/components/aladdin_connect/config_flow.py
View file

@ -33,13 +33,9 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
"""
acc = AladdinConnectClient(data[CONF_USERNAME], data[CONF_PASSWORD])
try:
login = await hass.async_add_executor_job(acc.login)
except (TypeError, KeyError, NameError, ValueError) as ex:
raise ConnectionError from ex
else:
if not login:
raise InvalidAuth
login = await hass.async_add_executor_job(acc.login)
if not login:
raise InvalidAuth
class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@ -72,8 +68,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
try:
await validate_input(self.hass, data)
except ConnectionError:
errors["base"] = "cannot_connect"
except InvalidAuth:
errors["base"] = "invalid_auth"
else:
@ -107,8 +101,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
try:
await validate_input(self.hass, user_input)
except ConnectionError:
errors["base"] = "cannot_connect"
except InvalidAuth:
errors["base"] = "invalid_auth"