Skip to content

Fix SimpliSafe re-auth flow #41805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 4 commits into from
Oct 15, 2020
Merged

Fix SimpliSafe re-auth flow #41805

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fbe809
Fix SimpliSafe re-auth flow
bachya Oct 13, 2020
18c0bd0
Code review
bachya Oct 14, 2020
fb5166b
Update homeassistant/components/simplisafe/__init__.py
balloob Oct 15, 2020
6c20ca5
Black
balloob Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions homeassistant/components/simplisafe/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
)
import voluptuous as vol

from homeassistant.config_entries import SOURCE_IMPORT
from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH
from homeassistant.const import (
ATTR_CODE,
CONF_CODE,
Expand Down Expand Up @@ -374,8 +374,7 @@ async def async_unload_entry(hass, entry):

async def async_update_options(hass, config_entry):
"""Handle an options update."""
simplisafe = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
simplisafe.options = config_entry.options
await hass.config_entries.async_reload(config_entry.entry_id)


class SimpliSafeWebsocket:
Expand Down Expand Up @@ -539,17 +538,26 @@ async def update_system(system):
for result in results:
if isinstance(result, InvalidCredentialsError):
if self._emergency_refresh_token_used:
LOGGER.error(
"Token disconnected or invalid. Please re-auth the "
"SimpliSafe integration in HASS"
)
self._hass.async_create_task(
self._hass.config_entries.flow.async_init(
DOMAIN,
context={"source": "reauth"},
data=self._config_entry.data,
matching_flows = [
flow
for flow in self._hass.config_entries.flow.async_progress()
if flow["context"].get("source") == SOURCE_REAUTH
and flow["context"].get("unique_id")
== self._config_entry.unique_id
]

if not matching_flows:
self._hass.async_create_task(
self._hass.config_entries.flow.async_init(
DOMAIN,
context={
"source": SOURCE_REAUTH,
"unique_id": self._config_entry.unique_id,
},
data=self._config_entry.data,
)
)
)

return

LOGGER.warning("SimpliSafe cloud error; trying stored refresh token")
Expand Down