Skip to content

Fix fitbit error when trying to access token after upgrade. #9183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pvizeli merged 2 commits into from
Aug 30, 2017
Merged

Fix fitbit error when trying to access token after upgrade. #9183

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
776be2d
- Fixes Fitbit error when trying to refresh oauth token
tchellomello Aug 30, 2017
cb69d71
Simplified by calling expires_at instead reading again from dict
tchellomello Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions homeassistant/components/sensor/fitbit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,16 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

access_token = config_file.get(ATTR_ACCESS_TOKEN)
refresh_token = config_file.get(ATTR_REFRESH_TOKEN)
expires_at = config_file.get(ATTR_LAST_SAVED_AT)
if None not in (access_token, refresh_token):
authd_client = fitbit.Fitbit(config_file.get(ATTR_CLIENT_ID),
config_file.get(ATTR_CLIENT_SECRET),
access_token=access_token,
refresh_token=refresh_token)
refresh_token=refresh_token,
expires_at=expires_at,
refresh_cb=lambda x: None)

if int(time.time()) - config_file.get(ATTR_LAST_SAVED_AT, 0) > 3600:
if int(time.time()) - expires_at > 3600:
authd_client.client.refresh_token()

authd_client.system = authd_client.user_profile_get()["user"]["locale"]
Expand Down Expand Up @@ -338,12 +341,14 @@ def get(self, request):
response_message = """Fitbit has been successfully authorized!
You can close this window now!"""

result = None
if data.get('code') is not None:
redirect_uri = '{}{}'.format(
hass.config.api.base_url, FITBIT_AUTH_CALLBACK_PATH)

try:
self.oauth.fetch_access_token(data.get('code'), redirect_uri)
result = self.oauth.fetch_access_token(data.get('code'),
redirect_uri)
except MissingTokenError as error:
_LOGGER.error("Missing token: %s", error)
response_message = """Something went wrong when
Expand All @@ -361,15 +366,23 @@ def get(self, request):
An unknown error occurred. Please try again!
"""

if result is None:
_LOGGER.error("Unknown error when authing")
response_message = """Something went wrong when
attempting authenticating with Fitbit.
An unknown error occurred. Please try again!
"""

html_response = """<html><head><title>Fitbit Auth</title></head>
<body><h1>{}</h1></body></html>""".format(response_message)

config_contents = {
ATTR_ACCESS_TOKEN: self.oauth.token['access_token'],
ATTR_REFRESH_TOKEN: self.oauth.token['refresh_token'],
ATTR_CLIENT_ID: self.oauth.client_id,
ATTR_CLIENT_SECRET: self.oauth.client_secret
}
if result:
config_contents = {
ATTR_ACCESS_TOKEN: result.get('access_token'),
ATTR_REFRESH_TOKEN: result.get('refresh_token'),
ATTR_CLIENT_ID: self.oauth.client_id,
ATTR_CLIENT_SECRET: self.oauth.client_secret
}
if not config_from_file(hass.config.path(FITBIT_CONFIG_FILE),
config_contents):
_LOGGER.error("Failed to save config file")
Expand Down Expand Up @@ -490,9 +503,11 @@ def update(self):
if self.resource_type == 'activities/heart':
self._state = response[container][-1]. \
get('value').get('restingHeartRate')

token = self.client.client.session.token
config_contents = {
ATTR_ACCESS_TOKEN: self.client.client.token['access_token'],
ATTR_REFRESH_TOKEN: self.client.client.token['refresh_token'],
ATTR_ACCESS_TOKEN: token.get('access_token'),
ATTR_REFRESH_TOKEN: token.get('refresh_token'),
ATTR_CLIENT_ID: self.client.client.client_id,
ATTR_CLIENT_SECRET: self.client.client.client_secret,
ATTR_LAST_SAVED_AT: int(time.time())
Expand Down