Skip to content
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

Show domain in oauth2 error log #109708

Merged
merged 3 commits into from
Feb 6, 2024

Conversation

joostlek
Copy link
Member

@joostlek joostlek commented Feb 5, 2024

Proposed change

Show token url in oauth2 error log. This would help pinpointing an issue to an integration.

image

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:

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.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@joostlek joostlek added this to the 2024.2.0 milestone Feb 5, 2024
@joostlek joostlek requested a review from a team as a code owner February 5, 2024 13:40
@home-assistant home-assistant bot added bugfix cla-signed core small-pr PRs with less than 30 lines. labels Feb 5, 2024
Copy link
Member

@MartinHjelmare MartinHjelmare left a comment

Choose a reason for hiding this comment

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

Please adjust the tests.

@home-assistant home-assistant bot marked this pull request as draft February 5, 2024 16:14
@home-assistant
Copy link

home-assistant bot commented Feb 5, 2024

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.

@joostlek joostlek marked this pull request as ready for review February 5, 2024 18:05
@@ -209,7 +209,10 @@ async def _token_request(self, data: dict) -> dict:
error_code = error_response.get("error", "unknown")
error_description = error_response.get("error_description", "unknown error")
_LOGGER.error(
"Token request failed (%s): %s", error_code, error_description
"Token request to %s failed (%s): %s",
self.token_url,
Copy link
Member

Choose a reason for hiding this comment

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

What I don't like is that the URL is printed first, error code/description last. The user might just skip over that.

I also don't know if the token URL is that important. It's usually bad redirect URI or client ID/secret.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's a way to pinpoint which integration this is causing it. My own prod currently struggles from the message shown in the description and I currently don't know which integration exactly is causing this. And there is a debug logger above this, so I can know this by enabling debug logging for homeassistant.helpers.config_entry_oauth2_flow, but that's an extra step. As in, when helping people, being able to pinpoint the integration in one logging entry is quite valuable.

Copy link
Member

Choose a reason for hiding this comment

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

How about using self.domain ?
The URL is an implementation detail that the user generally does not know about.
I think the domain is generally more recognizable.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh haven't checked if that's available

Copy link
Member

Choose a reason for hiding this comment

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

I think the latest change to use the domain settles the comment.

Copy link
Member

@MartinHjelmare MartinHjelmare left a comment

Choose a reason for hiding this comment

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

Thanks!

@ludeeus ludeeus changed the title Show token url in oauth2 error log Show domain in oauth2 error log Feb 6, 2024
@MartinHjelmare MartinHjelmare merged commit 59e9010 into home-assistant:dev Feb 6, 2024
53 checks passed
@joostlek joostlek deleted the oauth2-error branch February 6, 2024 22:34
frenck pushed a commit that referenced this pull request Feb 7, 2024
* Show token url in oauth2 error log

* Fix tests

* Use domain
@github-actions github-actions bot locked and limited conversation to collaborators Feb 8, 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.

5 participants