Cool_Tools/pyhOn
1
0
Fork 0
mirror of https://github.com/Andre0512/pyhOn.git synced 2024-12-01 01:27:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix token refresh problems

Browse Source
This commit is contained in:
Andre Basche 2023-04-11 17:09:02 +02:00
parent b4b782c52c
commit 8c832b44cd
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyhon/connection/auth.py
View File

@ -194,7 +194,9 @@ class HonAuth:
return False return False
if not await self._get_token(url): if not await self._get_token(url):
return False return False
return await self._api_auth()
async def _api_auth(self):
post_headers = {"id-token": self._id_token} post_headers = {"id-token": self._id_token}
data = self._device.get() data = self._device.get()
async with self._session.post( async with self._session.post(
@ -225,4 +227,4 @@ class HonAuth:
data = await response.json() data = await response.json()
self._id_token = data["id_token"] self._id_token = data["id_token"]
self._access_token = data["access_token"] self._access_token = data["access_token"]
return True return await self._api_auth()

12
pyhon/connection/handler.py
View File

@ -75,17 +75,18 @@ class HonConnectionHandler(HonBaseConnectionHandler):
self._request_headers["id-token"] = self._auth.id_token self._request_headers["id-token"] = self._auth.id_token
else: else:
raise HonAuthenticationError("Can't login") raise HonAuthenticationError("Can't login")
return {h: v for h, v in self._request_headers.items() if h not in headers} return headers | self._request_headers
@asynccontextmanager @asynccontextmanager
async def _intercept(self, method, *args, loop=0, **kwargs): async def _intercept(self, method, *args, loop=0, **kwargs):
kwargs["headers"] = await self._check_headers(kwargs.get("headers", {})) kwargs["headers"] = await self._check_headers(kwargs.get("headers", {}))
async with method(*args, **kwargs) as response: async with method(*args, **kwargs) as response:
if response.status == 403 and not loop: if response.status in [401, 403] and loop == 0:
_LOGGER.info("Try refreshing token...") _LOGGER.info("Try refreshing token...")
await self._auth.refresh() await self._auth.refresh()
yield await self._intercept(method, *args, loop=loop + 1, **kwargs) async with self._intercept(method, *args, loop=loop + 1, **kwargs) as result:
elif response.status == 403 and loop < 2: yield result
elif response.status in [401, 403] and loop == 1:
_LOGGER.warning( _LOGGER.warning(
"%s - Error %s - %s", "%s - Error %s - %s",
response.request_info.url, response.request_info.url,
@ -93,7 +94,8 @@ class HonConnectionHandler(HonBaseConnectionHandler):
await response.text(), await response.text(),
) )
await self.create() await self.create()
yield await self._intercept(method, *args, loop=loop + 1, **kwargs) async with self._intercept(method, *args, loop=loop + 1, **kwargs) as result:
yield result
elif loop >= 2: elif loop >= 2:
_LOGGER.error( _LOGGER.error(
"%s - Error %s - %s", "%s - Error %s - %s",

2
pyhon/parameter.py
View File

@ -5,7 +5,7 @@ def str_to_float(string):
try: try:
return int(string) return int(string)
except ValueError: except ValueError:
return float(str(string.replace(",", "."))) return float(str(string).replace(",", "."))
class HonParameter: class HonParameter: