Show domain in oauth2 error log (#109708)

* Show token url in oauth2 error log

* Fix tests

* Use domain
This commit is contained in:
Joost Lekkerkerker 2024-02-06 23:03:35 +01:00 committed by GitHub
parent fd5efd1f79
commit 59e9010b65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions

View File

@ -209,7 +209,10 @@ class LocalOAuth2Implementation(AbstractOAuth2Implementation):
error_code = error_response.get("error", "unknown") error_code = error_response.get("error", "unknown")
error_description = error_response.get("error_description", "unknown error") error_description = error_response.get("error_description", "unknown error")
_LOGGER.error( _LOGGER.error(
"Token request failed (%s): %s", error_code, error_description "Token request for %s failed (%s): %s",
self.domain,
error_code,
error_description,
) )
resp.raise_for_status() resp.raise_for_status()
return cast(dict, await resp.json()) return cast(dict, await resp.json())

View File

@ -395,19 +395,19 @@ async def test_abort_discovered_multiple(
HTTPStatus.UNAUTHORIZED, HTTPStatus.UNAUTHORIZED,
{}, {},
"oauth_unauthorized", "oauth_unauthorized",
"Token request failed (unknown): unknown", "Token request for oauth2_test failed (unknown): unknown",
), ),
( (
HTTPStatus.NOT_FOUND, HTTPStatus.NOT_FOUND,
{}, {},
"oauth_failed", "oauth_failed",
"Token request failed (unknown): unknown", "Token request for oauth2_test failed (unknown): unknown",
), ),
( (
HTTPStatus.INTERNAL_SERVER_ERROR, HTTPStatus.INTERNAL_SERVER_ERROR,
{}, {},
"oauth_failed", "oauth_failed",
"Token request failed (unknown): unknown", "Token request for oauth2_test failed (unknown): unknown",
), ),
( (
HTTPStatus.BAD_REQUEST, HTTPStatus.BAD_REQUEST,
@ -417,7 +417,7 @@ async def test_abort_discovered_multiple(
"error_uri": "See the full API docs at https://authorization-server.com/docs/access_token", "error_uri": "See the full API docs at https://authorization-server.com/docs/access_token",
}, },
"oauth_failed", "oauth_failed",
"Token request failed (invalid_request): Request was missing the", "Token request for oauth2_test failed (invalid_request): Request was missing the",
), ),
], ],
) )
@ -540,7 +540,7 @@ async def test_abort_if_oauth_token_closing_error(
with caplog.at_level(logging.DEBUG): with caplog.at_level(logging.DEBUG):
result = await hass.config_entries.flow.async_configure(result["flow_id"]) result = await hass.config_entries.flow.async_configure(result["flow_id"])
assert "Token request failed (unknown): unknown" in caplog.text assert "Token request for oauth2_test failed (unknown): unknown" in caplog.text
assert result["type"] == data_entry_flow.FlowResultType.ABORT assert result["type"] == data_entry_flow.FlowResultType.ABORT
assert result["reason"] == "oauth_unauthorized" assert result["reason"] == "oauth_unauthorized"