Skip to content

DRY refresh token recovery flow #104

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

Open
globalchubby wants to merge 8 commits into
base: master
Choose a base branch
from
Open

DRY refresh token recovery flow #104

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
90d17a6
WIP
globalchubby Oct 8, 2016
37136ba
WIP
globalchubby Oct 8, 2016
5cd3f64
WIP
globalchubby Oct 8, 2016
cbf80f7
WIP
globalchubby Oct 8, 2016
41a0245
WIP
globalchubby Oct 8, 2016
77d2409
WIP
globalchubby Oct 8, 2016
4bbfec5
WIP
globalchubby Oct 8, 2016
92fda71
WIP
globalchubby Oct 8, 2016
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
Prev Previous commit
WIP
  • Loading branch information
@globalchubby
globalchubby committed Oct 8, 2016
commit 92fda7150476908da1a187e1d32ec86534ea39c4
10 changes: 6 additions & 4 deletions fitbit/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ def __init__(self, client_id, client_secret,
}
self.oauth = OAuth2Session(client_id)

def _refresh_token_and_request(self, *args, **kwargs):
self.refresh_token()
return self._request(*args, **kwargs)

def _request(self, method, url, **kwargs):
"""
A simple wrapper around requests.
Expand All @@ -68,8 +72,7 @@ def make_request(self, url, data={}, method=None, **kwargs):
try:
response = self._request(method, url, data=data, **kwargs)
except (HTTPUnauthorized, TokenExpiredError) as e:
self.refresh_token()
response = self._request(method, url, data=data, **kwargs)
response = self._refresh_token_and_request(method, url, data=data, **kwargs)

# yet another token expiration check
# (the above try/except only applies if the expired token was obtained
Expand All @@ -80,8 +83,7 @@ def make_request(self, url, data={}, method=None, **kwargs):
response_errors = response_data['errors']
if (response_errors[0]['errorType'] == 'expired_token' and
response_errors[0]['message'].find('Access token expired:') == 0):
self.refresh_token()
response = self._request(method, url, data=data, **kwargs)
response = self._refresh_token_and_request(method, url, data=data, **kwargs)
except:
pass

Expand Down