changes to support guest accounts #42
+156
−39
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,8 +27,9 @@ def __init__(self, hiveSession=None, websession: Optional[ClientSession] = None) | |
| "login": f"{self.baseUrl}/cognito/login", | ||
| "refresh": f"{self.baseUrl}/cognito/refresh-token", | ||
| "holiday_mode": f"{self.baseUrl}/holiday-mode", | ||
| "all": f"{self.baseUrl}/nodes/all", | ||
| "homes": f"{self.baseUrl}/nodes/all", | ||
| "alarm": f"{self.baseUrl}/security-lite", | ||
| "cameraImages": f"https://event-history-service.{self.cameraBaseUrl}/v1/events/cameras?latest=true&cameraId={{0}}", | ||
| "cameraRecordings": f"https://event-history-service.{self.cameraBaseUrl}/v1/playlist/cameras/{{0}}/events/{{1}}.m3u8", | ||
| "devices": f"{self.baseUrl}/devices", | ||
|
|
@@ -44,10 +45,30 @@ def __init__(self, hiveSession=None, websession: Optional[ClientSession] = None) | |
| "parsed": "No response to Hive API request", | ||
| } | ||
| self.session = hiveSession | ||
| self.homeID = None | ||
| if self.session is not None: | ||
| self.homeID = self.session.config.homeID | ||
| self.websession = ClientSession() if websession is None else websession | ||
|
|
||
| def getParams(self, products=False, devices=False, actions=False): | ||
| """Get parameters.""" | ||
| params = { | ||
| "products": 'true' if products else 'false', | ||
| "devices": 'true' if devices else 'false', | ||
| "actions": 'true' if actions else 'false', | ||
| } | ||
| if self.homeID: | ||
|
There was a problem hiding this comment. You seemed to have catered for it here but not in the sync api |
||
| params.update({"homeId": self.homeID}) | ||
| return params | ||
|
|
||
| def getHomeIdParam(self): | ||
| """Get homeId parameter if set.""" | ||
| if self.homeID is not None: | ||
| return {"homeId": self.homeID} | ||
| return {} | ||
|
|
||
| async def request( | ||
| self, method: str, url: str, camera: bool = False, params={}, **kwargs | ||
| ) -> ClientResponse: | ||
| """Make a request.""" | ||
| data = kwargs.get("data", None) | ||
|
|
@@ -73,7 +94,7 @@ async def request( | |
| raise NoApiToken | ||
|
|
||
| async with self.websession.request( | ||
| method, url, headers=headers, data=data, params=params | ||
| ) as resp: | ||
| await resp.text() | ||
| if operator.contains(str(resp.status), "20"): | ||
|
|
@@ -142,21 +163,40 @@ async def getAll(self): | |
| """Build and query all endpoint.""" | ||
| json_return = {} | ||
| url = self.urls["all"] | ||
| params = self.getParams( | ||
| products=True, devices=True, actions=True | ||
| ) | ||
| try: | ||
| resp = await self.request("get", url, params=params) | ||
| json_return.update({"original": resp.status}) | ||
| json_return.update({"parsed": await resp.json(content_type=None)}) | ||
| except (OSError, RuntimeError, ZeroDivisionError): | ||
| await self.error() | ||
|
|
||
| return json_return | ||
|
|
||
| async def getHomes(self): | ||
| """Build and query all endpoint for homes.""" | ||
| json_return = {} | ||
| url = self.urls["all"] | ||
| params = self.getParams() | ||
| try: | ||
| resp = await self.request("get", url, params=params) | ||
| all = await resp.json(content_type=None) | ||
| json_return.update({"original": resp.status}) | ||
| json_return.update({"parsed": all["homes"]}) | ||
| except (OSError, RuntimeError, ZeroDivisionError): | ||
| await self.error() | ||
|
|
||
| return json_return | ||
|
|
||
| async def getAlarm(self): | ||
| """Build and query alarm endpoint.""" | ||
| json_return = {} | ||
| url = self.urls["alarm"] | ||
| params = self.getHomeIdParam() | ||
| try: | ||
| resp = await self.request("get", url, params=params) | ||
| json_return.update({"original": resp.status}) | ||
| json_return.update({"parsed": await resp.json(content_type=None)}) | ||
| except (OSError, RuntimeError, ZeroDivisionError): | ||
|
|
@@ -197,8 +237,9 @@ async def getDevices(self): | |
| """Call the get devices endpoint.""" | ||
| json_return = {} | ||
| url = self.urls["devices"] | ||
| params = self.getParams(devices=True) | ||
| try: | ||
| resp = await self.request("get", url, params=params) | ||
| json_return.update({"original": resp.status}) | ||
| json_return.update({"parsed": await resp.json(content_type=None)}) | ||
| except (OSError, RuntimeError, ZeroDivisionError): | ||
|
|
@@ -210,8 +251,9 @@ async def getProducts(self): | |
| """Call the get products endpoint.""" | ||
| json_return = {} | ||
| url = self.urls["products"] | ||
| params = self.getParams(products=True) | ||
| try: | ||
| resp = await self.request("get", url, params=params) | ||
| json_return.update({"original": resp.status}) | ||
| json_return.update({"parsed": await resp.json(content_type=None)}) | ||
| except (OSError, RuntimeError, ZeroDivisionError): | ||
|
|
@@ -222,11 +264,13 @@ async def getProducts(self): | |
| async def getActions(self): | ||
| """Call the get actions endpoint.""" | ||
| json_return = {} | ||
| url = self.urls["all"] | ||
|
There was a problem hiding this comment. Same comment here as the sync one |
||
| params = self.getParams(actions=True) | ||
| try: | ||
| resp = await self.request("get", url, params=params) | ||
| all = await resp.json(content_type=None) | ||
| json_return.update({"original": resp.status}) | ||
| json_return.update({"parsed": all["actions"]}) | ||
| except (OSError, RuntimeError, ZeroDivisionError): | ||
| await self.error() | ||
|
|
||
|
|
@@ -270,6 +314,10 @@ async def getWeather(self, weather_url): | |
|
|
||
| return json_return | ||
|
|
||
| def setHome(self, homeID): | ||
| """Set the home ID.""" | ||
| self.homeID = homeID | ||
|
|
||
| async def setState(self, n_type, n_id, **kwargs): | ||
| """Set the state of a Device.""" | ||
| json_return = {} | ||
|
|
@@ -306,10 +354,12 @@ async def setAlarm(self, **kwargs): | |
| + "}" | ||
| ) | ||
|
|
||
| url = self.urls["alarm"] | ||
| params = self.getHomeIdParam() | ||
|
|
||
| try: | ||
| await self.isFileBeingUsed() | ||
| resp = await self.request("post", url, data=jsc, params=params) | ||
| json_return["original"] = resp.status | ||
| json_return["parsed"] = await resp.json(content_type=None) | ||
| except (FileInUse, OSError, RuntimeError, ConnectionError) as e: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -537,7 +537,7 @@ async def refresh_token(self, token): | |
| if self.client is None: | ||
| await self.async_init() | ||
| result = None | ||
| auth_params = {"REFRESH_TOKEN": token} | ||
| if self.device_key is not None: | ||
| auth_params = { | ||
| "REFRESH_TOKEN": token, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did some testing of the the sync code and the api didn't seem to work with the params when they where booleans. When I changed them to be lower case f and in quotes the api then worked as expected.
The other option would be to the leave the params as booleans and update the dictionary to be as per below converting them to string and lowercasing them.