Skip to content

Add new helper for matching reauth/reconfigure config flows #127565

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.

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
merged 9 commits into from
Oct 8, 2024

Conversation

epenet
Copy link
Contributor

@epenet epenet commented Oct 4, 2024

Breaking change

Proposed change

When using reauth/reconfigure, there is currently no easy way to check that the unique_id of the original entry still matches what the new unique_id would be with the latest input.
This is especially obvious when reauth/reconfigure flows reuse existing functionnality from user flow.

I propose that we add this helper to make it easier to bail out if there is a mismatch:

Sample use:

await self.async_set_unique_id(uid)
if self.source == SOURCE_REAUTH:
    self._abort_if_unique_id_mismatch(reason="reauth_account_mismatch")
    return self.async_update_reload_and_abort(self._get_reauth_entry(), data=data)
self._abort_if_unique_id_configured()
return self.async_create_entry(title=uid, data=data)

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link

home-assistant bot commented Oct 4, 2024

Hey there @frenck, @joostlek, mind taking a look at this pull request as it has been labeled with an integration (spotify) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of spotify can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign spotify Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

Comment on lines +2447 to +2451
self.source == SOURCE_REAUTH
and self._get_reauth_entry().unique_id != self.unique_id
) or (
self.source == SOURCE_RECONFIGURE
and self._get_reconfigure_entry().unique_id != self.unique_id
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if we should assume the unique ID is being used for detecting these cases.

@frenck
Copy link
Member

frenck commented Oct 5, 2024

I think it makes sense to add this helper.

Can you elaborate on that? There is nothing in the PR description that explain the foundation behind it.

@epenet
Copy link
Contributor Author

epenet commented Oct 5, 2024

I think it makes sense to add this helper.

Can you elaborate on that? There is nothing in the PR description that explain the foundation behind it.

It's a pattern I've bumped into a few times. Axis and abode for example use this pattern.
It was used by integrations when reconfigure wasn't available.
I'll look for more examples on Monday

@epenet epenet marked this pull request as draft October 5, 2024 14:20
@epenet
Copy link
Contributor Author

epenet commented Oct 5, 2024

I think it makes sense to add this helper.

Can you elaborate on that? There is nothing in the PR description that explain the foundation behind it.

It's a pattern I've bumped into a few times. Axis and abode for example use this pattern. It was used by integrations when reconfigure wasn't available. I'll look for more examples on Monday

It's also partially linked to #127527

@epenet epenet mentioned this pull request Oct 6, 2024
19 tasks
@epenet
Copy link
Contributor Author

epenet commented Oct 6, 2024

I'll look for more examples on Monday

Here's another example I've just bumped into, which I think would benefit from this:
https://github.com/home-assistant/core/pull/127726/files#r1789215553

@epenet
Copy link
Contributor Author

epenet commented Oct 8, 2024

I think it makes sense to add this helper.

Can you elaborate on that? There is nothing in the PR description that explain the foundation behind it.

  • I have adjusted the PR description
  • I have added a documentation PR
  • I have added tests
  • I have applied the helper to three integrations that already have some of this logic implemented, to show the benefit
    • bmw_connected_drive
    • spotify
    • tesla_fleet

@epenet epenet marked this pull request as ready for review October 8, 2024 07:26
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly, I find the use-case/gain to shallow to add a helper. While helpers can be helpful, they can also make code harder to read / harder to follow (as one has to jump between more logic).

I'm not sure on this one. Going to ask for a second opinion from another reviewer.

../Frenck

@frenck frenck added the second-opinion-wanted Add this label when a reviewer needs a second opinion from another member. label Oct 8, 2024
@epenet
Copy link
Contributor Author

epenet commented Oct 8, 2024

Honestly, I find the use-case/gain to shallow to add a helper. While helpers can be helpful, they can also make code harder to read / harder to follow (as one has to jump between more logic).

I'm not sure on this one. Going to ask for a second opinion from another reviewer.

../Frenck

One more note: it is a mirror to self._abort_if_unique_id_configured that cannot be used inside reauth/reconfigure flows.

@MartinHjelmare
Copy link
Member

I think it's nice since it will help integrations to do the right thing. I think there are many integrations that have reauth flows where they don't check that the flow is reauthenticating matching flow data.

@MartinHjelmare MartinHjelmare removed the second-opinion-wanted Add this label when a reviewer needs a second opinion from another member. label Oct 8, 2024
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @epenet 👍

../Frenck

@frenck frenck merged commit 2c664ef into home-assistant:dev Oct 8, 2024
46 checks passed
@epenet epenet deleted the 20241004-1426 branch October 8, 2024 08:10
@github-actions github-actions bot locked and limited conversation to collaborators Oct 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants