jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 23:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
*   - Fixes Fitbit error when trying to refresh oauth token

  The 3rd python-fitbit module requires an extra kwarg on the FitBit
  constructor called refresh_cb. The value should be a function that
  accepts one argument token.

  This value will be a dictionary with the keys:

     'access_token', 'refresh_token', 'expires_at'

  This implements a lambda refresh_cb as required by the Fitbit module
  to work, however the new token will always be save manually on
  every update() call.

*  Simplified by calling  expires_at instead reading again from dict
This commit is contained in:
Marcelo Moreira de Mello 2017-08-30 04:01:01 -04:00 committed by Pascal Vizeli
parent 4aafcfa478
commit f76436f326
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/components/sensor/fitbit.py
View File

@ -260,13 +260,16 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
access_token = config_file.get(ATTR_ACCESS_TOKEN) access_token = config_file.get(ATTR_ACCESS_TOKEN)
refresh_token = config_file.get(ATTR_REFRESH_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): if None not in (access_token, refresh_token):
authd_client = fitbit.Fitbit(config_file.get(ATTR_CLIENT_ID), authd_client = fitbit.Fitbit(config_file.get(ATTR_CLIENT_ID),
config_file.get(ATTR_CLIENT_SECRET), config_file.get(ATTR_CLIENT_SECRET),
access_token=access_token, 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.client.refresh_token()
authd_client.system = authd_client.user_profile_get()["user"]["locale"] authd_client.system = authd_client.user_profile_get()["user"]["locale"]
@ -338,12 +341,14 @@ class FitbitAuthCallbackView(HomeAssistantView):
response_message = """Fitbit has been successfully authorized! response_message = """Fitbit has been successfully authorized!
You can close this window now!""" You can close this window now!"""
result = None
if data.get('code') is not None: if data.get('code') is not None:
redirect_uri = '{}{}'.format( redirect_uri = '{}{}'.format(
hass.config.api.base_url, FITBIT_AUTH_CALLBACK_PATH) hass.config.api.base_url, FITBIT_AUTH_CALLBACK_PATH)
try: 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: except MissingTokenError as error:
_LOGGER.error("Missing token: %s", error) _LOGGER.error("Missing token: %s", error)
response_message = """Something went wrong when response_message = """Something went wrong when
@ -361,12 +366,20 @@ class FitbitAuthCallbackView(HomeAssistantView):
An unknown error occurred. Please try again! 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> html_response = """<html><head><title>Fitbit Auth</title></head>
<body><h1>{}</h1></body></html>""".format(response_message) <body><h1>{}</h1></body></html>""".format(response_message)
if result:
config_contents = { config_contents = {
ATTR_ACCESS_TOKEN: self.oauth.token['access_token'], ATTR_ACCESS_TOKEN: result.get('access_token'),
ATTR_REFRESH_TOKEN: self.oauth.token['refresh_token'], ATTR_REFRESH_TOKEN: result.get('refresh_token'),
ATTR_CLIENT_ID: self.oauth.client_id, ATTR_CLIENT_ID: self.oauth.client_id,
ATTR_CLIENT_SECRET: self.oauth.client_secret ATTR_CLIENT_SECRET: self.oauth.client_secret
} }
@ -490,9 +503,11 @@ class FitbitSensor(Entity):
if self.resource_type == 'activities/heart': if self.resource_type == 'activities/heart':
self._state = response[container][-1]. \ self._state = response[container][-1]. \
get('value').get('restingHeartRate') get('value').get('restingHeartRate')
token = self.client.client.session.token
config_contents = { config_contents = {
ATTR_ACCESS_TOKEN: self.client.client.token['access_token'], ATTR_ACCESS_TOKEN: token.get('access_token'),
ATTR_REFRESH_TOKEN: self.client.client.token['refresh_token'], ATTR_REFRESH_TOKEN: token.get('refresh_token'),
ATTR_CLIENT_ID: self.client.client.client_id, ATTR_CLIENT_ID: self.client.client.client_id,
ATTR_CLIENT_SECRET: self.client.client.client_secret, ATTR_CLIENT_SECRET: self.client.client.client_secret,
ATTR_LAST_SAVED_AT: int(time.time()) ATTR_LAST_SAVED_AT: int(time.time())