evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor Fitbit tweaks. Correct the copy, dont require auth on the routes, get the client_id/client_secret from fitbit.conf instead of the YAML

Browse source
This commit is contained in:
Robbie Trencheny 2016-05-09 15:31:47 -07:00
parent 25e8c7bc5f
commit c8cbc528eb
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
homeassistant/components/sensor/fitbit.py
View file

@ -153,7 +153,7 @@ def request_app_setup(hass, config, add_devices, config_path,
else: else:
setup_platform(hass, config, add_devices, discovery_info) setup_platform(hass, config, add_devices, discovery_info)
start_url = "{}{}".format(hass.config.api.base_url, FITBIT_AUTH_START) start_url = "{}{}".format(hass.config.api.base_url, FITBIT_AUTH_CALLBACK_PATH)
description = """Please create a Fitbit developer app at description = """Please create a Fitbit developer app at
https://dev.fitbit.com/apps/new. https://dev.fitbit.com/apps/new.
@ -222,8 +222,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
access_token = config_file.get("access_token") access_token = config_file.get("access_token")
refresh_token = config_file.get("refresh_token") refresh_token = config_file.get("refresh_token")
if None not in (access_token, refresh_token): if None not in (access_token, refresh_token):
authd_client = fitbit.Fitbit(config.get("client_id"), authd_client = fitbit.Fitbit(config_file.get("client_id"),
config.get("client_secret"), config_file.get("client_secret"),
access_token=access_token, access_token=access_token,
refresh_token=refresh_token) refresh_token=refresh_token)
@ -239,8 +239,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
add_devices(dev) add_devices(dev)
else: else:
oauth = fitbit.api.FitbitOauth2Client(config.get("client_id"), oauth = fitbit.api.FitbitOauth2Client(config_file.get("client_id"),
config.get("client_secret")) config_file.get("client_secret"))
redirect_uri = "{}{}".format(hass.config.api.base_url, redirect_uri = "{}{}".format(hass.config.api.base_url,
FITBIT_AUTH_CALLBACK_PATH) FITBIT_AUTH_CALLBACK_PATH)
@ -301,9 +301,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
setup_platform(hass, config, add_devices, discovery_info=None) setup_platform(hass, config, add_devices, discovery_info=None)
hass.http.register_path("GET", FITBIT_AUTH_START, _start_fitbit_auth) hass.http.register_path("GET", FITBIT_AUTH_START, _start_fitbit_auth, require_auth=False)
hass.http.register_path("GET", FITBIT_AUTH_CALLBACK_PATH, hass.http.register_path("GET", FITBIT_AUTH_CALLBACK_PATH,
_finish_fitbit_auth) _finish_fitbit_auth, require_auth=False)
request_oauth_completion(hass) request_oauth_completion(hass)