diff --git a/custom_components/badnest/__init__.py b/custom_components/badnest/__init__.py index 88cf808..02e4d2e 100644 --- a/custom_components/badnest/__init__.py +++ b/custom_components/badnest/__init__.py @@ -4,7 +4,7 @@ from .api import NestAPI from .const import DOMAIN, CONF_ISSUE_TOKEN, CONF_COOKIE, CONF_USER_ID, \ - CONF_ACCESS_TOKEN, CONF_REGION + CONF_ACCESS_TOKEN CONFIG_SCHEMA = vol.Schema( { @@ -12,12 +12,10 @@ { vol.Required(CONF_USER_ID, default=""): cv.string, vol.Required(CONF_ACCESS_TOKEN, default=""): cv.string, - vol.Optional(CONF_REGION, default="us"): cv.string, }, { vol.Required(CONF_ISSUE_TOKEN, default=""): cv.string, vol.Required(CONF_COOKIE, default=""): cv.string, - vol.Optional(CONF_REGION, default="us"): cv.string, } ) }, @@ -32,11 +30,9 @@ def setup(hass, config): access_token = config[DOMAIN].get(CONF_ACCESS_TOKEN) issue_token = config[DOMAIN].get(CONF_ISSUE_TOKEN) cookie = config[DOMAIN].get(CONF_COOKIE) - region = config[DOMAIN].get(CONF_REGION) else: issue_token = None cookie = None - region = None hass.data[DOMAIN] = { 'api': NestAPI( @@ -44,7 +40,6 @@ def setup(hass, config): access_token, issue_token, cookie, - region, ), } diff --git a/custom_components/badnest/api.py b/custom_components/badnest/api.py index 0e2d654..41f751d 100644 --- a/custom_components/badnest/api.py +++ b/custom_components/badnest/api.py @@ -86,8 +86,7 @@ def __init__(self, user_id, access_token, issue_token, - cookie, - region): + cookie): self.device_data = {} self._wheres = {} self._user_id = user_id @@ -110,7 +109,6 @@ def __init__(self, self._issue_token = issue_token self._cookie = cookie self._czfe_url = None - self._camera_url = f'https://nexusapi-{region}1.camera.home.nest.com' self.cameras = [] self.thermostats = set() self.temperature_sensors = set() @@ -188,7 +186,8 @@ def _get_cameras(self): for camera in r.json()["items"]: cameras.append(camera['uuid']) self.device_data[camera['uuid']] = {} - + self.device_data[camera['uuid']]['camera_url'] = \ + camera['nexus_api_nest_domain_host'] return cameras @Decorators.refresh_login @@ -531,8 +530,10 @@ def camera_get_image(self, device_id, now): if device_id not in self.cameras: return + camera_url = self.device_data[device_id]['camera_url'] + r = self._session.get( - f'{self._camera_url}/get_image?uuid={device_id}' + + f'https://{camera_url}/get_image?uuid={device_id}' + f'&cachebuster={now}', ) diff --git a/custom_components/badnest/const.py b/custom_components/badnest/const.py index 9b86cce..fa20936 100644 --- a/custom_components/badnest/const.py +++ b/custom_components/badnest/const.py @@ -3,4 +3,3 @@ CONF_COOKIE = 'cookie' CONF_USER_ID = 'user_id' CONF_ACCESS_TOKEN = 'access_token' -CONF_REGION = 'region'