evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicate oauth2 token validity check (#128419)

Browse source 
* remove duplicate validity check

* Apply suggestions from code review

* add leftover

---------

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
This commit is contained in:
Christopher Fenner 2024-10-16 11:42:44 +02:00 • committed by GitHub
parent 8ae8fa7ec9
commit 144454b8c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/components/electric_kiwi/api.py
View file

@ -27,7 +27,6 @@ class AsyncConfigEntryAuth(AbstractAuth):
async def async_get_access_token(self) -> str:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return cast(str, self._oauth_session.token["access_token"])

3
homeassistant/components/fitbit/api.py
View file

@ -156,8 +156,7 @@ class OAuthFitbitApi(FitbitApi):
async def async_get_access_token(self) -> dict[str, Any]:
"""Return a valid access token for the Fitbit API."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return self._oauth_session.token

3
homeassistant/components/google_tasks/api.py
View file

@ -46,8 +46,7 @@ class AsyncConfigEntryAuth:
async def async_get_access_token(self) -> str:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return self._oauth_session.token[CONF_ACCESS_TOKEN]
async def _get_service(self) -> Resource:

4
homeassistant/components/iotty/api.py
View file

@ -33,8 +33,6 @@ class IottyProxy(CloudApi):
async def async_get_access_token(self) -> Any:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return self._oauth_session.token["access_token"]

3
homeassistant/components/lyric/api.py
View file

@ -36,8 +36,7 @@ class ConfigEntryLyricClient(LyricClient):
async def async_get_access_token(self):
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return self._oauth_session.token["access_token"]

3
homeassistant/components/monzo/api.py
View file

@ -20,7 +20,6 @@ class AuthenticatedMonzoAPI(AbstractMonzoApi):
async def async_get_access_token(self) -> str:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return str(self._oauth_session.token["access_token"])

3
homeassistant/components/myuplink/api.py
View file

@ -26,7 +26,6 @@ class AsyncConfigEntryAuth(AbstractAuth):
async def async_get_access_token(self) -> str:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return cast(str, self._oauth_session.token["access_token"])

3
homeassistant/components/nest/api.py
View file

@ -44,8 +44,7 @@ class AsyncConfigEntryAuth(AbstractAuth):
async def async_get_access_token(self) -> str:
"""Return a valid access token for SDM API."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return cast(str, self._oauth_session.token["access_token"])
async def async_get_creds(self) -> Credentials:

3
homeassistant/components/netatmo/api.py
View file

@ -40,6 +40,5 @@ class AsyncConfigEntryNetatmoAuth(pyatmo.AbstractAsyncAuth):
async def async_get_access_token(self) -> str:
"""Return a valid access token for Netatmo API."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return cast(str, self._oauth_session.token["access_token"])

3
homeassistant/components/point/api.py
View file

@ -20,7 +20,6 @@ class AsyncConfigEntryAuth(pypoint.AbstractAuth):
async def async_get_access_token(self) -> str:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return self._oauth_session.token["access_token"]

3
homeassistant/components/weheat/api.py
View file

@ -23,7 +23,6 @@ class AsyncConfigEntryAuth(AbstractAuth):
async def async_get_access_token(self) -> str:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return self._oauth_session.token[CONF_ACCESS_TOKEN]

3
script/scaffold/templates/config_flow_oauth2/integration/api.py
View file

@ -49,7 +49,6 @@ class AsyncConfigEntryAuth(my_pypi_package.AbstractAuth):
async def async_get_access_token(self) -> str:
"""Return a valid access token."""
if not self._oauth_session.valid_token:
await self._oauth_session.async_ensure_token_valid()
await self._oauth_session.async_ensure_token_valid()
return self._oauth_session.token["access_token"]