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

Simplify aussie_broadband reauth flow (#124774)

Browse source 
* Simplify aussie_broadband config flow

* Apply suggestions from code review

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>

* Update config_flow.py

* Update config_flow.py

---------

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>
This commit is contained in:
epenet 2024-08-28 13:19:58 +02:00 • committed by GitHub
parent 633ff0ea42
commit a0089685dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,15 +99,11 @@ class AussieBroadbandConfigFlow(ConfigFlow, domain=DOMAIN):
}
if not (errors := await self.async_auth(data)):
entry = await self.async_set_unique_id(self._reauth_username.lower())
if entry:
self.hass.config_entries.async_update_entry(
entry,
data=data,
)
await self.hass.config_entries.async_reload(entry.entry_id)
return self.async_abort(reason="reauth_successful")
return self.async_create_entry(title=self._reauth_username, data=data)
entry = self.hass.config_entries.async_get_entry(
self.context["entry_id"]
)
assert entry
return self.async_update_reload_and_abort(entry, data=data)
return self.async_show_form(
step_id="reauth_confirm",

39
tests/components/aussie_broadband/test_config_flow.py
View file

@ -13,6 +13,8 @@ from homeassistant.data_entry_flow import FlowResultType
from .common import FAKE_DATA, FAKE_SERVICES
from tests.common import MockConfigEntry
TEST_USERNAME = FAKE_DATA[CONF_USERNAME]
TEST_PASSWORD = FAKE_DATA[CONF_PASSWORD]
@ -163,39 +165,20 @@ async def test_form_network_issue(hass: HomeAssistant) -> None:
async def test_reauth(hass: HomeAssistant) -> None:
"""Test reauth flow."""
# Test reauth but the entry doesn't exist
result1 = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": config_entries.SOURCE_REAUTH}, data=FAKE_DATA
mock_entry = MockConfigEntry(
domain=DOMAIN,
data=FAKE_DATA,
unique_id=FAKE_DATA[CONF_USERNAME],
)
with (
patch("aussiebb.asyncio.AussieBB.__init__", return_value=None),
patch("aussiebb.asyncio.AussieBB.login", return_value=True),
patch(
"aussiebb.asyncio.AussieBB.get_services", return_value=[FAKE_SERVICES[0]]
),
patch(
"homeassistant.components.aussie_broadband.async_setup_entry",
return_value=True,
),
):
result2 = await hass.config_entries.flow.async_configure(
result1["flow_id"],
{
CONF_PASSWORD: TEST_PASSWORD,
},
)
await hass.async_block_till_done()
assert result2["type"] is FlowResultType.CREATE_ENTRY
assert result2["title"] == TEST_USERNAME
assert result2["data"] == FAKE_DATA
mock_entry.add_to_hass(hass)
# Test failed reauth
result5 = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": config_entries.SOURCE_REAUTH},
context={
"source": config_entries.SOURCE_REAUTH,
"entry_id": mock_entry.entry_id,
},
data=FAKE_DATA,
)
assert result5["step_id"] == "reauth_confirm"