mirror of
https://github.com/home-assistant/core.git
synced 2025-07-21 04:07:08 +00:00
Simplify aussie_broadband reauth flow (#124774)
* 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:
parent
633ff0ea42
commit
a0089685dd
@ -99,15 +99,11 @@ class AussieBroadbandConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
}
|
}
|
||||||
|
|
||||||
if not (errors := await self.async_auth(data)):
|
if not (errors := await self.async_auth(data)):
|
||||||
entry = await self.async_set_unique_id(self._reauth_username.lower())
|
entry = self.hass.config_entries.async_get_entry(
|
||||||
if entry:
|
self.context["entry_id"]
|
||||||
self.hass.config_entries.async_update_entry(
|
)
|
||||||
entry,
|
assert entry
|
||||||
data=data,
|
return self.async_update_reload_and_abort(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)
|
|
||||||
|
|
||||||
return self.async_show_form(
|
return self.async_show_form(
|
||||||
step_id="reauth_confirm",
|
step_id="reauth_confirm",
|
||||||
|
@ -13,6 +13,8 @@ from homeassistant.data_entry_flow import FlowResultType
|
|||||||
|
|
||||||
from .common import FAKE_DATA, FAKE_SERVICES
|
from .common import FAKE_DATA, FAKE_SERVICES
|
||||||
|
|
||||||
|
from tests.common import MockConfigEntry
|
||||||
|
|
||||||
TEST_USERNAME = FAKE_DATA[CONF_USERNAME]
|
TEST_USERNAME = FAKE_DATA[CONF_USERNAME]
|
||||||
TEST_PASSWORD = FAKE_DATA[CONF_PASSWORD]
|
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:
|
async def test_reauth(hass: HomeAssistant) -> None:
|
||||||
"""Test reauth flow."""
|
"""Test reauth flow."""
|
||||||
|
mock_entry = MockConfigEntry(
|
||||||
# Test reauth but the entry doesn't exist
|
domain=DOMAIN,
|
||||||
result1 = await hass.config_entries.flow.async_init(
|
data=FAKE_DATA,
|
||||||
DOMAIN, context={"source": config_entries.SOURCE_REAUTH}, data=FAKE_DATA
|
unique_id=FAKE_DATA[CONF_USERNAME],
|
||||||
)
|
)
|
||||||
|
mock_entry.add_to_hass(hass)
|
||||||
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
|
|
||||||
|
|
||||||
# Test failed reauth
|
# Test failed reauth
|
||||||
result5 = await hass.config_entries.flow.async_init(
|
result5 = await hass.config_entries.flow.async_init(
|
||||||
DOMAIN,
|
DOMAIN,
|
||||||
context={"source": config_entries.SOURCE_REAUTH},
|
context={
|
||||||
|
"source": config_entries.SOURCE_REAUTH,
|
||||||
|
"entry_id": mock_entry.entry_id,
|
||||||
|
},
|
||||||
data=FAKE_DATA,
|
data=FAKE_DATA,
|
||||||
)
|
)
|
||||||
assert result5["step_id"] == "reauth_confirm"
|
assert result5["step_id"] == "reauth_confirm"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user