Skip to content

Home Connect refactor OAuth exceptions - #175236

Merged
MartinHjelmare merged 2 commits into
home-assistant:devfrom
erwindouna:home-connect-refactor-oauth-exceptions
Jul 1, 2026
Merged

Home Connect refactor OAuth exceptions#175236
MartinHjelmare merged 2 commits into
home-assistant:devfrom
erwindouna:home-connect-refactor-oauth-exceptions

Conversation

@erwindouna

Copy link
Copy Markdown
Member

Breaking change

Proposed change

Refactors to use the to use the OAuth exceptions, instead of ClientResponseError.
Solves: #175235

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

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:
  • Link to developer documentation pull request:
  • Link to frontend pull request:

Checklist

  • I understand the code I am submitting and can explain how it works.
  • 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.
  • Any generated code has been carefully reviewed for correctness and compliance with project standards.

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 diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

To help with the load of incoming pull requests:

Copilot AI review requested due to automatic review settings July 1, 2026 07:45
@home-assistant home-assistant Bot added cla-signed code-quality integration: home_connect small-pr PRs with less than 30 lines. Top 200 Integration is ranked within the top 200 by usage labels Jul 1, 2026
@home-assistant

home-assistant Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

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

Code owner commands

Code owners of home_connect can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant mark-draft Mark the pull request as draft.
  • @home-assistant ready-for-review Remove the draft status from the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign home_connect Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant update-branch Update the pull request branch with the base branch.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) on the pull request.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR refactors the OAuth token-refresh error handling in the Home Connect integration's async_setup_entry. Instead of catching a raw aiohttp.ClientResponseError and inspecting its HTTP status to decide between ConfigEntryAuthFailed and ConfigEntryNotReady, it now catches the semantic OAuth2 exceptions (OAuth2TokenRequestReauthError, OAuth2TokenRequestError) that the Home Assistant OAuth2 helper already raises. This aligns Home Connect with the newer OAuth error-handling convention (per the referenced devblog and issue #175235) also used by SmartThings, Neato, and Google Assistant SDK.

Changes:

  • Import OAuth2TokenRequestError and OAuth2TokenRequestReauthError from homeassistant.exceptions.
  • Replace the status-based aiohttp.ClientResponseError branch with explicit exception handling: reauth error → ConfigEntryAuthFailed, other token request/client errors → ConfigEntryNotReady.

I verified the catch ordering is correct (OAuth2TokenRequestReauthError is caught before its superclass OAuth2TokenRequestError), that the trailing except aiohttp.ClientError is still necessary (raw client errors are not wrapped by the OAuth2 helper), and that the existing tests in test_init.py (400 → SETUP_ERROR, 500 → SETUP_RETRY, aiohttp.ClientErrorSETUP_RETRY) continue to reflect the new behavior. No issues were found.

@Diegorro98 Diegorro98 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thx!

Comment thread homeassistant/components/home_connect/__init__.py Outdated
@home-assistant
home-assistant Bot marked this pull request as draft July 1, 2026 10:26
@home-assistant

home-assistant Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@erwindouna
erwindouna marked this pull request as ready for review July 1, 2026 10:55
Copilot AI review requested due to automatic review settings July 1, 2026 10:55
@home-assistant
home-assistant Bot requested a review from MartinHjelmare July 1, 2026 10:55

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

@MartinHjelmare MartinHjelmare left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@MartinHjelmare
MartinHjelmare merged commit b936f1c into home-assistant:dev Jul 1, 2026
33 checks passed
@erwindouna
erwindouna deleted the home-connect-refactor-oauth-exceptions branch July 1, 2026 11:34
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 2, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants